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

Fix magic numbers in upload_list_item.xml #12

Divay Prakash 8 жил өмнө
parent
commit
d736536547

+ 13 - 13
res/layout/upload_list_item.xml

@@ -9,7 +9,7 @@
     >
 
     <FrameLayout
-        android:layout_width="60dp"
+        android:layout_width="@dimen/upload_list_item_frame_layout_width"
         android:layout_height="@dimen/standard_list_item_size"
         android:focusable="false"
         android:focusableInTouchMode="false">
@@ -24,7 +24,7 @@
     </FrameLayout>
 
     <LinearLayout
-        android:layout_width="0dp"
+        android:layout_width="@dimen/zero"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center_vertical"
@@ -40,7 +40,7 @@
             android:singleLine="true"
             android:textColor="@color/textColor"
             android:text="@string/placeholder_filename"
-            android:textSize="16sp" />
+            android:textSize="@dimen/two_line_primary_text_size" />
 
 
         <LinearLayout
@@ -55,23 +55,23 @@
                 android:ellipsize="middle"
                 android:singleLine="true"
                 android:text="@string/placeholder_filesize"
-                android:textSize="12sp"/>
+                android:textSize="@dimen/upload_list_item_text_size"/>
             <TextView
                 android:id="@+id/upload_date"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/list_item_lastmod_and_filesize_text"
-                android:layout_marginStart="4dp"
-                android:layout_marginEnd="4dp"
+                android:layout_marginStart="@dimen/standard_quarter_margin"
+                android:layout_marginEnd="@dimen/standard_quarter_margin"
                 android:text="@string/placeholder_timestamp"
-                android:textSize="12sp"/>
+                android:textSize="@dimen/upload_list_item_text_size"/>
             <TextView
                 android:id="@+id/upload_status"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/list_item_lastmod_and_filesize_text"
                 android:text="@string/uploads_view_upload_status_succeeded"
-                android:textSize="12sp"/>
+                android:textSize="@dimen/upload_list_item_text_size"/>
 
         </LinearLayout>
 
@@ -89,7 +89,7 @@
             android:textColor="@color/list_item_lastmod_and_filesize_text"
             android:singleLine="true"
             android:text="@string/auth_username"
-            android:textSize="12dip"/>
+            android:textSize="@dimen/upload_list_item_text_size_independent"/>
 
         <TextView
             android:id="@+id/upload_remote_path"
@@ -99,7 +99,7 @@
             android:ellipsize="middle"
             android:singleLine="true"
             android:text="@string/instant_upload_path"
-            android:textSize="12dip"/>
+            android:textSize="@dimen/upload_list_item_text_size_independent"/>
 
     </LinearLayout>
 
@@ -110,13 +110,13 @@
         android:focusable="false"
         android:focusableInTouchMode="false"
         android:layout_gravity="center_vertical"
-        android:paddingLeft="8dp"
+        android:paddingLeft="@dimen/standard_half_padding"
      >
 
         <ImageButton
             android:id="@+id/upload_right_button"
-            android:layout_width="35dp"
-            android:layout_height="35dp"
+            android:layout_width="@dimen/upload_list_item_image_size"
+            android:layout_height="@dimen/upload_list_item_image_size"
             android:layout_gravity="center"
             android:background="@android:color/transparent"
      />

+ 5 - 0
res/values/dims.xml

@@ -122,4 +122,9 @@
     <dimen name="ssl_untrusted_cert_layout_padding">20dp</dimen>
 
     <dimen name="scroll_view_height">180dp</dimen>
+
+    <dimen name="upload_list_item_frame_layout_width">60dp</dimen>
+    <dimen name="upload_list_item_text_size">12sp</dimen>
+    <dimen name="upload_list_item_text_size_independent">12dip</dimen>
+    <dimen name="upload_list_item_image_size">35dp</dimen>
 </resources>