style: Style the bottom sheet buttons and dividers like bottom sheet menus

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

Author: AndyScherzinger

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.kt

@@ -148,13 +148,12 @@ class OCFileListBottomSheetDialog(
             val itemHeight = context.resources.getDimensionPixelSize(R.dimen.bottom_sheet_item_height)
             val standardPadding = context.resources.getDimensionPixelSize(R.dimen.standard_padding)
             val iconSize = context.resources.getDimensionPixelSize(R.dimen.iconized_single_line_item_icon_size)
-            val startPadding = context.resources.getDimensionPixelSize(R.dimen.creator_container_start_padding)
 
             for (creator in directEditing.creators.values) {
                 val creatorButton = MaterialButton(
                     ContextThemeWrapper(
                         context,
-                        com.google.android.material.R.style.Widget_Material3_Button_IconButton
+                        R.style.ThemeOverlay_App_Button_BottomSheetItem
                     ),
                     null,
                     com.google.android.material.R.attr.materialButtonStyle
@@ -166,9 +165,7 @@ class OCFileListBottomSheetDialog(
                     )
 
                     gravity = Gravity.START or Gravity.CENTER_VERTICAL
-                    setPaddingRelative(startPadding, 0, standardPadding, 0)
-                    insetTop = 0
-                    insetBottom = 0
+                    setPaddingRelative(standardPadding, 0, standardPadding, 0)
 
                     val buttonText = String.format(
                         fileActivity.getString(R.string.editor_placeholder),

app/src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml

@@ -43,7 +43,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/menu_upload_files"
-                style="@style/Widget.Material3.Button.IconButton"
+                style="@style/Widget.App.Button.BottomSheetItem"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_item_height"
                 android:contentDescription="@string/upload_files"
@@ -61,7 +61,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/menu_upload_from_app"
-                style="@style/Widget.Material3.Button.IconButton"
+                style="@style/Widget.App.Button.BottomSheetItem"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_item_height"
                 android:contentDescription="@string/upload_content_from_other_apps"
@@ -79,7 +79,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/menu_direct_camera_upload"
-                style="@style/Widget.Material3.Button.IconButton"
+                style="@style/Widget.App.Button.BottomSheetItem"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_item_height"
                 android:contentDescription="@string/upload_direct_camera_upload"
@@ -97,7 +97,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/menu_scan_doc_upload"
-                style="@style/Widget.Material3.Button.IconButton"
+                style="@style/Widget.App.Button.BottomSheetItem"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_item_height"
                 android:contentDescription="@string/upload_scan_doc_upload"
@@ -116,7 +116,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/menu_mkdir"
-                style="@style/Widget.Material3.Button.IconButton"
+                style="@style/Widget.App.Button.BottomSheetItem"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_item_height"
                 android:contentDescription="@string/create_new_folder"
@@ -134,7 +134,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/menu_new_document"
-                style="@style/Widget.Material3.Button.IconButton"
+                style="@style/Widget.App.Button.BottomSheetItem"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_item_height"
                 android:contentDescription="@string/create_new_document"
@@ -152,7 +152,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/menu_new_spreadsheet"
-                style="@style/Widget.Material3.Button.IconButton"
+                style="@style/Widget.App.Button.BottomSheetItem"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_item_height"
                 android:contentDescription="@string/create_new_spreadsheet"
@@ -170,7 +170,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/menu_new_presentation"
-                style="@style/Widget.Material3.Button.IconButton"
+                style="@style/Widget.App.Button.BottomSheetItem"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_item_height"
                 android:contentDescription="@string/create_new_presentation"
@@ -205,13 +205,13 @@
                 android:id="@+id/menu_create_rich_workspace_divider"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/bottom_sheet_menu_item_divider_standard_margin"
+                android:layout_marginStart="@dimen/bottom_sheet_menu_item_divider_standard_margin"
                 android:layout_marginVertical="@dimen/standard_half_margin"
                 app:dividerColor="@color/list_divider_background" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/menu_create_rich_workspace"
-                style="@style/Widget.Material3.Button.IconButton"
+                style="@style/Widget.App.Button.BottomSheetItem"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/bottom_sheet_item_height"
                 android:contentDescription="@string/create_rich_workspace"

app/src/main/res/values/dims.xml

@@ -17,7 +17,7 @@
     <dimen name="action_bar_margin_top">64dp</dimen>
     <dimen name="bottom_sheet_text_start_margin">40dp</dimen>
     <dimen name="bottom_sheet_item_height">56dp</dimen>
-    <dimen name="bottom_sheet_menu_item_divider_standard_margin">80dp</dimen>
+    <dimen name="bottom_sheet_menu_item_divider_standard_margin">56dp</dimen>
     <dimen name="file_icon_size">40dp</dimen>
     <dimen name="live_photo_indicator_margin">100dp</dimen>
     <dimen name="file_icon_size_grid">128dp</dimen>
@@ -70,7 +70,6 @@
     <dimen name="file_list_item_avatar_icon_radius">10dp</dimen>
     <dimen name="account_action_layout_height">72dp</dimen>
     <dimen name="zero">0dp</dimen>
-    <dimen name="creator_container_start_padding">20dp</dimen>
     <dimen name="iconized_single_line_item_layout_height">56dp</dimen>
     <dimen name="iconized_single_line_item_icon_size">24dp</dimen>
     <dimen name="user_info_icon_horizontal_margin">24dp</dimen>

app/src/main/res/values/styles.xml

@@ -426,6 +426,18 @@
         <item name="iconPadding">0dp</item>
     </style>
 
+    <style name="Widget.App.Button.BottomSheetItem" parent="Widget.Material3.Button.TextButton.Icon">
+        <item name="cornerRadius">0dp</item>
+        <item name="android:insetTop">0dp</item>
+        <item name="android:insetBottom">0dp</item>
+        <item name="backgroundTint">@android:color/transparent</item>
+        <item name="rippleColor">?attr/colorControlHighlight</item>
+    </style>
+
+    <style name="ThemeOverlay.App.Button.BottomSheetItem" parent="Widget.Material3.Button.IconButton">
+        <item name="materialButtonStyle">@style/Widget.App.Button.BottomSheetItem</item>
+    </style>
+
     <style name="Nextcloud.Material.TextButton" parent="Widget.Material3.Button.TextButton.Icon">
         <item name="android:typeface">sans</item>
         <item name="android:textStyle">bold</item>