From bc492750fbb514d30d8aa154827443092cd83a5d Mon Sep 17 00:00:00 2001
From: Bart Sopers <bart@sopers.nl>
Date: Mon, 23 Nov 2020 22:02:57 +0100
Subject: [PATCH] Add some padding between Omnipod button icon & text

---
 .../icon_pod_management_activate_pod.xml        | 17 +++++------------
 .../src/main/res/layout/omnipod_overview.xml    |  6 ++++++
 .../main/res/layout/omnipod_pod_management.xml  |  7 +++++++
 omnipod/src/main/res/values/dimens.xml          |  1 +
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/omnipod/src/main/res/drawable/icon_pod_management_activate_pod.xml b/omnipod/src/main/res/drawable/icon_pod_management_activate_pod.xml
index 8f71e8ed1c..f0773c48e6 100644
--- a/omnipod/src/main/res/drawable/icon_pod_management_activate_pod.xml
+++ b/omnipod/src/main/res/drawable/icon_pod_management_activate_pod.xml
@@ -1,13 +1,6 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:tint="@color/icon_pod_management_activate_pod"
-    android:viewportWidth="310"
-    android:viewportHeight="310">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M221.742,46.906c-7.28,-3.954 -16.387,-1.259 -20.341,6.021c-3.955,7.279 -1.259,16.386 6.02,20.341C242.937,92.561 265,129.626 265,170c0,60.654 -49.346,110 -110,110S45,230.654 45,170c0,-40.198 21.921,-77.186 57.208,-96.531c7.265,-3.982 9.925,-13.1 5.943,-20.364c-3.983,-7.264 -13.101,-9.925 -20.364,-5.943C42.891,71.775 15,118.844 15,170c0,77.196 62.804,140 140,140s140,-62.804 140,-140C295,118.62 266.929,71.453 221.742,46.906z" />
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M155,130c8.284,0 15,-6.716 15,-15V15c0,-8.284 -6.716,-15 -15,-15c-8.284,0 -15,6.716 -15,15v100C140,123.284 146.716,130 155,130z" />
+<vector android:height="48dp" android:viewportHeight="200.2373"
+    android:viewportWidth="200.23718" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#808080"
+        android:pathData="M100.074,0.001C56.873,0.24 21.633,35.968 21.305,80.124l-0.752,101.244c-0.073,9.828 7.714,17.88 17.356,17.951l123.405,0.917c9.641,0.072 17.543,-7.867 17.616,-17.691l0.752,-101.241c0.331,-44.507 -34.922,-80.978 -78.587,-81.303 -0.341,-0.002 -0.681,-0.002 -1.022,-0.001zM101.007,9.013c39.735,0.295 71.815,33.483 71.515,73.985l-0.685,92.129c-0.066,8.94 -7.258,16.164 -16.031,16.099L43.507,190.392c-8.773,-0.065 -15.86,-7.392 -15.794,-16.335L28.398,81.924C28.699,41.425 61.272,8.717 101.007,9.013Z" android:strokeWidth="0.36617547"/>
+    <path android:fillColor="#00c021" android:pathData="m47.836,127.9c-1.714,-18.455 6.167,-35.171 19.24,-45.791 5.096,-4.143 12.716,-0.595 12.716,5.953l0,0c0,2.405 -1.143,4.62 -3,6.12 -9.263,7.549 -14.835,19.455 -13.478,32.599 1.762,17.121 15.478,30.98 32.576,32.885 22.312,2.5 41.267,-14.978 41.267,-36.79 0,-11.573 -5.358,-21.931 -13.716,-28.718 -1.857,-1.5 -2.977,-3.715 -2.977,-6.096l0,0c0,-6.477 7.501,-10.144 12.549,-6.096 11.954,9.644 19.622,24.384 19.622,40.91 0,30.218 -25.67,54.578 -56.364,52.364 -25.384,-1.786 -46.077,-22.003 -48.435,-47.339zM100.104,58.725c-4.286,0 -7.739,3.477 -7.739,7.739l0,35.647c0,4.286 3.477,7.739 7.739,7.739 4.262,0 7.739,-3.477 7.739,-7.739L107.843,66.464c0,-4.262 -3.453,-7.739 -7.739,-7.739z"/>
 </vector>
