🚀[Release v4.4.0] Merge into Main

app/build.gradle.kts

@@ -20,8 +20,8 @@ android {
         applicationId = "ltd.grunt.brainwallet"
         minSdk = 29
         targetSdk = 34
-        versionCode = 202503031
-        versionName = "v4.3.1"
+        versionCode = 202503221
+        versionName = "v4.4.0"
 
         multiDexEnabled = true
         base.archivesName.set("${defaultConfig.versionName}(${defaultConfig.versionCode})")

app/src/main/java/com/brainwallet/data/model/AppSetting.kt

@@ -5,7 +5,8 @@ data class AppSetting(
     val languageCode: String = Language.ENGLISH.code,
     val currency: CurrencyEntity = CurrencyEntity(
         "USD",
-        "USD",
-        -1f
+        "US Dollar",
+        -1f,
+        "$"
     )
 )

app/src/main/java/com/brainwallet/data/model/CurrencyEntity.java

@@ -11,11 +11,13 @@ public class CurrencyEntity implements Serializable {
     public String code;
     public String name;
     public float rate;
+    public String symbol;
 
-    public CurrencyEntity(String code, String name, float rate) {
+    public CurrencyEntity(String code, String name, float rate, String symbol) {
         this.code = code;
         this.name = name;
         this.rate = rate;
+        this.symbol = symbol;
     }
 
     public CurrencyEntity() {

app/src/main/java/com/brainwallet/data/repository/SettingRepository.kt

@@ -86,8 +86,9 @@ interface SettingRepository {
                     currencyDataSource.getCurrencyByIso(it)
                         ?: return@let CurrencyEntity(
                             "USD",
-                            "USD",
-                            -1f
+                            "US Dollar",
+                            -1f,
+                            "$"
                         )
                 }
 

app/src/main/java/com/brainwallet/di/Module.kt

@@ -7,6 +7,7 @@ import com.brainwallet.data.repository.SettingRepository
 import com.brainwallet.data.source.RemoteConfigSource
 import com.brainwallet.tools.manager.BRApiManager
 import com.brainwallet.tools.sqlite.CurrencyDataSource
+import com.brainwallet.ui.screens.home.SettingsViewModel
 import com.brainwallet.ui.screens.inputwords.InputWordsViewModel
 import com.brainwallet.ui.screens.setpasscode.SetPasscodeViewModel
 import com.brainwallet.ui.screens.unlock.UnLockViewModel
@@ -36,6 +37,7 @@ val dataModule = module {
 
 val viewModelModule = module {
     viewModelOf(::WelcomeViewModel)
+    viewModelOf(::SettingsViewModel)
     viewModel { InputWordsViewModel() }
     viewModel { SetPasscodeViewModel() }
     viewModel { UnLockViewModel() }

app/src/main/java/com/brainwallet/navigation/LegacyNavigation.kt

@@ -5,7 +5,6 @@ import android.content.Context
 import android.content.Intent
 import com.brainwallet.R
 import com.brainwallet.presenter.activities.BreadActivity
-import com.brainwallet.presenter.activities.LoginActivity
 import com.brainwallet.ui.BrainwalletActivity
 import timber.log.Timber
 
@@ -25,7 +24,7 @@ object LegacyNavigation {
         auth: Boolean
     ) {
         Timber.i("timber: startBreadActivity: %s", from.javaClass.name)
-        val intent = if (auth) BrainwalletActivity.createIntent(from, Route.UnLock)
+        val intent = if (auth) BrainwalletActivity.createIntent(from, Route.UnLock())
         else Intent(from, BreadActivity::class.java)
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
         from.startActivity(intent)
@@ -35,6 +34,17 @@ object LegacyNavigation {
         }
     }
 
+    @JvmStatic
+    fun restartBreadActivity(
+        context: Context
+    ) {
+        Intent(context, BreadActivity::class.java).apply {
+            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
+        }.also {
+            context.startActivity(it)
+        }
+    }
+
     //open compose from old activity
     @JvmStatic
     @JvmOverloads

app/src/main/java/com/brainwallet/navigation/MainNav.kt

@@ -74,7 +74,10 @@ fun NavGraphBuilder.mainNavGraph(
 
     composable<Route.SetPasscode> { navBackStackEntry ->
         val route: Route.SetPasscode = navBackStackEntry.toRoute()
-        SetPasscodeScreen(onNavigate = onNavigate, passcode = route.passcode)
+        SetPasscodeScreen(
+            onNavigate = onNavigate,
+            passcode = route.passcode,
+        )
     }
     composable<Route.InputWords> { navBackStackEntry ->
         val route: Route.InputWords = navBackStackEntry.toRoute()
@@ -98,16 +101,16 @@ fun NavGraphBuilder.mainNavGraph(
         )
     }
 
-
     /**
      * for now, still using old activity & fragment [com.brainwallet.presenter.activities.BreadActivity]
      */
 //    composable<Route.Home> {
 //        HomeScreen(onNavigate = onNavigate)
 //    }
 
-    composable<Route.UnLock> {
-        UnLockScreen(onNavigate = onNavigate)
+    composable<Route.UnLock> { navBackStackEntry ->
+        val route: Route.UnLock = navBackStackEntry.toRoute()
+        UnLockScreen(onNavigate = onNavigate, isUpdatePin = route.isUpdatePin)
     }
 
     //todo add more composable screens

app/src/main/java/com/brainwallet/navigation/Route.kt

@@ -15,9 +15,13 @@ sealed class Route : JavaSerializable {
     @Serializable
     object TopUp : Route()
 
+    @Serializable
+    object Settings : Route()
+
     @Serializable
     data class SetPasscode(
-        val passcode: List<Int> = emptyList()
+        val passcode: List<Int> = emptyList(),
+        val isUpdatePin: Boolean = false,
     ) : Route()
 
     @Serializable
@@ -39,6 +43,6 @@ sealed class Route : JavaSerializable {
 //    object Home : Route()
 
     @Serializable
-    object UnLock : Route()
+    data class UnLock(val isUpdatePin: Boolean = false) : Route()
 
 }

app/src/main/java/com/brainwallet/presenter/activities/BreadActivity.java

@@ -28,16 +28,21 @@
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.ConstraintSet;
 import androidx.core.app.ActivityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.transition.ChangeBounds;
 import androidx.transition.Fade;
 import androidx.transition.TransitionManager;
 import androidx.transition.TransitionSet;
 
-import com.brainwallet.BrainwalletApp;
 import com.brainwallet.R;
+import com.brainwallet.navigation.LegacyNavigation;
+import com.brainwallet.navigation.Route;
+import com.brainwallet.presenter.activities.settings.SettingsActivity;
+import com.brainwallet.presenter.activities.settings.SyncBlockchainActivity;
 import com.brainwallet.presenter.activities.util.BRActivity;
 import com.brainwallet.presenter.customviews.BRNotificationBar;
 import com.brainwallet.presenter.fragments.BuyTabFragment;
+import com.brainwallet.presenter.fragments.FragmentMoonpay;
 import com.brainwallet.presenter.history.HistoryFragment;
 import com.brainwallet.tools.animation.BRAnimator;
 import com.brainwallet.tools.animation.TextSizeTransition;
@@ -46,18 +51,23 @@
 import com.brainwallet.tools.manager.InternetManager;
 import com.brainwallet.tools.manager.SyncManager;
 import com.brainwallet.tools.security.BitcoinUrlHandler;
+import com.brainwallet.tools.security.PostAuth;
 import com.brainwallet.tools.sqlite.TransactionDataSource;
 import com.brainwallet.tools.threads.BRExecutor;
 import com.brainwallet.tools.util.BRConstants;
 import com.brainwallet.tools.util.BRCurrency;
 import com.brainwallet.tools.util.BRExchange;
 import com.brainwallet.tools.util.ExtensionKt;
 import com.brainwallet.tools.util.Utils;
+import com.brainwallet.ui.BrainwalletActivity;
+import com.brainwallet.ui.screens.home.SettingsViewModel;
+import com.brainwallet.ui.screens.home.composable.HomeSettingDrawerComposeView;
 import com.brainwallet.util.PermissionUtil;
 import com.brainwallet.wallet.BRPeerManager;
 import com.brainwallet.wallet.BRWalletManager;
 import com.google.android.gms.tasks.Task;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
+import com.google.android.material.navigation.NavigationView;
 import com.google.android.play.core.review.ReviewInfo;
 import com.google.android.play.core.review.ReviewManager;
 import com.google.android.play.core.review.ReviewManagerFactory;
@@ -90,6 +100,9 @@ public class BreadActivity extends BRActivity implements BRWalletManager.OnBalan
     private BottomNavigationView bottomNav;
 
     private Handler mHandler = new Handler();
+    private NavigationView navigationDrawer;
+    private DrawerLayout drawerLayout;
+    private HomeSettingDrawerComposeView homeSettingDrawerComposeView;
 
     public static BreadActivity getApp() {
         return app;
@@ -220,14 +233,15 @@ private void setListeners() {
         secondaryPrice.setOnClickListener(v -> swap());
         menuBut.setOnClickListener(v -> {
             if (BRAnimator.isClickAllowed()) {
-                BRAnimator.showMenuFragment(BreadActivity.this);
+                drawerLayout.open();
             }
         });
     }
 
     public boolean handleNavigationItemSelected(int menuItemId) {
         if (mSelectedBottomNavItem == menuItemId) return true;
         mSelectedBottomNavItem = menuItemId;
+
         //TODO: revisit
         // we are using compose, that's why commented, will remove it after fully migrated to compose
         if (menuItemId == R.id.nav_history) {
@@ -242,8 +256,12 @@ public boolean handleNavigationItemSelected(int menuItemId) {
                 BRAnimator.showReceiveFragment(BreadActivity.this, true);
             }
             mSelectedBottomNavItem = 0;
-        } else if (menuItemId == R.id.nav_buy) {
-            ExtensionKt.replaceFragment(BreadActivity.this, new BuyTabFragment(), false, R.id.fragment_container);
+        }
+        else if (menuItemId == R.id.nav_buy) {
+            if (BRAnimator.isClickAllowed()) {
+                BRAnimator.showMoonpayFragment(BreadActivity.this);
+            }
+            mSelectedBottomNavItem = 0;
         }
         return true;
     }
@@ -366,6 +384,33 @@ protected void onDestroy() {
 
     private void initializeViews() {
         menuBut = findViewById(R.id.menuBut);
+
+        navigationDrawer = findViewById(R.id.navigationDrawer);
+        drawerLayout = findViewById(R.id.drawerLayout);
+        homeSettingDrawerComposeView = findViewById(R.id.homeDrawerComposeView);
+        homeSettingDrawerComposeView.observeBus(message -> {
+            drawerLayout.close();
+            if (SettingsViewModel.LEGACY_EFFECT_ON_LOCK.equals(message.getMessage())) {
+                LegacyNavigation.startBreadActivity(this, true);
+            } else if (SettingsViewModel.LEGACY_EFFECT_ON_TOGGLE_DARK_MODE.equals(message.getMessage())) {
+                LegacyNavigation.restartBreadActivity(this);
+            } else if (SettingsViewModel.LEGACY_EFFECT_ON_SEC_UPDATE_PIN.equals(message.getMessage())) {
+                Intent intent = BrainwalletActivity.createIntent(this, new Route.UnLock(true));
+                intent.putExtra("noPin", true);
+                startActivity(intent);
+            } else if (SettingsViewModel.LEGACY_EFFECT_ON_SEED_PHRASE.equals(message.getMessage())) {
+                PostAuth.getInstance().onPhraseCheckAuth(this, true);
+            } else if (SettingsViewModel.LEGACY_EFFECT_ON_SHARE_ANALYTICS_DATA_TOGGLE.equals(message.getMessage())) {
+                boolean currentShareAnalyticsDataEnabled = BRSharedPrefs.getShareData(this);
+                BRSharedPrefs.putShareData(this, !currentShareAnalyticsDataEnabled);
+            } else if (SettingsViewModel.LEGACY_EFFECT_ON_SYNC.equals(message.getMessage())) {
+                Intent intent = new Intent(this, SyncBlockchainActivity.class);
+                startActivity(intent);
+                overridePendingTransition(R.anim.enter_from_right, R.anim.exit_to_left);
+            }
+            return null;
+        }); //since we are still using this BreadActivity, need to observe EventBus e.g. lock from [HomeSettingDrawerSheet]
+
         bottomNav = findViewById(R.id.bottomNav);
         bottomNav.getMenu().clear();
         bottomNav.inflateMenu(isInUsa() ? R.menu.bottom_nav_menu_us : R.menu.bottom_nav_menu);

app/src/main/java/com/brainwallet/presenter/activities/settings/SettingsActivity.java

@@ -140,6 +140,7 @@ private void populateItems() {
 
         //toggle dark mode
         boolean isDarkMode = settingRepository.isDarkMode();
+
         items.add(new BRSettingsItem(getString(R.string.toggle_dark_mode), getString(isDarkMode ? androidx.appcompat.R.string.abc_capital_on : androidx.appcompat.R.string.abc_capital_off), v -> {
             settingRepository.toggleDarkMode(!isDarkMode);
             LegacyNavigation.openComposeScreen(SettingsActivity.this);

app/src/main/java/com/brainwallet/presenter/activities/settings/SyncBlockchainActivity.java

@@ -118,6 +118,7 @@ public void onClick(BRDialogView brDialogView) {
                                 BRExecutor.getInstance().forLightWeightBackgroundTasks().execute(new Runnable() {
                                     @Override
                                     public void run() {
+                                        ///Dev: This is the structure to do full sync
                                         BRSharedPrefs.putStartHeight(SyncBlockchainActivity.this, 0);
                                         BRSharedPrefs.putAllowSpend(SyncBlockchainActivity.this, false);
                                         BRPeerManager.getInstance().rescan();