Переглянути джерело

Replace hard-coded dimensions by android resource values

There were a number of hard-coded dimensions present in the layout
resource files which have now been replaced by android resource
values present in dims.xml.
arundhati24 7 роки тому
батько
коміт
c3bfcc5e61

+ 8 - 8
src/main/res/layout/account_item.xml

@@ -39,12 +39,12 @@
             android:layout_width="@dimen/user_icon_size"
             android:layout_height="@dimen/user_icon_size"
             android:layout_gravity="top|start"
-            android:layout_marginBottom="1dp"
-            android:layout_marginLeft="12dp"
-            android:layout_marginStart="12dp"
-            android:layout_marginRight="1dp"
-            android:layout_marginEnd="1dp"
-            android:layout_marginTop="1dp"
+            android:layout_marginBottom="@dimen/account_item_layout_user_image_margin"
+            android:layout_marginLeft="@dimen/account_item_layout_user_image_left_start_margin"
+            android:layout_marginStart="@dimen/account_item_layout_user_image_left_start_margin"
+            android:layout_marginRight="@dimen/account_item_layout_user_image_margin"
+            android:layout_marginEnd="@dimen/account_item_layout_user_image_margin"
+            android:layout_marginTop="@dimen/account_item_layout_user_image_margin"
             android:src="@drawable/folder"
             android:contentDescription="@string/avatar"/>
 
@@ -74,7 +74,7 @@
             android:layout_marginLeft="@dimen/standard_half_margin"
             android:layout_marginRight="@dimen/standard_half_margin"
             android:layout_marginStart="@dimen/standard_margin"
-            android:layout_marginTop="4dp"
+            android:layout_marginTop="@dimen/standard_quarter_margin"
             android:ellipsize="end"
             android:gravity="bottom"
             android:maxLines="1"
@@ -85,7 +85,7 @@
             android:id="@+id/account"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
+            android:layout_marginBottom="@dimen/standard_quarter_margin"
             android:layout_marginEnd="@dimen/standard_half_margin"
             android:layout_marginLeft="@dimen/standard_half_margin"
             android:layout_marginRight="@dimen/standard_half_margin"

+ 7 - 7
src/main/res/layout/activity_list_item.xml

@@ -30,11 +30,11 @@
 
     <ImageView
         android:id="@+id/activity_icon"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
+        android:layout_width="@dimen/activity_icon_width"
+        android:layout_height="@dimen/activity_icon_height"
         android:layout_alignParentTop="true"
-        android:layout_marginRight="24dp"
-        android:layout_marginEnd="24dp"
+        android:layout_marginRight="@dimen/activity_icon_layout_right_end_margin"
+        android:layout_marginEnd="@dimen/activity_icon_layout_right_end_margin"
         android:alpha="0.5"
         android:src="@drawable/ic_activity"
         android:contentDescription="@string/activity_icon"/>
@@ -67,9 +67,9 @@
             android:id="@+id/list"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:layout_marginLeft="-3dp"
-            android:layout_marginStart="-3dp"
+            android:layout_marginTop="@dimen/alternate_half_margin"
+            android:layout_marginLeft="@dimen/activity_list_item_grid_layout_left_start_margin"
+            android:layout_marginStart="@dimen/activity_list_item_grid_layout_left_start_margin"
             android:columnCount="3" />
 
         <TextView

+ 1 - 1
src/main/res/layout/activity_list_item_header.xml

@@ -11,6 +11,6 @@
         android:layout_marginStart="@dimen/standard_list_item_size"
         android:layout_marginTop="10dp"
         android:text="@string/placeholder_filename"
-        android:textSize="20sp"/>
+        android:textSize="@dimen/activity_list_item_title_header_text_size"/>
 
 </LinearLayout>

+ 4 - 4
src/main/res/layout/activity_list_layout.xml

@@ -52,9 +52,9 @@
                     android:id="@android:id/list"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginBottom="-3dp"
-                    android:layout_marginLeft="-3dp"
-                    android:layout_marginRight="-3dp"
+                    android:layout_marginBottom="@dimen/activity_list_layout_recycler_view_margin"
+                    android:layout_marginLeft="@dimen/activity_list_layout_recycler_view_margin"
+                    android:layout_marginRight="@dimen/activity_list_layout_recycler_view_margin"
                     android:clipToPadding="false"
                     android:scrollbarStyle="outsideOverlay"
                     android:scrollbars="vertical"
