Merge pull request #30 from Omega-R/develop

Develop

Author: KsenyaBol

moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseActivity.java

@@ -1,5 +1,7 @@
 package example.com.moxy_androidx_sample;
 
+import android.widget.Toast;
+
 import androidx.annotation.ContentView;
 import androidx.annotation.LayoutRes;
 import com.omegar.mvp.MvpAppCompatActivity;
@@ -17,7 +19,7 @@ public BaseActivity(@LayoutRes int contentLayoutId) {
 
     @Override
     public void testFunction() {
-
+        Toast.makeText(this, "testFunction", Toast.LENGTH_LONG).show();
     }
 
 }

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

@@ -9,6 +9,7 @@ class MainPresenter : BasePresenter<Contract.MainView<Double>>() {
 
 
 	init {
+		viewState.testFunction()
 		viewState.printLog(10.0, "Kek")
 		viewState.value = "test";
 	}

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

@@ -10,7 +10,7 @@ interface Contract {
 
         var value: String
 
-        @StateStrategyType(ADD_TO_END_SINGLE)
+        @StateStrategyType(ADD_TO_END_SINGLE, singleInstance = true)
         fun printLog(msg: D?, log: String?)
 
     }

moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java

@@ -3,6 +3,7 @@
 import android.os.Build;
 import android.os.Bundle;
 
+import androidx.annotation.LayoutRes;
 import androidx.appcompat.app.AppCompatDialogFragment;
 import androidx.fragment.app.Fragment;
 
@@ -11,6 +12,10 @@ public class MvpAppCompatDialogFragment extends AppCompatDialogFragment implemen
     private boolean mIsStateSaved;
     private MvpDelegate<? extends MvpAppCompatDialogFragment> mMvpDelegate;
 
+    public MvpAppCompatDialogFragment() { super(); }
+
+    public MvpAppCompatDialogFragment(@LayoutRes int contentLayoutId) { super(contentLayoutId); }
+
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 

moxy-androidx/src/main/java/com/omegar/mvp/MvpBottomSheetDialogFragment.java

@@ -3,6 +3,7 @@
 import android.os.Build;
 import android.os.Bundle;
 
+import androidx.annotation.LayoutRes;
 import androidx.fragment.app.Fragment;
 
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
@@ -11,7 +12,7 @@ public class MvpBottomSheetDialogFragment extends BottomSheetDialogFragment impl
 
     private boolean mIsStateSaved;
     private MvpDelegate<? extends MvpBottomSheetDialogFragment> mMvpDelegate;
-
+    
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 

moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java

@@ -1,5 +1,6 @@
 package androidx.appcompat.app;
 
+import androidx.annotation.LayoutRes;
 import androidx.fragment.app.DialogFragment;
 
 /**
@@ -10,4 +11,8 @@
  */
 public class AppCompatDialogFragment extends DialogFragment {
 
+    public AppCompatDialogFragment() { super(); }
+
+    public AppCompatDialogFragment(@LayoutRes int contentLayoutId) { super(contentLayoutId); }
+
 }

moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/DialogFragment.java

@@ -1,5 +1,7 @@
 package androidx.fragment.app;
 
+import androidx.annotation.LayoutRes;
+
 /**
  * Date: 22-March-19
  * Time: 08:58
@@ -8,4 +10,8 @@
  */
 public class DialogFragment extends Fragment {
 
+    public DialogFragment() { super(); }
+
+    public DialogFragment(@LayoutRes int contentLayoutId) { super(contentLayoutId); }
+
 }

moxy-androidx/stub-androidx/src/main/java/com/google/android/material/bottomsheet/BottomSheetDialogFragment.java

@@ -4,4 +4,5 @@
 
 public class BottomSheetDialogFragment extends AppCompatDialogFragment {
 
+
 }

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

@@ -187,6 +187,17 @@ public static String getAnnotationValueAsString(AnnotationMirror annotationMirro
 		}
 	}
 
+	public static boolean getAnnotationValueAsBoolean(AnnotationMirror annotationMirror, String key) {
+		AnnotationValue av = getAnnotationValue(annotationMirror, key);
+
+		if (av != null) {
+			return Boolean.parseBoolean(av.getValue().toString());
+		} else {
+			return false;
+		}
+	}
+
+
 	public static AnnotationValue getAnnotationValue(AnnotationMirror annotationMirror, String key) {
 		if (annotationMirror == null) return null;
 

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

@@ -21,16 +21,19 @@ public class CommandViewMethod extends ViewMethod {
 	private final String mUniqueSuffix;
 	private final TypeElement mStrategy;
 	private final String mTag;
+	private final boolean mSingleInstance;
 
 	public CommandViewMethod(Types types, DeclaredType targetInterfaceElement,
 							 ExecutableElement methodElement,
 							 TypeElement strategy,
 							 String tag,
-							 String uniqueSuffix) {
+							 String uniqueSuffix,
+							 boolean singleInstance) {
 		super(types, targetInterfaceElement, methodElement);
 		mStrategy = strategy;
 		mTag = tag;
 		mUniqueSuffix = uniqueSuffix;
+		mSingleInstance = singleInstance;
 	}
 
 	public TypeElement getStrategy() {
@@ -49,6 +52,10 @@ public String getCommandClassName() {
 		return Util.capitalizeString(getName()) + mUniqueSuffix + "Command";
 	}
 
+	public boolean isSingleInstance() {
+		return mSingleInstance;
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) return true;
@@ -57,11 +64,12 @@ public boolean equals(Object o) {
 		CommandViewMethod that = (CommandViewMethod) o;
 		return Objects.equals(mUniqueSuffix, that.mUniqueSuffix) &&
 				Objects.equals(mStrategy, that.mStrategy) &&
-				Objects.equals(mTag, that.mTag);
+				Objects.equals(mTag, that.mTag) &&
+				mSingleInstance == that.mSingleInstance;
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(super.hashCode(), mUniqueSuffix, mStrategy, mTag);
+		return Objects.hash(super.hashCode(), mUniqueSuffix, mStrategy, mTag, mSingleInstance);
 	}
 }