Release/v4.8.0

.circleci/config.yml

@@ -54,8 +54,11 @@ commands:
             EOL
             ls && cat local.properties
       - run:
-          name: "Initialize submodule"
-          command: "git submodule init && git submodule update --init --recursive"
+          name: Rewrite .gitmodules with token
+          command: |
+            sed -i "s#https://github.com/#https://${GH_TOKEN}@github.com/#g" .gitmodules
+            git submodule sync --recursive
+            git submodule update --init --recursive
       - android/restore_gradle_cache
 
 # Define a job to be invoked later in a workflow.

.gitmodules

@@ -4,7 +4,9 @@
 [submodule "app/src/main/jni/core"]
 	path = app/src/main/jni/core
 	url = https://github.com/brainwallet-co/core.git
-[submodule "modules/games"]
-	path = modules/games
-	url = https://github.com/gruntsoftware/android-games.git
-	update = none
+[submodule "modules/private-general-purpose"]
+	path = modules/private-general-purpose
+	url = https://github.com/gruntsoftware/android-private-general-purpose.git
+[submodule "gruntsoftware-build-logic"]
+	path = gruntsoftware-build-logic
+	url = https://github.com/gruntsoftware/android-build-logic.git

app/build.gradle.kts

@@ -1,14 +1,17 @@
 import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
+import org.gradle.kotlin.dsl.grunt
 
 plugins {
-    alias(libs.plugins.android.application)
-    alias(libs.plugins.jetbrains.kotlin.android)
-    alias(libs.plugins.jetbrains.kotlin.compose)
+    alias(grunt.plugins.android.application)
+    alias(grunt.plugins.jetbrains.kotlin.android)
+    alias(grunt.plugins.jetbrains.kotlin.compose)
     alias(libs.plugins.jetbrains.kotlin.kapt)
-    alias(libs.plugins.jetbrains.kotlin.serialization)
+    alias(grunt.plugins.jetbrains.kotlin.serialization)
     alias(libs.plugins.google.services)
     alias(libs.plugins.firebase.crashlytics)
-    alias(libs.plugins.ksp)
+    alias(grunt.plugins.ksp)
+    alias(grunt.plugins.buildlogic.test)
+    alias(grunt.plugins.buildlogic.detekt)
 }
 
 val localProperties = gradleLocalProperties(rootDir, providers)
@@ -21,8 +24,8 @@ android {
         applicationId = "ltd.grunt.brainwallet"
         minSdk = 29
         targetSdk = 36
-        versionCode = 202506296
-        versionName = "v4.7.2"
+        versionCode = 202506298
+        versionName = "v4.8.0"
 
         multiDexEnabled = true
         base.archivesName.set("${defaultConfig.versionName}(${defaultConfig.versionCode})")
@@ -161,13 +164,17 @@ android {
         viewBinding = true
         compose = true
     }
-
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.valueOf("VERSION_${grunt.versions.jvm.target.get()}")
+        targetCompatibility = JavaVersion.valueOf("VERSION_${grunt.versions.jvm.target.get()}")
     }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    kotlin {
+        jvmToolchain(grunt.versions.jvm.target.get().toInt())
+        compilerOptions {
+            jvmTarget.set(
+                org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(grunt.versions.jvm.target.get())
+            )
+        }
     }
 
     packaging {
@@ -179,24 +186,13 @@ android {
     //TODO: rename output apk/bundle
 }
 
-val ktlint by configurations.creating
-
 dependencies {
-    ktlint(libs.pinterest.ktlint) {
-        attributes {
-            attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL))
-        }
-    }
-
-    val gamesModule = findProject(":modules:games:content")
-    if (gamesModule != null) {
-        implementation(gamesModule)
-    } else {
-        logger.lifecycle("⚠️ Submodule ':modules:games:content' not found — skipping dependency")
-    }
-
+    implementation(project(":games"))
+    implementation(project(":iap"))
+    implementation(project(":core"))
     implementation("androidx.webkit:webkit:1.9.0")
-    implementation(libs.androidx.core)
+    implementation(grunt.androidx.core.ktx)
+    implementation(grunt.app.startup)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.legacy.support)
     implementation(libs.androidx.recyclerview)
@@ -209,8 +205,10 @@ dependencies {
     implementation(libs.bundles.androidx.lifecycle)
     implementation(libs.androidx.work)
     implementation(libs.androidx.browser)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.bundles.androidx.compose)
+    implementation(platform(grunt.androidx.compose.bom))
+    implementation(grunt.bundles.androidx.compose)
+    implementation(grunt.kotlin.immutable)
+    implementation(grunt.material)
     implementation(libs.google.material)
     implementation(libs.google.zxing)
     implementation(platform(libs.firebase.bom))
@@ -222,11 +220,11 @@ dependencies {
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.kotlinx.coroutines.android)
     implementation (libs.airbnb.lottie.compose)
