Merge pull request #9 from Omega-R/viewCommand_inheritance_generation

View interface inside other interface - generation bug fixed

Author: anton-knyazev

build.gradle

@@ -24,7 +24,7 @@ allprojects {
 ext {
     targetVersionCode = 46
     targetVersionName = "1.5.6"
-    kotlin_version = '1.3.21'
+    kotlin_version = '1.3.41'
 
     deps = [
             android       : 'com.google.android:android:1.6_r2',

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

@@ -4,10 +4,10 @@ import android.location.Location
 import android.os.Bundle
 import android.util.Log
 import com.omegar.mvp.presenter.InjectPresenter
-import example.com.moxy_androidx_sample.first.FirstView
+import example.com.moxy_androidx_sample.contract.Contract
 import example.com.moxy_androidx_sample.packagee.Item
 
-class MainActivity : BaseActivity(), MainView, SecondInterface {
+class MainActivity : BaseActivity(), Contract.MainView, SecondInterface {
 	override fun fourth(item: String?) {
 		TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 	}

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

@@ -3,9 +3,10 @@ package example.com.moxy_androidx_sample
 import android.util.Log
 import com.omegar.mvp.InjectViewState
 import com.omegar.mvp.MvpPresenter
+import example.com.moxy_androidx_sample.contract.Contract
 
 @InjectViewState
-class MainPresenter : MvpPresenter<MainView>() {
+class MainPresenter : MvpPresenter<Contract.MainView>() {
 
 	override fun onFirstViewAttach() {
 		super.onFirstViewAttach()

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

@@ -0,0 +1,16 @@
+package example.com.moxy_androidx_sample.contract
+
+import example.com.moxy_androidx_sample.fifth.Contract
+import example.com.moxy_androidx_sample.first.FirstView
+import example.com.moxy_androidx_sample.packagee.Item
+import example.com.moxy_androidx_sample.second.SecondView
+
+interface Contract {
+
+    interface MainView : FirstView<Item>, SecondView, Contract.FifthView {
+
+        fun printLog(msg: Double?, log: String?)
+
+    }
+
+}

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

@@ -2,8 +2,10 @@
 
 import example.com.moxy_androidx_sample.fourth.FourthView;
 
-public interface FifthView extends FourthView<String> {
+public interface Contract {
 
+    interface FifthView extends FourthView<String> {
 
+    }
 
 }

…oxy_androidx_sample/fifth/FifthView.java …moxy_androidx_sample/fifth/Contract.javamoxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/FifthView.java renamed to moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/Contract.java moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/FifthView.java renamed to moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/Contract.java

@@ -39,6 +39,7 @@
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.type.TypeVariable;
 import javax.lang.model.type.WildcardType;
+import javax.tools.Diagnostic;
 
 /**
  * Utilities for handling types in annotation processors
@@ -128,6 +129,16 @@ public static String getFullClassName(TypeElement typeElement) {
 		return packageName + className.replaceAll("\\.", "\\$");
 	}
 
+    public static String getSimpleClassName(TypeElement typeElement) {
+        String packageName = MvpCompiler.getElementUtils().getPackageOf(typeElement).getQualifiedName().toString();
+        if (packageName.length() > 0) {
+            packageName += ".";
+        }
+
+        String className = typeElement.toString().substring(packageName.length());
+        return className.replaceAll("\\.", "\\$");
+    }
+
 	public static AnnotationMirror getAnnotation(Element element, String annotationClass) {
 		for (AnnotationMirror annotationMirror : element.getAnnotationMirrors()) {
 			if (annotationMirror.getAnnotationType().asElement().toString().equals(annotationClass))

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

@@ -71,7 +71,7 @@ private JavaFile generate(ViewInterfaceInfo viewInterfaceInfo) {
 		DeclaredType viewInterfaceType = (DeclaredType) viewInterfaceInfo.getElement().asType();
 		TypeVariableName variableName = TypeVariableName.get(VIEW, nameWithTypeVariables);
 
-		TypeSpec.Builder classBuilder = TypeSpec.classBuilder(viewName.simpleName() + MvpProcessor.VIEW_STATE_SUFFIX)
+		TypeSpec.Builder classBuilder = TypeSpec.classBuilder(Util.getSimpleClassName(viewInterfaceInfo.getElement()) + MvpProcessor.VIEW_STATE_SUFFIX)
                 .addModifiers(Modifier.PUBLIC)
                 .addSuperinterface(nameWithTypeVariables)
                 .addTypeVariables(new ArrayList<TypeVariableName>(viewInterfaceInfo.getTypeVariables()) {{
@@ -160,8 +160,8 @@ private MethodSpec generateMethod(DeclaredType enclosingType, ViewMethod method,
 				.addStatement("return")
 				.endControlFlow()
 				.addCode("\n")
-				.beginControlFlow("for ($T view : mViews)", viewTypeName)
-				.addStatement("view.$L($L)", method.getName(), method.getArgumentsString())
+				.beginControlFlow("for ($T view$$ : mViews)", viewTypeName)
+				.addStatement("view$$.$L($L)", method.getName(), method.getArgumentsString())
 				.endControlFlow()
 				.addCode("\n")
 				.addStatement("mViewCommands.afterApply($L)", commandFieldName)