Merge pull request #646 from soramitsu/staging

2.0.8 moonbeam staking

Author: Deneath

Jenkinsfile

@@ -1,11 +1,18 @@
 @Library('jenkins-library')
 
+// Job properties
+def jobParams = [
+  booleanParam(defaultValue: false, description: 'push to the dev profile', name: 'prDeployment'),
+]
+
 def pipeline = new org.android.AppPipeline(
     steps:            this,
     sonar:            false,
     pushReleaseNotes: false,
     testCmd:          'runTest',
     dockerImage:      'build-tools/android-build-box-jdk11:latest',
-    publishCmd:       'publishReleaseApk'
+    publishCmd:       'publishReleaseApk',
+    jobParams: jobParams,
+    appPushNoti: true
 )
 pipeline.runPipeline('fearless')

app/build.gradle

@@ -3,8 +3,8 @@ import com.github.triplet.gradle.androidpublisher.ReleaseStatus
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-parcelize'
 apply plugin: 'com.google.firebase.appdistribution'
 apply plugin: "com.github.triplet.play"
 apply from: "../scripts/versions.gradle"
@@ -63,6 +63,23 @@ android {
               groups = localFirebaseGroup
             }
         }
+        pr {
+            signingConfig signingConfigs.ci
+            matchingFallbacks = ['debug']
+            versionNameSuffix '-pr'
+            applicationIdSuffix '.dev'
+            //Init firebase
+            def localReleaseNotes = releaseNotes()
+            def localFirebaseGroup = firebaseGroup()
+            firebaseAppDistribution {
+              releaseNotes = localReleaseNotes
+              groups = localFirebaseGroup
+            }
+        }
+    }
+
+    buildFeatures {
+        viewBinding = true
     }
 
     bundle {
@@ -81,6 +98,7 @@ android {
 
         jvmTarget = '1.8'
     }
+    namespace 'jp.co.soramitsu.app'
 }
 
 play {
@@ -129,7 +147,7 @@ dependencies {
     implementation daggerDep
     kapt daggerKapt
 
-    implementation lifecycleDep
+    implementation lifecycleProcessDep
     kapt lifecycleKapt
 
     implementation lifeCycleKtxDep

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="jp.co.soramitsu.app">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.CAMERA" />

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

@@ -53,6 +53,7 @@ import jp.co.soramitsu.feature_staking_impl.presentation.payouts.confirm.Confirm
 import jp.co.soramitsu.feature_staking_impl.presentation.payouts.confirm.model.ConfirmPayoutPayload
 import jp.co.soramitsu.feature_staking_impl.presentation.payouts.detail.PayoutDetailsFragment
 import jp.co.soramitsu.feature_staking_impl.presentation.payouts.model.PendingPayoutParcelable
+import jp.co.soramitsu.feature_staking_impl.presentation.staking.balance.StakingBalanceFragment
 import jp.co.soramitsu.feature_staking_impl.presentation.staking.bond.confirm.ConfirmBondMoreFragment
 import jp.co.soramitsu.feature_staking_impl.presentation.staking.bond.confirm.ConfirmBondMorePayload
 import jp.co.soramitsu.feature_staking_impl.presentation.staking.bond.select.SelectBondMoreFragment
@@ -67,7 +68,12 @@ import jp.co.soramitsu.feature_staking_impl.presentation.staking.rewardDestinati
 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
 import jp.co.soramitsu.feature_staking_impl.presentation.staking.unbond.confirm.ConfirmUnbondPayload
+import jp.co.soramitsu.feature_staking_impl.presentation.staking.unbond.select.SelectUnbondFragment
+import jp.co.soramitsu.feature_staking_impl.presentation.staking.unbond.select.SelectUnbondPayload
+import jp.co.soramitsu.feature_staking_impl.presentation.validators.change.custom.settings.CustomValidatorsSettingsFragment
+import jp.co.soramitsu.feature_staking_impl.presentation.validators.details.CollatorDetailsFragment
 import jp.co.soramitsu.feature_staking_impl.presentation.validators.details.ValidatorDetailsFragment
+import jp.co.soramitsu.feature_staking_impl.presentation.validators.parcel.CollatorDetailsParcelModel
 import jp.co.soramitsu.feature_staking_impl.presentation.validators.parcel.ValidatorDetailsParcelModel
 import jp.co.soramitsu.feature_wallet_impl.presentation.AssetPayload
 import jp.co.soramitsu.feature_wallet_impl.presentation.WalletRouter
@@ -83,11 +89,12 @@ import jp.co.soramitsu.feature_wallet_impl.presentation.transaction.detail.extri
 import jp.co.soramitsu.feature_wallet_impl.presentation.transaction.detail.reward.RewardDetailFragment
 import jp.co.soramitsu.feature_wallet_impl.presentation.transaction.detail.reward.RewardDetailsPayload
 import jp.co.soramitsu.feature_wallet_impl.presentation.transaction.detail.transfer.TransferDetailFragment
+import jp.co.soramitsu.runtime.multiNetwork.chain.model.Chain
 import jp.co.soramitsu.runtime.multiNetwork.chain.model.ChainId
 import jp.co.soramitsu.splash.SplashRouter
-import kotlinx.android.parcel.Parcelize
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 class NavComponentDelayedNavigation(val globalActionId: Int, val extras: Bundle? = null) : DelayedNavigation
@@ -163,10 +170,10 @@ class Navigator :
 
         val navOptions = NavOptions.Builder()
             .setPopUpTo(R.id.pincodeFragment, true)
-            .setEnterAnim(R.anim.fragment_open_enter)
-            .setExitAnim(R.anim.fragment_open_exit)
-            .setPopEnterAnim(R.anim.fragment_close_enter)
-            .setPopExitAnim(R.anim.fragment_close_exit)
+            .setEnterAnim(R.animator.fragment_open_enter)
+            .setExitAnim(R.animator.fragment_open_exit)
+            .setPopEnterAnim(R.animator.fragment_close_enter)
+            .setPopExitAnim(R.animator.fragment_close_exit)
             .build()
 
         navController?.navigate(delayedNavigation.globalActionId, delayedNavigation.extras, navOptions)
@@ -225,6 +232,10 @@ class Navigator :
         navController?.navigate(R.id.openStartChangeValidatorsFragment)
     }
 
+    override fun openStartChangeCollators() {
+        navController?.navigate(R.id.openStartChangeCollatorsFragment)
+    }
+
     override fun openStory(story: StoryGroupModel) {
         navController?.navigate(R.id.open_staking_story, StoryFragment.getBundle(story))
     }
@@ -241,8 +252,9 @@ class Navigator :
         navController?.navigate(R.id.action_open_confirm_payout, ConfirmPayoutFragment.getBundle(payload))
     }
 
