Theming, replacing element_green with shades of grey

library/ui-strings/src/main/res/values/strings.xml

@@ -463,6 +463,9 @@
     <string name="labs_enable_new_app_layout_title">Enable new layout</string>
     <string name="labs_enable_new_app_layout_summary">A simplified Element with optional tabs</string>
 
+    <string name="labs_enable_hide_shields_title">Hide encryption shields</string>
+    <string name="labs_enable_hide_shields_summary">Hide encryption shields next to messages in rooms</string>
+
     <string name="labs_enable_deferred_dm_title">Enable deferred DMs</string>
     <string name="labs_enable_deferred_dm_summary">Create DM only on first message</string>
 

library/ui-styles/src/main/res/drawable/element_logo_black.xml

@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+  <path
+      android:pathData="M23.04,3.84C23.04,1.7192 24.7593,0 26.88,0C41.0185,0 52.48,11.4615 52.48,25.6C52.48,27.7208 50.7608,29.44 48.64,29.44C46.5193,29.44 44.8,27.7208 44.8,25.6C44.8,15.7031 36.777,7.68 26.88,7.68C24.7593,7.68 23.04,5.9608 23.04,3.84Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M40.96,60.16C40.96,62.2808 39.2407,64 37.12,64C22.9815,64 11.52,52.5385 11.52,38.4C11.52,36.2792 13.2392,34.56 15.36,34.56C17.4807,34.56 19.2,36.2792 19.2,38.4C19.2,48.2969 27.223,56.32 37.12,56.32C39.2407,56.32 40.96,58.0392 40.96,60.16Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M3.84,40.96C1.7192,40.96 -0,39.2407 -0,37.12C-0,22.9815 11.4615,11.52 25.6,11.52C27.7208,11.52 29.44,13.2392 29.44,15.36C29.44,17.4807 27.7208,19.2 25.6,19.2C15.7031,19.2 7.68,27.223 7.68,37.12C7.68,39.2407 5.9608,40.96 3.84,40.96Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M60.16,23.04C62.2808,23.04 64,24.7593 64,26.88C64,41.0185 52.5385,52.48 38.4,52.48C36.2792,52.48 34.56,50.7608 34.56,48.64C34.56,46.5193 36.2792,44.8 38.4,44.8C48.2969,44.8 56.32,36.777 56.32,26.88C56.32,24.7593 58.0392,23.04 60.16,23.04Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+</vector>

library/ui-styles/src/main/res/values/palette_mobile.xml

@@ -5,7 +5,7 @@
       Source: https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=1521%3A23026 -->
 
     <color name="element_accent_light">@color/palette_element_green</color>
-    <color name="element_accent_dark">@color/palette_element_green</color>
+    <color name="element_accent_dark">@color/palette_gray_400</color>
 
     <color name="element_alert_light">@color/palette_vermilion</color>
     <color name="element_alert_dark">@color/palette_vermilion</color>
@@ -53,4 +53,4 @@
     <color name="element_room_01">@color/palette_verde</color>
     <color name="element_room_02">@color/palette_azure</color>
     <color name="element_room_03">@color/palette_grape</color>
-</resources>
+</resources>

library/ui-styles/src/main/res/values/styles_tablayout.xml

@@ -11,6 +11,7 @@
     </style>
 
     <style name="ThemeOverlay.Vector.HomeFilterTabLayout" parent="Theme.Vector.Launcher">
+        <item name="colorPrimary">?vctr_content_primary</item>
         <item name="colorSurface">?vctr_toolbar_background</item>
         <item name="colorOnSurface">?vctr_content_secondary</item>
     </style>

library/ui-styles/src/main/res/values/theme_common.xml

@@ -4,9 +4,9 @@
     <!-- Launcher Theme, only used for VectorLauncherActivity (will be use even before the Activity is started) -->
     <style name="Theme.Vector.Launcher" parent="Theme.MaterialComponents.Light.NoActionBar">
         <item name="android:windowBackground">@drawable/splash</item>
-        <item name="colorPrimary">@color/element_accent_light</item>
-        <item name="android:statusBarColor">@color/element_accent_light</item>
-        <item name="android:navigationBarColor">@color/element_accent_light</item>
+        <item name="colorPrimary">#000000</item>
+        <item name="android:statusBarColor">#000000</item>
+        <item name="android:navigationBarColor">#000000</item>
     </style>
 
     <style name="Theme.Vector.Black.AttachmentsPreview">

vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt

