Feature/omega layout resource

README.md

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

build.gradle

@@ -7,7 +7,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
 
@@ -16,25 +17,32 @@ allprojects {
         jcenter()
         mavenCentral()
         google()
+        maven { url 'https://jitpack.io' }
     }
 }
 
 ext {
-    targetVersionCode = 45
-    targetVersionName = "1.5.5"
+    targetVersionCode = 46
+    targetVersionName = "1.5.6"
+    kotlin_version = '1.3.50'
+    def autoServiceVersion = '1.0-rc5'
+    def gradleIncapHelperVersion = '0.2'
 
     deps = [
-            android       : 'com.google.android:android:1.6_r2',
-            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.15',
-            asm           : ['org.ow2.asm:asm:6.0', 'org.ow2.asm:asm-util:6.0'],
-            autoservice   : 'com.google.auto.service:auto-service:1.0-rc4',
-            autocommon    : 'com.google.auto:auto-common:0.10',
-            guava         : 'com.google.guava:guava:21.0',
+            android                     : 'com.google.android:android:1.6_r2',
+            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.15',
+            asm                         : ['org.ow2.asm:asm:6.0', 'org.ow2.asm:asm-util:6.0'],
+            autoservice                 : "com.google.auto.service:auto-service:$autoServiceVersion",
+            autoserviceAnnotations      : "com.google.auto.service:auto-service-annotations:$autoServiceVersion",
+            autocommon                  : 'com.google.auto:auto-common:0.10',
+            guava                       : 'com.google.guava:guava:21.0',
+            gradleIncapHelperAnnotations: "net.ltgt.gradle.incap:incap:$gradleIncapHelperVersion",
+            gradleIncapHelperProcessor  : "net.ltgt.gradle.incap:incap-processor:$gradleIncapHelperVersion"
     ]
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Nov 24 23:06:24 NOVT 2018
+#Wed Oct 09 11:52:42 MSK 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

moxy-android/src/main/java/com/arellomobile/mvp/MvpActivity.java → moxy-android/src/main/java/com/omegar/mvp/MvpActivity.java

@@ -1,4 +1,4 @@
-package com.arellomobile.mvp;
+package com.omegar.mvp;
 
 import android.app.Activity;
 import android.os.Bundle;

moxy-android/src/main/java/com/arellomobile/mvp/MvpApplication.java → moxy-android/src/main/java/com/omegar/mvp/MvpApplication.java

@@ -1,4 +1,4 @@
-package com.arellomobile.mvp;
+package com.omegar.mvp;
 
 import android.app.Application;
 

moxy-android/src/main/java/com/arellomobile/mvp/MvpDialogFragment.java → moxy-android/src/main/java/com/omegar/mvp/MvpDialogFragment.java

@@ -1,4 +1,4 @@
-package com.arellomobile.mvp;
+package com.omegar.mvp;
 
 import android.app.DialogFragment;
 import android.app.Fragment;

moxy-android/src/main/java/com/arellomobile/mvp/MvpFragment.java → moxy-android/src/main/java/com/omegar/mvp/MvpFragment.java

@@ -1,4 +1,4 @@
-package com.arellomobile.mvp;
+package com.omegar.mvp;
 
 import android.app.Fragment;
 import android.os.Build;

moxy-androidx-sapmle/build.gradle → moxy-androidx-sample/build.gradle

@@ -1,5 +1,4 @@
 buildscript {
-    ext.kotlin_version = '1.3.10'
     repositories {
         google()
         jcenter()
@@ -19,13 +18,13 @@ android {
     compileSdkVersion 28
 
     defaultConfig {
-        applicationId "com.arellomobile.mvp.sample.androidx"
+        applicationId "com.omegar.mvp.sample.androidx"
         minSdkVersion 16
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "android.support.generateInfos.runner.AndroidJUnitRunner"
     }
 
     sourceSets {
@@ -41,7 +40,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation project(':moxy')
     implementation project(':moxy-androidx')
     kapt project(':moxy-compiler')

moxy-androidx-sapmle/src/main/AndroidManifest.xml → 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.moxy_androidx_sample">
 
     <application
         android:allowBackup="true"
@@ -9,7 +9,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name="example.com.moxy_androidx_sample.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 

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

@@ -0,0 +1,23 @@
+package example.com.moxy_androidx_sample;
+
+import androidx.annotation.ContentView;
+import androidx.annotation.LayoutRes;
+import com.omegar.mvp.MvpAppCompatActivity;
+
+public abstract class BaseActivity extends MvpAppCompatActivity implements BaseView {
+
+    public BaseActivity() {
+        super();
+    }
+
+    @ContentView
+    public BaseActivity(@LayoutRes int contentLayoutId) {
+        super(contentLayoutId);
+    }
+
+    @Override
+    public void testFunction() {
+
+    }
+
+}

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

@@ -0,0 +1,12 @@
+package example.com.moxy_androidx_sample;
+
+import com.omegar.mvp.MvpView;
+import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy;
+import com.omegar.mvp.viewstate.strategy.StateStrategyType;
+
+public interface BaseView extends MvpView {
+
+    @StateStrategyType(AddToEndSingleStrategy.class)
+    void testFunction();
+
+}

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

@@ -0,0 +1,54 @@
+package example.com.moxy_androidx_sample
+
+import android.location.Location
+import android.os.Bundle
+import android.util.Log
+import com.omegar.mvp.presenter.InjectPresenter
+import example.com.moxy_androidx_sample.contract.Contract
+import example.com.moxy_androidx_sample.packagee.Item
+
+class MainActivity : BaseActivity(R.layout.activity_main), Contract.MainView, SecondInterface {
+	override fun fourth(item: String?) {
+		TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+	}
+
+	override fun firstLog(m: Item?) {
+		TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+	}
+
+	override fun firstCopyMethod(item: MutableList<Location>?) {
+		TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+	}
+
+	override fun thirdMethod() {
+		TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+	}
+
+	override fun secondMethod() {
+		TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+	}
+
+	override fun firstMethod(item: List<Item>) {
+		TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+	}
+
+	@InjectPresenter
+	internal lateinit var presenter: MainPresenter
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+//		setContentView(R.layout.activity_main)
+	}
+
+	override fun printLog(msg: Double?, log: String?) {
+		Log.e(TAG, "printLog : msg : $msg activity hash code : ${hashCode()}")
+	}
+
+	override fun second() {
+		TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+	}
+
+	companion object {
+		const val TAG = "MoxyDebug"
+	}
+}

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

@@ -0,0 +1,16 @@
+package example.com.moxy_androidx_sample
+
+import android.util.Log
+import com.omegar.mvp.InjectViewState
+import com.omegar.mvp.MvpPresenter
+import example.com.moxy_androidx_sample.contract.Contract
+
+class MainPresenter : MvpPresenter<Contract.MainView>() {
+
+	override fun onFirstViewAttach() {
+		super.onFirstViewAttach()
+		Log.e(MainActivity.TAG, "presenter hash code : ${hashCode()}")
+		viewState.printLog(10.0, "Kek")
+	}
+
+}

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

@@ -0,0 +1,9 @@
+package example.com.moxy_androidx_sample;
+
+public class NotMainActivity extends BaseActivity implements NotMainView {
+
+    @Override
+    public void notMainFunction() {
+
+    }
+}

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

@@ -0,0 +1,7 @@
+package example.com.moxy_androidx_sample;
+
+public class NotMainPresenter  {
+
+
+
+}

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

@@ -0,0 +1,7 @@
+package example.com.moxy_androidx_sample;
+
+public interface NotMainView {
+
+    void notMainFunction();
+
+}

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

@@ -0,0 +1,7 @@
+package example.com.moxy_androidx_sample
+
+interface SecondInterface {
+
+    fun second()
+
+}

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

@@ -0,0 +1,19 @@
+package example.com.moxy_androidx_sample.contract
+
+import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy
+import com.omegar.mvp.viewstate.strategy.StateStrategyType
+import example.com.moxy_androidx_sample.fifth.Contract
+import example.com.moxy_androidx_sample.first.FirstView
+import example.com.moxy_androidx_sample.packagee.Item
+import example.com.moxy_androidx_sample.second.SecondView
+
+interface Contract {
+
+    interface MainView : FirstView<Item>, SecondView, Contract.FifthView {
+
+        @StateStrategyType(AddToEndSingleStrategy::class)
+        fun printLog(msg: Double?, log: String?)
+
+    }
+
+}

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

@@ -0,0 +1,14 @@
+package example.com.moxy_androidx_sample.fifth;
+
+import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy;
+import com.omegar.mvp.viewstate.strategy.StateStrategyType;
+
+import example.com.moxy_androidx_sample.fourth.FourthView;
+
+public interface Contract {
+
+    interface FifthView extends FourthView<String> {
+
+    }
+
+}