From aa747a2b154cebfdcdde93b68b674d776d964558 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 11 Jun 2017 19:10:05 -0700
Subject: finalize Pref layout

---
 sample/build.gradle                                            | 1 +
 sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt | 4 +++-
 sample/src/main/res/values/strings.xml                         | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'sample')

diff --git a/sample/build.gradle b/sample/build.gradle
index 9a349e6..9f4b555 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -35,4 +35,5 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
     testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
+    compile "com.mikepenz:google-material-typeface:${IICON_GOOGLE}.original@aar"
 }
diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt
index 98285d8..ac80fc6 100644
--- a/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt
+++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt
@@ -9,6 +9,7 @@ import ca.allanwang.kau.utils.darken
 import ca.allanwang.kau.utils.navigationBarColor
 import ca.allanwang.kau.utils.showChangelog
 import ca.allanwang.kau.views.RippleCanvas
+import com.mikepenz.google_material_typeface_library.GoogleMaterial
 
 
 class MainActivity : KPrefActivity() {
@@ -39,7 +40,8 @@ class MainActivity : KPrefActivity() {
                 configs = {
                     allowCustom = false
                 })
-        colorPicker(title = R.string.background_color, description = R.string.color_custom_alpha,
+        colorPicker(iicon = GoogleMaterial.Icon.gmd_colorize,
+                title = R.string.background_color, description = R.string.color_custom_alpha,
                 getter = { KPrefSample.bgColor }, setter = { KPrefSample.bgColor = it; bgCanvas.ripple(it, duration = 500L) },
                 configs = {
                     allowCustomAlpha = true
diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
index d76a9e6..56addfd 100644
--- a/sample/src/main/res/values/strings.xml
+++ b/sample/src/main/res/values/strings.xml
@@ -12,5 +12,5 @@
     <string name="background_color">Background Color</string>
     <string name="color_custom">This selector allows custom colors</string>
     <string name="color_no_custom">This selector does not allow custom colors</string>
-    <string name="color_custom_alpha">This selector allows for custom colors with alpha values kjljkjljk ljl lijl ijlijl</string>
+    <string name="color_custom_alpha">This selector allows for custom colors with alpha values</string>
 </resources>
-- 
cgit v1.2.3