Эх сурвалжийг харах

Merge pull request #1760 from nextcloud/fix-1743

Enlarge hitbox size of file list items
Mario Đanić 7 жил өмнө
parent
commit
dea32bf6a8

+ 1 - 1
scripts/lint/lint-results.txt

@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 460 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 447 warnings</span>

+ 28 - 17
src/main/res/layout/list_item.xml

@@ -28,7 +28,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:baselineAligned="false">
 
         <RelativeLayout
             android:layout_width="72dp"
@@ -90,8 +91,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginLeft="@dimen/zero"
-                android:layout_marginRight="@dimen/standard_quarter_margin"
                 android:ellipsize="middle"
                 android:singleLine="true"
                 android:text="@string/placeholder_filename"
@@ -101,8 +100,6 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/zero"
-                android:layout_marginRight="@dimen/standard_quarter_margin"
                 android:orientation="horizontal">
 
                 <TextView
@@ -118,7 +115,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingRight="@dimen/standard_quarter_padding"
-                    android:gravity="right"
+                    android:paddingEnd="@dimen/standard_quarter_padding"
+                    android:paddingLeft="@dimen/zero"
+                    android:paddingStart="@dimen/zero"
+                    android:gravity="end"
                     android:text="@string/info_separator"
                     android:textColor="@color/list_item_lastmod_and_filesize_text"
                     android:textSize="@dimen/two_line_secondary_text_size"/>
@@ -127,7 +127,7 @@
                     android:id="@+id/last_mod"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="right"
+                    android:gravity="end"
                     android:text="@string/placeholder_media_time"
                     android:textColor="@color/list_item_lastmod_and_filesize_text"
                     android:textSize="@dimen/two_line_secondary_text_size"/>
@@ -140,16 +140,20 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:paddingLeft="@dimen/alternate_padding"
-            android:paddingRight="@dimen/alternate_padding">
+            android:paddingLeft="@dimen/standard_half_padding"
+            android:paddingStart="@dimen/standard_half_padding"
+            android:paddingRight="@dimen/zero"
+            android:paddingEnd="@dimen/zero">
 
             <ImageView
                 android:id="@+id/sharedIcon"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_centerVertical="true"
-                android:layout_marginRight="@dimen/list_item_share_right_margin"
-                android:padding="@dimen/standard_quarter_padding"
+                android:paddingRight="@dimen/list_item_share_right_margin"
+                android:paddingEnd="@dimen/list_item_share_right_margin"
+                android:paddingLeft="@dimen/standard_half_padding"
+                android:paddingStart="@dimen/standard_half_padding"
                 android:clickable="true"
                 android:focusable="true"
                 android:src="@drawable/ic_unshared" />
@@ -157,11 +161,14 @@
             <ImageView
                 android:id="@+id/custom_checkbox"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_centerVertical="true"
-                android:layout_marginLeft="@dimen/standard_half_margin"
-                android:layout_marginRight="@dimen/standard_half_margin"
+                android:paddingLeft="@dimen/standard_half_padding"
+                android:paddingStart="@dimen/standard_half_padding"
+                android:paddingRight="@dimen/alternate_padding"
+                android:paddingEnd="@dimen/alternate_padding"
                 android:layout_toRightOf="@id/sharedIcon"
+                android:layout_toEndOf="@id/sharedIcon"
                 android:clickable="true"
                 android:focusable="true"
                 android:src="@drawable/ic_checkbox_blank_outline" />
@@ -169,10 +176,14 @@
             <ImageView
                 android:id="@+id/overflow_menu"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_centerVertical="true"
-                android:layout_marginLeft="@dimen/standard_half_margin"
+                android:paddingLeft="@dimen/standard_half_padding"
+                android:paddingStart="@dimen/standard_half_padding"
                 android:layout_toRightOf="@id/custom_checkbox"
+                android:layout_toEndOf="@id/custom_checkbox"
+                android:paddingRight="@dimen/alternate_padding"
+                android:paddingEnd="@dimen/alternate_padding"
                 android:clickable="true"
                 android:focusable="true"
                 android:src="@drawable/ic_dots_vertical" />

+ 1 - 1
src/main/res/values/dims.xml

@@ -47,7 +47,7 @@
     <dimen name="two_line_secondary_text_size">14sp</dimen>
     <dimen name="list_item_avatar_icon_margin">20dp</dimen>
     <dimen name="list_item_avatar_text_margin">20dp</dimen>
-    <dimen name="list_item_share_right_margin">10dp</dimen>
+    <dimen name="list_item_share_right_margin">12dp</dimen>
     <dimen name="account_action_layout_height">72dp</dimen>
     <dimen name="zero">0dp</dimen>
     <dimen name="account_item_layout_height">72dp</dimen>