Merge branch 'master' of https://github.com/Omega-R/OmegaMoxy into feature/bottom_dialog

Author: roman_tcaregorodtcev

README.md

@@ -1,5 +1,6 @@
 # Moxy
-[![Maven Central](https://img.shields.io/maven-central/v/com.arello-mobile/moxy.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.arello-mobile%22%20AND%20(a%3A%22moxy%22%20OR%20a%3A%22moxy-compiler%22%20OR%20a%3A%22moxy-android%22%20OR%20a%3A%22moxy-app-compat%22)) [![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://opensource.org/licenses/MIT)
+[![](https://jitpack.io/v/Omega-R/OmegaMoxy.svg)](https://jitpack.io/#Omega-R/OmegaMoxy)
+[![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://opensource.org/licenses/MIT)
 
 Moxy is a library that helps to use MVP pattern when you do the Android Application. _Without problems of lifecycle and boilerplate code!_
 
@@ -72,27 +73,46 @@ Templates located in [/moxy-templates](https://github.com/Arello-Mobile/Moxy/tre
 [FAQ](https://github.com/Arello-Mobile/Moxy/wiki/FAQ)
 
 ## Integration
+
+Add the JitPack repository to your build file:
+```groovy
+allprojects {
+    repositories {
+        ...
+        maven { url 'https://jitpack.io' }
+    }
+}
+```
+
 Base modules integration:
 ```groovy
 dependencies {
   ...
-  compile 'com.arello-mobile:moxy:1.5.6'
-  annotationProcessor 'com.arello-mobile:moxy-compiler:1.5.6'
+  implementation 'com.github.Omega-R.OmegaMoxy:moxy:1.5.7'
+  annotationProcessor 'com.github.Omega-R.OmegaMoxy:moxy-compiler:1.5.7'
 }
 ```
 For additional base view classes `MvpActivity` and `MvpFragment` add this:
 ```groovy
 dependencies {
   ...
-  compile 'com.arello-mobile:moxy-android:1.5.6'
+  implementation 'com.github.Omega-R.OmegaMoxy:moxy-android:1.5.7'
+}
+```
+
+If you are planning to use AndroidX, then you can use `MvpAppCompatActivity` and `MvpAppCompatFragment`. Then add this:
+```groovy
+dependencies {
+  ...
+  implementation 'com.github.Omega-R.OmegaMoxy:moxy-androidx:1.5.7'
 }
 ```
 If you are planning to use AppCompat, then you can use `MvpAppCompatActivity` and `MvpAppCompatFragment`. Then add this:
 ```groovy
 dependencies {
   ...
-  compile 'com.arello-mobile:moxy-app-compat:1.5.6'
-  compile 'com.android.support:appcompat-v7:$support_version'
+  implementation 'com.github.Omega-R.OmegaMoxy:moxy-app-compat:1.5.7'
+  implementation 'com.android.support:appcompat-v7:$support_version'
 }
 ```
 ### Kotlin
@@ -102,7 +122,7 @@ apply plugin: 'kotlin-kapt'
 
 dependencies {
   ...
-  kapt 'com.arello-mobile:moxy-compiler:1.5.6'
+  kapt 'com.github.Omega-R.OmegaMoxy:moxy-compiler:1.5.7'
 }
 ```
 

build.gradle

@@ -7,7 +7,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
 
@@ -16,12 +17,14 @@ allprojects {
         jcenter()
         mavenCentral()
         google()
+        maven { url 'https://jitpack.io' }
     }
 }
 
 ext {
     targetVersionCode = 46
     targetVersionName = "1.5.6"
+    kotlin_version = '1.3.21'
 
     deps = [
             android       : 'com.google.android:android:1.6_r2',

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Nov 24 23:06:24 NOVT 2018
+#Thu Mar 21 17:43:47 MSK 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

moxy-androidx-sapmle/build.gradle

@@ -1,5 +1,4 @@
 buildscript {
-    ext.kotlin_version = '1.3.10'
     repositories {
         google()
         jcenter()
@@ -19,7 +18,7 @@ android {
     compileSdkVersion 28
 
     defaultConfig {
-        applicationId "com.arellomobile.mvp.sample.androidx"
+        applicationId "com.omegar.mvp.sample.androidx"
         minSdkVersion 16
         targetSdkVersion 28
         versionCode 1

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

@@ -0,0 +1,95 @@
+package com.omegar.mvp;
+
+import android.os.Build;
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatDialogFragment;
+import androidx.fragment.app.Fragment;
+
+public class MvpAppCompatDialogFragment extends AppCompatDialogFragment {
+
+    private boolean mIsStateSaved;
+    private MvpDelegate<? extends MvpAppCompatDialogFragment> mMvpDelegate;
+
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        getMvpDelegate().onCreate(savedInstanceState);
+    }
+
+    public void onResume() {
+        super.onResume();
+
+        mIsStateSaved = false;
+
+        getMvpDelegate().onAttach();
+    }
+
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        mIsStateSaved = true;
+
+        getMvpDelegate().onSaveInstanceState(outState);
+        getMvpDelegate().onDetach();
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+
+        getMvpDelegate().onDetach();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+
+        getMvpDelegate().onDetach();
+        getMvpDelegate().onDestroyView();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        //We leave the screen and respectively all fragments will be destroyed
+        if (getActivity().isFinishing()) {
+            getMvpDelegate().onDestroy();
+            return;
+        }
+
+        // When we rotate device isRemoving() return true for fragment placed in backstack
+        // http://stackoverflow.com/questions/34649126/fragment-back-stack-and-isremoving
+        if (mIsStateSaved) {
+            mIsStateSaved = false;
+            return;
+        }
+
+        // See https://github.com/Arello-Mobile/Moxy/issues/24
+        boolean anyParentIsRemoving = false;
+
+        if (Build.VERSION.SDK_INT >= 17) {
+            Fragment parent = getParentFragment();
+            while (!anyParentIsRemoving && parent != null) {
+                anyParentIsRemoving = parent.isRemoving();
+                parent = parent.getParentFragment();
+            }
+        }
+
+        if (isRemoving() || anyParentIsRemoving) {
+            getMvpDelegate().onDestroy();
+        }
+    }
+
+    /**
+     * @return The {@link MvpDelegate} being used by this Fragment.
+     */
+    public MvpDelegate getMvpDelegate() {
+        if (mMvpDelegate == null) {
+            mMvpDelegate = new MvpDelegate<>(this);
+        }
+
+        return mMvpDelegate;
+    }
+}

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

@@ -2,14 +2,16 @@
 
 import android.os.Bundle;
 
+import androidx.fragment.app.FragmentActivity;
+
 /**
  * Date: 25-July-18
  * Time: 2:51
  *
  * @author Vova Stelmashchuk
  */
 
-public class AppCompatActivity {
+public class AppCompatActivity extends FragmentActivity {
 
     protected void onCreate(Bundle savedInstanceState) {
         throw new RuntimeException("Stub!");

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

@@ -0,0 +1,13 @@
+package androidx.appcompat.app;
+
+import androidx.fragment.app.DialogFragment;
+
+/**
+ * Date: 22-March-19
+ * Time: 09:18
+ *
+ * @author R12rus
+ */
+public class AppCompatDialogFragment extends DialogFragment {
+
+}

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

@@ -0,0 +1,11 @@
+package androidx.fragment.app;
+
+/**
+ * Date: 22-March-19
+ * Time: 08:58
+ *
+ * @author R12rus
+ */
+public class DialogFragment extends Fragment {
+
+}

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

@@ -49,7 +49,7 @@
 @SuppressWarnings("unused")
 @AutoService(Processor.class)
 public class MvpCompiler extends AbstractProcessor {
-	public static final String MOXY_REFLECTOR_DEFAULT_PACKAGE = "com.arellomobile.mvp";
+	public static final String MOXY_REFLECTOR_DEFAULT_PACKAGE = "com.omegar.mvp";
 
 	private static final String OPTION_MOXY_REFLECTOR_PACKAGE = "moxyReflectorPackage";
 

moxy-compiler/src/test/resources/multimodules/app/MoxyReflector.java

@@ -1,4 +1,4 @@
-package com.arellomobile.mvp;
+package com.omegar.mvp;
 
 import com.omegar.mvp.ViewStateProvider;