adapt bottom sheet items to m3

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

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

@@ -22,7 +22,6 @@ package com.owncloud.android.ui.fragment;
 
 import android.os.Bundle;
 import android.view.View;
-import android.view.ViewGroup;
 
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
@@ -83,10 +82,6 @@ public class OCFileListBottomSheetDialog extends BottomSheetDialog implements In
         binding = FileListActionsBottomSheetFragmentBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
-        if (getWindow() != null) {
-            getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-        }
-
         viewThemeUtils.platform.themeDialog(binding.getRoot());
 
         viewThemeUtils.platform.colorImageView(binding.menuIconUploadFiles);
@@ -160,19 +155,19 @@ public class OCFileListBottomSheetDialog extends BottomSheetDialog implements In
             // != "": info set -> hide button
             if (file.getRichWorkspace() == null || !"".equals(file.getRichWorkspace())) {
                 binding.menuCreateRichWorkspace.setVisibility(View.GONE);
+                binding.menuCreateRichWorkspaceDivider.setVisibility(View.GONE);
             } else {
                 binding.menuCreateRichWorkspace.setVisibility(View.VISIBLE);
+                binding.menuCreateRichWorkspaceDivider.setVisibility(View.VISIBLE);
             }
         } else {
             binding.menuCreateRichWorkspace.setVisibility(View.GONE);
+            binding.menuCreateRichWorkspaceDivider.setVisibility(View.GONE);
         }
 
         setupClickListener();
 
