Merge pull request #3523 from vector-im/feature/bma/preparing_release

Preparing release 1.1.10

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

@@ -2,7 +2,7 @@
 <resources>
 
     <!-- BottomSheet theming -->
-    <style name="BottomSheet.Vector.Light" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
+    <style name="Theme.Vector.BottomSheetDialog.Light" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
         <item name="colorPrimary">@color/element_accent_light</item>
         <item name="colorSecondary">@color/palette_element_green</item>
         <item name="colorSurface">@color/element_background_light</item>
@@ -13,7 +13,7 @@
         <item name="android:textColorLink">@color/element_link_light</item>
     </style>
 
-    <style name="BottomSheet.Vector.Dark" parent="Theme.MaterialComponents.BottomSheetDialog">
+    <style name="Theme.Vector.BottomSheetDialog.Dark" parent="Theme.MaterialComponents.BottomSheetDialog">
         <item name="colorPrimary">@color/element_accent_dark</item>
         <item name="colorSecondary">@color/palette_element_green</item>
         <item name="colorSurface">@color/element_background_dark</item>
@@ -24,7 +24,7 @@
         <item name="android:textColorLink">@color/element_link_dark</item>
     </style>
 
-    <style name="BottomSheet.Vector.Black" parent="BottomSheet.Vector.Dark">
+    <style name="Theme.Vector.BottomSheetDialog.Black" parent="Theme.Vector.BottomSheetDialog.Dark">
         <item name="colorSurface">@color/element_background_black</item>
     </style>
 

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

@@ -25,7 +25,8 @@
         <item name="colorSurface">@android:color/black</item>
         <item name="android:colorBackground">@color/element_background_black</item>
 
-        <item name="bottomSheetDialogTheme">@style/BottomSheet.Vector.Black</item>
+        <!-- Default theme -->
+        <item name="bottomSheetDialogTheme">@style/Theme.Vector.BottomSheetDialog.Black</item>
 
         <item name="android:statusBarColor">@android:color/black</item>
         <item name="android:navigationBarColor">@android:color/black</item>

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

@@ -82,12 +82,14 @@
         <item name="textInputStyle">@style/Widget.Vector.TextInputLayout</item>
         <item name="appBarLayoutStyle">@style/Widget.Vector.AppBarLayout</item>
         <item name="popupMenuStyle">@style/Widget.Vector.PopupMenu</item>
-        <item name="bottomSheetDialogTheme">@style/BottomSheet.Vector.Dark</item>
         <item name="snackbarStyle">@style/Widget.Vector.SnackBar</item>
         <item name="snackbarButtonStyle">@style/Widget.Vector.SnackBar.Button</item>
         <item name="snackbarTextViewStyle">@style/Widget.Vector.SnackBar.TextView</item>
         <item name="actionModeStyle">@style/Widget.Vector.ActionMode</item>
 
+        <!-- Default theme -->
+        <item name="bottomSheetDialogTheme">@style/Theme.Vector.BottomSheetDialog.Dark</item>
+
         <item name="android:textColorLink">@color/element_link_dark</item>
 
         <!-- Menu text color -->

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

@@ -82,12 +82,14 @@
         <item name="textInputStyle">@style/Widget.Vector.TextInputLayout</item>
         <item name="appBarLayoutStyle">@style/Widget.Vector.AppBarLayout</item>
         <item name="popupMenuStyle">@style/Widget.Vector.PopupMenu</item>
-        <item name="bottomSheetDialogTheme">@style/BottomSheet.Vector.Light</item>
         <item name="snackbarStyle">@style/Widget.Vector.SnackBar</item>
         <item name="snackbarButtonStyle">@style/Widget.Vector.SnackBar.Button</item>
         <item name="snackbarTextViewStyle">@style/Widget.Vector.SnackBar.TextView</item>
         <item name="actionModeStyle">@style/Widget.Vector.ActionMode</item>
 
+        <!-- Default theme -->
+        <item name="bottomSheetDialogTheme">@style/Theme.Vector.BottomSheetDialog.Light</item>
+
         <item name="android:textColorLink">@color/element_link_light</item>
 
         <!-- Menu text color -->

matrix-sdk-android/src/main/res/values-fr/strings_sas.xml

@@ -33,11 +33,11 @@
     <string name="verification_emoji_heart">Cœur</string>
     <string name="verification_emoji_smiley">Sourire</string>
     <string name="verification_emoji_robot">Robot</string>
