Skip to content

Commit a823e1b

Browse files
refactor: rename drawer package to settings
1 parent 5d21b9c commit a823e1b

7 files changed

Lines changed: 18 additions & 18 deletions

File tree

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/navigation/AppNavigation.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ import androidx.navigation.toRoute
2424
import org.bitcoindevkit.devkitwallet.data.SingleWallet
2525
import org.bitcoindevkit.devkitwallet.domain.Wallet
2626
import org.bitcoindevkit.devkitwallet.presentation.WalletCreateType
27-
import org.bitcoindevkit.devkitwallet.presentation.ui.screens.drawer.AboutScreen
28-
import org.bitcoindevkit.devkitwallet.presentation.ui.screens.drawer.BlockchainClientScreen
29-
import org.bitcoindevkit.devkitwallet.presentation.ui.screens.drawer.LogsScreen
30-
import org.bitcoindevkit.devkitwallet.presentation.ui.screens.drawer.RecoveryDataScreen
31-
import org.bitcoindevkit.devkitwallet.presentation.ui.screens.drawer.SettingsScreen
27+
import org.bitcoindevkit.devkitwallet.presentation.ui.screens.settings.AboutScreen
28+
import org.bitcoindevkit.devkitwallet.presentation.ui.screens.settings.BlockchainClientScreen
29+
import org.bitcoindevkit.devkitwallet.presentation.ui.screens.settings.LogsScreen
30+
import org.bitcoindevkit.devkitwallet.presentation.ui.screens.settings.RecoveryDataScreen
31+
import org.bitcoindevkit.devkitwallet.presentation.ui.screens.settings.SettingsScreen
3232
import org.bitcoindevkit.devkitwallet.presentation.ui.screens.intro.ActiveWalletsScreen
3333
import org.bitcoindevkit.devkitwallet.presentation.ui.screens.intro.CreateNewWalletScreen
3434
import org.bitcoindevkit.devkitwallet.presentation.ui.screens.intro.RecoverWalletScreen

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/drawer/AboutScreen.kt renamed to app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/settings/AboutScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the ./LICENSE file.
44
*/
55

6-
package org.bitcoindevkit.devkitwallet.presentation.ui.screens.drawer
6+
package org.bitcoindevkit.devkitwallet.presentation.ui.screens.settings
77

88
import androidx.compose.foundation.Image
99
import androidx.compose.foundation.clickable

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/drawer/BlockchainClientScreen.kt renamed to app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/settings/BlockchainClientScreen.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the ./LICENSE file.
44
*/
55

6-
package org.bitcoindevkit.devkitwallet.presentation.ui.screens.drawer
6+
package org.bitcoindevkit.devkitwallet.presentation.ui.screens.settings
77

88
import androidx.compose.foundation.background
99
import androidx.compose.foundation.layout.Arrangement
@@ -31,7 +31,7 @@ import androidx.navigation.NavController
3131
import org.bitcoindevkit.devkitwallet.presentation.theme.inter
3232
import org.bitcoindevkit.devkitwallet.presentation.ui.components.NeutralButton
3333
import org.bitcoindevkit.devkitwallet.presentation.ui.components.SecondaryScreensAppBar
34-
import org.bitcoindevkit.devkitwallet.presentation.viewmodels.mvi.KyotoNodeStatus
34+
import org.bitcoindevkit.devkitwallet.presentation.viewmodels.mvi.CbfNodeStatus
3535
import org.bitcoindevkit.devkitwallet.presentation.viewmodels.mvi.WalletScreenAction
3636
import org.bitcoindevkit.devkitwallet.presentation.viewmodels.mvi.WalletScreenState
3737

@@ -66,7 +66,7 @@ internal fun BlockchainClientScreen(
6666
horizontalArrangement = Arrangement.SpaceBetween,
6767
modifier = Modifier.fillMaxWidth(),
6868
) {
69-
val status = if (state.kyotoNodeStatus == KyotoNodeStatus.Running) "Online" else "Offline"
69+
val status = if (state.kyotoNodeStatus == CbfNodeStatus.Running) "Online" else "Offline"
7070
Text(
7171
text = "CBF Node Status: $status",
7272
color = colorScheme.onSurface,
@@ -81,7 +81,7 @@ internal fun BlockchainClientScreen(
8181
.size(size = 21.dp)
8282
.clip(shape = CircleShape)
8383
.background(
84-
if (state.kyotoNodeStatus == KyotoNodeStatus.Running) {
84+
if (state.kyotoNodeStatus == CbfNodeStatus.Running) {
8585
Color(0xFF8FD998)
8686
} else {
8787
Color(0xFFE76F51)
@@ -103,7 +103,7 @@ internal fun BlockchainClientScreen(
103103
textAlign = TextAlign.Start,
104104
)
105105
Text(
106-
text = "${state.latestBlock}",
106+
text = "${state.bestBlockHeight}",
107107
color = colorScheme.onSurface,
108108
fontSize = 14.sp,
109109
fontFamily = inter,
@@ -115,12 +115,12 @@ internal fun BlockchainClientScreen(
115115

116116
NeutralButton(
117117
text = "Start Node",
118-
enabled = state.kyotoNodeStatus == KyotoNodeStatus.Stopped,
119-
onClick = { onAction(WalletScreenAction.StartKyotoNode) },
118+
enabled = state.kyotoNodeStatus == CbfNodeStatus.Stopped,
119+
onClick = { onAction(WalletScreenAction.ActivateCbfNode) },
120120
)
121121
NeutralButton(
122122
text = "Stop Node",
123-
enabled = state.kyotoNodeStatus == KyotoNodeStatus.Running,
123+
enabled = state.kyotoNodeStatus == CbfNodeStatus.Running,
124124
onClick = { onAction(WalletScreenAction.StopKyotoNode) },
125125
)
126126
}

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/drawer/CustomBlockchainClient.kt renamed to app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/settings/CustomBlockchainClient.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the ./LICENSE file.
44
*/
55

6-
package org.bitcoindevkit.devkitwallet.presentation.ui.screens.drawer
6+
package org.bitcoindevkit.devkitwallet.presentation.ui.screens.settings
77

88
import androidx.compose.foundation.layout.Column
99
import androidx.compose.foundation.layout.fillMaxSize

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/drawer/LogsScreen.kt renamed to app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/settings/LogsScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the ./LICENSE file.
44
*/
55

6-
package org.bitcoindevkit.devkitwallet.presentation.ui.screens.drawer
6+
package org.bitcoindevkit.devkitwallet.presentation.ui.screens.settings
77

88
import androidx.compose.foundation.horizontalScroll
99
import androidx.compose.foundation.layout.fillMaxSize

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/drawer/RecoveryDataScreen.kt renamed to app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/settings/RecoveryDataScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the ./LICENSE file.
44
*/
55

6-
package org.bitcoindevkit.devkitwallet.presentation.ui.screens.drawer
6+
package org.bitcoindevkit.devkitwallet.presentation.ui.screens.settings
77

88
import android.content.ClipData
99
import android.content.ClipboardManager

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/drawer/SettingsScreen.kt renamed to app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/settings/SettingsScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the ./LICENSE file.
44
*/
55

6-
package org.bitcoindevkit.devkitwallet.presentation.ui.screens.drawer
6+
package org.bitcoindevkit.devkitwallet.presentation.ui.screens.settings
77

88
import androidx.compose.foundation.background
99
import androidx.compose.foundation.border

0 commit comments

Comments
 (0)