From d8bb6f1671b268791fb094f83a03d7edc2f5959c Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Fri, 30 Oct 2026 18:34:08 +0100 Subject: [PATCH] feat: show changelog after update --- .gitea/workflows/release.yaml | 6 +- .gitignore | 1 + .../de/schanbro/weekfocus/MainActivity.kt | 2 + .../schanbro/weekfocus/screens/AboutScreen.kt | 24 ++++++ .../schanbro/weekfocus/update/ReleaseNotes.kt | 29 +++++++ .../weekfocus/update/WhatsNewHandler.kt | 75 +++++++++++++++++++ app/src/main/res/values-en/strings.xml | 6 ++ app/src/main/res/values/strings.xml | 6 ++ 8 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/de/schanbro/weekfocus/update/ReleaseNotes.kt create mode 100644 app/src/main/java/de/schanbro/weekfocus/update/WhatsNewHandler.kt diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 906da82..cb9d3d3 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -125,7 +125,11 @@ jobs: : > "$NOTES_FILE" fi - if ! grep -q '[^[:space:]]' "$NOTES_FILE"; then + # In die APK einbetten, aber nur, wenn es echte Notes gibt + mkdir -p app/src/main/assets + if grep -q '[^[:space:]]' "$NOTES_FILE"; then + cp "$NOTES_FILE" app/src/main/assets/release_notes.md + else echo "Keine Release-Notes für Version $VERSION vorhanden." > "$NOTES_FILE" fi diff --git a/.gitignore b/.gitignore index 7f59393..ed15d08 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ .externalNativeBuild .cxx local.properties +app/src/main/assets/release_notes.md diff --git a/app/src/main/java/de/schanbro/weekfocus/MainActivity.kt b/app/src/main/java/de/schanbro/weekfocus/MainActivity.kt index 30f8cf4..f707fdd 100644 --- a/app/src/main/java/de/schanbro/weekfocus/MainActivity.kt +++ b/app/src/main/java/de/schanbro/weekfocus/MainActivity.kt @@ -32,6 +32,7 @@ import de.schanbro.weekfocus.settings.ThemeMode import de.schanbro.weekfocus.ui.theme.WeekFocusTheme import de.schanbro.weekfocus.update.NetworkPermissionGate import de.schanbro.weekfocus.update.UpdateHandler +import de.schanbro.weekfocus.update.WhatsNewHandler private object Routes { const val HOME = "home" @@ -55,6 +56,7 @@ class MainActivity : ComponentActivity() { WeekFocusTheme(darkTheme = darkTheme) { MainScreen() + WhatsNewHandler() NetworkPermissionGate { UpdateHandler() } diff --git a/app/src/main/java/de/schanbro/weekfocus/screens/AboutScreen.kt b/app/src/main/java/de/schanbro/weekfocus/screens/AboutScreen.kt index 24ee9ae..e02acce 100644 --- a/app/src/main/java/de/schanbro/weekfocus/screens/AboutScreen.kt +++ b/app/src/main/java/de/schanbro/weekfocus/screens/AboutScreen.kt @@ -7,6 +7,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material3.* import androidx.compose.runtime.Composable +import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -18,7 +19,11 @@ import androidx.compose.ui.unit.dp import de.schanbro.weekfocus.R import de.schanbro.weekfocus.components.ClickRow import de.schanbro.weekfocus.components.SectionTitle +import de.schanbro.weekfocus.update.ReleaseNotes import de.schanbro.weekfocus.update.UpdateChecker +import de.schanbro.weekfocus.update.WhatsNewDialog +import androidx.compose.runtime.getValue +import androidx.compose.runtime.setValue private const val REPO_URL = "https://git.schamagusa.de/robin/WeekFocus" @@ -81,6 +86,25 @@ fun AboutScreen( onClick = { uriHandler.openUri("$REPO_URL/releases") } ) + HorizontalDivider() + + SectionTitle(stringResource(R.string.about_whats_new_section_title)) + + var showNotes by remember { mutableStateOf(false) } + val notes = remember { ReleaseNotes.load(context) } + + if (notes != null) { + ClickRow( + title = stringResource(R.string.about_whats_new_title), + summary = stringResource(R.string.about_whats_new_summary), + onClick = { showNotes = true } + ) + } + + if (showNotes && notes != null) { + WhatsNewDialog(version = version, notes = notes, onDismiss = { showNotes = false }) + } + Spacer(Modifier.height(16.dp)) } } diff --git a/app/src/main/java/de/schanbro/weekfocus/update/ReleaseNotes.kt b/app/src/main/java/de/schanbro/weekfocus/update/ReleaseNotes.kt new file mode 100644 index 0000000..fcb38c0 --- /dev/null +++ b/app/src/main/java/de/schanbro/weekfocus/update/ReleaseNotes.kt @@ -0,0 +1,29 @@ +package de.schanbro.weekfocus.update + +import android.content.Context +import java.io.IOException + +object ReleaseNotes { + + /** Liefert die eingebetteten Notes oder null (z. B. bei lokalen Builds). */ + fun load(context: Context): String? = try { + context.assets.open("release_notes.md") + .bufferedReader().use { it.readText() } + .trim() + .ifEmpty { null } + } catch (e: IOException) { + null + } + + /** Einfache Markdown-Bereinigung für die Anzeige als Text. */ + fun format(markdown: String): String = + markdown.lines() + .joinToString("\n") { line -> + line.trimEnd() + .replace(Regex("^#{1,6}\\s*"), "") + .replace(Regex("^\\s*[-*]\\s+"), "• ") + .replace("**", "") + } + .replace(Regex("\n{3,}"), "\n\n") + .trim() +} \ No newline at end of file diff --git a/app/src/main/java/de/schanbro/weekfocus/update/WhatsNewHandler.kt b/app/src/main/java/de/schanbro/weekfocus/update/WhatsNewHandler.kt new file mode 100644 index 0000000..242aced --- /dev/null +++ b/app/src/main/java/de/schanbro/weekfocus/update/WhatsNewHandler.kt @@ -0,0 +1,75 @@ +package de.schanbro.weekfocus.update + +import android.content.Context +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import de.schanbro.weekfocus.R +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +private const val KEY_LAST_SEEN = "last_seen_version" + +@Composable +fun WhatsNewHandler() { + val context = LocalContext.current + val prefs = remember { + context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE) + } + val current = remember { UpdateChecker.currentVersion(context) } + var notes by remember { mutableStateOf(null) } + + fun markSeen() = prefs.edit().putString(KEY_LAST_SEEN, current).apply() + + LaunchedEffect(Unit) { + val lastSeen = prefs.getString(KEY_LAST_SEEN, null) + + // Erster Start nach Neuinstallation: nichts anzeigen, nur merken + if (lastSeen == null) { + markSeen() + return@LaunchedEffect + } + + if (UpdateChecker.isNewer(current, lastSeen)) { + val loaded = withContext(Dispatchers.IO) { ReleaseNotes.load(context) } + if (loaded != null) notes = loaded else markSeen() + } + } + + notes?.let { + WhatsNewDialog( + version = current, + notes = it, + onDismiss = { + markSeen() + notes = null + } + ) + } +} + +@Composable +fun WhatsNewDialog(version: String, notes: String, onDismiss: () -> Unit) { + AlertDialog( + onDismissRequest = onDismiss, + title = { Text(stringResource(R.string.whats_new_title, version)) }, + text = { + Column(Modifier.verticalScroll(rememberScrollState())) { + Text( + text = ReleaseNotes.format(notes), + style = MaterialTheme.typography.bodyMedium + ) + } + }, + confirmButton = { + TextButton(onClick = onDismiss) { + Text(stringResource(R.string.whats_new_close)) + } + } + ) +} \ No newline at end of file diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index e8a8c12..de09c99 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -64,4 +64,10 @@ Bugs and requests in the issue tracker Releases See all releases and changes + + What’s new in version %1$s + Got it + What’s new + See the changes in this version + Changes \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5f39eb6..2493678 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -71,4 +71,10 @@ Probleme und Wünsche im Issue-Tracker Versionen Alle Releases und Änderungen ansehen + + Neu in Version %1$s + Alles klar + Was ist neu + Änderungen dieser Version ansehen + Änderungen \ No newline at end of file