Merge pull request #307 from soramitsu/rc/1.8.1

Rc/1.8.1

Author: valentunn

app/build.gradle

@@ -117,6 +117,8 @@ dependencies {
     implementation lifecycleDep
     kapt lifecycleKapt
 
+    implementation lifeCycleKtxDep
+
     implementation retrofitDep
     implementation gsonConvertedDep
 

app/src/main/java/jp/co/soramitsu/app/root/navigation/Navigator.kt

@@ -2,6 +2,7 @@ package jp.co.soramitsu.app.root.navigation
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.asFlow
 import androidx.navigation.NavController
 import androidx.navigation.NavOptions
 import jp.co.soramitsu.app.R
@@ -30,6 +31,9 @@ import jp.co.soramitsu.feature_account_impl.presentation.pincode.ToolbarConfigur
 import jp.co.soramitsu.feature_crowdloan_impl.presentation.CrowdloanRouter
 import jp.co.soramitsu.feature_crowdloan_impl.presentation.contribute.confirm.ConfirmContributeFragment
 import jp.co.soramitsu.feature_crowdloan_impl.presentation.contribute.confirm.parcel.ConfirmContributePayload
+import jp.co.soramitsu.feature_crowdloan_impl.presentation.contribute.custom.BonusPayload
+import jp.co.soramitsu.feature_crowdloan_impl.presentation.contribute.custom.CustomContributeFragment
+import jp.co.soramitsu.feature_crowdloan_impl.presentation.contribute.custom.model.CustomContributePayload
 import jp.co.soramitsu.feature_crowdloan_impl.presentation.contribute.select.CrowdloanContributeFragment
 import jp.co.soramitsu.feature_crowdloan_impl.presentation.contribute.select.parcel.ContributePayload
 import jp.co.soramitsu.feature_onboarding_impl.OnboardingRouter
@@ -46,6 +50,8 @@ import jp.co.soramitsu.feature_staking_impl.presentation.staking.controller.conf
 import jp.co.soramitsu.feature_staking_impl.presentation.staking.main.model.StakingStoryModel
 import jp.co.soramitsu.feature_staking_impl.presentation.staking.rebond.confirm.ConfirmRebondFragment
 import jp.co.soramitsu.feature_staking_impl.presentation.staking.rebond.confirm.ConfirmRebondPayload
+import jp.co.soramitsu.feature_staking_impl.presentation.staking.redeem.RedeemFragment
+import jp.co.soramitsu.feature_staking_impl.presentation.staking.redeem.RedeemPayload
 import jp.co.soramitsu.feature_staking_impl.presentation.staking.rewardDestination.confirm.ConfirmRewardDestinationFragment
 import jp.co.soramitsu.feature_staking_impl.presentation.staking.rewardDestination.confirm.parcel.ConfirmRewardDestinationPayload
 import jp.co.soramitsu.feature_staking_impl.presentation.staking.unbond.confirm.ConfirmUnbondFragment
@@ -63,6 +69,7 @@ import jp.co.soramitsu.feature_wallet_impl.presentation.send.confirm.ConfirmTran
 import jp.co.soramitsu.feature_wallet_impl.presentation.transaction.detail.TransactionDetailFragment
 import jp.co.soramitsu.splash.SplashRouter
 import kotlinx.android.parcel.Parcelize
+import kotlinx.coroutines.flow.Flow
 
 @Parcelize
 class NavComponentDelayedNavigation(val globalActionId: Int, val extras: Bundle? = null) : DelayedNavigation
@@ -213,8 +220,8 @@ class Navigator :
         navController?.navigate(R.id.action_selectUnbondFragment_to_confirmUnbondFragment, ConfirmUnbondFragment.getBundle(payload))
     }
 
