Add ktx

Author: anton-knyazev

build.gradle

@@ -24,7 +24,7 @@ allprojects {
 ext {
     targetVersionCode = 46
     targetVersionName = "1.5.6"
-    kotlin_version = '1.3.50'
+    kotlin_version = '1.3.72'
     def autoServiceVersion = '1.0-rc5'
     def gradleIncapHelperVersion = '0.3'
 

moxy-androidx-sample/build.gradle

@@ -45,6 +45,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation project(':moxy')
     implementation project(':moxy-androidx')
+    implementation project(':moxy-ktx')
     kapt project(':moxy-compiler')
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }

moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainActivity.kt

@@ -2,6 +2,7 @@ package example.com.moxy_androidx_sample
 
 import android.os.Bundle
 import android.util.Log
+import com.omegar.mvp.ktx.providePresenter
 import com.omegar.mvp.presenter.InjectPresenter
 import example.com.moxy_androidx_sample.contract.Contract
 
@@ -30,8 +31,10 @@ class MainActivity : BaseActivity(R.layout.activity_main), Contract.MainView<Dou
 //		TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 //	}
 
-	@InjectPresenter
-	internal lateinit var presenter: MainPresenter
+
+	private val presenter: MainPresenter by providePresenter {
+		MainPresenter()
+	}
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)

moxy-ktx/.gitignore

@@ -0,0 +1 @@
+/build

moxy-ktx/build.gradle

@@ -0,0 +1,26 @@
+buildscript {
+    repositories {
+        google()
+        jcenter()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+
+apply plugin: 'java-library'
+apply plugin: 'kotlin'
+
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+}
+
+dependencies {
+    api(project(":moxy"))
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+}

moxy-ktx/src/main/java/com/omegar/mvp/ktx/CustomPresenterFactory.kt

@@ -0,0 +1,40 @@
+package com.omegar.mvp.ktx
+
+import com.omegar.mvp.MvpDelegateHolder
+import com.omegar.mvp.MvpPresenter
+import com.omegar.mvp.presenter.PresenterField
+import com.omegar.mvp.presenter.PresenterType
+import kotlin.reflect.KProperty
+
+/**
+ * Created by Anton Knyazev on 25.11.2020.
+ */
+
+class CustomPresenterFactory<P : MvpPresenter<*>>(tag: String, clz: Class<out MvpPresenter<*>>, private val factoryBlock: () -> P) :
+    PresenterField<Any?>(tag, PresenterType.LOCAL, null, clz) {
+
+    private var presenter: P? = null
+
+    override fun bind(container: Any?, presenter: MvpPresenter<*>?) {
+        @Suppress("UNCHECKED_CAST")
+        this.presenter = presenter as P
+    }
+
+    override fun providePresenter(delegated: Any?): MvpPresenter<*> {
+        return factoryBlock()
+    }
+
+    operator fun getValue(thisRef: Any?, property: KProperty<*>): P {
+        return presenter!!
+    }
+
+}
+
+inline fun <reified P : MvpPresenter<*>> MvpDelegateHolder.providePresenter(
+    name: String = "presenter",
+    noinline factoryBlock: () -> P = { P::class.java.newInstance() }
+): CustomPresenterFactory<P> {
+    return CustomPresenterFactory(P::class.java.name + "." + name, P::class.java, factoryBlock).also {
+        mvpDelegate.addCustomPresenterFields(it)
+    }
+}

settings.gradle

@@ -1,3 +1,4 @@
+include ':moxy-ktx'
 include ':moxy', ':stub-reflector', ':moxy-android', ':moxy-compiler', ':stub-android', ':moxy-app-compat', ':moxy-androidx', ':stub-appcompat', ':stub-androidx'
 include ':sample-github'
 include ':sample-kotlin'