Upgrade OmegaMoxy, fix MvpProcessor

anton-knyazev · anton-knyazev · commit 66b3173e1c48 · 2023-11-22T12:47:15.000+03:00
diff --git a/app/src/main/java/com/omega_r/base/simple/MainPresenter.kt b/app/src/main/java/com/omega_r/base/simple/MainPresenter.kt
@@ -4,15 +4,13 @@ import android.os.SystemClock
 import com.omega_r.base.annotations.AutoPresenterLauncher
 import com.omega_r.base.mvp.presenters.OmegaPresenter
 import com.omega_r.libs.omegatypes.Text
-import com.omegar.mvp.InjectViewState
 import java.io.Serializable
 
 /**
  * Created by Anton Knyazev on 06.05.19.
  */
 typealias TestEntity2 = TestEntity
 @AutoPresenterLauncher(MainActivity::class, TestFragment::class)
-@InjectViewState
 class MainPresenter(testEntity: TestEntity?, t2: TestEntity2?): OmegaPresenter<MainView>() {
 
     companion object {
diff --git a/app/src/main/java/com/omega_r/base/simple/dialog_fragment/DialogDialogFragment.kt b/app/src/main/java/com/omega_r/base/simple/dialog_fragment/DialogDialogFragment.kt
@@ -6,7 +6,6 @@ import com.omega_r.base.components.OmegaDialogFragment
 import com.omega_r.base.simple.R
 import com.omega_r.libs.omegatypes.Text
 import com.omegar.libs.omegalaunchers.createDialogFragmentLauncher
-import com.omegar.mvp.ktx.providePresenter
 
 /**
  * Created by Anton Knyazev on 10.03.2020.
diff --git a/app/src/main/java/com/omega_r/base/simple/dialog_fragment/DialogPresenter.kt b/app/src/main/java/com/omega_r/base/simple/dialog_fragment/DialogPresenter.kt
@@ -1,12 +1,10 @@
 package com.omega_r.base.simple.dialog_fragment
 
 import com.omega_r.base.mvp.presenters.OmegaPresenter
-import com.omegar.mvp.InjectViewState
 
 /**
  * Created by Anton Knyazev on 10.03.2020.
  */
-@InjectViewState
 class DialogPresenter : OmegaPresenter<DialogView>() {
 
 }
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         omegaRecyclerView = '1.10.1'
-        omegaMoxy_version = '3.0.0'
+        omegaMoxy_version = 'b5e0b08d88'
         kotlinCorutines_version = '1.5.0'
 
     }// Top-level build file where you can add configuration options common to all sub-projects/modules.
diff --git a/core/build.gradle b/core/build.gradle
@@ -56,15 +56,6 @@ android {
     }
 
     kotlinOptions.jvmTarget = "1.8"
-
-    kapt {
-        arguments {
-            arg("moxyReflectorPackage", 'com.omega_r.base')
-        }
-    }
-    ksp {
-        arg("moxyReflectorPackage", 'com.omega_r.base')
-    }
 }
 
 
