Merge pull request #34 from Omega-R/develop

anton-knyazev · web-flow · commit 07642edbcb52 · 2024-06-19T14:57:21.000+03:00
Fix ambiguous import of providePresenter for multiple presenters in o…
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
-    id 'kotlin-kapt'
     id 'com.google.devtools.ksp'
 }
 
diff --git a/app/src/main/java/com/omegar/mvp/MoxyPresenter.kt b/app/src/main/java/com/omegar/mvp/MoxyPresenter.kt
@@ -1,5 +1,6 @@
 package com.omegar.mvp
 
+import com.omegar.mvp.base.BasePresenter
 import kotlin.time.Duration
 
 class MoxyPresenter : BasePresenter<Long, Int, MoxyView<Int>>() {
diff --git a/app/src/main/java/com/omegar/mvp/MoxyView.kt b/app/src/main/java/com/omegar/mvp/MoxyView.kt
@@ -1,5 +1,6 @@
 package com.omegar.mvp
 
+import com.omegar.mvp.base.BaseView
 import com.omegar.mvp.viewstate.strategy.MoxyViewCommand
 import com.omegar.mvp.viewstate.strategy.StrategyType.ONE_EXECUTION
 import kotlin.time.Duration
diff --git a/app/src/main/java/com/omegar/mvp/base/BasePresenter.kt b/app/src/main/java/com/omegar/mvp/base/BasePresenter.kt
@@ -1,4 +1,6 @@
-package com.omegar.mvp
+package com.omegar.mvp.base
+
+import com.omegar.mvp.MvpPresenter
 
 
 /**
diff --git a/app/src/main/java/com/omegar/mvp/base/BaseView.kt b/app/src/main/java/com/omegar/mvp/base/BaseView.kt
@@ -1,4 +1,6 @@
-package com.omegar.mvp
+package com.omegar.mvp.base
+
+import com.omegar.mvp.MvpView
 
 
 /**
diff --git a/app/src/main/java/com/omegar/mvp/several/OneActivity.kt b/app/src/main/java/com/omegar/mvp/several/OneActivity.kt
@@ -0,0 +1,10 @@
+package com.omegar.mvp.several
+
+import com.omegar.mvp.MvpAppCompatActivity
+
+class OneActivity: MvpAppCompatActivity(), OneView {
+
+
+    private val presenter: OnePresenter by provideOnePresenter { OnePresenter() }
+
+}
diff --git a/app/src/main/java/com/omegar/mvp/several/OnePresenter.kt b/app/src/main/java/com/omegar/mvp/several/OnePresenter.kt
@@ -0,0 +1,6 @@
+package com.omegar.mvp.several
+
+import com.omegar.mvp.MvpPresenter
+
+class OnePresenter: MvpPresenter<OneView>() {
+}
diff --git a/app/src/main/java/com/omegar/mvp/several/OneView.kt b/app/src/main/java/com/omegar/mvp/several/OneView.kt
@@ -0,0 +1,5 @@
+package com.omegar.mvp.several
+
+import com.omegar.mvp.MvpView
+
+interface OneView: MvpView
diff --git a/app/src/main/java/com/omegar/mvp/several/ThreeActivity.kt b/app/src/main/java/com/omegar/mvp/several/ThreeActivity.kt
@@ -0,0 +1,9 @@
+package com.omegar.mvp.several
+
+import com.omegar.mvp.MvpAppCompatActivity
+
+class ThreeActivity: MvpAppCompatActivity(), TwoView {
+
+    private val presenter: ThreePresenter by provideThreePresenter { ThreePresenter() }
+
+}
diff --git a/app/src/main/java/com/omegar/mvp/several/ThreePresenter.kt b/app/src/main/java/com/omegar/mvp/several/ThreePresenter.kt
@@ -0,0 +1,5 @@
+package com.omegar.mvp.several
+
+import com.omegar.mvp.MvpPresenter
+
+class ThreePresenter: MvpPresenter<TwoView>()
diff --git a/app/src/main/java/com/omegar/mvp/several/TwoActivity.kt b/app/src/main/java/com/omegar/mvp/several/TwoActivity.kt
@@ -0,0 +1,9 @@
+package com.omegar.mvp.several
+
+import com.omegar.mvp.MvpAppCompatActivity
+
+class TwoActivity: MvpAppCompatActivity(), TwoView {
+
+    private val presenter: TwoPresenter by provideTwoPresenter { TwoPresenter() }
+
+}
diff --git a/app/src/main/java/com/omegar/mvp/several/TwoPresenter.kt b/app/src/main/java/com/omegar/mvp/several/TwoPresenter.kt
@@ -0,0 +1,5 @@
+package com.omegar.mvp.several
+
+import com.omegar.mvp.MvpPresenter
+
+class TwoPresenter: MvpPresenter<TwoView>()
diff --git a/app/src/main/java/com/omegar/mvp/several/TwoView.kt b/app/src/main/java/com/omegar/mvp/several/TwoView.kt
@@ -0,0 +1,5 @@
+package com.omegar.mvp.several
+
+import com.omegar.mvp.MvpView
+
+interface TwoView: MvpView
diff --git a/moxy/compiler/src/main/java/com/omegar/mvp/compiler/entities/View.kt b/moxy/compiler/src/main/java/com/omegar/mvp/compiler/entities/View.kt
@@ -1,7 +1,6 @@
 package com.omegar.mvp.compiler.entities
 
 import com.google.devtools.ksp.symbol.KSType
-import com.omegar.mvp.compiler.NamingRules.viewStateClassName
 import com.omegar.mvp.compiler.extensions.safeParameterizedBy
 import com.omegar.mvp.viewstate.strategy.StrategyType
 import com.squareup.kotlinpoet.ClassName
diff --git a/moxy/compiler/src/main/java/com/omegar/mvp/compiler/ksp/KspViewParser.kt b/moxy/compiler/src/main/java/com/omegar/mvp/compiler/ksp/KspViewParser.kt
@@ -247,7 +247,9 @@ class KspViewParser(
         putTag(OriginatingMarker::class, KspOriginatingMarker)
         val oldList = getTag(KspOriginatingMarker.Files::class)?.files.orEmpty()
         val list = oldList + declarations.mapNotNull { it.containingFile }
-        putTag(KspOriginatingMarker.Files::class, KspOriginatingMarker.Files(list))
+        val oldFiles = getTag(KspOriginatingMarker.Files::class)
+        val newFiles = oldFiles?.let { KspOriginatingMarker.Files(oldFiles.files + list) } ?: KspOriginatingMarker.Files(list)
+        putTag(KspOriginatingMarker.Files::class, newFiles)
     }
 
     private fun KSTypeReference.toTypeName(resolver: TypeNameResolver): TypeName {
diff --git a/moxy/compiler/src/main/java/com/omegar/mvp/compiler/processors/ViewStateGenerator.kt b/moxy/compiler/src/main/java/com/omegar/mvp/compiler/processors/ViewStateGenerator.kt
@@ -68,8 +68,33 @@ class ViewStateGenerator : Processor<View, FileSpec> {
 
         return typeSpec.toFileSpecBuilder(view.className.packageName)
             .apply {
-                view.presenterClassParamsMap.forEach { entry ->
-                    addFunction(view.createProvidePresenterFunSpec(entry.key, entry.value, view.presenterClassParamsMap.size == 1))
+                val receiver = MvpDelegateHolder::class.asClassName().parameterizedBy(STAR)
+                when (view.presenterClassParamsMap.size) {
+                    1 -> {
+                        val entry = view.presenterClassParamsMap.entries.first()
+                        addFunction(view.createProvidePresenterFunSpec(
+                            receiver = receiver,
+                            presenterType = entry.key,
+                            typeParams = entry.value,
+                            generalName = true
+                        ))
+                        addFunction(view.createProvidePresenterFunSpec(
+                            receiver = receiver,
+                            presenterType = entry.key,
+                            typeParams = entry.value,
+                            generalName = false
+                        ))
+                    }
+                    else -> {
+                        view.presenterClassParamsMap.forEach { entry ->
+                            addFunction(view.createProvidePresenterFunSpec(
+                                receiver = receiver,
+                                presenterType = entry.key,
+                                typeParams = entry.value,
+                                generalName = false
+                            ))
+                        }
+                    }
                 }
             }
             .build()
@@ -245,19 +270,25 @@ class ViewStateGenerator : Processor<View, FileSpec> {
         get() = (if (isVarargs) "*" else "") + name
 
 
-    private fun View.createProvidePresenterFunSpec(presenterType: ClassName, typeParams: List<TypeVariableName>, generalName: Boolean): FunSpec {
+    private fun View.createProvidePresenterFunSpec(
+        receiver: TypeName,
+        presenterType: ClassName,
+        typeParams: List<TypeVariableName>,
+        generalName: Boolean
+    ): FunSpec {
         val parameterizedPresenterType = presenterType.safeParameterizedBy(typeParams)
         val lambda = LambdaTypeName.get(
             parameters = emptyArray<TypeName>(),
             returnType = parameterizedPresenterType
         )
         val presenterFactoryTypeName = CustomPresenterFactory::class.asClassName().parameterizedBy(parameterizedPresenterType, className.safeParameterizedBy(viewTypePresenterParams[presenterType]))
         return FunSpec.builder("provide${ if (generalName) "Presenter" else presenterType.simpleName}")
-            .receiver(MvpDelegateHolder::class.asClassName().parameterizedBy(STAR))
+            .receiver(receiver)
             .addTypeVariables(typeParams)
             .addParameter("factoryBlock", lambda)
             .returns(presenterFactoryTypeName)
             .addCode(viewStateClassName.simpleName + ".Companion\n")
+            .addStatement("@Suppress(\"UNCHECKED_CAST\")")
             .addCode("return %T(%T::class as %T<%T>, factoryBlock).also { mvpDelegate.addCustomPresenterFields(it) }", presenterFactoryTypeName, presenterType, KClass::class.asClassName(), parameterizedPresenterType)
             .build()
     }
diff --git a/moxy/src/main/java/com/omegar/mvp/MvpPresenter.kt b/moxy/src/main/java/com/omegar/mvp/MvpPresenter.kt
@@ -39,6 +39,7 @@ abstract class MvpPresenter<View : MvpView> {
     val attachedViews: Set<View>
         get() = mvpViewState.attachedViews
 
+    @Suppress("UNCHECKED_CAST")
     internal fun attachView(mvpView: MvpView) {
         val view = mvpView as View
         attachView(view, firstLaunch)
@@ -87,10 +88,12 @@ abstract class MvpPresenter<View : MvpView> {
         // nothing
     }
 
+    @Suppress("UNCHECKED_CAST")
     internal fun detachView(view: MvpView) {
         detachView(view as View)
     }
 
+    @Suppress("UNCHECKED_CAST")
     internal fun destroyView(view: MvpView) {
         destroyView(view as View)
     }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id 'com.android.application'`
`3`	`3`	`id 'org.jetbrains.kotlin.android'`
`4`		`- id 'kotlin-kapt'`
`5`	`4`	`id 'com.google.devtools.ksp'`
`6`	`5`	`}`
`7`	`6`