-    override fun openStakingBalance() {
-        navController?.navigate(R.id.action_mainFragment_to_stakingBalanceFragment)
+    override fun openStakingBalance(collatorAddress: String?) {
+        val bundle = collatorAddress?.let { StakingBalanceFragment.getBundle(it) }
+        navController?.navigate(R.id.action_mainFragment_to_stakingBalanceFragment, bundle)
     }
 
     override fun openBondMore(payload: SelectBondMorePayload) {
@@ -257,8 +269,8 @@ class Navigator :
         navController?.navigate(R.id.action_return_to_staking_balance)
     }
 
-    override fun openSelectUnbond() {
-        navController?.navigate(R.id.action_stakingBalanceFragment_to_selectUnbondFragment)
+    override fun openSelectUnbond(payload: SelectUnbondPayload) {
+        navController?.navigate(R.id.action_stakingBalanceFragment_to_selectUnbondFragment, SelectUnbondFragment.getBundle(payload))
     }
 
     override fun openConfirmUnbond(payload: ConfirmUnbondPayload) {
@@ -351,6 +363,14 @@ class Navigator :
         )
     }
 
+    override fun openRecommendedCollators() {
+        navController?.navigate(R.id.action_startChangeCollatorsFragment_to_recommendedCollatorsFragment)
+    }
+
+    override fun openSelectCustomCollators() {
+        navController?.navigate(R.id.action_startChangeCollatorsFragment_to_selectCustomCollatorsFragment)
+    }
+
     override fun openRecommendedValidators() {
         navController?.navigate(R.id.action_startChangeValidatorsFragment_to_recommendedValidatorsFragment)
     }
@@ -359,14 +379,24 @@ class Navigator :
         navController?.navigate(R.id.action_startChangeValidatorsFragment_to_selectCustomValidatorsFragment)
     }
 
