Skip to content

Commit 8d12e4c

Browse files
committed
fix: scope widget preview sizes
1 parent f0a35f1 commit 8d12e4c

7 files changed

Lines changed: 72 additions & 4 deletions

File tree

app/src/main/java/to/bitkit/ui/screens/widgets/blocks/BlocksPreviewScreen.kt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,25 @@ private fun Content(
139139
.testTag("block_card_wide")
140140
)
141141
},
142+
smallContent = {
143+
BlockCardSmall(
144+
showBlock = blocksPreferences.showBlock,
145+
showTime = blocksPreferences.showTime,
146+
showDate = blocksPreferences.showDate,
147+
showTransactions = blocksPreferences.showTransactions,
148+
showSize = blocksPreferences.showSize,
149+
showFees = blocksPreferences.showFees,
150+
showSource = blocksPreferences.showSource,
151+
block = it.height,
152+
time = it.time,
153+
date = it.date,
154+
transactions = it.transactionCount,
155+
size = it.size,
156+
fees = it.fees,
157+
source = it.source,
158+
modifier = Modifier.testTag("block_card_small")
159+
)
160+
},
142161
modifier = Modifier
143162
.fillMaxWidth()
144163
.testTag("blocks_preview_carousel")

app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import to.bitkit.ui.components.VerticalSpacer
2525
import to.bitkit.ui.scaffold.AppTopBar
2626
import to.bitkit.ui.scaffold.ScreenColumn
2727
import to.bitkit.ui.screens.widgets.calculator.components.CalculatorCardEditor
28+
import to.bitkit.ui.screens.widgets.calculator.components.CalculatorCardSmall
2829
import to.bitkit.ui.screens.widgets.components.WidgetSizeCarousel
2930
import to.bitkit.ui.theme.AppThemeSurface
3031
import to.bitkit.ui.theme.Colors
@@ -113,6 +114,15 @@ fun CalculatorPreviewContent(
113114
.testTag("calculator_card_wide")
114115
)
115116
},
117+
smallContent = {
118+
CalculatorCardSmall(
119+
btcPrimaryDisplayUnit = uiState.displayUnit,
120+
btcValue = uiState.btcValue,
121+
fiatSymbol = uiState.currencySymbol,
122+
fiatValue = uiState.fiatValue,
123+
modifier = Modifier.testTag("calculator_card_small")
124+
)
125+
},
116126
modifier = Modifier
117127
.fillMaxWidth()
118128
.testTag("calculator_preview_carousel")

app/src/main/java/to/bitkit/ui/screens/widgets/components/WidgetSizeCarousel.kt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import androidx.compose.foundation.shape.CircleShape
1414
import androidx.compose.runtime.Composable
1515
import androidx.compose.ui.Alignment
1616
import androidx.compose.ui.Modifier
17+
import androidx.compose.ui.platform.LocalInspectionMode
1718
import androidx.compose.ui.platform.testTag
1819
import androidx.compose.ui.res.stringResource
1920
import androidx.compose.ui.text.style.TextAlign
@@ -39,10 +40,15 @@ fun WidgetSizeCarousel(
3940
modifier: Modifier = Modifier,
4041
smallContent: (@Composable () -> Unit)? = null,
4142
) {
42-
val pages = listOfNotNull(
43-
PreviewPage(size = PreviewSize.WIDE, content = wideContent),
44-
smallContent?.let { PreviewPage(size = PreviewSize.SMALL, content = it) },
45-
)
43+
val showSmallContent = LocalInspectionMode.current
44+
val pages = if (showSmallContent) {
45+
listOfNotNull(
46+
smallContent?.let { PreviewPage(size = PreviewSize.SMALL, content = it) },
47+
PreviewPage(size = PreviewSize.WIDE, content = wideContent),
48+
)
49+
} else {
50+
listOf(PreviewPage(size = PreviewSize.WIDE, content = wideContent))
51+
}
4652
val pagerState = rememberPagerState(pageCount = { pages.size })
4753

4854
Column(

app/src/main/java/to/bitkit/ui/screens/widgets/facts/FactsPreviewScreen.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,12 @@ fun FactsPreviewContent(
102102
.testTag("facts_card_wide")
103103
)
104104
},
105+
smallContent = {
106+
FactsCardSmall(
107+
headline = fact,
108+
modifier = Modifier.testTag("facts_card_small")
109+
)
110+
},
105111
modifier = Modifier
106112
.fillMaxWidth()
107113
.testTag("facts_preview_carousel")

app/src/main/java/to/bitkit/ui/screens/widgets/headlines/HeadlinesPreviewScreen.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,15 @@ fun HeadlinesPreviewContent(
130130
.testTag("headline_card_wide")
131131
)
132132
},
133+
smallContent = {
134+
HeadlineCardSmall(
135+
showTime = headlinePreferences.showTime,
136+
time = article.timeAgo,
137+
headline = article.title,
138+
link = article.link,
139+
modifier = Modifier.testTag("headline_card_small")
140+
)
141+
},
133142
modifier = Modifier
134143
.fillMaxWidth()
135144
.testTag("headlines_preview_carousel")

app/src/main/java/to/bitkit/ui/screens/widgets/price/PricePreviewScreen.kt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Column
66
import androidx.compose.foundation.layout.Row
77
import androidx.compose.foundation.layout.fillMaxWidth
88
import androidx.compose.foundation.layout.padding
9+
import androidx.compose.foundation.layout.size
910
import androidx.compose.material3.HorizontalDivider
1011
import androidx.compose.runtime.Composable
1112
import androidx.compose.runtime.LaunchedEffect
@@ -32,6 +33,7 @@ import to.bitkit.ui.components.settings.SettingsButtonRow
3233
import to.bitkit.ui.components.settings.SettingsButtonValue
3334
import to.bitkit.ui.scaffold.AppTopBar
3435
import to.bitkit.ui.scaffold.ScreenColumn
36+
import to.bitkit.ui.screens.widgets.components.WidgetCardDimens
3537
import to.bitkit.ui.screens.widgets.components.WidgetSizeCarousel
3638
import to.bitkit.ui.theme.AppThemeSurface
3739
import to.bitkit.ui.theme.Colors
@@ -143,6 +145,15 @@ fun PricePreviewContent(
143145
.testTag("price_card_wide")
144146
)
145147
},
148+
smallContent = {
149+
PriceCardSmall(
150+
pricePreferences = pricePreferences,
151+
priceDTO = priceDTO,
152+
modifier = Modifier
153+
.size(WidgetCardDimens.COMPACT_CARD_SIZE)
154+
.testTag("price_card_small")
155+
)
156+
},
146157
modifier = Modifier
147158
.fillMaxWidth()
148159
.weight(1f)

app/src/main/java/to/bitkit/ui/screens/widgets/weather/WeatherPreviewScreen.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,13 @@ fun WeatherPreviewContent(
132132
.testTag("weather_card_wide")
133133
)
134134
},
135+
smallContent = {
136+
WeatherCardSmall(
137+
weatherModel = model,
138+
preferences = weatherPreferences,
139+
modifier = Modifier.testTag("weather_card_small")
140+
)
141+
},
135142
modifier = Modifier
136143
.fillMaxWidth()
137144
.testTag("weather_preview_carousel")

0 commit comments

Comments
 (0)