Skip to content

Commit 8621c82

Browse files
authoredSep 5, 2023
Merge pull request #520 from kiwicom/task/MOBILE-48354-remove-choice-tile-centered
Remove deprecated `ChoiceTileCentered`
2 parents ad7b499 + 2e103d7 commit 8621c82

File tree

6 files changed

+0
-290
lines changed

6 files changed

+0
-290
lines changed
 

‎catalog/src/main/java/kiwi/orbit/compose/catalog/screens/ChoiceTileScreen.kt

-66
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package kiwi.orbit.compose.catalog.screens
22

3-
import androidx.compose.foundation.Image
43
import androidx.compose.foundation.horizontalScroll
54
import androidx.compose.foundation.layout.Arrangement
65
import androidx.compose.foundation.layout.Box
@@ -25,16 +24,12 @@ import androidx.compose.runtime.saveable.rememberSaveable
2524
import androidx.compose.runtime.setValue
2625
import androidx.compose.ui.Alignment
2726
import androidx.compose.ui.Modifier
28-
import androidx.compose.ui.text.style.TextOverflow
2927
import androidx.compose.ui.tooling.preview.Preview
3028
import androidx.compose.ui.unit.dp
3129
import kiwi.orbit.compose.catalog.components.CustomPlaceholder
3230
import kiwi.orbit.compose.icons.Icons
33-
import kiwi.orbit.compose.illustrations.Illustrations
3431
import kiwi.orbit.compose.ui.controls.BadgeInfoSubtle
35-
import kiwi.orbit.compose.ui.controls.BadgeNeutral
3632
import kiwi.orbit.compose.ui.controls.ChoiceTile
37-
import kiwi.orbit.compose.ui.controls.ChoiceTileCentered
3833
import kiwi.orbit.compose.ui.controls.Icon
3934
import kiwi.orbit.compose.ui.controls.Scaffold
4035
import kiwi.orbit.compose.ui.controls.Stepper
@@ -205,66 +200,5 @@ private fun ChoiceTileScreenInner() {
205200
onSelect = { selectedD = !selectedD },
206201
content = { },
207202
)
208-
209-
// Vertical padding to avoid clip issues on Android 12+ when over-scrolling.
210-
// https://issuetracker.google.com/issues/215652703
211-
var selectedE by rememberSaveable { mutableIntStateOf(-1) }
212-
Row(
213-
Modifier
214-
.height(IntrinsicSize.Max)
215-
.padding(horizontal = 16.dp)
216-
.padding(top = 12.dp) // half of the badge
217-
.padding(top = 2.dp, bottom = 4.dp), // over-scroll workaround
218-
horizontalArrangement = Arrangement.spacedBy(8.dp),
219-
) {
220-
ChoiceTileCentered(
221-
modifier = Modifier
222-
.fillMaxHeight()
223-
.weight(1f),
224-
selected = selectedE == 0,
225-
onSelect = { selectedE = 0 },
226-
title = { Text("Plus Support") },
227-
description = { Text("Everyone sits together") },
228-
price = { BadgeNeutral { Text("Included") } },
229-
)
230-
231-
ChoiceTileCentered(
232-
modifier = Modifier
233-
.fillMaxHeight()
234-
.weight(1f),
235-
selected = selectedE == 1,
236-
onSelect = { selectedE = 1 },
237-
icon = {
238-
Image(
239-
painter = Illustrations.Boarding,
240-
contentDescription = null,
241-
Modifier.height(60.dp),
242-
)
243-
},
244-
title = { Text("Plus Support") },
245-
description = { Text("Everyone sits together") },
246-
price = { Text("+ 10 €") },
247-
)
248-
249-
ChoiceTileCentered(
250-
modifier = Modifier
251-
.fillMaxHeight()
252-
.weight(1f),
253-
selected = selectedE == 2,
254-
onSelect = { selectedE = 2 },
255-
badgeContent = {
256-
Text(
257-
"Recommended Very Much",
258-
maxLines = 1,
259-
overflow = TextOverflow.Ellipsis,
260-
)
261-
},
262-
icon = { Icon(painter = Icons.BaggageSet, contentDescription = null) },
263-
title = { Text("Plus Support") },
264-
description = { Text("Everyone sits together") },
265-
price = { Text("+ 10 €") },
266-
largeHeading = false,
267-
)
268-
}
269203
}
270204
}

‎ui/src/androidMain/kotlin/kiwi/orbit/compose/ui/controls/ChoiceTileCentered.kt

-209
This file was deleted.

‎ui/src/androidUnitTest/kotlin/kiwi/orbit/compose/ui/ScreenshotTest.kt

-6
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import kiwi.orbit.compose.ui.controls.ButtonTextLinkPreview
3131
import kiwi.orbit.compose.ui.controls.CardPreview
3232
import kiwi.orbit.compose.ui.controls.CheckboxFieldPreview
3333
import kiwi.orbit.compose.ui.controls.CheckboxPreview
34-
import kiwi.orbit.compose.ui.controls.ChoiceTileCenteredPreview
3534
import kiwi.orbit.compose.ui.controls.ChoiceTilePreview
3635
import kiwi.orbit.compose.ui.controls.CircularProgressIndicatorPreview
3736
import kiwi.orbit.compose.ui.controls.ClickableFieldPreview
@@ -195,11 +194,6 @@ internal class ScreenshotTest {
195194
snapshot { ChoiceTilePreview() }
196195
}
197196

198-
@Test
199-
fun choiceTileCentered() {
200-
snapshot { ChoiceTileCenteredPreview() }
201-
}
202-
203197
@Test
204198
fun circularProgressIndicator() {
205199
snapshot { CircularProgressIndicatorPreview() }

‎ui/src/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_choiceTileCentered.png

-3
This file was deleted.

‎ui/src/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_choiceTileCentered_big.png

-3
This file was deleted.

‎ui/src/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_choiceTileCentered_dark.png

-3
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.