From afc3fb10c79c601fe0ac4a7a1adf3c0e3a4401a3 Mon Sep 17 00:00:00 2001
From: Viktor De Pasquale <info@depasquale.wiki>
Date: Tue, 19 Nov 2019 17:16:07 +0100
Subject: [PATCH] Updated icon padding for all buttons

---
 app/src/main/res/layout/fragment_home_md2.xml    | 4 ----
 app/src/main/res/layout/item_module_download.xml | 3 +--
 app/src/main/res/layout/item_module_md2.xml      | 1 -
 app/src/main/res/layout/item_policy_md2.xml      | 1 -
 app/src/main/res/layout/item_section_md2.xml     | 1 -
 app/src/main/res/values/styles_md2_impl.xml      | 8 ++++----
 6 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/app/src/main/res/layout/fragment_home_md2.xml b/app/src/main/res/layout/fragment_home_md2.xml
index 7afbc73a4..0606134f6 100644
--- a/app/src/main/res/layout/fragment_home_md2.xml
+++ b/app/src/main/res/layout/fragment_home_md2.xml
@@ -499,7 +499,6 @@
                         android:text="@string/update"
                         app:icon="@drawable/ic_update_md2"
                         app:iconGravity="textEnd"
-                        app:iconPadding="@dimen/l_50"
                         app:iconSize="18dp"
                         tools:visibility="gone" />
 
@@ -514,7 +513,6 @@
                         android:text="@string/install"
                         app:icon="@drawable/ic_install"
                         app:iconGravity="textEnd"
-                        app:iconPadding="@dimen/l_50"
                         app:iconSize="18dp" />
 
                 </FrameLayout>
@@ -722,7 +720,6 @@
                         android:text="@string/update"
                         app:icon="@drawable/ic_update_md2"
                         app:iconGravity="textEnd"
-                        app:iconPadding="@dimen/l_50"
                         app:iconSize="18dp" />
 
                     <com.google.android.material.button.MaterialButton
@@ -735,7 +732,6 @@
                         android:text="@string/install"
                         app:icon="@drawable/ic_install"
                         app:iconGravity="textEnd"
-                        app:iconPadding="@dimen/l_50"
                         app:iconSize="18dp"
                         tools:visibility="gone" />
 
diff --git a/app/src/main/res/layout/item_module_download.xml b/app/src/main/res/layout/item_module_download.xml
index 5a4e8e825..1bd28218b 100644
--- a/app/src/main/res/layout/item_module_download.xml
+++ b/app/src/main/res/layout/item_module_download.xml
@@ -23,7 +23,6 @@
         android:textAllCaps="false"
         android:textSize="12sp"
         app:cornerRadius="@dimen/r1"
-        app:icon="@drawable/ic_module_storage_md2"
-        app:iconPadding="@dimen/l_50" />
+        app:icon="@drawable/ic_module_storage_md2" />
 
 </layout>
diff --git a/app/src/main/res/layout/item_module_md2.xml b/app/src/main/res/layout/item_module_md2.xml
index eef049029..281470340 100644
--- a/app/src/main/res/layout/item_module_md2.xml
+++ b/app/src/main/res/layout/item_module_md2.xml
@@ -106,7 +106,6 @@
                 android:textAllCaps="false"
                 app:icon="@{item.removed ? R.drawable.ic_restart : R.drawable.ic_delete_md2}"
                 app:iconGravity="textEnd"
-                app:iconPadding="@dimen/l_50"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/module_divider"
                 tools:icon="@drawable/ic_delete_md2"
diff --git a/app/src/main/res/layout/item_policy_md2.xml b/app/src/main/res/layout/item_policy_md2.xml
index 2cafbe1a2..238bfa1cd 100644
--- a/app/src/main/res/layout/item_policy_md2.xml
+++ b/app/src/main/res/layout/item_policy_md2.xml
@@ -135,7 +135,6 @@
                 android:textColor="?colorError"
                 android:textSize="12sp"
                 app:icon="@drawable/ic_delete_md2"
-                app:iconPadding="@dimen/l_50"
                 app:iconTint="?colorError"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/item_section_md2.xml b/app/src/main/res/layout/item_section_md2.xml
index c2155a8ca..925a8ca2f 100644
--- a/app/src/main/res/layout/item_section_md2.xml
+++ b/app/src/main/res/layout/item_section_md2.xml
@@ -46,7 +46,6 @@
             tools:text="@tools:sample/lorem"
             android:textAllCaps="false"
             app:icon="@{item.icon}"
-            app:iconPadding="@dimen/l_50"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/module_title"
diff --git a/app/src/main/res/values/styles_md2_impl.xml b/app/src/main/res/values/styles_md2_impl.xml
index b5034dc4a..daff156e1 100644
--- a/app/src/main/res/values/styles_md2_impl.xml
+++ b/app/src/main/res/values/styles_md2_impl.xml
@@ -56,7 +56,7 @@ variant. Make sure to use style referenced by attribute defined it attrs.xml.
     <style name="WidgetFoundation.Button" parent="Widget.MaterialComponents.Button">
         <item name="android:textStyle">bold</item>
         <item name="iconGravity">textStart</item>
-        <item name="iconPadding">@dimen/l1</item>
+        <item name="iconPadding">@dimen/l_50</item>
     </style>
 
     <style name="WidgetFoundation.Button.OnPrimary">
@@ -69,7 +69,7 @@ variant. Make sure to use style referenced by attribute defined it attrs.xml.
     <style name="WidgetFoundation.Button.Outlined" parent="Widget.MaterialComponents.Button.OutlinedButton">
         <item name="android:textStyle">bold</item>
         <item name="iconGravity">textStart</item>
-        <item name="iconPadding">@dimen/l1</item>
+        <item name="iconPadding">@dimen/l_50</item>
         <item name="strokeColor">?colorPrimary</item>
         <item name="android:textColor">?colorPrimary</item>
     </style>
@@ -84,7 +84,7 @@ variant. Make sure to use style referenced by attribute defined it attrs.xml.
     <style name="WidgetFoundation.Button.Flat" parent="Widget.MaterialComponents.Button.UnelevatedButton">
         <item name="android:textStyle">bold</item>
         <item name="iconGravity">textStart</item>
-        <item name="iconPadding">@dimen/l1</item>
+        <item name="iconPadding">@dimen/l_50</item>
     </style>
 
     <style name="WidgetFoundation.Button.Flat.OnPrimary">
@@ -97,7 +97,7 @@ variant. Make sure to use style referenced by attribute defined it attrs.xml.
     <style name="WidgetFoundation.Button.Text" parent="Widget.MaterialComponents.Button.TextButton">
         <item name="android:textStyle">bold</item>
         <item name="iconGravity">textStart</item>
-        <item name="iconPadding">@dimen/l1</item>
+        <item name="iconPadding">@dimen/l_50</item>
     </style>
 
     <style name="WidgetFoundation.Button.Text.Secondary">