Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions app/src/main/java/to/bitkit/ui/ContentView.kt
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ import to.bitkit.ui.onboarding.InitializingWalletView
import to.bitkit.ui.onboarding.WalletRestoreErrorView
import to.bitkit.ui.onboarding.WalletRestoreSuccessView
import to.bitkit.ui.screens.CriticalUpdateScreen
import to.bitkit.ui.screens.common.ComingSoonScreen
import to.bitkit.ui.screens.profile.CreateProfileScreen
import to.bitkit.ui.screens.profile.ProfileIntroScreen
import to.bitkit.ui.screens.recovery.RecoveryMnemonicScreen
Expand Down Expand Up @@ -531,6 +532,7 @@ private fun RootNavHost(
navController = navController,
)
settings(navController, settingsViewModel)
comingSoon(navController)
profile(navController, settingsViewModel)
shop(navController, settingsViewModel, appViewModel)
generalSettings(navController)
Expand Down Expand Up @@ -912,6 +914,23 @@ private fun NavGraphBuilder.settings(
}
}

private fun NavGraphBuilder.comingSoon(
navController: NavHostController,
) {
composableWithDefaultTransitions<Routes.Contacts> {
ComingSoonScreen(
onWalletOverviewClick = { navController.navigateToHome() },
onBackClick = { navController.popBackStack() }
)
}
composableWithDefaultTransitions<Routes.Profile> {
ComingSoonScreen(
onWalletOverviewClick = { navController.navigateToHome() },
onBackClick = { navController.popBackStack() }
)
}
}

private fun NavGraphBuilder.profile(
navController: NavHostController,
settingsViewModel: SettingsViewModel,
Expand Down Expand Up @@ -1934,6 +1953,12 @@ sealed interface Routes {
@Serializable
data object LanguageSettings : Routes

@Serializable
data object Contacts : Routes

@Serializable
data object Profile : Routes

@Serializable
data object ProfileIntro : Routes

Expand Down
10 changes: 8 additions & 2 deletions app/src/main/java/to/bitkit/ui/components/DrawerMenu.kt
Original file line number Diff line number Diff line change
Expand Up @@ -158,14 +158,20 @@ private fun Menu(
DrawerItem(
label = stringResource(R.string.wallet__drawer__contacts),
iconRes = R.drawable.ic_users,
onClick = null, // TODO IMPLEMENT CONTACTS
onClick = {
rootNavController.navigateIfNotCurrent(Routes.Contacts)
scope.launch { drawerState.close() }
},
modifier = Modifier.testTag("DrawerContacts")
)

DrawerItem(
label = stringResource(R.string.wallet__drawer__profile),
iconRes = R.drawable.ic_user_square,
onClick = null, // TODO IMPLEMENT PROFILE
onClick = {
rootNavController.navigateIfNotCurrent(Routes.Profile)
scope.launch { drawerState.close() }
},
modifier = Modifier.testTag("DrawerProfile")
)

Expand Down
74 changes: 74 additions & 0 deletions app/src/main/java/to/bitkit/ui/screens/common/ComingSoonScreen.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
package to.bitkit.ui.screens.common

import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
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 to.bitkit.R
import to.bitkit.ui.components.BodyM
import to.bitkit.ui.components.Display
import to.bitkit.ui.components.PrimaryButton
import to.bitkit.ui.scaffold.AppTopBar
import to.bitkit.ui.scaffold.DrawerNavIcon
import to.bitkit.ui.scaffold.ScreenColumn
import to.bitkit.ui.theme.AppThemeSurface
import to.bitkit.ui.theme.Colors
import to.bitkit.ui.utils.withAccent

@Composable
fun ComingSoonScreen(
onWalletOverviewClick: () -> Unit,
onBackClick: () -> Unit,
) {
ScreenColumn {
AppTopBar(
titleText = stringResource(R.string.coming_soon__title),
onBackClick = onBackClick,
actions = { DrawerNavIcon() },
)

Column(
modifier = Modifier.padding(horizontal = 32.dp)
) {
Image(
painter = painterResource(R.drawable.img_cronometer),
contentDescription = null,
modifier = Modifier
.fillMaxWidth()
.weight(1f)
)

Display(
text = stringResource(R.string.coming_soon__headline).withAccent(accentColor = Colors.Brand),
color = Colors.White
)
Spacer(Modifier.height(8.dp))
BodyM(text = stringResource(R.string.coming_soon__description), color = Colors.White64)
Spacer(Modifier.height(54.dp))
PrimaryButton(
text = stringResource(R.string.coming_soon__button),
onClick = onWalletOverviewClick,
)
Spacer(Modifier.height(16.dp))
}
}
}

@Preview(showSystemUi = true)
@Composable
private fun Preview() {
AppThemeSurface {
ComingSoonScreen(
onWalletOverviewClick = {},
onBackClick = {}
)
}
}
21 changes: 1 addition & 20 deletions app/src/main/java/to/bitkit/ui/screens/wallets/HomeScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -646,26 +646,7 @@ private fun TopBar(
.zIndex(1f)
) {
TopAppBar(
title = {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier
.clickableAlpha(onClick = onClickProfile)
.testTag("Header")
) {
Icon(
imageVector = Icons.Filled.AccountCircle,
contentDescription = stringResource(R.string.slashtags__your_name_capital),
tint = Colors.White64,
modifier = Modifier.size(32.dp)
)
HorizontalSpacer(16.dp)
Title(
text = stringResource(R.string.slashtags__your_name_capital),
Modifier.testTag("EmptyProfileHeader")
)
}
},
title = {},
actions = {
AppStatus(onClick = { rootNavController.navigate(Routes.AppStatus) })
HorizontalSpacer(4.dp)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,6 @@ class HomeViewModel @Inject constructor(
Suggestion.QUICK_PAY,
Suggestion.NOTIFICATIONS.takeIf { !settings.notificationsGranted },
Suggestion.SHOP,
Suggestion.PROFILE,
)
}

Expand All @@ -260,7 +259,6 @@ class HomeViewModel @Inject constructor(
Suggestion.SUPPORT,
Suggestion.INVITE,
Suggestion.SHOP,
Suggestion.PROFILE,
)
}

Expand All @@ -274,7 +272,6 @@ class HomeViewModel @Inject constructor(
Suggestion.SECURE.takeIf { !settings.isPinEnabled },
Suggestion.SUPPORT,
Suggestion.INVITE,
Suggestion.PROFILE,
)
}
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@
<string name="common__max">Max</string>
<string name="common__default">Default</string>
<string name="common__preview">Preview</string>
<string name="coming_soon__button">Wallet overview</string>
<string name="coming_soon__description">This feature is currently in development and will be available soon.</string>
<string name="coming_soon__headline">Coming\n&lt;accent&gt;soon&lt;/accent&gt;</string>
<string name="coming_soon__title">Coming soon</string>
<string name="fee__instant__title">Instant</string>
<string name="fee__instant__description">±2-10 seconds</string>
<string name="fee__instant__shortRange">2-10s</string>
Expand Down
Loading