Browse Source

unify bottom sheet items to 56dp m3 item heights

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 2 years ago
parent
commit
e10a28b893

+ 12 - 16
app/src/main/res/layout/file_details_sharing_menu_bottom_sheet_fragment.xml

@@ -25,15 +25,16 @@
     android:layout_width="match_parent"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:orientation="vertical"
+    android:paddingTop="@dimen/dialog_padding"
     android:background="@color/bg_default">
     android:background="@color/bg_default">
 
 
     <LinearLayout
     <LinearLayout
         android:id="@+id/menu_share_advanced_permissions"
         android:id="@+id/menu_share_advanced_permissions"
         android:layout_width="match_parent"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="@dimen/minimum_size_for_touchable_area"
+        android:layout_height="@dimen/bottom_sheet_item_height"
         android:background="?android:attr/selectableItemBackground"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
         android:orientation="horizontal"
+        android:layout_gravity="center_vertical"
         android:paddingLeft="@dimen/standard_padding"
         android:paddingLeft="@dimen/standard_padding"
         android:paddingTop="@dimen/standard_half_padding"
         android:paddingTop="@dimen/standard_half_padding"
         android:paddingRight="@dimen/standard_padding"
         android:paddingRight="@dimen/standard_padding"
@@ -53,7 +54,7 @@
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="@dimen/standard_margin"
+            android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
             android:text="@string/share_settings"
             android:text="@string/share_settings"
             android:textColor="@color/text_color"
             android:textColor="@color/text_color"
             android:textSize="@dimen/bottom_sheet_text_size" />
             android:textSize="@dimen/bottom_sheet_text_size" />
@@ -63,8 +64,7 @@
     <LinearLayout
     <LinearLayout
         android:id="@+id/menu_share_send_new_email"
         android:id="@+id/menu_share_send_new_email"
         android:layout_width="match_parent"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="@dimen/minimum_size_for_touchable_area"
+        android:layout_height="@dimen/bottom_sheet_item_height"
         android:background="?android:attr/selectableItemBackground"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
         android:orientation="horizontal"
         android:paddingLeft="@dimen/standard_padding"
         android:paddingLeft="@dimen/standard_padding"
@@ -86,7 +86,7 @@
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="@dimen/standard_margin"
+            android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
             android:text="@string/share_send_new_email"
             android:text="@string/share_send_new_email"
             android:textColor="@color/text_color"
             android:textColor="@color/text_color"
             android:textSize="@dimen/bottom_sheet_text_size" />
             android:textSize="@dimen/bottom_sheet_text_size" />
@@ -96,8 +96,7 @@
     <LinearLayout
     <LinearLayout
         android:id="@+id/menu_share_send_link"
         android:id="@+id/menu_share_send_link"
         android:layout_width="match_parent"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="@dimen/minimum_size_for_touchable_area"
+        android:layout_height="@dimen/bottom_sheet_item_height"
         android:background="?android:attr/selectableItemBackground"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
         android:orientation="horizontal"
         android:paddingLeft="@dimen/standard_padding"
         android:paddingLeft="@dimen/standard_padding"
@@ -121,7 +120,7 @@
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="@dimen/standard_margin"
+            android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
             android:text="@string/share_via_link_send_link_label"
             android:text="@string/share_via_link_send_link_label"
             android:textColor="@color/text_color"
             android:textColor="@color/text_color"
             android:textSize="@dimen/bottom_sheet_text_size" />
             android:textSize="@dimen/bottom_sheet_text_size" />
@@ -131,8 +130,7 @@
     <LinearLayout
     <LinearLayout
         android:id="@+id/menu_share_unshare"
         android:id="@+id/menu_share_unshare"
         android:layout_width="match_parent"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="@dimen/minimum_size_for_touchable_area"
+        android:layout_height="@dimen/bottom_sheet_item_height"
         android:background="?android:attr/selectableItemBackground"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
         android:orientation="horizontal"
         android:paddingLeft="@dimen/standard_padding"
         android:paddingLeft="@dimen/standard_padding"
@@ -154,7 +152,7 @@
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="@dimen/standard_margin"
+            android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
             android:text="@string/delete_link"
             android:text="@string/delete_link"
             android:textColor="@color/text_color"
             android:textColor="@color/text_color"
             android:textSize="@dimen/bottom_sheet_text_size" />
             android:textSize="@dimen/bottom_sheet_text_size" />
@@ -164,8 +162,7 @@
     <LinearLayout
     <LinearLayout
         android:id="@+id/menu_share_add_another_link"
         android:id="@+id/menu_share_add_another_link"
         android:layout_width="match_parent"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="@dimen/minimum_size_for_touchable_area"
+        android:layout_height="@dimen/bottom_sheet_item_height"
         android:background="?android:attr/selectableItemBackground"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
         android:orientation="horizontal"
         android:paddingLeft="@dimen/standard_padding"
         android:paddingLeft="@dimen/standard_padding"
@@ -189,12 +186,11 @@
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="@dimen/standard_margin"
+            android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
             android:text="@string/add_another_public_share_link"
             android:text="@string/add_another_public_share_link"
             android:textColor="@color/text_color"
             android:textColor="@color/text_color"
             android:textSize="@dimen/bottom_sheet_text_size" />
             android:textSize="@dimen/bottom_sheet_text_size" />
 
 
     </LinearLayout>
     </LinearLayout>
 
 
-
 </LinearLayout>
 </LinearLayout>

+ 1 - 1
app/src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml

@@ -17,10 +17,10 @@
   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
     android:orientation="vertical">
 
 
     <TextView
     <TextView

+ 5 - 3
app/src/main/res/layout/item_quick_share_permissions.xml

@@ -21,8 +21,10 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="@dimen/standard_padding">
+    android:layout_height="@dimen/bottom_sheet_item_height"
+    android:background="?android:attr/selectableItemBackground"
+    android:paddingStart="@dimen/standard_padding"
+    android:paddingEnd="@dimen/standard_padding">
 
 
     <ImageView
     <ImageView
         android:id="@+id/tv_quick_share_check_icon"
         android:id="@+id/tv_quick_share_check_icon"
@@ -40,7 +42,7 @@
         android:layout_width="0dp"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_gravity="center_vertical"
-        android:layout_marginStart="@dimen/standard_margin"
+        android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
         android:text="@string/link_share_view_only"
         android:text="@string/link_share_view_only"
         android:textColor="@color/text_color"
         android:textColor="@color/text_color"
         android:textSize="@dimen/bottom_sheet_text_size"
         android:textSize="@dimen/bottom_sheet_text_size"

+ 1 - 1
app/src/main/res/layout/profile_bottom_sheet_fragment.xml

@@ -19,7 +19,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="@dimen/bottom_sheet_item_height"
     android:orientation="vertical">
     android:orientation="vertical">
 
 
     <LinearLayout
     <LinearLayout