From 7209ab87f5f9b62eba5fc790391ed1b78e66f6ad Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Thu, 8 Dec 2016 07:04:31 +1100
Subject: [PATCH] Tweak some button styles with those added in !419.

The styles used by the app details showed good padding on either
side of the buttons text. This was because they had a certain amount
of screen space to fill up which resulted in nice empty space on either
side of the text. Other buttons do not have this type of layout, so
need to have a minimum amount of padding thrust upon them.

Required breaking out into values-v17 too, so refactored common styles
into base style to make this easier.
---
 app/src/main/res/layout/category_item.xml       |  1 +
 app/src/main/res/layout/main_tab_swap.xml       |  1 +
 .../main/res/layout/my_apps_updates_header.xml  |  1 +
 app/src/main/res/values-v17/styles_detail.xml   |  7 +++++++
 app/src/main/res/values/styles_detail.xml       | 17 +++++++++++------
 5 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/values-v17/styles_detail.xml

diff --git a/app/src/main/res/layout/category_item.xml b/app/src/main/res/layout/category_item.xml
index 392ee0889..d2e516f80 100644
--- a/app/src/main/res/layout/category_item.xml
+++ b/app/src/main/res/layout/category_item.xml
@@ -24,6 +24,7 @@
     <Button
         android:id="@+id/button"
         tools:text="View all 10"
+        style="@style/DetailsSecondaryButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/main_tab_swap.xml b/app/src/main/res/layout/main_tab_swap.xml
index a7f010b06..bc439185c 100644
--- a/app/src/main/res/layout/main_tab_swap.xml
+++ b/app/src/main/res/layout/main_tab_swap.xml
@@ -54,6 +54,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Find people near me"
+        style="@style/DetailsSecondaryButtonStyle"
         app:layout_constraintTop_toBottomOf="@+id/text2"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
diff --git a/app/src/main/res/layout/my_apps_updates_header.xml b/app/src/main/res/layout/my_apps_updates_header.xml
index f283b406e..3ce423ae9 100644
--- a/app/src/main/res/layout/my_apps_updates_header.xml
+++ b/app/src/main/res/layout/my_apps_updates_header.xml
@@ -15,6 +15,7 @@
     <Button
         android:id="@+id/update_all_button"
         android:text="@string/my_apps_btn_update_all"
+        style="@style/DetailsSecondaryButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
diff --git a/app/src/main/res/values-v17/styles_detail.xml b/app/src/main/res/values-v17/styles_detail.xml
new file mode 100644
index 000000000..a9c311d27
--- /dev/null
+++ b/app/src/main/res/values-v17/styles_detail.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="DetailsButtonStyle" parent="DetailsButtonStyleBase">
+        <item name="android:paddingStart">20dp</item>
+        <item name="android:paddingEnd">20dp</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_detail.xml b/app/src/main/res/values/styles_detail.xml
index fb4290e8c..6030e0548 100644
--- a/app/src/main/res/values/styles_detail.xml
+++ b/app/src/main/res/values/styles_detail.xml
@@ -1,17 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="DetailsPrimaryButtonStyle">
-        <item name="android:padding">5dp</item>
+    <style name="DetailsButtonStyleBase">
+        <item name="android:paddingTop">5dp</item>
+        <item name="android:paddingBottom">5dp</item>
+        <item name="android:paddingLeft">20dp</item>
+        <item name="android:paddingRight">20dp</item>
         <item name="android:textSize">12sp</item>
         <item name="android:textStyle">normal</item>
+    </style>
+
+    <style name="DetailsButtonStyle" parent="DetailsButtonStyleBase" />
+
+    <style name="DetailsPrimaryButtonStyle" parent="DetailsButtonStyle">
         <item name="android:textColor">#ffffff</item>
         <item name="android:background">@drawable/button_primary_background_selector</item>
     </style>
 
-    <style name="DetailsSecondaryButtonStyle">
-        <item name="android:padding">5dp</item>
-        <item name="android:textSize">12sp</item>
-        <item name="android:textStyle">normal</item>
+    <style name="DetailsSecondaryButtonStyle" parent="DetailsButtonStyle">
         <item name="android:textColor">@color/fdroid_blue</item>
         <item name="android:background">@drawable/button_secondary_background_selector</item>
     </style>