Add SimpleAdapter Annotation

annotation/.gitignore

@@ -0,0 +1,29 @@
+/build
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Intellij
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/dictionaries
+.idea/libraries
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+.idea/misc.xml
+.idea/runConfigurations.xml
+.idea/vcs.xml
+.idea/modules.xml

annotation/build.gradle

@@ -0,0 +1,10 @@
+apply plugin: 'java-library'
+apply plugin: 'kotlin'
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+}
+
+sourceCompatibility = "7"
+targetCompatibility = "7"

annotation/src/main/java/com/umairjavid/kombind/anontation/SimpleKombindAdapter.kt

@@ -0,0 +1,5 @@
+package com.umairjavid.kombind.anontation
+
+@Retention(AnnotationRetention.SOURCE)
+@Target(AnnotationTarget.FIELD)
+annotation class SimpleKombindAdapter(val layoutRes: Int = 0)

app/build.gradle

@@ -36,6 +36,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    kapt {
+        generateStubs = true
+    }
     dataBinding {
         enabled = true
     }
@@ -44,6 +47,9 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation project(':kombind')
+    compileOnly project(':annotation')
+    kapt project(':processor')
+
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "androidx.legacy:legacy-support-v4:$androidx_legacy_support_library_version"
     implementation "androidx.appcompat:appcompat:$androidx_appcompat"

app/src/main/java/com/umairjavid/kombindsample/ui/main/MainActivity.kt

@@ -4,8 +4,10 @@ import android.os.Bundle
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.umairjavid.kombind.ui.KombindActivity
 import com.umairjavid.kombindsample.R
+import com.umairjavid.kombindsample.model.SimpleHeader
 import com.umairjavid.kombindsample.repo.SimpleItemRepository