@@ -90,7 +90,7 @@
 
     <include
         layout="@layout/drawer"
-        android:layout_width="240dp"
+        android:layout_width="@dimen/drawer_width"
         android:layout_height="match_parent"
         android:layout_gravity="start"/>
 

+ 1 - 1
src/main/res/layout/activity_row.xml

@@ -19,7 +19,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@+id/list_item"
 	android:layout_width="match_parent"
-	android:layout_height="48dp"
+	android:layout_height="@dimen/activity_row_layout_height"
 	android:background="?android:attr/activatedBackgroundIndicator"
 	android:minWidth="@dimen/activity_row_layout_min_width_independent"
 	android:orientation="horizontal"

+ 1 - 1
src/main/res/layout/contactlist_fragment.xml

@@ -45,7 +45,7 @@
 
             <ImageView
                 android:layout_width="match_parent"
-                android:layout_height="1dp"
+                android:layout_height="@dimen/uploader_list_separator_height"
                 android:src="@drawable/uploader_list_separator"
                 android:contentDescription="@null"/>
 

+ 3 - 3
src/main/res/layout/contactlist_list_item.xml

@@ -24,9 +24,9 @@
 
     <ImageView
         android:id="@+id/contactlist_item_icon"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_margin="16dp"
+        android:layout_width="@dimen/contactlist_item_icon_layout_width"
+        android:layout_height="@dimen/contactlist_item_icon_layout_height"
+        android:layout_margin="@dimen/standard_margin"
         android:scaleType="centerCrop"
         android:src="@drawable/ic_user"
         android:contentDescription="@string/contactlist_item_icon"/>

+ 2 - 2
src/main/res/layout/drawer.xml

@@ -50,7 +50,7 @@
                 android:id="@+id/drawer_quota_link"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:drawablePadding="5dp"
+                android:drawablePadding="@dimen/alternate_half_padding"
                 />
 
             <ProgressBar
@@ -67,7 +67,7 @@
                 android:id="@+id/drawer_quota_percentage"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:drawablePadding="5dp"
+                android:drawablePadding="@dimen/alternate_half_padding"
                 android:text="@string/drawer_quota"/>
 
         </LinearLayout>

+ 4 - 4
src/main/res/layout/empty_list.xml

@@ -30,16 +30,16 @@
 
     <ImageView
         android:id="@+id/empty_list_icon"
-        android:layout_width="72dp"
-        android:layout_height="72dp"
+        android:layout_width="@dimen/empty_list_icon_layout_width"
+        android:layout_height="@dimen/empty_list_icon_layout_height"
         android:contentDescription="@string/file_list_folder"
         android:src="@drawable/ic_list_empty_folder"
         android:visibility="gone"/>
 
     <ProgressBar
         android:id="@+id/empty_list_progress"
-        android:layout_width="72dp"
-        android:layout_height="72dp"
+        android:layout_width="@dimen/empty_list_progress_layout_width"
+        android:layout_height="@dimen/empty_list_progress_layout_height"
         android:layout_gravity="center_horizontal"/>
 
     <TextView

+ 4 - 4
src/main/res/layout/file_details_fragment.xml

@@ -138,7 +138,7 @@
                     android:id="@+id/fdProgressText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
+                    android:layout_marginTop="@dimen/standard_half_margin"
                     android:text="@string/downloader_download_in_progress_ticker"/>
 
                 <LinearLayout
@@ -207,8 +207,8 @@
                 <ImageView
                     android:contentDescription="@string/shared_icon"
                     android:id="@+id/fdShareLinkIcon"
-                    android:layout_width="14sp"
-                    android:layout_height="14sp"
+                    android:layout_width="@dimen/shared_list_icon_width"
+                    android:layout_height="@dimen/shared_list_icon_height"
                     android:layout_gravity="center_vertical"
                     android:layout_marginEnd="@dimen/standard_half_margin"
                     android:layout_marginRight="@dimen/standard_half_margin"
@@ -246,7 +246,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/share_no_users"
-                android:textSize="14sp"/>
+                android:textSize="@dimen/share_no_users_text_size"/>
 
         </LinearLayout>
 

+ 4 - 4
src/main/res/layout/file_details_share_user_item.xml

@@ -23,8 +23,8 @@
 
         <ImageView
             android:id="@+id/userIcon"