-    implementation(platform(libs.koin.bom))
-    implementation(libs.bundles.koin)
-    implementation(platform(libs.koin.annotation.bom))
-    implementation(libs.koin.annotation)
-    ksp(libs.koin.annotation.compiler)
+    implementation(platform(grunt.koin.bom))
+    implementation(grunt.bundles.koin)
+    implementation(platform(grunt.koin.annotation.bom))
+    implementation(grunt.koin.annotation)
+    ksp(grunt.koin.annotation.compiler)
 
     implementation(platform(libs.squareup.okhttp.bom))
     implementation(libs.bundles.squareup.okhttp)
@@ -248,45 +246,13 @@ dependencies {
     testImplementation(libs.slf4j.android)
     testImplementation(libs.kotlinx.coroutines.tests)
 
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.bundles.androidx.compose.ui.test)
+    androidTestImplementation(platform(grunt.androidx.compose.bom))
+    androidTestImplementation(grunt.bundles.androidx.compose.ui.test)
     androidTestImplementation(libs.bundles.android.test)
     androidTestImplementation(libs.fastlane.screengrab)
     androidTestImplementation(libs.slf4j.android)
 }
 
-val ktlintCheck by tasks.registering(JavaExec::class) {
-    group = LifecycleBasePlugin.VERIFICATION_GROUP
-    description = "Check Kotlin code style"
-    classpath = ktlint
-    mainClass.set("com.pinterest.ktlint.Main")
-    // see https://pinterest.github.io/ktlint/install/cli/#command-line-usage for more information
-    args(
-        "**/src/**/*.kt",
-        "**.kts",
-        "!**/build/**",
-    )
-}
-
-tasks.check {
-    dependsOn(ktlintCheck)
-}
-
-tasks.register<JavaExec>("ktlintFormat") {
-    group = LifecycleBasePlugin.VERIFICATION_GROUP
-    description = "Check Kotlin code style and format"
-    classpath = ktlint
-    mainClass.set("com.pinterest.ktlint.Main")
-    jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
-    // see https://pinterest.github.io/ktlint/install/cli/#command-line-usage for more information
-    args(
-        "-F",
-        "**/src/**/*.kt",
-        "**.kts",
-        "!**/build/**",
-    )
-}
-
 tasks.withType<Test> {
     jvmArgs("-XX:+EnableDynamicAgentLoading")
 }

app/proguard-rules.pro

@@ -41,6 +41,8 @@
 -dontwarn org.slf4j.impl.StaticMDCBinder
 -dontwarn org.slf4j.impl.StaticMarkerBinder
 -dontwarn java.lang.reflect.AnnotatedType
