From f3afa5546910bcbad38910312b0b7aae73a986da Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 6 Jun 2023 17:11:37 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../tangem/tap/features/home/HomeFragment.kt | 11 +++-- .../features/home/compose/StoriesScreen.kt | 15 ++++--- features/learn2earn/api/build.gradle.kts | 3 +- .../api/src/main/AndroidManifest.xml | 2 - features/learn2earn/impl/build.gradle.kts | 1 + .../presentation/ui/GetBonusAlert.kt | 25 +++++++++++ .../presentation/ui/OneInchStoriesScreen.kt | 41 +++++++++++++++---- .../res/drawable/img_1inch_logo_401_378.xml | 0 .../res/drawable/img_1inch_logo_42_40.xml | 0 9 files changed, 72 insertions(+), 26 deletions(-) delete mode 100644 features/learn2earn/api/src/main/AndroidManifest.xml rename {core/ui => features/learn2earn/impl}/src/main/res/drawable/img_1inch_logo_401_378.xml (100%) rename {core/ui => features/learn2earn/impl}/src/main/res/drawable/img_1inch_logo_42_40.xml (100%) 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 acf3408acf..bdb1d84900 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 @@ -12,8 +12,8 @@ import androidx.compose.ui.platform.ComposeView import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsControllerCompat import androidx.fragment.app.Fragment -import com.google.accompanist.appcompattheme.AppCompatTheme import com.tangem.core.analytics.Analytics +import com.tangem.core.ui.res.TangemTheme import com.tangem.tap.common.analytics.events.IntroductionProcess import com.tangem.tap.common.redux.navigation.AppScreen import com.tangem.tap.common.redux.navigation.NavigationAction @@ -37,11 +37,10 @@ class HomeFragment : Fragment(), StoreSubscriber { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { return ComposeView(inflater.context).apply { setContent { - BackHandler { - requireActivity().finish() - } - - AppCompatTheme { + TangemTheme { + BackHandler { + requireActivity().finish() + } ScreenContent() } } diff --git 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 index 2d453259c4..af5df09c59 100644 --- 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 @@ -26,7 +26,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.google.accompanist.systemuicontroller.rememberSystemUiController import com.tangem.core.ui.res.TangemTheme -import com.tangem.feature.learn2earn.presentation.ui.OneInchStoriesContent +import com.tangem.feature.learn2earn.presentation.ui.OneInchStoriesScreen import com.tangem.tap.features.home.compose.content.* import com.tangem.tap.features.home.compose.views.HomeButtons import com.tangem.tap.features.home.compose.views.StoriesProgressBar @@ -152,12 +152,7 @@ fun StoriesScreen( colorFilter = if (currentStory.isDarkBackground) null else ColorFilter.tint(Color.Black), ) when (currentStory) { - Stories.OneInchPromo -> { - // TODO: fixme - TangemTheme { - OneInchStoriesContent({}) - } - } + Stories.OneInchPromo -> OneInchStoriesScreen({}) Stories.TangemIntro -> FirstStoriesContent(isPaused, currentStory.duration) { hideContent.value = it } Stories.RevolutionaryWallet -> StoriesRevolutionaryWallet(currentStory.duration) Stories.UltraSecureBackup -> StoriesUltraSecureBackup(isPaused, currentStory.duration) @@ -200,7 +195,11 @@ fun StoriesScreen( if (currentStory != Stories.OneInchPromo) { HomeButtons( modifier = Modifier - .padding(start = 16.dp, top = 0.dp, end = 16.dp, bottom = 37.dp) + .padding( + start = TangemTheme.dimens.size16, + end = TangemTheme.dimens.size16, + bottom = TangemTheme.dimens.size36, + ) .fillMaxWidth(), isDarkBackground = currentStory.isDarkBackground, btnScanStateInProgress = homeState.value.btnScanStateInProgress, diff --git a/features/learn2earn/api/build.gradle.kts b/features/learn2earn/api/build.gradle.kts index 1fbece85d5..7ff7fb7522 100644 --- a/features/learn2earn/api/build.gradle.kts +++ b/features/learn2earn/api/build.gradle.kts @@ -1,5 +1,4 @@ plugins { - alias(deps.plugins.android.library) - alias(deps.plugins.kotlin.android) + alias(deps.plugins.kotlin.jvm) id("configuration") } \ No newline at end of file diff --git a/features/learn2earn/api/src/main/AndroidManifest.xml b/features/learn2earn/api/src/main/AndroidManifest.xml deleted file mode 100644 index 4d3df466b3..0000000000 --- a/features/learn2earn/api/src/main/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/features/learn2earn/impl/build.gradle.kts b/features/learn2earn/impl/build.gradle.kts index f0071798aa..9e390b1f67 100644 --- a/features/learn2earn/impl/build.gradle.kts +++ b/features/learn2earn/impl/build.gradle.kts @@ -34,6 +34,7 @@ dependencies { implementation(project(":core:res")) /** Tangem libraries */ + // TODO: fixme: delete if later it doesn't needed // implementation(deps.tangem.card.core) // implementation(deps.tangem.card.android) { // exclude(module = "joda-time") diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusAlert.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusAlert.kt index bbff8f8fa8..0079c24f11 100644 --- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusAlert.kt +++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/GetBonusAlert.kt @@ -14,6 +14,7 @@ import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.Shape import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemTypography @@ -103,4 +104,28 @@ private fun ContentBackground(shape: Shape) { ) .fillMaxSize(), ) +} + +@Preview +@Composable +private fun OneInchStoriesContentPreview_Light() { + TangemTheme( + isDark = false, + ) { + GetBonusAlert( + onClick = {}, + ) + } +} + +@Preview +@Composable +private fun OneInchStoriesContentPreview_Dark() { + TangemTheme( + isDark = true, + ) { + GetBonusAlert( + onClick = {}, + ) + } } \ No newline at end of file diff --git a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/OneInchStoriesScreen.kt b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/OneInchStoriesScreen.kt index 4d7c7ee283..ff3c3218b7 100644 --- a/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/OneInchStoriesScreen.kt +++ b/features/learn2earn/impl/src/main/java/com/tangem/feature/learn2earn/presentation/ui/OneInchStoriesScreen.kt @@ -11,6 +11,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.tangem.core.ui.components.SecondaryButton import com.tangem.core.ui.components.SpacerH16 @@ -23,16 +24,19 @@ import com.tangem.feature.learn2earn.presentation.ui.component.GradientCircle /** [REDACTED_AUTHOR] */ -@Suppress("ReusedModifierInstance") +// TODO: fixme: make function as internal after adding feature interface @Composable -fun OneInchStoriesContent(onLearnClick: () -> Unit, modifier: Modifier = Modifier) { +fun OneInchStoriesScreen(onLearnClick: () -> Unit, modifier: Modifier = Modifier) { Box(modifier = modifier.fillMaxSize()) { ContentBackground( - modifier = modifier + modifier = Modifier .fillMaxSize() .align(Alignment.Center), ) StoryDescription( + modifier = Modifier + .padding(horizontal = TangemTheme.dimens.size40) + .fillMaxSize(), headerText = stringResource(id = R.string.story_learn_title), bodyText = stringResource(id = R.string.story_learn_description), ) @@ -77,13 +81,10 @@ private fun ContentBackground(modifier: Modifier = Modifier) { } @Composable -private fun StoryDescription(headerText: String, bodyText: String) { +private fun StoryDescription(headerText: String, bodyText: String, modifier: Modifier = Modifier) { Column( - modifier = Modifier - .padding(horizontal = TangemTheme.dimens.size40) - .fillMaxSize(), + modifier = modifier, horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.Top, ) { SpacerH32() Text( @@ -102,4 +103,28 @@ private fun StoryDescription(headerText: String, bodyText: String) { color = TangemTheme.colors.text.tertiary, ) } +} + +@Preview +@Composable +private fun OneInchStoriesContentPreview_Light() { + TangemTheme( + isDark = false, + ) { + OneInchStoriesScreen( + onLearnClick = {}, + ) + } +} + +@Preview +@Composable +private fun OneInchStoriesContentPreview_Dark() { + TangemTheme( + isDark = true, + ) { + OneInchStoriesScreen( + onLearnClick = {}, + ) + } } \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/img_1inch_logo_401_378.xml b/features/learn2earn/impl/src/main/res/drawable/img_1inch_logo_401_378.xml similarity index 100% rename from core/ui/src/main/res/drawable/img_1inch_logo_401_378.xml rename to features/learn2earn/impl/src/main/res/drawable/img_1inch_logo_401_378.xml diff --git a/core/ui/src/main/res/drawable/img_1inch_logo_42_40.xml b/features/learn2earn/impl/src/main/res/drawable/img_1inch_logo_42_40.xml similarity index 100% rename from core/ui/src/main/res/drawable/img_1inch_logo_42_40.xml rename to features/learn2earn/impl/src/main/res/drawable/img_1inch_logo_42_40.xml