-    override fun openCustomValidatorsSettings() {
-        navController?.navigate(R.id.action_selectCustomValidatorsFragment_to_settingsCustomValidatorsFragment)
+    override fun openCustomValidatorsSettingsFromValidator() {
+        val bundle = CustomValidatorsSettingsFragment.getBundle(Chain.Asset.StakingType.RELAYCHAIN)
+        navController?.navigate(R.id.action_selectCustomValidatorsFragment_to_settingsCustomValidatorsFragment, bundle)
+    }
+
+    override fun openCustomValidatorsSettingsFromCollator() {
+        val bundle = CustomValidatorsSettingsFragment.getBundle(Chain.Asset.StakingType.PARACHAIN)
+        navController?.navigate(R.id.action_selectCustomCollatorsFragment_to_settingsCustomValidatorsFragment, bundle)
     }
 
     override fun openSearchCustomValidators() {
         navController?.navigate(R.id.action_selectCustomValidatorsFragment_to_searchCustomValidatorsFragment)
     }
 
+    override fun openSearchCustomCollators() {
+        navController?.navigate(R.id.action_selectCustomCollatorsFragment_to_searchCustomValidatorsFragment)
+    }
+
     override fun openReviewCustomValidators() {
         navController?.navigate(R.id.action_selectCustomValidatorsFragment_to_reviewCustomValidatorsFragment)
     }
@@ -387,6 +417,10 @@ class Navigator :
         navController?.navigate(R.id.open_validator_details, ValidatorDetailsFragment.getBundle(validatorDetails))
     }
 
