#5114

- update button text color in bottom sheet styles in syles_bottom_sheet.xml from black to white. Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
element-hq · Mar 3, 2022 · d4aab6e · d4aab6e
1 parent 5ceed3e
commit d4aab6e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/changelog.d/5114.bugfix b/changelog.d/5114.bugfix
@@ -3,4 +3,4 @@
 ## Changes : 
  - update room widget permission bottom sheet behaviour on click outside or on back button clicked (Triggering onCancel event) 
 to be the same as the "Decline" button performance.
- - change actions UI from button to colored labels, as was red for the decline, green for the continue action. 
+ -  - update button text color in bottom sheet styles in syles_bottom_sheet.xml
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
@@ -59,4 +59,8 @@
         <item name="android:textSize">12sp</item>
     </style>
 
+    <style name="BottomSheetButtonTextColor">
+        <item name="android:textColor">@android:color/white</item>
+    </style>
+
 </resources>
diff --git a/library/ui-styles/src/main/res/values/styles_buttons.xml b/library/ui-styles/src/main/res/values/styles_buttons.xml
@@ -15,7 +15,7 @@
         <item name="android:textColor">@android:color/white</item>
     </style>
 
-    <style name="Widget.Vector.Button.Destructive">
+    <style name="Widget.Vector.Button.Destructive" parent="BottomSheetButtonTextColor">
         <item name="android:minWidth">94dp</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayDestructive</item>
     </style>
@@ -24,7 +24,7 @@
         <item name="colorPrimary">?colorError</item>
     </style>
 
-    <style name="Widget.Vector.Button.Positive">
+    <style name="Widget.Vector.Button.Positive" parent="BottomSheetButtonTextColor">
         <item name="android:minWidth">94dp</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayPositive</item>
     </style>

diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
@@ -98,22 +98,21 @@
 
         <Button
             android:id="@+id/widgetPermissionDecline"
+            style="@style/Widget.Vector.Button.Destructive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
+            android:layout_marginEnd="@dimen/layout_vertical_margin"
             android:text="@string/action_decline"
-            android:background="@android:color/transparent"
-            android:textColor="?colorError"
             android:textAllCaps="true" />
 
         <Button
             android:id="@+id/widgetPermissionContinue"
+            style="@style/Widget.Vector.Button.Positive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/layout_vertical_margin"
+            android:minWidth="160dp"
             android:text="@string/_continue"
-            android:background="@android:color/transparent"
-            android:textColor="?colorPrimary"
             android:textAllCaps="true" />
 
     </LinearLayout>