diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b604e822..97faf649 100644 --- a/app/build.gradle.kts +++ b/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})") diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 149adf63..e68a66c1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -217,7 +217,7 @@ + android:resource="@drawable/brainwallet_logotype_white" /> \ No newline at end of file diff --git a/app/src/main/java/com/brainwallet/notification/NotificationHandler.kt b/app/src/main/java/com/brainwallet/notification/NotificationHandler.kt index 59e407a2..e0284842 100644 --- a/app/src/main/java/com/brainwallet/notification/NotificationHandler.kt +++ b/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) diff --git a/app/src/main/java/com/brainwallet/tools/manager/SyncManager.java b/app/src/main/java/com/brainwallet/tools/manager/SyncManager.java index 94a4bfe7..924c6fc6 100644 --- a/app/src/main/java/com/brainwallet/tools/manager/SyncManager.java +++ b/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 diff --git a/app/src/main/java/com/brainwallet/tools/util/BRConstants.java b/app/src/main/java/com/brainwallet/tools/util/BRConstants.java index 4da18340..4709597f 100644 --- a/app/src/main/java/com/brainwallet/tools/util/BRConstants.java +++ b/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 { } diff --git a/app/src/main/java/com/brainwallet/ui/BrainwalletActivity.kt b/app/src/main/java/com/brainwallet/ui/BrainwalletActivity.kt index fcd88f8c..23bc6e94 100644 --- a/app/src/main/java/com/brainwallet/ui/BrainwalletActivity.kt +++ b/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 diff --git a/app/src/main/java/com/brainwallet/ui/screens/topup/TopUpScreen.kt b/app/src/main/java/com/brainwallet/ui/screens/topup/TopUpScreen.kt index d960db03..ddc14ded 100644 --- a/app/src/main/java/com/brainwallet/ui/screens/topup/TopUpScreen.kt +++ b/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() diff --git a/app/src/main/java/com/brainwallet/ui/screens/unlock/UnLockScreen.kt b/app/src/main/java/com/brainwallet/ui/screens/unlock/UnLockScreen.kt index 0db28fbe..acd4819d 100644 --- a/app/src/main/java/com/brainwallet/ui/screens/unlock/UnLockScreen.kt +++ b/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, diff --git a/app/src/main/java/com/brainwallet/ui/screens/welcome/WelcomeScreen.kt b/app/src/main/java/com/brainwallet/ui/screens/welcome/WelcomeScreen.kt index 86fa5907..77104115 100644 --- a/app/src/main/java/com/brainwallet/ui/screens/welcome/WelcomeScreen.kt +++ b/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, diff --git a/app/src/main/res/drawable/brainwallet_logotype_black.png b/app/src/main/res/drawable/brainwallet_logotype_black.png new file mode 100644 index 00000000..6ce1d0b7 Binary files /dev/null and b/app/src/main/res/drawable/brainwallet_logotype_black.png differ diff --git a/app/src/main/res/drawable/brainwallet_logotype_color.png b/app/src/main/res/drawable/brainwallet_logotype_color.png new file mode 100644 index 00000000..2afba56d Binary files /dev/null and b/app/src/main/res/drawable/brainwallet_logotype_color.png differ diff --git a/app/src/main/res/drawable/brainwallet_logotype_white.png b/app/src/main/res/drawable/brainwallet_logotype_white.png new file mode 100644 index 00000000..cc0f84e7 Binary files /dev/null and b/app/src/main/res/drawable/brainwallet_logotype_white.png differ diff --git a/app/src/main/res/drawable/bw_black_logotype.png b/app/src/main/res/drawable/bw_black_logotype.png deleted file mode 100644 index 96c74938..00000000 Binary files a/app/src/main/res/drawable/bw_black_logotype.png and /dev/null differ diff --git a/app/src/main/res/drawable/bw_logo_white.png b/app/src/main/res/drawable/bw_logo_white.png new file mode 100644 index 00000000..b03cb218 Binary files /dev/null and b/app/src/main/res/drawable/bw_logo_white.png differ diff --git a/app/src/main/res/drawable/bw_logotype.png b/app/src/main/res/drawable/bw_logotype.png deleted file mode 100644 index 45f4bdbf..00000000 Binary files a/app/src/main/res/drawable/bw_logotype.png and /dev/null differ diff --git a/app/src/main/res/drawable/bw_white_logotype.png b/app/src/main/res/drawable/bw_white_logotype.png deleted file mode 100644 index 94f18829..00000000 Binary files a/app/src/main/res/drawable/bw_white_logotype.png and /dev/null differ diff --git a/app/src/main/res/drawable/signal_layout.xml b/app/src/main/res/drawable/signal_layout.xml index 333bcc8f..68643035 100644 --- a/app/src/main/res/drawable/signal_layout.xml +++ b/app/src/main/res/drawable/signal_layout.xml @@ -7,8 +7,8 @@ android:topRightRadius="10dp"/> 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 diff --git a/app/src/test/java/com/brainwallet/tools/util/ProdAPIManagerTests.kt b/app/src/test/java/com/brainwallet/tools/util/ProdAPIManagerTests.kt index f7ae93b8..2386d1f0 100644 --- a/app/src/test/java/com/brainwallet/tools/util/ProdAPIManagerTests.kt +++ b/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)