change import android.support.v7 ... to import androidx.appcompat

.gitignore

@@ -38,4 +38,7 @@ captures/
 # Moxy artifacts
 VERSION
 artifacts/
-artifacts-maven/
+artifacts-maven/
+
+# Mac OS
+*.icloud

README.md

@@ -1,12 +1,33 @@
-# 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)
+# MoxyX
 
-Moxy is a library that helps to use MVP pattern when you do the Android Application. _Without problems of lifecycle and boilerplate code!_
+**This Moxy repository is deprecated and no longer supported.**
+
+**Please migrate to the actual version of the Moxy framework at [Moxy communuty](https://github.com/moxy-community/Moxy) repo.**
+
+We added X to the Moxy for make this library coolest.
+
+[![Maven Central](https://img.shields.io/maven-central/v/tech.schoolhelper/moxy-x.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22tech.schoolhelper%22%20AND%20a:%22moxy-x%22)
+
+[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-MoxyX-blue.svg?style=flat)](https://android-arsenal.com/details/1/7547)
+
+[![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!
 
 The main idea of using Moxy:
 ![schematic_using](https://habrastorage.org/files/a2e/b51/8b4/a2eb518b465a4df9b47e68794519270d.gif)
+
 See what's happening here in the [wiki](https://github.com/Arello-Mobile/Moxy/wiki).
 
+## Diff between us and root project
+1. We support androidX
+2. We don't support GLOBAL and WEAK presenter type
+3. We have one more strategy to the library, [AddToEndSingleTagStrategy](https://github.com/jordan1997/Moxy/blob/master/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/AddToEndSingleTagStrategy.java)
+
+## RoadMap
+- [ ] We will change the template for android studio (and Intellij), the templates will create a view interface and activity or fragment into one file, and this file and presenter keep into one package. We will remove template for Java.
+- [ ] Implement compiler which use presenter from Dagger DI, by one annotation 
+
 ## Capabilities
 
 Moxy has a few killer features in other ways:
@@ -17,97 +38,118 @@ Moxy has a few killer features in other ways:
 ## Sample
 
 View interface
-```java
-public interface HelloWorldView extends MvpView {
-	void showMessage(int message);
+```kotlin
+interface MainView : MvpView {
+	fun printLog(msg: String)
+}
+
+class MainActivity : MvpAppCompatActivity(), MainView {
+
+	@InjectPresenter
+	internal lateinit var presenter: MainPresenter
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(R.layout.activity_main)
+	}
+
+	override fun printLog(msg: String) {
+		Log.e(TAG, "printLog : msg : $msg activity hash code : ${hashCode()}")
+	}
+
+	companion object {
+		const val TAG = "MoxyDebug"
+	}
 }
 ```
 Presenter
-```java
+```kotlin
 @InjectViewState
-public class HelloWorldPresenter extends MvpPresenter<HelloWorldView> {
-	public HelloWorldPresenter() {
-		getViewState().showMessage(R.string.hello_world);
+class MainPresenter : MvpPresenter<MainView>() {
+	override fun onFirstViewAttach() {
+		super.onFirstViewAttach()
+		Log.e(MainActivity.TAG, "presenter hash code : ${hashCode()}")
+		viewState.printLog("TEST")
 	}
 }
 ```
-View implementation
-```java
-public class HelloWorldActivity extends MvpAppCompatActivity implements HelloWorldView {
 
+## Inject with Dagger2
+```kotlin
+	@Inject
+	lateinit var daggerPresenter: Lazy<MainPresenter>
+
 	@InjectPresenter
-	HelloWorldPresenter mHelloWorldPresenter;
-
-	private TextView mHelloWorldTextView;
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_hello_world);
-
-		mHelloWorldTextView = ((TextView) findViewById(R.id.activity_hello_world_text_view_message));
-	}
-
-	@Override
-	public void showMessage(int message) {
-		mHelloWorldTextView.setText(message);
-	}
-}
+	lateinit var presenter: MainPresenter
+
+	@ProvidePresenter
+	fun providePresenter(): MainPresenter = daggerPresenter.get()
 ```
 
-[Here](https://github.com/Arello-Mobile/Moxy/tree/master/sample-github) you can see "Github" sample application.
+**We have plan for implement move easies way for connect moxy with dagger, but we need to implement specific compiler for this case**
 
 ## Wiki
+[Scheme of MoxyX strategies](https://github.com/jordan1997/MoxyX/blob/develop/SchemeOfStrategies.md)
+
 For all information check [Moxy Wiki](https://github.com/Arello-Mobile/Moxy/wiki)
 
-## Android studio templates
-In order to avoid boilerplate code creating for binding activity, fragments and its presentation part, we propose to use Android Studio templates for Moxy. 
+## Android studio and Intellij templates 
+**We will change this template in future**
+In order to avoid boilerplate code creating for binding activity, fragments and its presentation part, we propose to use Android Studio templates for Moxy.
 
-Templates located in [/moxy-templates](https://github.com/Arello-Mobile/Moxy/tree/master/moxy-templates)
+Templates located in [/moxy-templates](https://github.com/jordan1997/Moxy/tree/develop/moxy-templates)
 
 ## Links
+**Telegram channels from original moxy community**
+
 [Telegram channel (en)](https://telegram.me/moxy_mvp_library)<br />
 [Telegram channel (ru)](https://telegram.me/moxy_ru)<br />
 [References](https://github.com/Arello-Mobile/Moxy/wiki#references)<br />
 [FAQ](https://github.com/Arello-Mobile/Moxy/wiki/FAQ)
 
+## Twitter
+For connection with author of this repository use twitter
+[Twitter](https://twitter.com/jordan29041997)
+
 ## Integration
-Base modules integration:
+### Base modules integration: 
 ```groovy
-dependencies {
-  ...
-  compile 'com.arello-mobile:moxy:1.5.5'
-  annotationProcessor 'com.arello-mobile:moxy-compiler:1.5.5'
-}
+implementation 'tech.schoolhelper:moxy-x:1.7.0'
+```
+#### Java project
+```groovy
+annotationProcessor 'tech.schoolhelper:moxy-x-compiler:1.7.0'
+```
+#### Kotlin
+```groovy
+apply plugin: 'kotlin-kapt'
+```
+```groovy
+kapt 'tech.schoolhelper:moxy-x-compiler:1.7.0'
 ```
+### Default android module integration
 For additional base view classes `MvpActivity` and `MvpFragment` add this:
 ```groovy
-dependencies {
-  ...
-  compile 'com.arello-mobile:moxy-android:1.5.5'
-}
+implementation 'tech.schoolhelper:moxy-x-android:1.7.0'
 ```
-If you are planning to use AppCompat, then you can use `MvpAppCompatActivity` and `MvpAppCompatFragment`. Then add this:
+### AppCompat module integration
+If you use AppCompat, use `MvpAppCompatActivity` and `MvpAppCompatFragment` add this:
 ```groovy
-dependencies {
-  ...
-  compile 'com.arello-mobile:moxy-app-compat:1.5.5'
-  compile 'com.android.support:appcompat-v7:$support_version'
-}
+implementation 'tech.schoolhelper:moxy-x-app-compat:1.7.0'
 ```
-### Kotlin
-If you are using kotlin, use `kapt` instead of `provided`/`apt` dependency type:
+### AndroidX module integration
+If you use AndroidX, use `MvpAppCompatActivity` and `MvpAppCompatFragment` add this:
 ```groovy
-apply plugin: 'kotlin-kapt'
-
-dependencies {
-  ...
-  kapt 'com.arello-mobile:moxy-compiler:1.5.5'
-}
+implementation 'tech.schoolhelper:moxy-x-androidx:1.7.0'
+```
+### AndroidX(Google material) module integration
+If you use google material, use `MvpBottomSheetDialogFragment` add this:
+```groovy
+implementation 'tech.schoolhelper:moxy-x-material:1.7.0'
 ```
 
 ## ProGuard
-Moxy is completely without reflection! No special ProGuard rules required.
+MoxyX is completely without reflection! No special ProGuard rules required.
 
 ## License
 ```

SchemeOfStrategies.md

@@ -0,0 +1,15 @@
+# Scheme of strategies
+
+This page shows how MoxyX strategies work.
+
+# AddToEndSingleStrategy
+![AddToEndSingleStrategy](https://raw.githubusercontent.com/jordan1997/blog/master/images/AddToEndSingleStrategy.png)
+
+# AddToEndStartegy
+![AddToEndStartegy](https://raw.githubusercontent.com/jordan1997/blog/master/images/AddToEndStartegy.png)
+
+# OneExecutionStartegy
+![OneExecutionStartegy](https://raw.githubusercontent.com/jordan1997/blog/master/images/OneExecutionStartegy.png)
+
+# SkipStartegy
+![SkipStartegy](https://raw.githubusercontent.com/jordan1997/blog/master/images/SkipStartegy.png)

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.4.1'
     }
 }
 
@@ -20,21 +20,21 @@ allprojects {
 }
 
 ext {
-    targetVersionCode = 45
-    targetVersionName = "1.5.5"
+    targetVersionCode = 47
+    targetVersionName = "1.7.0"
 
     deps = [
             android       : 'com.google.android:android:1.6_r2',
-            javapoet      : 'com.squareup:javapoet:1.10.0',
+            javapoet      : 'com.squareup:javapoet:1.11.1',
             junit         : 'junit:junit:4.12',
-            mockito       : 'org.mockito:mockito-core:1.10.19',
-            truth         : 'com.google.truth:truth:0.34',
-            robolectric   : 'org.robolectric:robolectric:3.0',
-            compiletesting: 'com.google.testing.compile:compile-testing:0.15',
-            asm           : ['org.ow2.asm:asm:6.0', 'org.ow2.asm:asm-util:6.0'],
-            autoservice   : 'com.google.auto.service:auto-service:1.0-rc4',
+            mockito       : 'org.mockito:mockito-core:2.27.0',
+            truth         : 'com.google.truth:truth:0.44',
+            robolectric   : 'org.robolectric:robolectric:4.2.1',
+            compiletesting: 'com.google.testing.compile:compile-testing:0.17',
+            asm           : ['org.ow2.asm:asm:7.1', 'org.ow2.asm:asm-util:7.1'],
+            autoservice   : 'com.google.auto.service:auto-service:1.0-rc5',
             autocommon    : 'com.google.auto:auto-common:0.10',
-            guava         : 'com.google.guava:guava:21.0',
+            guava         : 'com.google.guava:guava:23.0',
     ]
 }
 

gradle.properties

@@ -1,20 +1,21 @@
 # Project-wide Gradle settings.
-
 # IDE (e.g. Android Studio) users:
 # Gradle settings configured through the IDE *will override*
 # any settings specified in this file.
-
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-
-#org.gradle.java.home=<path to jdk1.8 for tests>
+#org.gradle.java.home=<path to jdk1.8 for tests>
+POM_LICENCE_URL=https\://opensource.org/licenses/MIT
+POM_LICENCE_NAME=The MIT License (MIT)
+POM_SCM_CONNECTION=scm:[email protected]:jordan1997/Moxy.git
+POM_URL=https://github.com/jordan1997/Moxy
+URL=https://schoolhelper.tech/
+POM_DESCRIPTION=MoxyX, we added X for make this librayr coolest

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Nov 24 23:06:24 NOVT 2018
+#Mon Mar 18 21:21:55 EET 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