🚀[Release v4.7.0] Merge into Main

app/CMakeLists.txt

@@ -84,8 +84,11 @@ include_directories(src/main/secp/secp256k1/src/)
 include_directories(src/main/secp/secp256k1/)
 include_directories(src/main/secp/)
 
+# support compiling 16 KB-aligned: https://developer.android.com/guide/practices/page-sizes#cmake
+target_link_options(core-lib PRIVATE "-Wl,-z,max-page-size=16384")
+
 # add lib dependencies
 target_link_libraries(
     core-lib
     android
-    log)
+    log)

app/build.gradle.kts

@@ -14,14 +14,14 @@ val localProperties = gradleLocalProperties(rootDir, providers)
 
 android {
     namespace = "com.brainwallet"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "ltd.grunt.brainwallet"
         minSdk = 29
-        targetSdk = 34
-        versionCode = 202506291
-        versionName = "4.6.2"
+        targetSdk = 36
+        versionCode = 202506293
+        versionName = "v4.7.0"
 
         multiDexEnabled = true
         base.archivesName.set("${defaultConfig.versionName}(${defaultConfig.versionCode})")

app/proguard-rules.pro

@@ -40,7 +40,7 @@
 -dontwarn org.slf4j.impl.StaticLoggerBinder
 -dontwarn org.slf4j.impl.StaticMDCBinder
 -dontwarn org.slf4j.impl.StaticMarkerBinder
-
+-dontwarn java.lang.reflect.AnnotatedType
 
 -keepclasseswithmembernames class * {
  native <methods>;

app/src/main/AndroidManifest.xml

@@ -51,15 +51,16 @@
         tools:ignore="GoogleAppIndexingWarning,UnusedAttribute"
         tools:replace="android:fullBackupContent,android:allowBackup">
 
+        <property android:name="android.window.PROPERTY_COMPAT_ALLOW_RESTRICTED_RESIZABILITY" android:value="true" />
+
         <!-- Main Compose Activity -->
         <activity
             android:name=".ui.BrainwalletActivity"
             android:exported="true"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize">
-            <intent-filter android:autoVerify="true">
+            <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 

app/src/main/java/com/brainwallet/BrainwalletApp.kt

@@ -16,11 +16,6 @@ import com.brainwallet.tools.listeners.SyncReceiver
 import com.brainwallet.tools.manager.AnalyticsManager
 import com.brainwallet.tools.util.BRConstants
 import com.brainwallet.tools.util.Utils
-import com.google.firebase.analytics.FirebaseAnalytics
-import com.google.firebase.analytics.ktx.analytics
-import com.google.firebase.analytics.setConsent
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import com.google.firebase.ktx.Firebase
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.core.context.GlobalContext.startKoin

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

@@ -23,8 +23,8 @@ import com.brainwallet.ui.screens.yourseedwords.YourSeedWordsViewModel
 import com.brainwallet.util.cryptography.KeyStoreKeyGenerator
 import com.brainwallet.util.cryptography.KeyStoreManager
 import com.brainwallet.worker.CurrencyUpdateWorker
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.remoteconfig.ktx.remoteConfig
+import com.google.firebase.Firebase
+import com.google.firebase.remoteconfig.remoteConfig
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
@@ -35,7 +35,6 @@ import org.koin.core.component.inject
 import org.koin.core.module.dsl.viewModel
 import org.koin.core.module.dsl.viewModelOf
 import org.koin.dsl.module
-import retrofit2.HttpException
 import retrofit2.Retrofit
 import retrofit2.converter.kotlinx.serialization.asConverterFactory
 

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

@@ -10,6 +10,7 @@ import androidx.core.net.toUri
 import com.brainwallet.BuildConfig
 import com.brainwallet.R
 import com.brainwallet.data.repository.LtcRepository
+import com.brainwallet.data.source.RemoteApiSource
 import com.brainwallet.di.getKoinInstance
 import com.brainwallet.presenter.activities.BreadActivity
 import com.brainwallet.ui.BrainwalletActivity

app/src/main/java/com/brainwallet/ui/screens/buylitecoin/BuyLitecoinScreen.kt

@@ -1,9 +1,5 @@
 package com.brainwallet.ui.screens.buylitecoin
 
-import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
-import android.provider.Settings.Global.putString
 import android.widget.Toast
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -39,7 +35,6 @@ import com.brainwallet.ui.composable.LargeButton
 import com.brainwallet.ui.composable.LoadingDialog
 import com.brainwallet.ui.screens.home.receive.ReceiveDialogEvent
 import com.brainwallet.ui.theme.BrainwalletTheme
-import com.google.firebase.analytics.FirebaseAnalytics
 import org.koin.compose.koinInject
 
 //TODO: wip
@@ -52,10 +47,6 @@ fun BuyLitecoinScreen(
     val loadingState by viewModel.loadingState.collectAsState()
     val appSetting by viewModel.appSetting.collectAsState()
     val context = LocalContext.current
-    val  firebaseAnalytics = FirebaseAnalytics.getInstance(LocalContext.current)
-    val bundle = Bundle().apply {
-        putString("buy_tapped_location", "buy_litecoin_screen")
-    }
     LaunchedEffect(Unit) {
         viewModel.onEvent(BuyLitecoinEvent.OnLoad(context))
         viewModel.uiEffect.collect { effect ->
@@ -158,9 +149,7 @@ fun BuyLitecoinScreen(
                 enabled = loadingState.visible.not(),
                 onClick = {
                     //open bread activity first then open moonpay widget
-                    // Needs Refactor: This causes crashes ruining the UX
-                    // LegacyNavigation.restartBreadActivity(context)
-
+                    LegacyNavigation.restartBreadActivity(context)
                     LegacyNavigation.showMoonPayWidget(
                         context = context,
                         params = mapOf(
@@ -170,7 +159,6 @@ fun BuyLitecoinScreen(
                             "walletAddress" to state.address
                         )
                     )
-                    firebaseAnalytics.logEvent("will_show_mp_widget", bundle)
                 }
             ) {
                 Text(stringResource(R.string.buy_litecoin_button_moonpay))

app/src/main/java/com/brainwallet/ui/screens/home/receive/ReceiveDialog.kt

@@ -71,7 +71,6 @@ import com.brainwallet.ui.composable.WheelPickerFocusVertical
 import com.brainwallet.ui.composable.rememberWheelPickerState
 import com.brainwallet.ui.theme.BrainwalletAppTheme
 import com.brainwallet.ui.theme.BrainwalletTheme
-import com.google.firebase.analytics.FirebaseAnalytics
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.debounce
@@ -91,10 +90,6 @@ fun ReceiveDialog(
     val appSetting by viewModel.appSetting.collectAsState()
     val context = LocalContext.current
     val wheelPickerFiatCurrencyState = rememberWheelPickerState(0)
-    val  firebaseAnalytics = FirebaseAnalytics.getInstance(LocalContext.current)
-    val bundle = Bundle().apply {
-        putString("buy_tapped_location", "buy_receive_dialog")
-    }
     LaunchedEffect(Unit) {
         viewModel.onEvent(ReceiveDialogEvent.OnLoad(context))
         viewModel.uiEffect.collect { effect ->
@@ -384,7 +379,6 @@ fun ReceiveDialog(
                         ),
                         isDarkMode = appSetting.isDarkMode
                     )
-                    firebaseAnalytics.logEvent("will_show_mp_widget", bundle)
                     onDismissRequest.invoke()
                 },
             )

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

@@ -7,12 +7,15 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -93,39 +96,44 @@ fun WelcomeScreen(
         modifier = Modifier
             .fillMaxSize()
             .background(BrainwalletTheme.colors.surface)
-            .verticalScroll(rememberScrollState()),
+            .verticalScroll(rememberScrollState())
+            .padding(WindowInsets.systemBars.asPaddingValues()),
     ) {
-        Image(
-            painterResource(R.drawable.brainwallet_logotype_white),
-            contentDescription = "brainwallet_logotype_white",
-            contentScale = ContentScale.Fit,
-            colorFilter = ColorFilter.tint(
-                BrainwalletTheme.colors.content,
-            ),
+        Column(
             modifier = Modifier
                 .align(Alignment.TopCenter)
-                .fillMaxWidth()
-                .padding(horizontal = 55.dp)
-                .padding(vertical = 30.dp)
-        )
+                .padding(vertical = 20.dp)
+        ) {
+            Image(
+                painterResource(R.drawable.brainwallet_logotype_white),
+                contentDescription = "brainwallet_logotype_white",
+                contentScale = ContentScale.Fit,
+                colorFilter = ColorFilter.tint(
+                    BrainwalletTheme.colors.content,
+                ),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 55.dp)
+            )
+
+            // Animation Placeholder
+            LottieAnimation(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(leadTrailPadding.dp)
+                    .background(
+                        BrainwalletTheme.colors.surface,
+                        BrainwalletTheme.shapes.large
+                    )
+                    .height(thirdOfScreenHeight.dp)
+                    .clip(BrainwalletTheme.shapes.large),
+                composition = composition,
+                contentScale = ContentScale.FillWidth,
+                alignment = Alignment.Center,
+                progress = { progress }
+            )
+        }
 
-        // Animation Placeholder
-        LottieAnimation(
-            modifier = Modifier
-                .offset(y = 120.dp)
-                .fillMaxWidth()
-                .padding(leadTrailPadding.dp)
-                .background(
-                    BrainwalletTheme.colors.surface,
-                    BrainwalletTheme.shapes.large
-                )
-                .height(thirdOfScreenHeight.dp)
-                .clip(BrainwalletTheme.shapes.large),
-            composition = composition,
-            contentScale = ContentScale.FillWidth,
-            alignment = Alignment.Center,
-            progress = { progress }
-        )
 
         Column(
             modifier = Modifier.align(Alignment.BottomCenter),

app/src/main/java/com/brainwallet/ui/screens/yourseedproveit/YourSeedProveItScreen.kt

@@ -164,10 +164,10 @@ fun YourSeedProveItScreen(
 
                                             )
                                             if (text.toString() == expectedWord) {
-                                                clickAudioPlayer.start() // success sound
+                                                clickAudioPlayer.start() // Success sound
                                             }
                                             else {
-                                                errorAudioPlayer.start() // error sound
+                                                errorAudioPlayer.start() // Success sound
                                             }
                                             return true
                                         }
@@ -231,9 +231,7 @@ fun YourSeedProveItScreen(
             LargeButton(
                 onClick = {
                     if (state.orderCorrected) {
-                        //onNavigate.invoke(UiEffect.Navigate(Route.))
-                        viewModel.onEvent(YourSeedProveItEvent.OnGameAndSync)
-                        AnalyticsManager.logCustomEvent(BRConstants._20250303_DSTU)
+                        onNavigate.invoke(UiEffect.Navigate(Route.TopUp))
                     } else {
                         viewModel.onEvent(YourSeedProveItEvent.OnClear)
                     }