From 7c9f78708f834f0e3d2b9206cbd2d08406afadb5 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Wed, 3 Jun 2015 12:58:28 +0000
Subject: [PATCH] Add padding to settings icons, tweak size

---
 .../main/java/i2p/bote/android/util/IconicsPreference.java  | 3 +++
 app/src/main/res/values/attrs.xml                           | 1 +
 app/src/main/res/values/dimens.xml                          | 2 +-
 app/src/main/res/xml/settings.xml                           | 6 ++++++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/i2p/bote/android/util/IconicsPreference.java b/app/src/main/java/i2p/bote/android/util/IconicsPreference.java
index a21e114..c7ba5b2 100644
--- a/app/src/main/java/i2p/bote/android/util/IconicsPreference.java
+++ b/app/src/main/java/i2p/bote/android/util/IconicsPreference.java
@@ -37,6 +37,9 @@ public class IconicsPreference extends Preference {
         int size = a.getDimensionPixelSize(R.styleable.IconicsPreference_ip_size, 0);
         if (size != 0)
             icon.sizePx(size);
+        int padding = a.getDimensionPixelSize(R.styleable.IconicsPreference_ip_padding, 0);
+        if (padding != 0)
+            icon.paddingPx(padding);
 
         a.recycle();
         setIcon(icon);
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 0e2ce7a..601de83 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -4,6 +4,7 @@
         <attr name="ip_icon" format="string"/>
         <attr name="ip_color" format="color"/>
         <attr name="ip_size" format="dimension"/>
+        <attr name="ip_padding" format="dimension"/>
     </declare-styleable>
 
     <!-- Declare custom theme attributes that allow changing which styles are
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 4bb8d72..cf28def 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -38,5 +38,5 @@
 
     <dimen name="pie_size">300dp</dimen>
 
-    <dimen name="pref_icon">30dp</dimen>
+    <dimen name="pref_icon">32dp</dimen>
 </resources>
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index 531a504..329d598 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -6,35 +6,41 @@
         android:title="@string/settings_label_network"
         app:ip_color="@color/pref_icon"
         app:ip_icon="gmd-settings-ethernet"
+        app:ip_padding="1dp"
         app:ip_size="@dimen/pref_icon"/>
     <i2p.bote.android.util.IconicsPreference
         android:key="preference_category_identities"
         android:title="@string/pref_title_identities"
         app:ip_color="@color/pref_icon"
         app:ip_icon="gmd-account-box"
+        app:ip_padding="4dp"
         app:ip_size="@dimen/pref_icon"/>
     <i2p.bote.android.util.IconicsPreference
         android:key="preference_category_privacy"
         android:title="@string/pref_title_privacy"
         app:ip_color="@color/pref_icon"
         app:ip_icon="gmd-visibility"
+        app:ip_padding="1dp"
         app:ip_size="@dimen/pref_icon"/>
     <i2p.bote.android.util.IconicsPreference
         android:key="preference_category_app_protection"
         android:title="@string/settings_label_app_protection"
         app:ip_color="@color/pref_icon"
         app:ip_icon="gmd-lock"
+        app:ip_padding="2dp"
         app:ip_size="@dimen/pref_icon"/>
     <i2p.bote.android.util.IconicsPreference
         android:key="preference_category_appearance"
         android:title="@string/settings_label_appearance"
         app:ip_color="@color/pref_icon"
         app:ip_icon="gmd-settings-display"
+        app:ip_padding="1dp"
         app:ip_size="@dimen/pref_icon"/>
     <i2p.bote.android.util.IconicsPreference
         android:key="preference_category_advanced"
         android:title="@string/settings_label_advanced"
         app:ip_color="@color/pref_icon"
         app:ip_icon="gmd-settings"
+        app:ip_padding="3dp"
         app:ip_size="@dimen/pref_icon"/>
 </PreferenceScreen>
\ No newline at end of file