From ad2dc18f004ffc71d8d388ee50163e9a72be1a71 Mon Sep 17 00:00:00 2001 From: David Madl Date: Sat, 30 May 2026 20:11:31 +0200 Subject: [PATCH] ui: relayout settings logout --- .../player/ui/settings/SettingsScreen.kt | 42 +++++++++++-------- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/at/lockstep/player/ui/settings/SettingsScreen.kt b/app/src/main/java/at/lockstep/player/ui/settings/SettingsScreen.kt index 5308e7c..1396217 100644 --- a/app/src/main/java/at/lockstep/player/ui/settings/SettingsScreen.kt +++ b/app/src/main/java/at/lockstep/player/ui/settings/SettingsScreen.kt @@ -107,24 +107,32 @@ fun SettingsScreen( onCheckedChange = { viewModel.setCollectRunData(it) }, ) } - Text( - text = context.getString(R.string.settings_stub_body), - style = MaterialTheme.typography.bodyLarge, - ) - Text( - text = context.getString(R.string.settings_logout_spotify_help), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - Button( - onClick = { viewModel.logoutSpotifyAndRestartOnboarding() }, - colors = - ButtonDefaults.buttonColors( - containerColor = MaterialTheme.colorScheme.errorContainer, - contentColor = MaterialTheme.colorScheme.onErrorContainer, - ), + Column( + modifier = + Modifier + .fillMaxWidth() + .padding(vertical = 8.dp), ) { - Text(text = context.getString(R.string.settings_logout_spotify)) + Text( + text = context.getString(R.string.settings_logout_title), + style = MaterialTheme.typography.titleMedium, + ) + Text( + text = context.getString(R.string.settings_logout_spotify_help), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Button( + modifier = Modifier.padding(top = 12.dp), + onClick = { viewModel.logoutSpotifyAndRestartOnboarding() }, + colors = + ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.errorContainer, + contentColor = MaterialTheme.colorScheme.onErrorContainer, + ), + ) { + Text(text = context.getString(R.string.settings_logout_spotify)) + } } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a9b7a7a..aa50169 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -25,7 +25,7 @@ Tap to play (or pair local MP3s) Settings - More controls will land here in a later milestone. + Logout Sign out of Spotify Clears your stored access token and returns to the welcome steps so you can log in again. Use this if the app gets HTTP 401 from the server. Annotation mode