Change bottom navogation behaviour

Author: zaiatsartem

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/cis2/TokenDetailsActivity.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/more/moreoverview/MoreOverviewFragment.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/res/layout/fragment_more_overview.xml

@@ -213,12 +213,12 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/erase_data_layout"
+                android:id="@+id/remove_wallet_layout"
                 style="@style/SettingsOverviewItem">
 
                 <TextView
                     style="@style/SettingsOverviewItemTextView"
-                    android:text="@string/settings_overview_erase_data"
+                    android:text="@string/settings_overview_remove_wallet"
                     app:drawableStartCompat="@drawable/ccx_ico_file_shred" />
 
                 <View

app/src/main/res/values/strings.xml

@@ -285,7 +285,7 @@
     <string name="settings_overview_item_developer_options">Developer Options</string>
     <string name="settings_overview_item_clear_wallet_connect">Clear WalletConnect</string>
     <string name="settings_overview_item_recover">Recovery</string>
-    <string name="settings_overview_erase_data">Erase Data</string>
+    <string name="settings_overview_remove_wallet">Remove wallet</string>
     <string name="settings_overview_erase_data_confirmation_title">Erasing all data</string>
     <string name="settings_overview_erase_wallet_confirmation_message">
         All your wallets will be erased from this device.