-            android:layout_width="32sp"
-            android:layout_height="32sp"
+            android:layout_width="@dimen/file_details_user_icon_layout_width"
+            android:layout_height="@dimen/file_details_user_icon_layout_height"
             android:src="@drawable/ic_user"
             android:layout_gravity="center_vertical"
             android:contentDescription="@string/user_icon"/>
@@ -32,10 +32,10 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textSize="16sp"
+            android:textSize="@dimen/file_details_username_text_size"
             android:text="@string/username"
             android:id="@+id/userOrGroupName"
-            android:layout_margin="12dp"
+            android:layout_margin="@dimen/file_details_username_layout_text_margin"
             android:singleLine="true"
             android:ellipsize="middle"
             android:textColor="@color/black"/>

+ 3 - 3
src/main/res/layout/fingerprintlock.xml

@@ -46,16 +46,16 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
-            android:padding="8dp"
+            android:padding="@dimen/standard_half_padding"
             android:text="@string/fingerprint_scan_finger"
             android:textColor="@android:color/black"
-            android:textSize="32sp"/>
+            android:textSize="@dimen/scan_fingerprint_text_size"/>
 
         <ImageView
             android:id="@+id/fingerprinticon"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:padding="16dp"
+            android:padding="@dimen/standard_padding"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_fingerprint"
             android:tint="@color/primary"

+ 10 - 10
src/main/res/layout/grid_image.xml

@@ -32,7 +32,7 @@
             android:id="@+id/thumbnail"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:padding="2dp"
+            android:padding="@dimen/standard_eigth_padding"
             android:scaleType="centerCrop"
             android:src="@drawable/folder" />
 
@@ -51,16 +51,16 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="top|end"
-            android:layout_marginTop="24dp"
-            android:layout_marginRight="4dp"
-            android:layout_marginEnd="4dp"
+            android:layout_marginTop="@dimen/grid_image_shared_icon_layout_top_margin"
+            android:layout_marginRight="@dimen/standard_quarter_margin"
+            android:layout_marginEnd="@dimen/standard_quarter_margin"
             android:src="@drawable/shared_via_link"
             android:contentDescription="@string/shared_via_link_icon" />
 
         <ImageView
             android:id="@+id/localFileIndicator"
-            android:layout_width="16dp"
-            android:layout_height="16dp"
+            android:layout_width="@dimen/grid_image_local_file_indicator_layout_width"
+            android:layout_height="@dimen/grid_image_local_file_indicator_layout_height"
             android:layout_gravity="bottom|end"
             android:layout_marginBottom="@dimen/standard_quarter_margin"
             android:layout_marginRight="@dimen/standard_quarter_margin"
@@ -71,12 +71,12 @@
 
         <ImageView
             android:id="@+id/keptOfflineIcon"
-            android:layout_width="16dp"
-            android:layout_height="16dp"
+            android:layout_width="@dimen/grid_image_kept_offline_icon_layout_width"
+            android:layout_height="@dimen/grid_image_kept_offline_icon_layout_height"
             android:layout_gravity="bottom|end"
             android:layout_marginBottom="@dimen/standard_quarter_margin"
-            android:layout_marginRight="24dp"
-            android:layout_marginEnd="24dp"
+            android:layout_marginRight="@dimen/grid_image_kept_offline_icon_layout_right_end_margin"
+            android:layout_marginEnd="@dimen/grid_image_kept_offline_icon_layout_right_end_margin"
             android:src="@drawable/ic_available_offline"
             android:contentDescription="@string/available_offline_icon" />
 

+ 9 - 9
src/main/res/layout/grid_item.xml

@@ -51,16 +51,16 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="top|end"
-            android:layout_marginTop="24dp"
-            android:layout_marginRight="4dp"
-            android:layout_marginEnd="4dp"
+            android:layout_marginTop="@dimen/grid_item_shared_icon_layout_top_margin"
+            android:layout_marginRight="@dimen/standard_quarter_margin"
+            android:layout_marginEnd="@dimen/standard_quarter_margin"
             android:src="@drawable/shared_via_link"
             android:contentDescription="@string/shared_via_link_icon"/>
 
         <ImageView
             android:id="@+id/localFileIndicator"
