move applications logs to dev settings

app/src/main/java/com/geode/launcher/preferences/DeveloperSettingsActivity.kt

@@ -1,7 +1,12 @@
 package com.geode.launcher.preferences
 
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.content.Intent
 import android.os.Build
 import android.os.Bundle
+import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.OnBackPressedDispatcher
 import androidx.activity.compose.setContent
@@ -32,6 +37,8 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
@@ -40,6 +47,7 @@ import com.geode.launcher.ui.theme.GeodeLauncherTheme
 import com.geode.launcher.ui.theme.LocalTheme
 import com.geode.launcher.ui.theme.Theme
 import com.geode.launcher.utils.LabelledText
+import com.geode.launcher.utils.LaunchUtils
 import com.geode.launcher.utils.PreferenceUtils
 
 class DeveloperSettingsActivity : ComponentActivity() {
@@ -67,6 +75,30 @@ class DeveloperSettingsActivity : ComponentActivity() {
     }
 }
 
+fun onOpenFolder(context: Context) {
+    val file = LaunchUtils.getBaseDirectory(context)
+    val clipboardManager =
+        context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+    clipboardManager.setPrimaryClip(
+        ClipData.newPlainText(
+            context.getString(R.string.export_folder_tag),
+            file.path
+        )
+    )
+    if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) {
+        Toast.makeText(
+            context,
+            context.getString(R.string.text_copied),
+            Toast.LENGTH_SHORT
+        ).show()
+    }
+}
+
+fun onOpenLogs(context: Context) {
+    val launchIntent = Intent(context, ApplicationLogsActivity::class.java)
+    context.startActivity(launchIntent)
+}
+
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun DeveloperSettingsScreen(onBackPressedDispatcher: OnBackPressedDispatcher?) {
@@ -143,6 +175,26 @@ fun DeveloperSettingsScreen(onBackPressedDispatcher: OnBackPressedDispatcher?) {
                     */
                 }
 
+                OptionsGroup(stringResource(R.string.preference_category_developer)) {
+                    val context = LocalContext.current
+                    OptionsButton(
+                        title = stringResource(R.string.preferences_view_logs),
+                        icon = {
+                            Icon(
+                                painterResource(R.drawable.icon_description),
+                                contentDescription = null
+                            )
+                        },
+                        onClick = { onOpenLogs(context) }
+                    )
+
+                    OptionsButton(
+                        title = stringResource(R.string.preferences_copy_external_button),
+                        description = LaunchUtils.getBaseDirectory(context).path,
+                        onClick = { onOpenFolder(context) }
+                    )
+                }
+
                 OptionsGroup(title = stringResource(R.string.preference_category_updater)) {
                     SettingsCard(
                         title = stringResource(R.string.preference_use_index_update_api),

app/src/main/java/com/geode/launcher/preferences/SettingsActivity.kt

@@ -2,8 +2,6 @@ package com.geode.launcher.preferences
 
 import android.app.UiModeManager
 import android.content.ActivityNotFoundException
-import android.content.ClipData
-import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
 import android.os.Build
@@ -88,25 +86,6 @@ class SettingsActivity : ComponentActivity() {
     }
 }
 
-fun onOpenFolder(context: Context) {
-    val file = LaunchUtils.getBaseDirectory(context)
-    val clipboardManager =
-        context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-    clipboardManager.setPrimaryClip(
-        ClipData.newPlainText(
-            context.getString(R.string.export_folder_tag),
-            file.path
-        )
-    )
-    if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) {
-        Toast.makeText(
-            context,
-            context.getString(R.string.text_copied),
-            Toast.LENGTH_SHORT
-        ).show()
-    }
-}
-
 fun onOpenFileManager(context: Context) {
     // future thoughts: Intent.ACTION_VIEW may not work on some devices
     // the "correct" solution is to go through a list of possible intents/applications
@@ -226,11 +205,6 @@ fun updateTheme(context: Context, theme: Int) {
     }
 }
 
-fun onOpenLogs(context: Context) {
-    val launchIntent = Intent(context, ApplicationLogsActivity::class.java)
-    context.startActivity(launchIntent)
-}
-
 fun onOpenDeveloperOptions(context: Context) {
     val launchIntent = Intent(context, DeveloperSettingsActivity::class.java)
     context.startActivity(launchIntent)
@@ -460,29 +434,18 @@ fun SettingsScreen(
                 val developerModeEnabled by PreferenceUtils.useBooleanPreference(PreferenceUtils.Key.DEVELOPER_MODE)
 
                 OptionsGroup(stringResource(R.string.preference_category_developer)) {
-                    OptionsButton(
+                        if (developerModeEnabled) {
-                        title = stringResource(R.string.preferences_view_logs),
+                            OptionsButton(
-                        icon = {
+                                title = stringResource(R.string.preference_open_developer_options),
-                            Icon(painterResource(R.drawable.icon_description), contentDescription = null)
+                                icon = {
-                        },
+                                    Icon(
-                        onClick = { onOpenLogs(context) }
+                                        painterResource(R.drawable.icon_data_object),
-                    )
+                                        contentDescription = null
-
+                                    )
-                    if (developerModeEnabled) {
+                                },
-                        OptionsButton(
+                                onClick = { onOpenDeveloperOptions(context) }
-                            title = stringResource(R.string.preference_open_developer_options),
+                            )
-                            icon = {
+                        }
-                                Icon(painterResource(R.drawable.icon_data_object), contentDescription = null)
-                            },
-                            onClick = { onOpenDeveloperOptions(context) }
-                        )
-                    }
-
-                    OptionsButton(
-                        title = context.getString(R.string.preferences_copy_external_button),
-                        description = LaunchUtils.getBaseDirectory(context).path,
-                        onClick = { onOpenFolder(context) }
-                    )
                 }
 
                 OptionsGroup(stringResource(R.string.preference_category_about)) {