Merge pull request #206 from AllanWang/update/fastadapter

Update fastadapter to 4.x.x

8 files changed, 38 insertions, 23 deletions

diff --git a/sample/build.gradle b/sample/build.gradle
index 4e34bf9..ab98695 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -1,3 +1,5 @@
+import kau.Dependencies
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -54,8 +56,6 @@ android {
 
     buildTypes {
         debug {
-            minifyEnabled false
-            shrinkResources false
             applicationIdSuffix ".debug"
             versionNameSuffix "-debug"
             signingConfig signingConfigs.debug
@@ -78,6 +78,7 @@ android {
     packagingOptions {
         pickFirst 'META-INF/core_release.kotlin_module'
         pickFirst 'META-INF/library_release.kotlin_module'
+        pickFirst 'META-INF/library-core_release.kotlin_module'
     }
 
     compileOptions {
@@ -127,15 +128,15 @@ dependencies {
     implementation project(':searchview')
     implementation project(':mediapicker')
 
-    implementation kau.Dependencies.materialDialog("input")
+    implementation Dependencies.materialDialog("input")
 
-    testImplementation kau.Dependencies.kotlinTest
-    testImplementation kau.Dependencies.junit
+    testImplementation Dependencies.kotlinTest
+    testImplementation Dependencies.junit
 
-    androidTestImplementation kau.Dependencies.kotlinTest
-    androidTestImplementation kau.Dependencies.espresso
-    androidTestImplementation kau.Dependencies.espresso("intents")
-    androidTestImplementation kau.Dependencies.espresso("contrib")
-    androidTestImplementation kau.Dependencies.testRules
-    androidTestImplementation kau.Dependencies.testRunner
+    androidTestImplementation Dependencies.kotlinTest
+    androidTestImplementation Dependencies.espresso
+    androidTestImplementation Dependencies.espresso("intents")
+    androidTestImplementation Dependencies.espresso("contrib")
+    androidTestImplementation Dependencies.testRules
+    androidTestImplementation Dependencies.testRunner
 }
diff --git a/sample/proguard-rules.pro b/sample/proguard-rules.pro
index f3a65f0..3189ebb 100644
--- a/sample/proguard-rules.pro
+++ b/sample/proguard-rules.pro
@@ -1,2 +1,7 @@
 -ignorewarnings
--dontwarn kotlin.**
\ No newline at end of file
+-dontwarn kotlin.**
+# Iconics
+-keep class .R
+-keep class **.R$* {
+    <fields>;
+}
\ No newline at end of file
diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/AboutActivity.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/AboutActivity.kt
index 928070e..ffe769a 100644
--- a/sample/src/main/kotlin/ca/allanwang/kau/sample/AboutActivity.kt
+++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/AboutActivity.kt
@@ -18,7 +18,7 @@ package ca.allanwang.kau.sample
 import ca.allanwang.kau.about.AboutActivityBase
 import ca.allanwang.kau.adapters.FastItemThemedAdapter
 import ca.allanwang.kau.iitems.CardIItem
-import com.mikepenz.fastadapter.IItem
+import com.mikepenz.fastadapter.GenericItem
 
 /**
  * Created by Allan Wang on 2017-06-27.
@@ -33,7 +33,7 @@ class AboutActivity : AboutActivityBase(R.string::class.java, {
     faqParseNewLine = false
 }) {
 
-    override fun postInflateMainPage(adapter: FastItemThemedAdapter<IItem<*, *>>) {
+    override fun postInflateMainPage(adapter: FastItemThemedAdapter<GenericItem>) {
         adapter.add(CardIItem {
             title = "About KAU"
             descRes = R.string.about_kau
diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/AdapterActivity.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/AdapterActivity.kt
index a11a672..b166210 100644
--- a/sample/src/main/kotlin/ca/allanwang/kau/sample/AdapterActivity.kt
+++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/AdapterActivity.kt
@@ -20,9 +20,9 @@ import ca.allanwang.kau.adapters.fastAdapter
 import ca.allanwang.kau.iitems.CardIItem
 import ca.allanwang.kau.ui.activities.ElasticRecyclerActivity
 import ca.allanwang.kau.utils.toast
-import com.mikepenz.fastadapter.IItem
+import com.mikepenz.fastadapter.GenericItem
 import com.mikepenz.fastadapter.adapters.ItemAdapter
-import com.mikepenz.google_material_typeface_library.GoogleMaterial
+import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
 
 /**
  * Created by Allan Wang on 2017-07-17.
@@ -30,7 +30,7 @@ import com.mikepenz.google_material_typeface_library.GoogleMaterial
 class AdapterActivity : ElasticRecyclerActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?, configs: Configs): Boolean {
-        val adapter = ItemAdapter<IItem<*, *>>()
+        val adapter = ItemAdapter<GenericItem>()
         recycler.adapter = fastAdapter(adapter)
         adapter.add(
             listOf(
diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/AnimActivity.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/AnimActivity.kt
index 349e3d1..a5ef8c3 100644
--- a/sample/src/main/kotlin/ca/allanwang/kau/sample/AnimActivity.kt
+++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/AnimActivity.kt
@@ -30,7 +30,7 @@ import ca.allanwang.kau.utils.startActivity
 import ca.allanwang.kau.utils.toast
 import ca.allanwang.kau.utils.withAlpha
 import ca.allanwang.kau.utils.withSlideOut
-import com.mikepenz.fastadapter.commons.adapters.FastItemAdapter
+import com.mikepenz.fastadapter.adapters.FastItemAdapter
 
 /**
  * Created by Allan Wang on 2017-06-12.
@@ -43,14 +43,18 @@ class AnimActivity : KauBaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val adapter = FastItemAdapter<PermissionCheckbox>()
-        setContentView(fullLinearRecycler(adapter).apply { setBackgroundColor(KPrefSample.bgColor.withAlpha(255)) })
+        setContentView(fullLinearRecycler(adapter).apply {
+            setBackgroundColor(
+                KPrefSample.bgColor.withAlpha(255)
+            )
+        })
 
         adapter.add(listOf(
             PERMISSION_ACCESS_COARSE_LOCATION,
             PERMISSION_ACCESS_FINE_LOCATION,
             PERMISSION_CAMERA
         ).map { PermissionCheckbox(it) })
-        adapter.withOnClickListener { _, _, item, _ ->
+        adapter.onClickListener = { _, _, item, _ ->
             KL.d { "Perm Click" }
             kauRequestPermissions(item.permission) { granted, _ ->
                 toast("${item.permission} enabled: $granted")
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 9ce3f42..11d19e5 100644
--- a/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt
+++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt
@@ -39,7 +39,7 @@ import ca.allanwang.kau.utils.toast
 import ca.allanwang.kau.utils.withSceneTransitionAnimation
 import ca.allanwang.kau.xml.showChangelog
 import com.afollestad.materialdialogs.input.input
-import com.mikepenz.google_material_typeface_library.GoogleMaterial
+import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
 
 class MainActivity : KPrefActivity() {
 
@@ -106,7 +106,7 @@ class MainActivity : KPrefActivity() {
         accentColor = KPrefSample::accentColor
     }
 
-    override fun onCreateKPrefs(savedInstanceState: android.os.Bundle?): KPrefAdapterBuilder.() -> Unit = {
+    override fun onCreateKPrefs(savedInstanceState: Bundle?): KPrefAdapterBuilder.() -> Unit = {
 
         header(R.string.header)
 
diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/PermissionCheckbox.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/PermissionCheckbox.kt
index 025179d..7cf6cc1 100644
--- a/sample/src/main/kotlin/ca/allanwang/kau/sample/PermissionCheckbox.kt
+++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/PermissionCheckbox.kt
@@ -25,7 +25,7 @@ import ca.allanwang.kau.utils.hasPermission
 /**
  * Created by Allan Wang on 2017-07-03.
  */
-class PermissionCheckbox(val permission: String) : KauIItem<PermissionCheckbox, PermissionCheckbox.ViewHolder>(
+class PermissionCheckbox(val permission: String) : KauIItem<PermissionCheckbox.ViewHolder>(
     R.layout.permission_checkbox, { ViewHolder(it) }) {
 
     override fun bindView(holder: ViewHolder, payloads: MutableList<Any>) {
diff --git a/sample/src/main/res/xml/kau_changelog.xml b/sample/src/main/res/xml/kau_changelog.xml
index 62614ed..de73b41 100644
--- a/sample/src/main/res/xml/kau_changelog.xml
+++ b/sample/src/main/res/xml/kau_changelog.xml
@@ -6,6 +6,11 @@
     <item text="" />
     -->
 
+    <version title="v5.2.0" />
+    <item text=":fastadapter: Migrate fastadapter to v4.x.x" />
+    <item text="" />
+    <item text="" />
+
     <version title="v5.1.0" />
     <item text=":adapter: Moved fastadapter elements to new module, :fastadapter:. To migrate, simply rename the dependency. If you don't use fast adapter, no changes are necessary" />
     <item text=":adapter: Make NoAnimatorChange an object; previously a class" />