@@ -85,6 +85,11 @@ class DebugFeaturesStateFactory @Inject constructor(
                                 key = DebugFeatureKeys.newAppLayoutEnabled,
                                 factory = VectorFeatures::isNewAppLayoutFeatureEnabled
                         ),
+                        createBooleanFeature(
+                                label = "Disable Encryption Shields",
+                                key = DebugFeatureKeys.shieldVisibilityDisabled,
+                                factory = VectorFeatures::isShieldVisibilityDisabled
+                        ),
                         createBooleanFeature(
                                 label = "Enable QR Code Login",
                                 key = DebugFeatureKeys.qrCodeLoginEnabled,

vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt

@@ -76,6 +76,9 @@ class DebugVectorFeatures(
     override fun isNewAppLayoutFeatureEnabled(): Boolean = read(DebugFeatureKeys.newAppLayoutEnabled)
             ?: vectorFeatures.isNewAppLayoutFeatureEnabled()
 
+    override fun isShieldVisibilityDisabled(): Boolean = read(DebugFeatureKeys.shieldVisibilityDisabled)
+            ?: vectorFeatures.isShieldVisibilityDisabled()
+
     override fun isQrCodeLoginEnabled() = read(DebugFeatureKeys.qrCodeLoginEnabled)
             ?: vectorFeatures.isQrCodeLoginEnabled()
 
@@ -150,6 +153,7 @@ object DebugFeatureKeys {
     val screenSharing = booleanPreferencesKey("screen-sharing")
     val forceUsageOfOpusEncoder = booleanPreferencesKey("force-usage-of-opus-encoder")
     val newAppLayoutEnabled = booleanPreferencesKey("new-app-layout-enabled")
+    val shieldVisibilityDisabled = booleanPreferencesKey("shield-visibility-disabled")
     val qrCodeLoginEnabled = booleanPreferencesKey("qr-code-login-enabled")
     val qrCodeLoginForAllServers = booleanPreferencesKey("qr-code-login-for-all-servers")
     val reciprocateQrCodeLogin = booleanPreferencesKey("reciprocate-qr-code-login")

vector-app/src/main/res/drawable/ic_launcher_background.xml

@@ -5,6 +5,6 @@
     android:viewportHeight="108">
   <path
       android:pathData="m0,0h108v108h-108z"
-      android:fillColor="@color/launcher_background"
+      android:fillColor="@color/palette_white"
       android:fillType="evenOdd"/>
 </vector>

vector-app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -5,18 +5,18 @@
     android:viewportHeight="108">
   <path
       android:pathData="M47.28,32.88C47.28,31.289 48.569,30 50.16,30C60.764,30 69.36,38.596 69.36,49.2C69.36,50.791 68.071,52.08 66.48,52.08C64.89,52.08 63.6,50.791 63.6,49.2C63.6,41.777 57.583,35.76 50.16,35.76C48.569,35.76 47.28,34.471 47.28,32.88Z"
-      android:fillColor="#ffffff"
+      android:fillColor="#000000"
       android:fillType="evenOdd"/>
   <path
       android:pathData="M60.72,75.12C60.72,76.711 59.431,78 57.84,78C47.236,78 38.64,69.404 38.64,58.8C38.64,57.209 39.929,55.92 41.52,55.92C43.111,55.92 44.4,57.209 44.4,58.8C44.4,66.223 50.417,72.24 57.84,72.24C59.431,72.24 60.72,73.529 60.72,75.12Z"
-      android:fillColor="#ffffff"
+      android:fillColor="#000000"
       android:fillType="evenOdd"/>
   <path
       android:pathData="M32.88,60.72C31.289,60.72 30,59.431 30,57.84C30,47.236 38.596,38.64 49.2,38.64C50.791,38.64 52.08,39.929 52.08,41.52C52.08,43.111 50.791,44.4 49.2,44.4C41.777,44.4 35.76,50.417 35.76,57.84C35.76,59.431 34.471,60.72 32.88,60.72Z"
-      android:fillColor="#ffffff"
+      android:fillColor="#000000"
       android:fillType="evenOdd"/>
   <path
       android:pathData="M75.12,47.28C76.711,47.28 78,48.569 78,50.16C78,60.764 69.404,69.36 58.8,69.36C57.209,69.36 55.92,68.071 55.92,66.48C55.92,64.89 57.209,63.6 58.8,63.6C66.223,63.6 72.24,57.583 72.24,50.16C72.24,48.569 73.529,47.28 75.12,47.28Z"
-      android:fillColor="#ffffff"
+      android:fillColor="#000000"
       android:fillType="evenOdd"/>
 </vector>

vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

vector-config/src/main/res/values/config-settings.xml

@@ -39,14 +39,15 @@
     <!-- Level 1: Labs -->
     <bool name="settings_labs_deferred_dm_visible">true</bool>
     <bool name="settings_labs_deferred_dm_default">true</bool>
-    <bool name="settings_labs_thread_messages_default">true</bool>
+    <bool name="settings_labs_thread_messages_default">false</bool>
     <bool name="settings_labs_new_app_layout_default">true</bool>
-    <bool name="settings_labs_new_session_manager_default">false</bool>
+    <bool name="settings_labs_hide_shields_default">true</bool>
+    <bool name="settings_labs_new_session_manager_default">true</bool>
     <bool name="settings_labs_new_session_manager_visible">true</bool>
-    <bool name="settings_labs_client_info_recording_default">false</bool>
+    <bool name="settings_labs_client_info_recording_default">true</bool>
     <bool name="settings_labs_client_info_recording_visible">true</bool>
     <bool name="settings_timeline_show_live_sender_info_visible">true</bool>
-    <bool name="settings_timeline_show_live_sender_info_default">false</bool>
+    <bool name="settings_timeline_show_live_sender_info_default">true</bool>
     <bool name="settings_labs_rich_text_editor_visible">true</bool>
     <bool name="settings_labs_rich_text_editor_default">false</bool>
     <bool name="settings_labs_enable_voice_broadcast_visible">true</bool>
@@ -58,6 +59,6 @@
     <!-- Level 1: Legals -->
 
     <!-- Level 3: Security & Privacy, Sessions -->
-    <bool name="settings_session_manager_show_ip_address">false</bool>
+    <bool name="settings_session_manager_show_ip_address">true</bool>
 
 </resources>

vector/src/main/java/im/vector/app/features/VectorFeatures.kt

@@ -40,6 +40,7 @@ interface VectorFeatures {
      * use [VectorPreferences.isNewAppLayoutEnabled] instead.
      */
     fun isNewAppLayoutFeatureEnabled(): Boolean
+    fun isShieldVisibilityDisabled(): Boolean
     fun isQrCodeLoginEnabled(): Boolean
     fun isQrCodeLoginForAllServers(): Boolean
     fun isReciprocateQrCodeLogin(): Boolean
@@ -60,6 +61,7 @@ class DefaultVectorFeatures : VectorFeatures {
     override fun isLocationSharingEnabled() = Config.ENABLE_LOCATION_SHARING
     override fun forceUsageOfOpusEncoder(): Boolean = false
     override fun isNewAppLayoutFeatureEnabled(): Boolean = true
+    override fun isShieldVisibilityDisabled(): Boolean = true
     override fun isQrCodeLoginEnabled(): Boolean = true
     override fun isQrCodeLoginForAllServers(): Boolean = false
     override fun isReciprocateQrCodeLogin(): Boolean = false

vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt

@@ -26,6 +26,7 @@ import im.vector.app.features.home.room.detail.timeline.item.MessageInformationD
 import im.vector.app.features.home.room.detail.timeline.item.ReferencesInfoData
 import im.vector.app.features.home.room.detail.timeline.item.SendStateDecoration
 import im.vector.app.features.home.room.detail.timeline.style.TimelineMessageLayoutFactory
+import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.model.MessageVerificationState
@@ -55,6 +56,7 @@ class MessageInformationDataFactory @Inject constructor(
         private val messageLayoutFactory: TimelineMessageLayoutFactory,
         private val reactionsSummaryFactory: ReactionsSummaryFactory,
         private val pollResponseDataFactory: PollResponseDataFactory,
+        private val vectorPreferences: VectorPreferences,
 ) {
 
     fun create(params: TimelineItemFactoryParams): MessageInformationData {
@@ -147,7 +149,7 @@ class MessageInformationDataFactory @Inject constructor(
     }
 
     private fun getE2EDecorationV2(roomSummary: RoomSummary?, event: Event): E2EDecoration {
-        if (roomSummary?.isEncrypted != true) {
+        if (roomSummary?.isEncrypted != true || vectorPreferences.isShieldVisibilityDisabled()) {
             // No decoration for clear room
             // Questionable? what if the event is E2E?
             return E2EDecoration.NONE

vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt

@@ -70,6 +70,7 @@ class VectorPreferences @Inject constructor(
         const val SETTINGS_BACKGROUND_SYNC_DIVIDER_PREFERENCE_KEY = "SETTINGS_BACKGROUND_SYNC_DIVIDER_PREFERENCE_KEY"
         const val SETTINGS_LABS_PREFERENCE_KEY = "SETTINGS_LABS_PREFERENCE_KEY"
         const val SETTINGS_LABS_NEW_APP_LAYOUT_KEY = "SETTINGS_LABS_NEW_APP_LAYOUT_KEY"
+        const val SETTINGS_LABS_HIDE_SHIELDS_KEY = "SETTINGS_LABS_HIDE_SHIELDS_KEY"
         const val SETTINGS_LABS_DEFERRED_DM_KEY = "SETTINGS_LABS_DEFERRED_DM_KEY"
         const val SETTINGS_LABS_RICH_TEXT_EDITOR_KEY = "SETTINGS_LABS_RICH_TEXT_EDITOR_KEY"
         const val SETTINGS_LABS_NEW_SESSION_MANAGER_KEY = "SETTINGS_LABS_NEW_SESSION_MANAGER_KEY"
@@ -305,6 +306,8 @@ class VectorPreferences @Inject constructor(
                 SETTINGS_SECURITY_USE_FLAG_SECURE,
                 SETTINGS_SECURITY_INCOGNITO_KEYBOARD_PREFERENCE_KEY,
 
+                SETTINGS_LABS_HIDE_SHIELDS_KEY,
+
                 ShortcutsHandler.SHARED_PREF_KEY,
         )
     }
@@ -1123,7 +1126,7 @@ class VectorPreferences @Inject constructor(
      * Indicates whether or not thread messages are enabled.
      */
     fun areThreadMessagesEnabled(): Boolean {
-        return defaultPrefs.getBoolean(SETTINGS_LABS_ENABLE_THREAD_MESSAGES, getDefault(R.bool.settings_labs_thread_messages_default))
+        return defaultPrefs.getBoolean(SETTINGS_LABS_ENABLE_THREAD_MESSAGES, false)
     }
 
     /**
@@ -1141,7 +1144,7 @@ class VectorPreferences @Inject constructor(
      * Should be removed when Threads flag will be removed
      */
     fun wasThreadFlagChangedManually(): Boolean {
-        return defaultPrefs.getBoolean(SETTINGS_LABS_THREAD_MESSAGES_CHANGED_BY_USER, false)
+        return defaultPrefs.getBoolean(SETTINGS_LABS_THREAD_MESSAGES_CHANGED_BY_USER, true)
     }
 
     /**
@@ -1217,6 +1220,13 @@ class VectorPreferences @Inject constructor(
                 defaultPrefs.getBoolean(SETTINGS_LABS_NEW_APP_LAYOUT_KEY, getDefault(R.bool.settings_labs_new_app_layout_default))
     }
 
+    /**
+     * Indicates if the encryption shields in rooms next to messages are hidden
+     */
+    fun isShieldVisibilityDisabled() : Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_LABS_HIDE_SHIELDS_KEY, getDefault(R.bool.settings_labs_hide_shields_default))
+    }
+
     /**
      * Indicates whether or not deferred DMs are enabled.
      */
@@ -1228,18 +1238,18 @@ class VectorPreferences @Inject constructor(
      * Indicates whether or not new session manager screens are enabled.
      */
     fun isNewSessionManagerEnabled(): Boolean {
-        return defaultPrefs.getBoolean(SETTINGS_LABS_NEW_SESSION_MANAGER_KEY, getDefault(R.bool.settings_labs_new_session_manager_default))
+        return defaultPrefs.getBoolean(SETTINGS_LABS_NEW_SESSION_MANAGER_KEY, true)
     }
 
     /**
      * Indicates whether or not client info recording is enabled.
      */
     fun isClientInfoRecordingEnabled(): Boolean {
-        return defaultPrefs.getBoolean(SETTINGS_LABS_CLIENT_INFO_RECORDING_KEY, getDefault(R.bool.settings_labs_client_info_recording_default))
+        return defaultPrefs.getBoolean(SETTINGS_LABS_CLIENT_INFO_RECORDING_KEY, true)
     }
 
     fun showLiveSenderInfo(): Boolean {
-        return defaultPrefs.getBoolean(SETTINGS_TIMELINE_SHOW_LIVE_SENDER_INFO, getDefault(R.bool.settings_timeline_show_live_sender_info_default))
+        return defaultPrefs.getBoolean(SETTINGS_TIMELINE_SHOW_LIVE_SENDER_INFO, true)
     }
 
     fun isRichTextEditorEnabled(): Boolean {
@@ -1252,7 +1262,7 @@ class VectorPreferences @Inject constructor(
     }
 
     fun showIpAddressInSessionManagerScreens(): Boolean {
-        return defaultPrefs.getBoolean(SETTINGS_SESSION_MANAGER_SHOW_IP_ADDRESS, getDefault(R.bool.settings_session_manager_show_ip_address))
+        return defaultPrefs.getBoolean(SETTINGS_SESSION_MANAGER_SHOW_IP_ADDRESS, true)
     }
 
     fun setIpAddressVisibilityInDeviceManagerScreens(isVisible: Boolean) {

vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt

@@ -133,7 +133,7 @@ object ThemeUtils {
      */
     fun setActivityTheme(activity: Activity, otherThemes: ActivityOtherThemes) {
         when (getApplicationTheme(activity)) {
-            SYSTEM_THEME_VALUE -> if (isSystemDarkTheme(activity.resources)) activity.setTheme(otherThemes.dark)
+            SYSTEM_THEME_VALUE -> if (isSystemDarkTheme(activity.resources)) activity.setTheme(otherThemes.black)
             THEME_DARK_VALUE -> activity.setTheme(otherThemes.dark)
             THEME_BLACK_VALUE -> activity.setTheme(otherThemes.black)
         }
@@ -202,7 +202,7 @@ object ThemeUtils {
     @StyleRes
     private fun themeToRes(context: Context, theme: String): Int =
             when (theme) {
-                SYSTEM_THEME_VALUE -> if (isSystemDarkTheme(context.resources)) R.style.Theme_Vector_Dark else R.style.Theme_Vector_Light
+                SYSTEM_THEME_VALUE -> if (isSystemDarkTheme(context.resources)) R.style.Theme_Vector_Black else R.style.Theme_Vector_Light
                 THEME_DARK_VALUE -> R.style.Theme_Vector_Dark
                 THEME_BLACK_VALUE -> R.style.Theme_Vector_Black
                 else -> R.style.Theme_Vector_Light

vector/src/main/res/layout/fragment_login_splash.xml

@@ -37,7 +37,7 @@
             android:layout_width="64dp"
             android:layout_height="64dp"
             android:importantForAccessibility="no"
-            android:src="@drawable/element_logo_green"
+            android:src="@drawable/element_logo_black"
             android:transitionName="loginLogoTransition" />
 
         <ImageView
@@ -47,7 +47,7 @@
             android:layout_marginTop="8dp"
             android:contentDescription="@string/app_name"
             android:src="@drawable/element_logotype"
-            app:tint="?colorSecondary"
+            app:tint="@color/palette_black_900"
             tools:ignore="MissingPrefix" />
 
     </LinearLayout>

vector/src/main/res/layout/fragment_new_home_detail.xml

@@ -115,7 +115,7 @@
         app:layout_constraintBottom_toTopOf="@id/newLayoutCreateChatButton"
         app:layout_constraintEnd_toEndOf="@id/newLayoutCreateChatButton"
         app:layout_constraintStart_toStartOf="@id/newLayoutCreateChatButton"
-        app:tint="?attr/colorPrimary"
+        app:tint="?vctr_content_primary"
         tools:targetApi="lollipop_mr1"
         tools:visibility="visible" />
 

vector/src/main/res/xml/vector_settings_advanced_settings.xml

@@ -51,7 +51,7 @@
         android:title="@string/settings_rageshake">
 
         <im.vector.app.core.preference.VectorSwitchPreference
-            android:defaultValue="true"
+            android:defaultValue="false"
             android:key="SETTINGS_USE_RAGE_SHAKE_KEY"
             android:title="@string/send_bug_report_rage_shake" />
 

vector/src/main/res/xml/vector_settings_labs.xml

@@ -89,6 +89,12 @@
         android:summary="@string/labs_enable_new_app_layout_summary"
         android:title="@string/labs_enable_new_app_layout_title" />
 
+    <im.vector.app.core.preference.VectorSwitchPreference
+        android:defaultValue="@bool/settings_labs_hide_shields_default"
+        android:key="SETTINGS_LABS_HIDE_SHIELDS_KEY"
+        android:summary="@string/labs_enable_hide_shields_summary"
+        android:title="@string/labs_enable_hide_shields_title" />
+
     <im.vector.app.core.preference.VectorSwitchPreference
         android:defaultValue="@bool/settings_labs_deferred_dm_default"
         android:key="SETTINGS_LABS_DEFERRED_DM_KEY"