-    <string name="verification_emoji_hat">Châpeau</string>
+    <string name="verification_emoji_hat">Chapeau</string>
     <string name="verification_emoji_glasses">Lunettes</string>
     <string name="verification_emoji_spanner">Clé à molette</string>
     <string name="verification_emoji_santa">Père Noël</string>
-    <string name="verification_emoji_thumbs_up">Pouce en l\'air</string>
+    <string name="verification_emoji_thumbs_up">Pouce en l’air</string>
     <string name="verification_emoji_umbrella">Parapluie</string>
     <string name="verification_emoji_hourglass">Sablier</string>
     <string name="verification_emoji_clock">Réveil</string>

matrix-sdk-android/src/main/res/values-hu/strings_sas.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Generated file, do not edit -->
+    <string name="verification_emoji_dog">Kutya</string>
+    <string name="verification_emoji_cat">Macska</string>
+    <string name="verification_emoji_lion">Oroszlán</string>
+    <string name="verification_emoji_horse">Ló</string>
+    <string name="verification_emoji_unicorn">Egyszarvú</string>
+    <string name="verification_emoji_pig">Malac</string>
+    <string name="verification_emoji_elephant">Elefánt</string>
+    <string name="verification_emoji_rabbit">Nyúl</string>
+    <string name="verification_emoji_panda">Panda</string>
+    <string name="verification_emoji_rooster">Kakas</string>
+    <string name="verification_emoji_penguin">Pingvin</string>
+    <string name="verification_emoji_turtle">Teknős</string>
+    <string name="verification_emoji_fish">Hal</string>
+    <string name="verification_emoji_octopus">Polip</string>
+    <string name="verification_emoji_butterfly">Pillangó</string>
+    <string name="verification_emoji_flower">Virág</string>
+    <string name="verification_emoji_tree">Fa</string>
+    <string name="verification_emoji_cactus">Kaktusz</string>
+    <string name="verification_emoji_mushroom">Gomba</string>
+    <string name="verification_emoji_globe">Földgömb</string>
+    <string name="verification_emoji_moon">Hold</string>
+    <string name="verification_emoji_cloud">Felhő</string>
+    <string name="verification_emoji_fire">Tűz</string>
+    <string name="verification_emoji_banana">Banán</string>
+    <string name="verification_emoji_apple">Alma</string>
+    <string name="verification_emoji_strawberry">Eper</string>
+    <string name="verification_emoji_corn">Kukorica</string>
+    <string name="verification_emoji_pizza">Pizza</string>
+    <string name="verification_emoji_cake">Süti</string>
+    <string name="verification_emoji_heart">Szív</string>
+    <string name="verification_emoji_smiley">Mosoly</string>
+    <string name="verification_emoji_robot">Robot</string>
+    <string name="verification_emoji_hat">Kalap</string>
+    <string name="verification_emoji_glasses">Szemüveg</string>
+    <string name="verification_emoji_spanner">Csavarkulcs</string>
+    <string name="verification_emoji_santa">Télapó</string>
+    <string name="verification_emoji_thumbs_up">Hüvelykujj fel</string>
+    <string name="verification_emoji_umbrella">Esernyő</string>
+    <string name="verification_emoji_hourglass">Homokóra</string>
+    <string name="verification_emoji_clock">Óra</string>
+    <string name="verification_emoji_gift">Ajándék</string>
+    <string name="verification_emoji_light_bulb">Égő</string>
+    <string name="verification_emoji_book">Könyv</string>
+    <string name="verification_emoji_pencil">Ceruza</string>
+    <string name="verification_emoji_paperclip">Gémkapocs</string>
+    <string name="verification_emoji_scissors">Olló</string>
+    <string name="verification_emoji_lock">Lakat</string>
+    <string name="verification_emoji_key">Kulcs</string>
+    <string name="verification_emoji_hammer">Kalapács</string>
+    <string name="verification_emoji_telephone">Telefon</string>
+    <string name="verification_emoji_flag">Zászló</string>
+    <string name="verification_emoji_train">Vonat</string>
+    <string name="verification_emoji_bicycle">Kerékpár</string>
+    <string name="verification_emoji_aeroplane">Repülő</string>
+    <string name="verification_emoji_rocket">Rakáta</string>
+    <string name="verification_emoji_trophy">Trófea</string>
+    <string name="verification_emoji_ball">Labda</string>
+    <string name="verification_emoji_guitar">Gitár</string>
+    <string name="verification_emoji_trumpet">Trombita</string>
+    <string name="verification_emoji_bell">Harang</string>
+    <string name="verification_emoji_anchor">Horgony</string>
+    <string name="verification_emoji_headphones">Fejhallgató</string>
+    <string name="verification_emoji_folder">Mappa</string>
+    <string name="verification_emoji_pin">Rajszeg</string>
+</resources>

