From 196098ab6a37a3d6976788423842b9f6f2483ff4 Mon Sep 17 00:00:00 2001
From: NekoInverter <42698724+NekoInverter@users.noreply.github.com>
Date: Sat, 14 Mar 2020 13:41:42 +0800
Subject: [PATCH] Fixes

---
 app/src/main/res/layout/item_download.xml     |  3 +-
 app/src/main/res/layout/item_module.xml       |  3 +-
 .../main/res/layout/single_installer_view.xml | 20 ++++------
 app/src/main/res/layout/status_installer.xml  | 40 ++++++++-----------
 app/src/main/res/values/attrs.xml             |  3 +-
 app/src/main/res/values/styles.xml            |  6 ++-
 6 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml
index 0a8ae7e9..1f6fe2a3 100644
--- a/app/src/main/res/layout/item_download.xml
+++ b/app/src/main/res/layout/item_download.xml
@@ -2,7 +2,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?listItemBackground"
-    android:padding="16dp">
+    android:paddingHorizontal="16dp"
+    android:paddingVertical="?downloadVerticalPadding">
 
     <TextView
         android:id="@+id/title"
diff --git a/app/src/main/res/layout/item_module.xml b/app/src/main/res/layout/item_module.xml
index 62f40ec7..b6772690 100644
--- a/app/src/main/res/layout/item_module.xml
+++ b/app/src/main/res/layout/item_module.xml
@@ -7,8 +7,9 @@
     android:clickable="true"
     android:focusable="true"
     android:minHeight="?attr/listPreferredItemHeight"
-    android:padding="?listItemPadding"
+    android:paddingVertical="8dp"
     android:paddingStart="8dp"
+    android:paddingEnd="?modulesHorizontalPadding"
     tools:ignore="RtlSymmetry">
 
     <ImageView
diff --git a/app/src/main/res/layout/single_installer_view.xml b/app/src/main/res/layout/single_installer_view.xml
index a9d6cb41..3c7b31bc 100644
--- a/app/src/main/res/layout/single_installer_view.xml
+++ b/app/src/main/res/layout/single_installer_view.xml
@@ -187,15 +187,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/container"
-                android:layout_marginHorizontal="16dp"
                 android:layout_marginTop="4dp"
-                android:background="@drawable/item_background_round"
+                android:background="?roundBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:minHeight="48dp"
                 android:orientation="horizontal"
-                android:paddingHorizontal="8dp">
+                android:paddingHorizontal="16dp">
 
                 <ImageView
                     android:layout_width="24dp"
@@ -229,14 +228,13 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/author_view"
-                android:layout_marginHorizontal="16dp"
-                android:background="@drawable/item_background_round"
+                android:background="?roundBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:minHeight="48dp"
                 android:orientation="horizontal"
-                android:paddingHorizontal="8dp">
+                android:paddingHorizontal="16dp">
 
                 <ImageView
                     android:layout_width="24dp"
@@ -269,14 +267,13 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/show_on_xda"
-                android:layout_marginHorizontal="16dp"
-                android:background="@drawable/item_background_round"
+                android:background="?roundBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:minHeight="48dp"
                 android:orientation="horizontal"
-                android:paddingHorizontal="8dp">
+                android:paddingHorizontal="16dp">
 
                 <ImageView
                     android:layout_width="24dp"
@@ -308,14 +305,13 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/updateDescription"
-                android:layout_marginHorizontal="16dp"
-                android:background="@drawable/item_background_round"
+                android:background="?roundBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:minHeight="48dp"
                 android:orientation="horizontal"
-                android:paddingHorizontal="8dp">
+                android:paddingHorizontal="16dp">
 
                 <ImageView
                     android:layout_width="24dp"
diff --git a/app/src/main/res/layout/status_installer.xml b/app/src/main/res/layout/status_installer.xml
index a8278d69..5d169556 100644
--- a/app/src/main/res/layout/status_installer.xml
+++ b/app/src/main/res/layout/status_installer.xml
@@ -24,14 +24,13 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="16dp"
-                    android:background="@drawable/item_background_round"
+                    android:background="?roundBackground"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
                     android:minHeight="48dp"
                     android:orientation="horizontal"
-                    android:paddingHorizontal="8dp">
+                    android:paddingHorizontal="16dp">
 
                     <ImageView
                         android:layout_width="24dp"
