From 2a636e30b50891ce82970dd5956028769543633f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Sun, 20 Oct 2019 17:30:39 +0200
Subject: [PATCH] Add Android Settings Icons

---
 .../settings/SettingsRegisteredHostsFragment.kt   |  1 +
 android/app/src/main/res/drawable/ic_bitrate.xml  |  9 +++++++++
 .../src/main/res/drawable/ic_console_simple.xml   |  9 +++++++++
 android/app/src/main/res/drawable/ic_fps.xml      |  9 +++++++++
 android/app/src/main/res/drawable/ic_log.xml      |  9 +++++++++
 .../app/src/main/res/drawable/ic_resolution.xml   |  9 +++++++++
 android/app/src/main/res/values/styles.xml        |  2 +-
 android/app/src/main/res/xml/preferences.xml      | 15 ++++++++++-----
 8 files changed, 57 insertions(+), 6 deletions(-)
 create mode 100644 android/app/src/main/res/drawable/ic_bitrate.xml
 create mode 100644 android/app/src/main/res/drawable/ic_console_simple.xml
 create mode 100644 android/app/src/main/res/drawable/ic_fps.xml
 create mode 100644 android/app/src/main/res/drawable/ic_log.xml
 create mode 100644 android/app/src/main/res/drawable/ic_resolution.xml

diff --git a/android/app/src/main/java/com/metallic/chiaki/settings/SettingsRegisteredHostsFragment.kt b/android/app/src/main/java/com/metallic/chiaki/settings/SettingsRegisteredHostsFragment.kt
index 955b359..23508f3 100644
--- a/android/app/src/main/java/com/metallic/chiaki/settings/SettingsRegisteredHostsFragment.kt
+++ b/android/app/src/main/java/com/metallic/chiaki/settings/SettingsRegisteredHostsFragment.kt
@@ -46,6 +46,7 @@ class SettingsRegisteredHostsFragment: PreferenceFragmentCompat(), TitleFragment
 				val pref = Preference(context)
 				pref.title = host.ps4Nickname
 				pref.summary = host.ps4Mac.toString()
+				pref.setIcon(R.drawable.ic_console_simple)
 				preferenceScreen.addPreference(pref)
 			}
 		})
