Skip to content

Commit 9bb8d0f

Browse files
authored
Merge pull request #346 from joreilly/dep_updates
CMP 1.10.0
2 parents 44066ec + 47eae98 commit 9bb8d0f

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

common/src/commonMain/kotlin/dev/johnoreilly/common/stationlist/StationListUI.kt

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import androidx.compose.material3.Icon
2929
import androidx.compose.material3.IconButton
3030
import androidx.compose.material3.LinearProgressIndicator
3131
import androidx.compose.material3.MaterialTheme
32+
import androidx.compose.material3.ProgressIndicatorDefaults
3233
import androidx.compose.material3.ProvideTextStyle
3334
import androidx.compose.material3.Scaffold
3435
import androidx.compose.material3.Text
@@ -70,7 +71,7 @@ fun StationListUI(state: StationListScreen.State, modifier: Modifier = Modifier)
7071
navigationIcon = {
7172
IconButton(onClick = { state.eventSink(StationListScreen.Event.BackClicked) }) {
7273
Icon(
73-
Icons.AutoMirrored.Filled.ArrowBack,
74+
Icons.AutoMirrored.Filled.ArrowBack,
7475
contentDescription = "Back",
7576
tint = MaterialTheme.colorScheme.onPrimary
7677
)
@@ -119,7 +120,7 @@ fun StationViewPreview() {
119120
fun StationView(station: Station) {
120121
val totalSlots = station.freeBikes() + (station.empty_slots ?: 0)
121122
val bikePercentage = if (totalSlots > 0) station.freeBikes().toFloat() / totalSlots else 0f
122-
123+
123124
// Determine availability color based on percentage of available bikes
124125
val availabilityColor = when {
125126
bikePercentage < 0.2f -> lowAvailabilityColor
@@ -140,28 +141,29 @@ fun StationView(station: Station) {
140141
) {
141142
// Station name
142143
Text(
143-
text = station.name,
144-
style = MaterialTheme.typography.titleMedium,
144+
text = station.name,
145+
style = MaterialTheme.typography.titleMedium,
145146
fontWeight = FontWeight.Bold,
146147
maxLines = 2,
147148
overflow = TextOverflow.Ellipsis
148149
)
149-
150+
150151
Spacer(modifier = Modifier.height(12.dp))
151-
152+
152153
// Availability progress indicator
153154
LinearProgressIndicator(
154-
progress = bikePercentage,
155+
progress = { bikePercentage },
155156
modifier = Modifier
156157
.fillMaxWidth()
157158
.height(8.dp)
158159
.clip(RoundedCornerShape(4.dp)),
159160
color = availabilityColor,
160-
trackColor = MaterialTheme.colorScheme.surfaceVariant
161+
trackColor = MaterialTheme.colorScheme.surfaceVariant,
162+
strokeCap = ProgressIndicatorDefaults.LinearStrokeCap,
161163
)
162-
164+
163165
Spacer(modifier = Modifier.height(12.dp))
164-
166+
165167
// Availability details
166168
Row(
167169
modifier = Modifier.fillMaxWidth(),
@@ -185,9 +187,9 @@ fun StationView(station: Station) {
185187
modifier = Modifier.size(20.dp)
186188
)
187189
}
188-
190+
189191
Spacer(modifier = Modifier.width(8.dp))
190-
192+
191193
Column {
192194
Text(
193195
"Available Bikes",
@@ -202,7 +204,7 @@ fun StationView(station: Station) {
202204
)
203205
}
204206
}
205-
207+
206208
// Empty slots
207209
Row(
208210
verticalAlignment = Alignment.CenterVertically
@@ -221,9 +223,9 @@ fun StationView(station: Station) {
221223
modifier = Modifier.size(20.dp)
222224
)
223225
}
224-
226+
225227
Spacer(modifier = Modifier.width(8.dp))
226-
228+
227229
Column {
228230
Text(
229231
"Empty Slots",

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ ksp = "2.3.3"
44

55
androidGradlePlugin = "8.12.3"
66
androidxActivity = "1.12.2"
7-
androidxComposeBom = "2025.12.01"
7+
androidxComposeBom = "2026.01.00"
88
androidxLifecycle = "2.10.0"
99
androidxNavigationCompose = "2.9.6"
1010
androidxRoom = "2.8.4"
11-
circuit = "0.31.0"
11+
circuit = "0.32.0"
1212
composeLifecyleRuntime="2.9.6"
13-
compose-multiplatform = "1.9.3"
13+
compose-multiplatform = "1.10.0"
1414
composeAdaptiveLayout = "1.2.0"
1515
coroutines = "1.10.2"
1616
junit = "4.13.2"

0 commit comments

Comments
 (0)