🫙 Switching from release branches to tags

.github/workflows/notify.yml

@@ -15,7 +15,7 @@ jobs:
           script: |
             await github.rest.actions.createWorkflowDispatch({
               owner: 'gruntsoftware',
-              repo: 'brainwallet-android',
+              repo: 'android',
               workflow_id: 'sync.yml',
               ref: 'main',
               inputs: {

app/build.gradle.kts

@@ -35,7 +35,7 @@ android {
         applicationId = "ltd.grunt.brainwallet"
         minSdk = 29
         targetSdk = 35
-        versionCode = 202506323
+        versionCode = 202506326
         versionName = "v4.9.1"
         multiDexEnabled = true
         base.archivesName.set("${defaultConfig.versionName}(${defaultConfig.versionCode})")

app/src/main/AndroidManifest.xml

@@ -15,6 +15,7 @@
     <uses-permission android:name="com.google.android.gms.permission.AD_ID" /> <!-- Allows unlocking your device and activating its screen so UI tests can succeed -->
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" /> <!-- Allows changing locales -->
     <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
 
     <meta-data android:name="google_analytics_default_allow_analytics_storage" android:value="true" />

app/src/main/java/com/brainwallet/constants/BWConstants.kt

@@ -107,6 +107,8 @@ object BWConstants {
     const val TOS_LINK: String = "https://www.brainwallet.co/privacypolicy"
     const val LINKTREE_URL: String = "https://linktr.ee/brainwallet"
 
+    const val BITREFILL_URL: String = "https://www.bitrefill.com/?ref=bAshL935"
+
     /**
      * API Hosts
      */

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

@@ -7,10 +7,12 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
+import com.brainwallet.constants.BWConstants
 import com.brainwallet.ui.screens.buyreceive.BuyReceiveScreen
 import com.brainwallet.ui.screens.gamehub.GameHubScreen
 import com.brainwallet.ui.screens.home.MainScreen
 import com.brainwallet.ui.bentosections.buyreceivebento.receive.ReceiveDialog
+import com.brainwallet.ui.screens.main.WebModalScreen
 import com.brainwallet.ui.screens.restore.RestoreScreen
 import com.brainwallet.ui.screens.ready.ReadyScreen
 import com.brainwallet.ui.screens.send.SendScreen
@@ -132,8 +134,24 @@ fun NavGraphBuilder.mainNavGraph(
         val route: Route.GameHub = navBackStackEntry.toRoute()
         GameHubScreen(onNavigate = onNavigate)
     }
-    composable<Route.MoonPayWeb> { navBackStackEntry ->
+    composable<Route.MoonPayBuy> { navBackStackEntry ->
         val route: Route.GameHub = navBackStackEntry.toRoute()
         BuyReceiveScreen(onNavigate = onNavigate)
     }
+
+    composable<Route.LinktreeWeb> { navBackStackEntry ->
+        val route: Route.LinktreeWeb = navBackStackEntry.toRoute()
+        WebModalScreen(
+            onNavigate = onNavigate,
+            url = BWConstants.LINKTREE_URL
+        )
+    }
+
+    composable<Route.BitrefillWeb> { navBackStackEntry ->
+        val route: Route.LinktreeWeb = navBackStackEntry.toRoute()
+        WebModalScreen(
+            onNavigate = onNavigate,
+            url = BWConstants.BITREFILL_URL
+        )
+    }
 }

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

@@ -52,9 +52,21 @@ sealed class Route : JavaSerializable {
     @Serializable
     object Send : Route()
 
+    @Serializable
+    object TutorialWalkthrough : Route()
+
+    @Serializable
+    object TutorialSend : Route()
+
     @Serializable
     object GameHub : Route()
 
     @Serializable
-    object MoonPayWeb : Route()
+    object MoonPayBuy : Route()
+
+    @Serializable
+    object BitrefillWeb : Route()
+
+    @Serializable
+    object LinktreeWeb : Route()
 }

app/src/main/java/com/brainwallet/ui/bentosections/shopbento/GiftCardsComposable.kt

@@ -0,0 +1,102 @@
+package com.brainwallet.ui.bentosections.shopbento
+
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.offset
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.brainwallet.ui.bentosections.shopbento.cards.CardAmazonComposable
+import com.brainwallet.ui.bentosections.shopbento.cards.CardJustEatComposable
+import com.brainwallet.ui.bentosections.shopbento.cards.CardVisaComposable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
+
+@Composable
+fun GiftCardsComposable(
+    state: ShopBentoState,
+    cardData: String,
+    modifier: Modifier = Modifier,
+) {
+    val cornerRadius = 4.dp
+    var appeared by remember { mutableStateOf(false) }
+
+    LaunchedEffect(Unit) {
+        appeared = true
+    }
+
+    val offsetVisa by animateFloatAsState(
+        targetValue = if (appeared) -10f else 100f,
+        animationSpec = tween(
+            500,
+            delayMillis = 200
+        ),
+        label = "visaSlide"
+    )
+
+    val offsetJE by animateFloatAsState(
+        targetValue = if (appeared) 30f else 100f,
+        animationSpec = tween(
+            600,
+            delayMillis = 200
+        ),
+        label = "jeSlide"
+    )
+
+    val offsetAmazon by animateFloatAsState(
+        targetValue = if (appeared) -12f else 50f,
+        animationSpec = tween(
+            400,
+            delayMillis = 200
+        ),
+        label = "amazonSlide"
+    )
+
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxHeight()
+                .offset(x = offsetVisa.dp, y = 5.dp)
+        ) {
+            CardVisaComposable(rotation = 20f)
+        }
+
+        Column(
+            modifier = Modifier
+                .fillMaxHeight()
+                .offset(x = offsetAmazon.dp, y = -15.dp)
+
+        ) {
+            CardAmazonComposable(rotation = 20f)
+        }
+
+        Column(
+            modifier = Modifier
+                .fillMaxHeight()
+                .offset(x = offsetJE.dp, y = 15.dp)
+
+        ) {
+            CardJustEatComposable(rotation = -30f)
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun GiftCardsComposablePreview() {
+    Box(modifier = Modifier) {
+        GiftCardsComposable(state = ShopBentoState(), cardData = "acr")
+    }
+}

app/src/main/java/com/brainwallet/ui/bentosections/shopbento/ShopBentoEvent.kt

@@ -0,0 +1,6 @@
+package com.brainwallet.ui.bentosections.shopbento
+
+sealed class ShopBentoEvent {
+    data object OnLoad : ShopBentoEvent()
+    data object OnTapShop : ShopBentoEvent()
+}