Fix compilation with generic presenter

Author: anton-knyazev

app/src/main/java/com/omegar/mvp/BasePresenter.kt

@@ -5,5 +5,5 @@ package com.omegar.mvp
  * Created by Anton Knyazev on 09.06.2023.
  * Copyright (c) 2023 Omega https://omega-r.com
  */
-open class BasePresenter<T: Number, VIEW: BaseView>: MvpPresenter<VIEW>() {
+open class BasePresenter<T: Number, M, VIEW: BaseView<M>>: MvpPresenter<VIEW>() {
 }

app/src/main/java/com/omegar/mvp/BaseView.kt

@@ -5,7 +5,7 @@ package com.omegar.mvp
  * Created by Anton Knyazev on 09.06.2023.
  * Copyright (c) 2023 Omega https://omega-r.com
  */
-interface BaseView: MvpView {
+interface BaseView<M>: MvpView {
 
     fun base() {}
 

app/src/main/java/com/omegar/mvp/MoxyActivity.kt

@@ -5,7 +5,7 @@ import android.widget.Toast
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
-class MoxyActivity: MvpAppCompatActivity(R.layout.activity_moxy), MoxyView {
+class MoxyActivity: MvpAppCompatActivity(R.layout.activity_moxy), MoxyView<Int> {
 
     companion object {
         var first: Boolean = true

app/src/main/java/com/omegar/mvp/MoxyFragment.kt

@@ -5,7 +5,7 @@ import android.widget.Toast
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
-class MoxyFragment : MvpAppCompatFragment(R.layout.activity_moxy), MoxyView {
+class MoxyFragment : MvpAppCompatFragment(R.layout.activity_moxy), MoxyView<Int> {
 
     private val presenter: MoxyPresenter by providePresenter {
         MoxyPresenter()

app/src/main/java/com/omegar/mvp/MoxyPresenter.kt

@@ -2,7 +2,7 @@ package com.omegar.mvp
 
 import kotlin.time.Duration
 
-class MoxyPresenter : BasePresenter<Long, MoxyView>() {
+class MoxyPresenter : BasePresenter<Long, Int, MoxyView<Int>>() {
 
     init {
         viewState.showToast("Hello World!")

app/src/main/java/com/omegar/mvp/MoxyView.kt

@@ -4,7 +4,7 @@ import com.omegar.mvp.viewstate.strategy.MoxyViewCommand
 import com.omegar.mvp.viewstate.strategy.StrategyType.ONE_EXECUTION
 import kotlin.time.Duration
 
-interface MoxyView: Addon<Long>, BaseView {
+interface MoxyView<M>: Addon<Long>, BaseView<M> {
 
 
     var duration: Duration

moxy/compiler/src/main/java/com/omegar/mvp/compiler/ksp/KspViewParser.kt

@@ -81,7 +81,7 @@ class KspViewParser(
         val newView = if (oldViewStateDeclaration != null) {
             View(
                 className = viewClassName,
-                presenterClassParamsMap = mutableMapOf(presenterDeclaration.toClassName() to presenterDeclaration.typeParameters.map { it.toTypeVariableName() }),
+                presenterClassParamsMap = mutableMapOf(presenterDeclaration.toClassName() to presenterDeclaration.typeParameters.map { it.toTypeVariableName(presenterDeclaration.typeParameters.toTypeParameterResolver()) }),
                 methods = emptyList(),
                 viewTypeParams = emptyList(),
                 parent = null,
@@ -97,7 +97,7 @@ class KspViewParser(
             View(
                 className = viewClassName,
                 presenterClassParamsMap = mutableMapOf(
-                    presenterDeclaration.toClassName() to presenterDeclaration.typeParameters.map { it.toTypeVariableName() }
+                    presenterDeclaration.toClassName() to presenterDeclaration.typeParameters.map { it.toTypeVariableName(presenterDeclaration.typeParameters.toTypeParameterResolver()) }
                 ),
                 methods = viewDeclaration.getMethods(declarations, superView),
                 viewTypeResolvedParams = superView?.viewTypePresenterParams?.get(superPresenter.toClassName()).orEmpty(),