-import kotlinx.android.synthetic.main.activity_main.*
+import kotlinx.android.synthetic.main.activity_main.simple_item_list
+import main.KombindAdapter_MainState_Items
 
 class MainActivity : KombindActivity<MainViewModel>() {
     override val viewModelClass = MainViewModel::class.java
@@ -21,8 +23,12 @@ class MainActivity : KombindActivity<MainViewModel>() {
     private fun setupSimpleItemList() {
         simple_item_list.apply {
             layoutManager = LinearLayoutManager(this@MainActivity)
-            adapter = SimpleItemAdapter(viewModel.state.items, viewModel)
-                    .registerObserver(this@MainActivity)
+            adapter = object :KombindAdapter_MainState_Items(viewModel.state.items, viewModel) {
+                override fun getLayout(position: Int) = when(items[position]) {
+                    is SimpleHeader -> R.layout.item_simpleheader
+                    else -> R.layout.item_simpleitem
+                }
+            } .registerObserver(this@MainActivity)
         }
     }
 }

app/src/main/java/com/umairjavid/kombindsample/ui/main/MainState.kt

@@ -1,10 +1,12 @@
 package com.umairjavid.kombindsample.ui.main
 
+import com.umairjavid.kombind.anontation.SimpleKombindAdapter
 import com.umairjavid.kombind.model.MutableLiveArrayList
 import com.umairjavid.kombind.model.MutableLiveField
 
 class MainState {
     val title = MutableLiveField("Items Loaded!")
+    @SimpleKombindAdapter
     val items = MutableLiveArrayList<Any>()
 
     operator fun invoke(func: MainState.() -> Unit) = func()

app/src/main/java/com/umairjavid/kombindsample/ui/main/MainViewModel.kt

@@ -11,8 +11,7 @@ import com.umairjavid.kombindsample.repo.SimpleItemRepository
 class MainViewModel(application: Application, private val simpleItemRepository: SimpleItemRepository) : KombindViewModel(application),
         SimpleItemAdapter.HeaderActionHandler,
         SimpleItemAdapter.ItemActionHandler {
-    val state = MainState()
-
+   val state = MainState()
     init {
         loadItems()
     }

build.gradle

@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.android_plugin_version = '3.2.1'
-    ext.kotlin_version = '1.3.0'
+    ext.android_plugin_version = '3.4.0'
+    ext.kotlin_version = '1.3.30'
     repositories {
         google()
         jcenter()

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Nov 10 09:57:43 EST 2018
+#Thu Apr 18 00:03:04 EDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

kombind/build.gradle

@@ -8,15 +8,14 @@ group = 'com.github.ujavid'
 
 project.ext {
     compileSdkVersion = 28
-    buildToolsVersion = '28.0.3'
     minSdkVersion = 14
     targetSdkVersion = 28
     versionCode = 1
     versionName = '1.0'
 
     support_library_version = '27.1.1'
     androidx_appcompat = '1.0.2'
-    android_material = '1.1.0-alpha01'
+    android_material = '1.1.0-alpha05'
     lifecycle_version = '2.0.0'
     junit_version = '4.12'
     test_runner_version = '1.1.0'
@@ -25,7 +24,6 @@ project.ext {
 
 android {
     compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
     defaultConfig {
         minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
@@ -54,7 +52,7 @@ dependencies {
 
 task sourcesJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier 'sources'
+    archiveClassifier.set("sources")
 }
 
 artifacts {

kombind/src/main/java/com/umairjavid/kombind/ui/DialogFragmentBuilder.kt

@@ -10,7 +10,7 @@ open class DialogFragmentBuilder<out T: DialogFragment>(private val clazz: Class
             val fragment = clazz.newInstance()
             fragment.arguments = arguments
             return fragment
-        } catch (e: java.lang.InstantiationException) {
+        } catch (e: InstantiationException) {
             throw RuntimeException(e)
         } catch (e: IllegalAccessException) {
             throw RuntimeException(e)
@@ -27,7 +27,7 @@ open class DialogFragmentBuilder<out T: DialogFragment>(private val clazz: Class
         val fragment = fragmentManager.findFragmentByTag(fragmentTag)
 
         return if (fragment != null) {
-            clazz.cast(fragment)
+            clazz.cast(fragment)!!
         } else {
             forceShow(fragmentManager)
         }

kombind/src/main/java/com/umairjavid/kombind/ui/KombindDialogFragment.kt

@@ -1,17 +1,17 @@
 package com.umairjavid.kombind.ui
 
 import android.app.Dialog
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
-import androidx.databinding.DataBindingUtil
-import androidx.databinding.ViewDataBinding
 import android.os.Bundle
-import androidx.fragment.app.DialogFragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.Window
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ViewDataBinding
 import androidx.databinding.library.baseAdapters.BR
+import androidx.fragment.app.DialogFragment
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProviders
 import com.umairjavid.kombind.ext.registerViewActionObserver
 
 abstract class KombindDialogFragment<VM: KombindViewModel> : DialogFragment() {
@@ -28,7 +28,7 @@ abstract class KombindDialogFragment<VM: KombindViewModel> : DialogFragment() {
         viewModel.activityViewModel = (activity as KombindActivity<*>).viewModel
         viewBinding = DataBindingUtil.inflate(inflater, layoutResId, container, false)
         viewBinding.setVariable(BR.viewModel, viewModel)
-        viewBinding.setLifecycleOwner(this)
+        viewBinding.lifecycleOwner = this
         registerViewActionObserver(viewModel.viewAction)
         return viewBinding.root
     }
@@ -43,7 +43,7 @@ abstract class KombindDialogFragment<VM: KombindViewModel> : DialogFragment() {
         super.onViewStateRestored(savedInstanceState)
 
         val width = resources.displayMetrics.widthPixels
-        dialog.window?.setLayout(width, ViewGroup.LayoutParams.WRAP_CONTENT)
+        dialog!!.window?.setLayout(width, ViewGroup.LayoutParams.WRAP_CONTENT)
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {

processor/.gitignore

@@ -0,0 +1,29 @@
+/build
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Intellij
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/dictionaries
+.idea/libraries
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+.idea/misc.xml
+.idea/runConfigurations.xml
+.idea/vcs.xml
+.idea/modules.xml

processor/build.gradle

@@ -0,0 +1,34 @@
+apply plugin: 'java-library'
+apply plugin: 'kotlin'
+apply plugin: 'kotlin-kapt'
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    kapt 'com.google.auto.service:auto-service:1.0-rc2'
+    implementation 'com.google.auto.service:auto-service:1.0-rc2'
+    implementation project(':annotation')
+    implementation 'com.squareup:kotlinpoet:1.2.0'
+}
+
+sourceCompatibility = "7"
+targetCompatibility = "7"
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+}
+repositories {
+    mavenCentral()
+}
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}