-            android:layout_width="16dp"
-            android:layout_height="16dp"
+            android:layout_width="@dimen/grid_item_local_file_indicator_layout_width"
+            android:layout_height="@dimen/grid_item_local_file_indicator_layout_height"
             android:layout_gravity="bottom|end"
             android:layout_marginBottom="@dimen/standard_quarter_margin"
             android:layout_marginRight="@dimen/standard_quarter_margin"
@@ -71,12 +71,12 @@
 
         <ImageView
             android:id="@+id/keptOfflineIcon"
-            android:layout_width="16dp"
-            android:layout_height="16dp"
+            android:layout_width="@dimen/grid_item_kept_offline_icon_layout_width"
+            android:layout_height="@dimen/grid_item_kept_offline_icon_layout_height"
             android:layout_gravity="bottom|end"
             android:layout_marginBottom="@dimen/standard_quarter_margin"
-            android:layout_marginRight="24dp"
-            android:layout_marginEnd="24dp"
+            android:layout_marginRight="@dimen/grid_item_kept_offline_icon_layout_right_end_margin"
+            android:layout_marginEnd="@dimen/grid_item_kept_offline_icon_layout_right_end_margin"
             android:src="@drawable/ic_available_offline"
             android:contentDescription="@string/available_offline_icon"/>
 

+ 2 - 2
src/main/res/layout/grid_sync_item.xml

@@ -56,7 +56,7 @@
             android:layout_height="wrap_content"
             android:text="@string/synced_folders_plus"
             android:textColor="#ffffff"
-            android:textSize="22sp"
+            android:textSize="@dimen/grid_sync_item_layout_next_text_size"
             android:textStyle="bold"/>
 
         <TextView
@@ -66,7 +66,7 @@
             android:src="@android:drawable/checkbox_off_background"
             android:text="@string/placeholder_fileSize"
             android:textColor="#ffffff"
-            android:textSize="22sp"
+            android:textSize="@dimen/grid_sync_item_layout_counter_text_size"
             android:textStyle="bold"/>
     </LinearLayout>
 </FrameLayout>

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

@@ -32,12 +32,12 @@
         android:baselineAligned="false">
 
         <RelativeLayout
-            android:layout_width="72dp"
+            android:layout_width="@dimen/standard_list_item_size"
             android:layout_height="@dimen/standard_list_item_size"
             android:paddingBottom="@dimen/standard_padding"
             android:paddingTop="@dimen/standard_padding"
-            android:paddingEnd="4dp"
-            android:paddingRight="4dp"
+            android:paddingEnd="@dimen/standard_quarter_padding"
+            android:paddingRight="@dimen/standard_quarter_padding"
             android:paddingStart="@dimen/zero"
             android:paddingLeft="@dimen/zero">
 
@@ -46,47 +46,47 @@
                 android:layout_width="@dimen/file_icon_size"
                 android:layout_height="@dimen/file_icon_size"
                 android:layout_centerInParent="true"
-                android:layout_marginLeft="8dp"
-                android:layout_marginStart="8dp"
+                android:layout_marginLeft="@dimen/standard_half_margin"
+                android:layout_marginStart="@dimen/standard_half_margin"
                 android:src="@drawable/folder"
                 android:contentDescription="@string/thumbnail"/>
 
             <ImageView
                 android:id="@+id/favorite_action"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
+                android:layout_width="@dimen/list_item_favorite_action_layout_width"
+                android:layout_height="@dimen/list_item_favorite_action_layout_height"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentRight="true"
                 android:layout_alignParentEnd="true"
-                android:layout_marginRight="4dp"
-                android:layout_marginEnd="4dp"
+                android:layout_marginRight="@dimen/standard_quarter_margin"
+                android:layout_marginEnd="@dimen/standard_quarter_margin"
                 android:contentDescription="@string/favorite"
                 android:src="@drawable/ic_favorite" />
 
             <ImageView
                 android:id="@+id/keptOfflineIcon"
-                android:layout_height="12dp"
-                android:layout_width="12dp"
+                android:layout_height="@dimen/list_item_kept_offline_icon_layout_height"
+                android:layout_width="@dimen/list_item_kept_offline_icon_layout_width"
                 android:layout_alignParentBottom="true"
                 android:layout_alignParentRight="true"
                 android:layout_alignParentEnd="true"