+    override fun openCollatorDetails(collatorDetails: CollatorDetailsParcelModel) {
+        navController?.navigate(R.id.open_collator_details, CollatorDetailsFragment.getBundle(collatorDetails))
+    }
+
     override fun openChooseRecipient(assetPayload: AssetPayload) {
         val bundle = ChooseRecipientFragment.getBundle(assetPayload)
 

app/src/main/java/jp/co/soramitsu/app/root/presentation/RootActivity.kt

@@ -8,6 +8,7 @@ import android.os.Bundle
 import android.view.View
 import android.view.animation.Animation
 import android.view.animation.TranslateAnimation
+import android.widget.TextView
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.isVisible
 import androidx.lifecycle.Lifecycle
@@ -28,7 +29,6 @@ import jp.co.soramitsu.common.utils.EventObserver
 import jp.co.soramitsu.common.utils.showToast
 import jp.co.soramitsu.common.utils.updatePadding
 import jp.co.soramitsu.common.view.bottomSheet.AlertBottomSheet
-import kotlinx.android.synthetic.main.activity_root.rootNetworkBar
 import javax.inject.Inject
 
 class RootActivity : BaseActivity<RootViewModel>(), LifecycleObserver {
@@ -41,6 +41,8 @@ class RootActivity : BaseActivity<RootViewModel>(), LifecycleObserver {
     @Inject
     lateinit var navigator: Navigator
 
+    private val rootNetworkBar: TextView by lazy { findViewById(R.id.rootNetworkBar) }
+
     override fun inject() {
         FeatureUtils.getFeature<RootComponent>(this, RootApi::class.java)
             .mainActivityComponentFactory()
@@ -182,16 +184,18 @@ class RootActivity : BaseActivity<RootViewModel>(), LifecycleObserver {
         }
 
         val errorColor = getColor(R.color.colorAccent)
-        rootNetworkBar.setText(R.string.network_status_connecting)
-        rootNetworkBar.setBackgroundColor(errorColor)
+        findViewById<TextView>(R.id.rootNetworkBar).apply {
+            setText(R.string.network_status_connecting)
+            setBackgroundColor(errorColor)
+        }
         val animation = TranslateAnimation(0f, 0f, -ANIM_START_POSITION, 0f)
         animation.duration = ANIM_DURATION
-        rootNetworkBar.startAnimation(animation)
-        rootNetworkBar.isVisible = true
+        findViewById<TextView>(R.id.rootNetworkBar).startAnimation(animation)
+        findViewById<TextView>(R.id.rootNetworkBar).isVisible = true
     }
 
     private fun hideBadConnectionView() {
-        if (!rootNetworkBar.isVisible) {
+        if (!findViewById<TextView>(R.id.rootNetworkBar).isVisible) {
             return
         }
 
@@ -206,13 +210,13 @@ class RootActivity : BaseActivity<RootViewModel>(), LifecycleObserver {
             }
 
             override fun onAnimationEnd(p0: Animation?) {
-                rootNetworkBar.isVisible = false
+                findViewById<TextView>(R.id.rootNetworkBar).isVisible = false
             }
 
             override fun onAnimationStart(p0: Animation?) {
             }
         })
-        rootNetworkBar.startAnimation(animation)
+        findViewById<TextView>(R.id.rootNetworkBar).startAnimation(animation)
     }
 
     override fun changeLanguage() {

app/src/main/java/jp/co/soramitsu/app/root/presentation/RootViewModel.kt

@@ -91,7 +91,6 @@ class RootViewModel(
 
     private fun handleUpdatesSideEffect(sideEffect: Updater.SideEffect) {
         // pass
-        hashCode()
     }
 
     private fun updatePhishingAddresses() {

app/src/main/java/jp/co/soramitsu/app/root/presentation/main/MainFragment.kt

@@ -1,25 +1,21 @@
 package jp.co.soramitsu.app.root.presentation.main
 
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.activity.OnBackPressedCallback
 import androidx.navigation.NavController
 import androidx.navigation.NavDestination
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.NavigationUI.onNavDestinationSelected
 import androidx.navigation.ui.setupWithNavController
 import jp.co.soramitsu.app.R
+import jp.co.soramitsu.app.databinding.FragmentMainBinding
 import jp.co.soramitsu.app.root.di.RootApi
 import jp.co.soramitsu.app.root.di.RootComponent
 import jp.co.soramitsu.common.base.BaseFragment
 import jp.co.soramitsu.common.di.FeatureUtils
 import jp.co.soramitsu.common.utils.updatePadding
-import kotlinx.android.synthetic.main.fragment_main.bottomNavHost
-import kotlinx.android.synthetic.main.fragment_main.bottomNavigationView
+import jp.co.soramitsu.common.view.viewBinding
 
-class MainFragment : BaseFragment<MainViewModel>() {
+class MainFragment : BaseFragment<MainViewModel>(R.layout.fragment_main) {
 
     private var navController: NavController? = null
 
@@ -29,9 +25,7 @@ class MainFragment : BaseFragment<MainViewModel>() {
         }
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_main, container, false)
-    }
+    private val binding by viewBinding(FragmentMainBinding::bind)
 
     override fun onDestroyView() {
         super.onDestroyView()
@@ -40,17 +34,17 @@ class MainFragment : BaseFragment<MainViewModel>() {
     }
 
     override fun initViews() {
-        bottomNavigationView.setOnApplyWindowInsetsListener { _, insets ->
+        binding.bottomNavigationView.setOnApplyWindowInsetsListener { _, insets ->
             // overwrite BottomNavigation behavior and ignore insets
             insets
         }
 
-        bottomNavHost.setOnApplyWindowInsetsListener { v, insets ->
+        binding.bottomNavHost.setOnApplyWindowInsetsListener { v, insets ->
             val systemWindowInsetBottom = insets.systemWindowInsetBottom
 
             // post to prevent bottomNavigationView.height being 0 if callback is called before view has been measured
             v.post {
-                val padding = (systemWindowInsetBottom - bottomNavigationView.height).coerceAtLeast(0)
+                val padding = (systemWindowInsetBottom - binding.bottomNavigationView.height).coerceAtLeast(0)
                 v.updatePadding(bottom = padding)
             }
 
@@ -62,9 +56,9 @@ class MainFragment : BaseFragment<MainViewModel>() {
 
         navController = nestedNavHostFragment.navController
 
-        bottomNavigationView.setupWithNavController(navController!!)
+        binding.bottomNavigationView.setupWithNavController(navController!!)
 
-        bottomNavigationView.setOnNavigationItemSelectedListener { item ->
+        binding.bottomNavigationView.setOnNavigationItemSelectedListener { item ->
             onNavDestinationSelected(item, navController!!)
         }
 
@@ -84,10 +78,10 @@ class MainFragment : BaseFragment<MainViewModel>() {
 
     override fun subscribe(viewModel: MainViewModel) {
         viewModel.stakingAvailableLiveData.observe {
-            bottomNavigationView.menu.findItem(R.id.stakingFragment).isVisible = it
+            binding.bottomNavigationView.menu.findItem(R.id.stakingFragment).isVisible = it
         }
     }
 
     private fun isAtHomeTab(destination: NavDestination) =
-        destination.id == navController!!.graph.startDestination
+        destination.id == navController!!.graph.startDestinationId
 }