Minimal ui changes and config

config.sample.json

@@ -2,17 +2,17 @@
     "default_server_config": {
         "m.homeserver": {
             "base_url": "https://matrix.i.tchap.gouv.fr",
-            "server_name": "Matrix Internes Preprod"
+            "server_name": "Internes - Preprod"
         },
         "m.identity_server": {
             "base_url": "https://matrix.i.tchap.gouv.fr"
         }
     },
-    "disable_custom_urls": false,
-    "disable_guests": false,
+    "disable_custom_urls": true,
+    "disable_guests": true,
     "disable_login_language_selector": false,
     "disable_3pid_login": true,
-    "brand": "Element",
+    "brand": "Tchap",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
     "integrations_widgets_urls": [
@@ -24,31 +24,43 @@
     ],
     "bug_report_endpoint_url": "https://element.io/bugreports/submit",
     "uisi_autorageshake_app": "element-auto-uisi",
-    "defaultCountryCode": "GB",
+    "defaultCountryCode": "FR",
     "showLabsSettings": false,
     "features": { },
     "default_federate": true,
-    "default_theme": "light",
+    "default_theme": "custom-Tchap",
     "roomDirectory": {
         "servers": [
             "i.tchap.gouv.fr"
         ]
     },
-    "piwik": {
-        "url": "https://piwik.riot.im/",
-        "whitelistedHSUrls": ["https://matrix.org"],
-        "whitelistedISUrls": ["https://vector.im", "https://matrix.org"],
-        "siteId": 1
-    },
     "enable_presence_by_hs_url": {
         "https://matrix.org": false,
         "https://matrix-client.matrix.org": false
     },
     "settingDefaults": {
-        "breadcrumbs": true
+        "breadcrumbs": true,
+        "UIFeature.voip": false,
+        "UIFeature.shareSocial": false,
+        "custom_themes": [
+            {
+                "name": "Tchap",
+                "is_dark": false,
+                "colors": {
+                    "accent": "#162d58"
+                }
+            }
+        ]
+    },
+    "branding": {
+        "authHeaderLogoUrl": "themes/element/img/logos/tchap-logo.svg",
+        "authFooterLinks": []
     },
     "jitsi": {
         "preferredDomain": "meet.element.io"
     },
+    "desktopBuilds": {
+        "available": false
+    },
     "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }

res/manifest.json

