Add getter for view

Author: anton-knyazev

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

@@ -2,6 +2,7 @@ package example.com.moxy_androidx_sample
 
 import android.os.Bundle
 import android.util.Log
+import android.widget.Toast
 import com.omegar.mvp.ktx.providePresenter
 import com.omegar.mvp.presenter.InjectPresenter
 import example.com.moxy_androidx_sample.contract.Contract
@@ -31,6 +32,7 @@ class MainActivity : BaseActivity(R.layout.activity_main), Contract.MainView<Dou
 //		TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 //	}
 
+	override var value: String = ""
 
 	private val presenter: MainPresenter by providePresenter {
 		MainPresenter()
@@ -48,8 +50,11 @@ class MainActivity : BaseActivity(R.layout.activity_main), Contract.MainView<Dou
 	override fun second() {
 		TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
 	}
-	
+
+
+
 	companion object {
 		const val TAG = "MoxyDebug"
 	}
+
 }

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

@@ -7,13 +7,15 @@ import example.com.moxy_androidx_sample.contract.Contract
 
 class MainPresenter : BasePresenter<Contract.MainView<Double>>() {
 
+
 	init {
 		viewState.printLog(10.0, "Kek")
+		viewState.value = "test";
 	}
 
 	override fun onFirstViewAttach() {
 		super.onFirstViewAttach()
-		Log.e(MainActivity.TAG, "presenter hash code : ${hashCode()}")
+		Log.e(MainActivity.TAG, "presenter hash code : ${hashCode()}, value = ${viewState.value}")
 		viewState.printLog(2.0, viewState.toString())
 	}
 

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

@@ -8,6 +8,8 @@ interface Contract {
 
     interface MainView<D: Number> : BaseView {
 
+        var value: String
+
         @StateStrategyType(ADD_TO_END_SINGLE)
         fun printLog(msg: D?, log: String?)
 

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

@@ -128,7 +128,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
 		try {
 			return throwableProcess(annotations, roundEnv);
 		} catch (RuntimeException e) {
-			mMessager.printMessage(Diagnostic.Kind.OTHER, "Moxy compilation failed. Could you copy stack trace above and write us (or make issue on Github)?");
+			mMessager.printMessage(Diagnostic.Kind.ERROR, "Moxy compilation failed. Could you copy stack trace above and write us (or make issue on Github)?");
 			e.printStackTrace();
 			return true;
 		}

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

@@ -30,6 +30,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.AnnotationValue;
@@ -290,4 +291,8 @@ public static <E> HashSet<E> newHashSet(E... elements) {
 		return set;
 	}
 
+	public static boolean startWith(@Nonnull String string, @Nonnull String prefix) {
+		return string.indexOf(prefix) == 0;
+	}
+
 }

moxy-compiler/src/main/java/com/omegar/mvp/compiler/entity/CommandViewMethod.java

@@ -0,0 +1,67 @@
+package com.omegar.mvp.compiler.entity;
+
+import com.omegar.mvp.compiler.Util;
+
+import java.util.Objects;
+
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.util.Types;
+
+/**
+ * Date: 27-Jul-2017
+ * Time: 12:58
+ *
+ * @author Evgeny Kursakov
+ */
+@SuppressWarnings("NewApi")
+public class CommandViewMethod extends ViewMethod {
+
+	private final String mUniqueSuffix;
+	private final TypeElement mStrategy;
+	private final String mTag;
+
+	public CommandViewMethod(Types types, DeclaredType targetInterfaceElement,
+							 ExecutableElement methodElement,
+							 TypeElement strategy,
+							 String tag,
+							 String uniqueSuffix) {
+		super(types, targetInterfaceElement, methodElement);
+		mStrategy = strategy;
+		mTag = tag;
+		mUniqueSuffix = uniqueSuffix;
+	}
+
+	public TypeElement getStrategy() {
+		return mStrategy;
+	}
+
+	public String getTag() {
+		return mTag;
+	}
+
+	public String getUniqueSuffix() {
+		return mUniqueSuffix;
+	}
+
+	public String getCommandClassName() {
+		return Util.capitalizeString(getName()) + mUniqueSuffix + "Command";
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+		if (!super.equals(o)) return false;
+		CommandViewMethod that = (CommandViewMethod) o;
+		return Objects.equals(mUniqueSuffix, that.mUniqueSuffix) &&
+				Objects.equals(mStrategy, that.mStrategy) &&
+				Objects.equals(mTag, that.mTag);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(super.hashCode(), mUniqueSuffix, mStrategy, mTag);
+	}
+}

moxy-compiler/src/main/java/com/omegar/mvp/compiler/entity/ReturnViewMethod.java

@@ -0,0 +1,29 @@
+package com.omegar.mvp.compiler.entity;
+
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.Types;
+
+public class ReturnViewMethod extends ViewMethod {
+
+    private TypeMirror mReturnType;
+    private final ExecutableElement mSetterElement;
+
+    public ReturnViewMethod(Types types,
+                            DeclaredType targetInterfaceElement,
+                            ExecutableElement getterElement,
+                            ExecutableElement setterElement) {
+        super(types, targetInterfaceElement, getterElement);
+        mReturnType = getterElement.getReturnType();
+        mSetterElement = setterElement;
+    }
+
+    public TypeMirror getReturnType() {
+        return mReturnType;
+    }
+
+    public ExecutableElement getSetterElement() {
+        return mSetterElement;
+    }
+}

moxy-compiler/src/main/java/com/omegar/mvp/compiler/entity/ViewInterfaceInfo.java

@@ -29,10 +29,6 @@ public class ViewInterfaceInfo implements TypeElementHolder {
     private final List<TypeVariableName> mTypeVariables;
     private final List<ViewMethod> mMethods;
 
-    public ViewInterfaceInfo(TypeElement element, List<ViewMethod> methods) {
-        this(null, element, methods);
-    }
-
     public ViewInterfaceInfo(@Nullable TypeElement superInterfaceType, TypeElement element, List<ViewMethod> methods) {
         mSuperInterfaceType = superInterfaceType;
         mElement = element;