Merge pull request #10 from Omega-R/develop

Refactoring and fixing

Author: anton-knyazev

build.gradle

@@ -24,7 +24,7 @@ allprojects {
 ext {
     targetVersionCode = 46
     targetVersionName = "1.5.6"
-    kotlin_version = '1.3.21'
+    kotlin_version = '1.3.41'
 
     deps = [
             android       : 'com.google.android:android:1.6_r2',

moxy-androidx-sapmle/.gitignore moxy-androidx-sample/.gitignoremoxy-androidx-sapmle/.gitignore renamed to moxy-androidx-sample/.gitignore

@@ -24,7 +24,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "android.support.generateInfos.runner.AndroidJUnitRunner"
     }
 
     sourceSets {

moxy-androidx-sapmle/build.gradle moxy-androidx-sample/build.gradlemoxy-androidx-sapmle/build.gradle renamed to moxy-androidx-sample/build.gradle

@@ -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-sapmle/gradle.properties moxy-androidx-sample/gradle.propertiesmoxy-androidx-sapmle/gradle.properties renamed to moxy-androidx-sample/gradle.properties

@@ -0,0 +1,12 @@
+package example.com.moxy_androidx_sample;
+
+import com.omegar.mvp.MvpAppCompatActivity;
+
+public abstract class BaseActivity extends MvpAppCompatActivity implements BaseView {
+
+    @Override
+    public void testFunction() {
+
+    }
+
+}

moxy-androidx-sapmle/proguard-rules.pro moxy-androidx-sample/proguard-rules.promoxy-androidx-sapmle/proguard-rules.pro renamed to moxy-androidx-sample/proguard-rules.pro

@@ -0,0 +1,9 @@
+package example.com.moxy_androidx_sample;
+
+import com.omegar.mvp.MvpView;
+
+public interface BaseView extends MvpView {
+
+    void testFunction();
+
+}

…oidx-sapmle/src/main/AndroidManifest.xml …oidx-sample/src/main/AndroidManifest.xmlmoxy-androidx-sapmle/src/main/AndroidManifest.xml renamed to moxy-androidx-sample/src/main/AndroidManifest.xml moxy-androidx-sapmle/src/main/AndroidManifest.xml renamed to moxy-androidx-sample/src/main/AndroidManifest.xml

@@ -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(), 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/BaseActivity.java

@@ -1,16 +1,17 @@
-package example.com.moxy_androidx_sapmle
+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
 
 @InjectViewState
-class MainPresenter : MvpPresenter<MainView>() {
+class MainPresenter : MvpPresenter<Contract.MainView>() {
 
 	override fun onFirstViewAttach() {
 		super.onFirstViewAttach()
 		Log.e(MainActivity.TAG, "presenter hash code : ${hashCode()}")
-		viewState.printLog("TEST")
+		viewState.printLog(10.0, "Kek")
 	}
 
 }