+-dontwarn com.google.api.client.http.**
+-dontwarn org.joda.time.**
 
 -keepclasseswithmembernames class * {
  native <methods>;

app/src/androidTest/kotlin/flow/RecoverWalletScreenGrabsTest.kt

@@ -80,11 +80,9 @@ class RecoverWalletScreenGrabsTest {
         CleanStatusBar.disable()
     }
 
-
     @OptIn(ExperimentalTestApi::class)
     @Test
     fun onRecoverFlowSuccess() {
-
         composeTestRule.activityRule.scenario.onActivity {
             Screengrab.setDefaultScreenshotStrategy(FalconScreenshotStrategy(it))
         }
@@ -102,7 +100,7 @@ class RecoverWalletScreenGrabsTest {
 
         Screengrab.screenshot("2_input_words_screen")
 
-        //seed words input
+        // seed words input
         val editTextTags = (0..11).map { index -> "textFieldSeedWord$index" }
 
         val paperKey = BuildConfig.SCREENGRAB_PAPERKEY
@@ -148,7 +146,7 @@ class RecoverWalletScreenGrabsTest {
 
         Screengrab.screenshot("6_main_screen")
 
-        //setting drawer
+        // setting drawer
         onView(withId(R.id.menuBut)).perform(click())
 
         Screengrab.screenshot("7_setting_drawer_open")
@@ -216,8 +214,7 @@ class RecoverWalletScreenGrabsTest {
         uiDevice.waitForIdle()
         Thread.sleep(1000)
 
-
-        //tx send ui
+        // tx send ui
         onView(withId(R.id.nav_send)).perform(click())
 
         onView(withId(R.id.amount_edit)).perform(click())
@@ -226,16 +223,14 @@ class RecoverWalletScreenGrabsTest {
 
         onView(withId(R.id.close_button)).perform(click())
 
-
-        //tx buy/receive ui
+        // tx buy/receive ui
         onView(withId(R.id.nav_receive)).perform(click())
 
         Screengrab.screenshot("15_transaction_buy_receive")
 
         composeTestRule.onNodeWithTag("buttonClose").performClick()
 
         uiDevice.waitForIdle()
-
     }
 
     private fun waitUntilReady() {
@@ -262,5 +257,4 @@ class RecoverWalletScreenGrabsTest {
             }
         }
     }
-
-}
+}

app/src/main/AndroidManifest.xml

@@ -52,7 +52,14 @@
         tools:replace="android:fullBackupContent,android:allowBackup">
 
         <property android:name="android.window.PROPERTY_COMPAT_ALLOW_RESTRICTED_RESIZABILITY" android:value="true" />
-
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            android:exported="false"
+            tools:node="merge">
+            <meta-data  android:name="com.brainwallet.initializer.AppInitializer"
+                android:value="androidx.startup" />
+        </provider>
         <!-- Main Compose Activity -->
         <activity
             android:name=".ui.BrainwalletActivity"

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

@@ -6,9 +6,6 @@ import android.app.Application
 import android.content.Context
 import android.content.res.Resources
 import com.appsflyer.AppsFlyerLib
-import com.brainwallet.data.source.RemoteConfigSource
-import com.brainwallet.di.AppModule
-import com.brainwallet.domain.MessagingTopicUseCase
 import com.brainwallet.notification.NotificationHandler
 import com.brainwallet.presenter.activities.util.BRActivity
 import com.brainwallet.presenter.entities.ServiceItems
@@ -17,29 +14,19 @@ import com.brainwallet.tools.manager.AnalyticsManager
 import com.brainwallet.tools.util.BRConstants
 import com.brainwallet.tools.util.Utils
 import org.koin.android.ext.android.inject
-import org.koin.android.ext.koin.androidContext
-import org.koin.android.ext.koin.androidLogger
-import org.koin.core.context.GlobalContext.startKoin
-import org.koin.core.logger.Level
-import org.koin.ksp.generated.module
 import timber.log.Timber
 import timber.log.Timber.DebugTree
 import java.util.Timer
 import java.util.TimerTask
 import java.util.concurrent.atomic.AtomicInteger
-import kotlin.concurrent.thread
 
 open class BrainwalletApp : Application() {
 
-    private val remoteConfigSource: RemoteConfigSource by inject()
     private val notificationHandler: NotificationHandler by inject()
-    private val messagingTopicHandler: MessagingTopicUseCase by inject()
 
     override fun onCreate() {
         super.onCreate()
 
-        initializeModule()
-
         /** DEV:  Top placement requirement. **/
         val enableCrashlytics = !Utils.isEmulatorOrDebug(this)
         notificationHandler.setupNotificationChannels(this)
@@ -75,16 +62,6 @@ open class BrainwalletApp : Application() {
         appsFlyerLib.start(this)
     }
 
-    protected open fun initializeModule() {
-        startKoin {
-            androidLogger(if (BuildConfig.DEBUG) Level.DEBUG else Level.ERROR)
-            androidContext(this@BrainwalletApp)
-            modules(AppModule.dataModule, AppModule.module)
-        }
-        thread { remoteConfigSource.initialize() }
-        thread { messagingTopicHandler.initialize() }
-    }
-
 //    override fun attachBaseContext(base: Context) {
 //        init(base)
 //        super.attachBaseContext(instance.setLocale(base))
@@ -136,7 +113,7 @@ open class BrainwalletApp : Application() {
             return context == null || activityCounter.get() <= 0
         }
 
-        //call onStop on evert activity so
+        // call onStop on evert activity so
         @JvmStatic
         fun onStop(app: BRActivity?) {
             if (isBackgroundChecker != null) isBackgroundChecker!!.cancel()

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

@@ -9,4 +9,4 @@ data class AppSetting(
         -1f,
         "$"
     )
-)
+)

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

@@ -1,3 +1,3 @@
 package com.brainwallet.data.model
 
-data class Country(val name: String, val code: String)
+data class Country(val name: String, val code: String)

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

@@ -6,12 +6,12 @@ import java.io.Serializable
 @kotlinx.serialization.Serializable
 data class CurrencyEntity(
     @JvmField
-    var code: String ="",
+    var code: String = "",
     @JvmField
     var name: String = "",
     @JvmField
     @SerialName("n")
     var rate: Float = 0F,
     @JvmField
     var symbol: String = ""
-) : Serializable
+) : Serializable

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

@@ -49,7 +49,6 @@ data class Fee(
     }
 }
 
-
 data class FeeOption(
     @FeeType
     val type: String,
@@ -90,5 +89,5 @@ fun FeeOption.getFiatFormatted(currencyEntity: CurrencyEntity): String {
 
 fun List<FeeOption>.getSelectedIndex(selectedFeeType: String): Int {
     return indexOfFirst { it.type == selectedFeeType }.takeIf { it >= 0 }
-        ?: 2  //2 -> index of top, since we have [low,medium,top]
+        ?: 2 // 2 -> index of top, since we have [low,medium,top]
 }