From 0bb08c7afc26bdd7de8e39cc8dc88e17438d4f79 Mon Sep 17 00:00:00 2001
From: Ushie <ushiekane@gmail.com>
Date: Wed, 3 Jul 2024 01:34:01 +0300
Subject: [PATCH] feat: Improve device information in debugging section

Closes #1977
---
 .../screen/settings/AdvancedSettingsScreen.kt | 26 ++++++++-----------
 app/src/main/res/values/strings.xml           |  4 ++-
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/app/revanced/manager/ui/screen/settings/AdvancedSettingsScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/settings/AdvancedSettingsScreen.kt
index e596ea3e..993fefb5 100644
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/AdvancedSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/AdvancedSettingsScreen.kt
@@ -32,6 +32,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.core.content.getSystemService
 import androidx.lifecycle.viewModelScope
+import app.revanced.manager.BuildConfig
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.ColumnWithScrollbar
@@ -145,22 +146,17 @@ fun AdvancedSettingsScreen(
                 description = R.string.patch_selection_safeguard_description
             )
 
-            GroupHeader(stringResource(R.string.device))
+            GroupHeader(stringResource(R.string.debugging))
             SettingsListItem(
-                headlineContent = stringResource(R.string.device_model),
-                supportingContent = Build.MODEL
-            )
-            SettingsListItem(
-                headlineContent = stringResource(R.string.device_android_version),
-                supportingContent = Build.VERSION.RELEASE
-            )
-            SettingsListItem(
-                headlineContent = stringResource(R.string.device_architectures),
-                supportingContent = Build.SUPPORTED_ABIS.joinToString(", ")
-            )
-            SettingsListItem(
-                headlineContent = stringResource(R.string.device_memory_limit),
-                supportingContent = memoryLimit
+                headlineContent = stringResource(R.string.about_device),
+                supportingContent = """
+                    **Version**: ${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})
+                    **Build type**: ${BuildConfig.BUILD_TYPE}
+                    **Model**: ${Build.MODEL}
+                    **Android version**: ${Build.VERSION.RELEASE} (${Build.VERSION.SDK_INT})
+                    **Supported Archs**: ${Build.SUPPORTED_ABIS.joinToString(", ")}
+                    **Memory limit**: $memoryLimit
+                """.trimIndent()
             )
         }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d9c682d1..48416698 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -165,7 +165,7 @@
     <string name="device_model">Model</string>
     <string name="device_architectures">CPU Architectures</string>
     <string name="device_memory_limit">Memory limits</string>
-    <string name="device_memory_limit_format">Normal: %1$d MB, Large: %2$d MB</string>
+    <string name="device_memory_limit_format">%1$dMB (Normal) - %2$dMB (Large)</string>
     <string name="patch_bundles_section">Patch bundles</string>
     <string name="patch_bundles_redownload">Redownload all patch bundles</string>
     <string name="patch_bundles_reset">Reset patch bundles</string>
@@ -359,4 +359,6 @@
     <string name="remote_bundle_description">Import remote files from a URL, can automatically update</string>
     <string name="recommended">Recommended</string>
     <string name="show">Show</string>
+    <string name="debugging">Debugging</string>
+    <string name="about_device">About device</string>
 </resources>