From 88a068b204098bbc10c06d3056b8e4ae07d32b45 Mon Sep 17 00:00:00 2001
From: M57 <41645758+Hy4ri@users.noreply.github.com>
Date: Mon, 20 Jul 2026 17:43:49 +0300
Subject: [PATCH] Remove redundant logout button from Settings About tab (#641)

Co-authored-by: M57 <Hy4ri@users.noreply.github.com>
---
 .../java/com/m57/hermescontrol/Navigation.kt  |  1 -
 .../ui/settings/SettingsSubPages.kt           |  3 +--
 .../ui/settings/components/AboutSection.kt    | 22 +------------------
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/m57/hermescontrol/Navigation.kt b/app/src/main/java/com/m57/hermescontrol/Navigation.kt
index 6e4d6706..dd5d16b4 100644
--- a/app/src/main/java/com/m57/hermescontrol/Navigation.kt
+++ b/app/src/main/java/com/m57/hermescontrol/Navigation.kt
@@ -158,7 +158,6 @@ private fun appEntryProvider(
     entry<SettingsAbout> {
         SettingsAboutPage(
             onBack = { NavigationController.goBack() },
-            onLogout = { /* handled by caller via goBack fallback */ },
             viewModel = viewModel { SettingsViewModel() },
         )
     }
diff --git a/app/src/main/java/com/m57/hermescontrol/ui/settings/SettingsSubPages.kt b/app/src/main/java/com/m57/hermescontrol/ui/settings/SettingsSubPages.kt
index a385aea5..337f986c 100644
--- a/app/src/main/java/com/m57/hermescontrol/ui/settings/SettingsSubPages.kt
+++ b/app/src/main/java/com/m57/hermescontrol/ui/settings/SettingsSubPages.kt
@@ -229,7 +229,6 @@ internal fun SettingsBehaviorPage(
 @Composable
 internal fun SettingsAboutPage(
     onBack: () -> Unit,
-    onLogout: () -> Unit,
     viewModel: SettingsViewModel = viewModel { SettingsViewModel() },
 ) {
     HermesScaffold(
@@ -245,7 +244,7 @@ internal fun SettingsAboutPage(
                     .padding(horizontal = 16.dp, vertical = 8.dp),
             verticalArrangement = Arrangement.spacedBy(16.dp),
         ) {
-            AboutSection(onLogout = onLogout)
+            AboutSection()
         }
     }
 }
diff --git a/app/src/main/java/com/m57/hermescontrol/ui/settings/components/AboutSection.kt b/app/src/main/java/com/m57/hermescontrol/ui/settings/components/AboutSection.kt
index e7a74dc1..3e0614ce 100644
--- a/app/src/main/java/com/m57/hermescontrol/ui/settings/components/AboutSection.kt
+++ b/app/src/main/java/com/m57/hermescontrol/ui/settings/components/AboutSection.kt
@@ -2,16 +2,11 @@ package com.m57.hermescontrol.ui.settings.components
 
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -23,7 +18,7 @@ import com.m57.hermescontrol.ui.settings.InfoRow
 import com.m57.hermescontrol.ui.settings.SectionCard
 
 @Composable
-internal fun AboutSection(onLogout: () -> Unit) {
+internal fun AboutSection() {
     SectionCard {
         Row(verticalAlignment = Alignment.CenterVertically) {
             Text(
@@ -67,20 +62,5 @@ internal fun AboutSection(onLogout: () -> Unit) {
                     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))
-        }
     }
 }