Skip to content

Migrate to Nav-3 #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
anuj990 wants to merge 1 commit into from
Closed

Migrate to Nav-3 #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,13 @@ dependencies {

// Bitcoin Development Kit
implementation("org.bitcoindevkit:bdk-android:2.3.1")
// Nav-3
implementation("androidx.navigation:navigation-compose:2.8.0")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")

// QR codes
implementation("com.google.zxing:core:3.5.4")
implementation("com.google.android.gms:play-services-tflite-support:16.4.0")
Copy link
Member

@thunderbiscuit thunderbiscuit Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding new, unrequired dependencies is clearly not addressing the issue


// Tests
testImplementation("junit:junit:4.13.2")
Expand Down
72 changes: 37 additions & 35 deletions app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/navigation/AppNavigation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ import org.bitcoindevkit.devkitwallet.presentation.viewmodels.WalletViewModel
// M3 motion easing curves
private val EmphasizedDecelerate = CubicBezierEasing(0.05f, 0.7f, 0.1f, 1.0f)
private val EmphasizedAccelerate = CubicBezierEasing(0.3f, 0.0f, 0.8f, 0.15f)

Copy link
Member

@thunderbiscuit thunderbiscuit Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A bunch of empty line deletions?

private const val ENTER_DURATION = 400
private const val EXIT_DURATION = 200
private const val FADE_IN_DURATION = 300
Expand Down Expand Up @@ -99,7 +98,6 @@ fun AppNavigation(
onToggleTheme: () -> Unit,
) {
val navController: NavHostController = rememberNavController()

val walletViewModel = remember(activeWallet) { activeWallet?.let { WalletViewModel(it) } }
val addressViewModel = remember(activeWallet) { activeWallet?.let { AddressViewModel(it) } }
val sendViewModel = remember(activeWallet) { activeWallet?.let { SendViewModel(it) } }
Expand All @@ -124,73 +122,77 @@ fun AppNavigation(
composable<WalletChoiceScreen> {
WalletChoiceScreen(navController = navController)
}

composable<ActiveWalletsScreen> {
ActiveWalletsScreen(
activeWallets = activeWallets,
navController = navController,
onBuildWalletButtonClicked
onBuildWalletButtonClicked = onBuildWalletButtonClicked
)
}

composable<CreateNewWalletScreen> {
CreateNewWalletScreen(navController = navController, onBuildWalletButtonClicked)
}

composable<WalletRecoveryScreen> {
RecoverWalletScreen(onAction = onBuildWalletButtonClicked, navController = navController)
}

// Wallet screens
composable<HomeScreen> {
WalletHomeScreen(
Copy link
Member

@thunderbiscuit thunderbiscuit Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What... is this

state = walletViewModel!!.state,
onAction = walletViewModel::onAction,
navController = navController,
)
if (walletViewModel != null) {
WalletHomeScreen(
state = walletViewModel.state,
onAction = walletViewModel::onAction,
navController = navController,
)
}
}

composable<ReceiveScreen> {
ReceiveScreen(
state = addressViewModel!!.state,
onAction = addressViewModel::onAction,
navController = navController,
)
if (addressViewModel != null) {
ReceiveScreen(
state = addressViewModel.state,
onAction = addressViewModel::onAction,
navController = navController,
)
}
}
composable<SendScreen> {
if (sendViewModel != null) {
SendScreen(navController, sendViewModel)
}
}

composable<SendScreen> { SendScreen(navController, sendViewModel!!) }

composable<RbfScreen> {
val args = it.toRoute<RbfScreen>()
RBFScreen(args.txid, navController)
}

composable<TransactionHistoryScreen> { TransactionHistoryScreen(navController, activeWallet!!) }

composable<TransactionHistoryScreen> {
// Ensure activeWallet is available
activeWallet?.let { wallet ->
TransactionHistoryScreen(navController, wallet)
}
}
composable<TransactionScreen> {
val args = it.toRoute<TransactionScreen>()
TransactionScreen(args.txid, navController)
}

// Settings/drawer screens
composable<SettingsScreen> { SettingsScreen(navController = navController) }

composable<AboutScreen> { AboutScreen(navController = navController) }

composable<RecoveryPhraseScreen> {
RecoveryDataScreen(activeWallet!!.getWalletSecrets(), navController = navController)
activeWallet?.let { wallet ->
RecoveryDataScreen(wallet.getWalletSecrets(), navController = navController)
}
}

composable<BlockchainClientScreen> {
BlockchainClientScreen(
state = walletViewModel!!.state,
onAction = walletViewModel::onAction,
navController = navController,
)
if (walletViewModel != null) {
BlockchainClientScreen(
state = walletViewModel.state,
onAction = walletViewModel::onAction,
navController = navController,
)
}
}

composable<LogsScreen> { LogsScreen(navController = navController) }

composable<ThemeScreen> {
ThemeScreen(
useDarkTheme = useDarkTheme,
Expand All @@ -199,4 +201,4 @@ fun AppNavigation(
)
}
}
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/navigation/Destinations.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ object TransactionHistoryScreen
data class TransactionScreen(val txid: String)

@Serializable
data class RbfScreen(val txid: String)
data class RbfScreen(val txid: String)
Loading