Compare commits
22
Commits
0fcc9ba514
..
v1.4.3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a876465894 | ||
|
|
761ee25642 | ||
|
|
c56ff94a47 | ||
|
|
792047eae4 | ||
|
|
78fd859889 | ||
|
|
b93d23f31c | ||
|
|
648da0fb37 | ||
|
|
d8bb6f1671 | ||
|
|
168c3eeedc | ||
|
|
1f0f556e82 | ||
|
|
2a4b5f54a8 | ||
|
|
31a1f5158f | ||
|
|
3aedc51b97 | ||
|
|
8e88e9601a | ||
|
|
8f65bb05b7 | ||
|
|
6be81093e0 | ||
|
|
1b90010bbc | ||
|
|
ade61c0850 | ||
|
|
e97498a148 | ||
|
|
584ec246d1 | ||
|
|
200b834d1c | ||
|
|
f161db3345 |
No files matched your search
@@ -64,6 +64,51 @@ jobs:
|
||||
echo "$KEYSTORE_BASE64" | base64 -d > "$RUNNER_TEMP/release.keystore"
|
||||
echo "KEYSTORE_PATH=$RUNNER_TEMP/release.keystore" >> $GITHUB_ENV
|
||||
|
||||
- name: Release-Notes aus CHANGELOG.md extrahieren
|
||||
run: |
|
||||
VERSION="${GITHUB_REF_NAME#v}"
|
||||
NOTES_FILE="$RUNNER_TEMP/release_notes.md"
|
||||
|
||||
extract_notes() {
|
||||
awk -v ver="$1" '
|
||||
/^##[[:space:]]/ {
|
||||
if (found) exit
|
||||
line = $0
|
||||
sub(/^##[[:space:]]+/, "", line)
|
||||
sub(/^\[?v?/, "", line)
|
||||
if (substr(line, 1, length(ver)) == ver) {
|
||||
rest = substr(line, length(ver) + 1)
|
||||
if (rest ~ /^([^0-9.]|$)/) { found = 1 }
|
||||
}
|
||||
next
|
||||
}
|
||||
found { print }
|
||||
' CHANGELOG.md
|
||||
}
|
||||
|
||||
if [ -f CHANGELOG.md ]; then
|
||||
extract_notes "$VERSION" > "$NOTES_FILE"
|
||||
|
||||
# Kein eigener Eintrag für die Beta? Dann den der Basisversion nehmen.
|
||||
BASE="${VERSION%%-*}"
|
||||
if ! grep -q '[^[:space:]]' "$NOTES_FILE" && [ "$BASE" != "$VERSION" ]; then
|
||||
extract_notes "$BASE" > "$NOTES_FILE"
|
||||
fi
|
||||
else
|
||||
: > "$NOTES_FILE"
|
||||
fi
|
||||
|
||||
# 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
|
||||
|
||||
echo "Release-Notes:"
|
||||
cat "$NOTES_FILE"
|
||||
|
||||
- name: Android Release APK bauen
|
||||
run: |
|
||||
set -euo pipefail
|
||||
@@ -101,37 +146,6 @@ jobs:
|
||||
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
|
||||
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
|
||||
|
||||
- name: Release-Notes aus CHANGELOG.md extrahieren
|
||||
run: |
|
||||
VERSION="${GITHUB_REF_NAME#v}"
|
||||
NOTES_FILE="$RUNNER_TEMP/release_notes.md"
|
||||
|
||||
if [ -f CHANGELOG.md ]; then
|
||||
awk -v ver="$VERSION" '
|
||||
/^##[[:space:]]/ {
|
||||
if (found) exit
|
||||
line = $0
|
||||
sub(/^##[[:space:]]+/, "", line)
|
||||
sub(/^\[?v?/, "", line)
|
||||
if (substr(line, 1, length(ver)) == ver) {
|
||||
rest = substr(line, length(ver) + 1)
|
||||
if (rest ~ /^([^0-9.]|$)/) { found = 1 }
|
||||
}
|
||||
next
|
||||
}
|
||||
found { print }
|
||||
' CHANGELOG.md > "$NOTES_FILE"
|
||||
else
|
||||
: > "$NOTES_FILE"
|
||||
fi
|
||||
|
||||
if ! grep -q '[^[:space:]]' "$NOTES_FILE"; then
|
||||
echo "Keine Release-Notes für Version $VERSION vorhanden." > "$NOTES_FILE"
|
||||
fi
|
||||
|
||||
echo "Release-Notes:"
|
||||
cat "$NOTES_FILE"
|
||||
|
||||
- name: Release in Gitea erstellen und APK hochladen
|
||||
env:
|
||||
TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
@@ -15,3 +15,4 @@
|
||||
.externalNativeBuild
|
||||
.cxx
|
||||
local.properties
|
||||
app/src/main/assets/release_notes.md
|
||||
+16
-1
@@ -1,6 +1,21 @@
|
||||
# Changelog
|
||||
|
||||
## [1.3.0]
|
||||
## [1.4.2] - 2026-10-30
|
||||
### New
|
||||
* show changelog after update
|
||||
|
||||
## [1.4.1] - 2026-10-30
|
||||
### New
|
||||
* about screen
|
||||
|
||||
## [1.4.0] - 2026-10-30
|
||||
### New
|
||||
* settings
|
||||
|
||||
## [1.3.0] - 2026-10-30
|
||||
### New
|
||||
* auto update
|
||||
|
||||
### Fixed
|
||||
* show app icon on splash screen
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
**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%Schanbro%2FWeekFocus%22%2C%22author%22%3A%Schanbro%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>
|
||||
|
||||
@@ -58,11 +58,11 @@ No streaks, no pressure, no clutter. Just a gentle daily reminder of what you wa
|
||||
|
||||
## Features
|
||||
|
||||
- 🧩 Home screen widget showing your current quality of the week
|
||||
- 🔄 Automatic weekly rotation to a new quality
|
||||
- 🌙 Light and dark theme support
|
||||
- 🔒 No ads, no tracking, no unnecessary permissions
|
||||
- ⚡ Lightweight and battery-friendly
|
||||
- Home screen widget showing your current quality of the week
|
||||
- Automatic weekly rotation to a new quality
|
||||
- Light and dark theme support, Material You
|
||||
- No ads, no tracking, no unnecessary permissions
|
||||
- Lightweight and battery-friendly
|
||||
|
||||
## Installation
|
||||
|
||||
@@ -124,7 +124,7 @@ You can follow the build under **Actions** in the repository. When it finishes,
|
||||
The workflow takes the notes from the section of `CHANGELOG.md` whose heading starts with the version number:
|
||||
|
||||
```markdown
|
||||
## 1.1.3
|
||||
## [1.1.3] - 2026-10-03
|
||||
|
||||
- Added Weblate translations
|
||||
- Fixed widget update at the start of a new week
|
||||
@@ -152,7 +152,8 @@ You are free to use, modify and redistribute this software under the terms of th
|
||||
|
||||
## Translations
|
||||
|
||||
WeekFocus is translated via [Weblate](https://weblate.schamagusa.de/engage/weekfocus/).
|
||||
Help translate the app into your language!
|
||||
~~WeekFocus is translated via [Weblate](https://weblate.schamagusa.de/engage/weekfocus/).
|
||||
Help translate the app into your language!~~
|
||||
<!--[](https://weblate.schamagusa.de/engage/weekfocus/)-->
|
||||
|
||||
[](https://weblate.schamagusa.de/engage/weekfocus/)
|
||||
If you want to contribute with translation you would have to fork this repository, translate into the files directly and make an pull request back to this repository.
|
||||
@@ -95,4 +95,5 @@ dependencies {
|
||||
implementation(libs.androidx.material.icons.extended)
|
||||
implementation("androidx.core:core-splashscreen:1.0.1")
|
||||
implementation("androidx.lifecycle:lifecycle-runtime-compose:2.8.7")
|
||||
implementation("androidx.navigation:navigation-compose:2.8.5")
|
||||
}
|
||||
@@ -5,25 +5,83 @@ import android.os.Bundle
|
||||
import androidx.activity.ComponentActivity
|
||||
import androidx.activity.compose.setContent
|
||||
import androidx.activity.enableEdgeToEdge
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.isSystemInDarkTheme
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.automirrored.filled.ArrowBack
|
||||
import androidx.compose.material.icons.filled.Home
|
||||
import androidx.compose.material.icons.filled.List
|
||||
import androidx.compose.material.icons.filled.Settings
|
||||
import androidx.compose.material.icons.outlined.Home
|
||||
import androidx.compose.material.icons.outlined.List
|
||||
import androidx.compose.material.icons.outlined.Settings
|
||||
import androidx.compose.material3.*
|
||||
import androidx.compose.runtime.*
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.input.nestedscroll.nestedScroll
|
||||
import androidx.compose.ui.graphics.vector.ImageVector
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import de.schanbro.weekfocus.ui.theme.WeekFocusTheme
|
||||
import androidx.navigation.NavGraph.Companion.findStartDestination
|
||||
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
|
||||
import de.schanbro.weekfocus.screens.AboutScreen
|
||||
import de.schanbro.weekfocus.screens.HomeScreen
|
||||
import de.schanbro.weekfocus.screens.SettingsScreen
|
||||
import de.schanbro.weekfocus.screens.WordListScreen
|
||||
import de.schanbro.weekfocus.settings.SettingsRepository
|
||||
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
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.material.icons.automirrored.filled.List
|
||||
import androidx.compose.material.icons.automirrored.outlined.List
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.LargeTopAppBar
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.NavigationBar
|
||||
import androidx.compose.material3.NavigationBarItem
|
||||
import androidx.compose.material3.Scaffold
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TopAppBar
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.navigation.compose.NavHost
|
||||
import androidx.navigation.compose.composable
|
||||
import androidx.navigation.compose.currentBackStackEntryAsState
|
||||
import androidx.navigation.compose.rememberNavController
|
||||
import androidx.compose.material3.TopAppBarDefaults
|
||||
import androidx.compose.ui.input.nestedscroll.nestedScroll
|
||||
|
||||
private object Routes {
|
||||
const val HOME = "home"
|
||||
const val WORDS = "words"
|
||||
const val SETTINGS = "settings"
|
||||
const val ABOUT = "about"
|
||||
}
|
||||
|
||||
private data class Tab(
|
||||
val route: String,
|
||||
val labelRes: Int,
|
||||
val iconSelected: ImageVector,
|
||||
val iconUnselected: ImageVector
|
||||
)
|
||||
|
||||
private val tabs = listOf(
|
||||
Tab(Routes.HOME, R.string.title_home, Icons.Filled.Home, Icons.Outlined.Home),
|
||||
Tab(
|
||||
Routes.WORDS, R.string.title_words,
|
||||
Icons.AutoMirrored.Filled.List, Icons.AutoMirrored.Outlined.List
|
||||
),
|
||||
Tab(Routes.SETTINGS, R.string.title_settings, Icons.Filled.Settings, Icons.Outlined.Settings)
|
||||
)
|
||||
|
||||
/** Titel im Header je Route. Hier bei Bedarf anpassen. */
|
||||
private fun titleFor(route: String?): Int = when (route) {
|
||||
Routes.HOME -> R.string.title_weekly_focus
|
||||
Routes.WORDS -> R.string.title_words
|
||||
Routes.SETTINGS -> R.string.title_settings
|
||||
Routes.ABOUT -> R.string.title_about
|
||||
else -> R.string.app_name
|
||||
}
|
||||
|
||||
class MainActivity : ComponentActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
@@ -31,8 +89,16 @@ class MainActivity : ComponentActivity() {
|
||||
super.onCreate(savedInstanceState)
|
||||
enableEdgeToEdge()
|
||||
setContent {
|
||||
WeekFocusTheme {
|
||||
val settings = remember { SettingsRepository.get(applicationContext) }
|
||||
val darkTheme = when (settings.themeMode) {
|
||||
ThemeMode.SYSTEM -> isSystemInDarkTheme()
|
||||
ThemeMode.LIGHT -> false
|
||||
ThemeMode.DARK -> true
|
||||
}
|
||||
|
||||
WeekFocusTheme(darkTheme = darkTheme) {
|
||||
MainScreen()
|
||||
WhatsNewHandler()
|
||||
NetworkPermissionGate {
|
||||
UpdateHandler()
|
||||
}
|
||||
@@ -42,8 +108,6 @@ class MainActivity : ComponentActivity() {
|
||||
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
// Falls das Widget (z.B. durch Energiesparmodus) nicht rechtzeitig aktualisiert
|
||||
// wurde, wird es beim Öffnen der App nachgezogen.
|
||||
updateWidget(this)
|
||||
}
|
||||
}
|
||||
@@ -51,24 +115,37 @@ class MainActivity : ComponentActivity() {
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun MainScreen() {
|
||||
var selectedTab by remember { mutableIntStateOf(0) }
|
||||
val navController = rememberNavController()
|
||||
val backStackEntry by navController.currentBackStackEntryAsState()
|
||||
val currentRoute = backStackEntry?.destination?.route
|
||||
val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
|
||||
|
||||
fun navigateToTab(route: String) {
|
||||
navController.navigate(route) {
|
||||
popUpTo(navController.graph.findStartDestination().id) {
|
||||
saveState = true
|
||||
}
|
||||
launchSingleTop = true
|
||||
restoreState = true
|
||||
}
|
||||
}
|
||||
|
||||
Scaffold(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.nestedScroll(scrollBehavior.nestedScrollConnection),
|
||||
topBar = {
|
||||
LargeTopAppBar(
|
||||
title = {
|
||||
Text(
|
||||
when (selectedTab) {
|
||||
0 -> stringResource(R.string.title_home)
|
||||
1 -> stringResource(R.string.title_words)
|
||||
2 -> stringResource(R.string.title_settings)
|
||||
else -> stringResource(R.string.app_name)
|
||||
}
|
||||
title = { Text(stringResource(titleFor(currentRoute))) },
|
||||
navigationIcon = {
|
||||
if (currentRoute == Routes.ABOUT) {
|
||||
IconButton(onClick = { navController.popBackStack() }) {
|
||||
Icon(
|
||||
Icons.AutoMirrored.Filled.ArrowBack,
|
||||
contentDescription = stringResource(R.string.action_back)
|
||||
)
|
||||
}
|
||||
}
|
||||
},
|
||||
scrollBehavior = scrollBehavior,
|
||||
colors = TopAppBarDefaults.largeTopAppBarColors(
|
||||
@@ -78,75 +155,43 @@ fun MainScreen() {
|
||||
)
|
||||
},
|
||||
bottomBar = {
|
||||
if (tabs.any { it.route == currentRoute }) {
|
||||
NavigationBar {
|
||||
tabs.forEach { tab ->
|
||||
val selected = currentRoute == tab.route
|
||||
NavigationBarItem(
|
||||
selected = selectedTab == 0,
|
||||
onClick = { selectedTab = 0 },
|
||||
selected = selected,
|
||||
onClick = { navigateToTab(tab.route) },
|
||||
icon = {
|
||||
Icon(
|
||||
imageVector = if (selectedTab == 0) Icons.Filled.Home else Icons.Outlined.Home,
|
||||
contentDescription = stringResource(R.string.title_home)
|
||||
imageVector = if (selected) tab.iconSelected else tab.iconUnselected,
|
||||
contentDescription = null
|
||||
)
|
||||
},
|
||||
label = { Text(stringResource(R.string.title_home)) }
|
||||
)
|
||||
NavigationBarItem(
|
||||
selected = selectedTab == 1,
|
||||
onClick = { selectedTab = 1 },
|
||||
icon = {
|
||||
Icon(
|
||||
imageVector = if (selectedTab == 1) Icons.Filled.List else Icons.Outlined.List,
|
||||
contentDescription = stringResource(R.string.title_words)
|
||||
)
|
||||
},
|
||||
label = { Text(stringResource(R.string.title_words)) }
|
||||
)
|
||||
NavigationBarItem(
|
||||
selected = selectedTab == 2,
|
||||
onClick = { selectedTab = 2 },
|
||||
icon = {
|
||||
Icon(
|
||||
imageVector = if (selectedTab == 2) Icons.Filled.Settings else Icons.Outlined.Settings,
|
||||
contentDescription = stringResource(R.string.title_settings)
|
||||
)
|
||||
},
|
||||
label = { Text(stringResource(R.string.title_settings)) }
|
||||
label = { Text(stringResource(tab.labelRes)) }
|
||||
)
|
||||
}
|
||||
}
|
||||
) { innerPadding ->
|
||||
Surface(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.padding(innerPadding),
|
||||
color = MaterialTheme.colorScheme.background
|
||||
}
|
||||
}
|
||||
) { padding ->
|
||||
NavHost(
|
||||
navController = navController,
|
||||
startDestination = Routes.HOME,
|
||||
modifier = Modifier.padding(padding)
|
||||
) {
|
||||
when (selectedTab) {
|
||||
0 -> PlaceholderScreen(title = stringResource(R.string.title_weekly_focus))
|
||||
1 -> WordListScreen()
|
||||
2 -> PlaceholderScreen(title = stringResource(R.string.title_settings))
|
||||
composable(Routes.HOME) {
|
||||
HomeScreen(onOpenWords = { navigateToTab(Routes.WORDS) })
|
||||
}
|
||||
composable(Routes.WORDS) { WordListScreen() }
|
||||
composable(Routes.SETTINGS) {
|
||||
SettingsScreen(onOpenAbout = { navController.navigate(Routes.ABOUT) })
|
||||
}
|
||||
composable(Routes.ABOUT) { AboutScreen() }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun PlaceholderScreen(title: String) {
|
||||
Box(
|
||||
modifier = Modifier.fillMaxSize(),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Text(
|
||||
text = title,
|
||||
style = MaterialTheme.typography.headlineMedium,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Bleibt als Top-Level-Funktion erhalten, damit WordListScreen unverändert weiter funktioniert.
|
||||
*/
|
||||
fun updateWidget(context: Context) {
|
||||
SimpleWidget.updateAllWidgets(context)
|
||||
}
|
||||
@@ -11,21 +11,18 @@ import android.widget.RemoteViews
|
||||
import java.time.DayOfWeek
|
||||
import java.time.LocalDate
|
||||
import java.time.ZoneId
|
||||
import java.time.temporal.ChronoUnit
|
||||
import java.time.temporal.IsoFields
|
||||
import java.time.temporal.TemporalAdjusters
|
||||
|
||||
class SimpleWidget : AppWidgetProvider() {
|
||||
|
||||
override fun onReceive(context: Context, intent: Intent) {
|
||||
// Verarbeitet u.a. APPWIDGET_UPDATE / ENABLED / DISABLED und ruft die Callbacks unten auf
|
||||
super.onReceive(context, intent)
|
||||
|
||||
when (intent.action) {
|
||||
ACTION_WEEK_CHANGED,
|
||||
Intent.ACTION_BOOT_COMPLETED, // Alarme überleben keinen Neustart
|
||||
Intent.ACTION_BOOT_COMPLETED,
|
||||
Intent.ACTION_DATE_CHANGED,
|
||||
Intent.ACTION_TIME_CHANGED, // "android.intent.action.TIME_SET"
|
||||
Intent.ACTION_TIME_CHANGED,
|
||||
Intent.ACTION_TIMEZONE_CHANGED -> updateAllWidgets(context)
|
||||
}
|
||||
}
|
||||
@@ -38,17 +35,14 @@ class SimpleWidget : AppWidgetProvider() {
|
||||
for (appWidgetId in appWidgetIds) {
|
||||
updateAppWidget(context, appWidgetManager, appWidgetId)
|
||||
}
|
||||
// Selbstheilung: stellt sicher, dass immer ein Wochenwechsel-Alarm existiert
|
||||
scheduleNextWeekChange(context)
|
||||
}
|
||||
|
||||
override fun onEnabled(context: Context) {
|
||||
// Erstes Widget wurde platziert
|
||||
scheduleNextWeekChange(context)
|
||||
}
|
||||
|
||||
override fun onDisabled(context: Context) {
|
||||
// Letztes Widget wurde entfernt
|
||||
cancelWeekChange(context)
|
||||
}
|
||||
|
||||
@@ -56,7 +50,6 @@ class SimpleWidget : AppWidgetProvider() {
|
||||
const val ACTION_WEEK_CHANGED = "de.schanbro.weekfocus.ACTION_WEEK_CHANGED"
|
||||
|
||||
private const val PREFS_NAME = "WeekFocusPrefs"
|
||||
private const val KEY_WORDS = "words_key"
|
||||
private const val KEY_WEEK = "current_week_key"
|
||||
private const val KEY_WORD = "current_word"
|
||||
|
||||
@@ -90,63 +83,50 @@ class SimpleWidget : AppWidgetProvider() {
|
||||
}
|
||||
|
||||
/**
|
||||
* ISO-Kalenderwoche (Montag = Wochenbeginn, unabhängig von der Geräte-Locale)
|
||||
* kombiniert mit dem zugehörigen Wochenjahr, z.B. 202641.
|
||||
*
|
||||
* Das Wochenjahr (nicht das Kalenderjahr!) verhindert, dass sich der Wert
|
||||
* um Neujahr mitten in der Woche ändert.
|
||||
*/
|
||||
internal fun weekKeyFor(date: LocalDate): Int {
|
||||
val weekBasedYear = date.get(IsoFields.WEEK_BASED_YEAR)
|
||||
val week = date.get(IsoFields.WEEK_OF_WEEK_BASED_YEAR)
|
||||
return weekBasedYear * 100 + week
|
||||
}
|
||||
|
||||
/**
|
||||
* Liefert das Wort der aktuellen Woche.
|
||||
*
|
||||
* - Die Liste wird sortiert, damit die Reihenfolge deterministisch ist
|
||||
* (ein Set hat keine garantierte Reihenfolge).
|
||||
* - Das gewählte Wort wird pro Woche gespeichert. Dadurch ändert sich das Wort
|
||||
* nicht, wenn Wörter hinzugefügt oder gelöscht werden. Nur wenn das aktuelle
|
||||
* Wort selbst gelöscht wird, wird neu gewählt.
|
||||
* Holt das Wort für die aktuelle Woche unter Verwendung von WordOfWeek
|
||||
* und speichert es persistent ab, solange sich die Woche nicht ändert.
|
||||
*/
|
||||
private fun resolveWordOfWeek(context: Context): String? {
|
||||
val prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
|
||||
val words = (prefs.getStringSet(KEY_WORDS, emptySet()) ?: emptySet()).sorted()
|
||||
// Wörter sortiert laden, damit die Reihenfolge deterministisch bleibt
|
||||
val words = WordOfWeek.loadWords(context).sorted()
|
||||
|
||||
if (words.isEmpty()) {
|
||||
prefs.edit().remove(KEY_WEEK).remove(KEY_WORD).apply()
|
||||
context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
|
||||
.edit().remove(KEY_WEEK).remove(KEY_WORD).apply()
|
||||
return null
|
||||
}
|
||||
|
||||
val weekKey = weekKeyFor(LocalDate.now())
|
||||
val currentWeek = WordOfWeek.weekOf(0)
|
||||
val weekKey = currentWeek.weekYear * 100 + currentWeek.weekNumber
|
||||
|
||||
val prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
|
||||
val storedWord = prefs.getString(KEY_WORD, null)
|
||||
|
||||
// Wenn die gespeicherte Woche passt und das gespeicherte Wort noch in der Liste existiert: behalten
|
||||
if (prefs.getInt(KEY_WEEK, -1) == weekKey && storedWord != null && storedWord in words) {
|
||||
return storedWord
|
||||
}
|
||||
|
||||
val currentMonday = LocalDate.now().with(DayOfWeek.MONDAY)
|
||||
val weeksSinceEpoch = ChronoUnit.WEEKS.between(LocalDate.ofEpochDay(4), currentMonday) // 5.1.1970 war ein Montag
|
||||
val word = words[(weeksSinceEpoch % words.size).toInt()]
|
||||
// Ansonsten neu über WordOfWeek bestimmen
|
||||
val newWord = WordOfWeek.wordFor(words, currentWeek) ?: return null
|
||||
|
||||
// Speichern für den Rest der Woche
|
||||
prefs.edit()
|
||||
.putInt(KEY_WEEK, weekKey)
|
||||
.putString(KEY_WORD, word)
|
||||
.putString(KEY_WORD, newWord)
|
||||
.apply()
|
||||
return word
|
||||
|
||||
return newWord
|
||||
}
|
||||
|
||||
/**
|
||||
* Plant einen Alarm für den nächsten Montag, 00:00 Uhr (lokale Zeit).
|
||||
* Bewusst ohne Exact-Alarm-Berechtigung: Eine Verzögerung von wenigen Minuten
|
||||
* ist für ein Wochenwort unkritisch.
|
||||
*/
|
||||
private fun scheduleNextWeekChange(context: Context) {
|
||||
val alarmManager = context.getSystemService(AlarmManager::class.java) ?: return
|
||||
|
||||
val triggerAtMillis = LocalDate.now()
|
||||
.with(TemporalAdjusters.next(DayOfWeek.MONDAY)) // "next" schließt heute aus
|
||||
.with(TemporalAdjusters.next(DayOfWeek.MONDAY))
|
||||
.atStartOfDay(ZoneId.systemDefault())
|
||||
.toInstant()
|
||||
.toEpochMilli()
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
package de.schanbro.weekfocus
|
||||
|
||||
import android.content.Context
|
||||
import java.time.DayOfWeek
|
||||
import java.time.LocalDate
|
||||
import java.time.temporal.IsoFields
|
||||
import java.util.Random
|
||||
|
||||
data class WeekInfo(val monday: LocalDate) {
|
||||
val sunday: LocalDate get() = monday.plusDays(6)
|
||||
val weekNumber: Int get() = monday.get(IsoFields.WEEK_OF_WEEK_BASED_YEAR)
|
||||
val weekYear: Int get() = monday.get(IsoFields.WEEK_BASED_YEAR)
|
||||
}
|
||||
|
||||
object WordOfWeek {
|
||||
|
||||
fun loadWords(context: Context): List<String> =
|
||||
context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE)
|
||||
.getStringSet("words_key", emptySet())
|
||||
?.toList()
|
||||
.orEmpty()
|
||||
|
||||
/** offset 0 = diese Woche, -1 = letzte, 1 = nächste ... */
|
||||
fun weekOf(offset: Int = 0, today: LocalDate = LocalDate.now()): WeekInfo =
|
||||
WeekInfo(today.with(DayOfWeek.MONDAY).plusWeeks(offset.toLong()))
|
||||
|
||||
fun wordFor(words: List<String>, week: WeekInfo): String? {
|
||||
if (words.isEmpty()) return null
|
||||
val seed = (week.weekYear * 100 + week.weekNumber).toLong()
|
||||
return words[Random(seed).nextInt(words.size)]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,58 @@
|
||||
package de.schanbro.weekfocus.components
|
||||
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.selection.toggleable
|
||||
import androidx.compose.material3.ListItem
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Switch
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.semantics.Role
|
||||
import androidx.compose.ui.unit.dp
|
||||
|
||||
@Composable
|
||||
internal fun SectionTitle(text: String) {
|
||||
Text(
|
||||
text = text,
|
||||
style = MaterialTheme.typography.labelLarge,
|
||||
color = MaterialTheme.colorScheme.primary,
|
||||
modifier = Modifier.padding(start = 16.dp, end = 16.dp, top = 16.dp, bottom = 4.dp)
|
||||
)
|
||||
}
|
||||
|
||||
@Composable
|
||||
internal fun SwitchRow(
|
||||
title: String,
|
||||
summary: String,
|
||||
checked: Boolean,
|
||||
onCheckedChange: (Boolean) -> Unit
|
||||
) {
|
||||
ListItem(
|
||||
headlineContent = { Text(title) },
|
||||
supportingContent = { Text(summary) },
|
||||
trailingContent = { Switch(checked = checked, onCheckedChange = null) },
|
||||
// Die ganze Zeile ist klickbar, der Switch selbst nur Anzeige (gut für TalkBack)
|
||||
modifier = Modifier.toggleable(
|
||||
value = checked,
|
||||
role = Role.Switch,
|
||||
onValueChange = onCheckedChange
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
@Composable
|
||||
internal fun ClickRow(
|
||||
title: String,
|
||||
summary: String,
|
||||
onClick: () -> Unit,
|
||||
trailing: (@Composable () -> Unit)? = null
|
||||
) {
|
||||
ListItem(
|
||||
headlineContent = { Text(title) },
|
||||
supportingContent = { Text(summary) },
|
||||
trailingContent = trailing,
|
||||
modifier = Modifier.clickable(onClick = onClick)
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,111 @@
|
||||
package de.schanbro.weekfocus.screens
|
||||
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
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
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.platform.LocalUriHandler
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
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"
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun AboutScreen(
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
val context = LocalContext.current
|
||||
val uriHandler = LocalUriHandler.current
|
||||
val version = remember { UpdateChecker.currentVersion(context) }
|
||||
|
||||
Column(modifier = modifier.fillMaxSize()) {
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.verticalScroll(rememberScrollState())
|
||||
) {
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(horizontal = 24.dp, vertical = 32.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
Text(
|
||||
text = stringResource(R.string.app_name),
|
||||
style = MaterialTheme.typography.headlineMedium
|
||||
)
|
||||
Spacer(Modifier.height(4.dp))
|
||||
Text(
|
||||
text = stringResource(R.string.about_version, version),
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant
|
||||
)
|
||||
Spacer(Modifier.height(16.dp))
|
||||
Text(
|
||||
text = stringResource(R.string.about_description),
|
||||
style = MaterialTheme.typography.bodyLarge,
|
||||
textAlign = TextAlign.Center
|
||||
)
|
||||
}
|
||||
|
||||
HorizontalDivider()
|
||||
|
||||
SectionTitle(stringResource(R.string.about_section_links))
|
||||
|
||||
ClickRow(
|
||||
title = stringResource(R.string.settings_source_title),
|
||||
summary = stringResource(R.string.settings_source_summary),
|
||||
onClick = { uriHandler.openUri(REPO_URL) }
|
||||
)
|
||||
ClickRow(
|
||||
title = stringResource(R.string.about_issues_title),
|
||||
summary = stringResource(R.string.about_issues_summary),
|
||||
onClick = { uriHandler.openUri("$REPO_URL/issues") }
|
||||
)
|
||||
ClickRow(
|
||||
title = stringResource(R.string.about_releases_title),
|
||||
summary = stringResource(R.string.about_releases_summary),
|
||||
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,328 @@
|
||||
package de.schanbro.weekfocus.screens
|
||||
|
||||
import android.appwidget.AppWidgetManager
|
||||
import android.content.ComponentName
|
||||
import android.content.Context
|
||||
import android.text.format.DateUtils
|
||||
import androidx.compose.animation.AnimatedContent
|
||||
import androidx.compose.animation.fadeIn
|
||||
import androidx.compose.animation.fadeOut
|
||||
import androidx.compose.animation.slideInHorizontally
|
||||
import androidx.compose.animation.slideOutHorizontally
|
||||
import androidx.compose.animation.togetherWith
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowLeft
|
||||
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
|
||||
import androidx.compose.material.icons.filled.Check
|
||||
import androidx.compose.material3.*
|
||||
import androidx.compose.runtime.*
|
||||
import androidx.compose.runtime.saveable.rememberSaveable
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.hapticfeedback.HapticFeedbackType
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.platform.LocalHapticFeedback
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.lifecycle.Lifecycle
|
||||
import androidx.lifecycle.compose.LifecycleEventEffect
|
||||
import de.schanbro.weekfocus.R
|
||||
import de.schanbro.weekfocus.SimpleWidget
|
||||
import de.schanbro.weekfocus.WeekInfo
|
||||
import de.schanbro.weekfocus.WordOfWeek
|
||||
import java.time.LocalDate
|
||||
import java.time.ZoneId
|
||||
|
||||
@Composable
|
||||
fun HomeScreen(
|
||||
onOpenWords: () -> Unit,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
val context = LocalContext.current
|
||||
val haptic = LocalHapticFeedback.current
|
||||
|
||||
var words by remember { mutableStateOf(WordOfWeek.loadWords(context)) }
|
||||
var widgetPlaced by remember { mutableStateOf(true) } // true = kein Flackern beim Start
|
||||
var weekOffset by rememberSaveable { mutableIntStateOf(0) }
|
||||
val canPinWidget = remember {
|
||||
AppWidgetManager.getInstance(context).isRequestPinAppWidgetSupported
|
||||
}
|
||||
|
||||
// Beim Zurückkehren (Wörter-Tab, Launcher, Widget) neu laden
|
||||
LifecycleEventEffect(Lifecycle.Event.ON_RESUME) {
|
||||
words = WordOfWeek.loadWords(context)
|
||||
widgetPlaced = isWidgetPlaced(context)
|
||||
}
|
||||
|
||||
fun changeOffset(new: Int) {
|
||||
haptic.performHapticFeedback(HapticFeedbackType.TextHandleMove)
|
||||
weekOffset = new
|
||||
}
|
||||
|
||||
Column(
|
||||
modifier = modifier
|
||||
.fillMaxSize()
|
||||
.verticalScroll(rememberScrollState())
|
||||
.padding(horizontal = 16.dp, vertical = 8.dp),
|
||||
verticalArrangement = Arrangement.spacedBy(16.dp)
|
||||
) {
|
||||
if (words.isEmpty()) {
|
||||
EmptyCard(onOpenWords)
|
||||
} else {
|
||||
WordHeroCard(words, weekOffset, ::changeOffset)
|
||||
WeeksCard(words, weekOffset, ::changeOffset)
|
||||
}
|
||||
|
||||
if (!widgetPlaced && canPinWidget) {
|
||||
WidgetCard(
|
||||
onAdd = {
|
||||
AppWidgetManager.getInstance(context).requestPinAppWidget(
|
||||
ComponentName(context, SimpleWidget::class.java), null, null
|
||||
)
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(Modifier.height(8.dp))
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun WordHeroCard(
|
||||
words: List<String>,
|
||||
weekOffset: Int,
|
||||
onOffsetChange: (Int) -> Unit
|
||||
) {
|
||||
val context = LocalContext.current
|
||||
val week = WordOfWeek.weekOf(weekOffset)
|
||||
val onColor = MaterialTheme.colorScheme.onPrimaryContainer
|
||||
|
||||
Card(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
shape = MaterialTheme.shapes.extraLarge,
|
||||
colors = CardDefaults.cardColors(
|
||||
containerColor = MaterialTheme.colorScheme.primaryContainer,
|
||||
contentColor = onColor
|
||||
)
|
||||
) {
|
||||
Column(
|
||||
modifier = Modifier.padding(16.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
IconButton(onClick = { onOffsetChange(weekOffset - 1) }) {
|
||||
Icon(
|
||||
Icons.AutoMirrored.Filled.KeyboardArrowLeft,
|
||||
contentDescription = stringResource(R.string.home_cd_previous)
|
||||
)
|
||||
}
|
||||
Column(
|
||||
modifier = Modifier.weight(1f),
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
Text(
|
||||
text = weekLabel(weekOffset, week),
|
||||
style = MaterialTheme.typography.labelLarge
|
||||
)
|
||||
Text(
|
||||
text = stringResource(
|
||||
R.string.home_week_range,
|
||||
week.weekNumber,
|
||||
formatRange(context, week)
|
||||
),
|
||||
style = MaterialTheme.typography.bodySmall
|
||||
)
|
||||
}
|
||||
IconButton(onClick = { onOffsetChange(weekOffset + 1) }) {
|
||||
Icon(
|
||||
Icons.AutoMirrored.Filled.KeyboardArrowRight,
|
||||
contentDescription = stringResource(R.string.home_cd_next)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
AnimatedContent(
|
||||
targetState = weekOffset,
|
||||
transitionSpec = {
|
||||
val dir = if (targetState > initialState) 1 else -1
|
||||
(slideInHorizontally { width -> width * dir } + fadeIn()) togetherWith
|
||||
(slideOutHorizontally { width -> -width * dir } + fadeOut())
|
||||
},
|
||||
label = "word"
|
||||
) { offset ->
|
||||
Text(
|
||||
text = WordOfWeek.wordFor(words, WordOfWeek.weekOf(offset)).orEmpty(),
|
||||
style = MaterialTheme.typography.displaySmall,
|
||||
fontWeight = FontWeight.Bold,
|
||||
textAlign = TextAlign.Center,
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(vertical = 32.dp, horizontal = 8.dp)
|
||||
)
|
||||
}
|
||||
|
||||
if (weekOffset == 0) {
|
||||
val day = remember { LocalDate.now().dayOfWeek.value } // 1 = Mo ... 7 = So
|
||||
LinearProgressIndicator(
|
||||
progress = { day / 7f },
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
color = onColor,
|
||||
trackColor = onColor.copy(alpha = 0.15f)
|
||||
)
|
||||
Spacer(Modifier.height(8.dp))
|
||||
Text(
|
||||
text = stringResource(R.string.home_day_progress, day),
|
||||
style = MaterialTheme.typography.bodySmall
|
||||
)
|
||||
} else {
|
||||
FilledTonalButton(onClick = { onOffsetChange(0) }) {
|
||||
Text(stringResource(R.string.home_back_to_current))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun WeeksCard(
|
||||
words: List<String>,
|
||||
selectedOffset: Int,
|
||||
onOffsetChange: (Int) -> Unit
|
||||
) {
|
||||
val context = LocalContext.current
|
||||
|
||||
Column {
|
||||
Text(
|
||||
text = stringResource(R.string.home_more_weeks),
|
||||
style = MaterialTheme.typography.labelLarge,
|
||||
color = MaterialTheme.colorScheme.primary,
|
||||
modifier = Modifier.padding(start = 4.dp, bottom = 8.dp)
|
||||
)
|
||||
Card(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
shape = MaterialTheme.shapes.large,
|
||||
colors = CardDefaults.cardColors(
|
||||
containerColor = MaterialTheme.colorScheme.surfaceContainerLow
|
||||
)
|
||||
) {
|
||||
listOf(-2, -1, 0, 1, 2, 3).forEach { offset ->
|
||||
val week = WordOfWeek.weekOf(offset)
|
||||
ListItem(
|
||||
overlineContent = {
|
||||
Text(
|
||||
stringResource(
|
||||
R.string.home_week_range,
|
||||
week.weekNumber,
|
||||
formatRange(context, week)
|
||||
)
|
||||
)
|
||||
},
|
||||
headlineContent = {
|
||||
Text(WordOfWeek.wordFor(words, week).orEmpty())
|
||||
},
|
||||
trailingContent = {
|
||||
if (offset == selectedOffset) {
|
||||
Icon(Icons.Default.Check, contentDescription = null)
|
||||
}
|
||||
},
|
||||
colors = ListItemDefaults.colors(containerColor = Color.Transparent),
|
||||
modifier = Modifier.clickable { onOffsetChange(offset) }
|
||||
)
|
||||
}
|
||||
}
|
||||
Text(
|
||||
text = stringResource(R.string.home_preview_hint),
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
modifier = Modifier.padding(start = 4.dp, top = 8.dp)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun EmptyCard(onOpenWords: () -> Unit) {
|
||||
Card(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
shape = MaterialTheme.shapes.extraLarge,
|
||||
colors = CardDefaults.cardColors(
|
||||
containerColor = MaterialTheme.colorScheme.surfaceContainerLow
|
||||
)
|
||||
) {
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(24.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
verticalArrangement = Arrangement.spacedBy(16.dp)
|
||||
) {
|
||||
Text(
|
||||
text = stringResource(R.string.msg_no_words_yet),
|
||||
style = MaterialTheme.typography.bodyLarge,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant
|
||||
)
|
||||
Button(onClick = onOpenWords) {
|
||||
Text(stringResource(R.string.hint_add_word))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun WidgetCard(onAdd: () -> Unit) {
|
||||
Card(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
shape = MaterialTheme.shapes.large,
|
||||
colors = CardDefaults.cardColors(
|
||||
containerColor = MaterialTheme.colorScheme.secondaryContainer,
|
||||
contentColor = MaterialTheme.colorScheme.onSecondaryContainer
|
||||
)
|
||||
) {
|
||||
Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) {
|
||||
Text(
|
||||
text = stringResource(R.string.home_widget_title),
|
||||
style = MaterialTheme.typography.titleMedium
|
||||
)
|
||||
Text(
|
||||
text = stringResource(R.string.home_widget_message),
|
||||
style = MaterialTheme.typography.bodyMedium
|
||||
)
|
||||
Spacer(Modifier.height(8.dp))
|
||||
FilledTonalButton(onClick = onAdd) {
|
||||
Text(stringResource(R.string.home_widget_action))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun weekLabel(offset: Int, week: WeekInfo): String = when (offset) {
|
||||
0 -> stringResource(R.string.home_this_week)
|
||||
1 -> stringResource(R.string.home_next_week)
|
||||
-1 -> stringResource(R.string.home_last_week)
|
||||
else -> stringResource(R.string.home_calendar_week, week.weekNumber)
|
||||
}
|
||||
|
||||
private fun formatRange(context: Context, week: WeekInfo): String {
|
||||
val zone = ZoneId.systemDefault()
|
||||
val start = week.monday.atStartOfDay(zone).toInstant().toEpochMilli()
|
||||
val end = week.sunday.atStartOfDay(zone).toInstant().toEpochMilli()
|
||||
return DateUtils.formatDateRange(
|
||||
context, start, end,
|
||||
DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_ABBREV_MONTH or DateUtils.FORMAT_NO_YEAR
|
||||
)
|
||||
}
|
||||
|
||||
private fun isWidgetPlaced(context: Context): Boolean =
|
||||
AppWidgetManager.getInstance(context)
|
||||
.getAppWidgetIds(ComponentName(context, SimpleWidget::class.java))
|
||||
.isNotEmpty()
|
||||
@@ -0,0 +1,192 @@
|
||||
package de.schanbro.weekfocus.screens
|
||||
|
||||
import android.content.Intent
|
||||
import android.net.Uri
|
||||
import android.os.Build
|
||||
import android.provider.Settings
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.selection.toggleable
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material3.*
|
||||
import androidx.compose.runtime.*
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.hapticfeedback.HapticFeedbackType
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.platform.LocalHapticFeedback
|
||||
import androidx.compose.ui.platform.LocalUriHandler
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.semantics.Role
|
||||
import androidx.compose.ui.unit.dp
|
||||
import de.schanbro.weekfocus.R
|
||||
import de.schanbro.weekfocus.settings.SettingsRepository
|
||||
import de.schanbro.weekfocus.settings.ThemeMode
|
||||
import de.schanbro.weekfocus.update.ReleaseInfo
|
||||
import de.schanbro.weekfocus.update.UpdateChecker
|
||||
import de.schanbro.weekfocus.update.UpdateDialog
|
||||
import kotlinx.coroutines.launch
|
||||
import de.schanbro.weekfocus.components.SectionTitle
|
||||
import de.schanbro.weekfocus.components.ClickRow
|
||||
import de.schanbro.weekfocus.components.SwitchRow
|
||||
|
||||
private const val REPO_URL = "https://git.schamagusa.de/robin/WeekFocus"
|
||||
|
||||
private enum class CheckStatus { IDLE, CHECKING, UP_TO_DATE, FAILED, AVAILABLE }
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun SettingsScreen(
|
||||
modifier: Modifier = Modifier,
|
||||
onOpenAbout: () -> Unit
|
||||
) {
|
||||
val context = LocalContext.current
|
||||
val settings = remember { SettingsRepository.get(context) }
|
||||
val haptic = LocalHapticFeedback.current
|
||||
val uriHandler = LocalUriHandler.current
|
||||
val scope = rememberCoroutineScope()
|
||||
|
||||
val currentVersion = remember { UpdateChecker.currentVersion(context) }
|
||||
var status by remember { mutableStateOf(CheckStatus.IDLE) }
|
||||
var availableRelease by remember { mutableStateOf<ReleaseInfo?>(null) }
|
||||
|
||||
fun checkNow() {
|
||||
if (status == CheckStatus.CHECKING) return
|
||||
status = CheckStatus.CHECKING
|
||||
scope.launch {
|
||||
val latest = UpdateChecker.fetchLatestRelease(settings.includePrereleases)
|
||||
status = when {
|
||||
latest == null -> CheckStatus.FAILED
|
||||
UpdateChecker.isNewer(latest.version, currentVersion) -> {
|
||||
availableRelease = latest
|
||||
CheckStatus.AVAILABLE
|
||||
}
|
||||
else -> CheckStatus.UP_TO_DATE
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Column(
|
||||
modifier = modifier
|
||||
.fillMaxSize()
|
||||
.verticalScroll(rememberScrollState())
|
||||
) {
|
||||
// ---------- Updates ----------
|
||||
SectionTitle(stringResource(R.string.settings_section_updates))
|
||||
|
||||
SwitchRow(
|
||||
title = stringResource(R.string.settings_auto_update_title),
|
||||
summary = stringResource(R.string.settings_auto_update_summary),
|
||||
checked = settings.autoCheckUpdates,
|
||||
onCheckedChange = {
|
||||
haptic.performHapticFeedback(
|
||||
if (it) HapticFeedbackType.ToggleOn else HapticFeedbackType.ToggleOff
|
||||
)
|
||||
settings.updateAutoCheckUpdates(it)
|
||||
}
|
||||
)
|
||||
|
||||
SwitchRow(
|
||||
title = stringResource(R.string.settings_prerelease_title),
|
||||
summary = stringResource(R.string.settings_prerelease_summary),
|
||||
checked = settings.includePrereleases,
|
||||
onCheckedChange = {
|
||||
haptic.performHapticFeedback(
|
||||
if (it) HapticFeedbackType.ToggleOn else HapticFeedbackType.ToggleOff
|
||||
)
|
||||
settings.updateIncludePrereleases(it)
|
||||
}
|
||||
)
|
||||
|
||||
ClickRow(
|
||||
title = stringResource(R.string.settings_check_now_title),
|
||||
summary = when (status) {
|
||||
CheckStatus.IDLE -> stringResource(R.string.settings_check_idle, currentVersion)
|
||||
CheckStatus.CHECKING -> stringResource(R.string.settings_check_checking)
|
||||
CheckStatus.UP_TO_DATE -> stringResource(R.string.settings_check_up_to_date)
|
||||
CheckStatus.FAILED -> stringResource(R.string.settings_check_failed)
|
||||
CheckStatus.AVAILABLE -> stringResource(R.string.settings_check_available)
|
||||
},
|
||||
onClick = { checkNow() },
|
||||
trailing = {
|
||||
if (status == CheckStatus.CHECKING) {
|
||||
CircularProgressIndicator(
|
||||
modifier = Modifier.size(24.dp),
|
||||
strokeWidth = 3.dp
|
||||
)
|
||||
}
|
||||
}
|
||||
)
|
||||
|
||||
HorizontalDivider(Modifier.padding(vertical = 8.dp))
|
||||
|
||||
// ---------- Darstellung ----------
|
||||
SectionTitle(stringResource(R.string.settings_section_appearance))
|
||||
|
||||
ListItem(headlineContent = { Text(stringResource(R.string.settings_theme_title)) })
|
||||
val modes = listOf(
|
||||
ThemeMode.SYSTEM to R.string.settings_theme_system,
|
||||
ThemeMode.LIGHT to R.string.settings_theme_light,
|
||||
ThemeMode.DARK to R.string.settings_theme_dark
|
||||
)
|
||||
SingleChoiceSegmentedButtonRow(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(horizontal = 16.dp)
|
||||
) {
|
||||
modes.forEachIndexed { index, (mode, labelRes) ->
|
||||
SegmentedButton(
|
||||
selected = settings.themeMode == mode,
|
||||
onClick = {
|
||||
if (settings.themeMode != mode) {
|
||||
haptic.performHapticFeedback(HapticFeedbackType.ToggleOn)
|
||||
settings.updateThemeMode(mode)
|
||||
}
|
||||
},
|
||||
shape = SegmentedButtonDefaults.itemShape(index, modes.size)
|
||||
) {
|
||||
Text(stringResource(labelRes))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Pro-App-Sprache gibt es erst ab Android 13
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||
ClickRow(
|
||||
title = stringResource(R.string.settings_language_title),
|
||||
summary = stringResource(R.string.settings_language_summary),
|
||||
onClick = {
|
||||
try {
|
||||
context.startActivity(
|
||||
Intent(
|
||||
Settings.ACTION_APP_LOCALE_SETTINGS,
|
||||
Uri.fromParts("package", context.packageName, null)
|
||||
)
|
||||
)
|
||||
} catch (_: Exception) {
|
||||
// Gerät ohne diese Einstellungsseite: nichts tun
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
HorizontalDivider(Modifier.padding(vertical = 8.dp))
|
||||
|
||||
// ---------- Info ----------
|
||||
SectionTitle(stringResource(R.string.settings_section_about))
|
||||
|
||||
ClickRow(
|
||||
title = stringResource(R.string.title_about),
|
||||
summary = stringResource(R.string.settings_about_summary),
|
||||
onClick = onOpenAbout
|
||||
)
|
||||
|
||||
Spacer(Modifier.height(16.dp))
|
||||
}
|
||||
|
||||
// Dialog, wenn "Jetzt nach Updates suchen" etwas gefunden hat
|
||||
availableRelease?.let { info ->
|
||||
UpdateDialog(info = info, onDismiss = { availableRelease = null })
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
package de.schanbro.weekfocus.settings
|
||||
|
||||
import android.content.Context
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.setValue
|
||||
|
||||
enum class ThemeMode { SYSTEM, LIGHT, DARK }
|
||||
|
||||
class SettingsRepository private constructor(context: Context) {
|
||||
|
||||
private val prefs = context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE)
|
||||
|
||||
var themeMode by mutableStateOf(
|
||||
runCatching { ThemeMode.valueOf(prefs.getString(KEY_THEME, "") ?: "") }
|
||||
.getOrDefault(ThemeMode.SYSTEM)
|
||||
)
|
||||
private set
|
||||
|
||||
var autoCheckUpdates by mutableStateOf(prefs.getBoolean(KEY_AUTO_UPDATE, true))
|
||||
private set
|
||||
|
||||
var includePrereleases by mutableStateOf(prefs.getBoolean(KEY_PRERELEASE, false))
|
||||
private set
|
||||
|
||||
fun updateThemeMode(mode: ThemeMode) {
|
||||
themeMode = mode
|
||||
prefs.edit().putString(KEY_THEME, mode.name).apply()
|
||||
}
|
||||
|
||||
fun updateAutoCheckUpdates(value: Boolean) {
|
||||
autoCheckUpdates = value
|
||||
prefs.edit().putBoolean(KEY_AUTO_UPDATE, value).apply()
|
||||
}
|
||||
|
||||
fun updateIncludePrereleases(value: Boolean) {
|
||||
includePrereleases = value
|
||||
prefs.edit().putBoolean(KEY_PRERELEASE, value).apply()
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val KEY_THEME = "theme_mode"
|
||||
private const val KEY_AUTO_UPDATE = "auto_check_updates"
|
||||
private const val KEY_PRERELEASE = "include_prereleases"
|
||||
|
||||
@Volatile
|
||||
private var instance: SettingsRepository? = null
|
||||
|
||||
fun get(context: Context): SettingsRepository =
|
||||
instance ?: synchronized(this) {
|
||||
instance ?: SettingsRepository(context.applicationContext).also { instance = it }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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()
|
||||
}
|
||||
@@ -6,6 +6,7 @@ import kotlinx.coroutines.withContext
|
||||
import org.json.JSONObject
|
||||
import java.net.HttpURLConnection
|
||||
import java.net.URL
|
||||
import org.json.JSONArray
|
||||
|
||||
data class ReleaseInfo(
|
||||
val version: String,
|
||||
@@ -15,37 +16,53 @@ data class ReleaseInfo(
|
||||
|
||||
object UpdateChecker {
|
||||
|
||||
private const val LATEST_RELEASE_URL =
|
||||
"https://git.schamagusa.de/api/v1/repos/robin/WeekFocus/releases/latest"
|
||||
private const val RELEASES_URL =
|
||||
"https://git.schamagusa.de/api/v1/repos/robin/WeekFocus/releases"
|
||||
|
||||
/** Liefert das neueste stabile Release oder null (bei Fehler / ohne APK). */
|
||||
suspend fun fetchLatestRelease(): ReleaseInfo? = withContext(Dispatchers.IO) {
|
||||
suspend fun fetchLatestRelease(includePrereleases: Boolean = false): ReleaseInfo? =
|
||||
withContext(Dispatchers.IO) {
|
||||
try {
|
||||
val conn = URL(LATEST_RELEASE_URL).openConnection() as HttpURLConnection
|
||||
if (includePrereleases) {
|
||||
val body = httpGet("$RELEASES_URL?limit=10") ?: return@withContext null
|
||||
val array = JSONArray(body)
|
||||
(0 until array.length())
|
||||
.map { array.getJSONObject(it) }
|
||||
.firstNotNullOfOrNull { toRelease(it) }
|
||||
} else {
|
||||
val body = httpGet("$RELEASES_URL/latest") ?: return@withContext null
|
||||
toRelease(JSONObject(body))
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
null
|
||||
}
|
||||
}
|
||||
|
||||
private fun httpGet(url: String): String? {
|
||||
val conn = URL(url).openConnection() as HttpURLConnection
|
||||
conn.connectTimeout = 10_000
|
||||
conn.readTimeout = 10_000
|
||||
conn.setRequestProperty("Accept", "application/json")
|
||||
try {
|
||||
if (conn.responseCode != HttpURLConnection.HTTP_OK) return@withContext null
|
||||
return try {
|
||||
if (conn.responseCode == HttpURLConnection.HTTP_OK) {
|
||||
conn.inputStream.bufferedReader().use { it.readText() }
|
||||
} else null
|
||||
} finally {
|
||||
conn.disconnect()
|
||||
}
|
||||
}
|
||||
|
||||
val json = JSONObject(conn.inputStream.bufferedReader().use { it.readText() })
|
||||
private fun toRelease(json: JSONObject): ReleaseInfo? {
|
||||
if (json.optBoolean("draft", false)) return null
|
||||
val assets = json.getJSONArray("assets")
|
||||
val apk = (0 until assets.length())
|
||||
.map { assets.getJSONObject(it) }
|
||||
.firstOrNull { it.getString("name").endsWith(".apk", ignoreCase = true) }
|
||||
?: return@withContext null
|
||||
|
||||
ReleaseInfo(
|
||||
?: return null
|
||||
return ReleaseInfo(
|
||||
version = json.getString("tag_name"),
|
||||
notes = json.optString("body", ""),
|
||||
apkUrl = apk.getString("browser_download_url")
|
||||
)
|
||||
} finally {
|
||||
conn.disconnect()
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
null // Netzwerk- oder Parse-Fehler: still ignorieren
|
||||
}
|
||||
}
|
||||
|
||||
@Suppress("DEPRECATION")
|
||||
|
||||
@@ -12,6 +12,7 @@ import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.unit.dp
|
||||
import de.schanbro.weekfocus.R
|
||||
import de.schanbro.weekfocus.settings.SettingsRepository
|
||||
import kotlinx.coroutines.CancellationException
|
||||
import kotlinx.coroutines.Job
|
||||
import kotlinx.coroutines.launch
|
||||
@@ -21,21 +22,20 @@ private const val CHECK_INTERVAL_MS = 24L * 60 * 60 * 1000
|
||||
@Composable
|
||||
fun UpdateHandler() {
|
||||
val context = LocalContext.current
|
||||
val scope = rememberCoroutineScope()
|
||||
val settings = remember { SettingsRepository.get(context) }
|
||||
val prefs = remember {
|
||||
context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE)
|
||||
}
|
||||
|
||||
var release by remember { mutableStateOf<ReleaseInfo?>(null) }
|
||||
var progress by remember { mutableStateOf<Float?>(null) } // null = kein Download
|
||||
var downloadJob by remember { mutableStateOf<Job?>(null) }
|
||||
|
||||
// Einmal pro Start, höchstens alle 24 Stunden
|
||||
LaunchedEffect(Unit) {
|
||||
if (!settings.autoCheckUpdates) return@LaunchedEffect
|
||||
|
||||
val now = System.currentTimeMillis()
|
||||
if (now - prefs.getLong("last_update_check", 0L) < CHECK_INTERVAL_MS) return@LaunchedEffect
|
||||
|
||||
val latest = UpdateChecker.fetchLatestRelease() ?: return@LaunchedEffect
|
||||
val latest = UpdateChecker.fetchLatestRelease(settings.includePrereleases)
|
||||
?: return@LaunchedEffect
|
||||
prefs.edit().putLong("last_update_check", now).apply()
|
||||
|
||||
if (UpdateChecker.isNewer(latest.version, UpdateChecker.currentVersion(context))) {
|
||||
@@ -43,11 +43,19 @@ fun UpdateHandler() {
|
||||
}
|
||||
}
|
||||
|
||||
release?.let { info ->
|
||||
release?.let { UpdateDialog(info = it, onDismiss = { release = null }) }
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun UpdateDialog(info: ReleaseInfo, onDismiss: () -> Unit) {
|
||||
val context = LocalContext.current
|
||||
val scope = rememberCoroutineScope()
|
||||
var progress by remember { mutableStateOf<Float?>(null) } // null = kein Download
|
||||
var downloadJob by remember { mutableStateOf<Job?>(null) }
|
||||
val downloading = progress != null
|
||||
|
||||
AlertDialog(
|
||||
onDismissRequest = { if (!downloading) release = null },
|
||||
onDismissRequest = { if (!downloading) onDismiss() },
|
||||
title = { Text(stringResource(R.string.update_title)) },
|
||||
text = {
|
||||
Column(Modifier.verticalScroll(rememberScrollState())) {
|
||||
@@ -86,7 +94,7 @@ fun UpdateHandler() {
|
||||
progress = it
|
||||
}
|
||||
progress = null
|
||||
release = null
|
||||
onDismiss()
|
||||
ApkInstaller.install(context, apk)
|
||||
} catch (e: CancellationException) {
|
||||
throw e
|
||||
@@ -106,7 +114,7 @@ fun UpdateHandler() {
|
||||
onClick = {
|
||||
downloadJob?.cancel()
|
||||
progress = null
|
||||
release = null
|
||||
onDismiss()
|
||||
}
|
||||
) {
|
||||
Text(
|
||||
@@ -118,4 +126,3 @@ fun UpdateHandler() {
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -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))
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
@@ -28,4 +28,61 @@
|
||||
<string name="permission_network_message">WeekFocus needs network access to check for updates. Without it the app keeps working, but won’t look for new versions.</string>
|
||||
<string name="permission_allow">Allow</string>
|
||||
<string name="permission_not_now">Not now</string>
|
||||
|
||||
<string name="settings_section_updates">Updates</string>
|
||||
<string name="settings_auto_update_title">Check for updates automatically</string>
|
||||
<string name="settings_auto_update_summary">On app start, at most once a day</string>
|
||||
<string name="settings_prerelease_title">Include beta versions</string>
|
||||
<string name="settings_prerelease_summary">Also offer pre-releases. These may contain bugs.</string>
|
||||
<string name="settings_check_now_title">Check for updates now</string>
|
||||
<string name="settings_check_idle">Installed version: %1$s</string>
|
||||
<string name="settings_check_checking">Checking …</string>
|
||||
<string name="settings_check_up_to_date">The app is up to date</string>
|
||||
<string name="settings_check_failed">Check failed. Please check your network connection.</string>
|
||||
<string name="settings_check_available">Update available</string>
|
||||
|
||||
<string name="settings_section_appearance">Appearance</string>
|
||||
<string name="settings_theme_title">Theme</string>
|
||||
<string name="settings_theme_system">System</string>
|
||||
<string name="settings_theme_light">Light</string>
|
||||
<string name="settings_theme_dark">Dark</string>
|
||||
<string name="settings_language_title">Language</string>
|
||||
<string name="settings_language_summary">Change in system settings</string>
|
||||
|
||||
<string name="settings_section_about">About</string>
|
||||
<string name="settings_version_title">Version</string>
|
||||
<string name="settings_source_title">Source code</string>
|
||||
<string name="settings_source_summary">Open repository on Gitea</string>
|
||||
|
||||
<string name="action_back">Back</string>
|
||||
<string name="settings_about_summary">Version, source code and more</string>
|
||||
|
||||
<string name="about_version">Version %1$s</string>
|
||||
<string name="about_description">Keep your words of the week in view, right on your home screen.</string>
|
||||
<string name="about_section_links">Links</string>
|
||||
<string name="about_issues_title">Report a problem</string>
|
||||
<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>
|
||||
|
||||
<string name="home_this_week">This week</string>
|
||||
<string name="home_next_week">Next week</string>
|
||||
<string name="home_last_week">Last week</string>
|
||||
<string name="home_calendar_week">Week %1$d</string>
|
||||
<string name="home_week_range">Week %1$d · %2$s</string>
|
||||
<string name="home_cd_previous">Previous week</string>
|
||||
<string name="home_cd_next">Show next week</string>
|
||||
<string name="home_back_to_current">Back to this week</string>
|
||||
<string name="home_day_progress">Day %1$d of 7</string>
|
||||
<string name="home_more_weeks">More weeks</string>
|
||||
<string name="home_preview_hint">The preview is based on your current word list and changes whenever you add, edit or remove words.</string>
|
||||
<string name="home_widget_title">Add widget</string>
|
||||
<string name="home_widget_message">Show your word of the week right on your home screen.</string>
|
||||
<string name="home_widget_action">Add</string>
|
||||
</resources>
|
||||
@@ -9,6 +9,7 @@
|
||||
<string name="title_settings">Einstellungen</string>
|
||||
<string name="title_words">Wörter</string>
|
||||
<string name="title_home">Start</string>
|
||||
<string name="title_about">Über</string>
|
||||
|
||||
<!-- Aktionen -->
|
||||
<string name="action_delete">Löschen</string>
|
||||
@@ -33,4 +34,63 @@
|
||||
<string name="permission_network_message">WeekFocus braucht Netzwerkzugriff, um nach Updates zu suchen. Ohne Zugriff funktioniert die App weiterhin, sucht aber nicht nach neuen Versionen.</string>
|
||||
<string name="permission_allow">Erlauben</string>
|
||||
<string name="permission_not_now">Nicht jetzt</string>
|
||||
|
||||
<!-- Einstellungen -->
|
||||
<string name="settings_section_updates">Updates</string>
|
||||
<string name="settings_auto_update_title">Automatisch nach Updates suchen</string>
|
||||
<string name="settings_auto_update_summary">Beim Start der App, höchstens einmal täglich</string>
|
||||
<string name="settings_prerelease_title">Beta-Versionen einbeziehen</string>
|
||||
<string name="settings_prerelease_summary">Auch Vorabversionen anbieten. Diese können Fehler enthalten.</string>
|
||||
<string name="settings_check_now_title">Jetzt nach Updates suchen</string>
|
||||
<string name="settings_check_idle">Installierte Version: %1$s</string>
|
||||
<string name="settings_check_checking">Suche läuft …</string>
|
||||
<string name="settings_check_up_to_date">Die App ist auf dem neuesten Stand</string>
|
||||
<string name="settings_check_failed">Suche fehlgeschlagen. Bitte Netzwerkverbindung prüfen.</string>
|
||||
<string name="settings_check_available">Update verfügbar</string>
|
||||
|
||||
<string name="settings_section_appearance">Darstellung</string>
|
||||
<string name="settings_theme_title">Design</string>
|
||||
<string name="settings_theme_system">System</string>
|
||||
<string name="settings_theme_light">Hell</string>
|
||||
<string name="settings_theme_dark">Dunkel</string>
|
||||
<string name="settings_language_title">Sprache</string>
|
||||
<string name="settings_language_summary">In den Systemeinstellungen ändern</string>
|
||||
|
||||
<string name="settings_section_about">Über die App</string>
|
||||
<string name="settings_version_title">Version</string>
|
||||
<string name="settings_source_title">Quellcode</string>
|
||||
<string name="settings_source_summary">Repository auf Gitea öffnen</string>
|
||||
|
||||
<string name="action_back">Zurück</string>
|
||||
<string name="settings_about_summary">Version, Quellcode und mehr</string>
|
||||
|
||||
<string name="about_version">Version %1$s</string>
|
||||
<string name="about_description">Behalte deine Wörter der Woche im Blick, direkt auf dem Startbildschirm.</string>
|
||||
<string name="about_section_links">Links</string>
|
||||
<string name="about_issues_title">Fehler melden</string>
|
||||
<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>
|
||||
|
||||
<!-- Home Screen-->
|
||||
<string name="home_this_week">Diese Woche</string>
|
||||
<string name="home_next_week">Nächste Woche</string>
|
||||
<string name="home_last_week">Letzte Woche</string>
|
||||
<string name="home_calendar_week">Kalenderwoche %1$d</string>
|
||||
<string name="home_week_range">KW %1$d · %2$s</string>
|
||||
<string name="home_cd_previous">Vorherige Woche</string>
|
||||
<string name="home_cd_next">Nächste Woche anzeigen</string>
|
||||
<string name="home_back_to_current">Zur aktuellen Woche</string>
|
||||
<string name="home_day_progress">Tag %1$d von 7</string>
|
||||
<string name="home_more_weeks">Weitere Wochen</string>
|
||||
<string name="home_preview_hint">Die Vorschau richtet sich nach deiner aktuellen Wortliste und ändert sich, sobald du Wörter hinzufügst, bearbeitest oder entfernst.</string>
|
||||
<string name="home_widget_title">Widget hinzufügen</string>
|
||||
<string name="home_widget_message">Zeige dein Wort der Woche direkt auf dem Startbildschirm.</string>
|
||||
<string name="home_widget_action">Hinzufügen</string>
|
||||
</resources>
|
||||
Reference in new issue
Block a user