From 4ff768af303d989309ba06af525af9dbc7c3a583 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 21 Jul 2022 10:47:20 +0300 Subject: [PATCH 1/9] Updated on 2026-08-14 --- .../java/com/tangem/tap/features/home/HomeFragment.kt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt index c453cdadc4..fe998d4f19 100644 --- a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt @@ -4,16 +4,20 @@ import android.os.Bundle import android.view.View import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue import androidx.compose.ui.platform.ComposeView import androidx.fragment.app.Fragment import com.google.accompanist.appcompattheme.AppCompatTheme +import com.tangem.tap.common.entities.IndeterminateProgressButton import com.tangem.tap.common.redux.navigation.AppScreen import com.tangem.tap.common.redux.navigation.NavigationAction import com.tangem.tap.features.home.compose.StoriesScreen import com.tangem.tap.features.home.redux.HomeAction import com.tangem.tap.features.home.redux.HomeState import com.tangem.tap.features.onboarding.products.wallet.redux.BackupAction +import com.tangem.tap.features.send.redux.states.ButtonState import com.tangem.tap.features.tokens.redux.TokensAction +import com.tangem.tap.features.wallet.redux.ProgressState import com.tangem.tap.store import com.tangem.wallet.R import org.rekotlin.StoreSubscriber @@ -37,7 +41,12 @@ class HomeFragment : Fragment(R.layout.fragment_home), StoreSubscriber Date: Sun, 24 Jul 2022 21:38:08 +0300 Subject: [PATCH 2/9] Updated on 2026-08-14 --- .../java/com/tangem/tap/features/home/HomeFragment.kt | 10 ++++------ .../com/tangem/tap/features/home/compose/Stories.kt | 8 ++++---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt index fe998d4f19..2821cc4a99 100644 --- a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt @@ -4,7 +4,6 @@ import android.os.Bundle import android.view.View import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.setValue import androidx.compose.ui.platform.ComposeView import androidx.fragment.app.Fragment import com.google.accompanist.appcompattheme.AppCompatTheme @@ -17,7 +16,6 @@ import com.tangem.tap.features.home.redux.HomeState import com.tangem.tap.features.onboarding.products.wallet.redux.BackupAction import com.tangem.tap.features.send.redux.states.ButtonState import com.tangem.tap.features.tokens.redux.TokensAction -import com.tangem.tap.features.wallet.redux.ProgressState import com.tangem.tap.store import com.tangem.wallet.R import org.rekotlin.StoreSubscriber @@ -36,17 +34,17 @@ class HomeFragment : Fragment(R.layout.fragment_home), StoreSubscriber(R.id.cv_stories)?.setContent { AppCompatTheme { StoriesScreen( homeState, onScanButtonClick = { - store.dispatch(HomeAction.ReadCard) - homeState.value = HomeState(store.state.homeState.shouldScanCardOnResume, + homeState.value = HomeState( + store.state.homeState.shouldScanCardOnResume, IndeterminateProgressButton(ButtonState.PROGRESS) ) - }, + store.dispatch(HomeAction.ReadCard) + }, onShopButtonClick = { store.dispatch(HomeAction.GoToShop(store.state.globalState.userCountryCode)) }, diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/Stories.kt b/app/src/main/java/com/tangem/tap/features/home/compose/Stories.kt index 183392a4b4..2df573ae65 100644 --- a/app/src/main/java/com/tangem/tap/features/home/compose/Stories.kt +++ b/app/src/main/java/com/tangem/tap/features/home/compose/Stories.kt @@ -139,11 +139,11 @@ fun StoriesScreen( colorFilter = if (isDarkBackground) null else ColorFilter.tint(Color.Black) ) when (currentStep.value) { - 1 -> FirstStoriesContent(isPaused, currentStep.duration()) { hideContent.value = it } + 1 -> FirstStoriesContent(needsToBePaused.value, currentStep.duration()) { hideContent.value = it } 2 -> StoriesRevolutionaryWallet(currentStep.duration()) - 3 -> StoriesUltraSecureBackup(isPaused, currentStep.duration()) - 4 -> StoriesCurrencies(isPaused, currentStep.duration()) - 5 -> StoriesWeb3(isPaused, currentStep.duration()) + 3 -> StoriesUltraSecureBackup(needsToBePaused.value, currentStep.duration()) + 4 -> StoriesCurrencies(needsToBePaused.value, currentStep.duration()) + 5 -> StoriesWeb3(needsToBePaused.value, currentStep.duration()) 6 -> StoriesWalletForEveryone(currentStep.duration()) } } From 2f8cdb311ea55fe1583cdcf5b02f40db7898a858 Mon Sep 17 00:00:00 2001 From: Tangem Date: Sun, 24 Jul 2022 21:52:59 +0300 Subject: [PATCH 3/9] Updated on 2026-08-14 --- .../com/tangem/tap/features/home/HomeFragment.kt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt index 2821cc4a99..3156852df2 100644 --- a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt @@ -39,10 +39,15 @@ class HomeFragment : Fragment(R.layout.fragment_home), StoreSubscriber Date: Sun, 24 Jul 2022 22:13:09 +0300 Subject: [PATCH 4/9] Updated on 2026-08-14 --- .../com/tangem/tap/features/home/HomeFragment.kt | 2 +- .../com/tangem/tap/features/home/compose/Stories.kt | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt index 3156852df2..971db909e8 100644 --- a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt @@ -39,7 +39,7 @@ class HomeFragment : Fragment(R.layout.fragment_home), StoreSubscriber FirstStoriesContent(needsToBePaused.value, currentStep.duration()) { hideContent.value = it } + 1 -> FirstStoriesContent(needsToBePaused.value.value.btnScanState.progressState == ProgressState.Loading, currentStep.duration()) { hideContent.value = it } 2 -> StoriesRevolutionaryWallet(currentStep.duration()) - 3 -> StoriesUltraSecureBackup(needsToBePaused.value, currentStep.duration()) - 4 -> StoriesCurrencies(needsToBePaused.value, currentStep.duration()) - 5 -> StoriesWeb3(needsToBePaused.value, currentStep.duration()) + 3 -> StoriesUltraSecureBackup(needsToBePaused.value.value.btnScanState.progressState == ProgressState.Loading, currentStep.duration()) + 4 -> StoriesCurrencies(needsToBePaused.value.value.btnScanState.progressState == ProgressState.Loading, currentStep.duration()) + 5 -> StoriesWeb3(needsToBePaused.value.value.btnScanState.progressState == ProgressState.Loading, currentStep.duration()) 6 -> StoriesWalletForEveryone(currentStep.duration()) } } From 8b0dce5bcd0b101905b526317e0b74fbbdb47bf3 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 25 Jul 2022 08:38:27 +0300 Subject: [PATCH 5/9] Updated on 2026-08-14 --- .../java/com/tangem/tap/features/home/HomeFragment.kt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt index 971db909e8..521ddb9db6 100644 --- a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt @@ -39,15 +39,6 @@ class HomeFragment : Fragment(R.layout.fragment_home), StoreSubscriber Date: Mon, 25 Jul 2022 08:39:19 +0300 Subject: [PATCH 6/9] Updated on 2026-08-14 --- app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt index 521ddb9db6..7a1ed28159 100644 --- a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt @@ -31,9 +31,7 @@ class HomeFragment : Fragment(R.layout.fragment_home), StoreSubscriber(R.id.cv_stories)?.setContent { AppCompatTheme { StoriesScreen( From 562767038c6cefdd7eddc6249b0535d84933a667 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 25 Jul 2022 08:41:10 +0300 Subject: [PATCH 7/9] Updated on 2026-08-14 --- app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt index 7a1ed28159..125458acf8 100644 --- a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt @@ -7,14 +7,12 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.ui.platform.ComposeView import androidx.fragment.app.Fragment import com.google.accompanist.appcompattheme.AppCompatTheme -import com.tangem.tap.common.entities.IndeterminateProgressButton import com.tangem.tap.common.redux.navigation.AppScreen import com.tangem.tap.common.redux.navigation.NavigationAction import com.tangem.tap.features.home.compose.StoriesScreen import com.tangem.tap.features.home.redux.HomeAction import com.tangem.tap.features.home.redux.HomeState import com.tangem.tap.features.onboarding.products.wallet.redux.BackupAction -import com.tangem.tap.features.send.redux.states.ButtonState import com.tangem.tap.features.tokens.redux.TokensAction import com.tangem.tap.store import com.tangem.wallet.R From 6f236db962eb677ac137dba6529d837088aaf458 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 26 Jul 2022 18:32:44 +0300 Subject: [PATCH 8/9] Updated on 2026-08-14 --- .../com/tangem/tap/features/home/compose/Stories.kt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/Stories.kt b/app/src/main/java/com/tangem/tap/features/home/compose/Stories.kt index 11c6bfbeb4..3ea4e1c26b 100644 --- a/app/src/main/java/com/tangem/tap/features/home/compose/Stories.kt +++ b/app/src/main/java/com/tangem/tap/features/home/compose/Stories.kt @@ -54,9 +54,7 @@ fun StoriesScreen( } val isPressed = remember { mutableStateOf(false) } - val needsToBePaused = - remember(homeState) { mutableStateOf(homeState) } - val isPaused = isPressed.value || needsToBePaused.value.value.btnScanState.progressState == ProgressState.Loading + val isPaused = isPressed.value || homeState.value.btnScanState.progressState == ProgressState.Loading val hideContent = remember { mutableStateOf(true) } @@ -139,11 +137,11 @@ fun StoriesScreen( colorFilter = if (isDarkBackground) null else ColorFilter.tint(Color.Black) ) when (currentStep.value) { - 1 -> FirstStoriesContent(needsToBePaused.value.value.btnScanState.progressState == ProgressState.Loading, currentStep.duration()) { hideContent.value = it } + 1 -> FirstStoriesContent(isPaused, currentStep.duration()) { hideContent.value = it } 2 -> StoriesRevolutionaryWallet(currentStep.duration()) - 3 -> StoriesUltraSecureBackup(needsToBePaused.value.value.btnScanState.progressState == ProgressState.Loading, currentStep.duration()) - 4 -> StoriesCurrencies(needsToBePaused.value.value.btnScanState.progressState == ProgressState.Loading, currentStep.duration()) - 5 -> StoriesWeb3(needsToBePaused.value.value.btnScanState.progressState == ProgressState.Loading, currentStep.duration()) + 3 -> StoriesUltraSecureBackup(isPaused, currentStep.duration()) + 4 -> StoriesCurrencies(isPaused, currentStep.duration()) + 5 -> StoriesWeb3(isPaused, currentStep.duration()) 6 -> StoriesWalletForEveryone(currentStep.duration()) } } From 17f6799abf6be368313a1011eefdd5a82b73c0d0 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 26 Jul 2022 22:14:00 +0300 Subject: [PATCH 9/9] Updated on 2026-08-14 --- .../tangem/tap/features/home/HomeFragment.kt | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt index fc23162829..f1b3fa3f55 100644 --- a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt @@ -31,8 +31,6 @@ class HomeFragment : Fragment(), StoreSubscriber { store.dispatch(HomeAction.Init) } - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -41,22 +39,6 @@ class HomeFragment : Fragment(), StoreSubscriber { val context = container?.context ?: return null store.dispatch(BackupAction.CheckForUnfinishedBackup) - getView()?.findViewById(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 {