Skip to content

Commit 928cc0e

Browse files
committed
feat: replace close button with drawer
1 parent abb451c commit 928cc0e

File tree

74 files changed

+147
-147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+147
-147
lines changed

app/src/main/java/to/bitkit/ui/NodeInfoScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ import to.bitkit.ui.components.rememberMoneyText
6060
import to.bitkit.ui.components.settings.SectionHeader
6161
import to.bitkit.ui.components.settings.SettingsTextButtonRow
6262
import to.bitkit.ui.scaffold.AppTopBar
63-
import to.bitkit.ui.scaffold.CloseNavIcon
63+
import to.bitkit.ui.scaffold.DrawerNavIcon
6464
import to.bitkit.ui.scaffold.ScreenColumn
6565
import to.bitkit.ui.shared.util.clickableAlpha
6666
import to.bitkit.ui.theme.AppThemeSurface
@@ -117,7 +117,7 @@ private fun Content(
117117
AppTopBar(
118118
titleText = stringResource(R.string.lightning__node_info),
119119
onBackClick = onBack,
120-
actions = { CloseNavIcon(onClose) },
120+
actions = { DrawerNavIcon() },
121121
)
122122
PullToRefreshBox(
123123
isRefreshing = uiState.isRefreshing,

app/src/main/java/to/bitkit/ui/components/InfoScreenContent.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import androidx.compose.ui.tooling.preview.Preview
2121
import androidx.compose.ui.unit.dp
2222
import to.bitkit.R
2323
import to.bitkit.ui.scaffold.AppTopBar
24-
import to.bitkit.ui.scaffold.CloseNavIcon
24+
import to.bitkit.ui.scaffold.DrawerNavIcon
2525
import to.bitkit.ui.scaffold.ScreenColumn
2626
import to.bitkit.ui.theme.AppThemeSurface
2727
import to.bitkit.ui.theme.Colors
@@ -46,7 +46,7 @@ fun InfoScreenContent(
4646
onBackClick = null,
4747
actions = {
4848
if (showCloseButton) {
49-
CloseNavIcon(onCloseClick)
49+
DrawerNavIcon()
5050
}
5151
},
5252
)

app/src/main/java/to/bitkit/ui/scaffold/AppTopBar.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ private fun Preview3() {
175175
titleText = "Title and Action",
176176
onBackClick = {},
177177
actions = {
178-
CloseNavIcon(onClick = {})
178+
DrawerNavIcon()
179179
}
180180
)
181181
}

app/src/main/java/to/bitkit/ui/screens/profile/CreateProfileScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import androidx.compose.ui.unit.dp
1111
import to.bitkit.R
1212
import to.bitkit.ui.components.Display
1313
import to.bitkit.ui.scaffold.AppTopBar
14-
import to.bitkit.ui.scaffold.CloseNavIcon
14+
import to.bitkit.ui.scaffold.DrawerNavIcon
1515
import to.bitkit.ui.scaffold.ScreenColumn
1616
import to.bitkit.ui.theme.AppThemeSurface
1717
import to.bitkit.ui.theme.Colors
@@ -25,7 +25,7 @@ fun CreateProfileScreen(
2525
AppTopBar(
2626
titleText = stringResource(R.string.slashtags__profile_create),
2727
onBackClick = onBack,
28-
actions = { CloseNavIcon(onClick = onClose) },
28+
actions = { DrawerNavIcon() },
2929
)
3030

3131
Column(

app/src/main/java/to/bitkit/ui/screens/profile/ProfileIntroScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import to.bitkit.ui.components.BodyM
1717
import to.bitkit.ui.components.Display
1818
import to.bitkit.ui.components.PrimaryButton
1919
import to.bitkit.ui.scaffold.AppTopBar
20-
import to.bitkit.ui.scaffold.CloseNavIcon
20+
import to.bitkit.ui.scaffold.DrawerNavIcon
2121
import to.bitkit.ui.scaffold.ScreenColumn
2222
import to.bitkit.ui.theme.AppThemeSurface
2323
import to.bitkit.ui.theme.Colors
@@ -32,7 +32,7 @@ fun ProfileIntroScreen(
3232
AppTopBar(
3333
titleText = stringResource(R.string.slashtags__profile),
3434
onBackClick = null,
35-
actions = { CloseNavIcon(onClick = onClose) },
35+
actions = { DrawerNavIcon() },
3636
)
3737

3838
Column(

app/src/main/java/to/bitkit/ui/screens/settings/DevSettingsScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import to.bitkit.ui.components.settings.SettingsButtonRow
2323
import to.bitkit.ui.components.settings.SettingsTextButtonRow
2424
import to.bitkit.ui.navigateToHome
2525
import to.bitkit.ui.scaffold.AppTopBar
26-
import to.bitkit.ui.scaffold.CloseNavIcon
26+
import to.bitkit.ui.scaffold.DrawerNavIcon
2727
import to.bitkit.ui.scaffold.ScreenColumn
2828
import to.bitkit.ui.settingsViewModel
2929
import to.bitkit.ui.shared.util.shareZipFile
@@ -43,7 +43,7 @@ fun DevSettingsScreen(
4343
AppTopBar(
4444
titleText = stringResource(R.string.settings__dev_title),
4545
onBackClick = { navController.popBackStack() },
46-
actions = { CloseNavIcon(onClick = { navController.navigateToHome() }) },
46+
actions = { DrawerNavIcon() } ,
4747
)
4848
Column(
4949
modifier = Modifier

app/src/main/java/to/bitkit/ui/screens/settings/FeeSettingsScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import to.bitkit.ui.components.settings.SectionHeader
2020
import to.bitkit.ui.components.settings.SettingsTextButtonRow
2121
import to.bitkit.ui.navigateToHome
2222
import to.bitkit.ui.scaffold.AppTopBar
23-
import to.bitkit.ui.scaffold.CloseNavIcon
23+
import to.bitkit.ui.scaffold.DrawerNavIcon
2424
import to.bitkit.ui.scaffold.ScreenColumn
2525
import to.bitkit.ui.theme.AppThemeSurface
2626
import to.bitkit.viewmodels.FeeSettingsUiState
@@ -54,7 +54,7 @@ private fun Content(
5454
AppTopBar(
5555
titleText = "Fee Settings",
5656
onBackClick = onBack,
57-
actions = { CloseNavIcon(onClick = onClose) },
57+
actions = { DrawerNavIcon() },
5858
)
5959

6060
Column(

app/src/main/java/to/bitkit/ui/screens/shop/ShopIntroScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import to.bitkit.ui.components.BodyM
1717
import to.bitkit.ui.components.Display
1818
import to.bitkit.ui.components.PrimaryButton
1919
import to.bitkit.ui.scaffold.AppTopBar
20-
import to.bitkit.ui.scaffold.CloseNavIcon
20+
import to.bitkit.ui.scaffold.DrawerNavIcon
2121
import to.bitkit.ui.scaffold.ScreenColumn
2222
import to.bitkit.ui.theme.AppThemeSurface
2323
import to.bitkit.ui.theme.Colors
@@ -32,7 +32,7 @@ fun ShopIntroScreen(
3232
AppTopBar(
3333
titleText = "",
3434
onBackClick = null,
35-
actions = { CloseNavIcon(onClick = onClose) },
35+
actions = { DrawerNavIcon() },
3636
)
3737

3838
Column(

app/src/main/java/to/bitkit/ui/screens/shop/shopDiscover/ShopDiscoverScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import to.bitkit.ui.components.SuggestionCard
4747
import to.bitkit.ui.components.Text13Up
4848
import to.bitkit.ui.components.VerticalSpacer
4949
import to.bitkit.ui.scaffold.AppTopBar
50-
import to.bitkit.ui.scaffold.CloseNavIcon
50+
import to.bitkit.ui.scaffold.DrawerNavIcon
5151
import to.bitkit.ui.scaffold.ScreenColumn
5252
import to.bitkit.ui.shared.util.clickableAlpha
5353
import to.bitkit.ui.shared.util.gradientBackground
@@ -76,7 +76,7 @@ fun ShopDiscoverScreen(
7676
AppTopBar(
7777
titleText = stringResource(R.string.other__shop__discover__nav_title),
7878
onBackClick = onBack,
79-
actions = { CloseNavIcon(onClick = onClose) },
79+
actions = { DrawerNavIcon() },
8080
)
8181

8282
PrimaryTabRow(

app/src/main/java/to/bitkit/ui/screens/shop/shopWebView/ShopWebViewScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import to.bitkit.R
2121
import to.bitkit.env.Env
2222
import to.bitkit.ext.configureForBasicWebContent
2323
import to.bitkit.ui.scaffold.AppTopBar
24-
import to.bitkit.ui.scaffold.CloseNavIcon
24+
import to.bitkit.ui.scaffold.DrawerNavIcon
2525
import to.bitkit.ui.scaffold.ScreenColumn
2626
import to.bitkit.ui.theme.AppThemeSurface
2727

@@ -49,7 +49,7 @@ fun ShopWebViewScreen(
4949
AppTopBar(
5050
titleText = "${stringResource(R.string.other__shop__discover__nav_title)} $title",
5151
onBackClick = onBack,
52-
actions = { CloseNavIcon(onClick = onClose) },
52+
actions = { DrawerNavIcon() },
5353
)
5454

5555
Box(modifier = Modifier.weight(1f)) {

0 commit comments

Comments
 (0)