diff --git a/android/app/src/main/res/drawable/ic_bitrate.xml b/android/app/src/main/res/drawable/ic_bitrate.xml
new file mode 100644
index 0000000..0bc089e
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_bitrate.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="?android:attr/textColorPrimary"
+        android:pathData="M15.9,5c-0.17,0 -0.32,0.09 -0.41,0.23l-0.07,0.15 -5.18,11.65c-0.16,0.29 -0.26,0.61 -0.26,0.96 0,1.11 0.9,2.01 2.01,2.01 0.96,0 1.77,-0.68 1.96,-1.59l0.01,-0.03L16.4,5.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM1,9l2,2c2.88,-2.88 6.79,-4.08 10.53,-3.62l1.19,-2.68C9.89,3.84 4.74,5.27 1,9zM21,11l2,-2c-1.64,-1.64 -3.55,-2.82 -5.59,-3.57l-0.53,2.82c1.5,0.62 2.9,1.53 4.12,2.75zM17,15l2,-2c-0.8,-0.8 -1.7,-1.42 -2.66,-1.89l-0.55,2.92c0.42,0.27 0.83,0.59 1.21,0.97zM5,13l2,2c1.13,-1.13 2.56,-1.79 4.03,-2l1.28,-2.88c-2.63,-0.08 -5.3,0.87 -7.31,2.88z"/>
+</vector>
diff --git a/android/app/src/main/res/drawable/ic_console_simple.xml b/android/app/src/main/res/drawable/ic_console_simple.xml
new file mode 100644
index 0000000..75b92c6
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_console_simple.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="?android:attr/textColorPrimary"
+        android:pathData="M20.2,5.9l0.8,-0.8C19.6,3.7 17.8,3 16,3s-3.6,0.7 -5,2.1l0.8,0.8C13,4.8 14.5,4.2 16,4.2s3,0.6 4.2,1.7zM19.3,6.7c-0.9,-0.9 -2.1,-1.4 -3.3,-1.4s-2.4,0.5 -3.3,1.4l0.8,0.8c0.7,-0.7 1.6,-1 2.5,-1 0.9,0 1.8,0.3 2.5,1l0.8,-0.8zM19,13h-2L17,9h-2v4L5,13c-1.1,0 -2,0.9 -2,2v4c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-4c0,-1.1 -0.9,-2 -2,-2zM8,18L6,18v-2h2v2zM11.5,18h-2v-2h2v2zM15,18h-2v-2h2v2z"/>
+</vector>
diff --git a/android/app/src/main/res/drawable/ic_fps.xml b/android/app/src/main/res/drawable/ic_fps.xml
new file mode 100644
index 0000000..6af4280
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_fps.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="?android:attr/textColorPrimary"
+      android:pathData="M15,1L9,1v2h6L15,1zM19.03,7.39l1.42,-1.42c-0.43,-0.51 -0.9,-0.99 -1.41,-1.41l-1.42,1.42C16.07,4.74 14.12,4 12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9 9,-4.03 9,-9c0,-2.12 -0.74,-4.07 -1.97,-5.61zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7zM11.68,15L6.35,15c0.57,1.62 1.82,2.92 3.41,3.56l-0.11,-0.06 2.03,-3.5zM17.65,11c-0.57,-1.6 -1.78,-2.89 -3.34,-3.54L12.26,11h5.39zM10.61,18.83c0.45,0.11 0.91,0.17 1.39,0.17 1.34,0 2.57,-0.45 3.57,-1.19l-2.11,-3.9 -2.85,4.92zM7.55,8.99C6.59,10.05 6,11.46 6,13c0,0.34 0.04,0.67 0.09,1h4.72L7.55,8.99zM16.34,17.13C17.37,16.06 18,14.6 18,13c0,-0.34 -0.04,-0.67 -0.09,-1h-4.34l2.77,5.13zM13.33,7.15C12.9,7.06 12.46,7 12,7c-1.4,0 -2.69,0.49 -3.71,1.29l2.32,3.56 2.72,-4.7z"/>
+</vector>
diff --git a/android/app/src/main/res/drawable/ic_log.xml b/android/app/src/main/res/drawable/ic_log.xml
new file mode 100644
index 0000000..ddb91a0
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_log.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="?android:attr/textColorPrimary"
+        android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM8,14L6,14v-2h2v2zM8,11L6,11L6,9h2v2zM8,8L6,8L6,6h2v2zM15,14h-5v-2h5v2zM18,11h-8L10,9h8v2zM18,8h-8L10,6h8v2z"/>
+</vector>
diff --git a/android/app/src/main/res/drawable/ic_resolution.xml b/android/app/src/main/res/drawable/ic_resolution.xml
new file mode 100644
index 0000000..00a6d47
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_resolution.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="?android:attr/textColorPrimary"
+        android:pathData="M21,15h2v2h-2v-2zM21,11h2v2h-2v-2zM23,19h-2v2c1,0 2,-1 2,-2zM13,3h2v2h-2L13,3zM21,7h2v2h-2L21,7zM21,3v2h2c0,-1 -1,-2 -2,-2zM1,7h2v2L1,9L1,7zM17,3h2v2h-2L17,3zM17,19h2v2h-2v-2zM3,3C2,3 1,4 1,5h2L3,3zM9,3h2v2L9,5L9,3zM5,3h2v2L5,5L5,3zM1,11v8c0,1.1 0.9,2 2,2h12L15,11L1,11zM3,19l2.5,-3.21 1.79,2.15 2.5,-3.22L13,19L3,19z"/>
+</vector>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index b5a09da..503a53e 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -1,5 +1,5 @@
 <resources>
-    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.NoActionBar">
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="colorAccent">@color/accent</item>
diff --git a/android/app/src/main/res/xml/preferences.xml b/android/app/src/main/res/xml/preferences.xml
index 1096cb8..8b67a47 100644
--- a/android/app/src/main/res/xml/preferences.xml
+++ b/android/app/src/main/res/xml/preferences.xml
@@ -10,12 +10,14 @@
             tools:summary="@string/preferences_registered_hosts_summary"
             app:summary=" "
             app:title="@string/preferences_registered_hosts_title"
-            app:fragment="com.metallic.chiaki.settings.SettingsRegisteredHostsFragment"/>
+            app:fragment="com.metallic.chiaki.settings.SettingsRegisteredHostsFragment"
+            app:icon="@drawable/ic_console_simple"/>
 
         <SwitchPreference
             app:key="log_verbose"
             app:title="@string/preferences_log_verbose_title"
-            app:summary="@string/preferences_log_verbose_summary"/>
+            app:summary="@string/preferences_log_verbose_summary"
+            app:icon="@drawable/ic_log" />
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -24,15 +26,18 @@
         <ListPreference
             app:key="@string/preferences_resolution_key"
             app:title="@string/preferences_resolution_title"
-            app:summary="%s" />
+            app:summary="%s"
+            app:icon="@drawable/ic_resolution"/>
 
         <ListPreference
             app:key="@string/preferences_fps_key"
             app:title="@string/preferences_fps_title"
-            app:summary="%s"/>
+            app:summary="%s"
+            app:icon="@drawable/ic_fps"/>
 
         <EditTextPreference
             app:key="@string/preferences_bitrate_key"
-            app:title="@string/preferences_bitrate_title"/>
+            app:title="@string/preferences_bitrate_title"
+            app:icon="@drawable/ic_bitrate"/>
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file