Material 3: Simplify horizontal and vertical margins

Signed-off-by: Stefan Niedermann <info@niedermann.it>

8 files changed, 13 insertions, 22 deletions

diff --git a/app/src/main/res/layout/activity_exception.xml b/app/src/main/res/layout/activity_exception.xml
index 5b3a66000..596624d8e 100644
--- a/app/src/main/res/layout/activity_exception.xml
+++ b/app/src/main/res/layout/activity_exception.xml
@@ -65,8 +65,7 @@
             <HorizontalScrollView
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_marginStart="@dimen/spacer_2x"
-                android:layout_marginEnd="@dimen/spacer_2x"
+                android:layout_marginHorizontal="@dimen/spacer_2x"
                 android:layout_weight="1"
                 android:background="@color/bg_highlighted">
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index adc61da27..809c696f8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -99,9 +99,8 @@
                 android:id="@+id/toolbarCard"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:layout_marginStart="@dimen/spacer_2x"
+                android:layout_marginHorizontal="@dimen/spacer_2x"
                 android:layout_marginTop="@dimen/spacer_1x"
-                android:layout_marginEnd="@dimen/spacer_2x"
                 app:cardCornerRadius="@dimen/spacer_4x"
                 app:cardElevation="0dp"
                 app:strokeWidth="0dp">
diff --git a/app/src/main/res/layout/dialog_account_switcher.xml b/app/src/main/res/layout/dialog_account_switcher.xml
index 4de7c1d7e..9ca6cba5d 100644
--- a/app/src/main/res/layout/dialog_account_switcher.xml
+++ b/app/src/main/res/layout/dialog_account_switcher.xml
@@ -28,8 +28,7 @@
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/spacer_2x"
-            android:layout_marginEnd="@dimen/spacer_2x"
+            android:layout_marginHorizontal="@dimen/spacer_2x"
             android:layout_weight="1"
             android:orientation="vertical">
 
diff --git a/app/src/main/res/layout/dialog_move_card.xml b/app/src/main/res/layout/dialog_move_card.xml
index c00dcfbf4..7f37f8130 100644
--- a/app/src/main/res/layout/dialog_move_card.xml
+++ b/app/src/main/res/layout/dialog_move_card.xml
@@ -15,8 +15,7 @@
         style="@style/TextAppearance.AppCompat.Title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacer_1x"
-        android:layout_marginEnd="@dimen/spacer_1x"
+        android:layout_marginHorizontal="@dimen/spacer_1x"
         android:ellipsize="end"
         android:maxLines="5"
         tools:text="@string/action_card_move_title" />
diff --git a/app/src/main/res/layout/fragment_about_credits_tab.xml b/app/src/main/res/layout/fragment_about_credits_tab.xml
index 5c6d11b54..ae8e88aa4 100644
--- a/app/src/main/res/layout/fragment_about_credits_tab.xml
+++ b/app/src/main/res/layout/fragment_about_credits_tab.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView 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"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -14,13 +15,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginTop="30dp"
-            android:layout_marginBottom="30dp"
-            android:drawableTop="@mipmap/ic_launcher"
+            android:layout_marginVertical="30dp"
             android:drawablePadding="@dimen/spacer_2x"
             android:text="@string/app_name"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textSize="26sp" />
+            android:textSize="26sp"
+            app:drawableTop="@mipmap/ic_launcher" />
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_card_edit_tab_comments.xml b/app/src/main/res/layout/fragment_card_edit_tab_comments.xml
index 9564a4e6a..ab4ddb6ee 100644
--- a/app/src/main/res/layout/fragment_card_edit_tab_comments.xml
+++ b/app/src/main/res/layout/fragment_card_edit_tab_comments.xml
@@ -44,8 +44,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/spacer_1x"
-                android:layout_marginEnd="@dimen/spacer_1x"
+                android:layout_marginHorizontal="@dimen/spacer_1x"
                 android:contentDescription="@string/simple_reply"
                 android:padding="@dimen/spacer_1x"
                 app:srcCompat="@drawable/ic_reply_grey600_24dp" />
@@ -89,8 +88,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/spacer_1x"
-                android:layout_marginEnd="@dimen/spacer_1x"
+                android:layout_marginHorizontal="@dimen/spacer_1x"
                 android:contentDescription="@string/simple_reply"
                 android:padding="@dimen/spacer_1x"
                 app:srcCompat="@drawable/ic_baseline_mention_24" />
@@ -99,8 +97,7 @@
                 android:id="@+id/mention_proposer"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/avatar_size_small"
-                android:layout_marginStart="@dimen/spacer_1x"
-                android:layout_marginEnd="@dimen/spacer_1x"
+                android:layout_marginHorizontal="@dimen/spacer_1x"
                 android:gravity="center_vertical"
                 android:orientation="horizontal" />
         </LinearLayout>
diff --git a/app/src/main/res/layout/item_account_choose.xml b/app/src/main/res/layout/item_account_choose.xml
index d939c8d71..c2d7ed0fb 100644
--- a/app/src/main/res/layout/item_account_choose.xml
+++ b/app/src/main/res/layout/item_account_choose.xml
@@ -37,8 +37,7 @@
     <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacer_2x"
-        android:layout_marginEnd="@dimen/spacer_2x"
+        android:layout_marginHorizontal="@dimen/spacer_2x"
         android:layout_weight="1"
         android:orientation="vertical">
 
diff --git a/app/src/main/res/layout/widget_single_card.xml b/app/src/main/res/layout/widget_single_card.xml
index 287841c46..5646b98f1 100644
--- a/app/src/main/res/layout/widget_single_card.xml
+++ b/app/src/main/res/layout/widget_single_card.xml
@@ -64,8 +64,7 @@
             android:id="@+id/description_lv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacer_1hx"
-            android:layout_marginBottom="@dimen/spacer_1hx"
+            android:layout_marginVertical="@dimen/spacer_1hx"
             android:divider="@null"
             tools:listitem="@layout/widget_single_card_content" />
     </FrameLayout>