diff --git a/app/src/main/java/com/m57/hermescontrol/ui/settings/SettingsScreen.kt b/app/src/main/java/com/m57/hermescontrol/ui/settings/SettingsScreen.kt index f22ea339..c729407a 100644 --- a/app/src/main/java/com/m57/hermescontrol/ui/settings/SettingsScreen.kt +++ b/app/src/main/java/com/m57/hermescontrol/ui/settings/SettingsScreen.kt @@ -166,6 +166,20 @@ fun SettingsScreen( ) Spacer(modifier = Modifier.height(16.dp)) + + Button( + onClick = { + viewModel.logout() + onLogout() + }, + modifier = Modifier.fillMaxWidth(), + colors = + ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.error, + ), + ) { + Text(stringResource(R.string.settings_logout)) + } } SettingsTab.BEHAVIOR -> { @@ -252,20 +266,6 @@ fun SettingsScreen( Spacer(modifier = Modifier.height(24.dp)) HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant) Spacer(modifier = Modifier.height(16.dp)) - - Button( - onClick = { - viewModel.logout() - onLogout() - }, - modifier = Modifier.fillMaxWidth(), - colors = - ButtonDefaults.buttonColors( - containerColor = MaterialTheme.colorScheme.error, - ), - ) { - Text(stringResource(R.string.settings_logout)) - } } } } @@ -1166,66 +1166,3 @@ private fun NavBarSection( } } } - -@Composable -private fun AboutSection(onLogout: () -> Unit) { - SectionCard(title = stringResource(R.string.settings_sec_about)) { - Row(verticalAlignment = Alignment.CenterVertically) { - Text( - text = stringResource(R.string.settings_about_app_name), - style = - MaterialTheme.typography.titleMedium.copy( - fontWeight = FontWeight.Bold, - ), - ) - } - - Spacer(modifier = Modifier.height(8.dp)) - HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant) - Spacer(modifier = Modifier.height(8.dp)) - - InfoRow( - label = stringResource(R.string.settings_about_version), - value = "v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})", - ) - InfoRow( - label = stringResource(R.string.settings_about_build), - value = - if (BuildConfig.DEBUG) { - stringResource(R.string.settings_about_debug) - } else { - stringResource(R.string.settings_about_release) - }, - ) - if (BuildConfig.GIT_SHA.isNotBlank()) { - InfoRow( - label = stringResource(R.string.settings_about_commit), - value = BuildConfig.GIT_SHA, - ) - } - - Spacer(modifier = Modifier.height(12.dp)) - Text( - text = "https://github.com/Hy4ri/hermes-mobile", - style = - MaterialTheme.typography.bodySmall.copy( - color = MaterialTheme.colorScheme.primary, - ), - ) - - Spacer(modifier = Modifier.height(24.dp)) - HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant) - Spacer(modifier = Modifier.height(16.dp)) - - Button( - onClick = onLogout, - modifier = Modifier.fillMaxWidth(), - colors = - ButtonDefaults.buttonColors( - containerColor = MaterialTheme.colorScheme.error, - ), - ) { - Text(stringResource(R.string.settings_logout)) - } - } -}