-                android:layout_marginRight="20dp"
-                android:layout_marginEnd="20dp"
+                android:layout_marginRight="@dimen/list_item_kept_offline_icon_layout_right_end_margin"
+                android:layout_marginEnd="@dimen/list_item_kept_offline_icon_layout_right_end_margin"
                 android:src="@drawable/ic_available_offline"
                 android:contentDescription="@string/available_offline_icon"/>
 
             <ImageView
                 android:id="@+id/localFileIndicator"
-                android:layout_width="12dp"
-                android:layout_height="12dp"
+                android:layout_width="@dimen/list_item_local_file_indicator_layout_width"
+                android:layout_height="@dimen/list_item_local_file_indicator_layout_height"
                 android:src="@drawable/ic_synced"
                 android:layout_alignParentBottom="true"
                 android:layout_alignParentRight="true"
                 android:layout_alignParentEnd="true"
                 android:scaleType="fitCenter"
                 android:contentDescription="@string/downloader_download_succeeded_ticker"
-                android:layout_marginRight="4dp"
-                android:layout_marginEnd="4dp"/>
+                android:layout_marginRight="@dimen/standard_quarter_margin"
+                android:layout_marginEnd="@dimen/standard_quarter_margin"/>
 
         </RelativeLayout>
 

+ 3 - 3
src/main/res/layout/preview_image_error_fragment.xml

@@ -31,8 +31,8 @@
 
     <ImageView
         android:id="@+id/preview_error_image"
-        android:layout_width="72dp"
-        android:layout_height="72dp"
+        android:layout_width="@dimen/preview_error_image_layout_width"
+        android:layout_height="@dimen/preview_error_image_layout_height"
         android:layout_gravity="center"
         android:contentDescription="@string/file_icon"
         android:src="@drawable/file_image" />
@@ -43,5 +43,5 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:text="@string/preview_sorry"
-        android:textSize="26sp" />
+        android:textSize="@dimen/preview_error_text_size" />
 </LinearLayout>

+ 11 - 11
src/main/res/layout/send_share_fragment.xml

@@ -32,13 +32,13 @@
             android:id="@+id/send_share_buttons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="24dp"
-            android:layout_marginLeft="24dp"
-            android:layout_marginRight="24dp"
-            android:layout_marginStart="24dp"
+            android:layout_marginEnd="@dimen/send_share_fragment_layout_margin"
+            android:layout_marginLeft="@dimen/send_share_fragment_layout_margin"
+            android:layout_marginRight="@dimen/send_share_fragment_layout_margin"
+            android:layout_marginStart="@dimen/send_share_fragment_layout_margin"
             android:orientation="horizontal"
             android:baselineAligned="false"
-            android:padding="24dp">
+            android:padding="@dimen/send_share_fragment_layout_padding">
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -53,12 +53,12 @@
                 android:layout_gravity="center_horizontal"
                 android:contentDescription="@string/share"
                 android:src="@drawable/shared_via_users"
-                android:paddingTop="12dp"
-                android:paddingRight="12dp"
-                android:paddingEnd="12dp"
-                android:paddingBottom="12dp"
-                android:paddingLeft="8dp"
-                android:paddingStart="8dp"
+                android:paddingTop="@dimen/share_people_icon_layout_padding"
+                android:paddingRight="@dimen/share_people_icon_layout_padding"
+                android:paddingEnd="@dimen/share_people_icon_layout_padding"
+                android:paddingBottom="@dimen/share_people_icon_layout_padding"
+                android:paddingLeft="@dimen/standard_half_padding"
+                android:paddingStart="@dimen/standard_half_padding"
                 android:background="@drawable/round_bgnd"/>
 
             <TextView

+ 4 - 4
src/main/res/layout/synced_folders_item_header.xml

@@ -46,11 +46,11 @@
 
             <ImageView
                 android:id="@+id/type"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
+                android:layout_width="@dimen/synced_folders_item_type_layout_width"
+                android:layout_height="@dimen/synced_folders_item_type_layout_height"
                 android:layout_gravity="start|center_vertical"
-                android:layout_marginRight="24dp"
-                android:layout_marginEnd="24dp"
+                android:layout_marginRight="@dimen/synced_folders_item_type_layout_right_end_margin"
+                android:layout_marginEnd="@dimen/synced_folders_item_type_layout_right_end_margin"
                 android:src="@drawable/image_32dp"
                 android:contentDescription="@string/synced_folders_type"/>
 

+ 6 - 6
src/main/res/layout/synced_folders_layout.xml

