From a7e24f0c6bb1c598735eb902cf8cdff8de5dd1da Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Fri, 23 Feb 2018 20:53:16 -0500
Subject: Update/fast adapter (#138)

* Update version and add debug key

* Update fast adapter

* Add debug separation

* Inline functions and remove unused
---
 sample/build.gradle                                 | 21 +++++++++++++++++++--
 .../kotlin/ca/allanwang/kau/sample/MainActivity.kt  | 11 ++++++-----
 sample/src/main/res/values/strings_sample.xml       |  1 -
 3 files changed, 25 insertions(+), 8 deletions(-)

(limited to 'sample')

diff --git a/sample/build.gradle b/sample/build.gradle
index fb55b94..d2572c3 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -32,9 +32,9 @@ android {
     def releaseSigning = file("../files/kau.properties")
     def hasSigning = releaseSigning.exists()
 
-    if (hasSigning) {
-        signingConfigs {
+    signingConfigs {
 
+        if (hasSigning) {
             def releaseProps = new Properties()
             releaseSigning.withInputStream { releaseProps.load(it) }
 
@@ -45,12 +45,29 @@ android {
                 keyPassword releaseProps.getProperty('keyPassword')
             }
         }
+
+        debug {
+            storeFile file("../files/debug.keystore")
+            storePassword "debugKey"
+            keyAlias "debugKey"
+            keyPassword "debugKey"
+        }
     }
 
     buildTypes {
+        debug {
+            minifyEnabled false
+            shrinkResources false
+            applicationIdSuffix ".debug"
+            versionNameSuffix "-debug"
+            signingConfig signingConfigs.debug
+            resValue "string", "app_name", "KAU Debug"
+        }
+
         release {
             minifyEnabled true
             if (hasSigning) signingConfig signingConfigs.release
+            resValue "string", "app_name", "KAU"
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
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 0d2e5a3..b424e91 100644
--- a/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt
+++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt
@@ -233,11 +233,12 @@ class MainActivity : KPrefActivity() {
         this.navigationBarColor = KPrefSample.accentColor
         if (KPrefSample.version < BuildConfig.VERSION_CODE) {
             KPrefSample.version = BuildConfig.VERSION_CODE
-            showChangelog(R.xml.kau_changelog, KPrefSample.textColor) {
-                titleColor(KPrefSample.textColor)
-                backgroundColor(KPrefSample.bgColor)
-                positiveColor(KPrefSample.accentColor)
-            }
+            if (!BuildConfig.DEBUG)
+                showChangelog(R.xml.kau_changelog, KPrefSample.textColor) {
+                    titleColor(KPrefSample.textColor)
+                    backgroundColor(KPrefSample.bgColor)
+                    positiveColor(KPrefSample.accentColor)
+                }
         }
         supportActionBar?.apply {
             setDisplayHomeAsUpEnabled(false)
diff --git a/sample/src/main/res/values/strings_sample.xml b/sample/src/main/res/values/strings_sample.xml
index 1e3361e..46a8140 100644
--- a/sample/src/main/res/values/strings_sample.xml
+++ b/sample/src/main/res/values/strings_sample.xml
@@ -1,5 +1,4 @@
 <resources>
-    <string name="app_name">KAU</string>
     <string name="header">This is a header</string>
     <string name="desc">This is a description</string>
     <string name="checkbox_1">Checkbox 1</string>
-- 
cgit v1.2.3