From 9e72af05107bbaa8ec388ed0bd332e8af4a28ecd Mon Sep 17 00:00:00 2001
From: vova <v.stelmashchuk@mobidev.biz>
Date: Fri, 25 May 2018 13:40:41 +0300
Subject: [PATCH 01/35] tmp update for readMe

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 63796a29..b5f0dc65 100644
--- a/README.md
+++ b/README.md
@@ -72,19 +72,20 @@ Templates located in [/moxy-templates](https://github.com/Arello-Mobile/Moxy/tre
 [FAQ](https://github.com/Arello-Mobile/Moxy/wiki/FAQ)
 
 ## Integration
+###  Version `1.5.4` unstable at the moment, use 1.5.3 instead
 Base modules integration:
 ```groovy
 dependencies {
   ...
-  compile 'com.arello-mobile:moxy:1.5.4'
-  annotationProcessor 'com.arello-mobile:moxy-compiler:1.5.4'
+  compile 'com.arello-mobile:moxy:1.5.3'
+  annotationProcessor 'com.arello-mobile:moxy-compiler:1.5.3'
 }
 ```
 For additional base view classes `MvpActivity` and `MvpFragment` add this:
 ```groovy
 dependencies {
   ...
-  compile 'com.arello-mobile:moxy-android:1.5.4'
+  compile 'com.arello-mobile:moxy-android:1.5.3'
 }
 ```
 If you are planning to use AppCompat, then you can use `MvpAppCompatActivity` and `MvpAppCompatFragment`. Then add this:

From 761a4aa327919445ec3bc56d7d390a4f8348a4cc Mon Sep 17 00:00:00 2001
From: vova <v.stelmashchuk@mobidev.biz>
Date: Fri, 25 May 2018 13:42:39 +0300
Subject: [PATCH 02/35] dowgrade version in readMe

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index b5f0dc65..b598a414 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ Templates located in [/moxy-templates](https://github.com/Arello-Mobile/Moxy/tre
 [FAQ](https://github.com/Arello-Mobile/Moxy/wiki/FAQ)
 
 ## Integration
-###  Version `1.5.4` unstable at the moment, use 1.5.3 instead
+###  Version `1.5.4` unstable at the moment, use `1.5.3` instead
 Base modules integration:
 ```groovy
 dependencies {
@@ -92,7 +92,7 @@ If you are planning to use AppCompat, then you can use `MvpAppCompatActivity` an
 ```groovy
 dependencies {
   ...
-  compile 'com.arello-mobile:moxy-app-compat:1.5.4'
+  compile 'com.arello-mobile:moxy-app-compat:1.5.3'
   compile 'com.android.support:appcompat-v7:$support_version'
 }
 ```
@@ -103,7 +103,7 @@ apply plugin: 'kotlin-kapt'
 
 dependencies {
   ...
-  kapt 'com.arello-mobile:moxy-compiler:1.5.4'
+  kapt 'com.arello-mobile:moxy-compiler:1.5.3'
 }
 ```
 

From 3894eceffc8f8ee6bd3e870d555f0b1373a34bce Mon Sep 17 00:00:00 2001
From: Yurj Shmakov <yvshmakov@yandex-team.ru>
Date: Tue, 5 Jun 2018 03:37:08 +0700
Subject: [PATCH 03/35] [feature] update some dependencies

---
 sample-github/build.gradle | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sample-github/build.gradle b/sample-github/build.gradle
index d16146f4..c1ad1b74 100644
--- a/sample-github/build.gradle
+++ b/sample-github/build.gradle
@@ -23,7 +23,6 @@ android {
     lintOptions {
         abortOnError false
     }
-
     compileOptions {
         targetCompatibility 1.8
         sourceCompatibility 1.8
@@ -32,8 +31,8 @@ android {
 
 def support = '27.1.1'
 def retrofit = '2.1.0'
-def dagger = '2.7'
-def butterKnife = "8.4.0"
+def dagger = '2.16'
+def butterKnife = "8.5.1"
 
 dependencies {
     testImplementation "junit:junit:4.12"

From 1a24a56665294a76f7e8eab3da57f9612ccb8338 Mon Sep 17 00:00:00 2001
From: vova <v.stelmashchuk@mobidev.biz>
Date: Sat, 7 Jul 2018 14:29:45 +0300
Subject: [PATCH 04/35] update build.gradle for use sub project deps

---
 sample-custom-strategy/build.gradle | 14 ++++++++------
 sample-github/build.gradle          | 11 ++++++-----
 sample-kotlin/build.gradle          | 12 +++++++-----
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/sample-custom-strategy/build.gradle b/sample-custom-strategy/build.gradle
index 75967a84..135db90b 100644
--- a/sample-custom-strategy/build.gradle
+++ b/sample-custom-strategy/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.1.51'
+    ext.kotlin_version = '1.2.51'
     repositories {
         jcenter()
         mavenCentral()
@@ -41,12 +41,14 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
+    def supportVersion = '27.1.1'
+    implementation "com.android.support:appcompat-v7:$supportVersion"
+    implementation "com.android.support:design:$supportVersion"
 
-    implementation 'com.arello-mobile:moxy:1.5.5'
-    implementation 'com.arello-mobile:moxy-app-compat:1.5.5'
-    kapt 'com.arello-mobile:moxy-compiler:1.5.5'
+    implementation project(':moxy')
+    implementation project(':moxy-app-compat')
+
+    kapt project(':moxy-compiler')
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
diff --git a/sample-github/build.gradle b/sample-github/build.gradle
index c1ad1b74..895cb9cb 100644
--- a/sample-github/build.gradle
+++ b/sample-github/build.gradle
@@ -42,7 +42,7 @@ dependencies {
     implementation "com.j256.ormlite:ormlite-core:4.48"
     implementation "com.j256.ormlite:ormlite-android:4.48"
 
-    implementation "com.google.code.gson:gson:2.5"
+    implementation "com.google.code.gson:gson:2.8.0"
 
     implementation "com.jakewharton:butterknife:$butterKnife"
 
@@ -52,7 +52,7 @@ dependencies {
     implementation "com.squareup.picasso:picasso:2.5.2"
     implementation "com.squareup:otto:1.3.8"
 
-    implementation "io.reactivex:rxjava:1.1.0"
+    implementation "io.reactivex:rxjava:1.1.5"
     implementation "io.reactivex:rxandroid:1.1.0"
 
     implementation "com.google.dagger:dagger:$dagger"
@@ -66,7 +66,8 @@ dependencies {
     testImplementation "org.hamcrest:hamcrest-all:1.3"
     testImplementation "org.robolectric:robolectric:3.1-rc1"
 
-    implementation 'com.arello-mobile:moxy:1.5.5'
-    implementation 'com.arello-mobile:moxy-app-compat:1.5.5'
-    annotationProcessor 'com.arello-mobile:moxy-compiler:1.5.5'
+    implementation project(':moxy')
+    implementation project(':moxy-app-compat')
+
+    annotationProcessor project(':moxy-compiler')
 }
\ No newline at end of file
diff --git a/sample-kotlin/build.gradle b/sample-kotlin/build.gradle
index 6c110700..770a91ad 100644
--- a/sample-kotlin/build.gradle
+++ b/sample-kotlin/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.2.41'
+    ext.kotlin_version = '1.2.51'
     repositories {
         jcenter()
         mavenCentral()
@@ -41,11 +41,13 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:26.1.0'
+    def supportVersion = '27.1.1'
+    implementation "com.android.support:appcompat-v7:$supportVersion"
 
-    implementation 'com.arello-mobile:moxy:1.5.5'
-    implementation 'com.arello-mobile:moxy-app-compat:1.5.5'
-    kapt 'com.arello-mobile:moxy-compiler:1.5.5'
+    implementation project(':moxy')
+    implementation project(':moxy-app-compat')
+
+    kapt project(':moxy-compiler')
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }

From 3863ea4c947e34f464d009933af82f19e7db69ee Mon Sep 17 00:00:00 2001
From: vova <v.stelmashchuk@mobidev.biz>
Date: Mon, 30 Jul 2018 22:32:26 +0300
Subject: [PATCH 05/35] update dagger version

---
 sample-github/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sample-github/build.gradle b/sample-github/build.gradle
index c1ad1b74..3f7e7e57 100644
--- a/sample-github/build.gradle
+++ b/sample-github/build.gradle
@@ -31,7 +31,7 @@ android {
 
 def support = '27.1.1'
 def retrofit = '2.1.0'
-def dagger = '2.16'
+def dagger = '2.7'
 def butterKnife = "8.5.1"
 
 dependencies {
@@ -42,7 +42,7 @@ dependencies {
     implementation "com.j256.ormlite:ormlite-core:4.48"
     implementation "com.j256.ormlite:ormlite-android:4.48"
 
-    implementation "com.google.code.gson:gson:2.5"
+    implementation "com.google.code.gson:gson:2.8.0"
 
     implementation "com.jakewharton:butterknife:$butterKnife"
 
@@ -52,7 +52,7 @@ dependencies {
     implementation "com.squareup.picasso:picasso:2.5.2"
     implementation "com.squareup:otto:1.3.8"
 
-    implementation "io.reactivex:rxjava:1.1.0"
+    implementation "io.reactivex:rxjava:1.1.5"
     implementation "io.reactivex:rxandroid:1.1.0"
 
     implementation "com.google.dagger:dagger:$dagger"

From 9570e7ca2daae023c63d795e13278b95a77fbd9c Mon Sep 17 00:00:00 2001
From: AlexeyKorshun <lehakorshun@gmail.com>
Date: Wed, 8 Aug 2018 22:54:40 +0600
Subject: [PATCH 06/35] [feature] Ability to choose source language

 Merge pull request #189 from AlexeyKorshun/develop
---
 .../Kotlin/MoxyActivity/template.xml          |   2 +-
 .../Kotlin/MoxyFragment/template.xml          |   2 +-
 .../common/MoxyActivity/globals.xml.ftl       |  25 ++++
 .../common/MoxyActivity/recipe.xml.ftl        |  33 +++++
 .../MoxyActivity/root/AndroidManifest.xml.ftl |   6 +
 .../root/res/layout/activity_blank.xml.ftl    |   9 ++
 .../presenter/BlankPresenter.java.ftl         |  11 ++
 .../presenter/BlankPresenter.kt.ftl           |  10 ++
 .../presentation/view/BlankView.java.ftl      |   7 +
 .../presentation/view/BlankView.kt.ftl        |   7 +
 .../ui/activity/BlankActivity.java.ftl        |  50 +++++++
 .../ui/activity/BlankActivity.kt.ftl          |  41 ++++++
 .../common/MoxyActivity/template.xml          | 122 ++++++++++++++++++
 .../MoxyActivity/template_moxy_activity.png   | Bin 0 -> 21334 bytes
 .../common/MoxyFragment/globals.xml.ftl       |  24 ++++
 .../common/MoxyFragment/recipe.xml.ftl        |  30 +++++
 .../root/res/layout/fragment_blank.xml.ftl    |   7 +
 .../presenter/BlankPresenter.java.ftl         |  11 ++
 .../presenter/BlankPresenter.kt.ftl           |  10 ++
 .../presentation/view/BlankView.java.ftl      |   7 +
 .../presentation/view/BlankView.kt.ftl        |   7 +
 .../ui/fragment/BlankFragment.java.ftl        |  58 +++++++++
 .../ui/fragment/BlankFragment.kt.ftl          |  42 ++++++
 .../common/MoxyFragment/template.xml          | 121 +++++++++++++++++
 .../MoxyFragment/template_moxy_fragment.png   | Bin 0 -> 21334 bytes
 25 files changed, 640 insertions(+), 2 deletions(-)
 create mode 100644 moxy-templates/common/MoxyActivity/globals.xml.ftl
 create mode 100644 moxy-templates/common/MoxyActivity/recipe.xml.ftl
 create mode 100644 moxy-templates/common/MoxyActivity/root/AndroidManifest.xml.ftl
 create mode 100644 moxy-templates/common/MoxyActivity/root/res/layout/activity_blank.xml.ftl
 create mode 100644 moxy-templates/common/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl
 create mode 100644 moxy-templates/common/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl
 create mode 100644 moxy-templates/common/MoxyActivity/root/src/app_package/presentation/view/BlankView.java.ftl
 create mode 100644 moxy-templates/common/MoxyActivity/root/src/app_package/presentation/view/BlankView.kt.ftl
 create mode 100644 moxy-templates/common/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.java.ftl
 create mode 100644 moxy-templates/common/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.kt.ftl
 create mode 100644 moxy-templates/common/MoxyActivity/template.xml
 create mode 100644 moxy-templates/common/MoxyActivity/template_moxy_activity.png
 create mode 100644 moxy-templates/common/MoxyFragment/globals.xml.ftl
 create mode 100644 moxy-templates/common/MoxyFragment/recipe.xml.ftl
 create mode 100644 moxy-templates/common/MoxyFragment/root/res/layout/fragment_blank.xml.ftl
 create mode 100644 moxy-templates/common/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl
 create mode 100644 moxy-templates/common/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl
 create mode 100644 moxy-templates/common/MoxyFragment/root/src/app_package/presentation/view/BlankView.java.ftl
 create mode 100644 moxy-templates/common/MoxyFragment/root/src/app_package/presentation/view/BlankView.kt.ftl
 create mode 100644 moxy-templates/common/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.java.ftl
 create mode 100644 moxy-templates/common/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.kt.ftl
 create mode 100644 moxy-templates/common/MoxyFragment/template.xml
 create mode 100644 moxy-templates/common/MoxyFragment/template_moxy_fragment.png

diff --git a/moxy-templates/Kotlin/MoxyActivity/template.xml b/moxy-templates/Kotlin/MoxyActivity/template.xml
index 803a3cd8..0fb481e4 100644
--- a/moxy-templates/Kotlin/MoxyActivity/template.xml
+++ b/moxy-templates/Kotlin/MoxyActivity/template.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <template
-    name="Moxy activity"
+    name="Moxy activity Kotlin"
     description="MVP activity constructor"
     format="4"
     minApi="9"
diff --git a/moxy-templates/Kotlin/MoxyFragment/template.xml b/moxy-templates/Kotlin/MoxyFragment/template.xml
index c9027a88..38476106 100644
--- a/moxy-templates/Kotlin/MoxyFragment/template.xml
+++ b/moxy-templates/Kotlin/MoxyFragment/template.xml
@@ -2,7 +2,7 @@
 <template
     format="4"
     revision="1"
-    name="Moxy fragment"
+    name="Moxy fragment Kotlin"
     description="Moxy MVP fragment constructor"
     minApi="7"
     minBuildApi="8">
diff --git a/moxy-templates/common/MoxyActivity/globals.xml.ftl b/moxy-templates/common/MoxyActivity/globals.xml.ftl
new file mode 100644
index 00000000..1ba7a47d
--- /dev/null
+++ b/moxy-templates/common/MoxyActivity/globals.xml.ftl
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<globals>
+
+    <global id="superClassName" type="string" value="
+            <#if superClass == 'baseActivity'>BaseActivity
+            <#elseif superClass == 'appCompat'>MvpAppCompatActivity
+            <#else>MvpActivity</#if>
+        " />
+
+    <global id="superClassFqcn" type="string" value="
+            <#if superClass == 'baseActivity'>${packageName}.ui.activity.BaseActivity
+            <#elseif superClass == 'appCompat'>com.arellomobile.mvp.MvpAppCompatActivity
+            <#else>com.arellomobile.mvp.MvpActivity</#if>
+        " />
+
+    <global id="manifestOut" value="${manifestDir}" />
+    <global id="useSupport" type="boolean" value="${(minApiLevel lt 11)?string}" />
+    <global id="resOut" value="${resDir}" />
+    <global id="srcOut" value="${srcDir}/${slashedPackageName(packageName)}" />
+    <global id="relativePackage" value=".ui.activity" />
+    <global id="subpackage" value="<#if useSubPackage>${subPackage}/<#else></#if>" />
+    <global id="dotSubpackage" value="<#if useSubPackage>.${subPackage}<#else></#if>" />
+
+    <#include "root://activities/common/common_globals.xml.ftl" />
+</globals>
diff --git a/moxy-templates/common/MoxyActivity/recipe.xml.ftl b/moxy-templates/common/MoxyActivity/recipe.xml.ftl
new file mode 100644
index 00000000..aead3e1d
--- /dev/null
+++ b/moxy-templates/common/MoxyActivity/recipe.xml.ftl
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<recipe>
+
+    <#if includeLayout>
+        <instantiate from="res/layout/activity_blank.xml.ftl"
+                     to="${escapeXmlAttribute(resOut)}/layout/${escapeXmlAttribute(activityName)}.xml" />
+
+        <open file="${escapeXmlAttribute(resOut)}/layout/${escapeXmlAttribute(activityName)}.xml" />
+    </#if>
+
+    <open file="${escapeXmlAttribute(srcOut)}/ui/activity/${subpackage}${className}.${ktOrJavaExt}" />
+
+    <instantiate from="src/app_package/ui/activity/BlankActivity.${ktOrJavaExt}.ftl"
+                   to="${escapeXmlAttribute(srcOut)}/ui/activity/${subpackage}${className}.${ktOrJavaExt}" />
+
+    <#if includeView>
+    <instantiate from="src/app_package/presentation/view/BlankView.${ktOrJavaExt}.ftl"
+                   to="${escapeXmlAttribute(srcOut)}/presentation/view/${subpackage}${viewName}.${ktOrJavaExt}" />
+
+    <open file="${escapeXmlAttribute(srcOut)}/presentation/view/${subpackage}${viewName}.${ktOrJavaExt}" />
+    </#if>
+
+    <#if includePresenter>
+    <instantiate from="src/app_package/presentation/presenter/BlankPresenter.${ktOrJavaExt}.ftl"
+                   to="${escapeXmlAttribute(srcOut)}/presentation/presenter/${subpackage}${presenterName}.${ktOrJavaExt}" />
+
+    <open file="${escapeXmlAttribute(srcOut)}/presentation/presenter/${subpackage}${presenterName}.${ktOrJavaExt}" />
+    </#if>
+
+    <merge from="AndroidManifest.xml.ftl"
+             to="${escapeXmlAttribute(manifestOut)}/AndroidManifest.xml" />
+                                      
+</recipe>
diff --git a/moxy-templates/common/MoxyActivity/root/AndroidManifest.xml.ftl b/moxy-templates/common/MoxyActivity/root/AndroidManifest.xml.ftl
new file mode 100644
index 00000000..48c35a59
--- /dev/null
+++ b/moxy-templates/common/MoxyActivity/root/AndroidManifest.xml.ftl
@@ -0,0 +1,6 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <application>
+        <activity android:name="${relativePackage}${dotSubpackage}.${className}"/>
+    </application>
+</manifest>
diff --git a/moxy-templates/common/MoxyActivity/root/res/layout/activity_blank.xml.ftl b/moxy-templates/common/MoxyActivity/root/res/layout/activity_blank.xml.ftl
new file mode 100644
index 00000000..a253dff9
--- /dev/null
+++ b/moxy-templates/common/MoxyActivity/root/res/layout/activity_blank.xml.ftl
@@ -0,0 +1,9 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="${relativePackage}${dotSubpackage}.${className}">
+
+  
+
+</FrameLayout>
diff --git a/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl b/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl
new file mode 100644
index 00000000..838befe8
--- /dev/null
+++ b/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl
@@ -0,0 +1,11 @@
+package ${packageName}.presentation.presenter${dotSubpackage};
+
+<#if applicationPackage??>import ${applicationPackage}.R;</#if>
+import ${packageName}.presentation.view${dotSubpackage}.${viewName};
+import com.arellomobile.mvp.InjectViewState;
+import com.arellomobile.mvp.MvpPresenter;
+
+@InjectViewState
+public class ${presenterName} extends MvpPresenter<${viewName}>  {
+
+}
diff --git a/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl b/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl
new file mode 100644
index 00000000..ddc221b8
--- /dev/null
+++ b/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl
@@ -0,0 +1,10 @@
+package ${packageName}.presentation.presenter${dotSubpackage}
+
+import com.arellomobile.mvp.InjectViewState
+import com.arellomobile.mvp.MvpPresenter
+import ${packageName}.presentation.view${dotSubpackage}.${viewName}
+
+@InjectViewState
+class ${presenterName} : MvpPresenter<${viewName}>() {
+
+}
diff --git a/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/view/BlankView.java.ftl b/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/view/BlankView.java.ftl
new file mode 100644
index 00000000..ec5bbb0c
--- /dev/null
+++ b/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/view/BlankView.java.ftl
@@ -0,0 +1,7 @@
+package ${packageName}.presentation.view${dotSubpackage};
+
+import com.arellomobile.mvp.MvpView;
+
+public interface ${viewName} extends MvpView {
+
+}
diff --git a/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/view/BlankView.kt.ftl b/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/view/BlankView.kt.ftl
new file mode 100644
index 00000000..bd24a774
--- /dev/null
+++ b/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/view/BlankView.kt.ftl
@@ -0,0 +1,7 @@
+package ${packageName}.presentation.view${dotSubpackage}
+
+import com.arellomobile.mvp.MvpView
+
+interface ${viewName} : MvpView {
+
+}
diff --git a/moxy-templates/common/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.java.ftl b/moxy-templates/common/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.java.ftl
new file mode 100644
index 00000000..37798be2
--- /dev/null
+++ b/moxy-templates/common/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.java.ftl
@@ -0,0 +1,50 @@
+package ${packageName}.ui.activity${dotSubpackage};
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import ${packageName}.presentation.view${dotSubpackage}.${viewName};
+import ${packageName}.presentation.presenter${dotSubpackage}.${presenterName};
+
+import ${superClassFqcn};
+
+<#if packageName??>
+import ${packageName}.R;
+</#if>
+
+import com.arellomobile.mvp.presenter.InjectPresenter;
+<#if createProvidesMethod>
+import com.arellomobile.mvp.presenter.ProvidePresenter;
+</#if>
+
+public class ${className} extends ${superClassName} implements ${viewName} {
+    public static final String TAG = "${className}";
+	@InjectPresenter
+	${presenterName} m${presenterName};
+
+    <#if createProvidesMethod>
+    @ProvidePresenter
+    ${presenterName} providePresenter() {
+        return new ${presenterName}();
+    }
+    </#if>
+
+	<#if includeFactory>
+    public static Intent getIntent(final Context context) {
+        Intent intent = new Intent(context, ${className}.class);
+
+        return intent;
+    }
+	</#if>
+
+	<#if includeLayout>
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.${activityName});
+	}
+	</#if>
+}
diff --git a/moxy-templates/common/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.kt.ftl b/moxy-templates/common/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.kt.ftl
new file mode 100644
index 00000000..a924373a
--- /dev/null
+++ b/moxy-templates/common/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.kt.ftl
@@ -0,0 +1,41 @@
+package ${packageName}.ui.activity${dotSubpackage}
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+
+import com.arellomobile.mvp.presenter.InjectPresenter
+import ${packageName}.R
+import ${packageName}.presentation.view${dotSubpackage}.${viewName}
+import ${packageName}.presentation.presenter${dotSubpackage}.${presenterName}
+
+import ${superClassFqcn};
+
+<#if createProvidesMethod>
+import com.arellomobile.mvp.presenter.ProvidePresenter;
+</#if>
+
+
+class ${className} : ${superClassName}(), ${viewName} {
+    companion object {
+        const val TAG = "${className}"
+	<#if includeFactory>
+        fun getIntent(context: Context): Intent = Intent(context, ${className}::class.java)
+	</#if>
+    }
+
+	@InjectPresenter
+	lateinit var m${presenterName}: ${presenterName}
+
+    <#if createProvidesMethod>
+        @ProvidePresenter
+        fun providePresenter() : ${presenterName} = ${presenterName}()
+    </#if>
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+	<#if includeLayout>
+		setContentView(R.layout.${activityName})
+	</#if>
+	}
+}
diff --git a/moxy-templates/common/MoxyActivity/template.xml b/moxy-templates/common/MoxyActivity/template.xml
new file mode 100644
index 00000000..1f79ea6d
--- /dev/null
+++ b/moxy-templates/common/MoxyActivity/template.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<template
+    format="4"
+    revision="1"
+    name="Moxy activity"
+    description="MVP activity constructor"
+    minApi="7"
+    minBuildApi="8">
+
+    <category value="Moxy" />
+
+    <dependency name="android-support-v4" revision="8" />
+
+    <parameter
+        id="className"
+        name="Activity Name"
+        type="string"
+        constraints="class|nonempty|unique"
+        default="BlankActivity"
+        help="The name of the activity class to create" />
+
+    <parameter
+        id="useSubPackage"
+        name="Use sub package?"
+        type="boolean"
+        default="true"
+        help="Add generated classes to specified package" />
+        
+    <parameter
+        id="subPackage"
+        name="Package name"
+        type="string"
+        default="blank"
+        visibility="useSubPackage"
+        help="Package name" />
+
+    <parameter
+        id="includeLayout"
+        name="Create layout XML?"
+        type="boolean"
+        default="true"
+        help="Generate a layout XML for the activity" />
+
+    <parameter
+        id="includeView"
+        name="Create View?"
+        type="boolean"
+        default="true"
+        help="Generate a view for the activity" />
+
+    <parameter
+        id="includePresenter"
+        name="Create Presenter?"
+        type="boolean"
+        default="true"
+        help="Generate a presenter for the activity" />
+
+    <parameter
+        id="createProvidesMethod"
+        name="Create Custom Provides Presenter Method?"
+        type="boolean"
+        visibility="includePresenter"
+        default="false"
+        help="Generate a method for provides presenter" />
+
+    <parameter
+        id="superClass"
+        name="Base Activity"
+        type="enum"
+        default="baseActivity"
+        help="if choose BaseActivity, please add your_package_name/ui/activity/BaseActivity otherwise MvpActivity" >
+        <option id="baseActivity">BaseActivity</option>
+        <option id="appCompat">MvpAppCompatActivity</option>
+        <option id="activity">MvpActivity</option>
+    </parameter>
+
+    <parameter
+        id="activityName"
+        name="Activity Layout Name"
+        type="string"
+        constraints="layout|nonempty|unique"
+        default="activity_blank"
+        visibility="includeLayout"
+        suggest="activity_${classToResource(className)}"
+        help="The name of the layout to create" />
+
+    <parameter
+        id="includeFactory"
+        name="Include activity factory method?"
+        type="boolean"
+        default="true"
+        help="Generate static activity factory method for easy instantiation" />
+
+    <parameter
+        id="viewName"
+        name="View Name"
+        type="string"
+        constraints="class|nonempty|unique"
+        default="BlankView"
+        visibility="includeView"
+        suggest="${underscoreToCamelCase(classToResource(className))}View"
+        help="The name of the view interface to create" />
+
+    <parameter
+        id="presenterName"
+        name="Presenter Name"
+        type="string"
+        constraints="class|nonempty|unique"
+        default="BlankPresenter"
+        visibility="includePresenter"
+        suggest="${underscoreToCamelCase(classToResource(className))}Presenter"
+        help="The name of the presenter interface to create" />
+
+    <thumbs>
+        <thumb>template_moxy_activity.png</thumb>
+    </thumbs>
+
+    <globals file="globals.xml.ftl" />
+
+    <execute file="recipe.xml.ftl" />
+
+</template>
diff --git a/moxy-templates/common/MoxyActivity/template_moxy_activity.png b/moxy-templates/common/MoxyActivity/template_moxy_activity.png
new file mode 100644
index 0000000000000000000000000000000000000000..3553819b80d0ab0c6428dde916c07610095a5931
GIT binary patch
literal 21334
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

literal 0
HcmV?d00001

diff --git a/moxy-templates/common/MoxyFragment/globals.xml.ftl b/moxy-templates/common/MoxyFragment/globals.xml.ftl
new file mode 100644
index 00000000..e4a1a0b1
--- /dev/null
+++ b/moxy-templates/common/MoxyFragment/globals.xml.ftl
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<globals>
+
+    <global id="superClassName" type="string" value="
+            <#if superClass == 'baseFragment'>BaseFragment
+            <#elseif superClass == 'appCompat'>MvpAppCompatFragment
+            <#else>MvpFragment</#if>
+        " />
+
+    <global id="superClassFqcn" type="string" value="
+            <#if superClass == 'baseFragment'>${packageName}.ui.fragment.BaseFragment
+            <#elseif superClass == 'appCompat'>com.arellomobile.mvp.MvpAppCompatFragment
+            <#else>com.arellomobile.mvp.MvpFragment</#if>
+        " />
+
+    <global id="useSupport" type="boolean" value="${(minApiLevel lt 11)?string}" />
+    <global id="resOut" value="${resDir}" />
+    <global id="srcOut" value="${srcDir}/${slashedPackageName(packageName)}" />
+    <global id="relativePackage" value=".ui.fragment" />
+    <global id="subpackage" value="<#if useSubPackage>${subPackage}/<#else></#if>" />
+    <global id="dotSubpackage" value="<#if useSubPackage>.${subPackage}<#else></#if>" />
+
+    <#include "root://activities/common/common_globals.xml.ftl" />
+</globals>
diff --git a/moxy-templates/common/MoxyFragment/recipe.xml.ftl b/moxy-templates/common/MoxyFragment/recipe.xml.ftl
new file mode 100644
index 00000000..2592ba89
--- /dev/null
+++ b/moxy-templates/common/MoxyFragment/recipe.xml.ftl
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<recipe>
+
+    <#if includeLayout>
+        <instantiate from="res/layout/fragment_blank.xml.ftl"
+                       to="${escapeXmlAttribute(resOut)}/layout/${escapeXmlAttribute(fragmentName)}.xml" />
+
+        <open file="${escapeXmlAttribute(resOut)}/layout/${escapeXmlAttribute(fragmentName)}.xml" />
+    </#if>
+
+    <open file="${escapeXmlAttribute(srcOut)}/ui/fragment/${subpackage}${className}.${ktOrJavaExt}" />
+
+    <instantiate from="src/app_package/ui/fragment/BlankFragment.${ktOrJavaExt}.ftl"
+                   to="${escapeXmlAttribute(srcOut)}/ui/fragment/${subpackage}${className}.${ktOrJavaExt}" />
+
+    <#if includeView>
+    <instantiate from="src/app_package/presentation/view/BlankView.${ktOrJavaExt}.ftl"
+                   to="${escapeXmlAttribute(srcOut)}/presentation/view/${subpackage}${viewName}.${ktOrJavaExt}" />
+
+    <open file="${escapeXmlAttribute(srcOut)}/presentation/view/${subpackage}${viewName}.${ktOrJavaExt}" />
+    </#if>
+
+    <#if includePresenter>
+    <instantiate from="src/app_package/presentation/presenter/BlankPresenter.${ktOrJavaExt}.ftl"
+                   to="${escapeXmlAttribute(srcOut)}/presentation/presenter/${subpackage}${presenterName}.${ktOrJavaExt}" />
+
+    <open file="${escapeXmlAttribute(srcOut)}/presentation/presenter/${subpackage}${presenterName}.${ktOrJavaExt}" />
+    </#if>
+                                      
+</recipe>
diff --git a/moxy-templates/common/MoxyFragment/root/res/layout/fragment_blank.xml.ftl b/moxy-templates/common/MoxyFragment/root/res/layout/fragment_blank.xml.ftl
new file mode 100644
index 00000000..f25298b9
--- /dev/null
+++ b/moxy-templates/common/MoxyFragment/root/res/layout/fragment_blank.xml.ftl
@@ -0,0 +1,7 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="${relativePackage}${dotSubpackage}.${className}">
+
+</FrameLayout>
diff --git a/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl b/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl
new file mode 100644
index 00000000..838befe8
--- /dev/null
+++ b/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl
@@ -0,0 +1,11 @@
+package ${packageName}.presentation.presenter${dotSubpackage};
+
+<#if applicationPackage??>import ${applicationPackage}.R;</#if>
+import ${packageName}.presentation.view${dotSubpackage}.${viewName};
+import com.arellomobile.mvp.InjectViewState;
+import com.arellomobile.mvp.MvpPresenter;
+
+@InjectViewState
+public class ${presenterName} extends MvpPresenter<${viewName}>  {
+
+}
diff --git a/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl b/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl
new file mode 100644
index 00000000..ddc221b8
--- /dev/null
+++ b/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl
@@ -0,0 +1,10 @@
+package ${packageName}.presentation.presenter${dotSubpackage}
+
+import com.arellomobile.mvp.InjectViewState
+import com.arellomobile.mvp.MvpPresenter
+import ${packageName}.presentation.view${dotSubpackage}.${viewName}
+
+@InjectViewState
+class ${presenterName} : MvpPresenter<${viewName}>() {
+
+}
diff --git a/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/view/BlankView.java.ftl b/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/view/BlankView.java.ftl
new file mode 100644
index 00000000..ec5bbb0c
--- /dev/null
+++ b/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/view/BlankView.java.ftl
@@ -0,0 +1,7 @@
+package ${packageName}.presentation.view${dotSubpackage};
+
+import com.arellomobile.mvp.MvpView;
+
+public interface ${viewName} extends MvpView {
+
+}
diff --git a/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/view/BlankView.kt.ftl b/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/view/BlankView.kt.ftl
new file mode 100644
index 00000000..bd24a774
--- /dev/null
+++ b/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/view/BlankView.kt.ftl
@@ -0,0 +1,7 @@
+package ${packageName}.presentation.view${dotSubpackage}
+
+import com.arellomobile.mvp.MvpView
+
+interface ${viewName} : MvpView {
+
+}
diff --git a/moxy-templates/common/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.java.ftl b/moxy-templates/common/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.java.ftl
new file mode 100644
index 00000000..340481d1
--- /dev/null
+++ b/moxy-templates/common/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.java.ftl
@@ -0,0 +1,58 @@
+package ${packageName}.ui.fragment${dotSubpackage};
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import ${packageName}.presentation.view${dotSubpackage}.${viewName};
+import ${packageName}.presentation.presenter${dotSubpackage}.${presenterName};
+
+import ${superClassFqcn};
+
+<#if packageName??>
+import ${packageName}.R;
+</#if>
+
+import com.arellomobile.mvp.presenter.InjectPresenter;
+<#if createProvidesMethod>
+import com.arellomobile.mvp.presenter.ProvidePresenter;
+</#if>
+
+public class ${className} extends ${superClassName} implements ${viewName} {
+    public static final String TAG = "${className}";
+	@InjectPresenter
+	${presenterName} m${presenterName};
+
+<#if createProvidesMethod>
+        @ProvidePresenter
+        ${presenterName} providePresenter() {
+            return new ${presenterName}();
+        }
+</#if>
+
+<#if includeFactory>
+    public static ${className} newInstance() {
+        ${className} fragment = new ${className}();
+
+        Bundle args = new Bundle();
+        fragment.setArguments(args);
+
+        return fragment;
+    }
+</#if>
+
+    @Override
+    public View onCreateView(final LayoutInflater inflater, final   ViewGroup container,
+            final Bundle savedInstanceState) {
+<#if includeLayout>
+        return inflater.inflate(R.layout.${fragmentName}, container, false);
+</#if>
+    }
+
+    @Override
+    public void onViewCreated(final View view, final Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+    }
+}
diff --git a/moxy-templates/common/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.kt.ftl b/moxy-templates/common/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.kt.ftl
new file mode 100644
index 00000000..29a7c218
--- /dev/null
+++ b/moxy-templates/common/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.kt.ftl
@@ -0,0 +1,42 @@
+package ${packageName}.ui.fragment${dotSubpackage}
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import ${packageName}.R
+import ${packageName}.presentation.view${dotSubpackage}.${viewName}
+import ${packageName}.presentation.presenter${dotSubpackage}.${presenterName}
+
+import com.arellomobile.mvp.MvpFragment
+import com.arellomobile.mvp.presenter.InjectPresenter
+
+class ${className} : MvpFragment(), ${viewName} {
+    companion object {
+        const val TAG = "${className}"
+<#if includeFactory>
+
+        fun newInstance(): ${className} {
+			val fragment: ${className} = ${className}()
+			val args: Bundle = Bundle()
+			fragment.arguments = args
+			return fragment
+		}
+</#if>
+    }
+
+	@InjectPresenter
+	lateinit var m${presenterName}: ${presenterName}
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+<#if includeLayout>
+        return inflater.inflate(R.layout.${fragmentName}, container, false)
+</#if>
+    }
+
+    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+    }
+}
diff --git a/moxy-templates/common/MoxyFragment/template.xml b/moxy-templates/common/MoxyFragment/template.xml
new file mode 100644
index 00000000..73669c02
--- /dev/null
+++ b/moxy-templates/common/MoxyFragment/template.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0"?>
+<template
+    format="4"
+    revision="1"
+    name="Moxy fragment"
+    description="Moxy MVP fragment constructor"
+    minApi="7"
+    minBuildApi="8">
+
+    <category value="Moxy" />
+
+    <dependency name="android-support-v4" revision="8" />
+
+    <parameter
+        id="className"
+        name="Fragment Name"
+        type="string"
+        constraints="class|nonempty|unique"
+        default="BlankFragment"
+        help="The name of the fragment class to create" />
+
+    <parameter
+        id="useSubPackage"
+        name="Use sub package?"
+        type="boolean"
+        default="true"
+        help="Add generated classes to specified package" />
+        
+    <parameter
+        id="subPackage"
+        name="Package name"
+        type="string"
+        default="blank"
+        visibility="useSubPackage"
+        help="Package name" />
+
+    <parameter
+        id="superClass"
+        name="Base Fragment"
+        type="enum"
+        default="baseFragment"
+        help="if choose BaseFragment, please add your_package_name/ui/activity/BaseFragment otherwise MvpFragment" >
+        <option id="baseFragment">BaseFragment</option>
+        <option id="appCompat">MvpAppCompatFragment</option>
+        <option id="fragment">MvpFragment</option>
+    </parameter>
+
+    <parameter
+        id="includeLayout"
+        name="Create layout XML?"
+        type="boolean"
+        default="true"
+        help="Generate a layout XML for the fragment" />
+
+    <parameter
+        id="includeView"
+        name="Create View?"
+        type="boolean"
+        default="true"
+        help="Generate a view for the fragment" />
+
+    <parameter
+        id="includePresenter"
+        name="Create Presenter?"
+        type="boolean"
+        default="true"
+        help="Generate a presenter for the fragment" />
+
+    <parameter
+        id="createProvidesMethod"
+        name="Create Custom Provides Presenter Method?"
+        type="boolean"
+        visibility="includePresenter"
+        default="false"
+        help="Generate a method for provides presenter" />
+
+    <parameter
+        id="fragmentName"
+        name="Fragment Layout Name"
+        type="string"
+        constraints="layout|nonempty|unique"
+        default="fragment_blank"
+        visibility="includeLayout"
+        suggest="fragment_${classToResource(className)}"
+        help="The name of the layout to create" />
+
+    <parameter
+        id="includeFactory"
+        name="Include fragment factory method?"
+        type="boolean"
+        default="true"
+        help="Generate static fragment factory method for easy instantiation" />
+
+    <parameter
+        id="viewName"
+        name="View Name"
+        type="string"
+        constraints="class|nonempty|unique"
+        default="BlankView"
+        visibility="includeView"
+        suggest="${underscoreToCamelCase(classToResource(className))}View"
+        help="The name of the view interface to create" />
+
+    <parameter
+        id="presenterName"
+        name="Presenter Name"
+        type="string"
+        constraints="class|nonempty|unique"
+        default="BlankPresenter"
+        visibility="includePresenter"
+        suggest="${underscoreToCamelCase(classToResource(className))}Presenter"
+        help="The name of the presenter interface to create" />
+
+    <thumbs>
+        <thumb>template_moxy_fragment.png</thumb>
+    </thumbs>
+
+    <globals file="globals.xml.ftl" />
+    <execute file="recipe.xml.ftl" />
+
+</template>
diff --git a/moxy-templates/common/MoxyFragment/template_moxy_fragment.png b/moxy-templates/common/MoxyFragment/template_moxy_fragment.png
new file mode 100644
index 0000000000000000000000000000000000000000..3553819b80d0ab0c6428dde916c07610095a5931
GIT binary patch
literal 21334
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

literal 0
HcmV?d00001


From b1db5b0d948c0575bf08afc27f1106a40775f962 Mon Sep 17 00:00:00 2001
From: vova <v.stelmashchuk@mobidev.biz>
Date: Wed, 15 Aug 2018 00:58:02 +0300
Subject: [PATCH 07/35] add hasNotView

---
 .../compiler/viewstate/ViewStateClassGenerator.java  |  2 +-
 .../com/arellomobile/mvp/viewstate/MvpViewState.java | 12 ++++++++++--
 sample-kotlin/build.gradle                           |  6 +++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewStateClassGenerator.java b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewStateClassGenerator.java
index 266f7b70..16b86866 100644
--- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewStateClassGenerator.java
+++ b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewStateClassGenerator.java
@@ -89,7 +89,7 @@ private MethodSpec generateMethod(ViewMethod method, TypeName viewTypeName, Type
 				.addStatement("$1N $2L = new $1N($3L)", commandClass, commandFieldName, method.getArgumentsString())
 				.addStatement("mViewCommands.beforeApply($L)", commandFieldName)
 				.addCode("\n")
-				.beginControlFlow("if (mViews == null || mViews.isEmpty())")
+				.beginControlFlow("if (hasNotView())")
 				.addStatement("return")
 				.endControlFlow()
 				.addCode("\n")
diff --git a/moxy/src/main/java/com/arellomobile/mvp/viewstate/MvpViewState.java b/moxy/src/main/java/com/arellomobile/mvp/viewstate/MvpViewState.java
index 99bc644e..f4b1a173 100644
--- a/moxy/src/main/java/com/arellomobile/mvp/viewstate/MvpViewState.java
+++ b/moxy/src/main/java/com/arellomobile/mvp/viewstate/MvpViewState.java
@@ -1,13 +1,13 @@
 package com.arellomobile.mvp.viewstate;
 
+import com.arellomobile.mvp.MvpView;
+
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.WeakHashMap;
 
-import com.arellomobile.mvp.MvpView;
-
 /**
  * Date: 15.12.2015
  * Time: 19:58
@@ -41,7 +41,15 @@ protected void restoreState(View view, Set<ViewCommand<View>> currentState) {
 		mViewCommands.reapply(view, currentState);
 	}
 
+
 	/**
+	 * @return true if view state has one or more views, false otherwise (if view state doesn't have any view)
+	 */
+    protected Boolean hasNotView() {
+        return (mViews == null) || mViews.isEmpty();
+    }
+
+    /**
 	 * Attach view to view state and apply saves state
 	 *
 	 * @param view attachment
diff --git a/sample-kotlin/build.gradle b/sample-kotlin/build.gradle
index 6c110700..cad8001b 100644
--- a/sample-kotlin/build.gradle
+++ b/sample-kotlin/build.gradle
@@ -43,9 +43,9 @@ android {
 dependencies {
     implementation 'com.android.support:appcompat-v7:26.1.0'
 
-    implementation 'com.arello-mobile:moxy:1.5.5'
-    implementation 'com.arello-mobile:moxy-app-compat:1.5.5'
-    kapt 'com.arello-mobile:moxy-compiler:1.5.5'
+    implementation project(':moxy')
+    implementation project(':moxy-app-compat')
+    kapt project(':moxy-compiler')
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }

From 4562ddcfb64a957770bd3a3f928f8ee189c1773f Mon Sep 17 00:00:00 2001
From: Volodymyr <vovochkastelmashchuk@gmail.com>
Date: Mon, 27 Aug 2018 23:53:09 +0300
Subject: [PATCH 08/35] [feature] Add android X

PR #212 (Android x)
---
 moxy-androidx-sapmle/.gitignore               |   1 +
 moxy-androidx-sapmle/build.gradle             |  50 ++++
 moxy-androidx-sapmle/gradle.properties        |  22 ++
 moxy-androidx-sapmle/proguard-rules.pro       |  21 ++
 .../src/main/AndroidManifest.xml              |  21 ++
 .../com/moxy_androidx_sapmle/MainActivity.kt  |  31 +++
 .../com/moxy_androidx_sapmle/MainPresenter.kt |  16 ++
 .../drawable-v24/ic_launcher_foreground.xml   |  34 +++
 .../res/drawable/ic_launcher_background.xml   |  74 ++++++
 .../src/main/res/layout/activity_main.xml     |  14 +
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   5 +
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   5 +
 .../src/main/res/mipmap-hdpi/ic_launcher.png  | Bin 0 -> 3056 bytes
 .../res/mipmap-hdpi/ic_launcher_round.png     | Bin 0 -> 5024 bytes
 .../src/main/res/mipmap-mdpi/ic_launcher.png  | Bin 0 -> 2096 bytes
 .../res/mipmap-mdpi/ic_launcher_round.png     | Bin 0 -> 2858 bytes
 .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4569 bytes
 .../res/mipmap-xhdpi/ic_launcher_round.png    | Bin 0 -> 7098 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin 0 -> 6464 bytes
 .../res/mipmap-xxhdpi/ic_launcher_round.png   | Bin 0 -> 10676 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin 0 -> 9250 bytes
 .../res/mipmap-xxxhdpi/ic_launcher_round.png  | Bin 0 -> 15523 bytes
 .../src/main/res/values/colors.xml            |   6 +
 .../src/main/res/values/strings.xml           |   3 +
 .../src/main/res/values/styles.xml            |  11 +
 moxy-androidx/build.gradle                    | 244 ++++++++++++++++++
 .../mvp/MvpAppCompatActivity.java             |  73 ++++++
 .../mvp/MvpAppCompatFragment.java             | 107 ++++++++
 moxy-androidx/stub-androidx/build.gradle      |   8 +
 .../appcompat/app/AppCompatActivity.java      |  41 +++
 .../java/androidx/fragment/app/Fragment.java  |  52 ++++
 .../fragment/app/FragmentActivity.java        |  14 +
 .../mvp/viewstate/strategy/StateStrategy.java |   6 +-
 sample-custom-strategy/build.gradle           |  16 +-
 .../ExampleInstrumentedTest.kt                |  24 --
 .../app/presentation/launch/LaunchFragment.kt |   8 +-
 .../sample_custom_strategy/ExampleUnitTest.kt |  17 --
 sample-kotlin/build.gradle                    |   2 +-
 settings.gradle                               |   4 +-
 39 files changed, 873 insertions(+), 57 deletions(-)
 create mode 100644 moxy-androidx-sapmle/.gitignore
 create mode 100644 moxy-androidx-sapmle/build.gradle
 create mode 100644 moxy-androidx-sapmle/gradle.properties
 create mode 100644 moxy-androidx-sapmle/proguard-rules.pro
 create mode 100644 moxy-androidx-sapmle/src/main/AndroidManifest.xml
 create mode 100644 moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt
 create mode 100644 moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainPresenter.kt
 create mode 100644 moxy-androidx-sapmle/src/main/res/drawable-v24/ic_launcher_foreground.xml
 create mode 100644 moxy-androidx-sapmle/src/main/res/drawable/ic_launcher_background.xml
 create mode 100644 moxy-androidx-sapmle/src/main/res/layout/activity_main.xml
 create mode 100644 moxy-androidx-sapmle/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
 create mode 100644 moxy-androidx-sapmle/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
 create mode 100644 moxy-androidx-sapmle/src/main/res/mipmap-hdpi/ic_launcher.png
 create mode 100644 moxy-androidx-sapmle/src/main/res/mipmap-hdpi/ic_launcher_round.png
 create mode 100644 moxy-androidx-sapmle/src/main/res/mipmap-mdpi/ic_launcher.png
 create mode 100644 moxy-androidx-sapmle/src/main/res/mipmap-mdpi/ic_launcher_round.png
 create mode 100644 moxy-androidx-sapmle/src/main/res/mipmap-xhdpi/ic_launcher.png
 create mode 100644 moxy-androidx-sapmle/src/main/res/mipmap-xhdpi/ic_launcher_round.png
 create mode 100644 moxy-androidx-sapmle/src/main/res/mipmap-xxhdpi/ic_launcher.png
 create mode 100644 moxy-androidx-sapmle/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
 create mode 100644 moxy-androidx-sapmle/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 create mode 100644 moxy-androidx-sapmle/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
 create mode 100644 moxy-androidx-sapmle/src/main/res/values/colors.xml
 create mode 100644 moxy-androidx-sapmle/src/main/res/values/strings.xml
 create mode 100644 moxy-androidx-sapmle/src/main/res/values/styles.xml
 create mode 100755 moxy-androidx/build.gradle
 create mode 100755 moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatActivity.java
 create mode 100644 moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatFragment.java
 create mode 100755 moxy-androidx/stub-androidx/build.gradle
 create mode 100755 moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatActivity.java
 create mode 100644 moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/Fragment.java
 create mode 100644 moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/FragmentActivity.java
 delete mode 100644 sample-custom-strategy/src/androidTest/java/com/redmadrobot/sample_custom_strategy/ExampleInstrumentedTest.kt
 delete mode 100644 sample-custom-strategy/src/test/java/com/redmadrobot/sample_custom_strategy/ExampleUnitTest.kt

diff --git a/moxy-androidx-sapmle/.gitignore b/moxy-androidx-sapmle/.gitignore
new file mode 100644
index 00000000..796b96d1
--- /dev/null
+++ b/moxy-androidx-sapmle/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/moxy-androidx-sapmle/build.gradle b/moxy-androidx-sapmle/build.gradle
new file mode 100644
index 00000000..e7845836
--- /dev/null
+++ b/moxy-androidx-sapmle/build.gradle
@@ -0,0 +1,50 @@
+buildscript {
+    ext.kotlin_version = '1.2.51'
+    repositories {
+        google()
+        jcenter()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-android-extensions'
+
+android {
+    compileSdkVersion 28
+    buildToolsVersion '27.0.3'
+
+    defaultConfig {
+        applicationId "com.arellomobile.mvp.sample.androidx"
+        minSdkVersion 16
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
+    implementation project(':moxy')
+    implementation project(':moxy-androidx')
+    kapt project(':moxy-compiler')
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+}
diff --git a/moxy-androidx-sapmle/gradle.properties b/moxy-androidx-sapmle/gradle.properties
new file mode 100644
index 00000000..b766318a
--- /dev/null
+++ b/moxy-androidx-sapmle/gradle.properties
@@ -0,0 +1,22 @@
+# 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>
+android.useAndroidX=true
+android.enableJetifier=true
\ No newline at end of file
diff --git a/moxy-androidx-sapmle/proguard-rules.pro b/moxy-androidx-sapmle/proguard-rules.pro
new file mode 100644
index 00000000..f1b42451
--- /dev/null
+++ b/moxy-androidx-sapmle/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/moxy-androidx-sapmle/src/main/AndroidManifest.xml b/moxy-androidx-sapmle/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..3c55fb75
--- /dev/null
+++ b/moxy-androidx-sapmle/src/main/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="example.com.moxy_androidx_sapmle">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt
new file mode 100644
index 00000000..68fd1ef1
--- /dev/null
+++ b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt
@@ -0,0 +1,31 @@
+package example.com.moxy_androidx_sapmle
+
+import android.os.Bundle
+import android.util.Log
+import androidx.appcompat.app.AppCompatActivity
+import com.arellomobile.mvp.MvpAppCompatActivity
+import com.arellomobile.mvp.MvpView
+import com.arellomobile.mvp.presenter.InjectPresenter
+
+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"
+	}
+}
diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainPresenter.kt b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainPresenter.kt
new file mode 100644
index 00000000..6c37df14
--- /dev/null
+++ b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainPresenter.kt
@@ -0,0 +1,16 @@
+package example.com.moxy_androidx_sapmle
+
+import android.util.Log
+import com.arellomobile.mvp.InjectViewState
+import com.arellomobile.mvp.MvpPresenter
+
+@InjectViewState
+class MainPresenter : MvpPresenter<MainView>() {
+	
+	override fun onFirstViewAttach() {
+		super.onFirstViewAttach()
+		Log.e(MainActivity.TAG, "presenter hash code : ${hashCode()}")
+		viewState.printLog("TEST")
+	}
+	
+}
\ No newline at end of file
diff --git a/moxy-androidx-sapmle/src/main/res/drawable-v24/ic_launcher_foreground.xml b/moxy-androidx-sapmle/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 00000000..c3903edf
--- /dev/null
+++ b/moxy-androidx-sapmle/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:aapt="http://schemas.android.com/aapt"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportHeight="108"
+        android:viewportWidth="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0"/>
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1"/>
+</vector>
diff --git a/moxy-androidx-sapmle/src/main/res/drawable/ic_launcher_background.xml b/moxy-androidx-sapmle/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 00000000..9d478f4c
--- /dev/null
+++ b/moxy-androidx-sapmle/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path android:fillColor="#26A69A"
+          android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+</vector>
diff --git a/moxy-androidx-sapmle/src/main/res/layout/activity_main.xml b/moxy-androidx-sapmle/src/main/res/layout/activity_main.xml
new file mode 100644
index 00000000..1692a83d
--- /dev/null
+++ b/moxy-androidx-sapmle/src/main/res/layout/activity_main.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Hello World!"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/moxy-androidx-sapmle/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 00000000..bbd3e021
--- /dev/null
+++ b/moxy-androidx-sapmle/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/moxy-androidx-sapmle/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 00000000..bbd3e021
--- /dev/null
+++ b/moxy-androidx-sapmle/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-hdpi/ic_launcher.png b/moxy-androidx-sapmle/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2f5908281d070150700378b64a84c7db1f97aa1
GIT binary patch
literal 3056
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

literal 0
HcmV?d00001

diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-hdpi/ic_launcher_round.png b/moxy-androidx-sapmle/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b523998081149a985cef0cdf89045b9ed29964a
GIT binary patch
literal 5024
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

literal 0
HcmV?d00001

diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-mdpi/ic_launcher.png b/moxy-androidx-sapmle/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff10afd6e182edb2b1a63c8f984e9070d9f950ba
GIT binary patch
literal 2096
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
axPAxe%7rDusX+w*0000<MNUMnLSTa3f$up0

literal 0
HcmV?d00001

diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-mdpi/ic_launcher_round.png b/moxy-androidx-sapmle/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..115a4c768a20c9e13185c17043f4c4d12dd4632a
GIT binary patch
literal 2858
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
IM6N<$f{l1_%m4rY

literal 0
HcmV?d00001

diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-xhdpi/ic_launcher.png b/moxy-androidx-sapmle/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..dcd3cd8083358269d6ed7894726283bb9bcbbfea
GIT binary patch
literal 4569
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
D5i!M*

literal 0
HcmV?d00001

diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/moxy-androidx-sapmle/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..459ca609d3ae0d3943ab44cdc27feef9256dc6d7
GIT binary patch
literal 7098
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

literal 0
HcmV?d00001

diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-xxhdpi/ic_launcher.png b/moxy-androidx-sapmle/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ca12fe024be86e868d14e91120a6902f8e88ac6
GIT binary patch
literal 6464
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
B0*L?s

literal 0
HcmV?d00001

diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/moxy-androidx-sapmle/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e19b410a1b15ff180f3dacac19395fe3046cdec
GIT binary patch
literal 10676
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
a9sdtN6eHRrdyqB&0000<MNUMnLSTYHIB(_v

literal 0
HcmV?d00001

diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/moxy-androidx-sapmle/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..b824ebdd48db917eea2e67a82260a100371f8a24
GIT binary patch
literal 9250
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

literal 0
HcmV?d00001

diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/moxy-androidx-sapmle/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c19a13c239cb67b8a2134ddd5f325db1d2d5bee
GIT binary patch
literal 15523
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
BIP(Ai

literal 0
HcmV?d00001

diff --git a/moxy-androidx-sapmle/src/main/res/values/colors.xml b/moxy-androidx-sapmle/src/main/res/values/colors.xml
new file mode 100644
index 00000000..3ab3e9cb
--- /dev/null
+++ b/moxy-androidx-sapmle/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/moxy-androidx-sapmle/src/main/res/values/strings.xml b/moxy-androidx-sapmle/src/main/res/values/strings.xml
new file mode 100644
index 00000000..3de299df
--- /dev/null
+++ b/moxy-androidx-sapmle/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Moxy androidX</string>
+</resources>
diff --git a/moxy-androidx-sapmle/src/main/res/values/styles.xml b/moxy-androidx-sapmle/src/main/res/values/styles.xml
new file mode 100644
index 00000000..5885930d
--- /dev/null
+++ b/moxy-androidx-sapmle/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/moxy-androidx/build.gradle b/moxy-androidx/build.gradle
new file mode 100755
index 00000000..16dc3884
--- /dev/null
+++ b/moxy-androidx/build.gradle
@@ -0,0 +1,244 @@
+apply plugin: 'java'
+apply plugin: 'maven-publish'
+apply plugin: 'maven'
+
+ext {
+    publishDir = 'artifacts'
+    publishMavenDir = 'artifacts-maven'
+    targetGroupId = 'com.arello-mobile'
+    targetArtefactId = 'moxy-androidx'
+    targetArtefactIdDev = 'moxy-androidx-dev'
+    versionFile = 'VERSION'
+}
+configurations {
+    javadocDeps
+}
+
+// This is important even if Android Studio claims it isn't
+// used. Android can't interpret Java 8 byte code.
+sourceCompatibility = JavaVersion.VERSION_1_7
+targetCompatibility = JavaVersion.VERSION_1_7
+
+def logger = new com.android.build.gradle.internal.LoggerWrapper(project.logger)
+def sdkHandler = new com.android.build.gradle.internal.SdkHandler(project, logger)
+for (File file : sdkHandler.sdkLoader.repositories) {
+    project.repositories.maven {
+        url = file.toURI()
+    }
+}
+
+task clearPublishDir(type: Delete) {
+    delete publishDir
+}
+
+task sourcesJar(type: Jar, dependsOn: classes) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+}
+
+task makeJavadocs(type: Javadoc) {
+    classpath += configurations.javadocDeps
+    source = sourceSets.main.allJava
+}
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+task makeJar(type: Jar, dependsOn: classes) {
+    from('build/classes/java/main')
+}
+
+task copyVersion {
+    doLast {
+        def versionFile = new File(project.rootDir, versionFile)
+        versionFile.write(targetVersionName)
+
+        [publishDir, publishMavenDir].each { dest ->
+            copy {
+                from versionFile
+                into dest
+            }
+        }
+    }
+}
+
+def getBasePom(String libName) {
+
+    def basePom = pom {
+        //noinspection GroovyAssignabilityCheck
+        project {
+            groupId targetGroupId
+            artifactId targetArtefactId
+            version targetVersionName
+            name 'Moxy-androidx'
+            modelVersion = '4.0.0'
+            description = 'Arello-Mobile MVP library for Android'
+            url = 'https://www.arello-mobile.com/'
+            packaging = 'jar'
+
+            inceptionYear '2016'
+            licenses {
+                license {
+                    name 'The Apache Software License, Version 2.0'
+                    url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    distribution 'repo'
+                }
+            }
+
+            developers {
+                developer {
+                    name 'Blinov Alexander'
+                    email 'xanderblinov@gmail.com'
+                    organization = 'Arello Mobile'
+                    organizationUrl 'http://www.arello-mobile.com/'
+                }
+                developer {
+                    name 'Shmakov Yuri'
+                    email 'senneco@gmail.com'
+                    organization = 'Arello Mobile'
+                    organizationUrl 'http://www.arello-mobile.com/'
+                }
+            }
+
+            scm {
+                connection 'scm:git@github.com:Arello-Mobile/Moxy.git'
+                developerConnection 'scm:git@github.com:Arello-Mobile/Moxy.git'
+                url 'https://github.com/Arello-Mobile/Moxy'
+            }
+        }.withXml {
+            asNode().appendNode('packaging', 'jar')
+        }
+    }
+
+    return basePom.withXml {
+        asNode().dependencies.'*'.findAll {
+            it.artifactId.text().contains('moxy')
+        }.each {
+            it.groupId*.value = targetGroupId
+            it.version*.value = targetVersionName
+        }
+    }
+}
+
+task copyJars {
+    doLast {
+        def buildDir = 'build/libs/'
+        copy {
+            from buildDir
+            into publishMavenDir
+        }
+
+        copy {
+            from(buildDir)
+                    {
+                        rename targetArtefactId + '(.*)', targetArtefactIdDev + '$1'
+                    }
+            into publishDir
+        }
+    }
+}
+
+
+
+
+task createPomXml {
+    doLast {
+        // creating local pom
+
+        getBasePom('moxy-dev').withXml {
+            asNode().appendNode('build').appendNode('plugins').with {
+                appendNode('plugin').with {
+                    appendNode('groupId', 'org.apache.maven.plugins')
+                    appendNode('artifactId', 'maven-gpg-plugin')
+                    appendNode('version', '1.5')
+                    appendNode('executions').with {
+                        appendNode('execution').with {
+                            appendNode('id', 'sign-artifacts')
+                            appendNode('phase', 'verify')
+                            appendNode('goals').with {
+                                appendNode('goal', 'sign')
+                            }
+                        }
+                    }
+                    appendNode('configuration').appendNode('gpgArguments').appendNode('arg', '--no-tty')
+                }
+            }
+
+            asNode().artifactId*.value = targetArtefactIdDev
+
+            asNode().dependencies.'*'.findAll() {
+                it.version.text() == '4.0.+' && project.configurations.compile.allDependencies.find { dep ->
+                    dep.name == it.artifactId.text()
+                }
+            }.each() {
+                it.version*.value = '[4.0,)'
+            }
+
+
+        }.writeTo(publishDir + "/" + targetArtefactIdDev + ".pom")
+
+        //creating global pom
+
+        getBasePom('moxy').withXml {
+
+            asNode().appendNode('build')
+                    .appendNode('plugins')
+
+
+        }.writeTo(publishMavenDir + "/" + targetArtefactId + ".pom")
+
+        getBasePom('moxy').withXml {
+
+            asNode().appendNode('build')
+                    .appendNode('plugins')
+                    .appendNode('plugin')
+                    .with {
+                appendNode('groupId', 'org.sonatype.plugins')
+                appendNode('artifactId', 'nexus-staging-maven-plugin')
+                appendNode('version', '1.6.4')
+                appendNode('extensions', 'true')
+                appendNode('configuration').with {
+                    appendNode('serverId', 'ossrh')
+                    appendNode('nexusUrl', 'https://oss.sonatype.org/')
+                    appendNode('autoReleaseAfterClose', 'false')
+                }
+            }
+
+            asNode().appendNode('distributionManagement').with {
+                appendNode('snapshotRepository')
+                        .with {
+                    appendNode('id', 'ossrh')
+                    appendNode('url', 'https://oss.sonatype.org/content/repositories/snapshots')
+                }
+                appendNode('repository')
+                        .with {
+                    appendNode('id', 'ossrh')
+                    appendNode('url', 'https://oss.sonatype.org/service/local/staging/deploy/maven2/')
+                }
+            }
+
+        }.writeTo(publishMavenDir + "/pom.xml")
+
+    }
+}
+
+compileJava.dependsOn clearPublishDir
+copyJars.dependsOn makeJar
+copyJars.dependsOn sourcesJar
+javadocJar.dependsOn makeJavadocs
+copyJars.dependsOn javadocJar
+copyVersion.dependsOn copyJars
+copyVersion.dependsOn createPomXml
+assemble.dependsOn copyVersion
+
+dependencies {
+    compile project(':moxy')
+
+    compileOnly deps.android
+    compileOnly project(':stub-androidx')
+
+    javadocDeps project(':moxy')
+    javadocDeps deps.android
+    javadocDeps project(':stub-androidx')
+}
\ No newline at end of file
diff --git a/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatActivity.java b/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatActivity.java
new file mode 100755
index 00000000..f28fa328
--- /dev/null
+++ b/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatActivity.java
@@ -0,0 +1,73 @@
+package com.arellomobile.mvp;
+
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+/**
+ * Date: 25-July-18
+ * Time: 2:51
+ *
+ * @author Vova Stelmashchuk
+ */
+@SuppressWarnings("unused")
+public class MvpAppCompatActivity extends AppCompatActivity {
+    private MvpDelegate<? extends MvpAppCompatActivity> mMvpDelegate;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        getMvpDelegate().onCreate(savedInstanceState);
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+
+        getMvpDelegate().onAttach();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        getMvpDelegate().onAttach();
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        getMvpDelegate().onSaveInstanceState(outState);
+        getMvpDelegate().onDetach();
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+        getMvpDelegate().onDetach();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+        getMvpDelegate().onDestroyView();
+
+        if (isFinishing()) {
+            getMvpDelegate().onDestroy();
+        }
+    }
+
+    /**
+     * @return The {@link MvpDelegate} being used by this Activity.
+     */
+    public MvpDelegate getMvpDelegate() {
+        if (mMvpDelegate == null) {
+            mMvpDelegate = new MvpDelegate<>(this);
+        }
+        return mMvpDelegate;
+    }
+}
diff --git a/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatFragment.java b/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatFragment.java
new file mode 100644
index 00000000..16799c15
--- /dev/null
+++ b/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatFragment.java
@@ -0,0 +1,107 @@
+package com.arellomobile.mvp;
+
+import android.os.Bundle;
+import androidx.fragment.app.Fragment;
+
+/**
+ * Date: 25-July-18
+ * Time: 4:43
+ *
+ * @author Vova Stelmashchuk
+ */
+
+@SuppressWarnings({"ConstantConditions", "unused"})
+public class MvpAppCompatFragment extends Fragment {
+
+    private boolean mIsStateSaved;
+
+    private MvpDelegate<? extends MvpAppCompatFragment> mMvpDelegate;
+
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        getMvpDelegate().onCreate(savedInstanceState);
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        mIsStateSaved = false;
+
+        getMvpDelegate().onAttach();
+    }
+
+    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;
+        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;
+    }
+}
\ No newline at end of file
diff --git a/moxy-androidx/stub-androidx/build.gradle b/moxy-androidx/stub-androidx/build.gradle
new file mode 100755
index 00000000..d6d06d13
--- /dev/null
+++ b/moxy-androidx/stub-androidx/build.gradle
@@ -0,0 +1,8 @@
+apply plugin: 'java'
+
+sourceCompatibility = JavaVersion.VERSION_1_7
+targetCompatibility = JavaVersion.VERSION_1_7
+
+dependencies {
+    compileOnly deps.android
+}
diff --git a/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatActivity.java b/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatActivity.java
new file mode 100755
index 00000000..abc8929a
--- /dev/null
+++ b/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatActivity.java
@@ -0,0 +1,41 @@
+package androidx.appcompat.app;
+
+import android.os.Bundle;
+
+/**
+ * Date: 25-July-18
+ * Time: 2:51
+ *
+ * @author Vova Stelmashchuk
+ */
+
+public class AppCompatActivity {
+
+    protected void onCreate(Bundle savedInstanceState) {
+        throw new RuntimeException("Stub!");
+    }
+
+    protected void onStart() {
+        throw new RuntimeException("Stub!");
+    }
+
+    protected void onResume() {
+        throw new RuntimeException("Stub!");
+    }
+
+    protected void onSaveInstanceState(Bundle outState) {
+        throw new RuntimeException("Stub!");
+    }
+
+    protected void onStop() {
+        throw new RuntimeException("Stub!");
+    }
+
+    protected void onDestroy() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public boolean isFinishing() {
+        throw new RuntimeException("Stub!");
+    }
+}
diff --git a/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/Fragment.java b/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/Fragment.java
new file mode 100644
index 00000000..3c396732
--- /dev/null
+++ b/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/Fragment.java
@@ -0,0 +1,52 @@
+package androidx.fragment.app;
+
+import android.os.Bundle;
+
+/**
+ * Date: 25-July-18
+ * Time: 4:38
+ *
+ * @author Vova Stelmashchuk
+ */
+
+public class Fragment {
+    public void onCreate(Bundle savedInstanceState) {
+        throw new RuntimeException("Stub!");
+    }
+
+    public void onStart() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public void onResume() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public void onSaveInstanceState(Bundle outState) {
+        throw new RuntimeException("Stub!");
+    }
+
+    public void onStop() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public void onDestroyView() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public void onDestroy() {
+        throw new RuntimeException("Stub!");
+    }
+
+    final public boolean isRemoving() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public final FragmentActivity getActivity() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public Fragment getParentFragment() {
+        throw new RuntimeException("Stub!");
+    }
+}
diff --git a/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/FragmentActivity.java b/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/FragmentActivity.java
new file mode 100644
index 00000000..ff2e0765
--- /dev/null
+++ b/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/FragmentActivity.java
@@ -0,0 +1,14 @@
+package androidx.fragment.app;
+
+/**
+ * Date: 25-July-18
+ * Time: 4:41
+ *
+ * @author Vova Stelmashchuk
+ */
+
+public class FragmentActivity {
+    public boolean isFinishing() {
+        throw new RuntimeException("Stub!");
+    }
+}
diff --git a/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/StateStrategy.java b/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/StateStrategy.java
index 84ffbcab..1b9d6215 100644
--- a/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/StateStrategy.java
+++ b/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/StateStrategy.java
@@ -1,15 +1,15 @@
 package com.arellomobile.mvp.viewstate.strategy;
 
-import java.util.List;
-
 import com.arellomobile.mvp.MvpView;
 import com.arellomobile.mvp.viewstate.ViewCommand;
 
+import java.util.List;
+
 /**
  * Cautions:
  * <ul>
  *     <li>Don't rearrange current state</li>
- *     <li>Don't insert commands inside existing current state – only put to end of it</li>
+ *     <li>Don't insert commands inside existing current state - only put to end of it</li>
  *     <li>Be careful if remove commands by another type. If you make it, be sure that inside your view method you fully override view changes</li>
  * </ul>
  *
diff --git a/sample-custom-strategy/build.gradle b/sample-custom-strategy/build.gradle
index 75967a84..8904064a 100644
--- a/sample-custom-strategy/build.gradle
+++ b/sample-custom-strategy/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.1.51'
+    ext.kotlin_version = '1.2.51'
     repositories {
         jcenter()
         mavenCentral()
@@ -41,12 +41,14 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
-
-    implementation 'com.arello-mobile:moxy:1.5.5'
-    implementation 'com.arello-mobile:moxy-app-compat:1.5.5'
-    kapt 'com.arello-mobile:moxy-compiler:1.5.5'
+    def supportVersion = '27.1.1'
+    implementation "com.android.support:appcompat-v7:$supportVersion"
+    implementation "com.android.support:design:$supportVersion"
+
+    def moxyVersion = '1.5.5'
+    implementation "com.arello-mobile:moxy:$moxyVersion"
+    implementation "com.arello-mobile:moxy-app-compat:$moxyVersion"
+    kapt "com.arello-mobile:moxy-compiler:$moxyVersion"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
diff --git a/sample-custom-strategy/src/androidTest/java/com/redmadrobot/sample_custom_strategy/ExampleInstrumentedTest.kt b/sample-custom-strategy/src/androidTest/java/com/redmadrobot/sample_custom_strategy/ExampleInstrumentedTest.kt
deleted file mode 100644
index 2ecaf2e8..00000000
--- a/sample-custom-strategy/src/androidTest/java/com/redmadrobot/sample_custom_strategy/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.redmadrobot.sample_custom_strategy
-
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getTargetContext()
-        assertEquals("com.redmadrobot.sample_custom_strategy", appContext.packageName)
-    }
-}
diff --git a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchFragment.kt b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchFragment.kt
index 838b31f3..229ff189 100644
--- a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchFragment.kt
+++ b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchFragment.kt
@@ -22,7 +22,7 @@ class LaunchFragment : MvpAppCompatFragment(), LaunchView {
 
     companion object {
 
-        val TAG = "LaunchFragment"
+        const val TAG = "LaunchFragment"
         private const val animationDuration: Long = 500
 
         private const val DEFAULT_COLOR = Color.TRANSPARENT
@@ -49,11 +49,11 @@ class LaunchFragment : MvpAppCompatFragment(), LaunchView {
         return LaunchPresenter()
     }
 
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater?.inflate(R.layout.fragment_launch, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        return inflater.inflate(R.layout.fragment_launch, container, false)!!
     }
 
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         initViews()
     }
diff --git a/sample-custom-strategy/src/test/java/com/redmadrobot/sample_custom_strategy/ExampleUnitTest.kt b/sample-custom-strategy/src/test/java/com/redmadrobot/sample_custom_strategy/ExampleUnitTest.kt
deleted file mode 100644
index 7b98982e..00000000
--- a/sample-custom-strategy/src/test/java/com/redmadrobot/sample_custom_strategy/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.redmadrobot.sample_custom_strategy
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
diff --git a/sample-kotlin/build.gradle b/sample-kotlin/build.gradle
index 6c110700..f8eb4b10 100644
--- a/sample-kotlin/build.gradle
+++ b/sample-kotlin/build.gradle
@@ -41,7 +41,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
 
     implementation 'com.arello-mobile:moxy:1.5.5'
     implementation 'com.arello-mobile:moxy-app-compat:1.5.5'
diff --git a/settings.gradle b/settings.gradle
index 7974401a..4a7c3ce0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,9 @@
-include ':moxy', ':stub-reflector', ':moxy-android', ':moxy-compiler', ':stub-android', ':moxy-app-compat', ':stub-appcompat'
+include ':moxy', ':stub-reflector', ':moxy-android', ':moxy-compiler', ':stub-android', ':moxy-app-compat', ':moxy-androidx', ':stub-appcompat', ':stub-androidx'
 include ':sample-github'
 include ':sample-kotlin'
 include ':sample-custom-strategy'
+include ':moxy-androidx-sapmle'
 project(':stub-reflector').projectDir = new File('moxy/stub-reflector')
 project(':stub-android').projectDir = new File('moxy-android/stub-android')
 project(':stub-appcompat').projectDir = new File('moxy-app-compat/stub-appcompat')
+project(':stub-androidx').projectDir = new File('moxy-androidx/stub-androidx')

From 39c83849567fb552227376c498e8293de36221e1 Mon Sep 17 00:00:00 2001
From: Yrij Shmakov <yvshmakov@yandex-team.ru>
Date: Tue, 28 Aug 2018 05:28:04 +0700
Subject: [PATCH 09/35] [feature] Allow to use generics in Presenter and View
 declarations (PR #181 )

---
 build.gradle                                               | 2 +-
 .../mvp/compiler/presenterbinder/TargetPresenterField.java | 5 ++++-
 .../mvp/compiler/viewstate/ViewInterfaceInfo.java          | 5 ++++-
 .../viewstateprovider/InjectViewStateProcessor.java        | 4 ----
 .../arellomobile/mvp/compiler/PresentersBinderTest.java    | 2 +-
 .../target/GenericPresenterTarget$$PresentersBinder.java   | 2 +-
 .../src/test/resources/target/GenericPresenterTarget.java  | 2 +-
 moxy/src/main/java/com/arellomobile/mvp/MvpPresenter.java  | 6 +++---
 moxy/src/main/java/com/arellomobile/mvp/MvpProcessor.java  | 2 +-
 .../com/arellomobile/mvp/presenter/PresenterField.java     | 7 +++----
 10 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4b6f1b8b..ccd2a628 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.1.4'
     }
 }
 
diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/TargetPresenterField.java b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/TargetPresenterField.java
index 02c6b3dc..71b419e4 100644
--- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/TargetPresenterField.java
+++ b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/TargetPresenterField.java
@@ -2,12 +2,14 @@
 
 import com.arellomobile.mvp.MvpProcessor;
 import com.arellomobile.mvp.presenter.PresenterType;
+import com.squareup.javapoet.ParameterizedTypeName;
 import com.squareup.javapoet.TypeName;
 
 import javax.lang.model.type.TypeMirror;
 
 class TargetPresenterField {
 	private final TypeMirror clazz;
+	private final boolean isParametrized;
 	private final TypeName typeName;
 	private final String name;
 	private final PresenterType presenterType;
@@ -23,7 +25,8 @@ class TargetPresenterField {
 	                     String tag,
 	                     String presenterId) {
 		this.clazz = clazz;
-		this.typeName = TypeName.get(clazz);
+		this.isParametrized = TypeName.get(clazz) instanceof ParameterizedTypeName;
+		this.typeName = isParametrized ? ((ParameterizedTypeName) TypeName.get(clazz)).rawType : TypeName.get(clazz);
 		this.name = name;
 		this.tag = tag;
 
diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewInterfaceInfo.java b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewInterfaceInfo.java
index e81cdf17..cd8ecd71 100644
--- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewInterfaceInfo.java
+++ b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewInterfaceInfo.java
@@ -39,7 +39,10 @@ TypeName getNameWithTypeVariables() {
 		if (typeVariables.isEmpty()) {
 			return name;
 		} else {
-			return ParameterizedTypeName.get(name, Iterables.toArray(typeVariables, TypeVariableName.class));
+			TypeVariableName[] names = new TypeVariableName[typeVariables.size()];
+			typeVariables.toArray(names);
+
+			return ParameterizedTypeName.get(name, names);
 		}
 	}
 
diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstateprovider/InjectViewStateProcessor.java b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstateprovider/InjectViewStateProcessor.java
index 553730f5..185650f5 100644
--- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstateprovider/InjectViewStateProcessor.java
+++ b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstateprovider/InjectViewStateProcessor.java
@@ -126,10 +126,6 @@ private String getViewClassFromGeneric(TypeElement typeElement) {
 
 		Map<String, String> parentTypes = Collections.emptyMap();
 
-		if (!typeElement.getTypeParameters().isEmpty()) {
-			MvpCompiler.getMessager().printMessage(Diagnostic.Kind.WARNING, "Your " + typeElement.getSimpleName() + " is typed. @InjectViewState may generate wrong code. Your can set view/view state class manually.");
-		}
-
 		while (superclass.getKind() != TypeKind.NONE) {
 			TypeElement superclassElement = (TypeElement) ((DeclaredType) superclass).asElement();
 
diff --git a/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/PresentersBinderTest.java b/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/PresentersBinderTest.java
index f547d5e4..57fb48b7 100644
--- a/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/PresentersBinderTest.java
+++ b/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/PresentersBinderTest.java
@@ -25,7 +25,7 @@ public static String[] data() {
 		return new String[]{
 				"target.SimpleInjectPresenterTarget",
 				"target.SimpleProvidePresenterTarget",
-				// "target.GenericPresenterTarget", // failing, see issue #166
+				"target.GenericPresenterTarget",
 		};
 	}
 
diff --git a/moxy-compiler/src/test/resources/target/GenericPresenterTarget$$PresentersBinder.java b/moxy-compiler/src/test/resources/target/GenericPresenterTarget$$PresentersBinder.java
index cb55f14a..cc754a97 100644
--- a/moxy-compiler/src/test/resources/target/GenericPresenterTarget$$PresentersBinder.java
+++ b/moxy-compiler/src/test/resources/target/GenericPresenterTarget$$PresentersBinder.java
@@ -12,7 +12,7 @@
 
 public class GenericPresenterTarget$$PresentersBinder extends PresenterBinder<GenericPresenterTarget> {
 	public List<PresenterField<GenericPresenterTarget>> getPresenterFields() {
-		List<PresenterField<GenericPresenterTarget>> presenters = new ArrayList<>();
+		List<PresenterField<GenericPresenterTarget>> presenters = new ArrayList<>(1);
 
 		presenters.add(new presenterBinder());
 
diff --git a/moxy-compiler/src/test/resources/target/GenericPresenterTarget.java b/moxy-compiler/src/test/resources/target/GenericPresenterTarget.java
index 2a98d323..1d20d27c 100644
--- a/moxy-compiler/src/test/resources/target/GenericPresenterTarget.java
+++ b/moxy-compiler/src/test/resources/target/GenericPresenterTarget.java
@@ -9,7 +9,7 @@
 public class GenericPresenterTarget implements GenericView<String> {
 
 	@InjectPresenter
-	GenericPresenter<String> mPresenter;
+	GenericPresenter<String> presenter;
 
 	@ProvidePresenter
 	GenericPresenter<String> providePresenter() {
diff --git a/moxy/src/main/java/com/arellomobile/mvp/MvpPresenter.java b/moxy/src/main/java/com/arellomobile/mvp/MvpPresenter.java
index 79b66e43..7b04d604 100644
--- a/moxy/src/main/java/com/arellomobile/mvp/MvpPresenter.java
+++ b/moxy/src/main/java/com/arellomobile/mvp/MvpPresenter.java
@@ -22,7 +22,7 @@ public abstract class MvpPresenter<View extends MvpView> {
 	private Set<View> mViews;
 	private View mViewStateAsView;
 	private MvpViewState<View> mViewState;
-	private Class<? extends MvpPresenter<?>> mPresenterClass;
+	private Class<? extends MvpPresenter> mPresenterClass;
 
 	public MvpPresenter() {
 		Binder.bind(this);
@@ -143,11 +143,11 @@ void setTag(String tag) {
 		mTag = tag;
 	}
 
-	void setPresenterClass(Class<? extends MvpPresenter<?>> presenterClass) {
+	void setPresenterClass(Class<? extends MvpPresenter> presenterClass) {
 		mPresenterClass = presenterClass;
 	}
 
-	Class<? extends MvpPresenter<?>> getPresenterClass() {
+	Class<? extends MvpPresenter> getPresenterClass() {
 		return mPresenterClass;
 	}
 
diff --git a/moxy/src/main/java/com/arellomobile/mvp/MvpProcessor.java b/moxy/src/main/java/com/arellomobile/mvp/MvpProcessor.java
index ea07d5dd..0034123b 100644
--- a/moxy/src/main/java/com/arellomobile/mvp/MvpProcessor.java
+++ b/moxy/src/main/java/com/arellomobile/mvp/MvpProcessor.java
@@ -31,7 +31,7 @@ public class MvpProcessor {
 	 * @param delegateTag    unique tag generated by {@link MvpDelegate#generateTag()}   @return MvpPresenter instance
 	 */
 	private <Delegated> MvpPresenter<? super Delegated> getMvpPresenter(Delegated target, PresenterField<Delegated> presenterField, String delegateTag) {
-		Class<? extends MvpPresenter<?>> presenterClass = presenterField.getPresenterClass();
+		Class<? extends MvpPresenter> presenterClass = presenterField.getPresenterClass();
 		PresenterStore presenterStore = MvpFacade.getInstance().getPresenterStore();
 
 		PresenterType type = presenterField.getPresenterType();
diff --git a/moxy/src/main/java/com/arellomobile/mvp/presenter/PresenterField.java b/moxy/src/main/java/com/arellomobile/mvp/presenter/PresenterField.java
index 89c0661a..cf434d10 100644
--- a/moxy/src/main/java/com/arellomobile/mvp/presenter/PresenterField.java
+++ b/moxy/src/main/java/com/arellomobile/mvp/presenter/PresenterField.java
@@ -13,9 +13,9 @@ public abstract class PresenterField<PresentersContainer> {
 	protected final String tag;
 	protected final PresenterType presenterType;
 	protected final String presenterId;
-	protected final Class<? extends MvpPresenter<?>> presenterClass;
+	protected final Class<? extends MvpPresenter> presenterClass;
 
-	protected PresenterField(String tag, PresenterType presenterType, String presenterId, Class<? extends MvpPresenter<?>> presenterClass) {
+	protected PresenterField(String tag, PresenterType presenterType, String presenterId, Class<? extends MvpPresenter> presenterClass) {
 		this.tag = tag;
 		this.presenterType = presenterType;
 		this.presenterId = presenterId;
@@ -25,7 +25,6 @@ protected PresenterField(String tag, PresenterType presenterType, String present
 	public abstract void bind(PresentersContainer container, MvpPresenter presenter);
 
 	// Delegated may be used from generated code if user plane to generate tag at runtime
-	@SuppressWarnings("UnusedParameters")
 	public String getTag(PresentersContainer delegated) {
 		return tag;
 	}
@@ -38,7 +37,7 @@ public String getPresenterId() {
 		return presenterId;
 	}
 
-	public Class<? extends MvpPresenter<?>> getPresenterClass() {
+	public Class<? extends MvpPresenter> getPresenterClass() {
 		return presenterClass;
 	}
 

From f90b88942fd2a2ae67d482f284c63260386fe193 Mon Sep 17 00:00:00 2001
From: vova <v.stelmashchuk@mobidev.biz>
Date: Wed, 29 Aug 2018 12:18:03 +0300
Subject: [PATCH 10/35] fix

---
 .../redmadrobot/app/presentation/launch/LaunchFragment.kt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchFragment.kt b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchFragment.kt
index 838b31f3..b9f2bad5 100644
--- a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchFragment.kt
+++ b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchFragment.kt
@@ -22,7 +22,7 @@ class LaunchFragment : MvpAppCompatFragment(), LaunchView {
 
     companion object {
 
-        val TAG = "LaunchFragment"
+        const val TAG = "LaunchFragment"
         private const val animationDuration: Long = 500
 
         private const val DEFAULT_COLOR = Color.TRANSPARENT
@@ -49,11 +49,9 @@ class LaunchFragment : MvpAppCompatFragment(), LaunchView {
         return LaunchPresenter()
     }
 
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater?.inflate(R.layout.fragment_launch, container, false)
-    }
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?) = inflater.inflate(R.layout.fragment_launch, container, false)
 
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         initViews()
     }

From cdb607a70c6d9eeb7cd2dbd4aa9b58405014da29 Mon Sep 17 00:00:00 2001
From: vova <v.stelmashchuk@mobidev.biz>
Date: Wed, 29 Aug 2018 13:40:49 +0300
Subject: [PATCH 11/35] update LaunchFragment.kt

---
 .../app/presentation/launch/LaunchFragment.kt | 289 +++++++++---------
 1 file changed, 143 insertions(+), 146 deletions(-)

diff --git a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchFragment.kt b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchFragment.kt
index b9f2bad5..d5136651 100644
--- a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchFragment.kt
+++ b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchFragment.kt
@@ -19,152 +19,149 @@ import kotlinx.android.synthetic.main.fragment_launch.*
 
 
 class LaunchFragment : MvpAppCompatFragment(), LaunchView {
-
-    companion object {
-
-        const val TAG = "LaunchFragment"
-        private const val animationDuration: Long = 500
-
-        private const val DEFAULT_COLOR = Color.TRANSPARENT
-        private const val CHANGES_COLOR = Color.GREEN
-        private const val CLEAR_COLOR = Color.RED
-
-        fun newInstance(): LaunchFragment {
-            val fragment = LaunchFragment()
-
-            val args = Bundle()
-            fragment.arguments = args
-
-            return fragment
-        }
-
-    }
-
-    @InjectPresenter
-    internal lateinit var presenter: LaunchPresenter
-
-
-    @ProvidePresenter
-    fun providePresenter(): LaunchPresenter {
-        return LaunchPresenter()
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?) = inflater.inflate(R.layout.fragment_launch, container, false)
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        initViews()
-    }
-
-    private fun initViews() {
-        fragment_launch_button_toggle_bread_type.setOnClickListener { presenter.onToggleBreadClicked() }
-        fragment_launch_button_toggle_cheese.setOnClickListener { presenter.onToggleCheeseClicked() }
-        fragment_launch_button_burger_clear.setOnClickListener { presenter.onClearBurgerClicked() }
-        fragment_launch_button_toggle_lemon.setOnClickListener { presenter.onToggleLemonClicked() }
-        fragment_launch_button_apply_sugar.setOnClickListener {
-            val count = try {
-                fragment_launch_edit_text_sugar.text.toString().toInt()
-            } catch (e: NumberFormatException) {
-                0
-            }
-            presenter.onApplySugarClicked(count)
-        }
-        fragment_launch_button_beverage_clear.setOnClickListener { presenter.onClearBeverageClicked() }
-
-        fragment_launch_button_make_order.setOnClickListener { presenter.onMakeOrderClicked() }
-    }
-
-
-    override fun setBreadType(breadType: BreadType) {
-        setBreadTypeInternal(breadType)
-        startBlinkAnimation(fragment_launch_text_view_burger_bread, DEFAULT_COLOR, CHANGES_COLOR)
-        Log.d(TAG, "setBreadType: $breadType")
-    }
-
-    override fun toggleCheese(enable: Boolean) {
-        toggleCheeseInternal(enable)
-        startBlinkAnimation(fragment_launch_text_view_burger_cheese, DEFAULT_COLOR, CHANGES_COLOR)
-        Log.d(TAG, "toggleCheese: $enable")
-    }
-
-    override fun setSugarCount(count: Int) {
-        setSugarCountInternal(count)
-        startBlinkAnimation(fragment_launch_text_view_beverage_sugar, DEFAULT_COLOR, CHANGES_COLOR)
-        Log.d(TAG, "setSugarCount: $count")
-    }
-
-    override fun toggleLemon(enable: Boolean) {
-        toggleLemonInternal(enable)
-        startBlinkAnimation(fragment_launch_text_view_beverage_lemon, DEFAULT_COLOR, CHANGES_COLOR)
-        Log.d(TAG, "toggleLemon: $enable")
-    }
-
-    override fun clearBurger(breadType: BreadType, cheeseSelected: Boolean) {
-        setBreadTypeInternal(breadType)
-        toggleCheeseInternal(cheeseSelected)
-        startBlinkAnimation(fragment_launch_container_result_burger, DEFAULT_COLOR, CLEAR_COLOR)
-        Log.d(TAG, "clearBurger: $breadType $cheeseSelected")
-    }
-
-    override fun clearBeverage(sugarCount: Int, lemonSelected: Boolean) {
-        toggleLemonInternal(lemonSelected)
-        setSugarCountInternal(sugarCount)
-        startBlinkAnimation(fragment_launch_container_result_beverage, DEFAULT_COLOR, CLEAR_COLOR)
-        Log.d(TAG, "clearBeverage: $sugarCount $lemonSelected")
-    }
-
-    private fun setBreadTypeInternal(breadType: BreadType) {
-        fragment_launch_text_view_burger_bread.text = getString(R.string.bread_regex, breadType.toString())
-    }
-
-    private fun toggleCheeseInternal(enable: Boolean) {
-        fragment_launch_text_view_burger_cheese.text = getString(R.string.cheese_regex, enable.toString())
-    }
-
-    private fun setSugarCountInternal(count: Int) {
-        fragment_launch_text_view_beverage_sugar.text = getString(R.string.sugar_regex, count)
-    }
-
-
-    private fun toggleLemonInternal(enable: Boolean) {
-        fragment_launch_text_view_beverage_lemon.text = getString(R.string.lemon_regex, enable.toString())
-    }
-
-
-    override fun showOrderMade() {
-        Snackbar.make(fragment_launch_container, R.string.order_made, Snackbar.LENGTH_SHORT).show()
-
-        Log.d(TAG, "showOrderMade")
-    }
-
-    private fun startBlinkAnimation(view: View, startColor: Int, endColor: Int) {
-
-        (view.tag as? ValueAnimator)?.cancel()
-
-        val animation = ValueAnimator.ofArgb(startColor, endColor)
-        animation.duration = animationDuration
-        animation.addUpdateListener {
-            view.setBackgroundColor(it.animatedValue as Int)
-        }
-
-        val reverseAnimation = ValueAnimator.ofArgb(endColor, startColor)
-        reverseAnimation.duration = animationDuration
-        reverseAnimation.addUpdateListener {
-            view.setBackgroundColor(it.animatedValue as Int)
-        }
-
-
-        animation.addListener(object : AnimatorListenerAdapter() {
-
-            override fun onAnimationEnd(animation: Animator?) {
-                super.onAnimationEnd(animation)
-                reverseAnimation.start()
-                view.tag = reverseAnimation
-            }
-        })
-        animation.start()
-        view.tag = animation
-    }
+	
+	companion object {
+		
+		const val TAG = "LaunchFragment"
+		private const val animationDuration: Long = 500
+		
+		private const val DEFAULT_COLOR = Color.TRANSPARENT
+		private const val CHANGES_COLOR = Color.GREEN
+		private const val CLEAR_COLOR = Color.RED
+		
+		fun newInstance(): LaunchFragment {
+			val fragment = LaunchFragment()
+			
+			val args = Bundle()
+			fragment.arguments = args
+			
+			return fragment
+		}
+		
+	}
+	
+	@InjectPresenter
+	internal lateinit var presenter: LaunchPresenter
+	
+	@ProvidePresenter
+	fun providePresenter() = LaunchPresenter()
+	
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?) = inflater.inflate(R.layout.fragment_launch, container, false)!!
+	
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		initViews()
+	}
+	
+	private fun initViews() {
+		fragment_launch_button_toggle_bread_type.setOnClickListener { presenter.onToggleBreadClicked() }
+		fragment_launch_button_toggle_cheese.setOnClickListener { presenter.onToggleCheeseClicked() }
+		fragment_launch_button_burger_clear.setOnClickListener { presenter.onClearBurgerClicked() }
+		fragment_launch_button_toggle_lemon.setOnClickListener { presenter.onToggleLemonClicked() }
+		fragment_launch_button_apply_sugar.setOnClickListener {
+			val count = try {
+				fragment_launch_edit_text_sugar.text.toString().toInt()
+			} catch (e: NumberFormatException) {
+				0
+			}
+			presenter.onApplySugarClicked(count)
+		}
+		fragment_launch_button_beverage_clear.setOnClickListener { presenter.onClearBeverageClicked() }
+		
+		fragment_launch_button_make_order.setOnClickListener { presenter.onMakeOrderClicked() }
+	}
+	
+	
+	override fun setBreadType(breadType: BreadType) {
+		setBreadTypeInternal(breadType)
+		startBlinkAnimation(fragment_launch_text_view_burger_bread, DEFAULT_COLOR, CHANGES_COLOR)
+		Log.d(TAG, "setBreadType: $breadType")
+	}
+	
+	override fun toggleCheese(enable: Boolean) {
+		toggleCheeseInternal(enable)
+		startBlinkAnimation(fragment_launch_text_view_burger_cheese, DEFAULT_COLOR, CHANGES_COLOR)
+		Log.d(TAG, "toggleCheese: $enable")
+	}
+	
+	override fun setSugarCount(count: Int) {
+		setSugarCountInternal(count)
+		startBlinkAnimation(fragment_launch_text_view_beverage_sugar, DEFAULT_COLOR, CHANGES_COLOR)
+		Log.d(TAG, "setSugarCount: $count")
+	}
+	
+	override fun toggleLemon(enable: Boolean) {
+		toggleLemonInternal(enable)
+		startBlinkAnimation(fragment_launch_text_view_beverage_lemon, DEFAULT_COLOR, CHANGES_COLOR)
+		Log.d(TAG, "toggleLemon: $enable")
+	}
+	
+	override fun clearBurger(breadType: BreadType, cheeseSelected: Boolean) {
+		setBreadTypeInternal(breadType)
+		toggleCheeseInternal(cheeseSelected)
+		startBlinkAnimation(fragment_launch_container_result_burger, DEFAULT_COLOR, CLEAR_COLOR)
+		Log.d(TAG, "clearBurger: $breadType $cheeseSelected")
+	}
+	
+	override fun clearBeverage(sugarCount: Int, lemonSelected: Boolean) {
+		toggleLemonInternal(lemonSelected)
+		setSugarCountInternal(sugarCount)
+		startBlinkAnimation(fragment_launch_container_result_beverage, DEFAULT_COLOR, CLEAR_COLOR)
+		Log.d(TAG, "clearBeverage: $sugarCount $lemonSelected")
+	}
+	
+	private fun setBreadTypeInternal(breadType: BreadType) {
+		fragment_launch_text_view_burger_bread.text = getString(R.string.bread_regex, breadType.toString())
+	}
+	
+	private fun toggleCheeseInternal(enable: Boolean) {
+		fragment_launch_text_view_burger_cheese.text = getString(R.string.cheese_regex, enable.toString())
+	}
+	
+	private fun setSugarCountInternal(count: Int) {
+		fragment_launch_text_view_beverage_sugar.text = getString(R.string.sugar_regex, count)
+	}
+	
+	
+	private fun toggleLemonInternal(enable: Boolean) {
+		fragment_launch_text_view_beverage_lemon.text = getString(R.string.lemon_regex, enable.toString())
+	}
+	
+	
+	override fun showOrderMade() {
+		Snackbar.make(fragment_launch_container, R.string.order_made, Snackbar.LENGTH_SHORT).show()
+		
+		Log.d(TAG, "showOrderMade")
+	}
+	
+	private fun startBlinkAnimation(view: View, startColor: Int, endColor: Int) {
+		
+		(view.tag as? ValueAnimator)?.cancel()
+		
+		val animation = ValueAnimator.ofArgb(startColor, endColor)
+		animation.duration = animationDuration
+		animation.addUpdateListener {
+			view.setBackgroundColor(it.animatedValue as Int)
+		}
+		
+		val reverseAnimation = ValueAnimator.ofArgb(endColor, startColor)
+		reverseAnimation.duration = animationDuration
+		reverseAnimation.addUpdateListener {
+			view.setBackgroundColor(it.animatedValue as Int)
+		}
+		
+		
+		animation.addListener(object : AnimatorListenerAdapter() {
+			
+			override fun onAnimationEnd(animation: Animator?) {
+				super.onAnimationEnd(animation)
+				reverseAnimation.start()
+				view.tag = reverseAnimation
+			}
+		})
+		animation.start()
+		view.tag = animation
+	}
 }
 
 

From 5e9660cc90e40cc84e70303f4fb23c9f2c6f8765 Mon Sep 17 00:00:00 2001
From: Yuri Shmakov <senneco@gmail.com>
Date: Mon, 15 Oct 2018 20:29:30 +0700
Subject: [PATCH 12/35] [feature] Allow to extends one view interface from
 another typed view interface

---
 .../mvp/compiler/ViewStateTest.java           |  1 +
 .../view/ExtendsOfGenericView$$State.java     | 40 +++++++++++++++++++
 .../resources/view/ExtendsOfGenericView.java  |  8 ++++
 3 files changed, 49 insertions(+)
 create mode 100644 moxy-compiler/src/test/resources/view/ExtendsOfGenericView$$State.java
 create mode 100644 moxy-compiler/src/test/resources/view/ExtendsOfGenericView.java

diff --git a/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/ViewStateTest.java b/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/ViewStateTest.java
index 65826367..253fce4e 100644
--- a/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/ViewStateTest.java
+++ b/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/ViewStateTest.java
@@ -31,6 +31,7 @@ public static String[] data() {
 				"view.GenericView",
 				"view.GenericWithExtendsView",
 				"view.GenericMethodsView",
+				"view.ExtendsOfGenericView",
 				"view.strategies_inheritance.ChildView",
 				"view.strategies_inheritance.ParentView",
 		};
diff --git a/moxy-compiler/src/test/resources/view/ExtendsOfGenericView$$State.java b/moxy-compiler/src/test/resources/view/ExtendsOfGenericView$$State.java
new file mode 100644
index 00000000..c52d7ee0
--- /dev/null
+++ b/moxy-compiler/src/test/resources/view/ExtendsOfGenericView$$State.java
@@ -0,0 +1,40 @@
+package view;
+
+import com.arellomobile.mvp.MvpView;
+
+import java.io.Serializable;
+
+public interface ExtendsOfGenericView extends GenericWithExtendsView<Serializable> {
+
+    @Override
+    public void testEvent(Serializable param) {
+        ExtendsOfGenericView$$State.TestEventCommand testEventCommand = new ExtendsOfGenericView$$State.TestEventCommand(param);
+        mViewCommands.beforeApply(testEventCommand);
+
+        if (mViews == null || mViews.isEmpty()) {
+            return;
+        }
+
+        for (ExtendsOfGenericView view : mViews) {
+            view.testEvent(param);
+        }
+
+        mViewCommands.afterApply(testEventCommand);
+    }
+
+
+    public class TestEventCommand extends ViewCommand<ExtendsOfGenericView> {
+        public final Serializable param;
+
+        TestEventCommand(Serializable param) {
+            super("testEvent", AddToEndStrategy.class);
+            this.param = param;
+        }
+
+        @Override
+        public void apply(ExtendsOfGenericView mvpView) {
+            mvpView.testEvent(param);
+        }
+    }
+
+}
diff --git a/moxy-compiler/src/test/resources/view/ExtendsOfGenericView.java b/moxy-compiler/src/test/resources/view/ExtendsOfGenericView.java
new file mode 100644
index 00000000..da6edab2
--- /dev/null
+++ b/moxy-compiler/src/test/resources/view/ExtendsOfGenericView.java
@@ -0,0 +1,8 @@
+package view;
+
+import com.arellomobile.mvp.MvpView;
+
+import java.io.Serializable;
+
+public interface ExtendsOfGenericView extends GenericWithExtendsView<Serializable> {
+}

From 35122f9e2b2f0c0d78579eba4310cb4823c2f198 Mon Sep 17 00:00:00 2001
From: Evgeny Kursakov <ekursakov@yandex.ru>
Date: Fri, 26 Oct 2018 09:49:50 +0300
Subject: [PATCH 13/35] Add multimodules test and fix bug #220

---
 .../reflector/MoxyReflectorGenerator.java     |  4 +--
 .../mvp/compiler/CompilerTest.java            |  7 ++++
 .../mvp/compiler/MultiModulesTest.java        | 29 ++++++++++++++++
 .../Lib1Presenter$$ViewStateProvider.java     | 12 +++++++
 .../multimodules/lib1/Lib1Presenter.java      |  8 +++++
 .../multimodules/lib1/Lib1View$$State.java    |  6 ++++
 .../resources/multimodules/lib1/Lib1View.java |  6 ++++
 .../multimodules/lib1/MoxyReflector.java      | 34 +++++++++++++++++++
 8 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/MultiModulesTest.java
 create mode 100644 moxy-compiler/src/test/resources/multimodules/lib1/Lib1Presenter$$ViewStateProvider.java
 create mode 100644 moxy-compiler/src/test/resources/multimodules/lib1/Lib1Presenter.java
 create mode 100644 moxy-compiler/src/test/resources/multimodules/lib1/Lib1View$$State.java
 create mode 100644 moxy-compiler/src/test/resources/multimodules/lib1/Lib1View.java
 create mode 100644 moxy-compiler/src/test/resources/multimodules/lib1/MoxyReflector.java

diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/reflector/MoxyReflectorGenerator.java b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/reflector/MoxyReflectorGenerator.java
index c00dc74e..2bf16a20 100644
--- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/reflector/MoxyReflectorGenerator.java
+++ b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/reflector/MoxyReflectorGenerator.java
@@ -90,13 +90,13 @@ public static JavaFile generate(String destinationPackage,
 			classBuilder.addMethod(MethodSpec.methodBuilder("getViewStateProviders")
 					.addModifiers(Modifier.PUBLIC, Modifier.STATIC)
 					.returns(MAP_CLASS_TO_OBJECT_TYPE_NAME)
-					.addStatement("return viewStateProvider.getViewState()")
+					.addStatement("return sViewStateProviders")
 					.build());
 
 			classBuilder.addMethod(MethodSpec.methodBuilder("getPresenterBinders")
 					.addModifiers(Modifier.PUBLIC, Modifier.STATIC)
 					.returns(MAP_CLASS_TO_LIST_OF_OBJECT_TYPE_NAME)
-					.addStatement("return sViewStateProviders")
+					.addStatement("return sPresenterBinders")
 					.build());
 
 			classBuilder.addMethod(MethodSpec.methodBuilder("getStrategies")
diff --git a/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/CompilerTest.java b/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/CompilerTest.java
index dc4f7d33..052fe9fc 100644
--- a/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/CompilerTest.java
+++ b/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/CompilerTest.java
@@ -39,6 +39,13 @@ protected Compilation compileSourcesWithProcessor(JavaFileObject... sources) {
 				.compile(sources);
 	}
 
+	protected Compilation compileLibSourcesWithProcessor(String moxyReflectorPackage, JavaFileObject... sources) {
+		return javac()
+				.withOptions("-implicit:none", "-AmoxyReflectorPackage=" + moxyReflectorPackage)
+				.withProcessors(new MvpCompiler())
+				.compile(sources);
+	}
+
 	/**
 	 * Asserts that all files from {@code exceptedGeneratedFiles} exists in {@code actualGeneratedFiles}
 	 * and have equivalent bytecode
diff --git a/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/MultiModulesTest.java b/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/MultiModulesTest.java
new file mode 100644
index 00000000..9084f709
--- /dev/null
+++ b/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/MultiModulesTest.java
@@ -0,0 +1,29 @@
+package com.arellomobile.mvp.compiler;
+
+import com.google.testing.compile.Compilation;
+
+import org.junit.Test;
+
+import javax.tools.JavaFileObject;
+
+import static com.google.testing.compile.CompilationSubject.assertThat;
+import static com.google.testing.compile.JavaFileObjects.forResource;
+
+public class MultiModulesTest extends CompilerTest {
+
+	@Test
+	public void testCompileLibraryModule() throws Exception {
+		JavaFileObject presenter = forResource("multimodules/lib1/Lib1Presenter.java");
+		JavaFileObject view = forResource("multimodules/lib1/Lib1View.java");
+
+		Compilation compilation = compileLibSourcesWithProcessor("multimodules.lib1", presenter, view);
+		Compilation exceptedCompilation = compileSources(
+				forResource("multimodules/lib1/Lib1Presenter$$ViewStateProvider.java"),
+				forResource("multimodules/lib1/Lib1View$$State.java"),
+				forResource("multimodules/lib1/MoxyReflector.java")
+		);
+
+		assertThat(compilation).succeededWithoutWarnings();
+		assertExceptedFilesGenerated(compilation.generatedFiles(), exceptedCompilation.generatedFiles());
+	}
+}
diff --git a/moxy-compiler/src/test/resources/multimodules/lib1/Lib1Presenter$$ViewStateProvider.java b/moxy-compiler/src/test/resources/multimodules/lib1/Lib1Presenter$$ViewStateProvider.java
new file mode 100644
index 00000000..c5f16557
--- /dev/null
+++ b/moxy-compiler/src/test/resources/multimodules/lib1/Lib1Presenter$$ViewStateProvider.java
@@ -0,0 +1,12 @@
+package multimodules.lib1;
+
+import com.arellomobile.mvp.MvpView;
+import com.arellomobile.mvp.ViewStateProvider;
+import com.arellomobile.mvp.viewstate.MvpViewState;
+
+public class Lib1Presenter$$ViewStateProvider extends ViewStateProvider {
+	@Override
+	public MvpViewState<? extends MvpView> getViewState() {
+		return new Lib1View$$State();
+	}
+}
diff --git a/moxy-compiler/src/test/resources/multimodules/lib1/Lib1Presenter.java b/moxy-compiler/src/test/resources/multimodules/lib1/Lib1Presenter.java
new file mode 100644
index 00000000..ff74d536
--- /dev/null
+++ b/moxy-compiler/src/test/resources/multimodules/lib1/Lib1Presenter.java
@@ -0,0 +1,8 @@
+package multimodules.lib1;
+
+import com.arellomobile.mvp.InjectViewState;
+import com.arellomobile.mvp.MvpPresenter;
+
+@InjectViewState
+public class Lib1Presenter extends MvpPresenter<Lib1View> {
+}
\ No newline at end of file
diff --git a/moxy-compiler/src/test/resources/multimodules/lib1/Lib1View$$State.java b/moxy-compiler/src/test/resources/multimodules/lib1/Lib1View$$State.java
new file mode 100644
index 00000000..d8f5495f
--- /dev/null
+++ b/moxy-compiler/src/test/resources/multimodules/lib1/Lib1View$$State.java
@@ -0,0 +1,6 @@
+package multimodules.lib1;
+
+import com.arellomobile.mvp.viewstate.MvpViewState;
+
+public class Lib1View$$State extends MvpViewState<Lib1View> implements Lib1View {
+}
\ No newline at end of file
diff --git a/moxy-compiler/src/test/resources/multimodules/lib1/Lib1View.java b/moxy-compiler/src/test/resources/multimodules/lib1/Lib1View.java
new file mode 100644
index 00000000..9460cb0a
--- /dev/null
+++ b/moxy-compiler/src/test/resources/multimodules/lib1/Lib1View.java
@@ -0,0 +1,6 @@
+package multimodules.lib1;
+
+import com.arellomobile.mvp.MvpView;
+
+public interface Lib1View extends MvpView {
+}
\ No newline at end of file
diff --git a/moxy-compiler/src/test/resources/multimodules/lib1/MoxyReflector.java b/moxy-compiler/src/test/resources/multimodules/lib1/MoxyReflector.java
new file mode 100644
index 00000000..be9b3a2b
--- /dev/null
+++ b/moxy-compiler/src/test/resources/multimodules/lib1/MoxyReflector.java
@@ -0,0 +1,34 @@
+package multimodules.lib1;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public final class MoxyReflector {
+	private static Map<Class<?>, Object> sViewStateProviders;
+
+	private static Map<Class<?>, List<Object>> sPresenterBinders;
+
+	private static Map<Class<?>, Object> sStrategies;
+
+	static {
+		sViewStateProviders = new HashMap<>();
+		sViewStateProviders.put(Lib1Presenter.class, new Lib1Presenter$$ViewStateProvider());
+
+		sPresenterBinders = new HashMap<>();
+
+		sStrategies = new HashMap<>();
+	}
+
+	public static Map<Class<?>, Object> getViewStateProviders() {
+		return sViewStateProviders;
+	}
+
+	public static Map<Class<?>, List<Object>> getPresenterBinders() {
+		return sPresenterBinders;
+	}
+
+	public static Map<Class<?>, Object> getStrategies() {
+		return sStrategies;
+	}
+}

From c86af978f89d20f7b85f516760f2e98a78845f17 Mon Sep 17 00:00:00 2001
From: Evgeny Kursakov <ekursakov@yandex.ru>
Date: Sat, 27 Oct 2018 21:03:09 +0300
Subject: [PATCH 14/35] Add compiler test for RegisterMoxyReflectorPackages
 annotation

---
 .../mvp/compiler/MultiModulesTest.java        | 43 +++++++++++++++--
 .../app/AppPresenter$$ViewStateProvider.java  | 12 +++++
 .../multimodules/app/AppPresenter.java        |  8 ++++
 .../multimodules/app/AppView$$State.java      |  6 +++
 .../resources/multimodules/app/AppView.java   |  6 +++
 .../multimodules/app/MoxyReflector.java       | 47 +++++++++++++++++++
 6 files changed, 117 insertions(+), 5 deletions(-)
 create mode 100644 moxy-compiler/src/test/resources/multimodules/app/AppPresenter$$ViewStateProvider.java
 create mode 100644 moxy-compiler/src/test/resources/multimodules/app/AppPresenter.java
 create mode 100644 moxy-compiler/src/test/resources/multimodules/app/AppView$$State.java
 create mode 100644 moxy-compiler/src/test/resources/multimodules/app/AppView.java
 create mode 100644 moxy-compiler/src/test/resources/multimodules/app/MoxyReflector.java

diff --git a/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/MultiModulesTest.java b/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/MultiModulesTest.java
index 9084f709..fe767ff8 100644
--- a/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/MultiModulesTest.java
+++ b/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/MultiModulesTest.java
@@ -8,21 +8,54 @@
 
 import static com.google.testing.compile.CompilationSubject.assertThat;
 import static com.google.testing.compile.JavaFileObjects.forResource;
+import static com.google.testing.compile.JavaFileObjects.forSourceLines;
 
 public class MultiModulesTest extends CompilerTest {
 
 	@Test
-	public void testCompileLibraryModule() throws Exception {
-		JavaFileObject presenter = forResource("multimodules/lib1/Lib1Presenter.java");
-		JavaFileObject view = forResource("multimodules/lib1/Lib1View.java");
+	public void testLibraryModule() throws Exception {
+		JavaFileObject[] sources = {
+				forResource("multimodules/lib1/Lib1Presenter.java"),
+				forResource("multimodules/lib1/Lib1View.java")
+		};
 
-		Compilation compilation = compileLibSourcesWithProcessor("multimodules.lib1", presenter, view);
-		Compilation exceptedCompilation = compileSources(
+		JavaFileObject[] generatedSources = {
 				forResource("multimodules/lib1/Lib1Presenter$$ViewStateProvider.java"),
 				forResource("multimodules/lib1/Lib1View$$State.java"),
 				forResource("multimodules/lib1/MoxyReflector.java")
+		};
+
+		Compilation compilation = compileLibSourcesWithProcessor("multimodules.lib1", sources);
+		Compilation exceptedCompilation = compileSources(generatedSources);
+
+		assertThat(compilation).succeededWithoutWarnings();
+		assertExceptedFilesGenerated(compilation.generatedFiles(), exceptedCompilation.generatedFiles());
+	}
+
+	@Test
+	public void testRegisterMoxyReflectorPackages() throws Exception {
+		JavaFileObject someClientClass = forSourceLines("multimodules.app.App",
+				"package multimodules.app;",
+				"import com.arellomobile.mvp.RegisterMoxyReflectorPackages;",
+				"@RegisterMoxyReflectorPackages(\"multimodules.lib1\")",
+				"public class App {}"
 		);
 
+		JavaFileObject[] sources = new JavaFileObject[]{
+				forResource("multimodules/app/AppPresenter.java"),
+				forResource("multimodules/app/AppView.java"),
+				someClientClass
+		};
+
+		JavaFileObject[] exceptedSources = new JavaFileObject[]{
+				forResource("multimodules/app/AppPresenter$$ViewStateProvider.java"),
+				forResource("multimodules/app/AppView$$State.java"),
+				forResource("multimodules/app/MoxyReflector.java")
+		};
+
+		Compilation compilation = compileSourcesWithProcessor(sources);
+		Compilation exceptedCompilation = compileSources(exceptedSources);
+
 		assertThat(compilation).succeededWithoutWarnings();
 		assertExceptedFilesGenerated(compilation.generatedFiles(), exceptedCompilation.generatedFiles());
 	}
diff --git a/moxy-compiler/src/test/resources/multimodules/app/AppPresenter$$ViewStateProvider.java b/moxy-compiler/src/test/resources/multimodules/app/AppPresenter$$ViewStateProvider.java
new file mode 100644
index 00000000..60033e91
--- /dev/null
+++ b/moxy-compiler/src/test/resources/multimodules/app/AppPresenter$$ViewStateProvider.java
@@ -0,0 +1,12 @@
+package multimodules.app;
+
+import com.arellomobile.mvp.MvpView;
+import com.arellomobile.mvp.ViewStateProvider;
+import com.arellomobile.mvp.viewstate.MvpViewState;
+
+public class AppPresenter$$ViewStateProvider extends ViewStateProvider {
+	@Override
+	public MvpViewState<? extends MvpView> getViewState() {
+		return new AppView$$State();
+	}
+}
diff --git a/moxy-compiler/src/test/resources/multimodules/app/AppPresenter.java b/moxy-compiler/src/test/resources/multimodules/app/AppPresenter.java
new file mode 100644
index 00000000..199ebe48
--- /dev/null
+++ b/moxy-compiler/src/test/resources/multimodules/app/AppPresenter.java
@@ -0,0 +1,8 @@
+package multimodules.app;
+
+import com.arellomobile.mvp.InjectViewState;
+import com.arellomobile.mvp.MvpPresenter;
+
+@InjectViewState
+public class AppPresenter extends MvpPresenter<AppView> {
+}
\ No newline at end of file
diff --git a/moxy-compiler/src/test/resources/multimodules/app/AppView$$State.java b/moxy-compiler/src/test/resources/multimodules/app/AppView$$State.java
new file mode 100644
index 00000000..e0777a94
--- /dev/null
+++ b/moxy-compiler/src/test/resources/multimodules/app/AppView$$State.java
@@ -0,0 +1,6 @@
+package multimodules.app;
+
+import com.arellomobile.mvp.viewstate.MvpViewState;
+
+public class AppView$$State extends MvpViewState<AppView> implements AppView {
+}
\ No newline at end of file
diff --git a/moxy-compiler/src/test/resources/multimodules/app/AppView.java b/moxy-compiler/src/test/resources/multimodules/app/AppView.java
new file mode 100644
index 00000000..5ad2c6a5
--- /dev/null
+++ b/moxy-compiler/src/test/resources/multimodules/app/AppView.java
@@ -0,0 +1,6 @@
+package multimodules.app;
+
+import com.arellomobile.mvp.MvpView;
+
+public interface AppView extends MvpView {
+}
\ No newline at end of file
diff --git a/moxy-compiler/src/test/resources/multimodules/app/MoxyReflector.java b/moxy-compiler/src/test/resources/multimodules/app/MoxyReflector.java
new file mode 100644
index 00000000..7750af41
--- /dev/null
+++ b/moxy-compiler/src/test/resources/multimodules/app/MoxyReflector.java
@@ -0,0 +1,47 @@
+package com.arellomobile.mvp;
+
+import java.lang.Class;
+import java.lang.Object;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import multimodules.app.AppPresenter;
+import multimodules.app.AppPresenter$$ViewStateProvider;
+
+public final class MoxyReflector {
+	private static Map<Class<?>, Object> sViewStateProviders;
+
+	private static Map<Class<?>, List<Object>> sPresenterBinders;
+
+	private static Map<Class<?>, Object> sStrategies;
+
+	static {
+		sViewStateProviders = new HashMap<>();
+		sViewStateProviders.put(AppPresenter.class, new AppPresenter$$ViewStateProvider());
+
+		sPresenterBinders = new HashMap<>();
+
+		sStrategies = new HashMap<>();
+
+		sViewStateProviders.putAll(multimodules.lib1.MoxyReflector.getViewStateProviders());
+		sPresenterBinders.putAll(multimodules.lib1.MoxyReflector.getPresenterBinders());
+		sStrategies.putAll(multimodules.lib1.MoxyReflector.getStrategies());
+	}
+
+	public static Object getViewState(Class<?> presenterClass) {
+		ViewStateProvider viewStateProvider = (ViewStateProvider) sViewStateProviders.get(presenterClass);
+		if (viewStateProvider == null) {
+			return null;
+		}
+
+		return viewStateProvider.getViewState();
+	}
+
+	public static List<Object> getPresenterBinders(Class<?> delegated) {
+		return sPresenterBinders.get(delegated);
+	}
+
+	public static Object getStrategy(Class<?> strategyClass) {
+		return sStrategies.get(strategyClass);
+	}
+}
\ No newline at end of file

From ff745318d3dc8fdfc80272f027ae1aaaf99ad228 Mon Sep 17 00:00:00 2001
From: Evgeny Kursakov <ekursakov@yandex.ru>
Date: Tue, 30 Oct 2018 20:07:59 +0300
Subject: [PATCH 15/35] Fix ExtendsOfGenericView test

---
 .../view/ExtendsOfGenericView$$State.java        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/moxy-compiler/src/test/resources/view/ExtendsOfGenericView$$State.java b/moxy-compiler/src/test/resources/view/ExtendsOfGenericView$$State.java
index c52d7ee0..1d3b5f8f 100644
--- a/moxy-compiler/src/test/resources/view/ExtendsOfGenericView$$State.java
+++ b/moxy-compiler/src/test/resources/view/ExtendsOfGenericView$$State.java
@@ -1,14 +1,15 @@
 package view;
 
-import com.arellomobile.mvp.MvpView;
-
+import com.arellomobile.mvp.viewstate.MvpViewState;
+import com.arellomobile.mvp.viewstate.ViewCommand;
+import com.arellomobile.mvp.viewstate.strategy.AddToEndStrategy;
 import java.io.Serializable;
+import java.lang.Override;
 
-public interface ExtendsOfGenericView extends GenericWithExtendsView<Serializable> {
-
+public class ExtendsOfGenericView$$State extends MvpViewState<ExtendsOfGenericView> implements ExtendsOfGenericView {
     @Override
     public void testEvent(Serializable param) {
-        ExtendsOfGenericView$$State.TestEventCommand testEventCommand = new ExtendsOfGenericView$$State.TestEventCommand(param);
+        TestEventCommand testEventCommand = new TestEventCommand(param);
         mViewCommands.beforeApply(testEventCommand);
 
         if (mViews == null || mViews.isEmpty()) {
@@ -22,12 +23,12 @@ public void testEvent(Serializable param) {
         mViewCommands.afterApply(testEventCommand);
     }
 
-
     public class TestEventCommand extends ViewCommand<ExtendsOfGenericView> {
         public final Serializable param;
 
         TestEventCommand(Serializable param) {
             super("testEvent", AddToEndStrategy.class);
+
             this.param = param;
         }
 
@@ -36,5 +37,4 @@ public void apply(ExtendsOfGenericView mvpView) {
             mvpView.testEvent(param);
         }
     }
-
-}
+}
\ No newline at end of file

From 587eb55589cbd62967b75f25abd09a0b54cf7aa7 Mon Sep 17 00:00:00 2001
From: Evgeny Kursakov <ekursakov@yandex.ru>
Date: Wed, 24 Oct 2018 22:14:38 +0300
Subject: [PATCH 16/35] Fix types of parameters in methods from generic
 superinterfaces (fix #203)

---
 .../compiler/viewstate/ViewInterfaceInfo.java | 13 ++++--
 .../viewstate/ViewInterfaceProcessor.java     | 12 ++++--
 .../mvp/compiler/viewstate/ViewMethod.java    | 41 ++++++++++++++-----
 .../viewstate/ViewStateClassGenerator.java    | 10 +++--
 4 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewInterfaceInfo.java b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewInterfaceInfo.java
index cd8ecd71..d5069fb1 100644
--- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewInterfaceInfo.java
+++ b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewInterfaceInfo.java
@@ -1,6 +1,5 @@
 package com.arellomobile.mvp.compiler.viewstate;
 
-import com.google.common.collect.Iterables;
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.ParameterizedTypeName;
 import com.squareup.javapoet.TypeName;
@@ -18,19 +17,25 @@
  * @author Evgeny Kursakov
  */
 class ViewInterfaceInfo {
+	private final TypeElement element;
 	private final ClassName name;
 	private final List<TypeVariableName> typeVariables;
 	private final List<ViewMethod> methods;
 
-	ViewInterfaceInfo(TypeElement name, List<ViewMethod> methods) {
-		this.name = ClassName.get(name);
+	ViewInterfaceInfo(TypeElement element, List<ViewMethod> methods) {
+		this.element = element;
+		this.name = ClassName.get(element);
 		this.methods = methods;
 
-		this.typeVariables = name.getTypeParameters().stream()
+		this.typeVariables = element.getTypeParameters().stream()
 				.map(TypeVariableName::get)
 				.collect(Collectors.toList());
 	}
 
+	public TypeElement getElement() {
+		return element;
+	}
+
 	ClassName getName() {
 		return name;
 	}
diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewInterfaceProcessor.java b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewInterfaceProcessor.java
index 8588ab38..18d8a960 100644
--- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewInterfaceProcessor.java
+++ b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewInterfaceProcessor.java
@@ -37,7 +37,8 @@ public class ViewInterfaceProcessor extends ElementProcessor<TypeElement, ViewIn
 	private static final String STATE_STRATEGY_TYPE_ANNOTATION = StateStrategyType.class.getName();
 	private static final TypeElement DEFAULT_STATE_STRATEGY = MvpCompiler.getElementUtils().getTypeElement(AddToEndStrategy.class.getCanonicalName());
 
-	private String viewClassName;
+	private TypeElement viewInterfaceElement;
+	private String viewInterfaceName;
 	private Set<TypeElement> usedStrategies = new HashSet<>();
 
 	public List<TypeElement> getUsedStrategies() {
@@ -46,7 +47,8 @@ public List<TypeElement> getUsedStrategies() {
 
 	@Override
 	public ViewInterfaceInfo process(TypeElement element) {
-		viewClassName = element.getSimpleName().toString();
+		this.viewInterfaceElement = element;
+		viewInterfaceName = element.getSimpleName().toString();
 
 		List<ViewMethod> methods = new ArrayList<>();
 
@@ -126,7 +128,9 @@ private void getMethods(TypeElement typeElement,
 			// add strategy to list
 			usedStrategies.add(strategyClass);
 
-			final ViewMethod method = new ViewMethod(methodElement, strategyClass, methodTag);
+			final ViewMethod method = new ViewMethod(
+					(DeclaredType) viewInterfaceElement.asType(), methodElement, strategyClass, methodTag
+			);
 
 			if (rootMethods.contains(method)) {
 				continue;
@@ -161,7 +165,7 @@ private void checkStrategyAndTagEquals(ViewMethod method, ViewMethod existingMet
 					" and " + method.getEnclosedClassName() +
 					" has method " + method.getName() + "(" + arguments + ")" +
 					" with different " + parts + "." +
-					" Override this method in " + viewClassName + " or make " + parts + " equals");
+					" Override this method in " + viewInterfaceName + " or make " + parts + " equals");
 		}
 	}
 
diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewMethod.java b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewMethod.java
index 83065fa3..c4446751 100644
--- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewMethod.java
+++ b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewMethod.java
@@ -1,14 +1,21 @@
 package com.arellomobile.mvp.compiler.viewstate;
 
+import com.arellomobile.mvp.compiler.MvpCompiler;
 import com.squareup.javapoet.ParameterSpec;
 import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeVariableName;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.ExecutableType;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.Types;
 
 /**
  * Date: 27-Jul-2017
@@ -17,7 +24,7 @@
  * @author Evgeny Kursakov
  */
 class ViewMethod {
-	private final ExecutableElement element;
+	private final ExecutableElement methodElement;
 	private final String name;
 	private final TypeElement strategy;
 	private final String tag;
@@ -28,18 +35,32 @@ class ViewMethod {
 
 	private String uniqueSuffix;
 
-	ViewMethod(ExecutableElement methodElement,
+	ViewMethod(DeclaredType targetInterfaceElement,
+	           ExecutableElement methodElement,
 	           TypeElement strategy,
 	           String tag) {
-		this.element = methodElement;
+		this.methodElement = methodElement;
 		this.name = methodElement.getSimpleName().toString();
 		this.strategy = strategy;
 		this.tag = tag;
 
-		this.parameterSpecs = methodElement.getParameters()
-				.stream()
-				.map(ParameterSpec::get)
-				.collect(Collectors.toList());
+		this.parameterSpecs = new ArrayList<>();
+
+		Types typeUtils = MvpCompiler.getTypeUtils();
+		ExecutableType executableType = (ExecutableType) typeUtils.asMemberOf(targetInterfaceElement, methodElement);
+		List<? extends VariableElement> parameters = methodElement.getParameters();
+		List<? extends TypeMirror> resolvedParameterTypes = executableType.getParameterTypes();
+
+		for (int i = 0; i < parameters.size(); i++) {
+			VariableElement element = parameters.get(i);
+			TypeName type = TypeName.get(resolvedParameterTypes.get(i));
+			String name = element.getSimpleName().toString();
+
+			parameterSpecs.add(ParameterSpec.builder(type, name)
+					.addModifiers(element.getModifiers())
+					.build()
+			);
+		}
 
 		this.exceptions = methodElement.getThrownTypes().stream()
 				.map(TypeName::get)
@@ -50,7 +71,7 @@ class ViewMethod {
 				.map(TypeVariableName::get)
 				.collect(Collectors.toList());
 
-		this.argumentsString = parameterSpecs.stream()
+		this.argumentsString = this.parameterSpecs.stream()
 				.map(parameterSpec -> parameterSpec.name)
 				.collect(Collectors.joining(", "));
 
@@ -58,7 +79,7 @@ class ViewMethod {
 	}
 
 	ExecutableElement getElement() {
-		return element;
+		return methodElement;
 	}
 
 	String getName() {
@@ -94,7 +115,7 @@ String getCommandClassName() {
 	}
 
 	String getEnclosedClassName() {
-		TypeElement typeElement = (TypeElement) element.getEnclosingElement();
+		TypeElement typeElement = (TypeElement) methodElement.getEnclosingElement();
 		return typeElement.getQualifiedName().toString();
 	}
 
diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewStateClassGenerator.java b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewStateClassGenerator.java
index 266f7b70..c6463429 100644
--- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewStateClassGenerator.java
+++ b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewStateClassGenerator.java
@@ -2,6 +2,7 @@
 
 import com.arellomobile.mvp.MvpProcessor;
 import com.arellomobile.mvp.compiler.JavaFilesGenerator;
+import com.arellomobile.mvp.compiler.MvpCompiler;
 import com.arellomobile.mvp.viewstate.MvpViewState;
 import com.arellomobile.mvp.viewstate.ViewCommand;
 import com.squareup.javapoet.ClassName;
@@ -17,6 +18,7 @@
 import java.util.Random;
 
 import javax.lang.model.element.Modifier;
+import javax.lang.model.type.DeclaredType;
 
 import static com.arellomobile.mvp.compiler.Util.decapitalizeString;
 
@@ -32,6 +34,7 @@ public final class ViewStateClassGenerator extends JavaFilesGenerator<ViewInterf
 	public List<JavaFile> generate(ViewInterfaceInfo viewInterfaceInfo) {
 		ClassName viewName = viewInterfaceInfo.getName();
 		TypeName nameWithTypeVariables = viewInterfaceInfo.getNameWithTypeVariables();
+		DeclaredType viewInterfaceType = (DeclaredType) viewInterfaceInfo.getElement().asType();
 
 		TypeSpec.Builder classBuilder = TypeSpec.classBuilder(viewName.simpleName() + MvpProcessor.VIEW_STATE_SUFFIX)
 				.addModifiers(Modifier.PUBLIC)
@@ -42,7 +45,7 @@ public List<JavaFile> generate(ViewInterfaceInfo viewInterfaceInfo) {
 		for (ViewMethod method : viewInterfaceInfo.getMethods()) {
 			TypeSpec commandClass = generateCommandClass(method, nameWithTypeVariables);
 			classBuilder.addType(commandClass);
-			classBuilder.addMethod(generateMethod(method, nameWithTypeVariables, commandClass));
+			classBuilder.addMethod(generateMethod(viewInterfaceType, method, nameWithTypeVariables, commandClass));
 		}
 
 		JavaFile javaFile = JavaFile.builder(viewName.packageName(), classBuilder.build())
@@ -75,7 +78,8 @@ private TypeSpec generateCommandClass(ViewMethod method, TypeName viewTypeName)
 		return classBuilder.build();
 	}
 
-	private MethodSpec generateMethod(ViewMethod method, TypeName viewTypeName, TypeSpec commandClass) {
+	private MethodSpec generateMethod(DeclaredType enclosingType, ViewMethod method,
+	                                  TypeName viewTypeName, TypeSpec commandClass) {
 		// TODO: String commandFieldName = "$cmd";
 		String commandFieldName = decapitalizeString(method.getCommandClassName());
 
@@ -85,7 +89,7 @@ private MethodSpec generateMethod(ViewMethod method, TypeName viewTypeName, Type
 			commandFieldName += random.nextInt(10);
 		}
 
-		return MethodSpec.overriding(method.getElement())
+		return MethodSpec.overriding(method.getElement(), enclosingType, MvpCompiler.getTypeUtils())
 				.addStatement("$1N $2L = new $1N($3L)", commandClass, commandFieldName, method.getArgumentsString())
 				.addStatement("mViewCommands.beforeApply($L)", commandFieldName)
 				.addCode("\n")

From 095695a04598108fca607d9cb10c7823753d803f Mon Sep 17 00:00:00 2001
From: Yuri Shmakov <senneco@gmail.com>
Date: Sat, 24 Nov 2018 23:51:48 +0700
Subject: [PATCH 17/35] [artifact] Some gradle config changes

---
 build.gradle                             | 10 +++++-----
 gradle/wrapper/gradle-wrapper.properties |  4 ++--
 moxy-androidx-sapmle/build.gradle        |  5 ++---
 moxy/build.gradle                        | 15 ++++++++-------
 sample-custom-strategy/build.gradle      |  7 +++----
 sample-github/build.gradle               |  7 +++----
 sample-kotlin/build.gradle               |  7 +++----
 7 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/build.gradle b/build.gradle
index ccd2a628..6e919f67 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.1'
     }
 }
 
@@ -25,15 +25,15 @@ ext {
 
     deps = [
             android       : 'com.google.android:android:1.6_r2',
-            javapoet      : 'com.squareup:javapoet:1.9.0',
+            javapoet      : 'com.squareup:javapoet:1.10.0',
             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.11',
+            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-rc3',
-            autocommon    : 'com.google.auto:auto-common:0.8',
+            autoservice   : 'com.google.auto.service:auto-service:1.0-rc4',
+            autocommon    : 'com.google.auto:auto-common:0.10',
             guava         : 'com.google.guava:guava:21.0',
     ]
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2c2792bf..87f8b4ca 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jun 05 00:53:30 NOVT 2018
+#Sat Nov 24 23:06:24 NOVT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/moxy-androidx-sapmle/build.gradle b/moxy-androidx-sapmle/build.gradle
index e7845836..658eb036 100644
--- a/moxy-androidx-sapmle/build.gradle
+++ b/moxy-androidx-sapmle/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.2.51'
+    ext.kotlin_version = '1.3.10'
     repositories {
         google()
         jcenter()
@@ -17,7 +17,6 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 28
-    buildToolsVersion '27.0.3'
 
     defaultConfig {
         applicationId "com.arellomobile.mvp.sample.androidx"
@@ -42,7 +41,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation project(':moxy')
     implementation project(':moxy-androidx')
     kapt project(':moxy-compiler')
diff --git a/moxy/build.gradle b/moxy/build.gradle
index 8ff05ca5..90896fb5 100644
--- a/moxy/build.gradle
+++ b/moxy/build.gradle
@@ -228,11 +228,12 @@ dependencies {
     javadocDeps deps.android
     javadocDeps project(':stub-reflector')
 
-    testCompile deps.junit
-    testCompile deps.mockito
-    testCompile deps.truth
-    testCompile deps.android
-    testCompile deps.robolectric
-    testCompile deps.compiletesting
-    testCompile project(':moxy-compiler')
+    testImplementation deps.junit
+    testImplementation deps.mockito
+    testImplementation deps.truth
+    testImplementation deps.android
+    testImplementation deps.robolectric
+    testImplementation deps.compiletesting
+    testImplementation project(':moxy-compiler')
+    testImplementation deps.javapoet
 }
\ No newline at end of file
diff --git a/sample-custom-strategy/build.gradle b/sample-custom-strategy/build.gradle
index 8904064a..c8feff06 100644
--- a/sample-custom-strategy/build.gradle
+++ b/sample-custom-strategy/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.2.51'
+    ext.kotlin_version = '1.3.10'
     repositories {
         jcenter()
         mavenCentral()
@@ -16,13 +16,12 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.redmadrobot.sample_custom_strategy"
         minSdkVersion 21
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
diff --git a/sample-github/build.gradle b/sample-github/build.gradle
index c1ad1b74..31722875 100644
--- a/sample-github/build.gradle
+++ b/sample-github/build.gradle
@@ -1,13 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.arellomobile.mvp.sample.github"
         minSdkVersion 14
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -29,7 +28,7 @@ android {
     }
 }
 
-def support = '27.1.1'
+def support = '28.0.0'
 def retrofit = '2.1.0'
 def dagger = '2.16'
 def butterKnife = "8.5.1"
diff --git a/sample-kotlin/build.gradle b/sample-kotlin/build.gradle
index f8eb4b10..d2dd73bc 100644
--- a/sample-kotlin/build.gradle
+++ b/sample-kotlin/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.2.41'
+    ext.kotlin_version = '1.3.10'
     repositories {
         jcenter()
         mavenCentral()
@@ -15,13 +15,12 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.arellomobile.mvp.sample.kotlin"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 

From e344a0c9eee5b1db2dca85bd067a582cb8add7f7 Mon Sep 17 00:00:00 2001
From: Yuri Shmakov <senneco@gmail.com>
Date: Sun, 25 Nov 2018 00:46:55 +0700
Subject: [PATCH 18/35] [artifact] Some gradle config changes

---
 sample-custom-strategy/build.gradle | 2 +-
 sample-kotlin/build.gradle          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sample-custom-strategy/build.gradle b/sample-custom-strategy/build.gradle
index c8feff06..71a5aa53 100644
--- a/sample-custom-strategy/build.gradle
+++ b/sample-custom-strategy/build.gradle
@@ -40,7 +40,7 @@ android {
 }
 
 dependencies {
-    def supportVersion = '27.1.1'
+    def supportVersion = '28.0.0'
     implementation "com.android.support:appcompat-v7:$supportVersion"
     implementation "com.android.support:design:$supportVersion"
 
diff --git a/sample-kotlin/build.gradle b/sample-kotlin/build.gradle
index d2dd73bc..f517206b 100644
--- a/sample-kotlin/build.gradle
+++ b/sample-kotlin/build.gradle
@@ -40,7 +40,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
 
     implementation 'com.arello-mobile:moxy:1.5.5'
     implementation 'com.arello-mobile:moxy-app-compat:1.5.5'

From 040da05c41b84d7a303ac6cfcae44d2df57297db Mon Sep 17 00:00:00 2001
From: Yuri Shmakov <senneco@gmail.com>
Date: Sun, 25 Nov 2018 00:50:16 +0700
Subject: [PATCH 19/35] [artifact] Prepare version 1.5.6

---
 README.md                           | 10 +++++-----
 build.gradle                        |  4 ++--
 sample-custom-strategy/build.gradle |  2 +-
 sample-github/build.gradle          |  6 +++---
 sample-kotlin/build.gradle          |  6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 88628785..ed240398 100644
--- a/README.md
+++ b/README.md
@@ -76,22 +76,22 @@ Base modules integration:
 ```groovy
 dependencies {
   ...
-  compile 'com.arello-mobile:moxy:1.5.5'
-  annotationProcessor 'com.arello-mobile:moxy-compiler:1.5.5'
+  compile 'com.arello-mobile:moxy:1.5.6'
+  annotationProcessor 'com.arello-mobile:moxy-compiler:1.5.6'
 }
 ```
 For additional base view classes `MvpActivity` and `MvpFragment` add this:
 ```groovy
 dependencies {
   ...
-  compile 'com.arello-mobile:moxy-android:1.5.5'
+  compile 'com.arello-mobile:moxy-android:1.5.6'
 }
 ```
 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.5'
+  compile 'com.arello-mobile:moxy-app-compat:1.5.6'
   compile 'com.android.support:appcompat-v7:$support_version'
 }
 ```
@@ -102,7 +102,7 @@ apply plugin: 'kotlin-kapt'
 
 dependencies {
   ...
-  kapt 'com.arello-mobile:moxy-compiler:1.5.5'
+  kapt 'com.arello-mobile:moxy-compiler:1.5.6'
 }
 ```
 
diff --git a/build.gradle b/build.gradle
index 6e919f67..c9151251 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,8 +20,8 @@ allprojects {
 }
 
 ext {
-    targetVersionCode = 45
-    targetVersionName = "1.5.5"
+    targetVersionCode = 46
+    targetVersionName = "1.5.6"
 
     deps = [
             android       : 'com.google.android:android:1.6_r2',
diff --git a/sample-custom-strategy/build.gradle b/sample-custom-strategy/build.gradle
index 71a5aa53..4ae7711c 100644
--- a/sample-custom-strategy/build.gradle
+++ b/sample-custom-strategy/build.gradle
@@ -44,7 +44,7 @@ dependencies {
     implementation "com.android.support:appcompat-v7:$supportVersion"
     implementation "com.android.support:design:$supportVersion"
 
-    def moxyVersion = '1.5.5'
+    def moxyVersion = '1.5.6'
     implementation "com.arello-mobile:moxy:$moxyVersion"
     implementation "com.arello-mobile:moxy-app-compat:$moxyVersion"
     kapt "com.arello-mobile:moxy-compiler:$moxyVersion"
diff --git a/sample-github/build.gradle b/sample-github/build.gradle
index 31722875..6f820c72 100644
--- a/sample-github/build.gradle
+++ b/sample-github/build.gradle
@@ -65,7 +65,7 @@ dependencies {
     testImplementation "org.hamcrest:hamcrest-all:1.3"
     testImplementation "org.robolectric:robolectric:3.1-rc1"
 
-    implementation 'com.arello-mobile:moxy:1.5.5'
-    implementation 'com.arello-mobile:moxy-app-compat:1.5.5'
-    annotationProcessor 'com.arello-mobile:moxy-compiler:1.5.5'
+    implementation 'com.arello-mobile:moxy:1.5.6'
+    implementation 'com.arello-mobile:moxy-app-compat:1.5.6'
+    annotationProcessor 'com.arello-mobile:moxy-compiler:1.5.6'
 }
\ No newline at end of file
diff --git a/sample-kotlin/build.gradle b/sample-kotlin/build.gradle
index f517206b..c42f0808 100644
--- a/sample-kotlin/build.gradle
+++ b/sample-kotlin/build.gradle
@@ -42,9 +42,9 @@ android {
 dependencies {
     implementation 'com.android.support:appcompat-v7:28.0.0'
 
-    implementation 'com.arello-mobile:moxy:1.5.5'
-    implementation 'com.arello-mobile:moxy-app-compat:1.5.5'
-    kapt 'com.arello-mobile:moxy-compiler:1.5.5'
+    implementation 'com.arello-mobile:moxy:1.5.6'
+    implementation 'com.arello-mobile:moxy-app-compat:1.5.6'
+    kapt 'com.arello-mobile:moxy-compiler:1.5.6'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }

From c789deaf8f777b4b65b85319f351e67c5568c764 Mon Sep 17 00:00:00 2001
From: Vova Stelmashchuk <vovochkastelmashchuk@gmail.com>
Date: Sun, 3 Feb 2019 22:23:09 +0200
Subject: [PATCH 20/35] add androidX support

---
 README.md                           | 31 +++++++++++++++++++----------
 moxy-android/build.gradle           | 22 +++++++++++---------
 moxy-androidx/build.gradle          | 22 +++++++++++---------
 moxy-app-compat/build.gradle        | 22 ++++++++++++--------
 moxy-compiler/build.gradle          | 22 ++++++++++++--------
 moxy/build.gradle                   | 22 ++++++++++++--------
 sample-custom-strategy/build.gradle |  2 +-
 sample-github/build.gradle          |  7 ++++---
 sample-kotlin/build.gradle          |  7 ++++---
 9 files changed, 97 insertions(+), 60 deletions(-)

diff --git a/README.md b/README.md
index ed240398..64a69dbf 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,11 @@
-# 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
+We added X to the Moxy for make this library coolest.
 
-Moxy is a library that helps to use MVP pattern when you do the Android Application. _Without problems of lifecycle and boilerplate code!_
+[![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)
+
+[![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)
@@ -55,7 +59,7 @@ public class HelloWorldActivity extends MvpAppCompatActivity implements HelloWor
 }
 ```
 
-[Here](https://github.com/Arello-Mobile/Moxy/tree/master/sample-github) you can see "Github" sample application.
+[Here](https://github.com/jordan1997/Moxy/tree/develop/sample-github) you can see "Github" sample application.
 
 ## Wiki
 For all information check [Moxy Wiki](https://github.com/Arello-Mobile/Moxy/wiki)
@@ -63,7 +67,7 @@ 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. 
 
-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 channel (en)](https://telegram.me/moxy_mvp_library)<br />
@@ -76,25 +80,30 @@ Base modules integration:
 ```groovy
 dependencies {
   ...
-  compile 'com.arello-mobile:moxy:1.5.6'
-  annotationProcessor 'com.arello-mobile:moxy-compiler:1.5.6'
+  implementation 'tech.schoolhelper:moxy-x:1.5.6'
+  annotationProcessor 'tech.schoolhelper:moxy-x-compiler:1.5.6'
 }
 ```
 For additional base view classes `MvpActivity` and `MvpFragment` add this:
 ```groovy
 dependencies {
   ...
-  compile 'com.arello-mobile:moxy-android:1.5.6'
+  implementation 'tech.schoolhelper:moxy-x-android:1.5.6'
 }
 ```
 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 'tech.schoolhelper:moxy-x-app-compat:1.5.6'
+  implementation 'com.android.support:appcompat-v7:$support_version'
 }
 ```
+If you are planning to use AndroidX, then you can use `MvpAppCompatActivity` and `MvpAppCompatFragment`. Then add this:
+```groovy
+	...
+	implementation 'tech.schoolhelper:moxy-x-androidx:1.5.6'
+```
 ### Kotlin
 If you are using kotlin, use `kapt` instead of `provided`/`apt` dependency type:
 ```groovy
@@ -102,7 +111,7 @@ apply plugin: 'kotlin-kapt'
 
 dependencies {
   ...
-  kapt 'com.arello-mobile:moxy-compiler:1.5.6'
+  kapt 'tech.schoolhelper:moxy-x-compiler:1.5.6'
 }
 ```
 
diff --git a/moxy-android/build.gradle b/moxy-android/build.gradle
index 226b07e9..4f2f6291 100644
--- a/moxy-android/build.gradle
+++ b/moxy-android/build.gradle
@@ -5,8 +5,8 @@ apply plugin: 'maven'
 ext {
     publishDir = 'artifacts'
     publishMavenDir = 'artifacts-maven'
-    targetGroupId = 'com.arello-mobile'
-    targetArtefactId = 'moxy-android'
+    targetGroupId = 'tech.schoolhelper'
+    targetArtefactId = 'moxy-x-android'
     targetArtefactIdDev = 'moxy-android-dev'
     versionFile = 'VERSION'
 }
@@ -73,8 +73,8 @@ def getBasePom(String libName) {
             version targetVersionName
             name 'Moxy-android'
             modelVersion = '4.0.0'
-            description = 'Arello-Mobile MVP library for Android'
-            url = 'https://www.arello-mobile.com/'
+            description = 'MoxyX, we added X for make this librayr coolest'
+            url = 'https://schoolhelper.tech/'
             packaging = 'jar'
 
             inceptionYear '2016'
@@ -99,12 +99,18 @@ def getBasePom(String libName) {
                     organization = 'Arello Mobile'
                     organizationUrl 'http://www.arello-mobile.com/'
                 }
+                developer {
+                    name 'Vova Stelmashchuk'
+                    email 'vovochkastelmashchuk@gmail.com'
+                    organization = 'SchoolHelper'
+                    organizationUrl 'https://schoolhelper.tech/'
+                }
             }
 
             scm {
-                connection 'scm:git@github.com:Arello-Mobile/Moxy.git'
-                developerConnection 'scm:git@github.com:Arello-Mobile/Moxy.git'
-                url 'https://github.com/Arello-Mobile/Moxy'
+                connection 'scm:git@github.com:jordan1997/Moxy.git'
+                developerConnection 'scm:git@github.com:jordan1997/Moxy.git'
+                url 'https://github.com/jordan1997/Moxy'
             }
         }.withXml {
             asNode().appendNode('packaging', 'jar')
@@ -142,8 +148,6 @@ task copyJars {
 }
 
 
-
-
 task createPomXml {
     doLast {
         // creating local pom
diff --git a/moxy-androidx/build.gradle b/moxy-androidx/build.gradle
index 16dc3884..c1719e60 100755
--- a/moxy-androidx/build.gradle
+++ b/moxy-androidx/build.gradle
@@ -5,8 +5,8 @@ apply plugin: 'maven'
 ext {
     publishDir = 'artifacts'
     publishMavenDir = 'artifacts-maven'
-    targetGroupId = 'com.arello-mobile'
-    targetArtefactId = 'moxy-androidx'
+    targetGroupId = 'tech.schoolhelper'
+    targetArtefactId = 'moxy-x-androidx'
     targetArtefactIdDev = 'moxy-androidx-dev'
     versionFile = 'VERSION'
 }
@@ -73,8 +73,8 @@ def getBasePom(String libName) {
             version targetVersionName
             name 'Moxy-androidx'
             modelVersion = '4.0.0'
-            description = 'Arello-Mobile MVP library for Android'
-            url = 'https://www.arello-mobile.com/'
+            description = 'MoxyX, we added X for make this librayr coolest'
+            url = 'https://schoolhelper.tech/'
             packaging = 'jar'
 
             inceptionYear '2016'
@@ -99,12 +99,18 @@ def getBasePom(String libName) {
                     organization = 'Arello Mobile'
                     organizationUrl 'http://www.arello-mobile.com/'
                 }
+                developer {
+                    name 'Vova Stelmashchuk'
+                    email 'vovochkastelmashchuk@gmail.com'
+                    organization = 'SchoolHelper'
+                    organizationUrl 'https://schoolhelper.tech/'
+                }
             }
 
             scm {
-                connection 'scm:git@github.com:Arello-Mobile/Moxy.git'
-                developerConnection 'scm:git@github.com:Arello-Mobile/Moxy.git'
-                url 'https://github.com/Arello-Mobile/Moxy'
+                connection 'scm:git@github.com:jordan1997/Moxy.git'
+                developerConnection 'scm:git@github.com:jordan1997/Moxy.git'
+                url 'https://github.com/jordan1997/Moxy'
             }
         }.withXml {
             asNode().appendNode('packaging', 'jar')
@@ -140,8 +146,6 @@ task copyJars {
 }
 
 
-
-
 task createPomXml {
     doLast {
         // creating local pom
diff --git a/moxy-app-compat/build.gradle b/moxy-app-compat/build.gradle
index 4fba7312..2f714a4f 100644
--- a/moxy-app-compat/build.gradle
+++ b/moxy-app-compat/build.gradle
@@ -5,9 +5,9 @@ apply plugin: 'maven'
 ext {
     publishDir = 'artifacts'
     publishMavenDir = 'artifacts-maven'
-    targetGroupId = 'com.arello-mobile'
-    targetArtefactId = 'moxy-app-compat'
-    targetArtefactIdDev = 'moxy-app-compat-dev'
+    targetGroupId = 'tech.schoolhelper'
+    targetArtefactId = 'moxy-x-app-compat'
+    targetArtefactIdDev = 'moxy-x-app-compat-dev'
     versionFile = 'VERSION'
 }
 configurations {
@@ -73,8 +73,8 @@ def getBasePom(String libName) {
             version targetVersionName
             name 'Moxy-app-compat'
             modelVersion = '4.0.0'
-            description = 'Arello-Mobile MVP library for Android'
-            url = 'https://www.arello-mobile.com/'
+            description = 'MoxyX, we added X for make this librayr coolest'
+            url = 'https://schoolhelper.tech/'
             packaging = 'jar'
 
             inceptionYear '2016'
@@ -99,12 +99,18 @@ def getBasePom(String libName) {
                     organization = 'Arello Mobile'
                     organizationUrl 'http://www.arello-mobile.com/'
                 }
+                developer {
+                    name 'Vova Stelmashchuk'
+                    email 'vovochkastelmashchuk@gmail.com'
+                    organization = 'SchoolHelper'
+                    organizationUrl 'https://schoolhelper.tech/'
+                }
             }
 
             scm {
-                connection 'scm:git@github.com:Arello-Mobile/Moxy.git'
-                developerConnection 'scm:git@github.com:Arello-Mobile/Moxy.git'
-                url 'https://github.com/Arello-Mobile/Moxy'
+                connection 'scm:git@github.com:jordan1997/Moxy.git'
+                developerConnection 'scm:git@github.com:jordan1997/Moxy.git'
+                url 'https://github.com/jordan1997/Moxy'
             }
         }.withXml {
             asNode().appendNode('packaging', 'jar')
diff --git a/moxy-compiler/build.gradle b/moxy-compiler/build.gradle
index 7a34e47f..4b58cf42 100644
--- a/moxy-compiler/build.gradle
+++ b/moxy-compiler/build.gradle
@@ -5,9 +5,9 @@ apply plugin: 'maven'
 ext {
     publishDir = 'artifacts'
     publishMavenDir = 'artifacts-maven'
-    targetGroupId = 'com.arello-mobile'
-    targetArtefactId = 'moxy-compiler'
-    targetArtefactIdDev = 'moxy-compiler-dev'
+    targetGroupId = 'tech.schoolhelper'
+    targetArtefactId = 'moxy-x-compiler'
+    targetArtefactIdDev = 'moxy-x-compiler-dev'
     versionFile = 'VERSION'
 }
 configurations {
@@ -63,8 +63,8 @@ def getBasePom(String libName) {
             version targetVersionName
             name 'Moxy-compiler'
             modelVersion = '4.0.0'
-            description = 'Arello-Mobile MVP library for Android'
-            url = 'https://www.arello-mobile.com/'
+            description = 'MoxyX, we added X for make this librayr coolest'
+            url = 'https://schoolhelper.tech/'
             packaging = 'jar'
 
             inceptionYear '2016'
@@ -89,12 +89,18 @@ def getBasePom(String libName) {
                     organization = 'Arello Mobile'
                     organizationUrl 'http://www.arello-mobile.com/'
                 }
+                developer {
+                    name 'Vova Stelmashchuk'
+                    email 'vovochkastelmashchuk@gmail.com'
+                    organization = 'SchoolHelper'
+                    organizationUrl 'https://schoolhelper.tech/'
+                }
             }
 
             scm {
-                connection 'scm:git@github.com:Arello-Mobile/Moxy.git'
-                developerConnection 'scm:git@github.com:Arello-Mobile/Moxy.git'
-                url 'https://github.com/Arello-Mobile/Moxy'
+                connection 'scm:git@github.com:jordan1997/Moxy.git'
+                developerConnection 'scm:git@github.com:jordan1997/Moxy.git'
+                url 'https://github.com/jordan1997/Moxy'
             }
         }.withXml {
             asNode().appendNode('packaging', 'jar')
diff --git a/moxy/build.gradle b/moxy/build.gradle
index 90896fb5..b426b523 100644
--- a/moxy/build.gradle
+++ b/moxy/build.gradle
@@ -5,8 +5,8 @@ apply plugin: 'maven'
 ext {
     publishDir = 'artifacts'
     publishMavenDir = 'artifacts-maven'
-    targetGroupId = 'com.arello-mobile'
-    targetArtefactId = 'moxy'
+    targetGroupId = 'tech.schoolhelper'
+    targetArtefactId = 'moxy-x'
     targetArtefactIdDev = 'moxy-dev'
     versionFile = 'VERSION'
 }
@@ -76,8 +76,8 @@ def getBasePom() {
             version targetVersionName
             name 'Moxy'
             modelVersion = '4.0.0'
-            description = 'Arello-Mobile MVP library for Android'
-            url = 'https://www.arello-mobile.com/'
+            description = 'MoxyX, we added X for make this library coolest'
+            url = 'https://schoolhelper.tech/'
             //   packaging = 'jar'  //doesn't work from box, implement it manualy
 
             inceptionYear '2016'
@@ -102,12 +102,18 @@ def getBasePom() {
                     organization = 'Arello Mobile'
                     organizationUrl 'http://www.arello-mobile.com/'
                 }
+                developer {
+                    name 'Vova Stelmashchuk'
+                    email 'vovochkastelmashchuk@gmail.com'
+                    organization = 'SchoolHelper'
+                    organizationUrl 'https://schoolhelper.tech/'
+                }
             }
 
             scm {
-                connection 'scm:git@github.com:Arello-Mobile/Moxy.git'
-                developerConnection 'scm:git@github.com:Arello-Mobile/Moxy.git'
-                url 'https://github.com/Arello-Mobile/Moxy'
+                connection 'scm:git@github.com:jordan1997/Moxy.git'
+                developerConnection 'scm:git@github.com:jordan1997/Moxy.git'
+                url 'https://github.com/jordan1997/Moxy'
             }
         }.withXml {
             asNode().appendNode('packaging', 'jar')
@@ -116,7 +122,7 @@ def getBasePom() {
 
     return basePom.withXml {
         asNode().dependencies.'*'.findAll {
-            it.artifactId.text().contains('moxy')
+            it.artifactId.text().contains('moxy-x')
         }.each {
             it.groupId*.value = targetGroupId
             it.version*.value = targetVersionName
diff --git a/sample-custom-strategy/build.gradle b/sample-custom-strategy/build.gradle
index 4ae7711c..71a5aa53 100644
--- a/sample-custom-strategy/build.gradle
+++ b/sample-custom-strategy/build.gradle
@@ -44,7 +44,7 @@ dependencies {
     implementation "com.android.support:appcompat-v7:$supportVersion"
     implementation "com.android.support:design:$supportVersion"
 
-    def moxyVersion = '1.5.6'
+    def moxyVersion = '1.5.5'
     implementation "com.arello-mobile:moxy:$moxyVersion"
     implementation "com.arello-mobile:moxy-app-compat:$moxyVersion"
     kapt "com.arello-mobile:moxy-compiler:$moxyVersion"
diff --git a/sample-github/build.gradle b/sample-github/build.gradle
index 6f820c72..411c6b5a 100644
--- a/sample-github/build.gradle
+++ b/sample-github/build.gradle
@@ -65,7 +65,8 @@ dependencies {
     testImplementation "org.hamcrest:hamcrest-all:1.3"
     testImplementation "org.robolectric:robolectric:3.1-rc1"
 
-    implementation 'com.arello-mobile:moxy:1.5.6'
-    implementation 'com.arello-mobile:moxy-app-compat:1.5.6'
-    annotationProcessor 'com.arello-mobile:moxy-compiler:1.5.6'
+    def moxyVersion = '1.5.5'
+    implementation "com.arello-mobile:moxy:$moxyVersion"
+    implementation "com.arello-mobile:moxy-app-compat:$moxyVersion"
+    annotationProcessor "com.arello-mobile:moxy-compiler:$moxyVersion"
 }
\ No newline at end of file
diff --git a/sample-kotlin/build.gradle b/sample-kotlin/build.gradle
index c42f0808..e7b90d0d 100644
--- a/sample-kotlin/build.gradle
+++ b/sample-kotlin/build.gradle
@@ -42,9 +42,10 @@ android {
 dependencies {
     implementation 'com.android.support:appcompat-v7:28.0.0'
 
-    implementation 'com.arello-mobile:moxy:1.5.6'
-    implementation 'com.arello-mobile:moxy-app-compat:1.5.6'
-    kapt 'com.arello-mobile:moxy-compiler:1.5.6'
+    def moxyVersion = '1.5.5'
+    implementation "com.arello-mobile:moxy:$moxyVersion"
+    implementation "com.arello-mobile:moxy-app-compat:$moxyVersion"
+    kapt "com.arello-mobile:moxy-compiler:$moxyVersion"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }

From 670aa47ce01eb5fb028a4af76b004aba06c96a49 Mon Sep 17 00:00:00 2001
From: Volodymyr <vovochkastelmashchuk@gmail.com>
Date: Sun, 3 Feb 2019 22:37:35 +0200
Subject: [PATCH 21/35] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 64a69dbf..9771b349 100644
--- a/README.md
+++ b/README.md
@@ -101,8 +101,8 @@ dependencies {
 ```
 If you are planning to use AndroidX, then you can use `MvpAppCompatActivity` and `MvpAppCompatFragment`. Then add this:
 ```groovy
-	...
-	implementation 'tech.schoolhelper:moxy-x-androidx:1.5.6'
+   ...
+   implementation 'tech.schoolhelper:moxy-x-androidx:1.5.6'
 ```
 ### Kotlin
 If you are using kotlin, use `kapt` instead of `provided`/`apt` dependency type:

From 22f2095e0cbf4c755cf9c5d8ffd5b22350a85882 Mon Sep 17 00:00:00 2001
From: Vova Stelmashchuk <jordan29.04.1997@gmail.com>
Date: Tue, 19 Feb 2019 00:27:55 +0200
Subject: [PATCH 22/35] update gradle paths

---
 .gitignore                                    |   5 +-
 moxy-android/build.gradle                     |   4 +-
 .../.gitignore                                |   0
 .../build.gradle                              |  16 ++-
 .../gradle.properties                         |   0
 .../proguard-rules.pro                        |   0
 .../src/main/AndroidManifest.xml              |  21 ++++
 .../com/androidxsample}/MainActivity.kt       |   2 +-
 .../com/androidxsample}/MainPresenter.kt      |   2 +-
 .../drawable-v24/ic_launcher_foreground.xml   |   0
 .../res/drawable/ic_launcher_background.xml   |   0
 .../src/main/res/layout/activity_main.xml     |   0
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   0
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   0
 .../src/main/res/mipmap-hdpi/ic_launcher.png  | Bin
 .../res/mipmap-hdpi/ic_launcher_round.png     | Bin
 .../src/main/res/mipmap-mdpi/ic_launcher.png  | Bin
 .../res/mipmap-mdpi/ic_launcher_round.png     | Bin
 .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin
 .../res/mipmap-xhdpi/ic_launcher_round.png    | Bin
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin
 .../res/mipmap-xxhdpi/ic_launcher_round.png   | Bin
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin
 .../res/mipmap-xxxhdpi/ic_launcher_round.png  | Bin
 .../src/main/res/values/colors.xml            |   0
 .../src/main/res/values/strings.xml           |   0
 .../src/main/res/values/styles.xml            |   0
 .../src/main/AndroidManifest.xml              |  21 ----
 moxy-androidx/build.gradle                    |   4 +-
 .../mvp/MvpAppCompatDialogFragment.java       | 102 ++++++++++++++++++
 .../app/AppCompatDialogFragment.java          |   4 +
 moxy-app-compat/build.gradle                  |   4 +-
 moxy-compiler/build.gradle                    |   4 +-
 moxy/build.gradle                             |   4 +-
 sample-github/build.gradle                    |   6 +-
 sample-kotlin/build.gradle                    |   6 +-
 sample-kotlin/src/main/AndroidManifest.xml    |   1 -
 settings.gradle                               |  16 ++-
 38 files changed, 169 insertions(+), 53 deletions(-)
 rename {moxy-androidx-sapmle => moxy-androidx-sample}/.gitignore (100%)
 rename {moxy-androidx-sapmle => moxy-androidx-sample}/build.gradle (76%)
 rename {moxy-androidx-sapmle => moxy-androidx-sample}/gradle.properties (100%)
 rename {moxy-androidx-sapmle => moxy-androidx-sample}/proguard-rules.pro (100%)
 create mode 100644 moxy-androidx-sample/src/main/AndroidManifest.xml
 rename {moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle => moxy-androidx-sample/src/main/kotlin/example/com/androidxsample}/MainActivity.kt (94%)
 rename {moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle => moxy-androidx-sample/src/main/kotlin/example/com/androidxsample}/MainPresenter.kt (89%)
 rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/drawable-v24/ic_launcher_foreground.xml (100%)
 rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/drawable/ic_launcher_background.xml (100%)
 rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/layout/activity_main.xml (100%)
 rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%)
 rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%)
 rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-hdpi/ic_launcher.png (100%)
 rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-hdpi/ic_launcher_round.png (100%)
 rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-mdpi/ic_launcher.png (100%)
 rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-mdpi/ic_launcher_round.png (100%)
 rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-xhdpi/ic_launcher.png (100%)
 rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-xhdpi/ic_launcher_round.png (100%)
 rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%)
 rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (100%)
 rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%)
 rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (100%)
 rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/values/colors.xml (100%)
 rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/values/strings.xml (100%)
 rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/values/styles.xml (100%)
 delete mode 100644 moxy-androidx-sapmle/src/main/AndroidManifest.xml
 create mode 100644 moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatDialogFragment.java
 create mode 100644 moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java

diff --git a/.gitignore b/.gitignore
index 630efea1..b30419a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,4 +38,7 @@ captures/
 # Moxy artifacts
 VERSION
 artifacts/
-artifacts-maven/
\ No newline at end of file
+artifacts-maven/
+
+# Mac OS
+*.icloud
\ No newline at end of file
diff --git a/moxy-android/build.gradle b/moxy-android/build.gradle
index 4f2f6291..6585930b 100644
--- a/moxy-android/build.gradle
+++ b/moxy-android/build.gradle
@@ -239,12 +239,12 @@ copyVersion.dependsOn createPomXml
 assemble.dependsOn copyVersion
 
 dependencies {
-    compile project(':moxy')
+    compileOnly project(':moxy-x')
 
     compileOnly deps.android
     compileOnly project(':stub-android')
 
-    javadocDeps project(':moxy')
+    javadocDeps project(':moxy-x')
     javadocDeps deps.android
     javadocDeps project(':stub-android')
 }
\ No newline at end of file
diff --git a/moxy-androidx-sapmle/.gitignore b/moxy-androidx-sample/.gitignore
similarity index 100%
rename from moxy-androidx-sapmle/.gitignore
rename to moxy-androidx-sample/.gitignore
diff --git a/moxy-androidx-sapmle/build.gradle b/moxy-androidx-sample/build.gradle
similarity index 76%
rename from moxy-androidx-sapmle/build.gradle
rename to moxy-androidx-sample/build.gradle
index 658eb036..e2d32dcd 100644
--- a/moxy-androidx-sapmle/build.gradle
+++ b/moxy-androidx-sample/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.10'
+    ext.kotlin_version = '1.3.21'
     repositories {
         google()
         jcenter()
@@ -19,7 +19,7 @@ android {
     compileSdkVersion 28
 
     defaultConfig {
-        applicationId "com.arellomobile.mvp.sample.androidx"
+        applicationId "example.com.moxy_androidx_sapmle"
         minSdkVersion 16
         targetSdkVersion 28
         versionCode 1
@@ -28,10 +28,6 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-
     buildTypes {
         release {
             minifyEnabled false
@@ -42,8 +38,10 @@ android {
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation project(':moxy')
-    implementation project(':moxy-androidx')
-    kapt project(':moxy-compiler')
+
+    implementation project(':moxy-x')
+    implementation project(':moxy-x-androidx')
+    kapt project(':moxy-x-compiler')
+
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
diff --git a/moxy-androidx-sapmle/gradle.properties b/moxy-androidx-sample/gradle.properties
similarity index 100%
rename from moxy-androidx-sapmle/gradle.properties
rename to moxy-androidx-sample/gradle.properties
diff --git a/moxy-androidx-sapmle/proguard-rules.pro b/moxy-androidx-sample/proguard-rules.pro
similarity index 100%
rename from moxy-androidx-sapmle/proguard-rules.pro
rename to moxy-androidx-sample/proguard-rules.pro
diff --git a/moxy-androidx-sample/src/main/AndroidManifest.xml b/moxy-androidx-sample/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..d4df28c4
--- /dev/null
+++ b/moxy-androidx-sample/src/main/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="example.com.moxy_androidx_sapmle">
+	
+	<application
+	  android:allowBackup="true"
+	  android:icon="@mipmap/ic_launcher"
+	  android:label="@string/app_name"
+	  android:roundIcon="@mipmap/ic_launcher_round"
+	  android:supportsRtl="true"
+	  android:theme="@style/AppTheme">
+		<activity android:name=".MainActivity">
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN"/>
+				
+				<category android:name="android.intent.category.LAUNCHER"/>
+			</intent-filter>
+		</activity>
+	</application>
+
+</manifest>
\ No newline at end of file
diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt b/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainActivity.kt
similarity index 94%
rename from moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt
rename to moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainActivity.kt
index 68fd1ef1..0f0a00ea 100644
--- a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt
+++ b/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainActivity.kt
@@ -1,4 +1,4 @@
-package example.com.moxy_androidx_sapmle
+package example.com.moxy_androidx_sample
 
 import android.os.Bundle
 import android.util.Log
diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainPresenter.kt b/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainPresenter.kt
similarity index 89%
rename from moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainPresenter.kt
rename to moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainPresenter.kt
index 6c37df14..ebdf20cb 100644
--- a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainPresenter.kt
+++ b/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainPresenter.kt
@@ -1,4 +1,4 @@
-package example.com.moxy_androidx_sapmle
+package example.com.moxy_androidx_sample
 
 import android.util.Log
 import com.arellomobile.mvp.InjectViewState
diff --git a/moxy-androidx-sapmle/src/main/res/drawable-v24/ic_launcher_foreground.xml b/moxy-androidx-sample/src/main/res/drawable-v24/ic_launcher_foreground.xml
similarity index 100%
rename from moxy-androidx-sapmle/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to moxy-androidx-sample/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/moxy-androidx-sapmle/src/main/res/drawable/ic_launcher_background.xml b/moxy-androidx-sample/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from moxy-androidx-sapmle/src/main/res/drawable/ic_launcher_background.xml
rename to moxy-androidx-sample/src/main/res/drawable/ic_launcher_background.xml
diff --git a/moxy-androidx-sapmle/src/main/res/layout/activity_main.xml b/moxy-androidx-sample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from moxy-androidx-sapmle/src/main/res/layout/activity_main.xml
rename to moxy-androidx-sample/src/main/res/layout/activity_main.xml
diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/moxy-androidx-sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from moxy-androidx-sapmle/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to moxy-androidx-sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/moxy-androidx-sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from moxy-androidx-sapmle/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to moxy-androidx-sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-hdpi/ic_launcher.png b/moxy-androidx-sample/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from moxy-androidx-sapmle/src/main/res/mipmap-hdpi/ic_launcher.png
rename to moxy-androidx-sample/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-hdpi/ic_launcher_round.png b/moxy-androidx-sample/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from moxy-androidx-sapmle/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to moxy-androidx-sample/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-mdpi/ic_launcher.png b/moxy-androidx-sample/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from moxy-androidx-sapmle/src/main/res/mipmap-mdpi/ic_launcher.png
rename to moxy-androidx-sample/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-mdpi/ic_launcher_round.png b/moxy-androidx-sample/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from moxy-androidx-sapmle/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to moxy-androidx-sample/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-xhdpi/ic_launcher.png b/moxy-androidx-sample/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from moxy-androidx-sapmle/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to moxy-androidx-sample/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/moxy-androidx-sample/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from moxy-androidx-sapmle/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to moxy-androidx-sample/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-xxhdpi/ic_launcher.png b/moxy-androidx-sample/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from moxy-androidx-sapmle/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to moxy-androidx-sample/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/moxy-androidx-sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from moxy-androidx-sapmle/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to moxy-androidx-sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/moxy-androidx-sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from moxy-androidx-sapmle/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to moxy-androidx-sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/moxy-androidx-sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from moxy-androidx-sapmle/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to moxy-androidx-sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/moxy-androidx-sapmle/src/main/res/values/colors.xml b/moxy-androidx-sample/src/main/res/values/colors.xml
similarity index 100%
rename from moxy-androidx-sapmle/src/main/res/values/colors.xml
rename to moxy-androidx-sample/src/main/res/values/colors.xml
diff --git a/moxy-androidx-sapmle/src/main/res/values/strings.xml b/moxy-androidx-sample/src/main/res/values/strings.xml
similarity index 100%
rename from moxy-androidx-sapmle/src/main/res/values/strings.xml
rename to moxy-androidx-sample/src/main/res/values/strings.xml
diff --git a/moxy-androidx-sapmle/src/main/res/values/styles.xml b/moxy-androidx-sample/src/main/res/values/styles.xml
similarity index 100%
rename from moxy-androidx-sapmle/src/main/res/values/styles.xml
rename to moxy-androidx-sample/src/main/res/values/styles.xml
diff --git a/moxy-androidx-sapmle/src/main/AndroidManifest.xml b/moxy-androidx-sapmle/src/main/AndroidManifest.xml
deleted file mode 100644
index 3c55fb75..00000000
--- a/moxy-androidx-sapmle/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="example.com.moxy_androidx_sapmle">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/moxy-androidx/build.gradle b/moxy-androidx/build.gradle
index c1719e60..2fa01304 100755
--- a/moxy-androidx/build.gradle
+++ b/moxy-androidx/build.gradle
@@ -237,12 +237,12 @@ copyVersion.dependsOn createPomXml
 assemble.dependsOn copyVersion
 
 dependencies {
-    compile project(':moxy')
+    compile project(':moxy-x')
 
     compileOnly deps.android
     compileOnly project(':stub-androidx')
 
-    javadocDeps project(':moxy')
+    javadocDeps project(':moxy-x')
     javadocDeps deps.android
     javadocDeps project(':stub-androidx')
 }
\ No newline at end of file
diff --git a/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatDialogFragment.java b/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatDialogFragment.java
new file mode 100644
index 00000000..dc67ead3
--- /dev/null
+++ b/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatDialogFragment.java
@@ -0,0 +1,102 @@
+package com.alfaenzo.alfa.presentation.base;
+
+
+import android.os.Bundle;
+
+import com.arellomobile.mvp.MvpDelegate;
+
+import org.jetbrains.annotations.NotNull;
+
+import androidx.appcompat.app.AppCompatDialogFragment;
+import androidx.fragment.app.Fragment;
+
+/**
+ * Date: 15-Feb-19
+ *
+ * @author Vova Usachov
+ */
+@SuppressWarnings({"ConstantConditions", "unused"})
+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(@NotNull 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;
+        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;
+    }
\ No newline at end of file
diff --git a/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java b/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java
new file mode 100644
index 00000000..28607f5e
--- /dev/null
+++ b/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java
@@ -0,0 +1,4 @@
+package androidx.appcompat.app;
+
+public class AppCompatDialogFragment {
+}
diff --git a/moxy-app-compat/build.gradle b/moxy-app-compat/build.gradle
index 2f714a4f..21cf2ac0 100644
--- a/moxy-app-compat/build.gradle
+++ b/moxy-app-compat/build.gradle
@@ -239,12 +239,12 @@ copyVersion.dependsOn createPomXml
 assemble.dependsOn copyVersion
 
 dependencies {
-    compile project(':moxy')
+    compile project(':moxy-x')
 
     compileOnly deps.android
     compileOnly project(':stub-appcompat')
 
-    javadocDeps project(':moxy')
+    javadocDeps project(':moxy-x')
     javadocDeps deps.android
     javadocDeps project(':stub-appcompat')
 }
\ No newline at end of file
diff --git a/moxy-compiler/build.gradle b/moxy-compiler/build.gradle
index 4b58cf42..ca3b00df 100644
--- a/moxy-compiler/build.gradle
+++ b/moxy-compiler/build.gradle
@@ -253,14 +253,14 @@ copyVersion.dependsOn createPomXml
 assemble.dependsOn copyVersion
 
 dependencies {
-    implementation project(':moxy')
+    implementation project(':moxy-x')
     implementation deps.javapoet
 
     compileOnly deps.autocommon
     compileOnly deps.autoservice
     compileOnly deps.guava
 
-    javadocDeps project(':moxy')
+    javadocDeps project(':moxy-x')
     javadocDeps deps.javapoet
     javadocDeps deps.autoservice
 
diff --git a/moxy/build.gradle b/moxy/build.gradle
index b426b523..db387cc2 100644
--- a/moxy/build.gradle
+++ b/moxy/build.gradle
@@ -6,7 +6,7 @@ ext {
     publishDir = 'artifacts'
     publishMavenDir = 'artifacts-maven'
     targetGroupId = 'tech.schoolhelper'
-    targetArtefactId = 'moxy-x'
+    targetArtefactId = 'moxy'
     targetArtefactIdDev = 'moxy-dev'
     versionFile = 'VERSION'
 }
@@ -240,6 +240,6 @@ dependencies {
     testImplementation deps.android
     testImplementation deps.robolectric
     testImplementation deps.compiletesting
-    testImplementation project(':moxy-compiler')
+    testImplementation project(':moxy-x-compiler')
     testImplementation deps.javapoet
 }
\ No newline at end of file
diff --git a/sample-github/build.gradle b/sample-github/build.gradle
index a317ff91..106a2065 100644
--- a/sample-github/build.gradle
+++ b/sample-github/build.gradle
@@ -65,8 +65,8 @@ dependencies {
     testImplementation "org.hamcrest:hamcrest-all:1.3"
     testImplementation "org.robolectric:robolectric:3.1-rc1"
     
-    implementation project(':moxy')
-    implementation project(':moxy-app-compat')
+    implementation project(':moxy-x')
+    implementation project(':moxy-x-app-compat')
 
-    annotationProcessor project(':moxy-compiler')
+    annotationProcessor project(':moxy-x-compiler')
 }
\ No newline at end of file
diff --git a/sample-kotlin/build.gradle b/sample-kotlin/build.gradle
index 45e18bf8..971170e0 100644
--- a/sample-kotlin/build.gradle
+++ b/sample-kotlin/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.10'
+    ext.kotlin_version = '1.3.20'
     repositories {
         jcenter()
         mavenCentral()
@@ -16,7 +16,7 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 28
-    buildToolsVersion '27.0.3'
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "com.arellomobile.mvp.sample.kotlin"
@@ -41,7 +41,7 @@ android {
 }
 
 dependencies {
-    def supportVersion = '27.1.1'
+    def supportVersion = '28.0.0'
     implementation "com.android.support:appcompat-v7:$supportVersion"
 
     def moxyVersion = '1.5.5'
diff --git a/sample-kotlin/src/main/AndroidManifest.xml b/sample-kotlin/src/main/AndroidManifest.xml
index 2495abf9..403bcd33 100644
--- a/sample-kotlin/src/main/AndroidManifest.xml
+++ b/sample-kotlin/src/main/AndroidManifest.xml
@@ -3,7 +3,6 @@
 	package="com.arellomobile.mvp.sample.kotlin">
 
 	<application android:allowBackup="true"
-		android:icon="@mipmap/ic_launcher"
 		android:label="@string/app_name"
 		android:supportsRtl="true"
 		android:theme="@style/AppTheme">
diff --git a/settings.gradle b/settings.gradle
index 4a7c3ce0..86f42c94 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,9 +1,19 @@
-include ':moxy', ':stub-reflector', ':moxy-android', ':moxy-compiler', ':stub-android', ':moxy-app-compat', ':moxy-androidx', ':stub-appcompat', ':stub-androidx'
-include ':sample-github'
+include ':moxy-x', ':moxy-x-android', ':moxy-x-compiler', ':moxy-x-app-compat', ':moxy-x-androidx'
+
+include ':stub-reflector', ':stub-android', ':stub-appcompat', ':stub-androidx'
+
+/*include ':sample-github'*/
 include ':sample-kotlin'
 include ':sample-custom-strategy'
-include ':moxy-androidx-sapmle'
+include ':moxy-androidx-sample'
+
 project(':stub-reflector').projectDir = new File('moxy/stub-reflector')
 project(':stub-android').projectDir = new File('moxy-android/stub-android')
 project(':stub-appcompat').projectDir = new File('moxy-app-compat/stub-appcompat')
 project(':stub-androidx').projectDir = new File('moxy-androidx/stub-androidx')
+
+project(':moxy-x').projectDir = new File('moxy')
+project(':moxy-x-androidx').projectDir = new File('moxy-androidx')
+project(':moxy-x-app-compat').projectDir = new File('moxy-app-compat')
+project(':moxy-x-compiler').projectDir = new File('moxy-compiler')
+project(':moxy-x-android').projectDir = new File('moxy-android')
\ No newline at end of file

From f8e7fae58e9802882b8ae7853528a8fb8ca915ce Mon Sep 17 00:00:00 2001
From: Volodymyr <vovochkastelmashchuk@gmail.com>
Date: Fri, 1 Mar 2019 16:04:19 +0200
Subject: [PATCH 23/35] Update MvpAppCompatDialogFragment.java

---
 .../java/com/arellomobile/mvp/MvpAppCompatDialogFragment.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatDialogFragment.java b/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatDialogFragment.java
index dc67ead3..b0534a8f 100644
--- a/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatDialogFragment.java
+++ b/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatDialogFragment.java
@@ -1,4 +1,4 @@
-package com.alfaenzo.alfa.presentation.base;
+package com.arellomobile.mvp;
 
 
 import android.os.Bundle;
@@ -99,4 +99,4 @@ public MvpDelegate getMvpDelegate() {
         }
 
         return mMvpDelegate;
-    }
\ No newline at end of file
+    }

From 164c30998f7e9317e83a0b4cd180066e560b87d6 Mon Sep 17 00:00:00 2001
From: Vova Stelmashchuk <vovochkastelmashchuk@gmail.com>
Date: Sat, 2 Mar 2019 00:25:40 +0200
Subject: [PATCH 24/35] update

---
 build.gradle                                  |  4 +-
 moxy-android/build.gradle                     |  2 +-
 .../src/main/AndroidManifest.xml              |  2 +-
 .../com/androidxsample/MainActivity.kt        |  3 +-
 .../com/androidxsample/MainPresenter.kt       |  2 +-
 moxy-androidx/build.gradle                    |  2 +-
 .../mvp/MvpAppCompatDialogFragment.java       | 16 +++----
 .../mvp/MvpAppCompatFragment.java             |  2 +
 .../app/AppCompatDialogFragment.java          | 42 +++++++++++++++++++
 moxy-app-compat/build.gradle                  |  2 +-
 moxy-compiler/build.gradle                    |  2 +-
 11 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/build.gradle b/build.gradle
index c9151251..e8bf6cda 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,8 +20,8 @@ allprojects {
 }
 
 ext {
-    targetVersionCode = 46
-    targetVersionName = "1.5.6"
+    targetVersionCode = 47
+    targetVersionName = "1.5.7-SNAPSHOT"
 
     deps = [
             android       : 'com.google.android:android:1.6_r2',
diff --git a/moxy-android/build.gradle b/moxy-android/build.gradle
index 6585930b..5d140175 100644
--- a/moxy-android/build.gradle
+++ b/moxy-android/build.gradle
@@ -239,7 +239,7 @@ copyVersion.dependsOn createPomXml
 assemble.dependsOn copyVersion
 
 dependencies {
-    compileOnly project(':moxy-x')
+    implementation project(':moxy-x')
 
     compileOnly deps.android
     compileOnly project(':stub-android')
diff --git a/moxy-androidx-sample/src/main/AndroidManifest.xml b/moxy-androidx-sample/src/main/AndroidManifest.xml
index d4df28c4..7269fa23 100644
--- a/moxy-androidx-sample/src/main/AndroidManifest.xml
+++ b/moxy-androidx-sample/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="example.com.moxy_androidx_sapmle">
+          package="example.com.androidxsample">
 	
 	<application
 	  android:allowBackup="true"
diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainActivity.kt b/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainActivity.kt
index 0f0a00ea..e0e124bc 100644
--- a/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainActivity.kt
+++ b/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainActivity.kt
@@ -1,4 +1,4 @@
-package example.com.moxy_androidx_sample
+package example.com.androidxsample
 
 import android.os.Bundle
 import android.util.Log
@@ -6,6 +6,7 @@ import androidx.appcompat.app.AppCompatActivity
 import com.arellomobile.mvp.MvpAppCompatActivity
 import com.arellomobile.mvp.MvpView
 import com.arellomobile.mvp.presenter.InjectPresenter
+import example.com.androidxsample.R
 
 interface MainView : MvpView {
 	fun printLog(msg: String)
diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainPresenter.kt b/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainPresenter.kt
index ebdf20cb..fb631cba 100644
--- a/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainPresenter.kt
+++ b/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainPresenter.kt
@@ -1,4 +1,4 @@
-package example.com.moxy_androidx_sample
+package example.com.androidxsample
 
 import android.util.Log
 import com.arellomobile.mvp.InjectViewState
diff --git a/moxy-androidx/build.gradle b/moxy-androidx/build.gradle
index 2fa01304..67b827e0 100755
--- a/moxy-androidx/build.gradle
+++ b/moxy-androidx/build.gradle
@@ -237,7 +237,7 @@ copyVersion.dependsOn createPomXml
 assemble.dependsOn copyVersion
 
 dependencies {
-    compile project(':moxy-x')
+    implementation project(':moxy-x')
 
     compileOnly deps.android
     compileOnly project(':stub-androidx')
diff --git a/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatDialogFragment.java b/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatDialogFragment.java
index dc67ead3..90cea8ce 100644
--- a/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatDialogFragment.java
+++ b/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatDialogFragment.java
@@ -1,12 +1,8 @@
-package com.alfaenzo.alfa.presentation.base;
+package com.arellomobile.mvp;
 
 
 import android.os.Bundle;
 
-import com.arellomobile.mvp.MvpDelegate;
-
-import org.jetbrains.annotations.NotNull;
-
 import androidx.appcompat.app.AppCompatDialogFragment;
 import androidx.fragment.app.Fragment;
 
@@ -15,19 +11,21 @@
  *
  * @author Vova Usachov
  */
-@SuppressWarnings({"ConstantConditions", "unused"})
+@SuppressWarnings({"unused"})
 public class MvpAppCompatDialogFragment extends AppCompatDialogFragment {
 
     private boolean mIsStateSaved;
 
     private MvpDelegate<? extends MvpAppCompatDialogFragment> mMvpDelegate;
 
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         getMvpDelegate().onCreate(savedInstanceState);
     }
 
+    @Override
     public void onResume() {
         super.onResume();
 
@@ -36,7 +34,8 @@ public void onResume() {
         getMvpDelegate().onAttach();
     }
 
-    public void onSaveInstanceState(@NotNull Bundle outState) {
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
 
         mIsStateSaved = true;
@@ -99,4 +98,5 @@ public MvpDelegate getMvpDelegate() {
         }
 
         return mMvpDelegate;
-    }
\ No newline at end of file
+    }
+}
\ No newline at end of file
diff --git a/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatFragment.java b/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatFragment.java
index 16799c15..b87f9914 100644
--- a/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatFragment.java
+++ b/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatFragment.java
@@ -1,6 +1,7 @@
 package com.arellomobile.mvp;
 
 import android.os.Bundle;
+
 import androidx.fragment.app.Fragment;
 
 /**
@@ -17,6 +18,7 @@ public class MvpAppCompatFragment extends Fragment {
 
     private MvpDelegate<? extends MvpAppCompatFragment> mMvpDelegate;
 
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
diff --git a/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java b/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java
index 28607f5e..bc571788 100644
--- a/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java
+++ b/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java
@@ -1,4 +1,46 @@
 package androidx.appcompat.app;
 
+import android.os.Bundle;
+
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+
 public class AppCompatDialogFragment {
+    public void onCreate(Bundle savedInstanceState) {
+        throw new RuntimeException("Stub!");
+    }
+
+    public void onResume() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public void onSaveInstanceState(Bundle outState) {
+        throw new RuntimeException("Stub!");
+    }
+
+    public void onStop() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public void onDestroyView() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public void onDestroy() {
+        throw new RuntimeException("Stub!");
+    }
+
+    final public boolean isRemoving() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public final FragmentActivity getActivity() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public Fragment getParentFragment() {
+        throw new RuntimeException("Stub!");
+    }
+
 }
diff --git a/moxy-app-compat/build.gradle b/moxy-app-compat/build.gradle
index 21cf2ac0..9552d034 100644
--- a/moxy-app-compat/build.gradle
+++ b/moxy-app-compat/build.gradle
@@ -239,7 +239,7 @@ copyVersion.dependsOn createPomXml
 assemble.dependsOn copyVersion
 
 dependencies {
-    compile project(':moxy-x')
+    compileOnly project(':moxy-x')
 
     compileOnly deps.android
     compileOnly project(':stub-appcompat')
diff --git a/moxy-compiler/build.gradle b/moxy-compiler/build.gradle
index ca3b00df..cb94a1f3 100644
--- a/moxy-compiler/build.gradle
+++ b/moxy-compiler/build.gradle
@@ -269,6 +269,6 @@ dependencies {
     testImplementation deps.compiletesting
     testImplementation deps.asm
 
-    // workaround to use test resources (https://stackoverflow.com/q/24870464)
+    //workaround to use test resources (https://stackoverflow.com/q/24870464)
     testRuntime files(sourceSets.test.output.resourcesDir)
 }
\ No newline at end of file

From 74020c8856d78e49edbfc45b7526c24a7cdeb00e Mon Sep 17 00:00:00 2001
From: Vova Stelmashchuk <vovochkastelmashchuk@gmail.com>
Date: Sat, 2 Mar 2019 22:45:11 +0200
Subject: [PATCH 25/35] update read me

---
 README.md                         | 22 +++++------
 build.gradle                      |  2 +-
 makegpg.sh                        | 64 +++++++++++++++++++++++++++++++
 moxy-androidx-sample/build.gradle |  8 +++-
 moxy/build.gradle                 |  2 +-
 5 files changed, 83 insertions(+), 15 deletions(-)
 create mode 100755 makegpg.sh

diff --git a/README.md b/README.md
index 9771b349..3a1f2090 100644
--- a/README.md
+++ b/README.md
@@ -40,21 +40,21 @@ View implementation
 public class HelloWorldActivity extends MvpAppCompatActivity implements HelloWorldView {
 
 	@InjectPresenter
-	HelloWorldPresenter mHelloWorldPresenter;
+	HelloWorldPresenter helloWorldPresenter;
 
-	private TextView mHelloWorldTextView;
+	private TextView helloWorldTextView;
 
 	@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));
+		helloWorldTextView = ((TextView) findViewById(R.id.activity_hello_world_text_view_message));
 	}
 
 	@Override
 	public void showMessage(int message) {
-		mHelloWorldTextView.setText(message);
+		helloWorldTextView.setText(message);
 	}
 }
 ```
@@ -80,29 +80,29 @@ Base modules integration:
 ```groovy
 dependencies {
   ...
-  implementation 'tech.schoolhelper:moxy-x:1.5.6'
-  annotationProcessor 'tech.schoolhelper:moxy-x-compiler:1.5.6'
+  implementation 'tech.schoolhelper:moxy-x:1.5.7'
+  annotationProcessor 'tech.schoolhelper:moxy-x-compiler:1.5.7'
 }
 ```
 For additional base view classes `MvpActivity` and `MvpFragment` add this:
 ```groovy
 dependencies {
   ...
-  implementation 'tech.schoolhelper:moxy-x-android:1.5.6'
+  implementation 'tech.schoolhelper:moxy-x-android:1.5.7'
 }
 ```
 If you are planning to use AppCompat, then you can use `MvpAppCompatActivity` and `MvpAppCompatFragment`. Then add this:
 ```groovy
 dependencies {
   ...
-  implementation 'tech.schoolhelper:moxy-x-app-compat:1.5.6'
+  implementation 'tech.schoolhelper:moxy-x-app-compat:1.5.7'
   implementation 'com.android.support:appcompat-v7:$support_version'
 }
 ```
 If you are planning to use AndroidX, then you can use `MvpAppCompatActivity` and `MvpAppCompatFragment`. Then add this:
 ```groovy
    ...
-   implementation 'tech.schoolhelper:moxy-x-androidx:1.5.6'
+   implementation 'tech.schoolhelper:moxy-x-androidx:1.5.7'
 ```
 ### Kotlin
 If you are using kotlin, use `kapt` instead of `provided`/`apt` dependency type:
@@ -111,12 +111,12 @@ apply plugin: 'kotlin-kapt'
 
 dependencies {
   ...
-  kapt 'tech.schoolhelper:moxy-x-compiler:1.5.6'
+  kapt 'tech.schoolhelper:moxy-x-compiler:1.5.7'
 }
 ```
 
 ## ProGuard
-Moxy is completely without reflection! No special ProGuard rules required.
+MoxyX is completely without reflection! No special ProGuard rules required.
 
 ## License
 ```
diff --git a/build.gradle b/build.gradle
index e8bf6cda..30120205 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ allprojects {
 
 ext {
     targetVersionCode = 47
-    targetVersionName = "1.5.7-SNAPSHOT"
+    targetVersionName = "1.5.7"
 
     deps = [
             android       : 'com.google.android:android:1.6_r2',
diff --git a/makegpg.sh b/makegpg.sh
new file mode 100755
index 00000000..3745680a
--- /dev/null
+++ b/makegpg.sh
@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+
+./gradlew moxy-x:assemble
+./gradlew moxy-x-android:assemble
+./gradlew moxy-x-androidx:assemble
+./gradlew moxy-x-app-compat:assemble
+./gradlew moxy-x-compile:assemble
+
+echo "artifacts built"
+
+cd moxy/artifacts-maven
+
+pwd
+
+gpg2 -ab moxy-x-javadoc.jar
+gpg2 -ab moxy-x-sources.jar
+gpg2 -ab moxy-x.jar
+gpg2 -ab moxy-x.pom
+
+echo "gpg for moxy-x built"
+
+cd .. && cd ..
+
+cd moxy-android/artifacts-maven
+
+gpg2 -ab moxy-x-android-javadoc.jar
+gpg2 -ab moxy-x-android-sources.jar
+gpg2 -ab moxy-x-android.jar
+gpg2 -ab moxy-x-android.pom
+
+echo "gpg for moxy-x-android built"
+
+cd .. && cd ..
+
+cd moxy-androidx/artifacts-maven
+
+gpg2 -ab moxy-x-androidx-javadoc.jar
+gpg2 -ab moxy-x-androidx-sources.jar
+gpg2 -ab moxy-x-androidx.jar
+gpg2 -ab moxy-x-androidx.pom
+
+echo "gpg for moxy-x-androidX built"
+
+cd .. && cd ..
+
+cd moxy-app-compat/artifacts-maven
+
+gpg2 -ab moxy-x-app-compat-javadoc.jar
+gpg2 -ab moxy-x-app-compat-sources.jar
+gpg2 -ab moxy-x-app-compat.jar
+gpg2 -ab moxy-x-app-compat.pom
+
+echo "gpg for moxy-x-app-compat built"
+
+cd .. && cd ..
+
+cd moxy-compiler/artifacts-maven
+
+gpg2 -ab moxy-x-compiler-javadoc.jar
+gpg2 -ab moxy-x-compiler-sources.jar
+gpg2 -ab moxy-x-compiler.jar
+gpg2 -ab moxy-x-compiler.pom
+
+echo "gpg for moxy-x-app-compiler built"
\ No newline at end of file
diff --git a/moxy-androidx-sample/build.gradle b/moxy-androidx-sample/build.gradle
index e2d32dcd..1cee73ef 100644
--- a/moxy-androidx-sample/build.gradle
+++ b/moxy-androidx-sample/build.gradle
@@ -39,9 +39,13 @@ android {
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.0.2'
 
-    implementation project(':moxy-x')
+    /*implementation project(':moxy-x')
     implementation project(':moxy-x-androidx')
-    kapt project(':moxy-x-compiler')
+    kapt project(':moxy-x-compiler')*/
+    
+    implementation 'tech.schoolhelper:moxy-x:1.5.7'
+    implementation 'tech.schoolhelper:moxy-x-androidx:1.5.7'
+    kapt 'tech.schoolhelper:moxy-x-compiler:1.5.7'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
diff --git a/moxy/build.gradle b/moxy/build.gradle
index db387cc2..5bb983cb 100644
--- a/moxy/build.gradle
+++ b/moxy/build.gradle
@@ -6,7 +6,7 @@ ext {
     publishDir = 'artifacts'
     publishMavenDir = 'artifacts-maven'
     targetGroupId = 'tech.schoolhelper'
-    targetArtefactId = 'moxy'
+    targetArtefactId = 'moxy-x'
     targetArtefactIdDev = 'moxy-dev'
     versionFile = 'VERSION'
 }

From b12f919e7e713701d7a0ef4a5011b6ad628e6f87 Mon Sep 17 00:00:00 2001
From: Volodymyr <vovochkastelmashchuk@gmail.com>
Date: Sun, 3 Mar 2019 00:59:47 +0200
Subject: [PATCH 26/35] Update README.md

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3a1f2090..a3db6bce 100644
--- a/README.md
+++ b/README.md
@@ -69,12 +69,16 @@ In order to avoid boilerplate code creating for binding activity, fragments and
 
 Templates located in [/moxy-templates](https://github.com/jordan1997/Moxy/tree/develop/moxy-templates)
 
-## Links
+## 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:
 ```groovy

From 567f349a8c1026a9df2b155bf9c22c567d95b4ff Mon Sep 17 00:00:00 2001
From: Vova Stelmashchuk <vovochkastelmashchuk@gmail.com>
Date: Sun, 3 Mar 2019 01:16:28 +0200
Subject: [PATCH 27/35] update licenses for maven and move common to the
 gradle.properties

---
 gradle.properties                             |  13 +-
 moxy-android/build.gradle                     |  12 +-
 moxy-androidx-sample/build.gradle             |   3 +-
 moxy-androidx/build.gradle                    |  10 +-
 moxy-app-compat/build.gradle                  |  14 +-
 moxy-compiler/build.gradle                    |  16 +-
 .../mvp/compiler/MvpCompiler.java             |   4 +-
 .../InjectPresenterProcessor.java             | 310 +++++++++---------
 .../PresenterBinderClassGenerator.java        | 249 +++++++-------
 .../PresenterProviderMethod.java              |  14 +-
 .../presenterbinder/TargetPresenterField.java | 142 ++++----
 moxy/build.gradle                             |  12 +-
 .../arellomobile/mvp/GenerateViewState.java   |  17 -
 .../com/arellomobile/mvp/MvpDelegate.java     |   8 +-
 .../com/arellomobile/mvp/MvpPresenter.java    |  16 +-
 .../com/arellomobile/mvp/MvpProcessor.java    |  15 +-
 .../main/java/com/arellomobile/mvp/Pair.java  |  82 -----
 .../mvp/presenter/PresenterField.java         |  61 ++--
 .../mvp/presenter/PresenterType.java          |  27 --
 .../mvp/presenter/ProvidePresenter.java       |   2 -
 .../view/DelegateLocalPresenter2TestView.java |  10 -
 .../view/DelegateLocalPresenterTestView.java  |   5 +-
 22 files changed, 425 insertions(+), 617 deletions(-)
 delete mode 100644 moxy/src/main/java/com/arellomobile/mvp/GenerateViewState.java
 delete mode 100644 moxy/src/main/java/com/arellomobile/mvp/Pair.java
 delete mode 100644 moxy/src/main/java/com/arellomobile/mvp/presenter/PresenterType.java
 delete mode 100644 moxy/src/test/java/com/arellomobile/mvp/view/DelegateLocalPresenter2TestView.java

diff --git a/gradle.properties b/gradle.properties
index e7bb7068..d746b04c 100644
--- a/gradle.properties
+++ b/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>
\ No newline at end of file
+#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:git@github.com: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
\ No newline at end of file
diff --git a/moxy-android/build.gradle b/moxy-android/build.gradle
index 5d140175..4a68e41b 100644
--- a/moxy-android/build.gradle
+++ b/moxy-android/build.gradle
@@ -73,15 +73,15 @@ def getBasePom(String libName) {
             version targetVersionName
             name 'Moxy-android'
             modelVersion = '4.0.0'
-            description = 'MoxyX, we added X for make this librayr coolest'
+            description = 'POM_DESCRIPTION'
             url = 'https://schoolhelper.tech/'
             packaging = 'jar'
 
             inceptionYear '2016'
             licenses {
                 license {
-                    name 'The Apache Software License, Version 2.0'
-                    url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    name 'POM_LICENCE_NAME'
+                    url 'POM_LICENCE_URL'
                     distribution 'repo'
                 }
             }
@@ -108,9 +108,9 @@ def getBasePom(String libName) {
             }
 
             scm {
-                connection 'scm:git@github.com:jordan1997/Moxy.git'
-                developerConnection 'scm:git@github.com:jordan1997/Moxy.git'
-                url 'https://github.com/jordan1997/Moxy'
+                connection 'POM_SCM_CONNECTION'
+                developerConnection 'POM_SCM_CONNECTION'
+                url 'POM_URL'
             }
         }.withXml {
             asNode().appendNode('packaging', 'jar')
diff --git a/moxy-androidx-sample/build.gradle b/moxy-androidx-sample/build.gradle
index 1cee73ef..a391f047 100644
--- a/moxy-androidx-sample/build.gradle
+++ b/moxy-androidx-sample/build.gradle
@@ -39,10 +39,11 @@ android {
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.0.2'
 
+    //uncomment for test module
     /*implementation project(':moxy-x')
     implementation project(':moxy-x-androidx')
     kapt project(':moxy-x-compiler')*/
-    
+
     implementation 'tech.schoolhelper:moxy-x:1.5.7'
     implementation 'tech.schoolhelper:moxy-x-androidx:1.5.7'
     kapt 'tech.schoolhelper:moxy-x-compiler:1.5.7'
diff --git a/moxy-androidx/build.gradle b/moxy-androidx/build.gradle
index 67b827e0..c762c93c 100755
--- a/moxy-androidx/build.gradle
+++ b/moxy-androidx/build.gradle
@@ -80,8 +80,8 @@ def getBasePom(String libName) {
             inceptionYear '2016'
             licenses {
                 license {
-                    name 'The Apache Software License, Version 2.0'
-                    url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    name 'POM_LICENCE_NAME'
+                    url 'POM_LICENCE_URL'
                     distribution 'repo'
                 }
             }
@@ -108,9 +108,9 @@ def getBasePom(String libName) {
             }
 
             scm {
-                connection 'scm:git@github.com:jordan1997/Moxy.git'
-                developerConnection 'scm:git@github.com:jordan1997/Moxy.git'
-                url 'https://github.com/jordan1997/Moxy'
+                connection 'POM_SCM_CONNECTION'
+                developerConnection 'POM_SCM_CONNECTION'
+                url 'POM_URL'
             }
         }.withXml {
             asNode().appendNode('packaging', 'jar')
diff --git a/moxy-app-compat/build.gradle b/moxy-app-compat/build.gradle
index 9552d034..44262334 100644
--- a/moxy-app-compat/build.gradle
+++ b/moxy-app-compat/build.gradle
@@ -73,15 +73,15 @@ def getBasePom(String libName) {
             version targetVersionName
             name 'Moxy-app-compat'
             modelVersion = '4.0.0'
-            description = 'MoxyX, we added X for make this librayr coolest'
+            description = 'POM_DESCRIPTION'
             url = 'https://schoolhelper.tech/'
             packaging = 'jar'
 
             inceptionYear '2016'
             licenses {
                 license {
-                    name 'The Apache Software License, Version 2.0'
-                    url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    name 'POM_LICENCE_NAME'
+                    url 'POM_LICENCE_URL'
                     distribution 'repo'
                 }
             }
@@ -108,9 +108,9 @@ def getBasePom(String libName) {
             }
 
             scm {
-                connection 'scm:git@github.com:jordan1997/Moxy.git'
-                developerConnection 'scm:git@github.com:jordan1997/Moxy.git'
-                url 'https://github.com/jordan1997/Moxy'
+                connection 'POM_SCM_CONNECTION'
+                developerConnection 'POM_SCM_CONNECTION'
+                url 'POM_URL'
             }
         }.withXml {
             asNode().appendNode('packaging', 'jar')
@@ -146,8 +146,6 @@ task copyJars {
 }
 
 
-
-
 task createPomXml {
     doLast {
         // creating local pom
diff --git a/moxy-compiler/build.gradle b/moxy-compiler/build.gradle
index cb94a1f3..263a2b34 100644
--- a/moxy-compiler/build.gradle
+++ b/moxy-compiler/build.gradle
@@ -61,17 +61,17 @@ def getBasePom(String libName) {
             groupId targetGroupId
             artifactId targetArtefactId
             version targetVersionName
-            name 'Moxy-compiler'
+            name 'Moxy'
             modelVersion = '4.0.0'
-            description = 'MoxyX, we added X for make this librayr coolest'
+            description = 'POM_DESCRIPTION'
             url = 'https://schoolhelper.tech/'
-            packaging = 'jar'
+            //   packaging = 'jar'  //doesn't work from box, implement it manualy
 
             inceptionYear '2016'
             licenses {
                 license {
-                    name 'The Apache Software License, Version 2.0'
-                    url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    name 'POM_LICENCE_NAME'
+                    url 'POM_LICENCE_URL'
                     distribution 'repo'
                 }
             }
@@ -98,9 +98,9 @@ def getBasePom(String libName) {
             }
 
             scm {
-                connection 'scm:git@github.com:jordan1997/Moxy.git'
-                developerConnection 'scm:git@github.com:jordan1997/Moxy.git'
-                url 'https://github.com/jordan1997/Moxy'
+                connection 'POM_SCM_CONNECTION'
+                developerConnection 'POM_SCM_CONNECTION'
+                url 'POM_URL'
             }
         }.withXml {
             asNode().appendNode('packaging', 'jar')
diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/MvpCompiler.java b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/MvpCompiler.java
index 4c6f88d1..3ff166b7 100644
--- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/MvpCompiler.java
+++ b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/MvpCompiler.java
@@ -1,6 +1,5 @@
 package com.arellomobile.mvp.compiler;
 
-import com.arellomobile.mvp.GenerateViewState;
 import com.arellomobile.mvp.InjectViewState;
 import com.arellomobile.mvp.RegisterMoxyReflectorPackages;
 import com.arellomobile.mvp.compiler.presenterbinder.InjectPresenterProcessor;
@@ -91,8 +90,7 @@ public Set<String> getSupportedAnnotationTypes() {
 		Collections.addAll(supportedAnnotationTypes,
 				InjectPresenter.class.getCanonicalName(),
 				InjectViewState.class.getCanonicalName(),
-				RegisterMoxyReflectorPackages.class.getCanonicalName(),
-				GenerateViewState.class.getCanonicalName());
+				RegisterMoxyReflectorPackages.class.getCanonicalName());
 		return supportedAnnotationTypes;
 	}
 
diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/InjectPresenterProcessor.java b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/InjectPresenterProcessor.java
index faac2e0e..136914a8 100644
--- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/InjectPresenterProcessor.java
+++ b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/InjectPresenterProcessor.java
@@ -19,183 +19,175 @@
 import javax.lang.model.type.TypeMirror;
 
 public class InjectPresenterProcessor extends ElementProcessor<VariableElement, TargetClassInfo> {
-	private static final String PRESENTER_FIELD_ANNOTATION = InjectPresenter.class.getName();
-	private static final String PROVIDE_PRESENTER_ANNOTATION = ProvidePresenter.class.getName();
-	private static final String PROVIDE_PRESENTER_TAG_ANNOTATION = ProvidePresenterTag.class.getName();
+    private static final String PRESENTER_FIELD_ANNOTATION = InjectPresenter.class.getName();
 
-	private final List<TypeElement> presentersContainers = new ArrayList<>();
+    private static final String PROVIDE_PRESENTER_ANNOTATION = ProvidePresenter.class.getName();
 
-	public List<TypeElement> getPresentersContainers() {
-		return new ArrayList<>(presentersContainers);
-	}
+    private static final String PROVIDE_PRESENTER_TAG_ANNOTATION = ProvidePresenterTag.class.getName();
 
-	@Override
-	public TargetClassInfo process(VariableElement variableElement) {
-		final Element enclosingElement = variableElement.getEnclosingElement();
+    private final List<TypeElement> presentersContainers = new ArrayList<>();
 
-		if (!(enclosingElement instanceof TypeElement)) {
-			throw new RuntimeException("Only class fields could be annotated as @InjectPresenter: " +
-					variableElement + " at " + enclosingElement);
-		}
+    public List<TypeElement> getPresentersContainers() {
+        return new ArrayList<>(presentersContainers);
+    }
 
-		if (presentersContainers.contains(enclosingElement)) {
-			return null;
-		}
+    @Override
+    public TargetClassInfo process(VariableElement variableElement) {
+        final Element enclosingElement = variableElement.getEnclosingElement();
 
-		final TypeElement presentersContainer = (TypeElement) enclosingElement;
-		presentersContainers.add(presentersContainer);
+        if (!(enclosingElement instanceof TypeElement)) {
+            throw new RuntimeException("Only class fields could be annotated as @InjectPresenter: " +
+                    variableElement + " at " + enclosingElement);
+        }
 
-		// gather presenter fields info
-		List<TargetPresenterField> fields = collectFields(presentersContainer);
-		bindProvidersToFields(fields, collectPresenterProviders(presentersContainer));
-		bindTagProvidersToFields(fields, collectTagProviders(presentersContainer));
+        if (presentersContainers.contains(enclosingElement)) {
+            return null;
+        }
 
-		return new TargetClassInfo(presentersContainer, fields);
-	}
+        final TypeElement presentersContainer = (TypeElement) enclosingElement;
+        presentersContainers.add(presentersContainer);
 
-	private static List<TargetPresenterField> collectFields(TypeElement presentersContainer) {
-		List<TargetPresenterField> fields = new ArrayList<>();
+        // gather presenter fields info
+        List<TargetPresenterField> fields = collectFields(presentersContainer);
+        bindProvidersToFields(fields, collectPresenterProviders(presentersContainer));
+        bindTagProvidersToFields(fields, collectTagProviders(presentersContainer));
 
-		for (Element element : presentersContainer.getEnclosedElements()) {
-			if (element.getKind() != ElementKind.FIELD) {
-				continue;
-			}
+        return new TargetClassInfo(presentersContainer, fields);
+    }
 
-			AnnotationMirror annotation = Util.getAnnotation(element, PRESENTER_FIELD_ANNOTATION);
+    private static List<TargetPresenterField> collectFields(TypeElement presentersContainer) {
+        List<TargetPresenterField> fields = new ArrayList<>();
 
-			if (annotation == null) {
-				continue;
-			}
+        for (Element element : presentersContainer.getEnclosedElements()) {
+            if (element.getKind() != ElementKind.FIELD) {
+                continue;
+            }
 
-			// TODO: simplify?
-			TypeMirror clazz = ((DeclaredType) element.asType()).asElement().asType();
+            AnnotationMirror annotation = Util.getAnnotation(element, PRESENTER_FIELD_ANNOTATION);
 
-			String name = element.toString();
+            if (annotation == null) {
+                continue;
+            }
 
-			String type = Util.getAnnotationValueAsString(annotation, "type");
-			String tag = Util.getAnnotationValueAsString(annotation, "tag");
-			String presenterId = Util.getAnnotationValueAsString(annotation, "presenterId");
+            // TODO: simplify?
+            TypeMirror clazz = ((DeclaredType) element.asType()).asElement().asType();
 
-			TargetPresenterField field = new TargetPresenterField(clazz, name, type, tag, presenterId);
-			fields.add(field);
-		}
-		return fields;
-	}
+            String name = element.toString();
 
-	private static List<PresenterProviderMethod> collectPresenterProviders(TypeElement presentersContainer) {
-		List<PresenterProviderMethod> providers = new ArrayList<>();
+            String tag = Util.getAnnotationValueAsString(annotation, "tag");
+            String presenterId = Util.getAnnotationValueAsString(annotation, "presenterId");
 
-		for (Element element : presentersContainer.getEnclosedElements()) {
-			if (element.getKind() != ElementKind.METHOD) {
-				continue;
-			}
+            TargetPresenterField field = new TargetPresenterField(clazz, name, tag, presenterId);
+            fields.add(field);
+        }
+        return fields;
+    }
 
-			final ExecutableElement providerMethod = (ExecutableElement) element;
-
-			final AnnotationMirror annotation = Util.getAnnotation(element, PROVIDE_PRESENTER_ANNOTATION);
+    private static List<PresenterProviderMethod> collectPresenterProviders(TypeElement presentersContainer) {
+        List<PresenterProviderMethod> providers = new ArrayList<>();
 
-			if (annotation == null) {
-				continue;
-			}
-
-			final String name = providerMethod.getSimpleName().toString();
-			final DeclaredType kind = ((DeclaredType) providerMethod.getReturnType());
-
-			String type = Util.getAnnotationValueAsString(annotation, "type");
-			String tag = Util.getAnnotationValueAsString(annotation, "tag");
-			String presenterId = Util.getAnnotationValueAsString(annotation, "presenterId");
-
-			providers.add(new PresenterProviderMethod(kind, name, type, tag, presenterId));
-		}
-		return providers;
-	}
-
-	private static List<TagProviderMethod> collectTagProviders(TypeElement presentersContainer) {
-		List<TagProviderMethod> providers = new ArrayList<>();
-
-		for (Element element : presentersContainer.getEnclosedElements()) {
-			if (element.getKind() != ElementKind.METHOD) {
-				continue;
-			}
-
-			final ExecutableElement providerMethod = (ExecutableElement) element;
-
-			final AnnotationMirror annotation = Util.getAnnotation(element, PROVIDE_PRESENTER_TAG_ANNOTATION);
-
-			if (annotation == null) {
-				continue;
-			}
-
-			final String name = providerMethod.getSimpleName().toString();
-
-			TypeMirror presenterClass = Util.getAnnotationValueAsTypeMirror(annotation, "presenterClass");
-			String type = Util.getAnnotationValueAsString(annotation, "type");
-			String presenterId = Util.getAnnotationValueAsString(annotation, "presenterId");
-
-			providers.add(new TagProviderMethod(presenterClass, name, type, presenterId));
-		}
-		return providers;
-	}
-
-	private static void bindProvidersToFields(List<TargetPresenterField> fields,
-	                                          List<PresenterProviderMethod> presenterProviders) {
-		if (fields.isEmpty() || presenterProviders.isEmpty()) {
-			return;
-		}
-
-		for (PresenterProviderMethod presenterProvider : presenterProviders) {
-			TypeMirror providerTypeMirror = presenterProvider.getClazz().asElement().asType();
-
-			for (TargetPresenterField field : fields) {
-				if ((field.getClazz()).equals(providerTypeMirror)) {
-					if (field.getPresenterType() != presenterProvider.getPresenterType()) {
-						continue;
-					}
-
-					if (field.getTag() == null && presenterProvider.getTag() != null) {
-						continue;
-					}
-					if (field.getTag() != null && !field.getTag().equals(presenterProvider.getTag())) {
-						continue;
-					}
-
-					if (field.getPresenterId() == null && presenterProvider.getPresenterId() != null) {
-						continue;
-					}
-					if (field.getPresenterId() != null && !field.getPresenterId().equals(presenterProvider.getPresenterId())) {
-						continue;
-					}
-
-					field.setPresenterProviderMethodName(presenterProvider.getName());
-				}
-			}
-
-		}
-	}
-
-	private static void bindTagProvidersToFields(List<TargetPresenterField> fields,
-	                                             List<TagProviderMethod> tagProviders) {
-		if (fields.isEmpty() || tagProviders.isEmpty()) {
-			return;
-		}
-
-		for (TagProviderMethod tagProvider : tagProviders) {
-			for (TargetPresenterField field : fields) {
-				if ((field.getClazz()).equals(tagProvider.getPresenterClass())) {
-					if (field.getPresenterType() != tagProvider.getType()) {
-						continue;
-					}
-
-					if (field.getPresenterId() == null && tagProvider.getPresenterId() != null) {
-						continue;
-					}
-					if (field.getPresenterId() != null && !field.getPresenterId().equals(tagProvider.getPresenterId())) {
-						continue;
-					}
-
-					field.setPresenterTagProviderMethodName(tagProvider.getMethodName());
-				}
-			}
-		}
-	}
+        for (Element element : presentersContainer.getEnclosedElements()) {
+            if (element.getKind() != ElementKind.METHOD) {
+                continue;
+            }
+
+            final ExecutableElement providerMethod = (ExecutableElement) element;
+
+            final AnnotationMirror annotation = Util.getAnnotation(element, PROVIDE_PRESENTER_ANNOTATION);
+
+            if (annotation == null) {
+                continue;
+            }
+
+            final String name = providerMethod.getSimpleName().toString();
+            final DeclaredType kind = ((DeclaredType) providerMethod.getReturnType());
+
+            String tag = Util.getAnnotationValueAsString(annotation, "tag");
+            String presenterId = Util.getAnnotationValueAsString(annotation, "presenterId");
+
+            providers.add(new PresenterProviderMethod(kind, name, tag, presenterId));
+        }
+        return providers;
+    }
+
+    private static List<TagProviderMethod> collectTagProviders(TypeElement presentersContainer) {
+        List<TagProviderMethod> providers = new ArrayList<>();
+
+        for (Element element : presentersContainer.getEnclosedElements()) {
+            if (element.getKind() != ElementKind.METHOD) {
+                continue;
+            }
+
+            final ExecutableElement providerMethod = (ExecutableElement) element;
+
+            final AnnotationMirror annotation = Util.getAnnotation(element, PROVIDE_PRESENTER_TAG_ANNOTATION);
+
+            if (annotation == null) {
+                continue;
+            }
+
+            final String name = providerMethod.getSimpleName().toString();
+
+            TypeMirror presenterClass = Util.getAnnotationValueAsTypeMirror(annotation, "presenterClass");
+            String type = Util.getAnnotationValueAsString(annotation, "type");
+            String presenterId = Util.getAnnotationValueAsString(annotation, "presenterId");
+
+            providers.add(new TagProviderMethod(presenterClass, name, type, presenterId));
+        }
+        return providers;
+    }
+
+    private static void bindProvidersToFields(List<TargetPresenterField> fields,
+            List<PresenterProviderMethod> presenterProviders) {
+        if (fields.isEmpty() || presenterProviders.isEmpty()) {
+            return;
+        }
+
+        for (PresenterProviderMethod presenterProvider : presenterProviders) {
+            TypeMirror providerTypeMirror = presenterProvider.getClazz().asElement().asType();
+
+            for (TargetPresenterField field : fields) {
+                if ((field.getClazz()).equals(providerTypeMirror)) {
+                    if (field.getTag() == null && presenterProvider.getTag() != null) {
+                        continue;
+                    }
+                    if (field.getTag() != null && !field.getTag().equals(presenterProvider.getTag())) {
+                        continue;
+                    }
+
+                    if (field.getPresenterId() == null && presenterProvider.getPresenterId() != null) {
+                        continue;
+                    }
+                    if (field.getPresenterId() != null && !field.getPresenterId().equals(presenterProvider.getPresenterId())) {
+                        continue;
+                    }
+
+                    field.setPresenterProviderMethodName(presenterProvider.getName());
+                }
+            }
+
+        }
+    }
+
+    private static void bindTagProvidersToFields(List<TargetPresenterField> fields,
+            List<TagProviderMethod> tagProviders) {
+        if (fields.isEmpty() || tagProviders.isEmpty()) {
+            return;
+        }
+
+        for (TagProviderMethod tagProvider : tagProviders) {
+            for (TargetPresenterField field : fields) {
+                if ((field.getClazz()).equals(tagProvider.getPresenterClass())) {
+                    if (field.getPresenterId() == null && tagProvider.getPresenterId() != null) {
+                        continue;
+                    }
+                    if (field.getPresenterId() != null && !field.getPresenterId().equals(tagProvider.getPresenterId())) {
+                        continue;
+                    }
+
+                    field.setPresenterTagProviderMethodName(tagProvider.getMethodName());
+                }
+            }
+        }
+    }
 }
diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/PresenterBinderClassGenerator.java b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/PresenterBinderClassGenerator.java
index 1165499e..7de4b91b 100644
--- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/PresenterBinderClassGenerator.java
+++ b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/PresenterBinderClassGenerator.java
@@ -50,129 +50,128 @@
  */
 public final class PresenterBinderClassGenerator extends JavaFilesGenerator<TargetClassInfo> {
 
-	@Override
-	public List<JavaFile> generate(TargetClassInfo targetClassInfo) {
-		ClassName targetClassName = targetClassInfo.getName();
-		List<TargetPresenterField> fields = targetClassInfo.getFields();
-
-		final String containerSimpleName = String.join("$", targetClassName.simpleNames());
-
-		TypeSpec.Builder classBuilder = TypeSpec.classBuilder(containerSimpleName + MvpProcessor.PRESENTER_BINDER_SUFFIX)
-				.addModifiers(Modifier.PUBLIC)
-				.superclass(ParameterizedTypeName.get(ClassName.get(PresenterBinder.class), targetClassName));
-
-		for (TargetPresenterField field : fields) {
-			classBuilder.addType(generatePresenterBinderClass(field, targetClassName));
-		}
-
-		classBuilder.addMethod(generateGetPresentersMethod(fields, targetClassName));
-
-		JavaFile javaFile = JavaFile.builder(targetClassName.packageName(), classBuilder.build())
-				.indent("\t")
-				.build();
-		return Collections.singletonList(javaFile);
-	}
-
-	private static MethodSpec generateGetPresentersMethod(List<TargetPresenterField> fields,
-	                                                      ClassName containerClassName) {
-		MethodSpec.Builder builder = MethodSpec.methodBuilder("getPresenterFields")
-				.addAnnotation(Override.class)
-				.addModifiers(Modifier.PUBLIC)
-				.returns(ParameterizedTypeName.get(
-						ClassName.get(List.class), ParameterizedTypeName.get(
-								ClassName.get(PresenterField.class), containerClassName)));
-
-		builder.addStatement("$T<$T<$T>> presenters = new $T<>($L)",
-				List.class, PresenterField.class, containerClassName,
-				ArrayList.class, fields.size());
-
-		for (TargetPresenterField field : fields) {
-			builder.addStatement("presenters.add(new $L())", field.getGeneratedClassName());
-		}
-
-		builder.addStatement("return presenters");
-
-		return builder.build();
-	}
-
-	private static TypeSpec generatePresenterBinderClass(TargetPresenterField field,
-	                                                     ClassName targetClassName) {
-		String tag = field.getTag();
-		if (tag == null) tag = field.getName();
-
-		TypeSpec.Builder classBuilder = TypeSpec.classBuilder(field.getGeneratedClassName())
-				.addModifiers(Modifier.PUBLIC)
-				.superclass(ParameterizedTypeName.get(
-						ClassName.get(PresenterField.class), targetClassName))
-				.addMethod(generatePresenterBinderConstructor(field, tag))
-				.addMethod(generateBindMethod(field, targetClassName))
-				.addMethod(generateProvidePresenterMethod(field, targetClassName));
-
-		String tagProviderMethodName = field.getPresenterTagProviderMethodName();
-		if (tagProviderMethodName != null) {
-			classBuilder.addMethod(generateGetTagMethod(tagProviderMethodName, targetClassName));
-		}
-
-		return classBuilder.build();
-	}
-
-	private static MethodSpec generatePresenterBinderConstructor(TargetPresenterField field, String tag) {
-		return MethodSpec.constructorBuilder()
-				.addModifiers(Modifier.PUBLIC)
-				.addStatement("super($S, $T.$L, $S, $T.class)",
-						tag,
-						field.getPresenterType().getDeclaringClass(),
-						field.getPresenterType().name(),
-						field.getPresenterId(),
-						field.getTypeName())
-				.build();
-	}
-
-	private static MethodSpec generateBindMethod(TargetPresenterField field,
-	                                             ClassName targetClassName) {
-		return MethodSpec.methodBuilder("bind")
-				.addAnnotation(Override.class)
-				.addModifiers(Modifier.PUBLIC)
-				.addParameter(targetClassName, "target")
-				.addParameter(MvpPresenter.class, "presenter")
-				.addStatement("target.$L = ($T) presenter", field.getName(), field.getTypeName())
-				.build();
-	}
-
-	private static MethodSpec generateProvidePresenterMethod(TargetPresenterField field,
-	                                                         ClassName targetClassName) {
-		MethodSpec.Builder builder = MethodSpec.methodBuilder("providePresenter")
-				.addAnnotation(Override.class)
-				.addModifiers(Modifier.PUBLIC)
-				.returns(ParameterizedTypeName.get(
-						ClassName.get(MvpPresenter.class), WildcardTypeName.subtypeOf(Object.class)))
-				.addParameter(targetClassName, "delegated");
-
-		if (field.getPresenterProviderMethodName() != null) {
-			builder.addStatement("return delegated.$L()", field.getPresenterProviderMethodName());
-		} else {
-			boolean hasEmptyConstructor = Util.hasEmptyConstructor((TypeElement) ((DeclaredType) field.getClazz()).asElement());
-
-			if (hasEmptyConstructor) {
-				builder.addStatement("return new $T()", field.getTypeName());
-			} else {
-				builder.addStatement(
-						"throw new $T($S + $S)", IllegalStateException.class,
-						field.getClazz(), " has not default constructor. You can apply @ProvidePresenter to some method which will construct Presenter. Also you can make it default constructor");
-			}
-		}
-
-		return builder.build();
-	}
-
-	private static MethodSpec generateGetTagMethod(String tagProviderMethodName,
-	                                               ClassName targetClassName) {
-		return MethodSpec.methodBuilder("getTag")
-				.addAnnotation(Override.class)
-				.addModifiers(Modifier.PUBLIC)
-				.returns(String.class)
-				.addParameter(targetClassName, "delegated")
-				.addStatement("return String.valueOf(delegated.$L())", tagProviderMethodName)
-				.build();
-	}
+    @Override
+    public List<JavaFile> generate(TargetClassInfo targetClassInfo) {
+        ClassName targetClassName = targetClassInfo.getName();
+        List<TargetPresenterField> fields = targetClassInfo.getFields();
+
+        final String containerSimpleName = String.join("$", targetClassName.simpleNames());
+
+        TypeSpec.Builder classBuilder = TypeSpec.classBuilder(containerSimpleName + MvpProcessor.PRESENTER_BINDER_SUFFIX)
+                .addModifiers(Modifier.PUBLIC)
+                .superclass(ParameterizedTypeName.get(ClassName.get(PresenterBinder.class), targetClassName));
+
+        for (TargetPresenterField field : fields) {
+            classBuilder.addType(generatePresenterBinderClass(field, targetClassName));
+        }
+
+        classBuilder.addMethod(generateGetPresentersMethod(fields, targetClassName));
+
+        JavaFile javaFile = JavaFile.builder(targetClassName.packageName(), classBuilder.build())
+                .indent("\t")
+                .build();
+        return Collections.singletonList(javaFile);
+    }
+
+    private static MethodSpec generateGetPresentersMethod(List<TargetPresenterField> fields,
+            ClassName containerClassName) {
+        MethodSpec.Builder builder = MethodSpec.methodBuilder("getPresenterFields")
+                .addAnnotation(Override.class)
+                .addModifiers(Modifier.PUBLIC)
+                .returns(ParameterizedTypeName.get(
+                        ClassName.get(List.class), ParameterizedTypeName.get(
+                                ClassName.get(PresenterField.class), containerClassName)));
+
+        builder.addStatement("$T<$T<$T>> presenters = new $T<>($L)",
+                List.class, PresenterField.class, containerClassName,
+                ArrayList.class, fields.size());
+
+        for (TargetPresenterField field : fields) {
+            builder.addStatement("presenters.add(new $L())", field.getGeneratedClassName());
+        }
+
+        builder.addStatement("return presenters");
+
+        return builder.build();
+    }
+
+    private static TypeSpec generatePresenterBinderClass(TargetPresenterField field,
+            ClassName targetClassName) {
+        String tag = field.getTag();
+        if (tag == null) {
+            tag = field.getName();
+        }
+
+        TypeSpec.Builder classBuilder = TypeSpec.classBuilder(field.getGeneratedClassName())
+                .addModifiers(Modifier.PUBLIC)
+                .superclass(ParameterizedTypeName.get(ClassName.get(PresenterField.class), targetClassName))
+                .addMethod(generatePresenterBinderConstructor(field, tag))
+                .addMethod(generateBindMethod(field, targetClassName))
+                .addMethod(generateProvidePresenterMethod(field, targetClassName));
+
+        String tagProviderMethodName = field.getPresenterTagProviderMethodName();
+        if (tagProviderMethodName != null) {
+            classBuilder.addMethod(generateGetTagMethod(tagProviderMethodName, targetClassName));
+        }
+
+        return classBuilder.build();
+    }
+
+    private static MethodSpec generatePresenterBinderConstructor(TargetPresenterField field, String tag) {
+        return MethodSpec.constructorBuilder()
+                .addModifiers(Modifier.PUBLIC)
+                .addStatement("super($S, $S, $T.class)",
+                        tag,
+                        field.getPresenterId(),
+                        field.getTypeName())
+                .build();
+    }
+
+    private static MethodSpec generateBindMethod(TargetPresenterField field,
+            ClassName targetClassName) {
+        return MethodSpec.methodBuilder("bind")
+                .addAnnotation(Override.class)
+                .addModifiers(Modifier.PUBLIC)
+                .addParameter(targetClassName, "target")
+                .addParameter(MvpPresenter.class, "presenter")
+                .addStatement("target.$L = ($T) presenter", field.getName(), field.getTypeName())
+                .build();
+    }
+
+    private static MethodSpec generateProvidePresenterMethod(TargetPresenterField field,
+            ClassName targetClassName) {
+        MethodSpec.Builder builder = MethodSpec.methodBuilder("providePresenter")
+                .addAnnotation(Override.class)
+                .addModifiers(Modifier.PUBLIC)
+                .returns(ParameterizedTypeName.get(
+                        ClassName.get(MvpPresenter.class), WildcardTypeName.subtypeOf(Object.class)))
+                .addParameter(targetClassName, "delegated");
+
+        if (field.getPresenterProviderMethodName() != null) {
+            builder.addStatement("return delegated.$L()", field.getPresenterProviderMethodName());
+        } else {
+            boolean hasEmptyConstructor = Util.hasEmptyConstructor((TypeElement) ((DeclaredType) field.getClazz()).asElement());
+
+            if (hasEmptyConstructor) {
+                builder.addStatement("return new $T()", field.getTypeName());
+            } else {
+                builder.addStatement(
+                        "throw new $T($S + $S)", IllegalStateException.class,
+                        field.getClazz(), " has not default constructor. You can apply @ProvidePresenter to some method which will construct Presenter. Also you can make it default constructor");
+            }
+        }
+
+        return builder.build();
+    }
+
+    private static MethodSpec generateGetTagMethod(String tagProviderMethodName,
+            ClassName targetClassName) {
+        return MethodSpec.methodBuilder("getTag")
+                .addAnnotation(Override.class)
+                .addModifiers(Modifier.PUBLIC)
+                .returns(String.class)
+                .addParameter(targetClassName, "delegated")
+                .addStatement("return String.valueOf(delegated.$L())", tagProviderMethodName)
+                .build();
+    }
 }
diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/PresenterProviderMethod.java b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/PresenterProviderMethod.java
index 43814cc3..643abb18 100644
--- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/PresenterProviderMethod.java
+++ b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/PresenterProviderMethod.java
@@ -1,24 +1,16 @@
 package com.arellomobile.mvp.compiler.presenterbinder;
 
-import com.arellomobile.mvp.presenter.PresenterType;
-
 import javax.lang.model.type.DeclaredType;
 
 class PresenterProviderMethod {
 	private final DeclaredType clazz;
 	private final String name;
-	private final PresenterType presenterType;
 	private final String tag;
 	private final String presenterId;
 
-	PresenterProviderMethod(DeclaredType clazz, String name, String type, String tag, String presenterId) {
+	PresenterProviderMethod(DeclaredType clazz, String name, String tag, String presenterId) {
 		this.clazz = clazz;
 		this.name = name;
-		if (type == null) {
-			presenterType = PresenterType.LOCAL;
-		} else {
-			presenterType = PresenterType.valueOf(type);
-		}
 		this.tag = tag;
 		this.presenterId = presenterId;
 	}
@@ -31,10 +23,6 @@ String getName() {
 		return name;
 	}
 
-	PresenterType getPresenterType() {
-		return presenterType;
-	}
-
 	String getTag() {
 		return tag;
 	}
diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/TargetPresenterField.java b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/TargetPresenterField.java
index 71b419e4..d1a52266 100644
--- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/TargetPresenterField.java
+++ b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/TargetPresenterField.java
@@ -1,85 +1,77 @@
 package com.arellomobile.mvp.compiler.presenterbinder;
 
 import com.arellomobile.mvp.MvpProcessor;
-import com.arellomobile.mvp.presenter.PresenterType;
 import com.squareup.javapoet.ParameterizedTypeName;
 import com.squareup.javapoet.TypeName;
 
 import javax.lang.model.type.TypeMirror;
 
 class TargetPresenterField {
-	private final TypeMirror clazz;
-	private final boolean isParametrized;
-	private final TypeName typeName;
-	private final String name;
-	private final PresenterType presenterType;
-	private final String tag;
-	private final String presenterId;
-
-	private String presenterProviderMethodName;
-	private String presenterTagProviderMethodName;
-
-	TargetPresenterField(TypeMirror clazz,
-	                     String name,
-	                     String presenterType,
-	                     String tag,
-	                     String presenterId) {
-		this.clazz = clazz;
-		this.isParametrized = TypeName.get(clazz) instanceof ParameterizedTypeName;
-		this.typeName = isParametrized ? ((ParameterizedTypeName) TypeName.get(clazz)).rawType : TypeName.get(clazz);
-		this.name = name;
-		this.tag = tag;
-
-		if (presenterType == null) {
-			this.presenterType = PresenterType.LOCAL;
-		} else {
-			this.presenterType = PresenterType.valueOf(presenterType);
-		}
-
-		this.presenterId = presenterId;
-	}
-
-	TypeMirror getClazz() {
-		return clazz;
-	}
-
-	TypeName getTypeName() {
-		return typeName;
-	}
-
-	String getGeneratedClassName() {
-		return name + MvpProcessor.PRESENTER_BINDER_INNER_SUFFIX;
-	}
-
-	String getTag() {
-		return tag;
-	}
-
-	String getName() {
-		return name;
-	}
-
-	PresenterType getPresenterType() {
-		return presenterType;
-	}
-
-	String getPresenterId() {
-		return presenterId;
-	}
-
-	String getPresenterProviderMethodName() {
-		return presenterProviderMethodName;
-	}
-
-	void setPresenterProviderMethodName(String presenterProviderMethodName) {
-		this.presenterProviderMethodName = presenterProviderMethodName;
-	}
-
-	String getPresenterTagProviderMethodName() {
-		return presenterTagProviderMethodName;
-	}
-
-	void setPresenterTagProviderMethodName(String presenterTagProviderMethodName) {
-		this.presenterTagProviderMethodName = presenterTagProviderMethodName;
-	}
+    private final TypeMirror clazz;
+
+    private final boolean isParametrized;
+
+    private final TypeName typeName;
+
+    private final String name;
+
+    private final String tag;
+
+    private final String presenterId;
+
+    private String presenterProviderMethodName;
+
+    private String presenterTagProviderMethodName;
+
+    TargetPresenterField(TypeMirror clazz,
+            String name,
+            String tag,
+            String presenterId) {
+        this.clazz = clazz;
+        this.isParametrized = TypeName.get(clazz) instanceof ParameterizedTypeName;
+        this.typeName = isParametrized ? ((ParameterizedTypeName) TypeName.get(clazz)).rawType : TypeName.get(clazz);
+        this.name = name;
+        this.tag = tag;
+        this.presenterId = presenterId;
+    }
+
+    TypeMirror getClazz() {
+        return clazz;
+    }
+
+    TypeName getTypeName() {
+        return typeName;
+    }
+
+    String getGeneratedClassName() {
+        return name + MvpProcessor.PRESENTER_BINDER_INNER_SUFFIX;
+    }
+
+    String getTag() {
+        return tag;
+    }
+
+    String getName() {
+        return name;
+    }
+
+    String getPresenterId() {
+        return presenterId;
+    }
+
+    String getPresenterProviderMethodName() {
+        return presenterProviderMethodName;
+    }
+
+    void setPresenterProviderMethodName(String presenterProviderMethodName) {
+        this.presenterProviderMethodName = presenterProviderMethodName;
+    }
+
+    String getPresenterTagProviderMethodName() {
+        return presenterTagProviderMethodName;
+    }
+
+    void setPresenterTagProviderMethodName(String presenterTagProviderMethodName) {
+        this.presenterTagProviderMethodName = presenterTagProviderMethodName;
+    }
 }
diff --git a/moxy/build.gradle b/moxy/build.gradle
index 5bb983cb..ac21c717 100644
--- a/moxy/build.gradle
+++ b/moxy/build.gradle
@@ -76,15 +76,15 @@ def getBasePom() {
             version targetVersionName
             name 'Moxy'
             modelVersion = '4.0.0'
-            description = 'MoxyX, we added X for make this library coolest'
+            description = 'POM_DESCRIPTION'
             url = 'https://schoolhelper.tech/'
             //   packaging = 'jar'  //doesn't work from box, implement it manualy
 
             inceptionYear '2016'
             licenses {
                 license {
-                    name 'The Apache Software License, Version 2.0'
-                    url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    name 'POM_LICENCE_NAME'
+                    url 'POM_LICENCE_URL'
                     distribution 'repo'
                 }
             }
@@ -111,9 +111,9 @@ def getBasePom() {
             }
 
             scm {
-                connection 'scm:git@github.com:jordan1997/Moxy.git'
-                developerConnection 'scm:git@github.com:jordan1997/Moxy.git'
-                url 'https://github.com/jordan1997/Moxy'
+                connection 'POM_SCM_CONNECTION'
+                developerConnection 'POM_SCM_CONNECTION'
+                url 'POM_URL'
             }
         }.withXml {
             asNode().appendNode('packaging', 'jar')
diff --git a/moxy/src/main/java/com/arellomobile/mvp/GenerateViewState.java b/moxy/src/main/java/com/arellomobile/mvp/GenerateViewState.java
deleted file mode 100644
index c31dc24d..00000000
--- a/moxy/src/main/java/com/arellomobile/mvp/GenerateViewState.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.arellomobile.mvp;
-
-import java.lang.annotation.Target;
-
-
-import static java.lang.annotation.ElementType.TYPE;
-
-/**
- * <p>Generate view state class for annotated view interface.</p>
- * <p>Generated class implements this view interface.</p>
- *
- * @deprecated As of release 0.4.1, {@link InjectViewState} generate view state, if it needed
- */
-@Target(value = TYPE)
-@Deprecated
-public @interface GenerateViewState {
-}
diff --git a/moxy/src/main/java/com/arellomobile/mvp/MvpDelegate.java b/moxy/src/main/java/com/arellomobile/mvp/MvpDelegate.java
index ba8a674b..7b77eb04 100644
--- a/moxy/src/main/java/com/arellomobile/mvp/MvpDelegate.java
+++ b/moxy/src/main/java/com/arellomobile/mvp/MvpDelegate.java
@@ -1,13 +1,11 @@
 package com.arellomobile.mvp;
 
+import android.os.Bundle;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import android.os.Bundle;
-
-import com.arellomobile.mvp.presenter.PresenterType;
-
 /**
  * Date: 18-Dec-15
  * Time: 13:51
@@ -212,7 +210,7 @@ public void onDestroy() {
 		Set<MvpPresenter> allChildPresenters = presentersCounter.getAll(mDelegateTag);
 		for (MvpPresenter presenter : allChildPresenters) {
 			boolean isRejected = presentersCounter.rejectPresenter(presenter, mDelegateTag);
-			if (isRejected && presenter.getPresenterType() != PresenterType.GLOBAL) {
+			if (isRejected) {
 				presenterStore.remove(presenter.getTag());
 				presenter.onDestroy();
 			}
diff --git a/moxy/src/main/java/com/arellomobile/mvp/MvpPresenter.java b/moxy/src/main/java/com/arellomobile/mvp/MvpPresenter.java
index 7b04d604..86f5ce75 100644
--- a/moxy/src/main/java/com/arellomobile/mvp/MvpPresenter.java
+++ b/moxy/src/main/java/com/arellomobile/mvp/MvpPresenter.java
@@ -1,12 +1,11 @@
 package com.arellomobile.mvp;
 
+import com.arellomobile.mvp.viewstate.MvpViewState;
+
 import java.util.Collections;
 import java.util.Set;
 import java.util.WeakHashMap;
 
-import com.arellomobile.mvp.presenter.PresenterType;
-import com.arellomobile.mvp.viewstate.MvpViewState;
-
 /**
  * Date: 15.12.2015
  * Time: 19:31
@@ -18,7 +17,6 @@
 public abstract class MvpPresenter<View extends MvpView> {
 	private boolean mFirstLaunch = true;
 	private String mTag;
-	private PresenterType mPresenterType;
 	private Set<View> mViews;
 	private View mViewStateAsView;
 	private MvpViewState<View> mViewState;
@@ -124,15 +122,7 @@ public boolean isInRestoreState(View view) {
 	@SuppressWarnings({"unchecked", "unused"})
 	public void setViewState(MvpViewState<View> viewState) {
 		mViewStateAsView = (View) viewState;
-		mViewState = (MvpViewState) viewState;
-	}
-
-	PresenterType getPresenterType() {
-		return mPresenterType;
-	}
-
-	void setPresenterType(PresenterType presenterType) {
-		mPresenterType = presenterType;
+		mViewState = viewState;
 	}
 
 	String getTag() {
diff --git a/moxy/src/main/java/com/arellomobile/mvp/MvpProcessor.java b/moxy/src/main/java/com/arellomobile/mvp/MvpProcessor.java
index 0034123b..a697fc1a 100644
--- a/moxy/src/main/java/com/arellomobile/mvp/MvpProcessor.java
+++ b/moxy/src/main/java/com/arellomobile/mvp/MvpProcessor.java
@@ -1,12 +1,11 @@
 package com.arellomobile.mvp;
 
+import com.arellomobile.mvp.presenter.PresenterField;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import com.arellomobile.mvp.presenter.PresenterField;
-import com.arellomobile.mvp.presenter.PresenterType;
-
 /**
  * Date: 18-Dec-15
  * Time: 13:16
@@ -34,13 +33,8 @@ private <Delegated> MvpPresenter<? super Delegated> getMvpPresenter(Delegated ta
 		Class<? extends MvpPresenter> presenterClass = presenterField.getPresenterClass();
 		PresenterStore presenterStore = MvpFacade.getInstance().getPresenterStore();
 
-		PresenterType type = presenterField.getPresenterType();
-		String tag;
-		if (type == PresenterType.LOCAL) {
-			tag = delegateTag + "$" + presenterField.getTag(target);
-		} else {
-			tag = presenterField.getTag(target);
-		}
+		String tag = delegateTag + "$" + presenterField.getTag(target);
+
 
 		//noinspection unchecked
 		MvpPresenter<? super Delegated> presenter = presenterStore.get(tag);
@@ -55,7 +49,6 @@ private <Delegated> MvpPresenter<? super Delegated> getMvpPresenter(Delegated ta
 			return null;
 		}
 
-		presenter.setPresenterType(type);
 		presenter.setTag(tag);
 		presenter.setPresenterClass(presenterClass);
 		presenterStore.add(tag, presenter);
diff --git a/moxy/src/main/java/com/arellomobile/mvp/Pair.java b/moxy/src/main/java/com/arellomobile/mvp/Pair.java
deleted file mode 100644
index 243aa53f..00000000
--- a/moxy/src/main/java/com/arellomobile/mvp/Pair.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.arellomobile.mvp;
-
-/**
- * Container to ease passing around a tuple of two objects. This object provides a sensible
- * implementation of equals(), returning true if equals() is true on each of the contained
- * objects.
- */
-public class Pair<F, S> {
-	public final F first;
-	public final S second;
-
-	/**
-	 * Constructor for a Pair.
-	 *
-	 * @param first  the first object in the Pair
-	 * @param second the second object in the pair
-	 */
-	public Pair(F first, S second) {
-		this.first = first;
-		this.second = second;
-	}
-
-	/**
-	 * Checks the two objects for equality by delegating to their respective
-	 * {@link Object#equals(Object)} methods.
-	 *
-	 * @param o the {@link Pair} to which this one is to be checked for equality
-	 * @return true if the underlying objects of the Pair are both considered
-	 * equal
-	 */
-	@Override
-	public boolean equals(Object o) {
-		if (!(o instanceof Pair)) {
-			return false;
-		}
-		Pair<?, ?> p = (Pair<?, ?>) o;
-		return objectsEqual(p.first, first) && objectsEqual(p.second, second);
-	}
-
-	private static boolean objectsEqual(Object a, Object b) {
-		return (a == null) ? (b == null) : a.equals(b);
-	}
-
-	/**
-	 * Compute a hash code using the hash codes of the underlying objects
-	 *
-	 * @return a hashcode of the Pair
-	 */
-	@Override
-	public int hashCode() {
-		return (first == null ? 0 : first.hashCode()) ^ (second == null ? 0 : second.hashCode());
-	}
-
-	/**
-	 * Convenience method for creating an appropriately typed pair.
-	 *
-	 * @param <A> first entry type
-	 * @param <B> second entry type
-	 * @param a   the first object in the Pair
-	 * @param b   the second object in the pair
-	 * @return a Pair that is templatized with the types of a and b
-	 */
-	public static <A, B> Pair<A, B> create(A a, B b) {
-		return new Pair<A, B>(a, b);
-	}
-}
\ No newline at end of file
diff --git a/moxy/src/main/java/com/arellomobile/mvp/presenter/PresenterField.java b/moxy/src/main/java/com/arellomobile/mvp/presenter/PresenterField.java
index cf434d10..1708f9ac 100644
--- a/moxy/src/main/java/com/arellomobile/mvp/presenter/PresenterField.java
+++ b/moxy/src/main/java/com/arellomobile/mvp/presenter/PresenterField.java
@@ -10,36 +10,33 @@
  * @author Yuri Shmakov
  */
 public abstract class PresenterField<PresentersContainer> {
-	protected final String tag;
-	protected final PresenterType presenterType;
-	protected final String presenterId;
-	protected final Class<? extends MvpPresenter> presenterClass;
-
-	protected PresenterField(String tag, PresenterType presenterType, String presenterId, Class<? extends MvpPresenter> presenterClass) {
-		this.tag = tag;
-		this.presenterType = presenterType;
-		this.presenterId = presenterId;
-		this.presenterClass = presenterClass;
-	}
-
-	public abstract void bind(PresentersContainer container, MvpPresenter presenter);
-
-	// Delegated may be used from generated code if user plane to generate tag at runtime
-	public String getTag(PresentersContainer delegated) {
-		return tag;
-	}
-
-	public PresenterType getPresenterType() {
-		return presenterType;
-	}
-
-	public String getPresenterId() {
-		return presenterId;
-	}
-
-	public Class<? extends MvpPresenter> getPresenterClass() {
-		return presenterClass;
-	}
-
-	public abstract MvpPresenter<?> providePresenter(PresentersContainer delegated);
+
+    protected final String tag;
+
+    protected final String presenterId;
+
+    protected final Class<? extends MvpPresenter> presenterClass;
+
+    protected PresenterField(String tag, String presenterId, Class<? extends MvpPresenter> presenterClass) {
+        this.tag = tag;
+        this.presenterId = presenterId;
+        this.presenterClass = presenterClass;
+    }
+
+    public abstract void bind(PresentersContainer container, MvpPresenter presenter);
+
+    // Delegated may be used from generated code if user plane to generate tag at runtime
+    public String getTag(PresentersContainer delegated) {
+        return tag;
+    }
+
+    public String getPresenterId() {
+        return presenterId;
+    }
+
+    public Class<? extends MvpPresenter> getPresenterClass() {
+        return presenterClass;
+    }
+
+    public abstract MvpPresenter<?> providePresenter(PresentersContainer delegated);
 }
diff --git a/moxy/src/main/java/com/arellomobile/mvp/presenter/PresenterType.java b/moxy/src/main/java/com/arellomobile/mvp/presenter/PresenterType.java
deleted file mode 100644
index fbc886bc..00000000
--- a/moxy/src/main/java/com/arellomobile/mvp/presenter/PresenterType.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.arellomobile.mvp.presenter;
-
-import com.arellomobile.mvp.MvpPresenter;
-
-/**
- * Available presenter types. Manually lifetime control are available over {@link com.arellomobile.mvp.PresenterStore}, {@link com.arellomobile.mvp.PresentersCounter} and {@link MvpPresenter#onDestroy()}
- * <p>
- * Date: 17-Dec-15
- * Time: 19:31
- *
- * @author Yuri Shmakov
- * @author Alexander Blinov
- */
-public enum PresenterType {
-	/**
-	 * Local presenter are not available out of injectable object
-	 */
-	LOCAL,
-	/**
-	 * Weak presenters are available everywhere. Weak presenter will be destroyed when finished all views. Inject will create new presenter instance.
-	 */
-	WEAK,
-	/**
-	 * Global presenter will be destroyed only when process will be killed({@link MvpPresenter#onDestroy()} won't be called)
-	 */
-	GLOBAL
-}
diff --git a/moxy/src/main/java/com/arellomobile/mvp/presenter/ProvidePresenter.java b/moxy/src/main/java/com/arellomobile/mvp/presenter/ProvidePresenter.java
index 0822140b..0bcb7200 100644
--- a/moxy/src/main/java/com/arellomobile/mvp/presenter/ProvidePresenter.java
+++ b/moxy/src/main/java/com/arellomobile/mvp/presenter/ProvidePresenter.java
@@ -29,7 +29,5 @@
 
 	String tag() default EMPTY;
 
-	PresenterType type() default PresenterType.LOCAL;
-
 	String presenterId() default EMPTY;
 }
diff --git a/moxy/src/test/java/com/arellomobile/mvp/view/DelegateLocalPresenter2TestView.java b/moxy/src/test/java/com/arellomobile/mvp/view/DelegateLocalPresenter2TestView.java
deleted file mode 100644
index 52139b52..00000000
--- a/moxy/src/test/java/com/arellomobile/mvp/view/DelegateLocalPresenter2TestView.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.arellomobile.mvp.view;
-
-import com.arellomobile.mvp.presenter.InjectPresenter;
-import com.arellomobile.mvp.presenter.InjectViewStatePresenter;
-import com.arellomobile.mvp.presenter.PresenterType;
-
-public class DelegateLocalPresenter2TestView extends CounterTestView {
-	@InjectPresenter(type = PresenterType.LOCAL)
-	public InjectViewStatePresenter mInjectViewStatePresenter;
-}
\ No newline at end of file
diff --git a/moxy/src/test/java/com/arellomobile/mvp/view/DelegateLocalPresenterTestView.java b/moxy/src/test/java/com/arellomobile/mvp/view/DelegateLocalPresenterTestView.java
index f48ed4d5..329ed045 100644
--- a/moxy/src/test/java/com/arellomobile/mvp/view/DelegateLocalPresenterTestView.java
+++ b/moxy/src/test/java/com/arellomobile/mvp/view/DelegateLocalPresenterTestView.java
@@ -2,9 +2,8 @@
 
 import com.arellomobile.mvp.presenter.InjectPresenter;
 import com.arellomobile.mvp.presenter.InjectViewStatePresenter;
-import com.arellomobile.mvp.presenter.PresenterType;
 
 public class DelegateLocalPresenterTestView extends CounterTestView {
-	@InjectPresenter(type = PresenterType.LOCAL)
-	public InjectViewStatePresenter mInjectViewStatePresenter;
+    @InjectPresenter
+    public InjectViewStatePresenter mInjectViewStatePresenter;
 }
\ No newline at end of file

From b97769fc4e03b291320936fb30bd163ed95f82cc Mon Sep 17 00:00:00 2001
From: Volodymyr <vovochkastelmashchuk@gmail.com>
Date: Sun, 3 Mar 2019 18:04:14 +0200
Subject: [PATCH 28/35] Add android arsenal bange

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index a3db6bce..14694857 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,8 @@ 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!

From 297294a7f9cb130101910a52d59fa3b5b49013f5 Mon Sep 17 00:00:00 2001
From: Volodymyr <vovochkastelmashchuk@gmail.com>
Date: Tue, 5 Mar 2019 11:30:27 +0200
Subject: [PATCH 29/35] Update README.md

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 14694857..b40e2c23 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,11 @@ 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 beetween us and root project
+1. We support androidX
+2. We will remove GLOBAL and WEAK preseter type from the library
+3. Starategy which work by tag, will be added to main package. 
+
 ## Capabilities
 
 Moxy has a few killer features in other ways:

From 7f6802acc5ff07553ba9b65e56f8418a661b8d01 Mon Sep 17 00:00:00 2001
From: Volodymyr <vovochkastelmashchuk@gmail.com>
Date: Tue, 5 Mar 2019 14:53:27 +0200
Subject: [PATCH 30/35] Update README.md

---
 README.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index b40e2c23..a57139e1 100644
--- a/README.md
+++ b/README.md
@@ -11,12 +11,14 @@ Moxy is a library that helps to use MVP pattern when you do the Android Applicat
 
 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 beetween us and root project
+## Diff between us and root project
 1. We support androidX
 2. We will remove GLOBAL and WEAK preseter type from the library
-3. Starategy which work by tag, will be added to main package. 
+3. Starategy which work by tag, will be added to main package.
+4. We will change the template for android studio (and intelij), 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.
 
 ## Capabilities
 
@@ -72,7 +74,7 @@ public class HelloWorldActivity extends MvpAppCompatActivity implements HelloWor
 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. 
+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/jordan1997/Moxy/tree/develop/moxy-templates)
 

From b25896df81f2e575deeed6c4a3d4f8b950aa820e Mon Sep 17 00:00:00 2001
From: Vova Stelmashchuk <vovochkastelmashchuk@gmail.com>
Date: Wed, 6 Mar 2019 00:20:15 +0200
Subject: [PATCH 31/35] remove presenter type and add material mvp

---
 build.gradle                                  |   2 +-
 makegpg.sh                                    |  25 +-
 moxy-android/build.gradle                     |   2 +-
 .../com/androidxsample/MainPresenter.kt       |   2 -
 moxy-androidx/build.gradle                    |  16 +-
 moxy-app-compat/build.gradle                  |   2 +-
 moxy-app-compat/stub-appcompat/build.gradle   |   2 +-
 moxy-compiler/build.gradle                    |   2 +-
 .../presenterbinder/TagProviderMethod.java    |  56 ++---
 moxy-material/build.gradle                    | 238 ++++++++++++++++++
 .../mvp/MvpBottomSheetDialogFragment.java     |  96 +++++++
 moxy-material/stub-material/build.gradle      |   9 +
 .../BottomSheetDialogFragment.java            |  38 +++
 moxy/build.gradle                             |   2 +-
 .../mvp/presenter/InjectPresenter.java        |   2 -
 .../mvp/presenter/ProvidePresenterTag.java    |   6 +-
 .../mvp/viewstate/ViewCommand.java            |  27 +-
 .../strategy/AddToEndSingleStrategy.java      |  38 +--
 .../strategy/AddToEndSingleTagStrategy.java   |  34 +++
 .../ProvideMethodsTest.java                   |  56 ++---
 .../TwoWeakWithDiffPresenterIdView.java       |  44 ----
 .../TwoWeakWithSamePresenterIdView.java       |  34 ---
 .../resources/WeakProvidedView.java           |  27 --
 .../com/arellomobile/mvp/view/ChildView.java  |  18 --
 .../mvp/view/DelegateGlobalTestView.java      |  12 -
 .../com/arellomobile/mvp/view/ParentView.java |  23 --
 .../launch/AddToEndSingleTagStrategy.kt       |  47 ++--
 settings.gradle                               |   9 +-
 28 files changed, 546 insertions(+), 323 deletions(-)
 create mode 100755 moxy-material/build.gradle
 create mode 100644 moxy-material/src/main/java/com/arellomobile/mvp/MvpBottomSheetDialogFragment.java
 create mode 100755 moxy-material/stub-material/build.gradle
 create mode 100644 moxy-material/stub-material/src/main/java/com/google/android/material/bottomsheet/BottomSheetDialogFragment.java
 create mode 100644 moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/AddToEndSingleTagStrategy.java
 delete mode 100644 moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/TwoWeakWithDiffPresenterIdView.java
 delete mode 100644 moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/TwoWeakWithSamePresenterIdView.java
 delete mode 100644 moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/WeakProvidedView.java
 delete mode 100644 moxy/src/test/java/com/arellomobile/mvp/view/ChildView.java
 delete mode 100644 moxy/src/test/java/com/arellomobile/mvp/view/DelegateGlobalTestView.java
 delete mode 100644 moxy/src/test/java/com/arellomobile/mvp/view/ParentView.java

diff --git a/build.gradle b/build.gradle
index 30120205..0806d21a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ allprojects {
 
 ext {
     targetVersionCode = 47
-    targetVersionName = "1.5.7"
+    targetVersionName = "1.6.0-beta"
 
     deps = [
             android       : 'com.google.android:android:1.6_r2',
diff --git a/makegpg.sh b/makegpg.sh
index 3745680a..564b3f5f 100755
--- a/makegpg.sh
+++ b/makegpg.sh
@@ -1,17 +1,25 @@
 #!/usr/bin/env bash
 
+rm -rf moxy-material/artifacts-maven
+rm -rf moxy-compiler/artifacts-maven
+rm -rf moxy-app-compat/artifacts-maven
+rm -rf moxy-androidx/artifacts-maven
+rm -rf moxy-android/artifacts-maven
+rm -rf moxy/artifacts-maven
+
+echo "artifacts was clean"
+
 ./gradlew moxy-x:assemble
 ./gradlew moxy-x-android:assemble
 ./gradlew moxy-x-androidx:assemble
 ./gradlew moxy-x-app-compat:assemble
 ./gradlew moxy-x-compile:assemble
+./gradlew moxy-x-material:assemble
 
 echo "artifacts built"
 
 cd moxy/artifacts-maven
 
-pwd
-
 gpg2 -ab moxy-x-javadoc.jar
 gpg2 -ab moxy-x-sources.jar
 gpg2 -ab moxy-x.jar
@@ -61,4 +69,15 @@ gpg2 -ab moxy-x-compiler-sources.jar
 gpg2 -ab moxy-x-compiler.jar
 gpg2 -ab moxy-x-compiler.pom
 
-echo "gpg for moxy-x-app-compiler built"
\ No newline at end of file
+echo "gpg for moxy-x-app-compiler built"
+
+cd .. && cd ..
+
+cd moxy-material/artifacts-maven
+
+gpg2 -ab moxy-x-material-javadoc.jar
+gpg2 -ab moxy-x-material-sources.jar
+gpg2 -ab moxy-x-material.jar
+gpg2 -ab moxy-x-material.pom
+
+echo "gpg for moxy-x-material built"
\ No newline at end of file
diff --git a/moxy-android/build.gradle b/moxy-android/build.gradle
index 4a68e41b..cadcf657 100644
--- a/moxy-android/build.gradle
+++ b/moxy-android/build.gradle
@@ -74,7 +74,7 @@ def getBasePom(String libName) {
             name 'Moxy-android'
             modelVersion = '4.0.0'
             description = 'POM_DESCRIPTION'
-            url = 'https://schoolhelper.tech/'
+            url = 'URL'
             packaging = 'jar'
 
             inceptionYear '2016'
diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainPresenter.kt b/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainPresenter.kt
index fb631cba..a550a85e 100644
--- a/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainPresenter.kt
+++ b/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainPresenter.kt
@@ -6,11 +6,9 @@ import com.arellomobile.mvp.MvpPresenter
 
 @InjectViewState
 class MainPresenter : MvpPresenter<MainView>() {
-	
 	override fun onFirstViewAttach() {
 		super.onFirstViewAttach()
 		Log.e(MainActivity.TAG, "presenter hash code : ${hashCode()}")
 		viewState.printLog("TEST")
 	}
-	
 }
\ No newline at end of file
diff --git a/moxy-androidx/build.gradle b/moxy-androidx/build.gradle
index c762c93c..15a31b9d 100755
--- a/moxy-androidx/build.gradle
+++ b/moxy-androidx/build.gradle
@@ -74,7 +74,7 @@ def getBasePom(String libName) {
             name 'Moxy-androidx'
             modelVersion = '4.0.0'
             description = 'MoxyX, we added X for make this librayr coolest'
-            url = 'https://schoolhelper.tech/'
+            url = 'URL'
             packaging = 'jar'
 
             inceptionYear '2016'
@@ -87,23 +87,11 @@ def getBasePom(String libName) {
             }
 
             developers {
-                developer {
-                    name 'Blinov Alexander'
-                    email 'xanderblinov@gmail.com'
-                    organization = 'Arello Mobile'
-                    organizationUrl 'http://www.arello-mobile.com/'
-                }
-                developer {
-                    name 'Shmakov Yuri'
-                    email 'senneco@gmail.com'
-                    organization = 'Arello Mobile'
-                    organizationUrl 'http://www.arello-mobile.com/'
-                }
                 developer {
                     name 'Vova Stelmashchuk'
                     email 'vovochkastelmashchuk@gmail.com'
                     organization = 'SchoolHelper'
-                    organizationUrl 'https://schoolhelper.tech/'
+                    organizationUrl 'URL'
                 }
             }
 
diff --git a/moxy-app-compat/build.gradle b/moxy-app-compat/build.gradle
index 44262334..a9018770 100644
--- a/moxy-app-compat/build.gradle
+++ b/moxy-app-compat/build.gradle
@@ -74,7 +74,7 @@ def getBasePom(String libName) {
             name 'Moxy-app-compat'
             modelVersion = '4.0.0'
             description = 'POM_DESCRIPTION'
-            url = 'https://schoolhelper.tech/'
+            url = 'URL'
             packaging = 'jar'
 
             inceptionYear '2016'
diff --git a/moxy-app-compat/stub-appcompat/build.gradle b/moxy-app-compat/stub-appcompat/build.gradle
index d6d06d13..b54f13db 100644
--- a/moxy-app-compat/stub-appcompat/build.gradle
+++ b/moxy-app-compat/stub-appcompat/build.gradle
@@ -5,4 +5,4 @@ targetCompatibility = JavaVersion.VERSION_1_7
 
 dependencies {
     compileOnly deps.android
-}
+}
\ No newline at end of file
diff --git a/moxy-compiler/build.gradle b/moxy-compiler/build.gradle
index 263a2b34..7aab6960 100644
--- a/moxy-compiler/build.gradle
+++ b/moxy-compiler/build.gradle
@@ -64,7 +64,7 @@ def getBasePom(String libName) {
             name 'Moxy'
             modelVersion = '4.0.0'
             description = 'POM_DESCRIPTION'
-            url = 'https://schoolhelper.tech/'
+            url = 'URL'
             //   packaging = 'jar'  //doesn't work from box, implement it manualy
 
             inceptionYear '2016'
diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/TagProviderMethod.java b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/TagProviderMethod.java
index 8e01be05..34207c3d 100644
--- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/TagProviderMethod.java
+++ b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/TagProviderMethod.java
@@ -1,39 +1,29 @@
 package com.arellomobile.mvp.compiler.presenterbinder;
 
-import com.arellomobile.mvp.presenter.PresenterType;
-
 import javax.lang.model.type.TypeMirror;
 
 class TagProviderMethod {
-	private final TypeMirror presenterClass;
-	private final String methodName;
-	private final PresenterType type;
-	private final String presenterId;
-
-	TagProviderMethod(TypeMirror presenterClass, String methodName, String type, String presenterId) {
-		this.presenterClass = presenterClass;
-		this.methodName = methodName;
-		if (type == null) {
-			this.type = PresenterType.LOCAL;
-		} else {
-			this.type = PresenterType.valueOf(type);
-		}
-		this.presenterId = presenterId;
-	}
-
-	TypeMirror getPresenterClass() {
-		return presenterClass;
-	}
-
-	String getMethodName() {
-		return methodName;
-	}
-
-	PresenterType getType() {
-		return type;
-	}
-
-	String getPresenterId() {
-		return presenterId;
-	}
+    private final TypeMirror presenterClass;
+
+    private final String methodName;
+
+    private final String presenterId;
+
+    TagProviderMethod(TypeMirror presenterClass, String methodName, String type, String presenterId) {
+        this.presenterClass = presenterClass;
+        this.methodName = methodName;
+        this.presenterId = presenterId;
+    }
+
+    TypeMirror getPresenterClass() {
+        return presenterClass;
+    }
+
+    String getMethodName() {
+        return methodName;
+    }
+
+    String getPresenterId() {
+        return presenterId;
+    }
 }
diff --git a/moxy-material/build.gradle b/moxy-material/build.gradle
new file mode 100755
index 00000000..5f9f2d48
--- /dev/null
+++ b/moxy-material/build.gradle
@@ -0,0 +1,238 @@
+apply plugin: 'java'
+apply plugin: 'maven-publish'
+apply plugin: 'maven'
+
+ext {
+    publishDir = 'artifacts'
+    publishMavenDir = 'artifacts-maven'
+    targetGroupId = 'tech.schoolhelper'
+    targetArtefactId = 'moxy-x-material'
+    targetArtefactIdDev = 'moxy-material-dev'
+    versionFile = 'VERSION'
+}
+configurations {
+    javadocDeps
+}
+
+// This is important even if Android Studio claims it isn't
+// used. Android can't interpret Java 8 byte code.
+sourceCompatibility = JavaVersion.VERSION_1_7
+targetCompatibility = JavaVersion.VERSION_1_7
+
+def logger = new com.android.build.gradle.internal.LoggerWrapper(project.logger)
+def sdkHandler = new com.android.build.gradle.internal.SdkHandler(project, logger)
+for (File file : sdkHandler.sdkLoader.repositories) {
+    project.repositories.maven {
+        url = file.toURI()
+    }
+}
+
+task clearPublishDir(type: Delete) {
+    delete publishDir
+}
+
+task sourcesJar(type: Jar, dependsOn: classes) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+}
+
+task makeJavadocs(type: Javadoc) {
+    classpath += configurations.javadocDeps
+    source = sourceSets.main.allJava
+}
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+task makeJar(type: Jar, dependsOn: classes) {
+    from('build/classes/java/main')
+}
+
+task copyVersion {
+    doLast {
+        def versionFile = new File(project.rootDir, versionFile)
+        versionFile.write(targetVersionName)
+
+        [publishDir, publishMavenDir].each { dest ->
+            copy {
+                from versionFile
+                into dest
+            }
+        }
+    }
+}
+
+def getBasePom(String libName) {
+
+    def basePom = pom {
+        //noinspection GroovyAssignabilityCheck
+        project {
+            groupId targetGroupId
+            artifactId targetArtefactId
+            version targetVersionName
+            name 'Moxy-androidx'
+            modelVersion = '4.0.0'
+            description = 'MoxyX, we added X for make this library coolest'
+            url = 'URL'
+            packaging = 'jar'
+
+            inceptionYear '2016'
+            licenses {
+                license {
+                    name 'POM_LICENCE_NAME'
+                    url 'POM_LICENCE_URL'
+                    distribution 'repo'
+                }
+            }
+
+            developers {
+                developer {
+                    name 'Vova Stelmashchuk'
+                    email 'vovochkastelmashchuk@gmail.com'
+                    organization = 'SchoolHelper'
+                    organizationUrl 'URL'
+                }
+            }
+
+            scm {
+                connection 'POM_SCM_CONNECTION'
+                developerConnection 'POM_SCM_CONNECTION'
+                url 'POM_URL'
+            }
+        }.withXml {
+            asNode().appendNode('packaging', 'jar')
+        }
+    }
+
+    return basePom.withXml {
+        asNode().dependencies.'*'.findAll {
+            it.artifactId.text().contains('moxy')
+        }.each {
+            it.groupId*.value = targetGroupId
+            it.version*.value = targetVersionName
+        }
+    }
+}
+
+task copyJars {
+    doLast {
+        def buildDir = 'build/libs/'
+        copy {
+            from buildDir
+            into publishMavenDir
+        }
+
+        copy {
+            from(buildDir)
+                    {
+                        rename targetArtefactId + '(.*)', targetArtefactIdDev + '$1'
+                    }
+            into publishDir
+        }
+    }
+}
+
+
+task createPomXml {
+    doLast {
+        // creating local pom
+
+        getBasePom('moxy-dev').withXml {
+            asNode().appendNode('build').appendNode('plugins').with {
+                appendNode('plugin').with {
+                    appendNode('groupId', 'org.apache.maven.plugins')
+                    appendNode('artifactId', 'maven-gpg-plugin')
+                    appendNode('version', '1.5')
+                    appendNode('executions').with {
+                        appendNode('execution').with {
+                            appendNode('id', 'sign-artifacts')
+                            appendNode('phase', 'verify')
+                            appendNode('goals').with {
+                                appendNode('goal', 'sign')
+                            }
+                        }
+                    }
+                    appendNode('configuration').appendNode('gpgArguments').appendNode('arg', '--no-tty')
+                }
+            }
+
+            asNode().artifactId*.value = targetArtefactIdDev
+
+            asNode().dependencies.'*'.findAll() {
+                it.version.text() == '4.0.+' && project.configurations.compile.allDependencies.find { dep ->
+                    dep.name == it.artifactId.text()
+                }
+            }.each() {
+                it.version*.value = '[4.0,)'
+            }
+
+
+        }.writeTo(publishDir + "/" + targetArtefactIdDev + ".pom")
+
+        //creating global pom
+
+        getBasePom('moxy').withXml {
+
+            asNode().appendNode('build')
+                    .appendNode('plugins')
+
+
+        }.writeTo(publishMavenDir + "/" + targetArtefactId + ".pom")
+
+        getBasePom('moxy').withXml {
+
+            asNode().appendNode('build')
+                    .appendNode('plugins')
+                    .appendNode('plugin')
+                    .with {
+                appendNode('groupId', 'org.sonatype.plugins')
+                appendNode('artifactId', 'nexus-staging-maven-plugin')
+                appendNode('version', '1.6.4')
+                appendNode('extensions', 'true')
+                appendNode('configuration').with {
+                    appendNode('serverId', 'ossrh')
+                    appendNode('nexusUrl', 'https://oss.sonatype.org/')
+                    appendNode('autoReleaseAfterClose', 'false')
+                }
+            }
+
+            asNode().appendNode('distributionManagement').with {
+                appendNode('snapshotRepository')
+                        .with {
+                    appendNode('id', 'ossrh')
+                    appendNode('url', 'https://oss.sonatype.org/content/repositories/snapshots')
+                }
+                appendNode('repository')
+                        .with {
+                    appendNode('id', 'ossrh')
+                    appendNode('url', 'https://oss.sonatype.org/service/local/staging/deploy/maven2/')
+                }
+            }
+
+        }.writeTo(publishMavenDir + "/pom.xml")
+
+    }
+}
+
+compileJava.dependsOn clearPublishDir
+copyJars.dependsOn makeJar
+copyJars.dependsOn sourcesJar
+javadocJar.dependsOn makeJavadocs
+copyJars.dependsOn javadocJar
+copyVersion.dependsOn copyJars
+copyVersion.dependsOn createPomXml
+assemble.dependsOn copyVersion
+
+dependencies {
+    implementation project(':moxy-x')
+
+    compileOnly deps.android
+    compileOnly project(':stub-androidx')
+    compileOnly project(':stub-material')
+
+    javadocDeps project(':moxy-x')
+    javadocDeps deps.android
+    javadocDeps project(':stub-androidx')
+    javadocDeps project(':stub-material')
+}
\ No newline at end of file
diff --git a/moxy-material/src/main/java/com/arellomobile/mvp/MvpBottomSheetDialogFragment.java b/moxy-material/src/main/java/com/arellomobile/mvp/MvpBottomSheetDialogFragment.java
new file mode 100644
index 00000000..ce567891
--- /dev/null
+++ b/moxy-material/src/main/java/com/arellomobile/mvp/MvpBottomSheetDialogFragment.java
@@ -0,0 +1,96 @@
+package com.arellomobile.mvp;
+
+import android.os.Bundle;
+
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+
+import androidx.fragment.app.Fragment;
+
+public class MvpBottomSheetDialogFragment extends BottomSheetDialogFragment {
+
+    private boolean mIsStateSaved;
+
+    private MvpDelegate<? extends MvpBottomSheetDialogFragment> mMvpDelegate;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        getMvpDelegate().onCreate(savedInstanceState);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        mIsStateSaved = false;
+
+        getMvpDelegate().onAttach();
+    }
+
+    @Override
+    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;
+        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;
+    }
+}
diff --git a/moxy-material/stub-material/build.gradle b/moxy-material/stub-material/build.gradle
new file mode 100755
index 00000000..222d4acf
--- /dev/null
+++ b/moxy-material/stub-material/build.gradle
@@ -0,0 +1,9 @@
+apply plugin: 'java'
+
+sourceCompatibility = JavaVersion.VERSION_1_7
+targetCompatibility = JavaVersion.VERSION_1_7
+
+dependencies {
+    compileOnly deps.android
+    compileOnly project(':stub-androidx')
+}
\ No newline at end of file
diff --git a/moxy-material/stub-material/src/main/java/com/google/android/material/bottomsheet/BottomSheetDialogFragment.java b/moxy-material/stub-material/src/main/java/com/google/android/material/bottomsheet/BottomSheetDialogFragment.java
new file mode 100644
index 00000000..c5a3fcec
--- /dev/null
+++ b/moxy-material/stub-material/src/main/java/com/google/android/material/bottomsheet/BottomSheetDialogFragment.java
@@ -0,0 +1,38 @@
+package com.google.android.material.bottomsheet;
+
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatDialogFragment;
+import androidx.fragment.app.Fragment;
+
+public class BottomSheetDialogFragment extends AppCompatDialogFragment {
+
+    public void onCreate(Bundle savedInstanceState) {
+        throw new RuntimeException("Stub!");
+    }
+
+    public void onResume() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public void onSaveInstanceState(Bundle outState) {
+        throw new RuntimeException("Stub!");
+    }
+
+    public void onStop() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public void onDestroyView() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public void onDestroy() {
+        throw new RuntimeException("Stub!");
+    }
+
+    public Fragment getParentFragment() {
+        throw new RuntimeException("Stub!");
+    }
+
+}
diff --git a/moxy/build.gradle b/moxy/build.gradle
index ac21c717..12bc8a32 100644
--- a/moxy/build.gradle
+++ b/moxy/build.gradle
@@ -77,7 +77,7 @@ def getBasePom() {
             name 'Moxy'
             modelVersion = '4.0.0'
             description = 'POM_DESCRIPTION'
-            url = 'https://schoolhelper.tech/'
+            url = 'URL'
             //   packaging = 'jar'  //doesn't work from box, implement it manualy
 
             inceptionYear '2016'
diff --git a/moxy/src/main/java/com/arellomobile/mvp/presenter/InjectPresenter.java b/moxy/src/main/java/com/arellomobile/mvp/presenter/InjectPresenter.java
index ab8c10e1..694545a2 100644
--- a/moxy/src/main/java/com/arellomobile/mvp/presenter/InjectPresenter.java
+++ b/moxy/src/main/java/com/arellomobile/mvp/presenter/InjectPresenter.java
@@ -19,7 +19,5 @@
 
 	String tag() default EMPTY;
 
-	PresenterType type() default PresenterType.LOCAL;
-
 	String presenterId() default EMPTY;
 }
diff --git a/moxy/src/main/java/com/arellomobile/mvp/presenter/ProvidePresenterTag.java b/moxy/src/main/java/com/arellomobile/mvp/presenter/ProvidePresenterTag.java
index c77bff65..ab8e0979 100644
--- a/moxy/src/main/java/com/arellomobile/mvp/presenter/ProvidePresenterTag.java
+++ b/moxy/src/main/java/com/arellomobile/mvp/presenter/ProvidePresenterTag.java
@@ -1,12 +1,12 @@
 package com.arellomobile.mvp.presenter;
 
+import com.arellomobile.mvp.MvpPresenter;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.arellomobile.mvp.MvpPresenter;
-
 /**
  * <p>Called when Moxy generate presenter tag for search Presenter in {@link com.arellomobile.mvp.PresenterStore}.</p>
  * <p>Requirements:</p>
@@ -29,7 +29,5 @@
 
 	Class<? extends MvpPresenter<?>> presenterClass();
 
-	PresenterType type() default PresenterType.LOCAL;
-
 	String presenterId() default EMPTY;
 }
diff --git a/moxy/src/main/java/com/arellomobile/mvp/viewstate/ViewCommand.java b/moxy/src/main/java/com/arellomobile/mvp/viewstate/ViewCommand.java
index 8f4aeaf7..8c078e3e 100644
--- a/moxy/src/main/java/com/arellomobile/mvp/viewstate/ViewCommand.java
+++ b/moxy/src/main/java/com/arellomobile/mvp/viewstate/ViewCommand.java
@@ -10,21 +10,22 @@
  * @author Alexander Blinov
  */
 public abstract class ViewCommand<View extends MvpView> {
-	private final String mTag;
-	private final Class<? extends StateStrategy> mStateStrategyType;
+    private final String tag;
 
-	protected ViewCommand(String tag, Class<? extends StateStrategy> stateStrategyType) {
-		mTag = tag;
-		mStateStrategyType = stateStrategyType;
-	}
+    private final Class<? extends StateStrategy> stateStrategyType;
 
-	public abstract void apply(View view);
+    protected ViewCommand(String tag, Class<? extends StateStrategy> stateStrategyType) {
+        this.tag = tag;
+        this.stateStrategyType = stateStrategyType;
+    }
 
-	public String getTag() {
-		return mTag;
-	}
+    public abstract void apply(View view);
 
-	public Class<? extends StateStrategy> getStrategyType() {
-		return mStateStrategyType;
-	}
+    public String getTag() {
+        return tag;
+    }
+
+    public Class<? extends StateStrategy> getStrategyType() {
+        return stateStrategyType;
+    }
 }
diff --git a/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/AddToEndSingleStrategy.java b/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/AddToEndSingleStrategy.java
index 41dc9951..97730fe9 100644
--- a/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/AddToEndSingleStrategy.java
+++ b/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/AddToEndSingleStrategy.java
@@ -1,11 +1,11 @@
 package com.arellomobile.mvp.viewstate.strategy;
 
-import java.util.Iterator;
-import java.util.List;
-
 import com.arellomobile.mvp.MvpView;
 import com.arellomobile.mvp.viewstate.ViewCommand;
 
+import java.util.Iterator;
+import java.util.List;
+
 /**
  * Command will be added to end of commands queue. If commands queue contains same type command, then existing command will be removed.
  *
@@ -15,24 +15,24 @@
  * @author Yuri Shmakov
  */
 public class AddToEndSingleStrategy implements StateStrategy {
-	@Override
-	public <View extends MvpView> void beforeApply(List<ViewCommand<View>> currentState, ViewCommand<View> incomingCommand) {
-		Iterator<ViewCommand<View>> iterator = currentState.iterator();
+    @Override
+    public <View extends MvpView> void beforeApply(List<ViewCommand<View>> currentState, ViewCommand<View> incomingCommand) {
+        Iterator<ViewCommand<View>> iterator = currentState.iterator();
 
-		while (iterator.hasNext()) {
-			ViewCommand<View> entry = iterator.next();
+        while (iterator.hasNext()) {
+            ViewCommand<View> entry = iterator.next();
 
-			if (entry.getClass() == incomingCommand.getClass()) {
-				iterator.remove();
-				break;
-			}
-		}
+            if (entry.getClass() == incomingCommand.getClass()) {
+                iterator.remove();
+                break;
+            }
+        }
 
-		currentState.add(incomingCommand);
-	}
+        currentState.add(incomingCommand);
+    }
 
-	@Override
-	public <View extends MvpView> void afterApply(List<ViewCommand<View>> currentState, ViewCommand<View> incomingCommand) {
-		// pass
-	}
+    @Override
+    public <View extends MvpView> void afterApply(List<ViewCommand<View>> currentState, ViewCommand<View> incomingCommand) {
+        // pass
+    }
 }
diff --git a/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/AddToEndSingleTagStrategy.java b/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/AddToEndSingleTagStrategy.java
new file mode 100644
index 00000000..82d42514
--- /dev/null
+++ b/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/AddToEndSingleTagStrategy.java
@@ -0,0 +1,34 @@
+package com.arellomobile.mvp.viewstate.strategy;
+
+import com.arellomobile.mvp.MvpView;
+import com.arellomobile.mvp.viewstate.ViewCommand;
+
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Command will be added to end of commands queue. If commands queue contains same tag, then existing command will be removed.
+ *
+ * @author Vova Stelmashchuk
+ */
+public class AddToEndSingleTagStrategy implements StateStrategy {
+    @Override
+    public <View extends MvpView> void beforeApply(final List<ViewCommand<View>> currentState, final ViewCommand<View> incomingCommand) {
+        Iterator<ViewCommand<View>> iterator = currentState.iterator();
+
+        while (iterator.hasNext()) {
+            ViewCommand<View> entry = iterator.next();
+
+            if (entry.getTag().equals(incomingCommand.getTag())) {
+                iterator.remove();
+            }
+        }
+
+        currentState.add(incomingCommand);
+    }
+
+    @Override
+    public <View extends MvpView> void afterApply(final List<ViewCommand<View>> currentState, final ViewCommand<View> incomingCommand) {
+
+    }
+}
diff --git a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/ProvideMethodsTest.java b/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/ProvideMethodsTest.java
index 84f388af..0b8e22d2 100644
--- a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/ProvideMethodsTest.java
+++ b/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/ProvideMethodsTest.java
@@ -5,8 +5,6 @@
 import com.arellomobile.mvp.MvpDelegate;
 import com.arellomobile.mvp.provide_methods_test.resources.LocalProvidedView;
 import com.arellomobile.mvp.provide_methods_test.resources.TwoLocalProvidedView;
-import com.arellomobile.mvp.provide_methods_test.resources.TwoWeakWithSamePresenterIdView;
-import com.arellomobile.mvp.provide_methods_test.resources.WeakProvidedView;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -24,48 +22,24 @@
 @Config(manifest = Config.NONE)
 public class ProvideMethodsTest {
 
-	@Test
-	public void testLocalIsProvided() {
-		LocalProvidedView view = new LocalProvidedView();
+    @Test
+    public void testLocalIsProvided() {
+        LocalProvidedView view = new LocalProvidedView();
 
-		view.delegate = new MvpDelegate<>(view);
-		view.delegate.onCreate(new Bundle());
+        view.delegate = new MvpDelegate<>(view);
+        view.delegate.onCreate(new Bundle());
 
-		Assert.assertNotNull(view.oneLocalPresenter);
-		Assert.assertSame(view.oneLocalPresenter, view.oneLocalProvidedPresenter);
-	}
+        Assert.assertNotNull(view.oneLocalPresenter);
+        Assert.assertSame(view.oneLocalPresenter, view.oneLocalProvidedPresenter);
+    }
 
-	@Test
-	public void testTwoLocalUseDifferentProvided() {
-		TwoLocalProvidedView view = new TwoLocalProvidedView();
+    @Test
+    public void testTwoLocalUseDifferentProvided() {
+        TwoLocalProvidedView view = new TwoLocalProvidedView();
 
-		view.delegate = new MvpDelegate<>(view);
-		view.delegate.onCreate(new Bundle());
+        view.delegate = new MvpDelegate<>(view);
+        view.delegate.onCreate(new Bundle());
 
-		Assert.assertNotSame(view.oneLocalPresenter, view.secondLocalPresenter);
-	}
-
-	@Test
-	public void testWeakPresenterWithHardcodedTag() {
-		WeakProvidedView view = new WeakProvidedView();
-
-		view.delegate = new MvpDelegate<>(view);
-		view.delegate.onCreate(new Bundle());
-
-		Assert.assertNotNull(view.weakPresenter);
-		Assert.assertSame(view.weakPresenter, view.weakProvidedPresenter);
-	}
-
-	@Test
-	public void testTwoWeakPresenterWithSamePresenterIdTest() {
-		TwoWeakWithSamePresenterIdView view = new TwoWeakWithSamePresenterIdView();
-
-		view.delegate = new MvpDelegate<>(view);
-		view.delegate.onCreate(new Bundle());
-
-		Assert.assertNotNull(view.oneWeakPresenter);
-		Assert.assertNotNull(view.secondWeakPresenter);
-
-		Assert.assertSame(view.oneWeakPresenter, view.secondWeakPresenter);
-	}
+        Assert.assertNotSame(view.oneLocalPresenter, view.secondLocalPresenter);
+    }
 }
diff --git a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/TwoWeakWithDiffPresenterIdView.java b/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/TwoWeakWithDiffPresenterIdView.java
deleted file mode 100644
index 354a59eb..00000000
--- a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/TwoWeakWithDiffPresenterIdView.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.arellomobile.mvp.provide_methods_test.resources;
-
-import com.arellomobile.mvp.MvpDelegate;
-import com.arellomobile.mvp.presenter.InjectPresenter;
-import com.arellomobile.mvp.presenter.PresenterType;
-import com.arellomobile.mvp.presenter.ProvidePresenter;
-import com.arellomobile.mvp.presenter.ProvidePresenterTag;
-
-/**
- * Date: 30.12.2016
- * Time: 12:05
- *
- * @author Yuri Shmakov
- */
-
-public class TwoWeakWithDiffPresenterIdView implements TestView {
-	@InjectPresenter(type = PresenterType.WEAK, presenterId = "oneWeakPresenter")
-	public TestPresenter oneWeakPresenter;
-
-	@InjectPresenter(type = PresenterType.WEAK, presenterId = "secondWeakPresenter")
-	public TestPresenter secondWeakPresenter;
-
-	public MvpDelegate<TwoWeakWithDiffPresenterIdView> delegate;
-
-	@ProvidePresenterTag(presenterClass = TestPresenter.class, type = PresenterType.WEAK, presenterId = "oneWeakPresenter")
-	public String provideOnePresenterTag() {
-		return "oneWeakPresenterTag";
-	}
-
-	@ProvidePresenterTag(presenterClass = TestPresenter.class, type = PresenterType.WEAK, presenterId = "secondWeakPresenter")
-	public String provideSecondPresenterTag() {
-		return "secondWeakPresenterTag";
-	}
-
-	@ProvidePresenter(type = PresenterType.WEAK, presenterId = "oneWeakPresenter")
-	public TestPresenter provideOneTestPresenter() {
-		return new TestPresenter();
-	}
-
-	@ProvidePresenter(type = PresenterType.WEAK, presenterId = "secondWeakPresenter")
-	public TestPresenter provideSecondTestPresenter() {
-		return new TestPresenter();
-	}
-}
diff --git a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/TwoWeakWithSamePresenterIdView.java b/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/TwoWeakWithSamePresenterIdView.java
deleted file mode 100644
index db1d8682..00000000
--- a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/TwoWeakWithSamePresenterIdView.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.arellomobile.mvp.provide_methods_test.resources;
-
-import com.arellomobile.mvp.MvpDelegate;
-import com.arellomobile.mvp.presenter.InjectPresenter;
-import com.arellomobile.mvp.presenter.PresenterType;
-import com.arellomobile.mvp.presenter.ProvidePresenter;
-import com.arellomobile.mvp.presenter.ProvidePresenterTag;
-
-/**
- * Date: 30.12.2016
- * Time: 12:05
- *
- * @author Yuri Shmakov
- */
-
-public class TwoWeakWithSamePresenterIdView implements TestView {
-	@InjectPresenter(type = PresenterType.WEAK, presenterId = "weakPresenter")
-	public TestPresenter oneWeakPresenter;
-
-	@InjectPresenter(type = PresenterType.WEAK, presenterId = "weakPresenter")
-	public TestPresenter secondWeakPresenter;
-
-	public MvpDelegate<TwoWeakWithSamePresenterIdView> delegate;
-
-	@ProvidePresenterTag(presenterClass = TestPresenter.class, type = PresenterType.WEAK, presenterId = "weakPresenter")
-	public String providePresenterTag() {
-		return "weakPresenterTag";
-	}
-
-	@ProvidePresenter(type = PresenterType.WEAK, presenterId = "weakPresenter")
-	public TestPresenter provideTestPresenter() {
-		return new TestPresenter();
-	}
-}
diff --git a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/WeakProvidedView.java b/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/WeakProvidedView.java
deleted file mode 100644
index d4877256..00000000
--- a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/WeakProvidedView.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.arellomobile.mvp.provide_methods_test.resources;
-
-import com.arellomobile.mvp.MvpDelegate;
-import com.arellomobile.mvp.presenter.InjectPresenter;
-import com.arellomobile.mvp.presenter.PresenterType;
-import com.arellomobile.mvp.presenter.ProvidePresenter;
-
-/**
- * Date: 30.12.2016
- * Time: 12:05
- *
- * @author Yuri Shmakov
- */
-
-public class WeakProvidedView implements TestView {
-	@InjectPresenter(type = PresenterType.WEAK, tag = "weakPresenter")
-	public TestPresenter weakPresenter;
-	public TestPresenter weakProvidedPresenter;
-
-	public MvpDelegate<WeakProvidedView> delegate;
-
-	@ProvidePresenter(type = PresenterType.WEAK, tag = "weakPresenter")
-	public TestPresenter provideWeakPresenter() {
-		weakProvidedPresenter = new TestPresenter();
-		return weakProvidedPresenter;
-	}
-}
diff --git a/moxy/src/test/java/com/arellomobile/mvp/view/ChildView.java b/moxy/src/test/java/com/arellomobile/mvp/view/ChildView.java
deleted file mode 100644
index 64d1b570..00000000
--- a/moxy/src/test/java/com/arellomobile/mvp/view/ChildView.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.arellomobile.mvp.view;
-
-import com.arellomobile.mvp.GenerateViewState;
-import com.arellomobile.mvp.viewstate.strategy.SkipStrategy;
-import com.arellomobile.mvp.viewstate.strategy.StateStrategyType;
-
-/**
- * Date: 29.02.2016
- * Time: 9:10
- *
- * @author Savin Mikhail
- */
-@GenerateViewState
-@StateStrategyType(SkipStrategy.class)
-public interface ChildView extends ParentView, SimpleInterface {
-	@Override
-	void parentOverrideMethodWithCustomStrategy();
-}
diff --git a/moxy/src/test/java/com/arellomobile/mvp/view/DelegateGlobalTestView.java b/moxy/src/test/java/com/arellomobile/mvp/view/DelegateGlobalTestView.java
deleted file mode 100644
index 1c4d3d69..00000000
--- a/moxy/src/test/java/com/arellomobile/mvp/view/DelegateGlobalTestView.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.arellomobile.mvp.view;
-
-import com.arellomobile.mvp.presenter.InjectPresenter;
-import com.arellomobile.mvp.presenter.InjectViewStatePresenter;
-import com.arellomobile.mvp.presenter.PresenterType;
-
-public class DelegateGlobalTestView extends CounterTestView {
-	public static final String TEST_GLOBAL_PRESENTER = "TestGlobalPresenter";
-
-	@InjectPresenter(type = PresenterType.GLOBAL, tag = TEST_GLOBAL_PRESENTER)
-	public InjectViewStatePresenter mInjectViewStatePresenter;
-}
\ No newline at end of file
diff --git a/moxy/src/test/java/com/arellomobile/mvp/view/ParentView.java b/moxy/src/test/java/com/arellomobile/mvp/view/ParentView.java
deleted file mode 100644
index da71d5f7..00000000
--- a/moxy/src/test/java/com/arellomobile/mvp/view/ParentView.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.arellomobile.mvp.view;
-
-import com.arellomobile.mvp.GenerateViewState;
-import com.arellomobile.mvp.MvpView;
-import com.arellomobile.mvp.viewstate.strategy.AddToEndSingleStrategy;
-import com.arellomobile.mvp.viewstate.strategy.StateStrategyType;
-
-/**
- * Date: 29.02.2016
- * Time: 9:09
- *
- * @author Savin Mikhail
- */
-@GenerateViewState
-public interface ParentView extends MvpView {
-	void withoutStrategyMethod();
-
-	@StateStrategyType(AddToEndSingleStrategy.class)
-	void customStrategyMethod();
-
-	@StateStrategyType(AddToEndSingleStrategy.class)
-	void parentOverrideMethodWithCustomStrategy();
-}
diff --git a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/AddToEndSingleTagStrategy.kt b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/AddToEndSingleTagStrategy.kt
index 913ce048..1c5f0811 100644
--- a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/AddToEndSingleTagStrategy.kt
+++ b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/AddToEndSingleTagStrategy.kt
@@ -5,28 +5,27 @@ import com.arellomobile.mvp.viewstate.ViewCommand
 import com.arellomobile.mvp.viewstate.strategy.StateStrategy
 
 class AddToEndSingleTagStrategy : StateStrategy {
-
-    override fun <View : MvpView> beforeApply(
-            currentState: MutableList<ViewCommand<View>>,
-            incomingCommand: ViewCommand<View>) {
-
-        val iterator = currentState.iterator()
-
-        while (iterator.hasNext()) {
-            val entry = iterator.next()
-
-            if (entry.tag == incomingCommand.tag) {
-                iterator.remove()
-            }
-        }
-
-        currentState.add(incomingCommand)
-
-    }
-
-    override fun <View : MvpView?> afterApply(
-            currentState: MutableList<ViewCommand<View>>,
-            incomingCommand: ViewCommand<View>) {
-        //Just do nothing
-    }
+	
+	override fun <View : MvpView> beforeApply(
+			currentState: MutableList<ViewCommand<View>>,
+			incomingCommand: ViewCommand<View>) {
+		
+		val iterator = currentState.iterator()
+		
+		while (iterator.hasNext()) {
+			val entry = iterator.next()
+			
+			if (entry.tag == incomingCommand.tag) {
+				iterator.remove()
+			}
+		}
+		
+		currentState.add(incomingCommand)
+	}
+	
+	override fun <View : MvpView?> afterApply(
+			currentState: MutableList<ViewCommand<View>>,
+			incomingCommand: ViewCommand<View>) {
+		//Just do nothing
+	}
 }
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 86f42c94..c85ccf3e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,8 +1,7 @@
-include ':moxy-x', ':moxy-x-android', ':moxy-x-compiler', ':moxy-x-app-compat', ':moxy-x-androidx'
+include ':moxy-x', ':moxy-x-android', ':moxy-x-compiler', ':moxy-x-app-compat', ':moxy-x-androidx', ':moxy-x-material'
 
-include ':stub-reflector', ':stub-android', ':stub-appcompat', ':stub-androidx'
+include ':stub-reflector', ':stub-android', ':stub-appcompat', ':stub-androidx', ':stub-material'
 
-/*include ':sample-github'*/
 include ':sample-kotlin'
 include ':sample-custom-strategy'
 include ':moxy-androidx-sample'
@@ -11,9 +10,11 @@ project(':stub-reflector').projectDir = new File('moxy/stub-reflector')
 project(':stub-android').projectDir = new File('moxy-android/stub-android')
 project(':stub-appcompat').projectDir = new File('moxy-app-compat/stub-appcompat')
 project(':stub-androidx').projectDir = new File('moxy-androidx/stub-androidx')
+project(':stub-material').projectDir = new File('moxy-material/stub-material')
 
 project(':moxy-x').projectDir = new File('moxy')
 project(':moxy-x-androidx').projectDir = new File('moxy-androidx')
 project(':moxy-x-app-compat').projectDir = new File('moxy-app-compat')
 project(':moxy-x-compiler').projectDir = new File('moxy-compiler')
-project(':moxy-x-android').projectDir = new File('moxy-android')
\ No newline at end of file
+project(':moxy-x-android').projectDir = new File('moxy-android')
+project(':moxy-x-material').projectDir = new File('moxy-material')
\ No newline at end of file

From 4b8f7b50bf2a883ee09e66d0b590856a70c40d43 Mon Sep 17 00:00:00 2001
From: Vova Stelmashchuk <vovochkastelmashchuk@gmail.com>
Date: Sun, 17 Mar 2019 22:59:58 +0200
Subject: [PATCH 32/35] fixed pom files

---
 build.gradle                                    |  2 +-
 moxy-android/build.gradle                       | 14 +++++++-------
 moxy-androidx-sample/build.gradle               |  8 +++++---
 .../example/com/androidxsample/MainActivity.kt  |  2 ++
 moxy-androidx/build.gradle                      | 17 ++++++++---------
 moxy-compiler/build.gradle                      | 16 ++++++++--------
 moxy-material/build.gradle                      | 16 ++++++++--------
 moxy/build.gradle                               | 14 +++++++-------
 8 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0806d21a..0a26d37e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ allprojects {
 
 ext {
     targetVersionCode = 47
-    targetVersionName = "1.6.0-beta"
+    targetVersionName = "1.7.0"
 
     deps = [
             android       : 'com.google.android:android:1.6_r2',
diff --git a/moxy-android/build.gradle b/moxy-android/build.gradle
index cadcf657..ec4eac42 100644
--- a/moxy-android/build.gradle
+++ b/moxy-android/build.gradle
@@ -73,15 +73,15 @@ def getBasePom(String libName) {
             version targetVersionName
             name 'Moxy-android'
             modelVersion = '4.0.0'
-            description = 'POM_DESCRIPTION'
+            description = POM_DESCRIPTION
             url = 'URL'
             packaging = 'jar'
 
             inceptionYear '2016'
             licenses {
                 license {
-                    name 'POM_LICENCE_NAME'
-                    url 'POM_LICENCE_URL'
+                    name POM_LICENCE_NAME
+                    url POM_LICENCE_URL
                     distribution 'repo'
                 }
             }
@@ -103,14 +103,14 @@ def getBasePom(String libName) {
                     name 'Vova Stelmashchuk'
                     email 'vovochkastelmashchuk@gmail.com'
                     organization = 'SchoolHelper'
-                    organizationUrl 'https://schoolhelper.tech/'
+                    organizationUrl URL
                 }
             }
 
             scm {
-                connection 'POM_SCM_CONNECTION'
-                developerConnection 'POM_SCM_CONNECTION'
-                url 'POM_URL'
+                connection POM_SCM_CONNECTION
+                developerConnection POM_SCM_CONNECTION
+                url POM_URL
             }
         }.withXml {
             asNode().appendNode('packaging', 'jar')
diff --git a/moxy-androidx-sample/build.gradle b/moxy-androidx-sample/build.gradle
index a391f047..f9313367 100644
--- a/moxy-androidx-sample/build.gradle
+++ b/moxy-androidx-sample/build.gradle
@@ -38,15 +38,17 @@ android {
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation "com.google.android.material:material:1.0.0"
 
     //uncomment for test module
     /*implementation project(':moxy-x')
     implementation project(':moxy-x-androidx')
     kapt project(':moxy-x-compiler')*/
 
-    implementation 'tech.schoolhelper:moxy-x:1.5.7'
-    implementation 'tech.schoolhelper:moxy-x-androidx:1.5.7'
-    kapt 'tech.schoolhelper:moxy-x-compiler:1.5.7'
+    def moxyVersion = '1.6.0-beta'
+    implementation "tech.schoolhelper:moxy-x:$moxyVersion"
+    implementation "tech.schoolhelper:moxy-x-androidx:$moxyVersion"
+    kapt "tech.schoolhelper:moxy-x-compiler:$moxyVersion"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainActivity.kt b/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainActivity.kt
index e0e124bc..c82f9101 100644
--- a/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainActivity.kt
+++ b/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainActivity.kt
@@ -12,6 +12,8 @@ interface MainView : MvpView {
 	fun printLog(msg: String)
 }
 
+class Frag : com.google.android.material.bottomsheet.BottomSheetDialog
+
 class MainActivity : MvpAppCompatActivity(), MainView {
 	
 	@InjectPresenter
diff --git a/moxy-androidx/build.gradle b/moxy-androidx/build.gradle
index 15a31b9d..67c8e98b 100755
--- a/moxy-androidx/build.gradle
+++ b/moxy-androidx/build.gradle
@@ -73,15 +73,15 @@ def getBasePom(String libName) {
             version targetVersionName
             name 'Moxy-androidx'
             modelVersion = '4.0.0'
-            description = 'MoxyX, we added X for make this librayr coolest'
-            url = 'URL'
+            description = POM_DESCRIPTION
+            url = URL
             packaging = 'jar'
 
             inceptionYear '2016'
             licenses {
                 license {
-                    name 'POM_LICENCE_NAME'
-                    url 'POM_LICENCE_URL'
+                    name POM_LICENCE_NAME
+                    url POM_LICENCE_URL
                     distribution 'repo'
                 }
             }
@@ -91,14 +91,14 @@ def getBasePom(String libName) {
                     name 'Vova Stelmashchuk'
                     email 'vovochkastelmashchuk@gmail.com'
                     organization = 'SchoolHelper'
-                    organizationUrl 'URL'
+                    organizationUrl URL
                 }
             }
 
             scm {
-                connection 'POM_SCM_CONNECTION'
-                developerConnection 'POM_SCM_CONNECTION'
-                url 'POM_URL'
+                connection POM_SCM_CONNECTION
+                developerConnection POM_SCM_CONNECTION
+                url POM_URL
             }
         }.withXml {
             asNode().appendNode('packaging', 'jar')
@@ -211,7 +211,6 @@ task createPomXml {
             }
 
         }.writeTo(publishMavenDir + "/pom.xml")
-
     }
 }
 
diff --git a/moxy-compiler/build.gradle b/moxy-compiler/build.gradle
index 7aab6960..9e293a76 100644
--- a/moxy-compiler/build.gradle
+++ b/moxy-compiler/build.gradle
@@ -63,15 +63,15 @@ def getBasePom(String libName) {
             version targetVersionName
             name 'Moxy'
             modelVersion = '4.0.0'
-            description = 'POM_DESCRIPTION'
-            url = 'URL'
+            description = POM_DESCRIPTION
+            url = URL
             //   packaging = 'jar'  //doesn't work from box, implement it manualy
 
             inceptionYear '2016'
             licenses {
                 license {
-                    name 'POM_LICENCE_NAME'
-                    url 'POM_LICENCE_URL'
+                    name POM_LICENCE_NAME
+                    url POM_LICENCE_URL
                     distribution 'repo'
                 }
             }
@@ -93,14 +93,14 @@ def getBasePom(String libName) {
                     name 'Vova Stelmashchuk'
                     email 'vovochkastelmashchuk@gmail.com'
                     organization = 'SchoolHelper'
-                    organizationUrl 'https://schoolhelper.tech/'
+                    organizationUrl URL
                 }
             }
 
             scm {
-                connection 'POM_SCM_CONNECTION'
-                developerConnection 'POM_SCM_CONNECTION'
-                url 'POM_URL'
+                connection POM_SCM_CONNECTION
+                developerConnection POM_SCM_CONNECTION
+                url POM_URL
             }
         }.withXml {
             asNode().appendNode('packaging', 'jar')
diff --git a/moxy-material/build.gradle b/moxy-material/build.gradle
index 5f9f2d48..bd325249 100755
--- a/moxy-material/build.gradle
+++ b/moxy-material/build.gradle
@@ -73,15 +73,15 @@ def getBasePom(String libName) {
             version targetVersionName
             name 'Moxy-androidx'
             modelVersion = '4.0.0'
-            description = 'MoxyX, we added X for make this library coolest'
-            url = 'URL'
+            description = POM_DESCRIPTION
+            url = URL
             packaging = 'jar'
 
             inceptionYear '2016'
             licenses {
                 license {
-                    name 'POM_LICENCE_NAME'
-                    url 'POM_LICENCE_URL'
+                    name POM_LICENCE_NAME
+                    url POM_LICENCE_URL
                     distribution 'repo'
                 }
             }
@@ -91,14 +91,14 @@ def getBasePom(String libName) {
                     name 'Vova Stelmashchuk'
                     email 'vovochkastelmashchuk@gmail.com'
                     organization = 'SchoolHelper'
-                    organizationUrl 'URL'
+                    organizationUrl URL
                 }
             }
 
             scm {
-                connection 'POM_SCM_CONNECTION'
-                developerConnection 'POM_SCM_CONNECTION'
-                url 'POM_URL'
+                connection POM_SCM_CONNECTION
+                developerConnection POM_SCM_CONNECTION
+                url POM_URL
             }
         }.withXml {
             asNode().appendNode('packaging', 'jar')
diff --git a/moxy/build.gradle b/moxy/build.gradle
index 12bc8a32..e01a3f25 100644
--- a/moxy/build.gradle
+++ b/moxy/build.gradle
@@ -76,15 +76,15 @@ def getBasePom() {
             version targetVersionName
             name 'Moxy'
             modelVersion = '4.0.0'
-            description = 'POM_DESCRIPTION'
-            url = 'URL'
+            description = POM_DESCRIPTION
+            url = URL
             //   packaging = 'jar'  //doesn't work from box, implement it manualy
 
             inceptionYear '2016'
             licenses {
                 license {
-                    name 'POM_LICENCE_NAME'
-                    url 'POM_LICENCE_URL'
+                    name POM_LICENCE_NAME
+                    url POM_LICENCE_URL
                     distribution 'repo'
                 }
             }
@@ -111,9 +111,9 @@ def getBasePom() {
             }
 
             scm {
-                connection 'POM_SCM_CONNECTION'
-                developerConnection 'POM_SCM_CONNECTION'
-                url 'POM_URL'
+                connection POM_SCM_CONNECTION
+                developerConnection POM_SCM_CONNECTION
+                url POM_URL
             }
         }.withXml {
             asNode().appendNode('packaging', 'jar')

From a7271aff81d08c236cc7e879a7f5a15d0349f93c Mon Sep 17 00:00:00 2001
From: Vova Stelmashchuk <vovochkastelmashchuk@gmail.com>
Date: Mon, 18 Mar 2019 00:21:34 +0200
Subject: [PATCH 33/35] update readme

---
 README.md                                     | 124 +++++++++---------
 .../com/androidxsample/MainActivity.kt        |   2 -
 .../strategy/AddToEndSingleTagStrategy.java   |   1 -
 3 files changed, 62 insertions(+), 65 deletions(-)

diff --git a/README.md b/README.md
index a57139e1..ddac588d 100644
--- a/README.md
+++ b/README.md
@@ -16,9 +16,11 @@ See what's happening here in the [wiki](https://github.com/Arello-Mobile/Moxy/wi
 
 ## Diff between us and root project
 1. We support androidX
-2. We will remove GLOBAL and WEAK preseter type from the library
-3. Starategy which work by tag, will be added to main package.
-4. We will change the template for android studio (and intelij), 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.
+2. We don't support GLOBAL and WEAK presenter type
+3. We have one more strategy than core project, [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.
 
 ## Capabilities
 
@@ -30,40 +32,38 @@ Moxy has a few killer features in other ways:
 ## Sample
 
 View interface
-```java
-public interface HelloWorldView extends MvpView {
-	void showMessage(int message);
-}
-```
-Presenter
-```java
-@InjectViewState
-public class HelloWorldPresenter extends MvpPresenter<HelloWorldView> {
-	public HelloWorldPresenter() {
-		getViewState().showMessage(R.string.hello_world);
-	}
+```kotlin
+interface MainView : MvpView {
+	fun printLog(msg: String)
 }
-```
-View implementation
-```java
-public class HelloWorldActivity extends MvpAppCompatActivity implements HelloWorldView {
 
+class MainActivity : MvpAppCompatActivity(), MainView {
+	
 	@InjectPresenter
-	HelloWorldPresenter helloWorldPresenter;
-
-	private TextView helloWorldTextView;
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_hello_world);
-
-		helloWorldTextView = ((TextView) findViewById(R.id.activity_hello_world_text_view_message));
+	internal lateinit var presenter: MainPresenter
+	
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(R.layout.activity_main)
 	}
-
-	@Override
-	public void showMessage(int message) {
-		helloWorldTextView.setText(message);
+	
+	override fun printLog(msg: String) {
+		Log.e(TAG, "printLog : msg : $msg activity hash code : ${hashCode()}")
+	}
+	
+	companion object {
+		const val TAG = "MoxyDebug"
+	}
+}
+```
+Presenter
+```kotlin
+@InjectViewState
+class MainPresenter : MvpPresenter<MainView>() {
+	override fun onFirstViewAttach() {
+		super.onFirstViewAttach()
+		Log.e(MainActivity.TAG, "presenter hash code : ${hashCode()}")
+		viewState.printLog("TEST")
 	}
 }
 ```
@@ -73,12 +73,15 @@ public class HelloWorldActivity extends MvpAppCompatActivity implements HelloWor
 ## Wiki
 For all information check [Moxy Wiki](https://github.com/Arello-Mobile/Moxy/wiki)
 
-## Android studio templates
+## 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/jordan1997/Moxy/tree/develop/moxy-templates)
 
-## Links (Telegram channels from original moxy community)
+## 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 />
@@ -89,43 +92,40 @@ For connection with author of this repository use twitter
 [Twitter](https://twitter.com/jordan29041997)
 
 ## Integration
-Base modules integration:
+### Base modules integration: 
 ```groovy
-dependencies {
-  ...
-  implementation 'tech.schoolhelper:moxy-x:1.5.7'
-  annotationProcessor 'tech.schoolhelper:moxy-x-compiler:1.5.7'
-}
+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 {
-  ...
-  implementation 'tech.schoolhelper:moxy-x-android:1.5.7'
-}
+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 {
-  ...
-  implementation 'tech.schoolhelper:moxy-x-app-compat:1.5.7'
-  implementation 'com.android.support:appcompat-v7:$support_version'
-}
+implementation 'tech.schoolhelper:moxy-x-app-compat:1.7.0'
 ```
-If you are planning to use AndroidX, then you can use `MvpAppCompatActivity` and `MvpAppCompatFragment`. Then add this:
+### AndroidX module integration
+If you use AndroidX, use `MvpAppCompatActivity` and `MvpAppCompatFragment` add this:
 ```groovy
-   ...
-   implementation 'tech.schoolhelper:moxy-x-androidx:1.5.7'
+implementation 'tech.schoolhelper:moxy-x-androidx:1.7.0'
 ```
-### Kotlin
-If you are using kotlin, use `kapt` instead of `provided`/`apt` dependency type:
+### AndroidX(Google material) module integration
+If you use google material, use `MvpBottomSheetDialogFragment` add this:
 ```groovy
-apply plugin: 'kotlin-kapt'
-
-dependencies {
-  ...
-  kapt 'tech.schoolhelper:moxy-x-compiler:1.5.7'
-}
+implementation 'tech.schoolhelper:moxy-x-material:1.7.0'
 ```
 
 ## ProGuard
diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainActivity.kt b/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainActivity.kt
index c82f9101..e0e124bc 100644
--- a/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainActivity.kt
+++ b/moxy-androidx-sample/src/main/kotlin/example/com/androidxsample/MainActivity.kt
@@ -12,8 +12,6 @@ interface MainView : MvpView {
 	fun printLog(msg: String)
 }
 
-class Frag : com.google.android.material.bottomsheet.BottomSheetDialog
-
 class MainActivity : MvpAppCompatActivity(), MainView {
 	
 	@InjectPresenter
diff --git a/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/AddToEndSingleTagStrategy.java b/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/AddToEndSingleTagStrategy.java
index 82d42514..f79db457 100644
--- a/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/AddToEndSingleTagStrategy.java
+++ b/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/AddToEndSingleTagStrategy.java
@@ -9,7 +9,6 @@
 /**
  * Command will be added to end of commands queue. If commands queue contains same tag, then existing command will be removed.
  *
- * @author Vova Stelmashchuk
  */
 public class AddToEndSingleTagStrategy implements StateStrategy {
     @Override

From 3b01fca38e564c8bb1ef99c9abf8c7ebe3d8dae5 Mon Sep 17 00:00:00 2001
From: Sergey Valevich <sergey_valevich@epam.com>
Date: Sun, 3 Mar 2019 10:51:52 +0300
Subject: [PATCH 34/35] Added ability to run feature modules independent from
 main application module. This allows Instant App support
 (https://github.com/Arello-Mobile/Moxy/issues/209), running unit-tests for
 feature modules (https://github.com/Arello-Mobile/Moxy/issues/223) and other
 issues https://github.com/Arello-Mobile/Moxy/issues/224.

Here, Moxy always references to MoxyReflector by com.arellomobile.mvp package and generates
MoxyReflectorDelegate for each module.

In order to use Moxy, there is no need to follow instructions described on this page https://github.com/Arello-Mobile/Moxy/wiki/Multiple-modules

Now it is only required to add 1 line of code to BaseActivity.onCreate of each module : MoxyReflector.registerDelegate(MoxyReflectorDelegate.INSTANCE);
---
 .../mvp/compiler/MvpCompiler.java             |  61 ++++-------
 .../reflector/MoxyReflectorGenerator.java     | 103 +++++++-----------
 .../com/arellomobile/mvp/MvpPresenter.java    |   5 +-
 .../com/arellomobile/mvp/MvpProcessor.java    |   5 +-
 .../mvp/reflector/MoxyReflector.java          |  66 +++++++++++
 .../mvp/reflector/ReflectorDelegate.java      |   9 ++
 .../mvp/viewstate/ViewCommands.java           |   2 +-
 .../com/arellomobile/mvp/MoxyReflector.java   |  34 ------
 8 files changed, 140 insertions(+), 145 deletions(-)
 create mode 100644 moxy/src/main/java/com/arellomobile/mvp/reflector/MoxyReflector.java
 create mode 100644 moxy/src/main/java/com/arellomobile/mvp/reflector/ReflectorDelegate.java
 delete mode 100644 moxy/stub-reflector/src/main/java/com/arellomobile/mvp/MoxyReflector.java

diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/MvpCompiler.java b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/MvpCompiler.java
index 3ff166b7..5f66f6d2 100644
--- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/MvpCompiler.java
+++ b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/MvpCompiler.java
@@ -1,7 +1,6 @@
 package com.arellomobile.mvp.compiler;
 
 import com.arellomobile.mvp.InjectViewState;
-import com.arellomobile.mvp.RegisterMoxyReflectorPackages;
 import com.arellomobile.mvp.compiler.presenterbinder.InjectPresenterProcessor;
 import com.arellomobile.mvp.compiler.presenterbinder.PresenterBinderClassGenerator;
 import com.arellomobile.mvp.compiler.reflector.MoxyReflectorGenerator;
@@ -15,10 +14,8 @@
 
 import java.io.IOException;
 import java.lang.annotation.Annotation;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -48,9 +45,6 @@
 @SuppressWarnings("unused")
 @AutoService(Processor.class)
 public class MvpCompiler extends AbstractProcessor {
-	public static final String MOXY_REFLECTOR_DEFAULT_PACKAGE = "com.arellomobile.mvp";
-
-	private static final String OPTION_MOXY_REFLECTOR_PACKAGE = "moxyReflectorPackage";
 
 	private static Messager sMessager;
 	private static Types sTypeUtils;
@@ -79,18 +73,13 @@ public synchronized void init(ProcessingEnvironment processingEnv) {
 		sOptions = processingEnv.getOptions();
 	}
 
-	@Override
-	public Set<String> getSupportedOptions() {
-		return Collections.singleton(OPTION_MOXY_REFLECTOR_PACKAGE);
-	}
-
 	@Override
 	public Set<String> getSupportedAnnotationTypes() {
 		Set<String> supportedAnnotationTypes = new HashSet<>();
 		Collections.addAll(supportedAnnotationTypes,
 				InjectPresenter.class.getCanonicalName(),
-				InjectViewState.class.getCanonicalName(),
-				RegisterMoxyReflectorPackages.class.getCanonicalName());
+				InjectViewState.class.getCanonicalName()
+		);
 		return supportedAnnotationTypes;
 	}
 
@@ -138,43 +127,33 @@ private boolean throwableProcess(RoundEnvironment roundEnv) {
 					viewInterfaceProcessor, viewStateClassGenerator);
 		}
 
-		String moxyReflectorPackage = sOptions.get(OPTION_MOXY_REFLECTOR_PACKAGE);
-
-		if (moxyReflectorPackage == null) {
-			moxyReflectorPackage = MOXY_REFLECTOR_DEFAULT_PACKAGE;
-		}
-
-		List<String> additionalMoxyReflectorPackages = getAdditionalMoxyReflectorPackages(roundEnv);
+		String moxyReflectorDelegatePackage = getMoxyReflectorDelegatePackage(roundEnv);
 
-		JavaFile moxyReflector = MoxyReflectorGenerator.generate(
-				moxyReflectorPackage,
+		JavaFile moxyReflectorDelegate = MoxyReflectorGenerator.generate(
+                moxyReflectorDelegatePackage,
 				injectViewStateProcessor.getPresenterClassNames(),
 				injectPresenterProcessor.getPresentersContainers(),
-				viewInterfaceProcessor.getUsedStrategies(),
-				additionalMoxyReflectorPackages
+				viewInterfaceProcessor.getUsedStrategies()
 		);
 
-		createSourceFile(moxyReflector);
+		createSourceFile(moxyReflectorDelegate);
 
 		return true;
 	}
 
-	private List<String> getAdditionalMoxyReflectorPackages(RoundEnvironment roundEnv) {
-		List<String> result = new ArrayList<>();
-
-		for (Element element : roundEnv.getElementsAnnotatedWith(RegisterMoxyReflectorPackages.class)) {
-			if (element.getKind() != ElementKind.CLASS) {
-				getMessager().printMessage(Diagnostic.Kind.ERROR, element + " must be " + ElementKind.CLASS.name() + ", or not mark it as @" + RegisterMoxyReflectorPackages.class.getSimpleName());
-			}
-
-			String[] packages = element.getAnnotation(RegisterMoxyReflectorPackages.class).value();
-
-			Collections.addAll(result, packages);
-		}
-
-		return result;
-	}
-
+	/**
+	 * @return first package associated with this module.
+	 * Probably should return module's top-level package
+	 */
+	private String getMoxyReflectorDelegatePackage(
+	        final RoundEnvironment roundEnv
+    ) {
+		return processingEnv
+				.getElementUtils()
+				.getPackageOf(roundEnv.getElementsAnnotatedWith(InjectPresenter.class).iterator().next())
+				.getQualifiedName()
+				.toString();
+    }
 
 	private void checkInjectors(final RoundEnvironment roundEnv, Class<? extends Annotation> clazz, AnnotationRule annotationRule) {
 		for (Element annotatedElement : roundEnv.getElementsAnnotatedWith(clazz)) {
diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/reflector/MoxyReflectorGenerator.java b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/reflector/MoxyReflectorGenerator.java
index 2bf16a20..c11b99c6 100644
--- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/reflector/MoxyReflectorGenerator.java
+++ b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/reflector/MoxyReflectorGenerator.java
@@ -2,6 +2,7 @@
 
 import com.arellomobile.mvp.MvpProcessor;
 import com.arellomobile.mvp.ViewStateProvider;
+import com.arellomobile.mvp.reflector.ReflectorDelegate;
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.CodeBlock;
 import com.squareup.javapoet.JavaFile;
@@ -26,8 +27,6 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
-import static com.arellomobile.mvp.compiler.MvpCompiler.MOXY_REFLECTOR_DEFAULT_PACKAGE;
-
 /**
  * Date: 07.12.2016
  * Time: 19:05
@@ -50,61 +49,46 @@ public class MoxyReflectorGenerator {
 	public static JavaFile generate(String destinationPackage,
 	                                List<TypeElement> presenterClassNames,
 	                                List<TypeElement> presentersContainers,
-	                                List<TypeElement> strategyClasses,
-	                                List<String> additionalMoxyReflectorsPackages) {
-		TypeSpec.Builder classBuilder = TypeSpec.classBuilder("MoxyReflector")
-				.addModifiers(Modifier.PUBLIC, Modifier.FINAL)
+	                                List<TypeElement> strategyClasses) {
+
+		TypeSpec.Builder classBuilder = TypeSpec.enumBuilder("MoxyReflectorDelegate")
+                .addEnumConstant("INSTANCE")
+				.addModifiers(Modifier.PUBLIC)
+				.addSuperinterface(TypeName.get(ReflectorDelegate.class))
 				.addField(MAP_CLASS_TO_OBJECT_TYPE_NAME, "sViewStateProviders", Modifier.PRIVATE, Modifier.STATIC)
 				.addField(MAP_CLASS_TO_LIST_OF_OBJECT_TYPE_NAME, "sPresenterBinders", Modifier.PRIVATE, Modifier.STATIC)
 				.addField(MAP_CLASS_TO_OBJECT_TYPE_NAME, "sStrategies", Modifier.PRIVATE, Modifier.STATIC);
 
-		classBuilder.addStaticBlock(generateStaticInitializer(presenterClassNames, presentersContainers, strategyClasses, additionalMoxyReflectorsPackages));
-
-		if (destinationPackage.equals(MOXY_REFLECTOR_DEFAULT_PACKAGE)) {
-			classBuilder.addMethod(MethodSpec.methodBuilder("getViewState")
-					.addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-					.returns(Object.class)
-					.addParameter(CLASS_WILDCARD_TYPE_NAME, "presenterClass")
-					.addStatement("$1T viewStateProvider = ($1T) sViewStateProviders.get(presenterClass)", ViewStateProvider.class)
-					.beginControlFlow("if (viewStateProvider == null)")
-					.addStatement("return null")
-					.endControlFlow()
-					.addCode("\n")
-					.addStatement("return viewStateProvider.getViewState()")
-					.build());
-
-			classBuilder.addMethod(MethodSpec.methodBuilder("getPresenterBinders")
-					.addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-					.returns(ParameterizedTypeName.get(List.class, Object.class))
-					.addParameter(CLASS_WILDCARD_TYPE_NAME, "delegated")
-					.addStatement("return sPresenterBinders.get(delegated)")
-					.build());
-
-			classBuilder.addMethod(MethodSpec.methodBuilder("getStrategy")
-					.addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-					.returns(Object.class)
-					.addParameter(CLASS_WILDCARD_TYPE_NAME, "strategyClass")
-					.addStatement("return sStrategies.get(strategyClass)")
-					.build());
-		} else {
-			classBuilder.addMethod(MethodSpec.methodBuilder("getViewStateProviders")
-					.addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-					.returns(MAP_CLASS_TO_OBJECT_TYPE_NAME)
-					.addStatement("return sViewStateProviders")
-					.build());
-
-			classBuilder.addMethod(MethodSpec.methodBuilder("getPresenterBinders")
-					.addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-					.returns(MAP_CLASS_TO_LIST_OF_OBJECT_TYPE_NAME)
-					.addStatement("return sPresenterBinders")
-					.build());
-
-			classBuilder.addMethod(MethodSpec.methodBuilder("getStrategies")
-					.addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-					.returns(MAP_CLASS_TO_OBJECT_TYPE_NAME)
-					.addStatement("return sStrategies")
-					.build());
-		}
+		classBuilder.addStaticBlock(generateStaticInitializer(presenterClassNames, presentersContainers, strategyClasses));
+
+		classBuilder.addMethod(MethodSpec.methodBuilder("getViewState")
+                .addAnnotation(Override.class)
+                .addModifiers(Modifier.PUBLIC)
+                .returns(Object.class)
+                .addParameter(CLASS_WILDCARD_TYPE_NAME, "presenterClass")
+                .addStatement("$1T viewStateProvider = ($1T) sViewStateProviders.get(presenterClass)", ViewStateProvider.class)
+                .beginControlFlow("if (viewStateProvider == null)")
+                .addStatement("return null")
+                .endControlFlow()
+                .addCode("\n")
+                .addStatement("return viewStateProvider.getViewState()")
+                .build());
+
+		classBuilder.addMethod(MethodSpec.methodBuilder("getPresenterBinders")
+                .addAnnotation(Override.class)
+                .addModifiers(Modifier.PUBLIC)
+                .returns(ParameterizedTypeName.get(List.class, Object.class))
+                .addParameter(CLASS_WILDCARD_TYPE_NAME, "delegated")
+                .addStatement("return sPresenterBinders.get(delegated)")
+                .build());
+
+		classBuilder.addMethod(MethodSpec.methodBuilder("getStrategy")
+                .addAnnotation(Override.class)
+                .addModifiers(Modifier.PUBLIC)
+                .returns(Object.class)
+                .addParameter(CLASS_WILDCARD_TYPE_NAME, "strategyClass")
+                .addStatement("return sStrategies.get(strategyClass)")
+                .build());
 
 
 		return JavaFile.builder(destinationPackage, classBuilder.build())
@@ -114,13 +98,11 @@ public static JavaFile generate(String destinationPackage,
 
 	private static CodeBlock generateStaticInitializer(List<TypeElement> presenterClassNames,
 	                                                   List<TypeElement> presentersContainers,
-	                                                   List<TypeElement> strategyClasses,
-	                                                   List<String> additionalMoxyReflectorsPackages) {
+	                                                   List<TypeElement> strategyClasses) {
 		// sort to preserve order of statements between compilations
 		Map<TypeElement, List<TypeElement>> presenterBinders = getPresenterBinders(presentersContainers);
 		presenterClassNames.sort(TYPE_ELEMENT_COMPARATOR);
 		strategyClasses.sort(TYPE_ELEMENT_COMPARATOR);
-		additionalMoxyReflectorsPackages.sort(Comparator.naturalOrder());
 
 		CodeBlock.Builder builder = CodeBlock.builder();
 
@@ -161,15 +143,6 @@ private static CodeBlock generateStaticInitializer(List<TypeElement> presenterCl
 			builder.addStatement("sStrategies.put($1T.class, new $1T())", strategyClass);
 		}
 
-		for (String pkg : additionalMoxyReflectorsPackages) {
-			ClassName moxyReflector = ClassName.get(pkg, "MoxyReflector");
-
-			builder.add("\n");
-			builder.addStatement("sViewStateProviders.putAll($T.getViewStateProviders())", moxyReflector);
-			builder.addStatement("sPresenterBinders.putAll($T.getPresenterBinders())", moxyReflector);
-			builder.addStatement("sStrategies.putAll($T.getStrategies())", moxyReflector);
-		}
-
 		return builder.build();
 	}
 
diff --git a/moxy/src/main/java/com/arellomobile/mvp/MvpPresenter.java b/moxy/src/main/java/com/arellomobile/mvp/MvpPresenter.java
index 86f5ce75..62329e29 100644
--- a/moxy/src/main/java/com/arellomobile/mvp/MvpPresenter.java
+++ b/moxy/src/main/java/com/arellomobile/mvp/MvpPresenter.java
@@ -1,11 +1,12 @@
 package com.arellomobile.mvp;
 
-import com.arellomobile.mvp.viewstate.MvpViewState;
-
 import java.util.Collections;
 import java.util.Set;
 import java.util.WeakHashMap;
 
+import com.arellomobile.mvp.reflector.MoxyReflector;
+import com.arellomobile.mvp.viewstate.MvpViewState;
+
 /**
  * Date: 15.12.2015
  * Time: 19:31
diff --git a/moxy/src/main/java/com/arellomobile/mvp/MvpProcessor.java b/moxy/src/main/java/com/arellomobile/mvp/MvpProcessor.java
index a697fc1a..92010658 100644
--- a/moxy/src/main/java/com/arellomobile/mvp/MvpProcessor.java
+++ b/moxy/src/main/java/com/arellomobile/mvp/MvpProcessor.java
@@ -1,11 +1,12 @@
 package com.arellomobile.mvp;
 
-import com.arellomobile.mvp.presenter.PresenterField;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import com.arellomobile.mvp.presenter.PresenterField;
+import com.arellomobile.mvp.reflector.MoxyReflector;
+
 /**
  * Date: 18-Dec-15
  * Time: 13:16
diff --git a/moxy/src/main/java/com/arellomobile/mvp/reflector/MoxyReflector.java b/moxy/src/main/java/com/arellomobile/mvp/reflector/MoxyReflector.java
new file mode 100644
index 00000000..0cb9b278
--- /dev/null
+++ b/moxy/src/main/java/com/arellomobile/mvp/reflector/MoxyReflector.java
@@ -0,0 +1,66 @@
+package com.arellomobile.mvp.reflector;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Date: 07.12.2016
+ * Time: 16:39
+ *
+ * @author Yuri Shmakov
+ */
+public final class MoxyReflector {
+
+	private static final Collection<ReflectorDelegate> sReflectorDelegates = new HashSet<>();
+
+	public static void registerDelegate(final ReflectorDelegate reflectorDelegate) {
+		sReflectorDelegates.add(reflectorDelegate);
+	}
+
+	public static Object getViewState(final Class<?> presenterClass) {
+
+	    for (final ReflectorDelegate delegate: sReflectorDelegates) {
+
+	        final Object viewState = delegate.getViewState(presenterClass);
+
+	        if (viewState != null) {
+
+	            return viewState;
+            }
+        }
+
+		return null;
+	}
+
+	public static List<Object> getPresenterBinders(final Class<?> delegated) {
+        for (final ReflectorDelegate delegate: sReflectorDelegates) {
+
+            final List<Object> binders = delegate.getPresenterBinders(delegated);
+
+            if (binders != null) {
+
+                return binders;
+            }
+        }
+
+        return null;
+	}
+
+	public static Object getStrategy(final Class strategyClass) {
+
+        for (final ReflectorDelegate delegate: sReflectorDelegates) {
+
+            final Object strategy = delegate.getStrategy(strategyClass);
+
+            if (strategy != null) {
+
+                return strategy;
+            }
+        }
+
+        return null;
+	}
+}
diff --git a/moxy/src/main/java/com/arellomobile/mvp/reflector/ReflectorDelegate.java b/moxy/src/main/java/com/arellomobile/mvp/reflector/ReflectorDelegate.java
new file mode 100644
index 00000000..42594e69
--- /dev/null
+++ b/moxy/src/main/java/com/arellomobile/mvp/reflector/ReflectorDelegate.java
@@ -0,0 +1,9 @@
+package com.arellomobile.mvp.reflector;
+
+import java.util.List;
+
+public interface ReflectorDelegate {
+    Object getViewState(Class<?> presenterClass);
+    List<Object> getPresenterBinders(Class<?> delegated);
+    Object getStrategy(Class<?> strategyClass);
+}
diff --git a/moxy/src/main/java/com/arellomobile/mvp/viewstate/ViewCommands.java b/moxy/src/main/java/com/arellomobile/mvp/viewstate/ViewCommands.java
index 044d0aad..a91060f6 100644
--- a/moxy/src/main/java/com/arellomobile/mvp/viewstate/ViewCommands.java
+++ b/moxy/src/main/java/com/arellomobile/mvp/viewstate/ViewCommands.java
@@ -6,7 +6,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import com.arellomobile.mvp.MoxyReflector;
+import com.arellomobile.mvp.reflector.MoxyReflector;
 import com.arellomobile.mvp.MvpView;
 import com.arellomobile.mvp.viewstate.strategy.StateStrategy;
 
diff --git a/moxy/stub-reflector/src/main/java/com/arellomobile/mvp/MoxyReflector.java b/moxy/stub-reflector/src/main/java/com/arellomobile/mvp/MoxyReflector.java
deleted file mode 100644
index 835f1dc5..00000000
--- a/moxy/stub-reflector/src/main/java/com/arellomobile/mvp/MoxyReflector.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.arellomobile.mvp;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Date: 07.12.2016
- * Time: 16:39
- *
- * @author Yuri Shmakov
- */
-public class MoxyReflector {
-	private static Map<Class<?>, Object> sViewStateProviders;
-	private static Map<Class<?>, List<Object>> sPresenterBinders;
-	private static Map<Class<?>, Object> sStrategies;
-
-	static {
-		sViewStateProviders = new HashMap<>();
-		sPresenterBinders = new HashMap<>();
-	}
-
-	public static Object getViewState(Class<?> presenterClass) {
-		return sViewStateProviders.get(presenterClass);
-	}
-
-	public static List<Object> getPresenterBinders(Class<?> delegated) {
-		return sPresenterBinders.get(delegated);
-	}
-
-	public static Object getStrategy(Class strategyClass) {
-		return sStrategies.get(strategyClass);
-	}
-}

From b803983a0fd511225c6334ad6f62e5796576cf93 Mon Sep 17 00:00:00 2001
From: Sergey Valevich <sergey_valevich@epam.com>
Date: Fri, 15 Mar 2019 16:11:44 +0300
Subject: [PATCH 35/35] added annotation to find exact package for moxy
 reflector deleaget

---
 .../mvp/compiler/MvpCompiler.java             | 24 ++++++++++++-------
 .../mvp/RegisterMoxyReflectorDelegate.java    | 11 +++++++++
 .../mvp/RegisterMoxyReflectorPackages.java    | 13 ----------
 3 files changed, 27 insertions(+), 21 deletions(-)
 create mode 100644 moxy/src/main/java/com/arellomobile/mvp/RegisterMoxyReflectorDelegate.java
 delete mode 100644 moxy/src/main/java/com/arellomobile/mvp/RegisterMoxyReflectorPackages.java

diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/MvpCompiler.java b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/MvpCompiler.java
index 5f66f6d2..507533d2 100644
--- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/MvpCompiler.java
+++ b/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/MvpCompiler.java
@@ -1,6 +1,7 @@
 package com.arellomobile.mvp.compiler;
 
 import com.arellomobile.mvp.InjectViewState;
+import com.arellomobile.mvp.RegisterMoxyReflectorDelegate;
 import com.arellomobile.mvp.compiler.presenterbinder.InjectPresenterProcessor;
 import com.arellomobile.mvp.compiler.presenterbinder.PresenterBinderClassGenerator;
 import com.arellomobile.mvp.compiler.reflector.MoxyReflectorGenerator;
@@ -76,10 +77,12 @@ public synchronized void init(ProcessingEnvironment processingEnv) {
 	@Override
 	public Set<String> getSupportedAnnotationTypes() {
 		Set<String> supportedAnnotationTypes = new HashSet<>();
-		Collections.addAll(supportedAnnotationTypes,
+		Collections.addAll(
+		        supportedAnnotationTypes,
 				InjectPresenter.class.getCanonicalName(),
-				InjectViewState.class.getCanonicalName()
-		);
+				InjectViewState.class.getCanonicalName(),
+				RegisterMoxyReflectorDelegate.class.getCanonicalName()
+        );
 		return supportedAnnotationTypes;
 	}
 
@@ -141,16 +144,21 @@ private boolean throwableProcess(RoundEnvironment roundEnv) {
 		return true;
 	}
 
-	/**
-	 * @return first package associated with this module.
-	 * Probably should return module's top-level package
-	 */
 	private String getMoxyReflectorDelegatePackage(
 	        final RoundEnvironment roundEnv
     ) {
+        final Set<? extends Element> elements = roundEnv.getElementsAnnotatedWith(RegisterMoxyReflectorDelegate.class);
+
+        if (elements.isEmpty()) {
+            getMessager().printMessage(
+                    Diagnostic.Kind.ERROR,
+                    "Cannot find any class annotated with " + RegisterMoxyReflectorDelegate.class.getSimpleName() + " in this module"
+            );
+        }
+
 		return processingEnv
 				.getElementUtils()
-				.getPackageOf(roundEnv.getElementsAnnotatedWith(InjectPresenter.class).iterator().next())
+				.getPackageOf(elements.iterator().next())
 				.getQualifiedName()
 				.toString();
     }
diff --git a/moxy/src/main/java/com/arellomobile/mvp/RegisterMoxyReflectorDelegate.java b/moxy/src/main/java/com/arellomobile/mvp/RegisterMoxyReflectorDelegate.java
new file mode 100644
index 00000000..d133bbd9
--- /dev/null
+++ b/moxy/src/main/java/com/arellomobile/mvp/RegisterMoxyReflectorDelegate.java
@@ -0,0 +1,11 @@
+package com.arellomobile.mvp;
+
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.TYPE;
+
+/**
+ * Register MoxyReflector package
+ */
+@Target(TYPE)
+public @interface RegisterMoxyReflectorDelegate {}
diff --git a/moxy/src/main/java/com/arellomobile/mvp/RegisterMoxyReflectorPackages.java b/moxy/src/main/java/com/arellomobile/mvp/RegisterMoxyReflectorPackages.java
deleted file mode 100644
index 8b09c9be..00000000
--- a/moxy/src/main/java/com/arellomobile/mvp/RegisterMoxyReflectorPackages.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.arellomobile.mvp;
-
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.TYPE;
-
-/**
- * Register MoxyReflector packages from other modules
- */
-@Target(value = TYPE)
-public @interface RegisterMoxyReflectorPackages {
-	String[] value();
-}