Merge pull request #27 from Omega-R/develop

Add ktx, add logs

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

@@ -1,11 +1,10 @@
 package example.com.moxy_androidx_sample
 
-import android.location.Location
 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
-import example.com.moxy_androidx_sample.packagee.Item
 
 class MainActivity : BaseActivity(R.layout.activity_main), Contract.MainView<Double>, SecondInterface {
 //	override fun fourth(item: String?) {
@@ -32,16 +31,18 @@ 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)
 //		setContentView(R.layout.activity_main)
 	}
 
 	override fun printLog(msg: Double?, log: String?) {
-		Log.e(TAG, "printLog : msg : $msg activity hash code : ${hashCode()}")
+		Log.e(TAG, "printLog : msg : $msg activity hash code : ${hashCode()}, log: $log")
 	}
 
 	override fun second() {

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

@@ -1,14 +1,20 @@
 package example.com.moxy_androidx_sample
 
 import android.util.Log
+import example.com.moxy_androidx_sample.BasePresenter
+import example.com.moxy_androidx_sample.MainActivity
 import example.com.moxy_androidx_sample.contract.Contract
 
 class MainPresenter : BasePresenter<Contract.MainView<Double>>() {
-	
+
+	init {
+		viewState.printLog(10.0, "Kek")
+	}
+
 	override fun onFirstViewAttach() {
 		super.onFirstViewAttach()
 		Log.e(MainActivity.TAG, "presenter hash code : ${hashCode()}")
-		viewState.printLog(10.0, "Kek")
+		viewState.printLog(2.0, viewState.toString())
 	}
 
 }

moxy-compiler/src/main/java/com/omegar/mvp/compiler/Util.java

@@ -16,7 +16,6 @@
  */
 package com.omegar.mvp.compiler;
 
-import com.google.common.collect.Iterables;
 import com.omegar.mvp.MvpView;
 import com.omegar.mvp.viewstate.strategy.StrategyType;
 import com.squareup.javapoet.ClassName;
@@ -45,7 +44,6 @@
 import javax.lang.model.type.TypeVariable;
 import javax.lang.model.type.WildcardType;
 import javax.lang.model.util.Elements;
-import javax.lang.model.util.Types;
 
 /**
  * Utilities for handling types in annotation processors

moxy-compiler/src/main/java/com/omegar/mvp/compiler/pipeline/JavaFileWriter.java

@@ -45,10 +45,7 @@ private void run(JavaFile file) {
     }
 
     public void shutdown() {
-        List<Runnable> runnables = mAsyncExecutors.shutdownNow();
-        for (Runnable runnable : runnables) {
-            runnable.run();
-        }
+        mAsyncExecutors.shutdown();
 
         try {
             mAsyncExecutors.awaitTermination(2, TimeUnit.MINUTES);

moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceInfoToViewStateJavaFileProcessor.java

@@ -166,7 +166,8 @@ private TypeSpec generateCommandClass(ViewMethod method, List<TypeVariableName>
                 }})
                 .superclass(VIEW_COMMAND_TYPE_NAME)
                 .addMethod(generateCommandConstructor(method))
-                .addMethod(applyMethod);
+                .addMethod(applyMethod)
+                .addMethod(generateToStringMethodSpec(method));
 
         for (ParameterSpec parameter : method.getParameterSpecs()) {
             classBuilder.addField(parameter.type, parameter.name, Modifier.PRIVATE, Modifier.FINAL);
@@ -221,6 +222,37 @@ private MethodSpec generateCommandConstructor(ViewMethod method) {
         return builder.build();
     }
 
+    private MethodSpec generateToStringMethodSpec(ViewMethod method) {
+        StringBuilder statement = new StringBuilder("return \"" + method.getName());
+
+        boolean firstParams = true;
+        for (ParameterSpec parameter : method.getParameterSpecs()) {
+            if (firstParams) {
+                firstParams = false;
+                statement.append("{\" + \n\"");
+            } else {
+                statement.append(" + \n\", ");
+            }
+
+            statement.append(parameter.name)
+                    .append("=\" + ")
+                    .append(parameter.name)
+                    .append(" ");
+        }
+        if (!firstParams) {
+            statement.append("+\n'}'");
+        } else {
+            statement.append("\"");
+        }
+
+        return MethodSpec.methodBuilder("toString")
+                .addAnnotation(Override.class)
+                .addModifiers(Modifier.PUBLIC)
+                .returns(String.class)
+                .addStatement(statement.toString())
+                .build();
+    }
+
     @Override
     protected void finish(PipelineContext<JavaFile> nextContext) {
         mReflectorPackagesPublisher.finish();

moxy-ktx/.gitignore

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

moxy-ktx/build.gradle

@@ -0,0 +1,27 @@
+buildscript {
+    repositories {
+        google()
+        jcenter()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+
+apply plugin: 'java-library'
+apply plugin: 'kotlin'
+apply plugin: 'com.github.dcendents.android-maven'
+group = 'com.github.Omega-R.OmegaMoxy'
+
+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)
+    }
+}