Skip to content

Commit d77ee32

Browse files
author
sds100
committed
#49 feat (onboarding): dark arrow buttons and pager indicator
Signed-off-by: sds100 <developer.sds100@gmail.com>
1 parent b287013 commit d77ee32

1 file changed

Lines changed: 12 additions & 11 deletions

File tree

app/src/main/java/com/mapcode/onboarding/OnboardingScreen.kt

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ private fun PageControls(
191191
) {
192192
val scope = rememberCoroutineScope()
193193

194-
val darkBackgroundColor = pageColors(pagerState.currentPage).backgroundDark
194+
val pageColors = pageColors(pagerState.currentPage)
195195

196196
Row(
197197
modifier = modifier,
@@ -205,6 +205,7 @@ private fun PageControls(
205205

206206
PreviousPageButton(
207207
modifier = Modifier.alpha(previousPageButtonAlpha),
208+
color = pageColors.foreground,
208209
onClick = {
209210
scope.launch {
210211
pagerState.animateScrollToPreviousPage()
@@ -215,14 +216,14 @@ private fun PageControls(
215216
HorizontalPagerIndicator(
216217
modifier = Modifier.align(Alignment.CenterVertically),
217218
pagerState = pagerState,
218-
inactiveColor = Color.White,
219-
activeColor = darkBackgroundColor
219+
inactiveColor = pageColors.foreground,
220+
activeColor = pageColors.backgroundDark
220221
)
221222

222223
if (pagerState.isLastPage()) {
223-
DoneButton(onClick = onDoneClick)
224+
DoneButton(color = pageColors.foreground, onClick = onDoneClick)
224225
} else {
225-
NextPageButton {
226+
NextPageButton(color = pageColors.foreground) {
226227
scope.launch {
227228
pagerState.animateScrollToNextPage()
228229
}
@@ -232,34 +233,34 @@ private fun PageControls(
232233
}
233234

234235
@Composable
235-
private fun DoneButton(modifier: Modifier = Modifier, onClick: () -> Unit) {
236+
private fun DoneButton(modifier: Modifier = Modifier, color: Color, onClick: () -> Unit) {
236237
IconButton(modifier = modifier, onClick = onClick) {
237238
Icon(
238239
imageVector = Icons.Outlined.Done,
239240
contentDescription = stringResource(R.string.onboarding_done_content_description),
240-
tint = Color.White
241+
tint = color
241242
)
242243
}
243244
}
244245

245246
@Composable
246-
private fun NextPageButton(modifier: Modifier = Modifier, onClick: () -> Unit) {
247+
private fun NextPageButton(modifier: Modifier = Modifier, color: Color, onClick: () -> Unit) {
247248
IconButton(modifier = modifier, onClick = onClick) {
248249
Icon(
249250
imageVector = Icons.Outlined.ArrowForward,
250251
contentDescription = stringResource(R.string.onboarding_next_page_content_description),
251-
tint = Color.White
252+
tint = color
252253
)
253254
}
254255
}
255256

256257
@Composable
257-
private fun PreviousPageButton(modifier: Modifier = Modifier, onClick: () -> Unit) {
258+
private fun PreviousPageButton(modifier: Modifier = Modifier, color: Color, onClick: () -> Unit) {
258259
IconButton(modifier = modifier, onClick = onClick) {
259260
Icon(
260261
imageVector = Icons.Outlined.ArrowBack,
261262
contentDescription = stringResource(R.string.onboarding_previous_page_content_description),
262-
tint = Color.White
263+
tint = color
263264
)
264265
}
265266
}

0 commit comments

Comments
 (0)