@@ -1,8 +1,8 @@
 {
-    "name": "Element",
-    "short_name": "Element",
+    "name": "Tchap",
+    "short_name": "Tchap",
     "display": "standalone",
-    "theme_color": "#76CFA6",
+    "theme_color": "#162d58",
     "start_url": "index.html",
     "icons": [
         {

res/welcome.html

@@ -170,9 +170,9 @@
 
 <div class="mx_Parent">
     <a href="https://element.io" target="_blank" rel="noopener">
-        <img src="welcome/images/logo.svg" alt="" class="mx_Logo"/>
+        <img src="themes/element/img/logos/tchap-logo.svg" alt="" class="mx_Logo"/>
     </a>
-    <h1 class="mx_Header_title">_t("Welcome to Element")</h1>
+    <h1 class="mx_Header_title">_t("Welcome to Tchap")</h1>
     <h4 class="mx_Header_subtitle">_t("Decentralised, encrypted chat &amp; collaboration powered by [matrix]")</h4>
     <div class="mx_ButtonGroup">
         <div class="mx_ButtonRow">

scripts/make-icons.sh

@@ -17,7 +17,7 @@ set -x
 
 tmpdir=`mktemp -d 2>/dev/null || mktemp -d -t 'icontmp'`
 
-for i in 1024 512 310 256 192 180 152 150 144 128 120 114 96 76 72 70 64 60 57 48 36 32 24 16
+for i in 1024 512 310 300 256 192 180 152 150 144 128 120 114 96 88 76 72 70 64 60 57 50 48 44 36 32 24 16
 do
     #convert -background none -density 1000 -resize $i -extent $i -gravity center "$1" "$tmpdir/$i.png"
 
@@ -59,22 +59,34 @@ cp "$tmpdir/512.png" "$tmpdir/Riot.iconset/[email protected]"
 cp "$tmpdir/512.png" "$tmpdir/Riot.iconset/icon_512x512.png"
 cp "$tmpdir/1024.png" "$tmpdir/Riot.iconset/[email protected]"
 
-if [ -x "$(command -v iconutil)" ]; then
-  # available on macos
-  iconutil -c icns -o electron_app/build/icon.icns "$tmpdir/Riot.iconset"
-elif [ -x "$(command -v png2icns)" ]; then
-  # available on linux
-  # png2icns is more finicky about its input than iconutil
-  # 1. it doesn't support a 64x64 (aka 32x32@2x)
-  # 2. it doesn't like duplicates (128x128@2x == 256x256)
-  rm "$tmpdir/Riot.iconset/[email protected]"
-  rm "$tmpdir/Riot.iconset/[email protected]"
-  rm "$tmpdir/Riot.iconset/[email protected]"
-  rm "$tmpdir/Riot.iconset/[email protected]"
-  png2icns electron_app/build/icon.icns "$tmpdir"/Riot.iconset/*png
-else
-  echo "WARNING: Unsupported platform. Skipping icns build"
-fi
+#if [ -x "$(command -v iconutil)" ]; then
+#  # available on macos
+#  iconutil -c icns -o electron_app/build/icon.icns "$tmpdir/Riot.iconset"
+#elif [ -x "$(command -v png2icns)" ]; then
+#  # available on linux
+#  # png2icns is more finicky about its input than iconutil
+#  # 1. it doesn't support a 64x64 (aka 32x32@2x)
+#  # 2. it doesn't like duplicates (128x128@2x == 256x256)
+#  rm "$tmpdir/Riot.iconset/[email protected]"
+#  rm "$tmpdir/Riot.iconset/[email protected]"
+#  rm "$tmpdir/Riot.iconset/[email protected]"
+#  rm "$tmpdir/Riot.iconset/[email protected]"
+#  png2icns electron_app/build/icon.icns "$tmpdir"/Riot.iconset/*png
+#else
+#  echo "WARNING: Unsupported platform. Skipping icns build"
+#fi
+
+cp "$tmpdir/24.png" "res/vector-icons/24.png"
+cp "$tmpdir/44.png" "res/vector-icons/44.png"
+cp "$tmpdir/50.png" "res/vector-icons/50.png"
+cp "$tmpdir/76.png" "res/vector-icons/76.png"
+cp "$tmpdir/88.png" "res/vector-icons/88.png"
+cp "$tmpdir/120.png" "res/vector-icons/120.png"
+cp "$tmpdir/150.png" "res/vector-icons/150.png"
+cp "$tmpdir/152.png" "res/vector-icons/152.png"
+cp "$tmpdir/180.png" "res/vector-icons/180.png"
+cp "$tmpdir/300.png" "res/vector-icons/300.png"
+cp "$tmpdir/1024.png" "res/vector-icons/1024.png"
 
 cp "$tmpdir/36.png" "res/vector-icons/android-chrome-36x36.png"
 cp "$tmpdir/48.png" "res/vector-icons/android-chrome-48x48.png"
@@ -84,34 +96,34 @@ cp "$tmpdir/144.png" "res/vector-icons/android-chrome-144x144.png"
 cp "$tmpdir/192.png" "res/vector-icons/android-chrome-192x192.png"
 cp "$tmpdir/180.png" "res/vector-icons/apple-touch-icon.png"
 cp "$tmpdir/180.png" "res/vector-icons/apple-touch-icon-precomposed.png"
-cp "$tmpdir/57.png" "res/vector-icons/apple-touch-icon-57x57.png"
-cp "$tmpdir/60.png" "res/vector-icons/apple-touch-icon-60x60.png"
-cp "$tmpdir/72.png" "res/vector-icons/apple-touch-icon-72x72.png"
-cp "$tmpdir/76.png" "res/vector-icons/apple-touch-icon-76x76.png"
-cp "$tmpdir/114.png" "res/vector-icons/apple-touch-icon-114x114.png"
-cp "$tmpdir/120.png" "res/vector-icons/apple-touch-icon-120x120.png"
-cp "$tmpdir/144.png" "res/vector-icons/apple-touch-icon-144x144.png"
-cp "$tmpdir/152.png" "res/vector-icons/apple-touch-icon-152x152.png"
-cp "$tmpdir/180.png" "res/vector-icons/apple-touch-icon-180x180.png"
+cp "$tmpdir/57.png" "res/vector-icons/apple-touch-icon-57.png"
+cp "$tmpdir/60.png" "res/vector-icons/apple-touch-icon-60.png"
+cp "$tmpdir/72.png" "res/vector-icons/apple-touch-icon-72.png"
+cp "$tmpdir/76.png" "res/vector-icons/apple-touch-icon-76.png"
+cp "$tmpdir/114.png" "res/vector-icons/apple-touch-icon-114.png"
+cp "$tmpdir/120.png" "res/vector-icons/apple-touch-icon-120.png"
+cp "$tmpdir/144.png" "res/vector-icons/apple-touch-icon-144.png"
+cp "$tmpdir/152.png" "res/vector-icons/apple-touch-icon-152.png"
+cp "$tmpdir/180.png" "res/vector-icons/apple-touch-icon-180.png"
 cp "$tmpdir/16.png" "res/vector-icons/favicon-16x16.png"
 cp "$tmpdir/32.png" "res/vector-icons/favicon-32x32.png"
 cp "$tmpdir/96.png" "res/vector-icons/favicon-96x96.png"
-cp "$tmpdir/70.png" "res/vector-icons/mstile-70x70.png"
-cp "$tmpdir/144.png" "res/vector-icons/mstile-144x144.png"
-cp "$tmpdir/150.png" "res/vector-icons/mstile-150x150.png"
-cp "$tmpdir/310.png" "res/vector-icons/mstile-310x310.png"
+cp "$tmpdir/70.png" "res/vector-icons/mstile-70.png"
+cp "$tmpdir/144.png" "res/vector-icons/mstile-144.png"
+cp "$tmpdir/150.png" "res/vector-icons/mstile-150.png"
+cp "$tmpdir/310.png" "res/vector-icons/mstile-310.png"
 cp "$tmpdir/310x150.png" "res/vector-icons/mstile-310x150.png"
-cp "$tmpdir/180.png" "electron_app/img/riot.png"
+#cp "$tmpdir/180.png" "electron_app/img/riot.png"
 
 convert "$tmpdir/16.png" "$tmpdir/32.png" "$tmpdir/64.png" "$tmpdir/128.png"  "$tmpdir/256.png" "res/vector-icons/favicon.ico"
 
-cp "res/vector-icons/favicon.ico" "electron_app/build/icon.ico"
-cp "res/vector-icons/favicon.ico" "electron_app/img/riot.ico"
+#cp "res/vector-icons/favicon.ico" "electron_app/build/icon.ico"
+#cp "res/vector-icons/favicon.ico" "electron_app/img/riot.ico"
 
 # https://github.com/electron-userland/electron-builder/blob/3f97b86993d4ea5172e562b182230a194de0f621/src/targets/LinuxTargetHelper.ts#L127
-for i in 24 96 16 48 64 128 256 512
-do
-    cp "$tmpdir/$i.png" "electron_app/build/icons/${i}x${i}.png"
-done
+#for i in 24 96 16 48 64 128 256 512
+#do
+#    cp "$tmpdir/$i.png" "electron_app/build/icons/${i}x${i}.png"
+#done
 
 rm -r "$tmpdir"

src/i18n/strings/en_EN.json

@@ -25,7 +25,7 @@
     "I understand the risks and wish to continue": "I understand the risks and wish to continue",
     "Go to element.io": "Go to element.io",
     "Failed to start": "Failed to start",
-    "Welcome to Element": "Welcome to Element",
+    "Welcome to Tchap": "Welcome to Tchap",
     "Decentralised, encrypted chat & collaboration powered by [matrix]": "Decentralised, encrypted chat & collaboration powered by [matrix]",
     "Sign In": "Sign In",
     "Create Account": "Create Account",

src/i18n/strings/fr.json

@@ -3,7 +3,7 @@
     "powered by Matrix": "propulsé par Matrix",
     "Unknown device": "Appareil inconnu",
     "You need to be using HTTPS to place a screen-sharing call.": "Vous devez utiliser HTTPS pour effectuer un appel avec partage d’écran.",
-    "Welcome to Element": "Bienvenue sur Element",
+    "Welcome to Tchap": "Bienvenue sur Tchap",
     "Decentralised, encrypted chat & collaboration powered by [matrix]": "Messagerie et collaboration décentralisées et chiffrées, propulsées par [matrix]",
     "Sign In": "Se connecter",
     "Create Account": "Créer un compte",

src/vector/index.html

@@ -2,7 +2,7 @@
 <html lang="en" style="height: 100%;">
   <head>
     <meta charset="utf-8">
-    <title>Element</title>
+    <title>Tchap</title>
     <link rel="apple-touch-icon" sizes="57x57" href="<%= require('../../res/vector-icons/apple-touch-icon-57.png') %>">
     <link rel="apple-touch-icon" sizes="60x60" href="<%= require('../../res/vector-icons/apple-touch-icon-60.png') %>">
     <link rel="apple-touch-icon" sizes="72x72" href="<%= require('../../res/vector-icons/apple-touch-icon-72.png') %>">
@@ -16,8 +16,8 @@
     <meta name="referrer" content="no-referrer">
     <link rel="shortcut icon" href="<%= require('../../res/vector-icons/favicon.ico') %>">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="apple-mobile-web-app-title" content="Element">
-    <meta name="application-name" content="Element">
+    <meta name="apple-mobile-web-app-title" content="Tchap">
+    <meta name="application-name" content="Tchap">
     <meta name="msapplication-TileColor" content="#da532c">
     <meta name="msapplication-TileImage" content="<%= require('../../res/vector-icons/mstile-150.png') %>">
     <meta name="msapplication-config" content="<%= require('../../res/vector-icons/browserconfig.xml') %>">
@@ -59,7 +59,7 @@
 
   </head>
   <body style="height: 100%; margin: 0;">
-    <noscript>Sorry, Element requires JavaScript to be enabled.</noscript> <!-- TODO: Translate this? -->
+    <noscript>Sorry, Tchap requires JavaScript to be enabled.</noscript> <!-- TODO: Translate this? -->
     <section id="matrixchat" style="height: 100%;" class="notranslate"></section>
     <script src="<%= htmlWebpackPlugin.files.js.find(entry => entry.includes("bundle.js")) %>"></script>