Compare commits
3
Commits
v1.4.1
..
648da0fb37
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
648da0fb37 | ||
|
|
d8bb6f1671 | ||
|
|
168c3eeedc |
No files matched your search
@@ -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
|
||||
|
||||
|
||||
@@ -15,3 +15,4 @@
|
||||
.externalNativeBuild
|
||||
.cxx
|
||||
local.properties
|
||||
app/src/main/assets/release_notes.md
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
**One word. One week. One quality to grow.**
|
||||
|
||||
<a href="https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22de.schanbro.weekfocus%22%2C%22url%22%3A%22https%3A%2F%2Fgit.schamagusa.de%2FSchanbro%2FWeekFocus%22%2C%22author%22%3A%22Schanbro%22%2C%22name%22%3A%22WeekFocus%22%2C%22overrideSource%22%3A%22Codeberg%22%7D">
|
||||
<a href="https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22de.schanbro.weekfocus%22%2C%22url%22%3A%22https%3A%2F%2Fgit.schamagusa.de%2Frobin%2FWeekFocus%22%2C%22author%22%3A%22robin%22%2C%22name%22%3A%22WeekFocus%22%2C%22overrideSource%22%3A%22Codeberg%22%7D">
|
||||
<img src="https://raw.githubusercontent.com/ImranR98/Obtainium/main/assets/graphics/badge_obtainium.png" alt="Get it on Obtainium" height="64">
|
||||
</a>
|
||||
|
||||
[](https://git.schamagusa.de/Schanbro/WeekFocus/releases)
|
||||
[](https://git.schamagusa.de/robin/WeekFocus/releases)
|
||||
[](LICENSE)
|
||||
<!--[](https://weblate.schamagusa.de/engage/weekfocus/)-->
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
|
||||
<!--[](https://git.schamagusa.de/Schanbro/WeekFocus)
|
||||
[](https://git.schamagusa.de/Schanbro/WeekFocus)-->
|
||||
[](https://git.schamagusa.de/Schanbro/WeekFocus/issues)
|
||||
[](https://git.schamagusa.de/Schanbro/WeekFocus)
|
||||
[](https://git.schamagusa.de/robin/WeekFocus/issues)
|
||||
[](https://git.schamagusa.de/robin/WeekFocus)
|
||||
|
||||
</div>
|
||||
|
||||
@@ -82,7 +82,7 @@ https://git.schamagusa.de/Schanbro/WeekFocus
|
||||
|
||||
### Manual APK Install
|
||||
|
||||
1. Open the [Releases](https://git.schamagusa.de/Schanbro/WeekFocus/releases) page.
|
||||
1. Open the [Releases](https://git.schamagusa.de/robin/WeekFocus/releases) page.
|
||||
2. Download the latest `.apk` file.
|
||||
3. If prompted, allow installation from unknown sources, then install the APK.
|
||||
|
||||
|
||||
@@ -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()
|
||||
}
|
||||
|
||||
@@ -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))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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()
|
||||
}
|
||||
@@ -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<String?>(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))
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
@@ -64,4 +64,10 @@
|
||||
<string name="about_issues_summary">Bugs and requests in the issue tracker</string>
|
||||
<string name="about_releases_title">Releases</string>
|
||||
<string name="about_releases_summary">See all releases and changes</string>
|
||||
|
||||
<string name="whats_new_title">What’s new in version %1$s</string>
|
||||
<string name="whats_new_close">Got it</string>
|
||||
<string name="about_whats_new_title">What’s new</string>
|
||||
<string name="about_whats_new_summary">See the changes in this version</string>
|
||||
<string name="about_whats_new_section_title">Changes</string>
|
||||
</resources>
|
||||
@@ -71,4 +71,10 @@
|
||||
<string name="about_issues_summary">Probleme und Wünsche im Issue-Tracker</string>
|
||||
<string name="about_releases_title">Versionen</string>
|
||||
<string name="about_releases_summary">Alle Releases und Änderungen ansehen</string>
|
||||
|
||||
<string name="whats_new_title">Neu in Version %1$s</string>
|
||||
<string name="whats_new_close">Alles klar</string>
|
||||
<string name="about_whats_new_title">Was ist neu</string>
|
||||
<string name="about_whats_new_summary">Änderungen dieser Version ansehen</string>
|
||||
<string name="about_whats_new_section_title">Änderungen</string>
|
||||
</resources>
|
||||
Reference in new issue
Block a user