🚀[Release v4.31] Merge into Develop

app/build.gradle.kts

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

app/src/main/AndroidManifest.xml

@@ -217,7 +217,7 @@
 
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_icon"
-            android:resource="@drawable/bw_white_logotype" />
+            android:resource="@drawable/brainwallet_logotype_white" />
     </application>
 
 </manifest>

app/src/main/java/com/brainwallet/notification/NotificationHandler.kt

@@ -41,7 +41,7 @@ object NotificationHandler {
         val notification = NotificationCompat.Builder(context, channelId)
             .setContentTitle(title)
             .setContentText(body)
-            .setSmallIcon(R.drawable.bw_white_logotype)
+            .setSmallIcon(R.drawable.brainwallet_logotype_white)
             .setContentIntent(pendingIntent)
             .setAutoCancel(true)
 

app/src/main/java/com/brainwallet/tools/manager/SyncManager.java

@@ -186,7 +186,7 @@ public void run() {
                         app = BreadActivity.getApp();
                     }
 
-                    ///DEV kcw-grunt 26-10-24
+                    ///DEV: kcw-grunt 26-10-24
                     /// DUMB sleep was slowing sync dramatically
                     /// Why is this here?
                     /// Reduced it from 500msec to 100msec until refactor

app/src/main/java/com/brainwallet/tools/util/BRConstants.java

@@ -133,6 +133,9 @@ private BRConstants() {
     public static final String _20201121_FRIA = "failed_resolve_IPFS_address";
     public static final String _20230113_BAC = "backup_apiserver_called";
     public static final String _20230407_DCS = "did_complete_sync";
+
+    public static final String _20250303_DSTU = "did_skip_top_up";
+
     ///Dev: These events not yet used
     public static final String _20200207_DTHB = "did_tap_header_balance";
     public static final String _20210427_HCIEEH = "heartbeat_check_if_event_even_happens";
@@ -181,7 +184,8 @@ private BRConstants() {
             _20241006_DRR,
             _20241006_UCR,
             _HOME_OPEN,
-            _20250222_PAC
+            _20250222_PAC,
+            _20250303_DSTU
     })
     public @interface Event {
     }

app/src/main/java/com/brainwallet/ui/BrainwalletActivity.kt

@@ -55,6 +55,8 @@ class BrainwalletActivity : BRActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        ///DEV: Test / Dev Composable Shortcut swap to launch
+        /// Ergo; Route.TopUp
         val startDestination =
             intent.getSerializableExtra(EXTRA_START_DESTINATION) ?: Route.Welcome
 

app/src/main/java/com/brainwallet/ui/screens/topup/TopUpScreen.kt

@@ -44,6 +44,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import com.brainwallet.R
 import com.brainwallet.navigation.OnNavigate
 import com.brainwallet.navigation.UiEffect
+import com.brainwallet.tools.manager.AnalyticsManager
 import com.brainwallet.tools.util.BRConstants
 import com.brainwallet.ui.composable.BorderedLargeButton
 import com.brainwallet.ui.composable.BrainwalletScaffold
@@ -180,6 +181,7 @@ fun TopUpScreen(
                         MediumTextButton(
                             onClick = {
                                 viewModel.onEvent(YourSeedProveItEvent.OnGameAndSync)
+                                AnalyticsManager.logCustomEvent(BRConstants._20250303_DSTU)
                             },
                             modifier = Modifier
                                 .width(skipButtonWidth.dp)
@@ -213,6 +215,7 @@ fun TopUpScreen(
                 BorderedLargeButton(
                     onClick = {
                         viewModel.onEvent(YourSeedProveItEvent.OnGameAndSync)
+                        AnalyticsManager.logCustomEvent(BRConstants._20250303_DSTU)
                     },
                     modifier = Modifier.fillMaxWidth()
 

app/src/main/java/com/brainwallet/ui/screens/unlock/UnLockScreen.kt

@@ -82,7 +82,7 @@ fun UnLockScreen(
                 modifier = Modifier
                     .fillMaxWidth(0.80f)
                     .padding(horizontalVerticalSpacing.dp),
-                painter = painterResource(R.drawable.bw_white_logotype),
+                painter = painterResource(R.drawable.brainwallet_logotype_white),
                 contentDescription = stringResource(R.string.logo),
                 colorFilter = ColorFilter.tint(
                     BrainwalletTheme.colors.content,

app/src/main/java/com/brainwallet/ui/screens/welcome/WelcomeScreen.kt

@@ -96,8 +96,8 @@ fun WelcomeScreen(
         Spacer(modifier = Modifier.weight(0.4f))
 
         Image(
-            painterResource(R.drawable.bw_white_logotype),
-            contentDescription = "bw_white_logotype",
+            painterResource(R.drawable.brainwallet_logotype_white),
+            contentDescription = "brainwallet_logotype_white",
             contentScale = ContentScale.Fit,
             colorFilter = ColorFilter.tint(
                 BrainwalletTheme.colors.content,

app/src/main/res/drawable/signal_layout.xml

@@ -7,8 +7,8 @@
         android:topRightRadius="10dp"/>
     <gradient
         android:angle="45"
-        android:endColor="@color/near_black"
-        android:startColor="@color/near_black"
+        android:endColor="@color/midnight"
+        android:startColor="@color/midnight"
         android:type="linear"/>
     <padding
         android:left="10dp"

app/src/main/res/layout/activity_intro.xml

@@ -14,7 +14,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="100dp"
         android:layout_marginEnd="8dp"
-        android:src="@drawable/bw_white_logotype"
+        android:src="@drawable/brainwallet_logotype_white"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.498"
         app:layout_constraintStart_toStartOf="parent"

app/src/main/res/layout/activity_pin.xml

@@ -62,7 +62,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="8dp"
         android:adjustViewBounds="true"
-        android:src="@drawable/bw_white_logotype"
+        android:src="@drawable/brainwallet_logotype_white"
         app:layout_constraintBottom_toTopOf="@+id/brkeyboard"
         app:layout_constraintHorizontal_bias="0.497"
         app:layout_constraintStart_toStartOf="parent"

app/src/test/java/com/brainwallet/tools/util/LocaleHelperTest.kt

@@ -53,7 +53,7 @@ class LocaleHelperTest {
     }
 
     @Test
-    fun `check all language codes`() {
+    fun `check all language codes given the subjective business logic which prioritizes localization popularity`() {
         Language.entries
             .also { languages ->
                 assertEquals(16, languages.size)
@@ -69,14 +69,14 @@ class LocaleHelperTest {
                         "uk",
                         "ru",
                         "pt",
+                        "hi",
+                        "de",
                         "ko",
                         "fr",
                         "zh-TW",
                         "tr",
                         "ja",
-                        "de",
                         "zh-CN",
-                        "hi",
                         "it",
                     ),
                     langCodes

app/src/test/java/com/brainwallet/tools/util/ProdAPIManagerTests.kt

@@ -97,7 +97,7 @@ class ProdAPIManagerTests {
         assertEquals("GBP", jsonGBP.optString("code"))
         assertEquals("British Pound Sterling", jsonGBP.optString("name"))
 
-        ///DEV Very flaky test not enough time for the response
+        ///DEV: Very flaky test not enough time for the response
         verifyAll {
             ActivityUTILS.isMainThread()
             APIClient.getInstance(activity).getCurrentLocale(activity)