Merge pull request #10 from Omega-R/develop

Develop

Author: anton-knyazev

.idea/codeStyles/Project.xml

@@ -25,22 +25,31 @@ android {
         pickFirst 'META-INF/atomicfu.kotlin_module'
         pickFirst 'META-INF/kotlinx-coroutines-io.kotlin_module'
     }
+
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
-    implementation 'androidx.core:core-ktx:1.1.0-alpha05'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}"
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha05'
+    implementation 'androidx.core:core-ktx:1.1.0-beta01'
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${kotlinCorutines_version}"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${kotlinCorutines_version}"
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha5'
+    testImplementation 'junit:junit:4.13-beta-3'
+    androidTestImplementation 'androidx.test:runner:1.2.0-beta01'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0-beta01'
     implementation project(':lib')
-    implementation 'com.github.Omega-R:OmegaRecyclerView:1.9.4'
+    implementation "com.github.Omega-R:OmegaRecyclerView:${omegaRecyclerView}"
     implementation 'com.github.Omega-R.OmegaMoxy:moxy:1.5.7'
     implementation 'com.github.Omega-R.OmegaMoxy:moxy-androidx:1.5.7'
     kapt 'com.github.Omega-R.OmegaMoxy:moxy-compiler:1.5.7'
-    implementation 'com.github.Omega-R.OmegaTypes:omegatypes:0.2.0'
+    implementation 'com.github.Omega-R.OmegaTypes:omegatypes:ae42598df9'
 
 }

.idea/misc.xml

@@ -1,34 +1,40 @@
 package com.omega_r.base.simple
 
 import android.view.View
+import androidx.recyclerview.widget.RecyclerView
 import com.omega_r.base.adapters.OmegaAutoAdapter
 import com.omega_r.base.annotations.OmegaContentView
 import com.omega_r.base.binders.IdHolder
 import com.omega_r.base.components.OmegaActivity
-import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView
 import com.omega_r.libs.omegatypes.Text
+import com.omegar.mvp.presenter.InjectPresenter
 
 @OmegaContentView(R.layout.activity_main)
-class MainActivity : OmegaActivity(), OmegaAutoAdapter.Callback<MainActivity.Item> {
+class MainActivity : OmegaActivity(), MainView {
 
-    private val adapter = OmegaAutoAdapter.create(R.layout.item_test, this) {
+    @InjectPresenter
+    override lateinit var presenter: MainPresenter
+
+    private val adapter = OmegaAutoAdapter.create(R.layout.item_test, R.layout.item_test2, ::onClickItem) {
         bind(R.id.textview_test, Item::text)
+        bindClick(R.id.textview_test1) {
+            showToast(Text.from("MENU!"))
+        }
         bindRecycler(R.id.recyclerview, R.layout.item_test, Item::list) {
             bind(R.id.textview_test, SubItem::text)
         }
+    }.apply {
+        list = listOf(Item(), Item())
     }
 
-    private val recyclerView: OmegaRecyclerView by bind(R.id.recyclerview) {
-        this@MainActivity.adapter.list = listOf(Item(), Item())
-        adapter = this@MainActivity.adapter
-    }
+    private val recyclerView: RecyclerView by bind(R.id.recyclerview, adapter)
 
     private val maps: Map<Field, View> by bind(Field.values()) {
         showToast(Text.from(it.id.toString()))
     }
 
-    override fun onClickItem(item: Item, position: Int) {
-        showToast(Text.from("Click $position"))
+    private fun onClickItem(item: Item) {
+        showToast(Text.from("Click $item"))
     }
 
     data class Item (val text: String = "123", val list: List<SubItem> = listOf(SubItem(), SubItem(), SubItem(), SubItem(), SubItem(), SubItem(), SubItem(), SubItem(), SubItem(), SubItem()))

app/build.gradle

@@ -0,0 +1,27 @@
+package com.omega_r.base.simple
+
+import com.omega_r.base.mvp.OmegaPresenter
+import com.omega_r.base.mvp.model.Action
+import com.omega_r.libs.omegatypes.Text
+import com.omegar.mvp.InjectViewState
+
+/**
+ * Created by Anton Knyazev on 06.05.19.
+ */
+@InjectViewState
+class MainPresenter : OmegaPresenter<MainView>() {
+
+    init {
+        viewState.showMessage(Text.from("test"), Action(Text.from("Test")){
+            viewState.showToast(Text.from("test"))
+        })
+
+        viewState.showQuery(Text.from("message"), Text.from("title"), positiveAction = Action("Yes") {
+
+        }, negativeAction = Action("No", {
+
+        }))
+
+    }
+
+}

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

@@ -0,0 +1,9 @@
+package com.omega_r.base.simple
+
+import com.omega_r.base.mvp.OmegaView
+
+interface MainView: OmegaView {
+
+
+
+}

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/text"
               android:orientation="vertical"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
@@ -9,7 +10,8 @@
     <TextView
             android:id="@+id/textview_test"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+    />
 
     <com.omega_r.libs.omegarecyclerview.OmegaRecyclerView
             android:id="@+id/recyclerview"

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:background="?selectableItemBackground">
+
+    <TextView
+            android:id="@+id/textview_test1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="32dp"
+            android:textSize="14sp"
+            android:background="@color/colorAccent"
+            android:textColor="#fff"
+            android:text="123"
+    />
+
+
+</LinearLayout>

app/src/main/res/layout/item_test.xml

@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

app/src/main/res/layout/item_test2.xml

@@ -1,14 +1,18 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
+ext {
+    omegaRecyclerView = '1.9.6'
+    kotlinCorutines_version = '1.2.1'
+
+}// Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.21'
+    ext.kotlin_version = '1.3.31'
     repositories {
         google()
         jcenter()
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.4.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files