From 5913dd3920d07bd4a6b0d600f6fb0fdeae558ca3 Mon Sep 17 00:00:00 2001
From: SuperDragonXD <70206496+SuperDragonXD@users.noreply.github.com>
Date: Tue, 9 Jul 2024 20:45:15 +0800
Subject: [PATCH] Fix back button for screens in large screen devices

---
 lawnchair/src/app/lawnchair/backup/ui/CreateBackupScreen.kt     | 2 +-
 lawnchair/src/app/lawnchair/backup/ui/RestoreBackupScreen.kt    | 2 +-
 lawnchair/src/app/lawnchair/ui/preferences/about/About.kt       | 2 +-
 .../ui/preferences/destinations/DebugMenuPreferences.kt         | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lawnchair/src/app/lawnchair/backup/ui/CreateBackupScreen.kt b/lawnchair/src/app/lawnchair/backup/ui/CreateBackupScreen.kt
index add91a3177..5682d0bfb2 100644
--- a/lawnchair/src/app/lawnchair/backup/ui/CreateBackupScreen.kt
+++ b/lawnchair/src/app/lawnchair/backup/ui/CreateBackupScreen.kt
@@ -118,7 +118,7 @@ fun CreateBackupScreen(
     PreferenceLayout(
         label = stringResource(id = R.string.create_backup),
         modifier = modifier,
-        backArrowVisible = LocalIsExpandedScreen.current,
+        backArrowVisible = !LocalIsExpandedScreen.current,
         scrollState = if (isPortrait) null else scrollState,
     ) {
         DisposableEffect(contents, hasLiveWallpaper, hasStoragePermission) {
diff --git a/lawnchair/src/app/lawnchair/backup/ui/RestoreBackupScreen.kt b/lawnchair/src/app/lawnchair/backup/ui/RestoreBackupScreen.kt
index 0c40fe3538..602118fbac 100644
--- a/lawnchair/src/app/lawnchair/backup/ui/RestoreBackupScreen.kt
+++ b/lawnchair/src/app/lawnchair/backup/ui/RestoreBackupScreen.kt
@@ -91,7 +91,7 @@ fun RestoreBackupScreen(
     PreferenceLayout(
         label = stringResource(id = R.string.restore_backup),
         modifier = modifier,
-        backArrowVisible = LocalIsExpandedScreen.current,
+        backArrowVisible = !LocalIsExpandedScreen.current,
         scrollState = if (isPortrait) null else scrollState,
     ) {
         when (uiState) {
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/about/About.kt b/lawnchair/src/app/lawnchair/ui/preferences/about/About.kt
index 266f44629a..bf424d3f74 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/about/About.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/about/About.kt
@@ -216,7 +216,7 @@ fun About(
     PreferenceLayout(
         label = stringResource(id = R.string.about_label),
         modifier = modifier,
-        backArrowVisible = LocalIsExpandedScreen.current,
+        backArrowVisible = !LocalIsExpandedScreen.current,
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         Column(
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/destinations/DebugMenuPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/destinations/DebugMenuPreferences.kt
index 2bb34d5417..8e8d96afc2 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/destinations/DebugMenuPreferences.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/destinations/DebugMenuPreferences.kt
@@ -11,6 +11,7 @@ import app.lawnchair.preferences.getAdapter
 import app.lawnchair.preferences.preferenceManager
 import app.lawnchair.preferences2.PreferenceManager2
 import app.lawnchair.preferences2.preferenceManager2
+import app.lawnchair.ui.preferences.LocalIsExpandedScreen
 import app.lawnchair.ui.preferences.components.controls.ClickablePreference
 import app.lawnchair.ui.preferences.components.controls.MainSwitchPreference
 import app.lawnchair.ui.preferences.components.controls.SwitchPreference
@@ -39,6 +40,7 @@ fun DebugMenuPreferences(
 
     PreferenceLayout(
         label = "Debug menu",
+        backArrowVisible = !LocalIsExpandedScreen.current,
         modifier = modifier,
     ) {
         MainSwitchPreference(adapter = enableDebug, label = "Show debug menu") {