diff --git a/omnipod/src/main/res/layout/omnipod_overview.xml b/omnipod/src/main/res/layout/omnipod_overview.xml
index 7da99f4579..a873bfe104 100644
--- a/omnipod/src/main/res/layout/omnipod_overview.xml
+++ b/omnipod/src/main/res/layout/omnipod_overview.xml
@@ -748,6 +748,7 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:drawableTop="@drawable/icon_omnipod_overview_refresh_pod_status"
+                    android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/omnipod_overview_button_refresh" />
@@ -759,6 +760,7 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:drawableTop="@drawable/icon_omnipod_overview_pod_management"
+                    android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/omnipod_overview_button_pod_management" />
@@ -770,6 +772,7 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:drawableTop="@drawable/icon_omnipod_overview_acknowledge_alerts"
+                    android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/omnipod_overview_button_acknowledge_active_alerts" />
@@ -781,6 +784,7 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:drawableTop="@drawable/icon_omnipod_overview_set_time"
+                    android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/omnipod_overview_button_set_time"
@@ -793,6 +797,7 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:drawableTop="@drawable/icon_omnipod_overview_resume_delivery"
+                    android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/omnipod_overview_button_resume_delivery"
@@ -805,6 +810,7 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:drawableTop="@drawable/icon_omnipod_overview_suspend_delivery"
+                    android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/omnipod_overview_button_suspend_delivery"
diff --git a/omnipod/src/main/res/layout/omnipod_pod_management.xml b/omnipod/src/main/res/layout/omnipod_pod_management.xml
index 577c5960fd..d9cf031689 100644
--- a/omnipod/src/main/res/layout/omnipod_pod_management.xml
+++ b/omnipod/src/main/res/layout/omnipod_pod_management.xml
@@ -63,6 +63,7 @@
                 android:layout_marginRight="40dp"
                 android:layout_weight="0.5"
                 android:drawableTop="@drawable/icon_pod_management_activate_pod"
+                android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
                 android:text="@string/omnipod_pod_management_button_activate_pod"
                 android:textAllCaps="false" />
 
@@ -76,6 +77,7 @@
                 android:layout_marginRight="40dp"
                 android:layout_weight="0.5"
                 android:drawableTop="@drawable/icon_pod_management_deactivate_pod"
+                android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
                 android:text="@string/omnipod_pod_management_button_deactivate_pod"
                 android:textAllCaps="false" />
 
@@ -89,6 +91,7 @@
                 android:layout_marginRight="40dp"
                 android:layout_weight="0.5"
                 android:drawableTop="@drawable/icon_pod_management_discard_pod"
+                android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
                 android:text="@string/omnipod_pod_management_button_discard_pod"
                 android:textAllCaps="false" />
 
@@ -102,6 +105,7 @@
                 android:layout_marginRight="40dp"
                 android:layout_weight="0.5"
                 android:drawableTop="@drawable/icon_pod_management_play_test_beep"
+                android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
                 android:text="@string/omnipod_pod_management_button_play_test_beep"
                 android:textAllCaps="false" />
 
@@ -115,6 +119,7 @@
                 android:layout_marginRight="40dp"
                 android:layout_weight="0.5"
                 android:drawableTop="@drawable/icon_pod_management_pulse_log"
+                android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
                 android:text="@string/omnipod_pod_management_button_read_pulse_log"
                 android:textAllCaps="false"
                 android:visibility="gone" />
@@ -129,6 +134,7 @@
                 android:layout_marginRight="40dp"
                 android:layout_weight="0.5"
                 android:drawableTop="@drawable/icon_pod_management_pod_history"
+                android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
                 android:text="@string/omnipod_pod_management_button_pod_history"
                 android:textAllCaps="false" />
 
@@ -142,6 +148,7 @@
                 android:layout_marginRight="40dp"
                 android:layout_weight="0.5"
                 android:drawableTop="@drawable/icon_pod_management_rl_stats"
+                android:drawablePadding="@dimen/omnipod_icon_button_drawable_padding"
                 android:text="@string/omnipod_pod_management_button_riley_link_stats"
                 android:textAllCaps="false" />
 
diff --git a/omnipod/src/main/res/values/dimens.xml b/omnipod/src/main/res/values/dimens.xml
index fba59bf307..62deaa8023 100644
--- a/omnipod/src/main/res/values/dimens.xml
+++ b/omnipod/src/main/res/values/dimens.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="omnipod_wizard_vertical_spacing">10dp</dimen>
+    <dimen name="omnipod_icon_button_drawable_padding">4dp</dimen>
 </resources>
\ No newline at end of file