From 29d4916a2e9d2f22df02809a28d03f384f9fdf28 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 22 Jun 2022 15:04:02 +0200
Subject: [PATCH] Cleanup of #5187 (#6326)

Update design and behaviour on widget permission bottom sheet
---
 changelog.d/6326.bugfix                                   | 1 +
 .../ui-styles/src/main/res/values/styles_bottom_sheet.xml | 8 +++++++-
 library/ui-styles/src/main/res/values/styles_buttons.xml  | 2 +-
 .../widgets/permissions/RoomWidgetPermissionActions.kt    | 1 -
 .../permissions/RoomWidgetPermissionBottomSheet.kt        | 3 ++-
 .../widgets/permissions/RoomWidgetPermissionViewModel.kt  | 1 -
 .../res/layout/bottom_sheet_room_widget_permission.xml    | 2 +-
 7 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 changelog.d/6326.bugfix

diff --git a/changelog.d/6326.bugfix b/changelog.d/6326.bugfix
new file mode 100644
index 0000000000..c09dd8fec1
--- /dev/null
+++ b/changelog.d/6326.bugfix
@@ -0,0 +1 @@
+Update design and behaviour on widget permission bottom sheet
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 9f17342ede..f6c30040d9 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
@@ -4,10 +4,13 @@
     <!-- BottomSheet theming -->
     <style name="Theme.Vector.BottomSheetDialog.Light" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
         <item name="colorPrimary">@color/element_accent_light</item>
+        <item name="colorOnPrimary">@color/palette_white</item>
         <item name="colorSecondary">@color/palette_element_green</item>
+        <item name="colorOnSecondary">@color/palette_white</item>
         <item name="colorSurface">@color/element_background_light</item>
         <item name="colorOnSurface">@color/element_content_primary_light</item>
         <item name="colorError">@color/element_alert_light</item>
+        <item name="colorOnError">@color/palette_white</item>
         <!-- Default color for text View -->
         <item name="android:textColorTertiary">@color/element_content_primary_light</item>
         <item name="android:textColorLink">@color/element_link_light</item>
@@ -15,10 +18,13 @@
 
     <style name="Theme.Vector.BottomSheetDialog.Dark" parent="Theme.MaterialComponents.BottomSheetDialog">
         <item name="colorPrimary">@color/element_accent_dark</item>
+        <item name="colorOnPrimary">@color/palette_white</item>
         <item name="colorSecondary">@color/palette_element_green</item>
+        <item name="colorOnSecondary">@color/palette_white</item>
         <item name="colorSurface">@color/element_background_dark</item>
         <item name="colorOnSurface">@color/element_content_primary_dark</item>
         <item name="colorError">@color/element_alert_dark</item>
+        <item name="colorOnError">@color/palette_white</item>
         <!-- Default color for text View -->
         <item name="android:textColorTertiary">@color/element_content_primary_dark</item>
         <item name="android:textColorLink">@color/element_link_dark</item>
@@ -59,4 +65,4 @@
         <item name="android:textSize">12sp</item>
     </style>
 
-</resources>
\ No newline at end of file
+</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
index 004aca5aaa..c8dcacb8ed 100644
--- a/library/ui-styles/src/main/res/values/styles_buttons.xml
+++ b/library/ui-styles/src/main/res/values/styles_buttons.xml
@@ -65,4 +65,4 @@
         <item name="colorPrimary">?colorOnPrimary</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionActions.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionActions.kt
index ae02707b50..5ba3990cda 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionActions.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionActions.kt
@@ -21,5 +21,4 @@ import im.vector.app.core.platform.VectorViewModelAction
 sealed class RoomWidgetPermissionActions : VectorViewModelAction {
     object AllowWidget : RoomWidgetPermissionActions()
     object BlockWidget : RoomWidgetPermissionActions()
-    object DoClose : RoomWidgetPermissionActions()
 }
diff --git a/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt
index 91371b1f73..a917b6699d 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt
@@ -102,8 +102,9 @@ class RoomWidgetPermissionBottomSheet :
     }
 
     override fun onCancel(dialog: DialogInterface) {
+        viewModel.handle(RoomWidgetPermissionActions.BlockWidget)
+        directListener?.invoke(false)
         super.onCancel(dialog)
-        viewModel.handle(RoomWidgetPermissionActions.DoClose)
     }
 
     companion object {
diff --git a/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt
index 55f40b6e4d..e9f16baf9d 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt
@@ -95,7 +95,6 @@ class RoomWidgetPermissionViewModel @AssistedInject constructor(
         when (action) {
             RoomWidgetPermissionActions.AllowWidget -> handleAllowWidget()
             RoomWidgetPermissionActions.BlockWidget -> handleRevokeWidget()
-            RoomWidgetPermissionActions.DoClose -> Unit
         }
     }
 
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
index 4e5e8392c4..27643bcda0 100644
--- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
+++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
@@ -92,7 +92,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/layout_vertical_margin_big"
+        android:layout_marginTop="@dimen/layout_vertical_margin"
         android:gravity="end"
         android:orientation="horizontal">