-    override fun openRedeem() {
-        navController?.navigate(R.id.action_stakingBalanceFragment_to_redeemFragment)
+    override fun openRedeem(payload: RedeemPayload) {
+        navController?.navigate(R.id.action_open_redeemFragment, RedeemFragment.getBundle(payload))
     }
 
     override fun openConfirmRebond(payload: ConfirmRebondPayload) {
@@ -225,6 +232,23 @@ class Navigator :
         navController?.navigate(R.id.action_mainFragment_to_crowdloanContributeFragment, CrowdloanContributeFragment.getBundle(payload))
     }
 
+    override val customBonusFlow: Flow<BonusPayload?>
+        get() = navController!!.currentBackStackEntry!!.savedStateHandle
+            .getLiveData<BonusPayload?>(CrowdloanContributeFragment.KEY_BONUS_LIVE_DATA)
+            .asFlow()
+
+    override val latestCustomBonus: BonusPayload?
+        get() = navController!!.currentBackStackEntry!!.savedStateHandle
+            .get(CrowdloanContributeFragment.KEY_BONUS_LIVE_DATA)
+
+    override fun openCustomContribute(payload: CustomContributePayload) {
+        navController?.navigate(R.id.action_crowdloanContributeFragment_to_customContributeFragment, CustomContributeFragment.getBundle(payload))
+    }
+
+    override fun setCustomBonus(payload: BonusPayload) {
+        navController!!.previousBackStackEntry!!.savedStateHandle.set(CrowdloanContributeFragment.KEY_BONUS_LIVE_DATA, payload)
+    }
+
     override fun openConfirmContribute(payload: ConfirmContributePayload) {
         navController?.navigate(R.id.action_crowdloanContributeFragment_to_confirmContributeFragment, ConfirmContributeFragment.getBundle(payload))
     }

app/src/main/res/navigation/main_nav_graph.xml

@@ -551,13 +551,7 @@
             app:popEnterAnim="@anim/fragment_close_enter"
             app:popExitAnim="@anim/fragment_close_exit" />
 
-        <action
-            android:id="@+id/action_stakingBalanceFragment_to_redeemFragment"
-            app:destination="@id/redeemFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
+
         <action
             android:id="@+id/action_stakingBalanceFragment_to_customRebondFragment"
             app:destination="@id/customRebondFragment"
@@ -637,6 +631,14 @@
         android:name="jp.co.soramitsu.feature_staking_impl.presentation.staking.unbond.confirm.ConfirmUnbondFragment"
         android:label="ConfirmUnbondFragment" />
 
+    <action
+        android:id="@+id/action_open_redeemFragment"
+        app:destination="@id/redeemFragment"
+        app:enterAnim="@anim/fragment_open_enter"
+        app:exitAnim="@anim/fragment_open_exit"
+        app:popEnterAnim="@anim/fragment_close_enter"
+        app:popExitAnim="@anim/fragment_close_exit" />
+
     <fragment
         android:id="@+id/redeemFragment"
         android:name="jp.co.soramitsu.feature_staking_impl.presentation.staking.redeem.RedeemFragment"
@@ -702,6 +704,14 @@
             app:popExitAnim="@anim/fragment_close_exit"
             android:id="@+id/action_crowdloanContributeFragment_to_confirmContributeFragment"
             app:destination="@id/confirmContributeFragment" />
+
+        <action
+            app:enterAnim="@anim/fragment_open_enter"
+            app:exitAnim="@anim/fragment_open_exit"
+            app:popEnterAnim="@anim/fragment_close_enter"
+            app:popExitAnim="@anim/fragment_close_exit"
+            android:id="@+id/action_crowdloanContributeFragment_to_customContributeFragment"
+            app:destination="@id/customContributeFragment" />
     </fragment>
 
     <fragment
@@ -710,4 +720,10 @@
         android:name="jp.co.soramitsu.feature_crowdloan_impl.presentation.contribute.confirm.ConfirmContributeFragment"
         android:label="ConfirmContributeFragment" />
 
+    <fragment
+        tools:layout="@layout/fragment_custom_contribute"
+        android:id="@+id/customContributeFragment"
+        android:name="jp.co.soramitsu.feature_crowdloan_impl.presentation.contribute.custom.CustomContributeFragment"
+        android:label="CustomContributeFragment" />
+
 </navigation>

build.gradle

@@ -1,8 +1,8 @@
 buildscript {
     ext {
         // App version
-        versionName = '1.8 RC1'
-        versionCode = 14
+        versionName = '1.8.1'
+        versionCode = 15
 
         // SDK and tools
         compileSdkVersion = 29

common/src/main/java/jp/co/soramitsu/common/utils/FlowExt.kt

@@ -1,6 +1,8 @@
 package jp.co.soramitsu.common.utils
 
+import android.widget.CompoundButton
 import android.widget.EditText
+import androidx.lifecycle.LifecycleCoroutineScope
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import jp.co.soramitsu.common.presentation.LoadingState
@@ -77,3 +79,28 @@ fun EditText.bindTo(flow: MutableStateFlow<String>, scope: CoroutineScope) {
         }
     }
 }
+
+fun CompoundButton.bindTo(flow: MutableStateFlow<Boolean>, scope: CoroutineScope) {
+    scope.launch {
+        flow.collect { newValue ->
+            if (isChecked != newValue) {
+                isChecked = newValue
+            }
+        }
+    }
+
+    setOnCheckedChangeListener { _, newValue ->
+        scope.launch {
+            flow.emit(newValue)
+        }
+    }
+}
+
+inline fun <T> Flow<T>.observe(
+    scope: LifecycleCoroutineScope,
+    crossinline collector: suspend (T) -> Unit
+) {
+    scope.launchWhenResumed {
+        collect(collector)
+    }
+}

common/src/main/java/jp/co/soramitsu/common/utils/SpannableDSL.kt

@@ -0,0 +1,45 @@
+package jp.co.soramitsu.common.utils
+
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.TextPaint
+import android.text.style.ClickableSpan
+import android.view.View
+
+private fun clickableSpan(onClick: () -> Unit) = object : ClickableSpan() {
+    override fun updateDrawState(ds: TextPaint) {
+        super.updateDrawState(ds)
+        ds.isUnderlineText = false
+    }
+
+    override fun onClick(widget: View) {
+        onClick()
+    }
+}
+
+class SpannableBuilder(val content: String) {
+
+    private val buildingSpannable = SpannableString(content)
+
+    fun clickable(text: String, onClick: () -> Unit) {
+        val startIndex = content.indexOf(text)
+
+        if (startIndex == -1) {
+            return
+        }
+
+        val endIndex = startIndex + text.length
+
+        buildingSpannable.setSpan(clickableSpan(onClick), startIndex, endIndex, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+    }
+
+    fun build() = buildingSpannable
+}
+
+fun createSpannable(content: String, block: SpannableBuilder.() -> Unit): Spannable {
+    val builder = SpannableBuilder(content)
+
+    builder.block()
+
+    return builder.build()
+}