Skip to content

Commit 1996e17

Browse files
ovitrifovitrif
authored
Merge pull request #488 from synonymdev/chore/lint
Remove unused close actions
2 parents acb85a0 + 36092af commit 1996e17

38 files changed

+1
-110
lines changed

‎app/src/main/java/to/bitkit/ui/ContentView.kt‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,6 @@ private fun RootNavHost(
561561
navController.navigateToTransferFunding()
562562
settingsViewModel.setHasSeenTransferIntro(true)
563563
},
564-
onCloseClick = { navController.navigateToHome() },
565564
)
566565
}
567566
composableWithDefaultTransitions<Routes.SavingsIntro> {
@@ -571,7 +570,6 @@ private fun RootNavHost(
571570
settingsViewModel.setHasSeenSavingsIntro(true)
572571
},
573572
onBackClick = { navController.popBackStack() },
574-
onCloseClick = { navController.navigateToHome() },
575573
)
576574
}
577575
composableWithDefaultTransitions<Routes.SavingsAvailability> {
@@ -586,14 +584,12 @@ private fun RootNavHost(
586584
onConfirm = { navController.navigate(Routes.SavingsProgress) },
587585
onAdvancedClick = { navController.navigate(Routes.SavingsAdvanced) },
588586
onBackClick = { navController.popBackStack() },
589-
onCloseClick = { navController.navigateToHome() },
590587
)
591588
}
592589
composableWithDefaultTransitions<Routes.SavingsAdvanced> {
593590
SavingsAdvancedScreen(
594591
onContinueClick = { navController.popBackStack<Routes.SavingsConfirm>(inclusive = false) },
595592
onBackClick = { navController.popBackStack() },
596-
onCloseClick = { navController.navigateToHome() },
597593
)
598594
}
599595
composableWithDefaultTransitions<Routes.SavingsProgress> {
@@ -602,7 +598,6 @@ private fun RootNavHost(
602598
wallet = walletViewModel,
603599
transfer = transferViewModel,
604600
onContinueClick = { navController.popBackStack<Routes.TransferRoot>(inclusive = true) },
605-
onCloseClick = { navController.popBackStack<Routes.TransferRoot>(inclusive = true) },
606601
)
607602
}
608603
composableWithDefaultTransitions<Routes.SpendingIntro> {
@@ -612,14 +607,12 @@ private fun RootNavHost(
612607
settingsViewModel.setHasSeenSpendingIntro(true)
613608
},
614609
onBackClick = { navController.popBackStack() },
615-
onCloseClick = { navController.navigateToHome() },
616610
)
617611
}
618612
composableWithDefaultTransitions<Routes.SpendingAmount> {
619613
SpendingAmountScreen(
620614
viewModel = transferViewModel,
621615
onBackClick = { navController.popBackStack() },
622-
onCloseClick = { navController.navigateToHome() },
623616
onOrderCreated = { navController.navigate(Routes.SpendingConfirm) },
624617
toastException = { appViewModel.toast(it) },
625618
toast = { title, description ->
@@ -651,7 +644,6 @@ private fun RootNavHost(
651644
composableWithDefaultTransitions<Routes.TransferLiquidity> {
652645
LiquidityScreen(
653646
onBackClick = { navController.popBackStack() },
654-
onCloseClick = { navController.navigateToHome() },
655647
onContinueClick = { navController.popBackStack() }
656648
)
657649
}
@@ -683,7 +675,6 @@ private fun RootNavHost(
683675
},
684676
onAdvanced = { navController.navigate(Routes.FundingAdvanced) },
685677
onBackClick = { navController.popBackStack() },
686-
onCloseClick = { navController.navigateToHome() },
687678
isGeoBlocked = isGeoBlocked,
688679
)
689680
}
@@ -692,7 +683,6 @@ private fun RootNavHost(
692683
onLnurl = { navController.navigateToScanner() },
693684
onManual = { navController.navigate(Routes.ExternalNav) },
694685
onBackClick = { navController.popBackStack() },
695-
onCloseClick = { navController.navigateToHome() },
696686
)
697687
}
698688
navigationWithDefaultTransitions<Routes.ExternalNav>(
@@ -710,7 +700,6 @@ private fun RootNavHost(
710700
onNodeConnected = { navController.navigate(Routes.ExternalAmount) },
711701
onScanClick = { navController.navigateToScanner(isCalledForResult = true) },
712702
onBackClick = { navController.popBackStack() },
713-
onCloseClick = { navController.navigateToHome() },
714703
)
715704
}
716705
composableWithDefaultTransitions<Routes.ExternalAmount> {
@@ -721,7 +710,6 @@ private fun RootNavHost(
721710
viewModel = viewModel,
722711
onContinue = { navController.navigate(Routes.ExternalConfirm) },
723712
onBackClick = { navController.popBackStack() },
724-
onCloseClick = { navController.navigateToHome() },
725713
)
726714
}
727715
composableWithDefaultTransitions<Routes.ExternalConfirm> {
@@ -736,7 +724,6 @@ private fun RootNavHost(
736724
},
737725
onNetworkFeeClick = { navController.navigate(Routes.ExternalFeeCustom) },
738726
onBackClick = { navController.popBackStack() },
739-
onCloseClick = { navController.navigateToHome() },
740727
)
741728
}
742729
composableWithDefaultTransitions<Routes.LnurlChannel> {
@@ -837,7 +824,6 @@ private fun NavGraphBuilder.settings(
837824
composableWithDefaultTransitions<Routes.LanguageSettings> {
838825
LanguageSettingsScreen(
839826
onBackClick = { navController.popBackStack() },
840-
onCloseClick = { navController.navigateToHome() },
841827
)
842828
}
843829
}
@@ -1125,7 +1111,6 @@ private fun NavGraphBuilder.activityItem(
11251111
listViewModel = activityListViewModel,
11261112
route = it.toRoute(),
11271113
onBackClick = { navController.popBackStack() },
1128-
onCloseClick = { navController.navigateToHome() },
11291114
)
11301115
}
11311116
}
@@ -1359,7 +1344,6 @@ private fun NavGraphBuilder.widgets(
13591344

13601345
BlocksEditScreen(
13611346
blocksViewModel = viewModel,
1362-
onClose = { navController.navigateToHome() },
13631347
onBack = { navController.popBackStack() },
13641348
navigatePreview = { navController.navigate(Routes.BlocksPreview) }
13651349
)

‎app/src/main/java/to/bitkit/ui/screens/transfer/FundingAdvancedScreen.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ fun FundingAdvancedScreen(
3131
onLnurl: () -> Unit = {},
3232
onManual: () -> Unit = {},
3333
onBackClick: () -> Unit = {},
34-
onCloseClick: () -> Unit = {},
3534
) {
3635
ScreenColumn {
3736
AppTopBar(

‎app/src/main/java/to/bitkit/ui/screens/transfer/FundingScreen.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ fun FundingScreen(
4646
onFund: () -> Unit = {},
4747
onAdvanced: () -> Unit = {},
4848
onBackClick: () -> Unit = {},
49-
onCloseClick: () -> Unit = {},
5049
) {
5150
val balances = LocalBalances.current
5251
val canTransfer = remember(balances.totalOnchainSats) {

‎app/src/main/java/to/bitkit/ui/screens/transfer/LiquidityScreen.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import to.bitkit.ui.utils.withAccent
3232
fun LiquidityScreen(
3333
onContinueClick: () -> Unit = {},
3434
onBackClick: () -> Unit = {},
35-
onCloseClick: () -> Unit = {},
3635
) {
3736
val transfer = transferViewModel ?: return
3837
val state by transfer.spendingUiState.collectAsStateWithLifecycle()
@@ -47,7 +46,6 @@ fun LiquidityScreen(
4746
localBalance = localBalance,
4847
remoteBalance = remoteBalance,
4948
onBackClick = onBackClick,
50-
onCloseClick = onCloseClick,
5149
onContinueClick = onContinueClick,
5250
)
5351
}
@@ -58,7 +56,6 @@ private fun LiquidityScreen(
5856
localBalance: Long,
5957
remoteBalance: Long,
6058
onBackClick: () -> Unit = {},
61-
onCloseClick: () -> Unit = {},
6259
onContinueClick: () -> Unit = {},
6360
) {
6461
ScreenColumn {

‎app/src/main/java/to/bitkit/ui/screens/transfer/SavingsAdvancedScreen.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ import to.bitkit.ui.walletViewModel
4848
fun SavingsAdvancedScreen(
4949
onContinueClick: () -> Unit,
5050
onBackClick: () -> Unit,
51-
onCloseClick: () -> Unit,
5251
) {
5352
val currency = currencyViewModel ?: return
5453
val wallet = walletViewModel ?: return
@@ -93,7 +92,6 @@ fun SavingsAdvancedScreen(
9392
onContinueClick()
9493
},
9594
onBackClick = onBackClick,
96-
onCloseClick = onCloseClick,
9795
)
9896
}
9997

@@ -104,7 +102,6 @@ private fun SavingsAdvancedContent(
104102
onAmountClick: () -> Unit = {},
105103
onContinueClick: () -> Unit = {},
106104
onBackClick: () -> Unit = {},
107-
onCloseClick: () -> Unit = {},
108105
) {
109106
val totalAmount = channelItems.filter { it.isSelected }.sumOf { it.balance }
110107

‎app/src/main/java/to/bitkit/ui/screens/transfer/SavingsConfirmScreen.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ fun SavingsConfirmScreen(
4949
onConfirm: () -> Unit,
5050
onAdvancedClick: () -> Unit,
5151
onBackClick: () -> Unit,
52-
onCloseClick: () -> Unit,
5352
) {
5453
val currency = currencyViewModel ?: return
5554
val transfer = transferViewModel ?: return
@@ -76,7 +75,6 @@ fun SavingsConfirmScreen(
7675
hasMultiple = hasMultiple,
7776
hasSelected = hasSelected,
7877
onBackClick = onBackClick,
79-
onCloseClick = onCloseClick,
8078
onAmountClick = { currency.switchUnit() },
8179
onAdvancedClick = onAdvancedClick,
8280
onSelectAllClick = { transfer.setSelectedChannelIds(emptySet()) },
@@ -93,7 +91,6 @@ private fun SavingsConfirmContent(
9391
hasMultiple: Boolean,
9492
hasSelected: Boolean,
9593
onBackClick: () -> Unit = {},
96-
onCloseClick: () -> Unit = {},
9794
onAmountClick: () -> Unit = {},
9895
onAdvancedClick: () -> Unit = {},
9996
onSelectAllClick: () -> Unit = {},

‎app/src/main/java/to/bitkit/ui/screens/transfer/SavingsIntroScreen.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import to.bitkit.ui.utils.withAccent
3232
fun SavingsIntroScreen(
3333
onContinueClick: () -> Unit = {},
3434
onBackClick: () -> Unit = {},
35-
onCloseClick: () -> Unit = {},
3635
) {
3736
Box(
3837
contentAlignment = Alignment.TopCenter,

‎app/src/main/java/to/bitkit/ui/screens/transfer/SavingsProgressScreen.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ fun SavingsProgressScreen(
5252
transfer: TransferViewModel,
5353
wallet: WalletViewModel,
5454
onContinueClick: () -> Unit = {},
55-
onCloseClick: () -> Unit = {},
5655
) {
5756
val window = LocalActivity.current?.window
5857
var progressState by remember { mutableStateOf(SavingsProgressState.PROGRESS) }

‎app/src/main/java/to/bitkit/ui/screens/transfer/SpendingAmountScreen.kt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ import kotlin.math.min
5353
fun SpendingAmountScreen(
5454
viewModel: TransferViewModel,
5555
onBackClick: () -> Unit = {},
56-
onCloseClick: () -> Unit = {},
5756
onOrderCreated: () -> Unit = {},
5857
toastException: (Throwable) -> Unit,
5958
toast: (title: String, description: String) -> Unit,
@@ -85,7 +84,6 @@ fun SpendingAmountScreen(
8584
amountInputViewModel = amountInputViewModel,
8685
currencies = currencies,
8786
onBackClick = onBackClick,
88-
onCloseClick = onCloseClick,
8987
onClickQuarter = {
9088
val quarter = uiState.balanceAfterFeeQuarter()
9189
val max = uiState.maxAllowedToSend
@@ -116,7 +114,6 @@ private fun Content(
116114
uiState: TransferToSpendingUiState,
117115
amountInputViewModel: AmountInputViewModel,
118116
onBackClick: () -> Unit,
119-
onCloseClick: () -> Unit,
120117
onClickQuarter: () -> Unit,
121118
onClickMaxAmount: () -> Unit,
122119
onConfirmAmount: () -> Unit,
@@ -254,7 +251,6 @@ private fun Preview() {
254251
amountInputViewModel = previewAmountInputViewModel(),
255252
currencies = CurrencyState(),
256253
onBackClick = {},
257-
onCloseClick = {},
258254
onClickQuarter = {},
259255
onClickMaxAmount = {},
260256
onConfirmAmount = {},
@@ -272,7 +268,6 @@ private fun PreviewInitializing() {
272268
amountInputViewModel = previewAmountInputViewModel(),
273269
currencies = CurrencyState(),
274270
onBackClick = {},
275-
onCloseClick = {},
276271
onClickQuarter = {},
277272
onClickMaxAmount = {},
278273
onConfirmAmount = {},

‎app/src/main/java/to/bitkit/ui/screens/transfer/SpendingConfirmScreen.kt‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ fun SpendingConfirmScreen(
9696

9797
Content(
9898
onBackClick = onBackClick,
99-
onCloseClick = onCloseClick,
10099
onLearnMoreClick = onLearnMoreClick,
101100
onAdvancedClick = onAdvancedClick,
102101
onConfirm = onConfirm,
@@ -114,7 +113,6 @@ fun SpendingConfirmScreen(
114113
@Composable
115114
private fun Content(
116115
onBackClick: () -> Unit,
117-
onCloseClick: () -> Unit,
118116
onLearnMoreClick: () -> Unit,
119117
onAdvancedClick: () -> Unit,
120118
onConfirm: () -> Unit,
@@ -273,7 +271,6 @@ private fun Preview() {
273271
AppThemeSurface {
274272
Content(
275273
onBackClick = {},
276-
onCloseClick = {},
277274
onLearnMoreClick = {},
278275
onAdvancedClick = {},
279276
onConfirm = {},
@@ -351,7 +348,6 @@ private fun Preview2() {
351348
AppThemeSurface {
352349
Content(
353350
onBackClick = {},
354-
onCloseClick = {},
355351
onLearnMoreClick = {},
356352
onAdvancedClick = {},
357353
onConfirm = {},
@@ -429,7 +425,6 @@ private fun Preview3() {
429425
AppThemeSurface {
430426
Content(
431427
onBackClick = {},
432-
onCloseClick = {},
433428
onLearnMoreClick = {},
434429
onAdvancedClick = {},
435430
onConfirm = {},
@@ -507,7 +502,6 @@ private fun Preview4() {
507502
AppThemeSurface {
508503
Content(
509504
onBackClick = {},
510-
onCloseClick = {},
511505
onLearnMoreClick = {},
512506
onAdvancedClick = {},
513507
onConfirm = {},

0 commit comments

Comments
 (0)