From 9f96974e67fa011f0e8fdc253cf8ed4ad99af3ad Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 17 Jun 2021 14:04:37 +0200
Subject: [PATCH] Rename some theme to follow naming convention

---
 .../ui-styles/src/main/res/values/styles_bottom_sheet.xml   | 6 +++---
 library/ui-styles/src/main/res/values/theme_black.xml       | 3 ++-
 library/ui-styles/src/main/res/values/theme_dark.xml        | 4 +++-
 library/ui-styles/src/main/res/values/theme_light.xml       | 4 +++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml b/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
index 8d1511f405..9f17342ede 100644
--- a/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
+++ b/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>
 
diff --git a/library/ui-styles/src/main/res/values/theme_black.xml b/library/ui-styles/src/main/res/values/theme_black.xml
index 6db7e5a663..c472a4fae5 100644
--- a/library/ui-styles/src/main/res/values/theme_black.xml
+++ b/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>
diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml
index 3c9d3ada33..a262dfe782 100644
--- a/library/ui-styles/src/main/res/values/theme_dark.xml
+++ b/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 -->
diff --git a/library/ui-styles/src/main/res/values/theme_light.xml b/library/ui-styles/src/main/res/values/theme_light.xml
index 08d9761a7a..6a1010bf28 100644
--- a/library/ui-styles/src/main/res/values/theme_light.xml
+++ b/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 -->