From 2436e2d9c32ab6271759880f4c2fa7a6ecd36b13 Mon Sep 17 00:00:00 2001 From: Rafael Date: Fri, 13 Dec 2024 15:59:36 +0600 Subject: [PATCH] Update Main Settings menu options --- .../settings/main/MainSettingsScreen.kt | 165 +++++++++--------- .../main/res/drawable/ic_ai_assistant_24.xml | 15 ++ app/src/main/res/drawable/ic_telegram_24.xml | 12 ++ app/src/main/res/drawable/ic_twitter_24.xml | 13 ++ app/src/main/res/values/strings.xml | 5 +- .../main/res/drawable/ic_club_yellow_24.xml | 18 ++ .../src/main/res/drawable/ic_heart_24.xml | 9 + .../res/drawable/ic_support_yellow_24.xml | 22 +++ 8 files changed, 180 insertions(+), 79 deletions(-) create mode 100644 app/src/main/res/drawable/ic_ai_assistant_24.xml create mode 100644 app/src/main/res/drawable/ic_telegram_24.xml create mode 100644 app/src/main/res/drawable/ic_twitter_24.xml create mode 100644 components/icons/src/main/res/drawable/ic_club_yellow_24.xml create mode 100644 components/icons/src/main/res/drawable/ic_heart_24.xml create mode 100644 components/icons/src/main/res/drawable/ic_support_yellow_24.xml diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/main/MainSettingsScreen.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/main/MainSettingsScreen.kt index 7a119a49311..ff73bbede2d 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/main/MainSettingsScreen.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/main/MainSettingsScreen.kt @@ -52,13 +52,13 @@ import io.horizontalsystems.bankwallet.ui.compose.components.AppBar import io.horizontalsystems.bankwallet.ui.compose.components.BadgeText import io.horizontalsystems.bankwallet.ui.compose.components.CellSingleLineLawrenceSection import io.horizontalsystems.bankwallet.ui.compose.components.CellUniversalLawrenceSection -import io.horizontalsystems.bankwallet.ui.compose.components.InfoText +import io.horizontalsystems.bankwallet.ui.compose.components.PremiumHeader import io.horizontalsystems.bankwallet.ui.compose.components.RowUniversal import io.horizontalsystems.bankwallet.ui.compose.components.VSpacer import io.horizontalsystems.bankwallet.ui.compose.components.body_leah import io.horizontalsystems.bankwallet.ui.compose.components.caption_grey +import io.horizontalsystems.bankwallet.ui.compose.components.cell.SectionPremiumUniversalLawrence import io.horizontalsystems.bankwallet.ui.compose.components.subhead1_grey -import io.horizontalsystems.bankwallet.ui.compose.components.subhead1_jacob import io.horizontalsystems.bankwallet.ui.helpers.LinkHelper @Composable @@ -282,91 +282,46 @@ private fun SettingSections( ) ) - VSpacer(24.dp) + VSpacer(32.dp) - Row( - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 32.dp) - .height(32.dp), - verticalAlignment = Alignment.CenterVertically, - ) { - subhead1_jacob(text = stringResource(id = R.string.Settings_JoinUnstoppables).uppercase()) - } CellUniversalLawrenceSection( - listOf({ - HsSettingCell( - R.string.Settings_Telegram, - R.drawable.ic_telegram_filled_24, - ComposeAppTheme.colors.jacob, - onClick = { - LinkHelper.openLinkInAppBrowser(context, App.appConfigProvider.appTelegramLink) - - stat( - page = StatPage.Settings, - event = StatEvent.Open(StatPage.ExternalTelegram) - ) - } - ) - }, { - HsSettingCell( - R.string.Settings_Twitter, - R.drawable.ic_twitter_filled_24, - ComposeAppTheme.colors.jacob, - onClick = { - LinkHelper.openLinkInAppBrowser(context, App.appConfigProvider.appTwitterLink) + listOf( + { + HsSettingCell( + R.string.Settings_BotSupport, + R.drawable.ic_ai_assistant_24, + onClick = { - stat(page = StatPage.Settings, event = StatEvent.Open(StatPage.ExternalTwitter)) - } - ) - }) - ) - InfoText( - text = stringResource(R.string.Settings_JoinUnstoppables_Description), + } + ) + }, + ) ) - VSpacer(32.dp) - - CellUniversalLawrenceSection( - listOf({ - HsSettingCell( - R.string.Settings_Faq, - R.drawable.ic_faq_20, - onClick = { - navController.slideFromRight(R.id.faqListFragment) - - stat(page = StatPage.Settings, event = StatEvent.Open(StatPage.Faq)) - } - ) - }, { - HsSettingCell( - R.string.Guides_Title, - R.drawable.ic_academy_20, - onClick = { - navController.slideFromRight(R.id.academyFragment) + VSpacer(24.dp) - stat(page = StatPage.Settings, event = StatEvent.Open(StatPage.Academy)) - } - ) - }) - ) + PremiumHeader() - VSpacer(32.dp) + SectionPremiumUniversalLawrence { + HsSettingCell( + R.string.Settings_VipSupport, + R.drawable.ic_support_yellow_24, + onClick = { - CellUniversalLawrenceSection( - listOf { - HsSettingCell( - R.string.Settings_Donate, - R.drawable.ic_heart_filled_24, - ComposeAppTheme.colors.jacob, - onClick = { - navController.slideFromRight(R.id.donateTokenSelectFragment) + } + ) + Divider( + thickness = 1.dp, + color = ComposeAppTheme.colors.steel10, + ) + HsSettingCell( + R.string.Settings_VipClub, + R.drawable.ic_club_yellow_24, + onClick = { - stat(page = StatPage.Settings, event = StatEvent.Open(StatPage.Donate)) - } - ) - } - ) + } + ) + } VSpacer(32.dp) @@ -415,6 +370,60 @@ private fun SettingSections( }) ) + VSpacer(24.dp) + + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 32.dp) + .height(32.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + subhead1_grey(text = stringResource(id = R.string.Settings_JoinUnstoppables).uppercase()) + } + CellUniversalLawrenceSection( + listOf({ + HsSettingCell( + R.string.Settings_Telegram, + R.drawable.ic_telegram_24, + onClick = { + LinkHelper.openLinkInAppBrowser(context, App.appConfigProvider.appTelegramLink) + + stat( + page = StatPage.Settings, + event = StatEvent.Open(StatPage.ExternalTelegram) + ) + } + ) + }, { + HsSettingCell( + R.string.Settings_Twitter, + R.drawable.ic_twitter_24, + onClick = { + LinkHelper.openLinkInAppBrowser(context, App.appConfigProvider.appTwitterLink) + + stat(page = StatPage.Settings, event = StatEvent.Open(StatPage.ExternalTwitter)) + } + ) + }) + ) + + VSpacer(32.dp) + + CellUniversalLawrenceSection( + listOf { + HsSettingCell( + R.string.Settings_Donate, + R.drawable.ic_heart_24, + onClick = { + navController.slideFromRight(R.id.donateTokenSelectFragment) + + stat(page = StatPage.Settings, event = StatEvent.Open(StatPage.Donate)) + } + ) + } + ) + VSpacer(32.dp) } diff --git a/app/src/main/res/drawable/ic_ai_assistant_24.xml b/app/src/main/res/drawable/ic_ai_assistant_24.xml new file mode 100644 index 00000000000..e86c785fceb --- /dev/null +++ b/app/src/main/res/drawable/ic_ai_assistant_24.xml @@ -0,0 +1,15 @@ + + + + diff --git a/app/src/main/res/drawable/ic_telegram_24.xml b/app/src/main/res/drawable/ic_telegram_24.xml new file mode 100644 index 00000000000..676441c055e --- /dev/null +++ b/app/src/main/res/drawable/ic_telegram_24.xml @@ -0,0 +1,12 @@ + + + diff --git a/app/src/main/res/drawable/ic_twitter_24.xml b/app/src/main/res/drawable/ic_twitter_24.xml new file mode 100644 index 00000000000..3635d78108e --- /dev/null +++ b/app/src/main/res/drawable/ic_twitter_24.xml @@ -0,0 +1,13 @@ + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6d1eac3d56c..d76c44ae600 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -823,7 +823,10 @@ Auto-Lock Telegram Twitter - Be Unstoppable + Join Unstoppables + VIP Support + VIP Club + BOT Support Learn and master crypto via exclusive videos. Get to know us informally. Be the first to see things we work on. Personal Support diff --git a/components/icons/src/main/res/drawable/ic_club_yellow_24.xml b/components/icons/src/main/res/drawable/ic_club_yellow_24.xml new file mode 100644 index 00000000000..e3a1167e909 --- /dev/null +++ b/components/icons/src/main/res/drawable/ic_club_yellow_24.xml @@ -0,0 +1,18 @@ + + + + + diff --git a/components/icons/src/main/res/drawable/ic_heart_24.xml b/components/icons/src/main/res/drawable/ic_heart_24.xml new file mode 100644 index 00000000000..c59d7b76f29 --- /dev/null +++ b/components/icons/src/main/res/drawable/ic_heart_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/components/icons/src/main/res/drawable/ic_support_yellow_24.xml b/components/icons/src/main/res/drawable/ic_support_yellow_24.xml new file mode 100644 index 00000000000..335c7eb6aed --- /dev/null +++ b/components/icons/src/main/res/drawable/ic_support_yellow_24.xml @@ -0,0 +1,22 @@ + + + + + +