@@ -41,7 +41,7 @@
             <android.support.design.widget.CollapsingToolbarLayout
                 android:id="@+id/collapsing_toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="110dp"
+                android:layout_height="@dimen/collapsing_toolbar_layout_height"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
                 app:titleEnabled="false">
 
@@ -103,8 +103,8 @@
 
                 <ProgressBar
                     android:id="@+id/syncedFoldersProgressBar"
-                    android:layout_width="72dp"
-                    android:layout_height="72dp"
+                    android:layout_width="@dimen/synced_folders_progress_bar_layout_width"
+                    android:layout_height="@dimen/synced_folders_progress_bar_layout_height"
                     android:layout_gravity="center_horizontal"/>
 
                 <TextView
@@ -131,9 +131,9 @@
                 android:id="@android:id/list"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginBottom="-3dp"
-                android:layout_marginLeft="-3dp"
-                android:layout_marginRight="-3dp"
+                android:layout_marginBottom="@dimen/synced_folders_recycler_view_layout_margin"
+                android:layout_marginLeft="@dimen/synced_folders_recycler_view_layout_margin"
+                android:layout_marginRight="@dimen/synced_folders_recycler_view_layout_margin"
                 android:clipToPadding="false"
                 android:scrollbarStyle="outsideOverlay"
                 android:scrollbars="vertical"

+ 3 - 3
src/main/res/layout/toolbar_user_information.xml

@@ -52,11 +52,11 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="12dp"
+                android:layout_marginBottom="@dimen/toolbar_user_information_layout_margin"
                 android:layout_marginEnd="@dimen/standard_half_margin"
-                android:layout_marginLeft="12dp"
+                android:layout_marginLeft="@dimen/toolbar_user_information_layout_margin"
                 android:layout_marginRight="@dimen/standard_half_margin"
-                android:layout_marginStart="12dp"
+                android:layout_marginStart="@dimen/toolbar_user_information_layout_margin"
                 android:gravity="bottom"
                 android:orientation="horizontal"
                 android:weightSum="1">

+ 4 - 4
src/main/res/layout/whats_new_activity.xml

@@ -29,10 +29,10 @@
         android:id="@+id/welcomeText"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginBottom="5dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="5dp"
+        android:layout_marginBottom="@dimen/alternate_half_margin"
+        android:layout_marginLeft="@dimen/alternate_margin"
+        android:layout_marginStart="@dimen/alternate_margin"
+        android:layout_marginTop="@dimen/alternate_half_margin"
         android:layout_weight="6"
         android:textStyle="bold"
         android:gravity="center"

+ 1 - 1
src/main/res/layout/whats_new_element.xml

@@ -30,7 +30,7 @@
         android:layout_height="0dp"
         android:id="@+id/whatsNewImage"
         android:layout_gravity="center_horizontal"
-        android:layout_marginBottom="10dp"
+        android:layout_marginBottom="@dimen/alternate_margin"
         android:layout_weight="50"
         android:src="@drawable/whats_new_files"
         android:contentDescription="@string/what_s_new_image"/>

+ 60 - 0
src/main/res/values/dims.xml

@@ -35,6 +35,7 @@
     <dimen name="standard_double_padding">32dp</dimen>
     <dimen name="standard_half_padding">8dp</dimen>
     <dimen name="standard_quarter_padding">4dp</dimen>
+    <dimen name="standard_eigth_padding">2dp</dimen>
     <dimen name="standard_margin">16dp</dimen>
     <dimen name="standard_icon_list_horizontal_margin">24dp</dimen>
     <dimen name="standard_double_margin">32dp</dimen>
@@ -84,5 +85,64 @@
     <dimen name="upload_list_item_image_size">35dp</dimen>
     <dimen name="uploader_list_item_layout_image_margin">12dp</dimen>
     <dimen name="media_grid_spacing">2dp</dimen>