@@ -63,14 +62,13 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="16dp"
-                    android:background="@drawable/item_background_round"
+                    android:background="?roundBackground"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
                     android:minHeight="48dp"
                     android:orientation="horizontal"
-                    android:paddingHorizontal="8dp">
+                    android:paddingHorizontal="16dp">
 
                     <ImageView
                         android:layout_width="24dp"
@@ -102,14 +100,13 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="16dp"
-                    android:background="@drawable/item_background_round"
+                    android:background="?roundBackground"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
                     android:minHeight="48dp"
                     android:orientation="horizontal"
-                    android:paddingHorizontal="8dp">
+                    android:paddingHorizontal="16dp">
 
                     <ImageView
                         android:layout_width="24dp"
@@ -140,14 +137,13 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="16dp"
-                    android:background="@drawable/item_background_round"
+                    android:background="?roundBackground"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
                     android:minHeight="48dp"
                     android:orientation="horizontal"
-                    android:paddingHorizontal="8dp">
+                    android:paddingHorizontal="16dp">
 
                     <ImageView
                         android:layout_width="24dp"
@@ -177,14 +173,13 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="16dp"
-                    android:background="@drawable/item_background_round"
+                    android:background="?roundBackground"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
                     android:minHeight="48dp"
                     android:orientation="horizontal"
-                    android:paddingHorizontal="8dp">
+                    android:paddingHorizontal="16dp">
 
                     <ImageView
                         android:layout_width="24dp"
@@ -213,14 +208,13 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="16dp"
-                    android:background="@drawable/item_background_round"
+                    android:background="?roundBackground"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
                     android:minHeight="48dp"
                     android:orientation="horizontal"
-                    android:paddingHorizontal="8dp">
+                    android:paddingHorizontal="16dp">
 
                     <ImageView
                         android:layout_width="24dp"
@@ -249,13 +243,12 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="16dp"
-                    android:background="@drawable/item_background_round"
+                    android:background="?roundBackground"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
                     android:orientation="horizontal"
-                    android:paddingHorizontal="8dp">
+                    android:paddingHorizontal="16dp">
 
                     <ImageView
                         android:layout_width="24dp"
@@ -310,14 +303,13 @@
                     android:id="@+id/click_to_update"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="16dp"
-                    android:background="@drawable/item_background_round"
+                    android:background="?roundBackground"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
                     android:minHeight="48dp"
                     android:orientation="horizontal"
-                    android:paddingHorizontal="8dp">
+                    android:paddingHorizontal="16dp">
 
                     <ImageView
                         android:layout_width="24dp"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 6924d63d..12c85419 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -5,7 +5,8 @@
     <attr name="listItemBackground" format="reference" />
     <attr name="roundBackground" format="reference" />
     <attr name="actionBarTheme" format="reference" />
-    <attr name="listItemPadding" format="dimension" />
+    <attr name="modulesHorizontalPadding" format="dimension" />
+    <attr name="downloadVerticalPadding" format="dimension" />
     <attr name="actionBarPopupTheme" format="reference" />
     <attr name="tabLayoutTheme" format="reference" />
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4f8fb84e..6e654b8f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,7 +8,8 @@
         <item name="colorAccent">@color/colorAccent</item>
         <item name="colorActionBar">@color/colorActionBar</item>
         <item name="colorStickyHeader">@color/colorStickyHeader</item>
-        <item name="listItemPadding">8dp</item>
+        <item name="modulesHorizontalPadding">8dp</item>
+        <item name="downloadVerticalPadding">16dp</item>
         <item name="actionBarTheme">@style/ThemeOverlay.MaterialComponents.ActionBar</item>
         <item name="android:colorBackground">@color/colorBackground</item>
         <item name="android:windowBackground">@color/colorBackground</item>
@@ -40,7 +41,8 @@
         <item name="colorStickyHeader">@color/colorStickyHeader_md2</item>
         <item name="android:colorBackground">@color/colorBackground_md2</item>
         <item name="android:windowBackground">@color/colorBackground_md2</item>
-        <item name="listItemPadding">16dp</item>
+        <item name="modulesHorizontalPadding">16dp</item>
+        <item name="downloadVerticalPadding">8dp</item>
         <item name="listItemBackground">@drawable/item_background_md2</item>
         <item name="roundBackground">@drawable/item_background_md2</item>
         <item name="liftOnScroll">true</item>