Use a variable for the activity padding

11 files changed, 33 insertions, 19 deletions

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
index ebd4b7ac..ab22bff1 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
@@ -630,7 +630,7 @@ public class NotesListViewActivity extends LockedActivity implements NoteClickLi
                     getResources().getDimensionPixelSize(R.dimen.spacer_5x),
                     getResources().getDimensionPixelSize(R.dimen.spacer_3x),
                     getResources().getDimensionPixelSize(R.dimen.spacer_1x),
-                    getResources().getDimensionPixelSize(R.dimen.spacer_2x)
+                    getResources().getDimensionPixelSize(R.dimen.activity_padding)
             ));
         } else {
             LinearLayoutManager layoutManager = new LinearLayoutManager(this);
diff --git a/app/src/main/res/layout/activity_formatting_help.xml b/app/src/main/res/layout/activity_formatting_help.xml
index 43b6020a..dc2c1742 100644
--- a/app/src/main/res/layout/activity_formatting_help.xml
+++ b/app/src/main/res/layout/activity_formatting_help.xml
@@ -33,8 +33,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="@dimen/spacer_2x"
-            android:paddingStart="@dimen/spacer_3x"
-            android:paddingEnd="@dimen/spacer_3x"
+            android:layout_marginStart="@dimen/activity_padding"
+            android:layout_marginEnd="@dimen/activity_padding"
+            android:paddingStart="@dimen/spacer_2x"
+            android:paddingEnd="@dimen/spacer_2x"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="@color/fg_default"
             android:textIsSelectable="true"
diff --git a/app/src/main/res/layout/activity_notes_list_view.xml b/app/src/main/res/layout/activity_notes_list_view.xml
index 60b1f39b..04144669 100644
--- a/app/src/main/res/layout/activity_notes_list_view.xml
+++ b/app/src/main/res/layout/activity_notes_list_view.xml
@@ -37,9 +37,9 @@
                 android:id="@+id/home_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/spacer_2x"
+                android:layout_marginStart="@dimen/spacer_1x"
                 android:layout_marginTop="@dimen/spacer_1hx"
-                android:layout_marginEnd="@dimen/spacer_2x"
+                android:layout_marginEnd="@dimen/spacer_1x"
                 android:layout_marginBottom="@dimen/spacer_1hx"
                 app:cardBackgroundColor="@color/appbar"
                 app:cardCornerRadius="@dimen/spacer_1x"
diff --git a/app/src/main/res/layout/fragment_note_edit.xml b/app/src/main/res/layout/fragment_note_edit.xml
index 07f5927f..61818044 100644
--- a/app/src/main/res/layout/fragment_note_edit.xml
+++ b/app/src/main/res/layout/fragment_note_edit.xml
@@ -27,13 +27,15 @@
             android:id="@+id/editContent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/activity_padding"
+            android:layout_marginEnd="@dimen/activity_padding"
             android:background="?attr/colorPrimary"
             android:ems="10"
             android:gravity="top"
             android:inputType="textMultiLine|textCapSentences"
             android:padding="@dimen/spacer_2x"
-            android:paddingStart="@dimen/spacer_3x"
-            android:paddingEnd="@dimen/spacer_3x"
+            android:paddingStart="@dimen/spacer_2x"
+            android:paddingEnd="@dimen/spacer_2x"
             android:textColor="@color/fg_default"
             android:theme="@style/textViewStyle"
             tools:text="@tools:sample/lorem/random" />
diff --git a/app/src/main/res/layout/fragment_note_preview.xml b/app/src/main/res/layout/fragment_note_preview.xml
index 1d1560a1..b5f81e26 100644
--- a/app/src/main/res/layout/fragment_note_preview.xml
+++ b/app/src/main/res/layout/fragment_note_preview.xml
@@ -24,9 +24,11 @@
                 android:id="@+id/single_note_content"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/activity_padding"
+                android:layout_marginEnd="@dimen/activity_padding"
                 android:padding="@dimen/spacer_2x"
-                android:paddingStart="@dimen/spacer_3x"
-                android:paddingEnd="@dimen/spacer_3x"
+                android:paddingStart="@dimen/spacer_2x"
+                android:paddingEnd="@dimen/spacer_2x"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textColor="@color/fg_default"
                 android:textIsSelectable="true"
diff --git a/app/src/main/res/layout/item_notes_list_note_item_with_excerpt.xml b/app/src/main/res/layout/item_notes_list_note_item_with_excerpt.xml
index 916c723e..0798b954 100644
--- a/app/src/main/res/layout/item_notes_list_note_item_with_excerpt.xml
+++ b/app/src/main/res/layout/item_notes_list_note_item_with_excerpt.xml
@@ -31,7 +31,7 @@
         android:layout_height="wrap_content"
         android:background="@drawable/list_item_background_selector"
         android:baselineAligned="false"
-        android:paddingStart="@dimen/spacer_1x"
+        android:paddingStart="@dimen/activity_padding"
         android:paddingEnd="@null">
 
         <FrameLayout
diff --git a/app/src/main/res/layout/item_notes_list_note_item_without_excerpt.xml b/app/src/main/res/layout/item_notes_list_note_item_without_excerpt.xml
index 793cf5eb..a48b0e05 100644
--- a/app/src/main/res/layout/item_notes_list_note_item_without_excerpt.xml
+++ b/app/src/main/res/layout/item_notes_list_note_item_without_excerpt.xml
@@ -32,7 +32,7 @@
         android:background="@drawable/list_item_background_selector"
         android:baselineAligned="false"
         android:gravity="center_vertical"
-        android:paddingStart="@dimen/spacer_1x"
+        android:paddingStart="@dimen/activity_padding"
         android:paddingEnd="@null">
 
         <FrameLayout
diff --git a/app/src/main/res/layout/item_pref.xml b/app/src/main/res/layout/item_pref.xml
index 879b9c94..0d100ce0 100644
--- a/app/src/main/res/layout/item_pref.xml
+++ b/app/src/main/res/layout/item_pref.xml
@@ -4,8 +4,8 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:paddingStart="@dimen/spacer_1x"
-    android:paddingEnd="@dimen/spacer_1x"
+    android:paddingStart="@dimen/activity_padding"
+    android:paddingEnd="@dimen/activity_padding"
     android:minHeight="?android:attr/listPreferredItemHeight">
 
     <ImageView
diff --git a/app/src/main/res/layout/item_preference_category.xml b/app/src/main/res/layout/item_preference_category.xml
index d7ebba1b..4a719105 100644
--- a/app/src/main/res/layout/item_preference_category.xml
+++ b/app/src/main/res/layout/item_preference_category.xml
@@ -4,7 +4,9 @@
     android:id="@android:id/title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="64dp"
+    android:layout_marginStart="56dp"
+    android:layout_marginEnd="0dp"
+    android:paddingStart="@dimen/activity_padding"
     android:paddingTop="@dimen/spacer_3x"
     android:paddingEnd="0dp"
     tools:text="@tools:sample/lorem" />
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index bf616e26..eb001ec1 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -11,6 +11,8 @@
 
     <dimen name="avatar_size">36dp</dimen>
 
+    <dimen name="activity_padding">@dimen/spacer_1x</dimen>
+
     <!-- Drawer header -->
     <dimen name="drawer_header_height">100dp</dimen>
     <dimen name="drawer_header_logo_size">42dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 22113530..a50e3a18 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="BaseTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
         <item name="colorPrimary">@color/primary</item>
@@ -8,6 +8,7 @@
         <item name="colorControlNormal">?attr/colorAccent</item>
         <item name="windowActionModeOverlay">true</item>
         <item name="actionModeStyle">@style/actionModeStyle</item>
+        <item name="appBarLayoutStyle">@style/appBarLayoutStyle</item>
         <item name="toolbarStyle">@style/toolbarStyle</item>
     </style>
 
@@ -18,15 +19,18 @@
         <item name="android:textColorHighlight">@color/defaultTextHighlightBackground</item>
     </style>
 
+    <style name="appBarLayoutStyle" parent="@style/Widget.Design.AppBarLayout">
+        <item name="android:paddingStart">@dimen/activity_padding</item>
+        <item name="android:paddingEnd">@dimen/activity_padding</item>
+    </style>
+
     <style name="toolbarStyle" parent="@style/Widget.AppCompat.Toolbar">
-        <item name="android:paddingStart">@dimen/spacer_1x</item>
-        <item name="android:paddingEnd">@null</item>
         <item name="android:background">?attr/colorPrimary</item>
     </style>
 
     <style name="actionModeStyle" parent="@style/Widget.AppCompat.ActionMode">
-        <item name="android:paddingStart">@dimen/spacer_1x</item>
-        <item name="android:paddingEnd">@null</item>
+        <item name="android:paddingStart">@dimen/activity_padding</item>
+        <item name="android:paddingEnd">@dimen/activity_padding</item>
     </style>
 
     <style name="fab">