diff --git a/core/src/main/java/com/omega_r/base/data/OmegaBaseRepository.kt b/core/src/main/java/com/omega_r/base/data/OmegaBaseRepository.kt
@@ -27,6 +27,8 @@ open class OmegaBaseRepository<SOURCE : Source>(
 
     protected val coroutineScope = CoroutineScope(Dispatchers.Background + job)
 
+    override var mockMode: Boolean = false
+
     protected val remoteSource: SOURCE? = sources.firstOrNull { it.type == Source.Type.REMOTE }
 
     protected val memorySource: SOURCE?
@@ -49,6 +51,9 @@ open class OmegaBaseRepository<SOURCE : Source>(
         return result
     }
 
+    private val generalSource: SOURCE?
+        get() = if (mockMode) mockSource else remoteSource
+
     protected fun <R> createChannel(strategy: Strategy, block: suspend SOURCE.() -> R): ReceiveChannel<R> {
         return coroutineScope.produce {
             try {
diff --git a/core/src/main/java/com/omega_r/base/data/OmegaRepository.kt b/core/src/main/java/com/omega_r/base/data/OmegaRepository.kt
@@ -2,6 +2,8 @@ package com.omega_r.base.data
 
 interface OmegaRepository {
 
+    var mockMode: Boolean
+
     fun clearCache()
 
     enum class Strategy {
diff --git a/core/src/main/java/com/omega_r/base/mvp/presenters/OmegaPresenter.kt b/core/src/main/java/com/omega_r/base/mvp/presenters/OmegaPresenter.kt
@@ -14,7 +14,6 @@ import com.omegar.libs.omegalaunchers.ActivityLauncher
 import com.omegar.libs.omegalaunchers.BaseIntentLauncher
 import com.omegar.libs.omegalaunchers.DialogFragmentLauncher
 import com.omegar.libs.omegalaunchers.Launcher
-import com.omegar.mvp.InjectViewState
 import com.omegar.mvp.MvpPresenter
 import kotlinx.coroutines.*
 import java.io.PrintWriter
@@ -30,7 +29,6 @@ import kotlin.coroutines.EmptyCoroutineContext
 private const val REQUEST_PERMISSION_BASE = 10000
 private const val REQUEST_CODE_MAX: Int = Int.MAX_VALUE - 1
 
-@InjectViewState
 open class OmegaPresenter<View : OmegaView> : MvpPresenter<View>(), CoroutineScope {
 
     companion object {
diff --git a/core/src/main/java/com/omega_r/base/mvp/views/OmegaBindView.kt b/core/src/main/java/com/omega_r/base/mvp/views/OmegaBindView.kt
@@ -1,11 +1,12 @@
 package com.omega_r.base.mvp.views
 
+import com.omegar.mvp.viewstate.strategy.MoxyViewCommand
 import com.omegar.mvp.viewstate.strategy.StateStrategyType
 import com.omegar.mvp.viewstate.strategy.StrategyType
 
 interface OmegaBindView<M>: OmegaView {
 
-    @StateStrategyType(StrategyType.ADD_TO_END_SINGLE)
+    @MoxyViewCommand(StrategyType.ADD_TO_END_SINGLE)
     fun bind(item: M)
 
 }
diff --git a/mvp-processor/build.gradle b/mvp-processor/build.gradle
@@ -37,6 +37,7 @@ dependencies {
     implementation project(path: ':annotations')
 
     implementation 'com.google.devtools.ksp:symbol-processing-api:1.9.0-1.0.11'
+    implementation "com.github.Omega-R.OmegaMoxy:moxy:${omegaMoxy_version}"
 
     implementation("com.squareup:kotlinpoet:1.14.2")
     implementation("com.squareup:kotlinpoet-ksp:1.14.2")
diff --git a/mvp-processor/src/main/java/com/omegar/mvp_processor/MvpProcessor.kt b/mvp-processor/src/main/java/com/omegar/mvp_processor/MvpProcessor.kt
@@ -8,14 +8,18 @@ import com.google.devtools.ksp.processing.CodeGenerator
 import com.google.devtools.ksp.processing.KSPLogger
 import com.google.devtools.ksp.processing.Resolver
 import com.google.devtools.ksp.processing.SymbolProcessor
+import com.google.devtools.ksp.symbol.ClassKind
 import com.google.devtools.ksp.symbol.KSAnnotated
 import com.google.devtools.ksp.symbol.KSClassDeclaration
 import com.google.devtools.ksp.symbol.KSType
 import com.google.devtools.ksp.symbol.KSTypeAlias
+import com.google.devtools.ksp.symbol.KSTypeParameter
+import com.google.devtools.ksp.symbol.KSTypeReference
 import com.google.devtools.ksp.symbol.KSValueParameter
 import com.google.devtools.ksp.symbol.KSVisitorVoid
 import com.google.devtools.ksp.validate
 import com.omega_r.base.annotations.AutoPresenterLauncher
+import com.omegar.mvp.MvpView
 import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.CodeBlock
 import com.squareup.kotlinpoet.FileSpec
@@ -36,6 +40,7 @@ import com.squareup.kotlinpoet.ksp.addOriginatingKSFile
 import com.squareup.kotlinpoet.ksp.toClassName
 import com.squareup.kotlinpoet.ksp.toTypeName
 import com.squareup.kotlinpoet.ksp.writeTo
+import java.lang.RuntimeException
 
 class MvpProcessor(
     private val options: Map<String, String>,
@@ -85,7 +90,7 @@ class MvpProcessor(
         val activityType = resolver.getClassDeclarationByName(ACTIVITY_NAME.canonicalName)!!.asType(emptyList())
         val fragmentType = resolver.getClassDeclarationByName(FRAGMENT_NAME.canonicalName)!!.asType(emptyList())
         val dialogFragmentType = resolver.getClassDeclarationByName(DIALOG_FRAGMENT_NAME.canonicalName)!!.asType(emptyList())
-
+        val mvpView = resolver.getClassDeclarationByName(MvpView::class.qualifiedName!!)!!.asStarProjectedType()
 
         return resolver.getSymbolsWithAnnotation(AutoPresenterLauncher::class.qualifiedName!!)
             .filterIsInstance<KSClassDeclaration>()
@@ -97,7 +102,8 @@ class MvpProcessor(
                             parcelableType = parcelableType,
                             activityType = activityType,
                             fragmentType = fragmentType,
-                            dialogFragmentType = dialogFragmentType
+                            dialogFragmentType = dialogFragmentType,
+                            mvpView = mvpView
                         ),
                         data = Unit
                     )
@@ -113,6 +119,7 @@ class MvpProcessor(
         private val activityType: KSType,
         private val fragmentType: KSType,
         private val dialogFragmentType: KSType,
+        private val mvpView: KSType,
 
         ) : KSVisitorVoid() {
 
@@ -128,6 +135,9 @@ class MvpProcessor(
 
             val presenterType = if (annotation.localPresenterType) "LOCAL" else "GLOBAL"
 
+            val (_, view) = classDeclaration.getSuperPresenterAndView()
+            val viewStateName = view.toClassName().simpleName.replace("View", "MvpViewState")
+
             val presenterClassName = classDeclaration.toClassName()
 
             val typeSpec = TypeSpec.objectBuilder(factoryName)
@@ -197,7 +207,10 @@ class MvpProcessor(
                                     mvpDelegateLauncherMap[delegatedClass.getDelegateType()]!!
                                 )
                             )
-                            .addCode("return with($factoryName) { createPresenterField() }")
+                            .addCode("return with($factoryName) { \n" +
+                                    "$viewStateName.Companion\n" +
+                                    "createPresenterField() " +
+                                    "}")
                             .build()
                             .apply {
                                 builder.addFunction(this)
@@ -206,10 +219,51 @@ class MvpProcessor(
                 }
                 .build()
                 .also { fileSpec ->
-                    fileSpec.writeTo(codeGenerator = codeGenerator, aggregating = true)
+                    fileSpec.writeTo(codeGenerator = codeGenerator, aggregating = false)
+                }
+        }
+
+        private fun KSClassDeclaration.getSuperPresenterAndView(): Pair<KSClassDeclaration, KSType> {
+            return superTypes
+                .firstNotNullOf { reference ->
+                    (reference.resolve().declaration as? KSClassDeclaration)
+                        ?.takeIf { it.classKind == ClassKind.CLASS }
+                        ?.let {
+                            it to (reference.findView() ?: throw RuntimeException("It is impossible to find a view in $this"))
+                        }
                 }
         }
 
+        private fun KSTypeReference.findView(): KSType? {
+            val type = element
+                ?.typeArguments
+                ?.asSequence()
+                ?.map { it.type?.resolve() }
+                ?.firstOrNull {
+                    it?.let {
+                        mvpView.isAssignableFrom(it)
+                    } ?: false
+                }
+            return when (type?.declaration) {
+                is KSClassDeclaration -> type
+                is KSTypeParameter -> {
+                    (type.declaration as KSTypeParameter)
+                        .bounds
+                        .map {
+                            it.resolve()
+                        }
+                        .firstOrNull {
+                            mvpView.isAssignableFrom(it)
+                        }
+                }
+
+                else -> {
+                    logger.warn("Unknown type is " + type?.declaration?.let { it::class}.toString())
+                    null
+                }
+            }
+        }
+
         private fun List<Pair<String, KSValueParameter>>.generateBundlePutter(delegatedClass: TypeName): CodeBlock {
             val args = mutableListOf<Any>(delegatedClass)
             val format = "return createLauncher(%T::class, " +

Original file line number	Diff line number	Diff line change
`@@ -56,15 +56,6 @@ android {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`kotlinOptions.jvmTarget = "1.8"`
`59`		`-`
`60`		`- kapt {`
`61`		`- arguments {`
`62`		`- arg("moxyReflectorPackage", 'com.omega_r.base')`
`63`		`- }`
`64`		`- }`
`65`		`- ksp {`
`66`		`- arg("moxyReflectorPackage", 'com.omega_r.base')`
`67`		`- }`
`68`	`59`	`}`
`69`	`60`
`70`	`61`