Skip to content

Commit d9ebf69

Browse files
authored
Merge pull request #348 from synonymdev/fix/adapt-activity-detail-short-screens
Adapt Activity details to short screens
2 parents 2da923f + c7a1e3f commit d9ebf69

File tree

1 file changed

+40
-0
lines changed

1 file changed

+40
-0
lines changed

app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityDetailScreen.kt

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ import androidx.compose.foundation.layout.height
1414
import androidx.compose.foundation.layout.padding
1515
import androidx.compose.foundation.layout.size
1616
import androidx.compose.foundation.layout.width
17+
import androidx.compose.foundation.rememberScrollState
18+
import androidx.compose.foundation.verticalScroll
1719
import androidx.compose.material3.HorizontalDivider
1820
import androidx.compose.material3.Icon
1921
import androidx.compose.runtime.Composable
@@ -31,6 +33,7 @@ import androidx.compose.ui.platform.LocalContext
3133
import androidx.compose.ui.platform.testTag
3234
import androidx.compose.ui.res.painterResource
3335
import androidx.compose.ui.res.stringResource
36+
import androidx.compose.ui.tooling.preview.Devices
3437
import androidx.compose.ui.tooling.preview.Preview
3538
import androidx.compose.ui.unit.dp
3639
import androidx.hilt.navigation.compose.hiltViewModel
@@ -55,6 +58,7 @@ import to.bitkit.ui.Routes
5558
import to.bitkit.ui.appViewModel
5659
import to.bitkit.ui.components.BalanceHeaderView
5760
import to.bitkit.ui.components.BodySSB
61+
import to.bitkit.ui.components.BottomSheetPreview
5862
import to.bitkit.ui.components.ButtonSize
5963
import to.bitkit.ui.components.Caption13Up
6064
import to.bitkit.ui.components.MoneySSB
@@ -65,6 +69,7 @@ import to.bitkit.ui.scaffold.AppTopBar
6569
import to.bitkit.ui.scaffold.CloseNavIcon
6670
import to.bitkit.ui.screens.wallets.activity.components.ActivityAddTagSheet
6771
import to.bitkit.ui.screens.wallets.activity.components.ActivityIcon
72+
import to.bitkit.ui.shared.modifiers.sheetHeight
6873
import to.bitkit.ui.shared.util.clickableAlpha
6974
import to.bitkit.ui.sheets.BoostTransactionSheet
7075
import to.bitkit.ui.theme.AppThemeSurface
@@ -216,6 +221,7 @@ private fun ActivityDetailContent(
216221
Column(
217222
modifier = Modifier
218223
.fillMaxSize()
224+
.verticalScroll(rememberScrollState())
219225
.padding(16.dp)
220226
) {
221227
Row(
@@ -705,3 +711,37 @@ private fun PreviewOnchain() {
705711
)
706712
}
707713
}
714+
715+
@Preview(showSystemUi = true, device = Devices.NEXUS_5)
716+
@Composable
717+
private fun PreviewSheetSmallScreen() {
718+
AppThemeSurface {
719+
BottomSheetPreview(
720+
modifier = Modifier.sheetHeight(),
721+
) {
722+
ActivityDetailContent(
723+
item = Activity.Lightning(
724+
v1 = LightningActivity(
725+
id = "test-lightning-1",
726+
txType = PaymentType.SENT,
727+
status = PaymentState.SUCCEEDED,
728+
value = 50000UL,
729+
fee = 1UL,
730+
invoice = "lnbc...",
731+
message = "Thanks for paying at the bar. Here's my share.",
732+
timestamp = (System.currentTimeMillis() / 1000).toULong(),
733+
preimage = null,
734+
createdAt = null,
735+
updatedAt = null,
736+
)
737+
),
738+
tags = listOf("Lunch", "Drinks"),
739+
onRemoveTag = {},
740+
onAddTagClick = {},
741+
onExploreClick = {},
742+
onCopy = {},
743+
onClickBoost = {},
744+
)
745+
}
746+
}
747+
}

0 commit comments

Comments
 (0)