Updated on 2026-08-14

2022-07-26 10:23:28 +03:00 · 2022-07-26 10:23:28 +03:00 · 71b9684efc
commit 71b9684efc
parent fc0803b40a 2f701f7237
8 changed files with 122 additions and 70 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -6,13 +6,13 @@ apply plugin: 'com.google.firebase.crashlytics'
 apply from: '../dependencies.gradle'

 android {
-    compileSdkVersion 31
+    compileSdkVersion 32
    defaultConfig {
        applicationId "com.tangem.wallet"
        versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 1
        versionName project.hasProperty('versionName') ? project.property('versionName') : "1.0.0.-SNAPSHOT"
        minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 32
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

        buildConfigField 'Boolean', environmentConfig.testActionEnabled, 'false'
@ -83,12 +83,11 @@ dependencies {
    implementation implementation(project(path: ':network'))
    implementation implementation(project(path: ':common'))

-    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.core:core-ktx:1.8.0'
    implementation 'androidx.appcompat:appcompat:1.4.1'
    implementation 'androidx.fragment:fragment-ktx:1.4.1'
    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
    implementation 'com.google.android.material:material:1.5.0'
-    implementation "androidx.core:core-ktx:1.7.0"
    implementation 'com.google.android.play:core:1.10.3'
    implementation 'com.google.android.play:core-ktx:1.8.1'
    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
@ -164,14 +163,14 @@ dependencies {
    implementation 'com.google.android.gms:play-services-wallet:19.1.0'

    //Compose
-    implementation 'androidx.activity:activity-compose:1.4.0'
+    implementation 'androidx.activity:activity-compose:1.5.0'
    implementation 'androidx.compose.material:material:1.1.1'
    implementation 'androidx.compose.animation:animation:1.1.1'
-    implementation 'androidx.compose.foundation:foundation:1.1.1'
-    implementation 'androidx.compose.foundation:foundation-layout:1.1.1'
+    implementation 'androidx.compose.foundation:foundation:1.2.0-rc03'
    implementation 'androidx.compose.ui:ui:1.1.1'
    implementation 'androidx.compose.ui:ui-tooling:1.1.1'
    implementation "com.google.accompanist:accompanist-appcompat-theme:0.23.0"
+    implementation "com.google.accompanist:accompanist-systemuicontroller:0.23.0"

    implementation "com.github.skydoves:androidveil:1.1.2"

--- a/app/src/main/java/com/tangem/tap/MainActivity.kt
+++ b/app/src/main/java/com/tangem/tap/MainActivity.kt
@ -5,6 +5,8 @@ import android.content.pm.ActivityInfo
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsControllerCompat
 import by.kirich1409.viewbindingdelegate.viewBinding
 import com.google.android.material.snackbar.Snackbar
 import com.tangem.TangemSdk
@ -27,11 +29,11 @@ import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction
 import com.tangem.tap.features.shop.redux.ShopAction
 import com.tangem.wallet.R
 import com.tangem.wallet.databinding.ActivityMainBinding
-import java.lang.ref.WeakReference
-import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import java.lang.ref.WeakReference
+import kotlin.coroutines.CoroutineContext

 lateinit var tangemSdk: TangemSdk
 lateinit var tangemSdkManager: TangemSdkManager
@ -83,8 +85,10 @@ class MainActivity : AppCompatActivity(), SnackbarHandler {
    }

    private fun systemActions() {
-        // makes the status bar text dark
-        window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+        WindowInsetsControllerCompat(window, binding.root)
+            .isAppearanceLightStatusBars = true
+
        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
    }

--- a/app/src/main/java/com/tangem/tap/domain/termsOfUse/CardTou.kt
+++ b/app/src/main/java/com/tangem/tap/domain/termsOfUse/CardTou.kt
@ -4,16 +4,17 @@ import android.content.res.Resources
 import android.net.Uri
 import androidx.core.os.ConfigurationCompat
 import com.tangem.common.card.Card
-import java.util.*
+import java.util.Locale

 /**
 [REDACTED_AUTHOR]
 */
 class CardTou {
-    private val locale: Locale = ConfigurationCompat.getLocales(Resources.getSystem().configuration).get(0)
+    private val locale: Locale =
+        ConfigurationCompat.getLocales(Resources.getSystem().configuration).get(0)!!

    fun getUrl(card: Card): Uri? {
-        val issuerName = card.issuer.name ?: return null
+        val issuerName = card.issuer.name
        if (issuerName.lowercase(Locale.getDefault()) != "start2coin") return null

        val baseUrl = "https://app.tangem.com/tou/"
--- a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
@ -1,10 +1,14 @@
 package com.tangem.tap.features.home

 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
+import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.platform.ComposeView
+import androidx.core.view.WindowInsetsControllerCompat
 import androidx.fragment.app.Fragment
 import com.google.accompanist.appcompattheme.AppCompatTheme
 import com.tangem.tap.common.redux.navigation.AppScreen
@ -15,48 +19,36 @@ import com.tangem.tap.features.home.redux.HomeState
 import com.tangem.tap.features.onboarding.products.wallet.redux.BackupAction
 import com.tangem.tap.features.tokens.redux.TokensAction
 import com.tangem.tap.store
-import com.tangem.wallet.R
 import org.rekotlin.StoreSubscriber

-class HomeFragment : Fragment(R.layout.fragment_home), StoreSubscriber<HomeState> {
+class HomeFragment : Fragment(), StoreSubscriber<HomeState> {

-    var homeState: MutableState<HomeState> = mutableStateOf(store.state.homeState)
+    private var homeState: MutableState<HomeState> = mutableStateOf(store.state.homeState)
+    private var composeView: ComposeView? = null

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        store.dispatch(HomeAction.Init)
    }

-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        val context = container?.context ?: return null

        store.dispatch(BackupAction.CheckForUnfinishedBackup)
-
-
-        getView()?.findViewById<ComposeView>(R.id.cv_stories)?.setContent {
-            AppCompatTheme {
-                StoriesScreen(
-                    homeState,
-                    onScanButtonClick = { store.dispatch(HomeAction.ReadCard) },
-                    onShopButtonClick = {
-                        store.dispatch(HomeAction.GoToShop(store.state.globalState.userCountryCode))
-                    },
-                    onSearchTokensClick = {
-                        store.dispatch(NavigationAction.NavigateTo(AppScreen.AddTokens))
-                        store.dispatch(TokensAction.AllowToAddTokens(false))
-                        store.dispatch(TokensAction.LoadCurrencies())
-                    }
-                )
+        composeView = ComposeView(context).apply {
+            setContent {
+                AppCompatTheme {
+                    ScreenContent()
+                }
            }
        }
-    }

-    private fun getRegionProvider(): RegionProvider = RegionService(
-        listOf(
-//            TelephonyManagerRegionProvider(requireContext()),
-            LocaleRegionProvider()
-        )
-    )
+        return composeView
+    }

    override fun onStart() {
        super.onStart()
@ -72,6 +64,11 @@ class HomeFragment : Fragment(R.layout.fragment_home), StoreSubscriber<HomeState
        store.unsubscribe(this)
    }

+    override fun onDestroyView() {
+        super.onDestroyView()
+        rollbackStatusBarIconsColor()
+        composeView = null
+    }

    override fun newState(state: HomeState) {
        if (activity == null || view == null) return
@ -79,4 +76,32 @@ class HomeFragment : Fragment(R.layout.fragment_home), StoreSubscriber<HomeState
        homeState.value = state
    }

+    @Composable
+    private fun ScreenContent() {
+        StoriesScreen(
+            homeState,
+            onScanButtonClick = { store.dispatch(HomeAction.ReadCard) },
+            onShopButtonClick = {
+                store.dispatch(
+                    HomeAction.GoToShop(store.state.globalState.userCountryCode)
+                )
+            },
+            onSearchTokensClick = {
+                store.dispatch(NavigationAction.NavigateTo(AppScreen.AddTokens))
+                store.dispatch(TokensAction.AllowToAddTokens(false))
+                store.dispatch(TokensAction.LoadCurrencies())
+            }
+        )
+    }
+
+    /*
+    * !!! Workaround !!!
+    * Used to roll back the color of icons in the status bar after the stories screen
+    * */
+    private fun rollbackStatusBarIconsColor() {
+        WindowInsetsControllerCompat(
+            activity?.window ?: return,
+            view ?: return,
+        ).isAppearanceLightStatusBars = true
+    }
 }
--- a/app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt
@ -3,12 +3,25 @@ package com.tangem.tap.features.home.compose
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.union
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.material.Button
 import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@ -25,8 +38,13 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.tangem.tap.common.compose.SpacerS24
-import com.tangem.tap.features.home.compose.content.*
+import com.google.accompanist.systemuicontroller.rememberSystemUiController
+import com.tangem.tap.features.home.compose.content.FirstStoriesContent
+import com.tangem.tap.features.home.compose.content.StoriesCurrencies
+import com.tangem.tap.features.home.compose.content.StoriesRevolutionaryWallet
+import com.tangem.tap.features.home.compose.content.StoriesUltraSecureBackup
+import com.tangem.tap.features.home.compose.content.StoriesWalletForEveryone
+import com.tangem.tap.features.home.compose.content.StoriesWeb3
 import com.tangem.tap.features.home.compose.views.HomeButtons
 import com.tangem.tap.features.home.compose.views.StoriesProgressBar
 import com.tangem.tap.features.home.redux.HomeState
@ -43,6 +61,7 @@ fun StoriesScreen(
 ) {
    val steps = 6
    val currentStep = remember { mutableStateOf(1) }
+    val systemUiController = rememberSystemUiController()

    val isDarkBackground = currentStep.value !in 3..5

@ -60,13 +79,20 @@ fun StoriesScreen(

    val hideContent = remember { mutableStateOf(true) }

+    SideEffect {
+        systemUiController.setSystemBarsColor(
+            color = Color.Transparent,
+            darkIcons = false,
+        )
+    }
+
    Box(
-        Modifier
+        modifier = Modifier
            .fillMaxSize()
            .background(Color(0xFF090E13))
    ) {
        Row(
-            Modifier.fillMaxSize()
+            modifier = Modifier.fillMaxSize()
        ) {
            Box(
                Modifier
@ -107,19 +133,23 @@ fun StoriesScreen(
        }
        if (!isDarkBackground) {
            Image(
+                modifier = Modifier.fillMaxSize(),
                painter = painterResource(id = R.drawable.ic_overlay),
                contentDescription = null,
-                modifier = Modifier
-                    .fillMaxSize(),
                contentScale = ContentScale.FillBounds
            )
        }
+
+        val insets = WindowInsets.systemBars
+            .union(WindowInsets(top = 32.dp))
+
        Column(
+            modifier = Modifier
+                .windowInsetsPadding(insets)
+                .fillMaxSize(),
            horizontalAlignment = Alignment.CenterHorizontally,
            verticalArrangement = Arrangement.Center,
-            modifier = Modifier.fillMaxWidth()
        ) {
-            SpacerS24()
            StoriesProgressBar(
                steps = steps,
                currentStep = currentStep.value,
--- a/app/src/main/res/drawable/ic_overlay.xml
+++ b/app/src/main/res/drawable/ic_overlay.xml
@ -4,10 +4,18 @@
    <path android:fillColor="#F8F9F9" android:pathData="M0,0h360v720h-360z"/>
    <path android:fillAlpha="0.2" android:pathData="M0,0h360v720h-360z">
        <aapt:attr name="android:fillColor">
-            <gradient android:endX="179.591" android:endY="82.4634"
-                android:startX="180" android:startY="0" android:type="linear">
-                <item android:color="#FF090E13" android:offset="0"/>
-                <item android:color="#00000000" android:offset="1"/>
+            <gradient
+                    android:endX="179.591"
+                    android:endY="120.4634"
+                    android:startX="180"
+                    android:startY="0"
+                    android:type="linear">
+                <item
+                        android:color="#FF090E13"
+                        android:offset="0" />
+                <item
+                        android:color="#00000000"
+                        android:offset="1" />
            </gradient>
        </aapt:attr>
    </path>
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.compose.ui.platform.ComposeView
-        android:id="@+id/cv_stories"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@ -5,10 +5,6 @@
        <item name="colorPrimary">@color/colorPrimary</item>
        <item name="colorSecondary">@color/colorSecondary</item>
        <item name="android:textColor">@color/darkGray6</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:windowActionBarOverlay">true</item>
-        <item name="android:windowContentOverlay">@null</item>
        <item name="actionMenuTextColor">@color/menu_accent_color</item>

        <item name="materialCardViewStyle">@style/Widget.AppTheme.CardView</item>