Merge pull request #42 from Omega-R/develop

Develop

Author: anton-knyazev

.idea/compiler.xml

@@ -4,12 +4,12 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
     defaultConfig {
         applicationId "com.omega_r.omegabase.simple"
         multiDexEnabled true
-        minSdkVersion 14
-        targetSdkVersion 28
+        minSdkVersion 16
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -25,6 +25,7 @@ android {
         pickFirst 'META-INF/kotlinx-io.kotlin_module'
         pickFirst 'META-INF/atomicfu.kotlin_module'
         pickFirst 'META-INF/kotlinx-coroutines-io.kotlin_module'
+        pickFirst 'META-INF/library_release.kotlin_module'
     }
 
 
@@ -48,7 +49,7 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
 
     implementation project(':core')
-    kapt 'com.github.Omega-R.OmegaMoxy:moxy-compiler:1.7.1'
+    kapt 'com.github.Omega-R.OmegaMoxy:moxy-compiler:2.2.0'
     kapt project(':processor')
 
     implementation 'com.github.bumptech.glide:glide:4.9.0'

.idea/modules.xml

@@ -11,6 +11,7 @@
             android:label="@string/app_name"
             android:roundIcon="@mipmap/ic_launcher_round"
             android:supportsRtl="true"
+            android:name=".SampleApp"
             android:theme="@style/AppTheme">
         <activity android:name="com.omega_r.base.simple.MainActivity">
             <intent-filter>

app/build.gradle

@@ -3,17 +3,17 @@ package com.omega_r.base.simple
 import android.os.Bundle
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView
-import com.omega_r.base.adapters.OmegaAutoAdapter
-import com.omega_r.base.adapters.OmegaListAdapter
-import com.omega_r.base.annotations.OmegaContentView
-import com.omega_r.base.binders.IdHolder
+import com.omega_r.adapters.OmegaListAdapter
 import com.omega_r.base.components.OmegaActivity
+import com.omega_r.bind.adapters.OmegaAutoAdapter
+import com.omega_r.bind.delegates.IdHolder
+import com.omega_r.bind.model.binders.bindImage
 import com.omega_r.libs.omegatypes.Text
 import com.omega_r.libs.omegatypes.image.Image
 import com.omega_r.libs.omegatypes.image.from
 import com.omegar.libs.omegalaunchers.createActivityLauncher
 import com.omegar.libs.omegalaunchers.tools.put
-import com.omegar.mvp.presenter.InjectPresenter
+import com.omegar.mvp.ktx.providePresenter
 
 class MainActivity : OmegaActivity(R.layout.activity_main), MainView {
 
@@ -27,8 +27,7 @@ class MainActivity : OmegaActivity(R.layout.activity_main), MainView {
 
     }
 
-    @InjectPresenter
-    override lateinit var presenter: MainPresenter
+    override val presenter: MainPresenter by providePresenter()
 
     private val adapter = OmegaAutoAdapter.create(R.layout.item_test_3, ::onClickItem) {
         bindImage(R.id.imageview)
@@ -70,13 +69,13 @@ class MainActivity : OmegaActivity(R.layout.activity_main), MainView {
         showToast(Text.from(it.id.toString()))
     }
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        title = intent.getStringExtra(EXTRA_TITLE)
-        setOnClickListener(R.id.button) {
+        title = this[EXTRA_TITLE]
+        setClickListener(R.id.button) {
             showToast(Text.from("Test"))
         }
+        setMenu(R.menu.menu_main, R.id.action_test to { showToast(Text.from("Test")) })
     }
 
     private fun onClickItem(item: Image) {

app/src/main/AndroidManifest.xml

@@ -7,7 +7,6 @@ import com.omega_r.base.mvp.model.Action
 import com.omega_r.base.mvp.presenters.OmegaPresenter
 import com.omega_r.base.simple.dialog_fragment.DialogDialogFragment
 import com.omega_r.libs.omegatypes.Text
-import com.omegar.mvp.InjectViewState
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -16,7 +15,6 @@ import java.io.Serializable
 /**
  * Created by Anton Knyazev on 06.05.19.
  */
-@InjectViewState
 class MainPresenter : OmegaPresenter<MainView>() {
 
     init {

app/src/main/java/com/omega_r/base/simple/MainActivity.kt

@@ -0,0 +1,11 @@
+package com.omega_r.base.simple
+
+import android.app.Application
+
+class SampleApp : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+    }
+
+}

app/src/main/java/com/omega_r/base/simple/MainPresenter.kt

@@ -23,7 +23,7 @@ class DialogDialogFragment : OmegaDialogFragment(), DialogView {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setOnClickListener(R.id.button) {
+        setClickListener(R.id.button) {
             showToast(Text.from("Test from dialog"))
         }
     }

app/src/main/java/com/omega_r/base/simple/SampleApp.kt

@@ -1,12 +1,10 @@
 package com.omega_r.base.simple.dialog_fragment
 
 import com.omega_r.base.mvp.presenters.OmegaPresenter
-import com.omegar.mvp.InjectViewState
 
 /**
  * Created by Anton Knyazev on 10.03.2020.
  */
-@InjectViewState
 class DialogPresenter : OmegaPresenter<DialogView>() {
 
 }

app/src/main/java/com/omega_r/base/simple/dialog_fragment/DialogDialogFragment.kt

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:id="@+id/action_test"
+        android:title="@string/app_name"/>
+
+</menu>