Merge pull request #14 from Omega-R/develop

Develop

Author: anton-knyazev

app/build.gradle

@@ -48,13 +48,7 @@ dependencies {
     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:${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:1.0.1'
-    implementation 'com.github.Omega-R.OmegaTypes:glide:1.0.1'
-    implementation 'com.github.Omega-R:OmegaLaunchers:1.0.1'
 
 
 }

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

@@ -1,9 +1,10 @@
 package com.omega_r.base.simple
 
-import com.omega_r.base.mvp.presenters.OmegaPresenter
 import com.omega_r.base.mvp.model.Action
+import com.omega_r.base.mvp.presenters.OmegaPresenter
 import com.omega_r.libs.omegatypes.Text
 import com.omegar.mvp.InjectViewState
+import java.io.Serializable
 
 /**
  * Created by Anton Knyazev on 06.05.19.
@@ -12,16 +13,25 @@ import com.omegar.mvp.InjectViewState
 class MainPresenter : OmegaPresenter<MainView>() {
 
     init {
-        viewState.showMessage(Text.from("test"), Action(Text.from("Test")){
+        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") {
+        viewState.showQuery(
+            Text.from("message"),
+            Text.from("title"),
+            positiveAction = Action("Yes"),
+            negativeAction = Action("No")
+        )
 
-        }, negativeAction = Action("No", {
-
-        }))
+        intentBuilder.settings()
+            .application()
+            .launch()
+    }
 
+    override fun onLaunchResult(requestCode: Int, success: Boolean, data: Serializable?): Boolean {
+        viewState.showToast(Text.from("onLaunchResult = $requestCode"))
+        return super.onLaunchResult(requestCode, success, data)
     }
 
 }

lib/build.gradle

@@ -53,18 +53,18 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${kotlinCorutines_version}"
     implementation "org.jetbrains.kotlin:kotlin-android-extensions-runtime:${kotlin_version}"
 
-    implementation 'com.github.Omega-R.OmegaMoxy:moxy:1.5.8'
-    implementation 'com.github.Omega-R.OmegaMoxy:moxy-androidx:1.5.8'
-    implementation 'com.github.Omega-R:OmegaLaunchers:1.0.1'
+    api 'com.github.Omega-R.OmegaMoxy:moxy:1.5.8'
+    api 'com.github.Omega-R.OmegaMoxy:moxy-androidx:1.5.8'
 
     kapt 'com.github.Omega-R.OmegaMoxy:moxy-compiler:1.5.8'
 
-    implementation "com.github.Omega-R:OmegaRecyclerView:${omegaRecyclerView}@aar"
-    implementation 'com.github.Omega-R.OmegaTypes:omegatypes:1.0.1'
-    implementation 'com.github.Omega-R.OmegaTypes:glide:1.0.1'
+    api "com.github.Omega-R:OmegaRecyclerView:${omegaRecyclerView}@aar"
+    api 'com.github.Omega-R.OmegaTypes:glide:1.0.2'
+    api 'com.github.Omega-R:OmegaIntentBuilder:1.2.0'
+    api 'com.github.Omega-R:OmegaLaunchers:1.0.2'
 
-    implementation "com.squareup.retrofit2:retrofit:2.4.0"
-    implementation "com.squareup.moshi:moshi-kotlin:1.8.0"
+    api "com.squareup.retrofit2:retrofit:2.6.1"
+    api "com.squareup.moshi:moshi-kotlin:1.8.0"
 
     implementation 'com.google.android.material:material:1.1.0-alpha06'
 

lib/src/main/java/com/omega_r/base/components/OmegaActivity.kt

@@ -22,6 +22,7 @@ import com.omega_r.base.mvp.views.findAnnotation
 import com.omega_r.base.tools.WaitingDialog
 import com.omega_r.libs.omegatypes.Text
 import com.omegar.libs.omegalaunchers.ActivityLauncher
+import com.omegar.libs.omegalaunchers.BaseIntentLauncher
 import com.omegar.libs.omegalaunchers.DialogFragmentLauncher
 import com.omegar.libs.omegalaunchers.FragmentLauncher
 import com.omegar.mvp.MvpAppCompatActivity
@@ -233,7 +234,7 @@ abstract class OmegaActivity : MvpAppCompatActivity(), OmegaComponent {
         }
     }
 
-    override fun launchForResult(launcher: ActivityLauncher, requestCode: Int) {
+    override fun launchForResult(launcher: BaseIntentLauncher, requestCode: Int) {
         launcher.launchForResult(this, requestCode)
     }
 

lib/src/main/java/com/omega_r/base/components/OmegaBottomSheetDialogFragment.kt

@@ -17,6 +17,7 @@ import com.omega_r.base.mvp.model.Action
 import com.omega_r.base.mvp.views.findAnnotation
 import com.omega_r.libs.omegatypes.Text
 import com.omegar.libs.omegalaunchers.ActivityLauncher
+import com.omegar.libs.omegalaunchers.BaseIntentLauncher
 import com.omegar.libs.omegalaunchers.DialogFragmentLauncher
 import com.omegar.libs.omegalaunchers.FragmentLauncher
 import com.omegar.mvp.MvpBottomSheetDialogFragment
@@ -148,7 +149,7 @@ abstract class OmegaBottomSheetDialogFragment : MvpBottomSheetDialogFragment(),
         }
     }
 
-    override fun launchForResult(launcher: ActivityLauncher, requestCode: Int) {
+    override fun launchForResult(launcher: BaseIntentLauncher, requestCode: Int) {
         launcher.launchForResult(this, requestCode)
     }
 

lib/src/main/java/com/omega_r/base/components/OmegaDialogFragment.kt

@@ -15,13 +15,12 @@ import com.omega_r.base.binders.managers.ResettableBindersManager
 import com.omega_r.base.clickers.ClickManager
 import com.omega_r.base.mvp.views.findAnnotation
 import com.omega_r.base.mvp.model.Action
-import com.omega_r.base.mvp.views.OmegaView
 import com.omega_r.libs.omegatypes.Text
 import com.omegar.libs.omegalaunchers.ActivityLauncher
+import com.omegar.libs.omegalaunchers.BaseIntentLauncher
 import com.omegar.libs.omegalaunchers.DialogFragmentLauncher
 import com.omegar.libs.omegalaunchers.FragmentLauncher
 import com.omegar.mvp.MvpAppCompatDialogFragment
-import java.io.Serializable
 
 /**
  * Created by Anton Knyazev on 04.04.2019.
@@ -153,7 +152,7 @@ abstract class OmegaDialogFragment : MvpAppCompatDialogFragment(), OmegaComponen
         }
     }
 
-    override fun launchForResult(launcher: ActivityLauncher, requestCode: Int) {
+    override fun launchForResult(launcher: BaseIntentLauncher, requestCode: Int) {
         launcher.launchForResult(this, requestCode)
     }
 

lib/src/main/java/com/omega_r/base/components/OmegaFragment.kt

@@ -17,6 +17,7 @@ import com.omega_r.base.mvp.views.findAnnotation
 import com.omega_r.base.mvp.model.Action
 import com.omega_r.libs.omegatypes.Text
 import com.omegar.libs.omegalaunchers.ActivityLauncher
+import com.omegar.libs.omegalaunchers.BaseIntentLauncher
 import com.omegar.libs.omegalaunchers.DialogFragmentLauncher
 import com.omegar.libs.omegalaunchers.FragmentLauncher
 import com.omegar.mvp.MvpAppCompatFragment
@@ -155,7 +156,7 @@ abstract class OmegaFragment : MvpAppCompatFragment(), OmegaComponent {
         }
     }
 
-    override fun launchForResult(launcher: ActivityLauncher, requestCode: Int) {
+    override fun launchForResult(launcher: BaseIntentLauncher, requestCode: Int) {
         launcher.launchForResult(this, requestCode)
     }
 

lib/src/main/java/com/omega_r/base/errors/ErrorHandler.kt

@@ -19,7 +19,7 @@ open class ErrorHandler : (Throwable) -> Exception, CoroutineExceptionHandler {
     protected open fun handleHttpException(httpException: HttpException): AppException {
         val response = httpException.response()
 
-        when (response.code()) {
+        when (response?.code()) {
             HTTP_INTERNAL_ERROR -> return AppException.ServerProblem(
                 "Internal server error",
                 httpException

lib/src/main/java/com/omega_r/base/mvp/presenters/OmegaPresenter.kt

@@ -3,7 +3,10 @@ package com.omega_r.base.mvp.presenters
 import com.omega_r.base.data.OmegaRepository
 import com.omega_r.base.data.sources.Source
 import com.omega_r.base.mvp.views.OmegaView
+import com.omega_r.libs.omegaintentbuilder.OmegaIntentBuilder
+import com.omega_r.libs.omegaintentbuilder.interfaces.IntentBuilder
 import com.omegar.libs.omegalaunchers.ActivityLauncher
+import com.omegar.libs.omegalaunchers.BaseIntentLauncher
 import com.omegar.libs.omegalaunchers.Launcher
 import com.omegar.mvp.MvpPresenter
 import kotlinx.coroutines.*
@@ -14,14 +17,17 @@ import kotlin.coroutines.CoroutineContext
 /**
  * Created by Anton Knyazev on 04.04.2019.
  */
-open class OmegaPresenter<View: OmegaView>: MvpPresenter<View>(), CoroutineScope {
+open class OmegaPresenter<View : OmegaView> : MvpPresenter<View>(), CoroutineScope {
 
     private val handler = CoroutineExceptionHandler { _, throwable -> handleErrors(throwable) }
 
     private val job = SupervisorJob()
 
     override val coroutineContext: CoroutineContext = Dispatchers.Main + job + handler
 
+    protected val intentBuilder
+        get() = OmegaIntentBuilder
+
     protected open fun handleErrors(throwable: Throwable) {
         throwable.printStackTrace()
     }
@@ -46,14 +52,14 @@ open class OmegaPresenter<View: OmegaView>: MvpPresenter<View>(), CoroutineScope
     }
 
 
-    protected fun <R> ReceiveChannel<R>.request(waiting: Boolean = true, block: suspend View.(R) -> Unit) {
+    protected fun <R> ReceiveChannel<R>.request(waiting: Boolean = true, block: (suspend View.(R) -> Unit)? = null) {
         if (waiting) viewState.setWaiting(true)
         val channel = this
         launch {
             var hideWaiting = waiting
             try {
                 for (item in channel) {
-                    block(viewState, item)
+                    block?.invoke(viewState, item)
 
                     if (hideWaiting) {
                         hideWaiting = false
@@ -77,6 +83,15 @@ open class OmegaPresenter<View: OmegaView>: MvpPresenter<View>(), CoroutineScope
         createChannel(strategy, sourceBlock).request(waiting = waiting, block = viewStateBlock)
     }
 
+    protected fun <S : Source> OmegaRepository<S>.request(
+        strategy: OmegaRepository.Strategy = OmegaRepository.Strategy.CACHE_AND_REMOTE,
+        waiting: Boolean = true,
+        sourceBlock: suspend S.() -> Unit
+    ) {
+        createChannel(strategy, sourceBlock)
+            .request(waiting = waiting)
+    }
+
     fun hideQueryOrMessage() = viewState.hideQueryOrMessage()
 
     protected open fun Launcher.launch() {
@@ -87,10 +102,14 @@ open class OmegaPresenter<View: OmegaView>: MvpPresenter<View>(), CoroutineScope
         viewState.launch(createLauncher())
     }
 
-    protected fun ActivityLauncher.launchForResult(requestCode: Int) {
+    protected fun BaseIntentLauncher.launchForResult(requestCode: Int) {
         viewState.launchForResult(this, requestCode)
     }
 
+    protected fun IntentBuilder.launch() = createLauncher().launch()
+
+    protected fun IntentBuilder.launchForResult(requestCode: Int) = createLauncher().launchForResult(requestCode)
+
     open fun onLaunchResult(requestCode: Int, success: Boolean, data: Serializable?): Boolean {
         return false
     }
@@ -109,4 +128,5 @@ open class OmegaPresenter<View: OmegaView>: MvpPresenter<View>(), CoroutineScope
         job.cancel()
     }
 
+
 }

lib/src/main/java/com/omega_r/base/mvp/views/OmegaView.kt

@@ -3,7 +3,7 @@ package com.omega_r.base.mvp.views
 import com.omega_r.base.mvp.model.Action
 import com.omega_r.base.mvp.strategies.RemoveEndTagStrategy
 import com.omega_r.libs.omegatypes.Text
-import com.omegar.libs.omegalaunchers.ActivityLauncher
+import com.omegar.libs.omegalaunchers.BaseIntentLauncher
 import com.omegar.libs.omegalaunchers.DialogFragmentLauncher
 import com.omegar.libs.omegalaunchers.Launcher
 import com.omegar.mvp.MvpView
@@ -48,7 +48,7 @@ interface OmegaView : MvpView {
     fun launch(launcher: DialogFragmentLauncher)
 
     @StateStrategyType(OneExecutionStateStrategy::class)
-    fun launchForResult(launcher: ActivityLauncher, requestCode: Int)
+    fun launchForResult(launcher: BaseIntentLauncher, requestCode: Int)
 
     @StateStrategyType(OneExecutionStateStrategy::class)
     fun setResult(success: Boolean, data: Serializable?)