matrix-sdk-android/src/main/res/values-tzm/strings_sas.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Generated file, do not edit -->
+    <string name="verification_emoji_dog">Aydi</string>
+    <string name="verification_emoji_cat">Amuc</string>
+    <string name="verification_emoji_lion">Izem</string>
+    <string name="verification_emoji_horse">Ayyis</string>
+    <string name="verification_emoji_pig">Ilef</string>
+    <string name="verification_emoji_elephant">Ilu</string>
+    <string name="verification_emoji_rabbit">Agnin</string>
+    <string name="verification_emoji_rooster">Ayaẓiḍ</string>
+    <string name="verification_emoji_turtle">Ifker</string>
+    <string name="verification_emoji_fish">Aselm</string>
+    <string name="verification_emoji_tree">Aseklu</string>
+    <string name="verification_emoji_mushroom">Agursel</string>
+    <string name="verification_emoji_moon">Ayyur</string>
+    <string name="verification_emoji_fire">Timessi</string>
+    <string name="verification_emoji_banana">Tabanant</string>
+    <string name="verification_emoji_apple">Tadeffuyt</string>
+    <string name="verification_emoji_heart">Ul</string>
+    <string name="verification_emoji_robot">Aṛubu</string>
+    <string name="verification_emoji_hat">Taraza</string>
+    <string name="verification_emoji_book">Adlis</string>
+    <string name="verification_emoji_key">Tasarut</string>
+    <string name="verification_emoji_telephone">Atilifun</string>
+    <string name="verification_emoji_flag">Acenyal</string>
+    <string name="verification_emoji_ball">Tcama</string>
+    <string name="verification_emoji_guitar">Agiṭaṛ</string>
+    <string name="verification_emoji_folder">Asdaw</string>
+</resources>

tools/emojis/README.md

@@ -0,0 +1,5 @@
+# Emojis in Element Android
+
+This folder contains a formatted version of emoji_picker_datasource.json, for easier comparison when doing change.
+
+It is updated each time the emoji are imported, using ./tools/import_emoji.py.

tools/import_emojis.py

@@ -130,4 +130,10 @@ print("Writing emoji_picker_datasource.json...")
 scripts_dir = os.path.dirname(os.path.abspath(__file__))
 with open(os.path.join(scripts_dir, "../vector/src/main/res/raw/emoji_picker_datasource.json"), "w") as outfile:
     json.dump(emoji_picker_datasource, outfile, ensure_ascii=False, separators=(',', ':'))
+
+# Also export a formatted version
+print("Writing emoji_picker_datasource_formatted.json...")
+with open(os.path.join(scripts_dir, "../tools/emojis/emoji_picker_datasource_formatted.json"), "w") as outfile:
+    json.dump(emoji_picker_datasource, outfile, ensure_ascii=False, indent=4)
+
 print("Done.")

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

@@ -53,6 +53,7 @@
             android:paddingStart="@dimen/alerter_padding_small"
             android:paddingEnd="@dimen/alerter_padding_small"
             android:textColor="@android:color/white"
+            android:textStyle="bold"
             android:visibility="gone"
             tools:text="Title"
             tools:visibility="visible" />

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

@@ -21,7 +21,7 @@
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
-            android:layout_marginTop="@dimen/layout_vertical_margin"
+            android:layout_marginTop="24dp"
             android:contentDescription="@string/avatar"
             android:transitionName="profile"
             app:layout_constraintStart_toStartOf="parent"
@@ -112,6 +112,13 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+    <View
+        android:id="@+id/homeDrawerHeaderSeparator"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?vctr_list_separator"
+        app:layout_constraintTop_toBottomOf="@+id/homeDrawerHeader" />
+
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/homeDrawerGroupListContainer"
         android:layout_width="0dp"
@@ -120,7 +127,7 @@
         app:layout_constraintBottom_toTopOf="@+id/homeDrawerBottomSeparator"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/homeDrawerHeader" />
+        app:layout_constraintTop_toBottomOf="@+id/homeDrawerHeaderSeparator" />
 
     <View
         android:id="@+id/homeDrawerBottomSeparator"

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

@@ -5,7 +5,7 @@
     android:id="@+id/itemVerificationClickableZone"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?colorSurface"
+    android:background="?android:colorBackground"
     android:clickable="true"
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground"