From 28232a33b40879e57dbeeb9cc513af0b32496bfb Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Tue, 3 Jun 2025 20:01:00 +0200
Subject: [PATCH] more settings stuff
---
.../ui/settings/about/AboutSettingsScreen.kt | 7 +--
.../crashreporter/CrashReportScreen.kt | 49 ++++++++++---------
.../crashreporter/CrashReporterScreen.kt | 6 +--
.../launcher2/ui/settings/log/LogScreen.kt | 21 ++++----
core/i18n/src/main/res/values/strings.xml | 7 ---
5 files changed, 37 insertions(+), 53 deletions(-)
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreen.kt
index 60824920..546a8b72 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreen.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreen.kt
@@ -43,13 +43,8 @@ fun AboutSettingsScreen() {
title = stringResource(R.string.preference_version),
summary = appVersion,
onClick = {
- when(easterEggCounter) {
- 3 -> Toast.makeText(context, context.getString(R.string.easter_egg_1), Toast.LENGTH_SHORT).show()
- 7 -> Toast.makeText(context, context.getString(R.string.easter_egg_2), Toast.LENGTH_SHORT).show()
- 11 -> Toast.makeText(context, context.getString(R.string.easter_egg_3), Toast.LENGTH_SHORT).show()
- }
easterEggCounter++
- if (easterEggCounter >= 14) {
+ if (easterEggCounter >= 9) {
navController?.navigate("settings/about/easteregg")
easterEggCounter = 0
}
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReportScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReportScreen.kt
index a9adc327..69cbfcc8 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReportScreen.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReportScreen.kt
@@ -1,5 +1,6 @@
package de.mm20.launcher2.ui.settings.crashreporter
+import androidx.compose.foundation.background
import androidx.compose.foundation.horizontalScroll
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
@@ -9,12 +10,16 @@ import androidx.compose.foundation.rememberScrollState
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.BugReport
import androidx.compose.material.icons.rounded.Share
-import androidx.compose.material3.*
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
@@ -44,31 +49,26 @@ fun CrashReportScreen(fileName: String) {
}
) {
item {
- Surface(
+ Box(
modifier = Modifier
.fillMaxWidth()
- .padding(8.dp),
- color = if (crashReport?.type == CrashReportType.Crash) {
- MaterialTheme.colorScheme.errorContainer
- } else {
- MaterialTheme.colorScheme.primaryContainer
- },
- shape = MaterialTheme.shapes.small,
+ .clip(MaterialTheme.shapes.medium)
+ .background(MaterialTheme.colorScheme.surface)
+ .horizontalScroll(
+ rememberScrollState()
+ ),
) {
- Box(
- modifier = Modifier
- .fillMaxWidth()
- .horizontalScroll(
- rememberScrollState()
- ),
- ) {
- crashReport?.stacktrace?.let {
- Text(
- text = it,
- modifier = Modifier.padding(16.dp),
- style = MaterialTheme.typography.bodySmall
- )
- }
+ crashReport?.stacktrace?.let {
+ Text(
+ text = it,
+ modifier = Modifier.padding(12.dp),
+ style = MaterialTheme.typography.bodySmall,
+ color = if (crashReport?.type == CrashReportType.Crash) {
+ MaterialTheme.colorScheme.error
+ } else {
+ MaterialTheme.colorScheme.primary
+ },
+ )
}
}
}
@@ -76,7 +76,8 @@ fun CrashReportScreen(fileName: String) {
Column(
modifier = Modifier
.fillMaxWidth()
- .padding(12.dp)
+ .background(MaterialTheme.colorScheme.surface, MaterialTheme.shapes.medium)
+ .padding(12.dp),
) {
Text(text = "Device Information", style = MaterialTheme.typography.titleMedium)
val deviceInformation = remember { viewModel.getDeviceInformation(context) }
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReporterScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReporterScreen.kt
index 35570447..8d288737 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReporterScreen.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReporterScreen.kt
@@ -66,10 +66,8 @@ fun CrashReporterScreen() {
}
}
items(it) {
- OutlinedCard(
- modifier = Modifier
- .padding(vertical = 4.dp, horizontal = 8.dp)
- ,
+ Surface(
+ shape = MaterialTheme.shapes.medium,
) {
Column(
modifier = Modifier
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/log/LogScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/log/LogScreen.kt
index 11056fa7..d6a66ac4 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/log/LogScreen.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/log/LogScreen.kt
@@ -142,27 +142,24 @@ fun LogScreen() {
items(lines) {
if (it is RawLogcatLine) {
Text(
- modifier = Modifier.padding(16.dp),
- text = it.line ?: "",
+ modifier = Modifier
+ .fillMaxWidth()
+ .background(MaterialTheme.colorScheme.surface, MaterialTheme.shapes.medium)
+ .padding(16.dp),
+ text = it.line,
style = MaterialTheme.typography.bodySmall
)
} else if (it is FormattedLogcatLine) {
val contentColor = when (it.level) {
- "E" -> MaterialTheme.colorScheme.onErrorContainer
- "W" -> MaterialTheme.colorScheme.onPrimaryContainer
+ "E" -> MaterialTheme.colorScheme.error
+ "W" -> MaterialTheme.colorScheme.primary
"D" -> MaterialTheme.colorScheme.onSurfaceVariant
else -> MaterialTheme.colorScheme.onSurface
}
- val bgColor = when (it.level) {
- "E" -> MaterialTheme.colorScheme.errorContainer
- "W" -> MaterialTheme.colorScheme.primaryContainer
- "D" -> MaterialTheme.colorScheme.surfaceVariant
- else -> MaterialTheme.colorScheme.surface
- }
Column(
modifier = Modifier
.fillMaxWidth()
- .background(bgColor)
+ .background(MaterialTheme.colorScheme.surface, MaterialTheme.shapes.medium)
.padding(16.dp)
) {
Row(verticalAlignment = Alignment.CenterVertically) {
@@ -187,7 +184,7 @@ fun LogScreen() {
modifier = Modifier.padding(top = 8.dp),
text = it.message,
style = MaterialTheme.typography.bodySmall,
- color = contentColor
+ color = MaterialTheme.colorScheme.onSurface,
)
}
}
diff --git a/core/i18n/src/main/res/values/strings.xml b/core/i18n/src/main/res/values/strings.xml
index 1eb28fae..f093e528 100644
--- a/core/i18n/src/main/res/values/strings.xml
+++ b/core/i18n/src/main/res/values/strings.xml
@@ -239,13 +239,6 @@
Note dismissed.
By %1$s
-
-
- There are no easter eggs here, unless you brought them with you.
-
- Please, stop it, you are wasting your time
-
- I won\'t say it again: there are absolutely no easter eggs hidden here
Well, you found me. Congratulations. Was it worth it\?