Merge pull request #36 from Omega-R/develop

anton-knyazev · web-flow · commit 45224befc5fb · 2020-10-20T10:40:05.000+03:00
Develop
diff --git a/app/src/main/java/com/omega_r/base/simple/MainActivity.kt b/app/src/main/java/com/omega_r/base/simple/MainActivity.kt
@@ -15,8 +15,7 @@ import com.omegar.libs.omegalaunchers.createActivityLauncher
 import com.omegar.libs.omegalaunchers.tools.put
 import com.omegar.mvp.presenter.InjectPresenter
 
-@OmegaContentView(R.layout.activity_main)
-class MainActivity : OmegaActivity(), MainView {
+class MainActivity : OmegaActivity(R.layout.activity_main), MainView {
 
     companion object {
 
diff --git a/core/build.gradle b/core/build.gradle
@@ -53,9 +53,9 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${kotlinCorutines_version}"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${kotlinCorutines_version}"
     implementation "org.jetbrains.kotlin:kotlin-android-extensions-runtime:${kotlin_version}"
-
-    api 'com.github.Omega-R.OmegaMoxy:moxy:1.7.1'
-    api 'com.github.Omega-R.OmegaMoxy:moxy-androidx:1.7.1'
+//
+    api 'com.github.Omega-R.OmegaMoxy:moxy:1.7.3'
+    api 'com.github.Omega-R.OmegaMoxy:moxy-androidx:1.7.3'
 
     api "com.github.Omega-R:OmegaRecyclerView:${omegaRecyclerView}@aar"
     api 'com.github.Omega-R.OmegaTypes:glide:2.0.2'
diff --git a/core/src/main/java/com/omega_r/base/annotations/OmegaClickViews.kt b/core/src/main/java/com/omega_r/base/annotations/OmegaClickViews.kt
@@ -8,4 +8,5 @@ import androidx.annotation.IdRes
 
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
+@Deprecated("This method will be deprecated since Gradle 5.")
 annotation class OmegaClickViews(@IdRes vararg val ids: Int)
diff --git a/core/src/main/java/com/omega_r/base/annotations/OmegaContentView.kt b/core/src/main/java/com/omega_r/base/annotations/OmegaContentView.kt
@@ -8,4 +8,5 @@ import androidx.annotation.LayoutRes
 
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
+@Deprecated("This method will be deprecated since Gradle 5.")
 annotation class OmegaContentView(@LayoutRes val layoutRes: Int)
diff --git a/core/src/main/java/com/omega_r/base/annotations/OmegaHomeIndicator.kt b/core/src/main/java/com/omega_r/base/annotations/OmegaHomeIndicator.kt
@@ -8,4 +8,5 @@ import androidx.annotation.DrawableRes
 
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
+@Deprecated("This method will be deprecated since Gradle 5.")
 annotation class OmegaHomeIndicator(@DrawableRes val iconRes: Int = - 1, val isVisible: Boolean = true)
diff --git a/core/src/main/java/com/omega_r/base/annotations/OmegaMenu.kt b/core/src/main/java/com/omega_r/base/annotations/OmegaMenu.kt
@@ -7,4 +7,5 @@ import androidx.annotation.MenuRes
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
+@Deprecated("This method will be deprecated since Gradle 5.")
 annotation class OmegaMenu(@MenuRes val menuRes: Int)
diff --git a/core/src/main/java/com/omega_r/base/annotations/OmegaTheme.kt b/core/src/main/java/com/omega_r/base/annotations/OmegaTheme.kt
@@ -7,4 +7,5 @@ import androidx.annotation.StyleRes
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
+@Deprecated("This method will be deprecated since Gradle 5.")
 annotation class OmegaTheme(@StyleRes val resId: Int)
diff --git a/core/src/main/java/com/omega_r/base/annotations/OmegaTitle.kt b/core/src/main/java/com/omega_r/base/annotations/OmegaTitle.kt
@@ -7,4 +7,5 @@ import androidx.annotation.StringRes
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
+@Deprecated("This method will be deprecated since Gradle 5.")
 annotation class OmegaTitle(@StringRes val resId: Int)
diff --git a/core/src/main/java/com/omega_r/base/annotations/OmegaWindowBackground.kt b/core/src/main/java/com/omega_r/base/annotations/OmegaWindowBackground.kt
@@ -14,6 +14,7 @@ import com.omega_r.libs.extensions.context.getCompatDrawable
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
+@Deprecated("This method will be deprecated since Gradle 5.")
 annotation class OmegaWindowBackground(
     @DrawableRes val drawableRes: Int = 0,
     @AttrRes val colorAttrRes: Int = 0,
diff --git a/core/src/main/java/com/omega_r/base/binders/OmegaBindable.kt b/core/src/main/java/com/omega_r/base/binders/OmegaBindable.kt
@@ -7,9 +7,10 @@ import android.view.animation.AnimationUtils
 import androidx.annotation.*
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
-import androidx.vectordrawable.graphics.drawable.AnimatorInflaterCompat
 import com.omega_r.base.OmegaContextable
 import com.omega_r.base.OmegaViewFindable
+import com.omega_r.base.adapters.OmegaAutoAdapter
+import com.omega_r.base.adapters.model.AutoBindModel
 import com.omega_r.base.binders.managers.BindersManager
 import com.omega_r.base.binders.managers.BindersManager.BindType.RESETTABLE
 import com.omega_r.base.binders.managers.BindersManager.BindType.RESETTABLE_WITH_AUTO_INIT
@@ -55,6 +56,18 @@ interface OmegaBindable : OmegaContextable, OmegaViewFindable {
             this.adapter = adapter
         }
 
+    fun <T : RecyclerView, M> bind(
+        @IdRes res: Int,
+        @LayoutRes layoutRes: Int,
+        parentModel: AutoBindModel<M>? = null,
+        callback: ((M) -> Unit)? = null,
+        builder: AutoBindModel.Builder<M>.() -> Unit
+    ) =
+        bindersManager.bind<T>(RESETTABLE_WITH_AUTO_INIT, { findView(res) }) {
+            adapter =
+                OmegaAutoAdapter.create(layoutRes = layoutRes, callback = callback, parentModel = parentModel, block = builder)
+        }
+
     fun <T : RecyclerView> bind(@IdRes res: Int, adapter: RecyclerView.Adapter<*>, initBlock: T.() -> Unit) =
         bindersManager.bind<T>(RESETTABLE_WITH_AUTO_INIT, { findView(res) }) {
             this.adapter = adapter
diff --git a/core/src/main/java/com/omega_r/base/components/OmegaActivity.kt b/core/src/main/java/com/omega_r/base/components/OmegaActivity.kt
@@ -14,6 +14,7 @@ import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.omega_r.base.R
+import com.omega_r.base.adapters.model.AutoBindModel
 import com.omega_r.base.annotations.*
 import com.omega_r.base.annotations.OmegaWindowBackground.Companion.apply
 import com.omega_r.base.binders.IdHolder
@@ -35,14 +36,19 @@ import java.io.Serializable
  */
 
 
-abstract class OmegaActivity : MvpAppCompatActivity(), OmegaComponent {
+abstract class OmegaActivity : MvpAppCompatActivity, OmegaComponent {
 
     override val clickManager = ClickManager()
 
     override val bindersManager = BindersManager()
 
     protected val dialogManager by lazy { DialogManager(this) }
 
+    constructor() : super()
+
+    @ContentView
+    constructor(@LayoutRes contentLayoutId: Int) : super(contentLayoutId)
+
     override fun getContext(): Context = this
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -304,6 +310,16 @@ abstract class OmegaActivity : MvpAppCompatActivity(), OmegaComponent {
     final override fun <T : RecyclerView> bind(@IdRes res: Int, adapter: RecyclerView.Adapter<*>) =
         super.bind<T>(res, adapter)
 
+    final override fun <T : RecyclerView, M> bind(
+        res: Int,
+        layoutRes: Int,
+        parentModel: AutoBindModel<M>?,
+        callback: ((M) -> Unit)?,
+        builder: AutoBindModel.Builder<M>.() -> Unit
+    ): Lazy<T> {
+        return super.bind(res, layoutRes, parentModel, callback, builder)
+    }
+
     final override fun <T : View, E> bind(vararg idsPair: Pair<E, Int>, initBlock: T.(E) -> Unit) =
         super.bind(idsPair = *idsPair, initBlock = initBlock)
 
diff --git a/core/src/main/java/com/omega_r/base/components/OmegaBottomSheetDialogFragment.kt b/core/src/main/java/com/omega_r/base/components/OmegaBottomSheetDialogFragment.kt
@@ -8,6 +8,7 @@ import android.os.Bundle
 import android.view.*
 import androidx.annotation.*
 import androidx.recyclerview.widget.RecyclerView
+import com.omega_r.base.adapters.model.AutoBindModel
 import com.omega_r.base.annotations.*
 import com.omega_r.base.annotations.OmegaWindowBackground.Companion.apply
 import com.omega_r.base.binders.IdHolder
@@ -276,6 +277,16 @@ abstract class OmegaBottomSheetDialogFragment : MvpBottomSheetDialogFragment(),
 
     final override fun <T : RecyclerView> bind(@IdRes res: Int, adapter: RecyclerView.Adapter<*>) = super.bind<T>(res, adapter)
 
+    final override fun <T : RecyclerView, M> bind(
+        res: Int,
+        layoutRes: Int,
+        parentModel: AutoBindModel<M>?,
+        callback: ((M) -> Unit)?,
+        builder: AutoBindModel.Builder<M>.() -> Unit
+    ): Lazy<T> {
+        return super.bind(res, layoutRes, parentModel, callback, builder)
+    }
+
     final override fun <T : View, E> bind(vararg idsPair: Pair<E, Int>, initBlock: T.(E) -> Unit) =
         super.bind(idsPair = *idsPair, initBlock = initBlock)
 
diff --git a/core/src/main/java/com/omega_r/base/components/OmegaDialog.kt b/core/src/main/java/com/omega_r/base/components/OmegaDialog.kt
@@ -7,6 +7,7 @@ import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import com.omega_r.base.adapters.model.AutoBindModel
 import com.omega_r.base.annotations.OmegaClickViews
 import com.omega_r.base.annotations.OmegaContentView
 import com.omega_r.base.binders.IdHolder
@@ -85,6 +86,16 @@ open class OmegaDialog : Dialog, OmegaBindable, OmegaClickable {
 
     final override fun <T : RecyclerView> bind(res: Int, adapter: RecyclerView.Adapter<*>) = super.bind<T>(res, adapter)
 
+    final override fun <T : RecyclerView, M> bind(
+        res: Int,
+        layoutRes: Int,
+        parentModel: AutoBindModel<M>?,
+        callback: ((M) -> Unit)?,
+        builder: AutoBindModel.Builder<M>.() -> Unit
+    ): Lazy<T> {
+        return super.bind(res, layoutRes, parentModel, callback, builder)
+    }
+
     final override fun <T : View, E> bind(vararg idsPair: Pair<E, Int>, initBlock: T.(E) -> Unit) =
         super.bind(idsPair = *idsPair, initBlock = initBlock)
 
diff --git a/core/src/main/java/com/omega_r/base/components/OmegaDialogFragment.kt b/core/src/main/java/com/omega_r/base/components/OmegaDialogFragment.kt
@@ -8,6 +8,7 @@ import android.os.Bundle
 import android.view.*
 import androidx.annotation.*
 import androidx.recyclerview.widget.RecyclerView
+import com.omega_r.base.adapters.model.AutoBindModel
 import com.omega_r.base.annotations.*
 import com.omega_r.base.annotations.OmegaWindowBackground.Companion.apply
 import com.omega_r.base.binders.IdHolder
@@ -280,6 +281,16 @@ abstract class OmegaDialogFragment : MvpAppCompatDialogFragment(), OmegaComponen
 
     final override fun <T : RecyclerView> bind(@IdRes res: Int, adapter: RecyclerView.Adapter<*>) = super.bind<T>(res, adapter)
 
+    final override fun <T : RecyclerView, M> bind(
+        res: Int,
+        layoutRes: Int,
+        parentModel: AutoBindModel<M>?,
+        callback: ((M) -> Unit)?,
+        builder: AutoBindModel.Builder<M>.() -> Unit
+    ): Lazy<T> {
+        return super.bind(res, layoutRes, parentModel, callback, builder)
+    }
+
     final override fun <T : View, E> bind(vararg idsPair: Pair<E, Int>, initBlock: T.(E) -> Unit) =
         super.bind(idsPair = *idsPair, initBlock = initBlock)
 
diff --git a/core/src/main/java/com/omega_r/base/components/OmegaFragment.kt b/core/src/main/java/com/omega_r/base/components/OmegaFragment.kt
@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.view.*
 import androidx.annotation.*
 import androidx.recyclerview.widget.RecyclerView
+import com.omega_r.base.adapters.model.AutoBindModel
 import com.omega_r.base.annotations.OmegaClickViews
 import com.omega_r.base.annotations.OmegaContentView
 import com.omega_r.base.annotations.OmegaMenu
@@ -26,7 +27,7 @@ import java.io.Serializable
 /**
  * Created by Anton Knyazev on 04.04.2019.
  */
-abstract class OmegaFragment : MvpAppCompatFragment(), OmegaComponent {
+abstract class OmegaFragment : MvpAppCompatFragment, OmegaComponent {
 
     private val dialogList = mutableListOf<Dialog>()
 
@@ -36,6 +37,11 @@ abstract class OmegaFragment : MvpAppCompatFragment(), OmegaComponent {
 
     private var childPresenterAttached = false
 
+    constructor() : super()
+
+    @ContentView
+    constructor(@LayoutRes contentLayoutId: Int) : super(contentLayoutId)
+
     open fun getTitle(): Text? = null
 
     override fun <T : View> findViewById(id: Int) = view?.findViewById<T>(id)
@@ -258,6 +264,16 @@ abstract class OmegaFragment : MvpAppCompatFragment(), OmegaComponent {
     final override fun <T : RecyclerView> bind(@IdRes res: Int, adapter: RecyclerView.Adapter<*>) =
         super.bind<T>(res, adapter)
 
+    final override fun <T : RecyclerView, M> bind(
+        res: Int,
+        layoutRes: Int,
+        parentModel: AutoBindModel<M>?,
+        callback: ((M) -> Unit)?,
+        builder: AutoBindModel.Builder<M>.() -> Unit
+    ): Lazy<T> {
+        return super.bind(res, layoutRes, parentModel, callback, builder)
+    }
+
     final override fun <T : View, E> bind(vararg idsPair: Pair<E, Int>, initBlock: T.(E) -> Unit) =
         super.bind(idsPair = *idsPair, initBlock = initBlock)
 
