Fix/UI updates (#245)

* Change bottom navogation behaviour

* Fix transactions header

* Update onboarding view when creating first account

Author: zaiatsartem

app/src/main/AndroidManifest.xml

@@ -270,11 +270,6 @@
             android:launchMode="singleTop"
             android:parentActivityName=".ui.account.newaccountidentity.NewAccountIdentityActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".ui.account.newaccountconfirmed.NewAccountConfirmedActivity"
-            android:launchMode="singleTop"
-            android:parentActivityName=".ui.account.newaccountsetup.NewAccountSetupActivity"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.account.accountdetails.AccountReleaseScheduleActivity"
             android:launchMode="singleTop"

app/src/main/java/com/concordium/wallet/ui/MainActivity.kt

@@ -5,7 +5,6 @@ import android.os.Bundle
 import android.view.MenuItem
 import android.widget.Toast
 import androidx.core.content.ContextCompat
-import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.get
 import androidx.lifecycle.lifecycleScope
@@ -228,12 +227,11 @@ class MainActivity : BaseActivity(R.layout.activity_main, R.string.accounts_over
     private fun onNavigationItemSelected(menuItem: MenuItem): Boolean {
         menuItem.isChecked = true
 
-        val state = getState(menuItem)
-        if (state != null) {
-            viewModel.setState(state)
-            return true
-        }
-        return false
+        val state = getState(menuItem) ?: return false
+
+        if (viewModel.stateLiveData.value == state) return false
+        viewModel.setState(state)
+        return true
     }
 
     private fun getState(menuItem: MenuItem): MainViewModel.State? {
@@ -246,19 +244,19 @@ class MainActivity : BaseActivity(R.layout.activity_main, R.string.accounts_over
     }
 
     private fun replaceFragment(state: MainViewModel.State) {
-        val fragment = when (state) {
+        val existingFragment = supportFragmentManager.findFragmentByTag(state.name)
+
+        val fragment = existingFragment ?: when (state) {
             MainViewModel.State.AccountOverview -> AccountDetailsFragment()
             MainViewModel.State.NewsOverview -> NewsOverviewFragment()
             MainViewModel.State.More -> MoreOverviewFragment()
         }
-        replaceFragment(fragment)
-    }
 
-    private fun replaceFragment(fragment: Fragment?) {
-        if (fragment == null) return
-        val transaction = supportFragmentManager.beginTransaction()
-        transaction.replace(R.id.fragment_container, fragment)
-        transaction.commit()
+        if (existingFragment == null) {
+            supportFragmentManager.beginTransaction()
+                .replace(R.id.fragment_container, fragment, state.name)
+                .commit()
+        }
     }
 
     //endregion

app/src/main/java/com/concordium/wallet/ui/account/accountdetails/AccountDetailsFragment.kt

@@ -208,13 +208,6 @@ class AccountDetailsFragment : BaseFragment(), EarnDelegate by EarnDelegateImpl(
             }
         }
 
-        viewModelAccountDetails.newFinalizedAccountFlow.collectWhenStarted(viewLifecycleOwner) {
-            if (it.isNotEmpty()) {
-                updateViews(viewModelAccountDetails.activeAccount.first())
-                viewModelTokens.loadTokens(viewModelAccountDetails.activeAccount.first().address)
-            }
-        }
-
         viewModelAccountDetails.fileWalletMigrationVisible.collectWhenStarted(viewLifecycleOwner) {
             binding.fileWalletMigrationDisclaimerLayout.isVisible = it
             isFileWallet = it

app/src/main/java/com/concordium/wallet/ui/account/accountdetails/AccountDetailsViewModel.kt

@@ -191,15 +191,7 @@ class AccountDetailsViewModel(application: Application) : AndroidViewModel(appli
                 }
             }
 
-            override fun onNewAccountFinalized(accountName: String) {
-                viewModelScope.launch {
-                    getActiveAccount()
-                    updateAccountFromRepository()
-                    postState(OnboardingState.DONE)
-                    restartUpdater(BuildConfig.ACCOUNT_UPDATE_FREQUENCY_SEC)
-                    _newFinalizedAccountFlow.value = accountName
-                }
-            }
+            override fun onNewAccountFinalized(accountName: String) { }
 
             override fun onError(stringRes: Int) {
                 _errorLiveData.value = Event(stringRes)

app/src/main/java/com/concordium/wallet/ui/account/newaccountconfirmed/NewAccountConfirmedActivity.kt

@@ -11,7 +11,7 @@ import com.concordium.wallet.core.backend.BackendError
 import com.concordium.wallet.data.room.Account
 import com.concordium.wallet.data.room.Identity
 import com.concordium.wallet.databinding.ActivityNewAccountSetupBinding
-import com.concordium.wallet.ui.account.newaccountconfirmed.NewAccountConfirmedActivity
+import com.concordium.wallet.ui.MainActivity
 import com.concordium.wallet.ui.base.BaseActivity
 import com.concordium.wallet.ui.common.delegates.AuthDelegate
 import com.concordium.wallet.ui.common.delegates.AuthDelegateImpl
@@ -86,7 +86,7 @@ class NewAccountSetupActivity : BaseActivity(
         })
         viewModel.gotoAccountCreatedLiveData.observe(this, object : EventObserver<Account>() {
             override fun onUnhandledEvent(value: Account) {
-                gotoNewAccountConfirmed(value)
+                gotoNewAccountConfirmed()
             }
         })
         viewModel.gotoFailedLiveData.observe(
@@ -126,9 +126,9 @@ class NewAccountSetupActivity : BaseActivity(
         }
     }
 
-    private fun gotoNewAccountConfirmed(account: Account) {
-        val intent = Intent(this, NewAccountConfirmedActivity::class.java)
-        intent.putExtra(NewAccountConfirmedActivity.EXTRA_ACCOUNT, account)
+    private fun gotoNewAccountConfirmed() {
+        val intent = Intent(this, MainActivity::class.java)
+        intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
         startActivity(intent)
     }
 

app/src/main/java/com/concordium/wallet/ui/account/newaccountconfirmed/NewAccountConfirmedViewModel.kt

@@ -147,9 +147,11 @@ class TokenDetailsActivity : BaseActivity(R.layout.activity_token_details),
 
     private fun setBalances(token: Token) {
         binding.walletInfoCard.totalBalanceTextview.text = if (token.isCcd) {
-            CurrencyUtil.formatGTU(viewModel.tokenData.account?.balance!!, token)
+            CurrencyUtil.formatGTU(viewModel.tokenData.account?.balance!!, token) +
+                    " ${token.symbol}"
         } else {
-            CurrencyUtil.formatGTU(token.balance, token)
+            CurrencyUtil.formatGTU(token.balance, token) +
+                    " ${token.symbol}"
         }
 
         viewModel.tokenData.account?.readOnly?.let {

app/src/main/java/com/concordium/wallet/ui/account/newaccountsetup/NewAccountSetupActivity.kt

@@ -26,10 +26,10 @@ import com.concordium.wallet.ui.more.notifications.NotificationsPreferencesActiv
 import com.concordium.wallet.ui.more.tracking.TrackingPreferencesActivity
 import com.concordium.wallet.ui.more.unshielding.UnshieldingAccountsActivity
 import com.concordium.wallet.ui.multiwallet.WalletsActivity
+import com.concordium.wallet.ui.recipient.recipientlist.RecipientListActivity
 import com.concordium.wallet.ui.seed.recoverprocess.RecoverProcessActivity
 import com.concordium.wallet.ui.seed.reveal.SavedSeedPhraseRevealActivity
 import com.concordium.wallet.ui.seed.reveal.SavedSeedRevealActivity
-import com.concordium.wallet.ui.recipient.recipientlist.RecipientListActivity
 import com.concordium.wallet.ui.tokens.provider.NFTActivity
 import com.concordium.wallet.ui.welcome.WelcomeActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -208,7 +208,7 @@ class MoreOverviewFragment : BaseFragment() {
             clearWalletConnectAndRestart()
         }
 
-        binding.eraseDataLayout.setOnClickListener {
+        binding.removeWalletLayout.setOnClickListener {
             eraseDataAndExit()
         }
     }

app/src/main/java/com/concordium/wallet/ui/cis2/TokenDetailsActivity.kt

@@ -10,36 +10,45 @@ class PinnedHeaderItemDecoration(private val listener: PinnedHeaderListener) :
     RecyclerView.ItemDecoration() {
 
     private var headerHeight: Int = 0
+    private var cachedHeader: View? = null
+    private var cachedHeaderPosition: Int = RecyclerView.NO_POSITION
 
     override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
         super.onDrawOver(c, parent, state)
 
         val topChild = parent.getChildAt(0) ?: return
-
         val topChildPosition = parent.getChildAdapterPosition(topChild)
-        if (topChildPosition == RecyclerView.NO_POSITION) {
-            return
+        if (topChildPosition == RecyclerView.NO_POSITION) return
+
+        val headerPosition = listener.getHeaderPositionForItem(topChildPosition)
+        val currentHeader = if (cachedHeaderPosition == headerPosition && cachedHeader != null) {
+            cachedHeader!!
+        } else {
+            getHeaderViewForItem(headerPosition, parent)
         }
 
-        val currentHeader = getHeaderViewForItem(topChildPosition, parent)
         fixLayoutSize(parent, currentHeader)
         val contactPoint = currentHeader.bottom
-        val childInContact = getChildInContact(parent, contactPoint) ?: return
+        val childInContact = getChildInContact(parent, contactPoint)
 
-        if (listener.isHeader(parent.getChildAdapterPosition(childInContact))) {
+        if (childInContact != null && listener.isHeader(parent.getChildAdapterPosition(childInContact))) {
             moveHeader(c, currentHeader, childInContact)
-            return
+        } else {
+            drawHeader(c, currentHeader)
         }
-
-        drawHeader(c, currentHeader)
     }
 
     private fun getHeaderViewForItem(itemPosition: Int, parent: RecyclerView): View {
         val headerPosition = listener.getHeaderPositionForItem(itemPosition)
-        val layoutResId = listener.getHeaderLayout(headerPosition)
-        val header = LayoutInflater.from(parent.context).inflate(layoutResId, parent, false)
-        listener.bindHeaderData(header, headerPosition)
-        return header
+
+        if (cachedHeaderPosition != headerPosition || cachedHeader == null) {
+            val layoutResId = listener.getHeaderLayout(headerPosition)
+            val header = LayoutInflater.from(parent.context).inflate(layoutResId, parent, false)
+            listener.bindHeaderData(header, headerPosition)
+            cachedHeader = header
+            cachedHeaderPosition = headerPosition
+        }
+        return cachedHeader!!
     }
 
     private fun drawHeader(c: Canvas, header: View) {
@@ -57,18 +66,9 @@ class PinnedHeaderItemDecoration(private val listener: PinnedHeaderListener) :
     }
 
     private fun getChildInContact(parent: RecyclerView, contactPoint: Int): View? {
-        var childInContact: View? = null
-        for (i in 0 until parent.childCount) {
-            val child = parent.getChildAt(i)
-            if (child.bottom > contactPoint) {
-                if (child.top <= contactPoint) {
-                    // This child overlaps the contactPoint
-                    childInContact = child
-                    break
-                }
-            }
-        }
-        return childInContact
+        return (0 until parent.childCount)
+            .map { parent.getChildAt(it) }
+            .firstOrNull { it.bottom > contactPoint && it.top <= contactPoint }
     }
 
     /**