-        setOnShowListener(d ->
-                              BottomSheetBehavior.from((View) binding.getRoot().getParent())
-                                  .setPeekHeight(binding.getRoot().getMeasuredHeight())
-                         );
+        setOnShowListener(d -> getBehavior().setState(BottomSheetBehavior.STATE_COLLAPSED));
     }
 
     private void setupClickListener() {

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

@@ -22,20 +22,22 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/creator_container"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
+    android:layout_height="@dimen/bottom_sheet_item_height"
     android:background="?android:attr/selectableItemBackground"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
     android:paddingLeft="@dimen/standard_padding"
-    android:paddingTop="@dimen/standard_half_padding"
     android:paddingRight="@dimen/standard_padding"
-    android:paddingBottom="@dimen/standard_half_padding"
     tools:ignore="UseCompoundDrawables">
 
     <ImageView
         android:id="@+id/creator_thumbnail"
         android:layout_width="24dp"
         android:layout_height="24dp"
+        android:layout_marginTop="@dimen/standard_margin"
+        android:layout_marginBottom="@dimen/standard_margin"
         android:contentDescription="@null"
         android:src="@drawable/file_ppt" />
 
@@ -44,7 +46,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginStart="@dimen/standard_margin"
+        android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
         android:text="@string/create_new_presentation"
         android:textColor="@color/text_color"
         android:textSize="@dimen/bottom_sheet_text_size" />

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

@@ -35,9 +35,10 @@
     <LinearLayout
         android:id="@+id/menu_upload_files"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/bottom_sheet_item_height"
         android:orientation="horizontal"
         android:background="?android:attr/selectableItemBackground"
+        android:gravity="center_vertical"
         android:paddingLeft="@dimen/standard_padding"
         android:paddingTop="@dimen/standard_half_padding"
         android:paddingRight="@dimen/standard_padding"
@@ -56,7 +57,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="@dimen/standard_margin"
+            android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
             android:text="@string/upload_files"
             android:textColor="@color/text_color"
             android:textSize="@dimen/bottom_sheet_text_size" />
@@ -66,9 +67,10 @@
     <LinearLayout
         android:id="@+id/menu_upload_from_app"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/bottom_sheet_item_height"
         android:orientation="horizontal"
         android:background="?android:attr/selectableItemBackground"
+        android:gravity="center_vertical"
         android:paddingLeft="@dimen/standard_padding"
         android:paddingTop="@dimen/standard_half_padding"
         android:paddingRight="@dimen/standard_padding"
@@ -87,7 +89,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="@dimen/standard_margin"
+            android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
             android:text="@string/upload_content_from_other_apps"
             android:textColor="@color/text_color"
             android:textSize="@dimen/bottom_sheet_text_size" />
@@ -97,9 +99,10 @@
     <LinearLayout
         android:id="@+id/menu_direct_camera_upload"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/bottom_sheet_item_height"
         android:orientation="horizontal"
         android:background="?android:attr/selectableItemBackground"
+        android:gravity="center_vertical"
         android:paddingLeft="@dimen/standard_padding"
         android:paddingTop="@dimen/standard_half_padding"
         android:paddingRight="@dimen/standard_padding"
@@ -118,7 +121,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="@dimen/standard_margin"
+            android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
             android:text="@string/upload_direct_camera_upload"
             android:textColor="@color/text_color"
             android:textSize="@dimen/bottom_sheet_text_size" />
@@ -128,8 +131,9 @@
     <LinearLayout
         android:id="@+id/menu_scan_doc_upload"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/bottom_sheet_item_height"
         android:background="?android:attr/selectableItemBackground"
+        android:gravity="center_vertical"
         android:orientation="horizontal"
         android:paddingLeft="@dimen/standard_padding"
         android:paddingTop="@dimen/standard_half_padding"
@@ -149,28 +153,19 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="@dimen/standard_margin"
+            android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
             android:text="@string/upload_scan_doc_upload"
             android:textColor="@color/text_color"
             android:textSize="@dimen/bottom_sheet_text_size" />
     </LinearLayout>
 
-    <View
-        android:id="@+id/divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/bottom_sheet_menu_item_divider_standard_margin"
-        android:layout_marginTop="@dimen/standard_half_margin"
-        android:layout_marginEnd="@dimen/standard_margin"
-        android:layout_marginBottom="@dimen/standard_half_margin"
-        android:background="@color/list_divider_background" />
-
     <LinearLayout
         android:id="@+id/menu_mkdir"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/bottom_sheet_item_height"
         android:orientation="horizontal"
         android:background="?android:attr/selectableItemBackground"
+        android:gravity="center_vertical"
         android:paddingLeft="@dimen/standard_padding"
         android:paddingTop="@dimen/standard_half_padding"
         android:paddingRight="@dimen/standard_padding"
@@ -189,35 +184,28 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="@dimen/standard_margin"
+            android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
             android:text="@string/create_new_folder"
             android:textColor="@color/text_color"
             android:textSize="@dimen/bottom_sheet_text_size" />
 
     </LinearLayout>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/bottom_sheet_menu_item_divider_standard_margin"
-        android:layout_marginTop="@dimen/standard_half_margin"
-        android:layout_marginEnd="@dimen/standard_margin"
-        android:layout_marginBottom="@dimen/standard_half_margin"
-        android:background="@color/list_divider_background" />
-
     <LinearLayout
         android:id="@+id/templates"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:visibility="gone">
+        android:visibility="gone"
+        tools:visibility="visible">
 
         <LinearLayout
             android:id="@+id/menu_new_document"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/bottom_sheet_item_height"
             android:orientation="horizontal"
             android:background="?android:attr/selectableItemBackground"
+            android:gravity="center_vertical"
             android:paddingLeft="@dimen/standard_padding"
             android:paddingTop="@dimen/standard_half_padding"
             android:paddingRight="@dimen/standard_padding"
@@ -235,7 +223,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginStart="@dimen/standard_margin"
+                android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
                 android:text="@string/create_new_document"
                 android:textColor="@color/text_color"
                 android:textSize="@dimen/bottom_sheet_text_size" />
@@ -244,9 +232,10 @@
         <LinearLayout
             android:id="@+id/menu_new_spreadsheet"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/bottom_sheet_item_height"
             android:orientation="horizontal"
             android:background="?android:attr/selectableItemBackground"
+            android:gravity="center_vertical"
             android:paddingLeft="@dimen/standard_padding"
             android:paddingTop="@dimen/standard_half_padding"
             android:paddingRight="@dimen/standard_padding"
@@ -264,7 +253,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginStart="@dimen/standard_margin"
+                android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
                 android:text="@string/create_new_spreadsheet"
                 android:textColor="@color/text_color"
                 android:textSize="@dimen/bottom_sheet_text_size" />
@@ -273,9 +262,10 @@
         <LinearLayout
             android:id="@+id/menu_new_presentation"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/bottom_sheet_item_height"
             android:orientation="horizontal"
             android:background="?android:attr/selectableItemBackground"
+            android:gravity="center_vertical"
             android:paddingLeft="@dimen/standard_padding"
             android:paddingTop="@dimen/standard_half_padding"
             android:paddingRight="@dimen/standard_padding"
@@ -293,20 +283,18 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginStart="@dimen/standard_margin"
+                android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
                 android:text="@string/create_new_presentation"
                 android:textColor="@color/text_color"
                 android:textSize="@dimen/bottom_sheet_text_size" />
         </LinearLayout>
 
-        <View
+        <LinearLayout
+            android:id="@+id/creators"
             android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginStart="@dimen/bottom_sheet_menu_item_divider_standard_margin"
-            android:layout_marginTop="@dimen/standard_half_margin"
-            android:layout_marginEnd="@dimen/standard_margin"
-            android:layout_marginBottom="@dimen/standard_half_margin"
-            android:background="@color/list_divider_background" />
+            android:layout_height="wrap_content"
+            android:orientation="vertical"></LinearLayout>
+
     </LinearLayout>
 
     <LinearLayout
@@ -314,35 +302,28 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:visibility="gone">
-
-        <LinearLayout
-            android:id="@+id/creators"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginStart="@dimen/bottom_sheet_menu_item_divider_standard_margin"
-            android:layout_marginTop="@dimen/standard_half_margin"
-            android:layout_marginEnd="@dimen/standard_margin"
-            android:layout_marginBottom="@dimen/standard_half_margin"
-            android:background="@color/list_divider_background" />
+        android:visibility="gone"
+        tools:visibility="visible">
     </LinearLayout>
 
+    <View
+        android:id="@+id/menu_create_rich_workspace_divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginStart="@dimen/bottom_sheet_menu_item_divider_standard_margin"
+        android:layout_marginTop="@dimen/standard_half_margin"
+        android:layout_marginBottom="@dimen/standard_half_margin"
+        android:background="@color/list_divider_background" />
+
     <LinearLayout
         android:id="@+id/menu_create_rich_workspace"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/bottom_sheet_item_height"
         android:orientation="horizontal"
         android:background="?android:attr/selectableItemBackground"
+        android:gravity="center_vertical"
         android:paddingLeft="@dimen/standard_padding"
-        android:paddingTop="@dimen/standard_half_padding"
         android:paddingRight="@dimen/standard_padding"
-        android:paddingBottom="@dimen/standard_padding"
         tools:ignore="UseCompoundDrawables">
 
         <ImageView
@@ -357,7 +338,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="@dimen/standard_margin"
+            android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
             android:text="@string/create_rich_workspace"
             android:textColor="@color/text_color"
             android:textSize="@dimen/bottom_sheet_text_size"

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

@@ -20,7 +20,9 @@
     <dimen name="nav_drawer_header_height">164dp</dimen>
     <dimen name="nav_drawer_menu_avatar_radius">12sp</dimen>
     <dimen name="list_item_avatar_icon_radius">20dp</dimen>
-    <dimen name="bottom_sheet_menu_item_divider_standard_margin">56dp</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="file_icon_size">40dp</dimen>
     <dimen name="file_icon_size_grid">128dp</dimen>
     <dimen name="file_icon_rounded_corner_radius">8dp</dimen>