Merge branch 'hotfix/tchap_v2.6.1'

tchapgouv · Feb 10, 2023 · 7881313 · 7881313
2 parents a8e86eb + e452acc
commit 7881313
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 5 deletions.
diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
@@ -1,3 +1,13 @@
+Changes in Tchap 2.6.1 (2023-02-10)
+===================================
+
+Other changes
+-------------
+ - Remove welcome slide related to spaces ([#821](https://github.com/tchapgouv/tchap-android-v2/issues/821))
+ - Remove the ability to install an app from Tchap ([#832](https://github.com/tchapgouv/tchap-android-v2/issues/832))
+ - [Dark modes] Fix contrast of blue color ([#838](https://github.com/tchapgouv/tchap-android-v2/issues/838))
+
+
 Changes in Tchap 2.6.0 (2023-01-24)
 ===================================
 

diff --git a/library/ui-styles/src/main/res/values/colors.xml b/library/ui-styles/src/main/res/values/colors.xml
@@ -54,6 +54,9 @@
     <!-- Used for item separators in list, on surface -->
     <attr name="vctr_list_separator_on_surface" format="color" />
 
+    <!-- Tchap : Used for filter menu -->
+    <attr name="tchap_filter_menu" format="color" />
+
     <!-- Background color used for:
           - unread badge background for a room item in the room list
           - start unread indicator for a room item in the room list

diff --git a/library/ui-styles/src/main/res/values/palette.xml b/library/ui-styles/src/main/res/values/palette.xml
@@ -61,5 +61,6 @@
     <color name="palette_tchap_pumpkin_orange">#EF8425</color>
     <color name="palette_tchap_jade_green">#2CCE70</color>
     <color name="palette_tchap_greyish_brown">#4F4F4F</color>
+    <color name="palette_tchap_dark_blue">#3377FF</color>
 
-</resources>
+</resources>
diff --git a/library/ui-styles/src/main/res/values/styles_tablayout.xml b/library/ui-styles/src/main/res/values/styles_tablayout.xml
@@ -12,6 +12,7 @@
 
     <style name="ThemeOverlay.Vector.HomeFilterTabLayout" parent="Theme.Vector.Launcher">
         <item name="colorSurface">?vctr_toolbar_background</item>
+        <item name="colorPrimary">?tchap_filter_menu</item>
         <item name="colorOnSurface">?vctr_content_secondary</item>
     </style>
 

diff --git a/library/ui-styles/src/main/res/values/theme_black.xml b/library/ui-styles/src/main/res/values/theme_black.xml
@@ -18,6 +18,7 @@
         <item name="vctr_markdown_block_background_color">#FF4D4D4D</item>
         <item name="vctr_toolbar_background">@color/element_background_black</item>
         <item name="tchap_bottom_navigation_background">@color/element_background_black</item>
+        <item name="tchap_filter_menu">@color/palette_tchap_dark_blue</item>
 
         <!-- Material color -->
         <item name="colorSurface">@android:color/black</item>

diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -32,6 +32,7 @@
         <item name="vctr_message_bubble_outbound">@color/vctr_message_bubble_outbound_dark</item>
         <item name="vctr_badge_color_border">@color/vctr_badge_color_border_dark</item>
         <item name="tchap_bottom_navigation_background">@color/element_system_dark</item>
+        <item name="tchap_filter_menu">@color/palette_tchap_dark_blue</item>
 
         <!-- room message colors -->
         <item name="vctr_notice_secondary">#61708B</item>

diff --git a/library/ui-styles/src/main/res/values/theme_light.xml b/library/ui-styles/src/main/res/values/theme_light.xml
@@ -32,6 +32,7 @@
         <item name="vctr_message_bubble_outbound">@color/vctr_message_bubble_outbound_light</item>
         <item name="vctr_badge_color_border">@color/vctr_badge_color_border_light</item>
         <item name="tchap_bottom_navigation_background">@color/element_background_light</item>
+        <item name="tchap_filter_menu">@color/palette_tchap_official_blue</item>
 
         <!-- room message colors -->
         <item name="vctr_notice_secondary">#61708B</item>

diff --git a/towncrier.toml b/towncrier.toml
@@ -1,5 +1,5 @@
 [tool.towncrier]
-    version = "2.6.0"
+    version = "2.6.1"
     directory = "changelog.d"
     filename = "TCHAP_CHANGES.md"
     name = "Changes in Tchap"

diff --git a/vector-app/build.gradle b/vector-app/build.gradle
@@ -37,7 +37,7 @@ ext.versionMinor = 6
 // Note: even values are reserved for regular release, odd values for hotfix release.
 // When creating a hotfix, you should decrease the value, since the current value
 // is the value for the next regular release.
-ext.versionPatch = 0
+ext.versionPatch = 1
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
@@ -35,7 +35,9 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
     <!-- To be able to install APK from the application -->
+    <!-- Tchap: Remove the ability to install an app from Tchap (https://github.com/tchapgouv/tchap-android/issues/832)
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    -->
 
     <!-- Location Sharing -->
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

diff --git a/.../src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesFragment.kt b/.../src/main/java/im/vector/app/features/home/room/list/home/release/ReleaseNotesFragment.kt
@@ -96,11 +96,12 @@ class ReleaseNotesFragment : VectorBaseFragment<BottomSheetReleaseNotesBinding>(
                                 R.string.onboarding_new_app_layout_welcome_message,
                                 R.drawable.ill_app_layout_onboarding_rooms
                         ),
-                        ReleaseCarouselData.Item(
+                        // Tchap : No space function
+                        /* ReleaseCarouselData.Item(
                                 R.string.onboarding_new_app_layout_spaces_title,
                                 R.string.onboarding_new_app_layout_spaces_message,
                                 R.drawable.ill_app_layout_onboarding_spaces
-                        ),
+                        ), */
                         ReleaseCarouselData.Item(
                                 R.string.onboarding_new_app_layout_feedback_title,
                                 R.string.onboarding_new_app_layout_feedback_message,

diff --git a/vector/src/main/res/drawable-hdpi/ill_app_layout_onboarding_spaces.webp b/vector/src/main/res/drawable-hdpi/ill_app_layout_onboarding_spaces.webp
diff --git a/vector/src/main/res/drawable-mdpi/ill_app_layout_onboarding_spaces.webp b/vector/src/main/res/drawable-mdpi/ill_app_layout_onboarding_spaces.webp
diff --git a/vector/src/main/res/drawable-xhdpi/ill_app_layout_onboarding_spaces.webp b/vector/src/main/res/drawable-xhdpi/ill_app_layout_onboarding_spaces.webp
diff --git a/vector/src/main/res/drawable-xxhdpi/ill_app_layout_onboarding_spaces.webp b/vector/src/main/res/drawable-xxhdpi/ill_app_layout_onboarding_spaces.webp
diff --git a/vector/src/main/res/drawable-xxxhdpi/ill_app_layout_onboarding_spaces.webp b/vector/src/main/res/drawable-xxxhdpi/ill_app_layout_onboarding_spaces.webp