+    <dimen name="account_item_layout_user_image_left_start_margin">12dp</dimen>
+    <dimen name="account_item_layout_user_image_margin">1dp</dimen>
+    <dimen name="activity_icon_width">32dp</dimen>
+    <dimen name="activity_icon_height">32dp</dimen>
+    <dimen name="activity_icon_layout_right_end_margin">24dp</dimen>
+    <dimen name="activity_list_item_grid_layout_left_start_margin">-3dp</dimen>
+    <dimen name="activity_list_item_title_header_text_size">20sp</dimen>
+    <dimen name="activity_list_layout_recycler_view_margin">-3dp</dimen>
+    <dimen name="activity_row_layout_height">48dp</dimen>
+    <dimen name="uploader_list_separator_height">1dp</dimen>
+    <dimen name="contactlist_item_icon_layout_width">40dp</dimen>
+    <dimen name="contactlist_item_icon_layout_height">40dp</dimen>
+    <dimen name="empty_list_icon_layout_width">72dp</dimen>
+    <dimen name="empty_list_icon_layout_height">72dp</dimen>
+    <dimen name="empty_list_progress_layout_width">72dp</dimen>
+    <dimen name="empty_list_progress_layout_height">72dp</dimen>
+    <dimen name="shared_list_icon_width">14dp</dimen>
+    <dimen name="shared_list_icon_height">14dp</dimen>
+    <dimen name="share_no_users_text_size">14sp</dimen>
+    <dimen name="file_details_user_icon_layout_width">32dp</dimen>
+    <dimen name="file_details_user_icon_layout_height">32dp</dimen>
+    <dimen name="file_details_username_text_size">16sp</dimen>
+    <dimen name="file_details_username_layout_text_margin">12dp</dimen>
+    <dimen name="grid_image_shared_icon_layout_top_margin">24dp</dimen>
+    <dimen name="grid_image_local_file_indicator_layout_width">16dp</dimen>
+    <dimen name="grid_image_local_file_indicator_layout_height">16dp</dimen>
+    <dimen name="grid_image_kept_offline_icon_layout_width">16dp</dimen>
+    <dimen name="grid_image_kept_offline_icon_layout_height">16dp</dimen>
+    <dimen name="grid_image_kept_offline_icon_layout_right_end_margin">24dp</dimen>
+    <dimen name="grid_item_shared_icon_layout_top_margin">24dp</dimen>
+    <dimen name="scan_fingerprint_text_size">32sp</dimen>
+    <dimen name="grid_item_local_file_indicator_layout_width">16dp</dimen>
+    <dimen name="grid_item_local_file_indicator_layout_height">16dp</dimen>
+    <dimen name="grid_item_kept_offline_icon_layout_width">16dp</dimen>
+    <dimen name="grid_item_kept_offline_icon_layout_height">16dp</dimen>
+    <dimen name="grid_item_kept_offline_icon_layout_right_end_margin">24dp</dimen>
+    <dimen name="grid_sync_item_layout_next_text_size">22sp</dimen>
+    <dimen name="grid_sync_item_layout_counter_text_size">22sp</dimen>
+    <dimen name="list_item_favorite_action_layout_width">16dp</dimen>
+    <dimen name="list_item_favorite_action_layout_height">16dp</dimen>
+    <dimen name="list_item_kept_offline_icon_layout_width">12dp</dimen>
+    <dimen name="list_item_kept_offline_icon_layout_height">12dp</dimen>
+    <dimen name="list_item_kept_offline_icon_layout_right_end_margin">20dp</dimen>
+    <dimen name="list_item_local_file_indicator_layout_width">12dp</dimen>
+    <dimen name="list_item_local_file_indicator_layout_height">12dp</dimen>
+    <dimen name="preview_error_image_layout_width">72dp</dimen>
+    <dimen name="preview_error_image_layout_height">72dp</dimen>
+    <dimen name="preview_error_text_size">26sp</dimen>
+    <dimen name="send_share_fragment_layout_margin">24dp</dimen>
+    <dimen name="send_share_fragment_layout_padding">24dp</dimen>
+    <dimen name="share_people_icon_layout_padding">12dp</dimen>
+    <dimen name="synced_folders_item_type_layout_width">32dp</dimen>
+    <dimen name="synced_folders_item_type_layout_height">32dp</dimen>
+    <dimen name="synced_folders_item_type_layout_right_end_margin">24dp</dimen>
+    <dimen name="collapsing_toolbar_layout_height">110dp</dimen>
+    <dimen name="synced_folders_progress_bar_layout_width">72dp</dimen>
+    <dimen name="synced_folders_progress_bar_layout_height">72dp</dimen>
+    <dimen name="synced_folders_recycler_view_layout_margin">-3dp</dimen>
+    <dimen name="toolbar_user_information_layout_margin">12dp</dimen>
     <integer name="media_grid_width">4</integer>
 </resources>