Compare commits

..
15 Commits
Author SHA1 Message Date
robin 78fd859889 CHANGELOG update
Build & Release Android App / build (push) Successful in 17m52s
2026-10-30 18:52:26 +01:00
robin b93d23f31c feat: beta may take release notes from stable 2026-10-30 18:51:37 +01:00
robin 648da0fb37 Merge pull request 'feat: show changelog after update' (#41) from feat/changelog-after-update into main
Build & Release Android App / build (push) Successful in 11m15s
Reviewed-on: robin/WeekFocus#41
2026-10-30 17:34:31 +00:00
robin d8bb6f1671 feat: show changelog after update 2026-10-30 18:34:08 +01:00
robin 168c3eeedc README.md aktualisiert 2026-10-30 13:32:15 +00:00
robin 1f0f556e82 Merge pull request 'Feat/about screen' (#40) from feat/about-screen into main
Build & Release Android App / build (push) Successful in 9m30s
Reviewed-on: robin/WeekFocus#40
2026-10-30 13:25:02 +00:00
robin 2a4b5f54a8 CHANGELOG update 2026-10-30 14:24:38 +01:00
robin 31a1f5158f feat: about screen 2026-10-30 14:24:03 +01:00
robin 3aedc51b97 Merge pull request 'Feat/settings' (#39) from feat/settings into main
Build & Release Android App / build (push) Successful in 11m1s
Reviewed-on: robin/WeekFocus#39
2026-10-30 12:35:53 +00:00
robin 8e88e9601a CHANGELOG update 2026-10-30 13:35:25 +01:00
robin 8f65bb05b7 feat: settings 2026-10-30 13:34:34 +01:00
robin 6be81093e0 fix CHANGELOG typo 2026-10-30 13:18:07 +01:00
robin 1b90010bbc README.md aktualisiert 2026-10-30 12:06:00 +00:00
robin ade61c0850 README.md aktualisiert 2026-10-30 12:04:13 +00:00
robin e97498a148 CHANGELOG update
Build & Release Android App / build (push) Successful in 12m17s
2026-10-30 12:57:30 +01:00
16 changed files with 825 additions and 99 deletions

No files matched your search

+45 -31
View File
@@ -64,6 +64,51 @@ jobs:
echo "$KEYSTORE_BASE64" | base64 -d > "$RUNNER_TEMP/release.keystore" echo "$KEYSTORE_BASE64" | base64 -d > "$RUNNER_TEMP/release.keystore"
echo "KEYSTORE_PATH=$RUNNER_TEMP/release.keystore" >> $GITHUB_ENV 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 - name: Android Release APK bauen
run: | run: |
set -euo pipefail set -euo pipefail
@@ -101,37 +146,6 @@ jobs:
KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} 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 - name: Release in Gitea erstellen und APK hochladen
env: env:
TOKEN: ${{ secrets.GITHUB_TOKEN }} TOKEN: ${{ secrets.GITHUB_TOKEN }}
+1
View File
@@ -15,3 +15,4 @@
.externalNativeBuild .externalNativeBuild
.cxx .cxx
local.properties local.properties
app/src/main/assets/release_notes.md
+16 -1
View File
@@ -1,6 +1,21 @@
# Changelog # 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 ### Fixed
* show app icon on splash screen * show app icon on splash screen
+15 -14
View File
@@ -7,11 +7,11 @@
**One word. One week. One quality to grow.** **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"> <img src="https://raw.githubusercontent.com/ImranR98/Obtainium/main/assets/graphics/badge_obtainium.png" alt="Get it on Obtainium" height="64">
</a> </a>
[![Release](https://img.shields.io/gitea/v/release/Schanbro/WeekFocus?gitea_url=https://git.schamagusa.de&style=for-the-badge&label=Release)](https://git.schamagusa.de/Schanbro/WeekFocus/releases) [![Release](https://img.shields.io/gitea/v/release/robin/WeekFocus?gitea_url=https://git.schamagusa.de&style=for-the-badge&label=Release)](https://git.schamagusa.de/robin/WeekFocus/releases)
[![License: GPL-3.0](https://img.shields.io/badge/License-GPL--3.0-blue?style=for-the-badge)](LICENSE) [![License: GPL-3.0](https://img.shields.io/badge/License-GPL--3.0-blue?style=for-the-badge)](LICENSE)
<!--[![Translation status](https://weblate.schamagusa.de/widgets/weekfocus/-/svg-badge.svg)](https://weblate.schamagusa.de/engage/weekfocus/)--> <!--[![Translation status](https://weblate.schamagusa.de/widgets/weekfocus/-/svg-badge.svg)](https://weblate.schamagusa.de/engage/weekfocus/)-->
@@ -22,8 +22,8 @@
<!--[![Stars](https://img.shields.io/gitea/stars/Schanbro/WeekFocus?gitea_url=https://git.schamagusa.de&style=for-the-badge)](https://git.schamagusa.de/Schanbro/WeekFocus) <!--[![Stars](https://img.shields.io/gitea/stars/Schanbro/WeekFocus?gitea_url=https://git.schamagusa.de&style=for-the-badge)](https://git.schamagusa.de/Schanbro/WeekFocus)
[![Forks](https://img.shields.io/gitea/forks/Schanbro/WeekFocus?gitea_url=https://git.schamagusa.de&style=for-the-badge)](https://git.schamagusa.de/Schanbro/WeekFocus)--> [![Forks](https://img.shields.io/gitea/forks/Schanbro/WeekFocus?gitea_url=https://git.schamagusa.de&style=for-the-badge)](https://git.schamagusa.de/Schanbro/WeekFocus)-->
[![Open Issues](https://img.shields.io/gitea/issues/open/Schanbro/WeekFocus?gitea_url=https://git.schamagusa.de&style=for-the-badge)](https://git.schamagusa.de/Schanbro/WeekFocus/issues) [![Open Issues](https://img.shields.io/gitea/issues/open/Schanbro/WeekFocus?gitea_url=https://git.schamagusa.de&style=for-the-badge)](https://git.schamagusa.de/robin/WeekFocus/issues)
[![Last Commit](https://img.shields.io/gitea/last-commit/Schanbro/WeekFocus?gitea_url=https://git.schamagusa.de&style=for-the-badge)](https://git.schamagusa.de/Schanbro/WeekFocus) [![Last Commit](https://img.shields.io/gitea/last-commit/robin/WeekFocus?gitea_url=https://git.schamagusa.de&style=for-the-badge)](https://git.schamagusa.de/robin/WeekFocus)
</div> </div>
@@ -58,11 +58,11 @@ No streaks, no pressure, no clutter. Just a gentle daily reminder of what you wa
## Features ## Features
- 🧩 Home screen widget showing your current quality of the week - Home screen widget showing your current quality of the week
- 🔄 Automatic weekly rotation to a new quality - Automatic weekly rotation to a new quality
- 🌙 Light and dark theme support - Light and dark theme support, Material You
- 🔒 No ads, no tracking, no unnecessary permissions - No ads, no tracking, no unnecessary permissions
- ⚡ Lightweight and battery-friendly - Lightweight and battery-friendly
## Installation ## Installation
@@ -82,7 +82,7 @@ https://git.schamagusa.de/Schanbro/WeekFocus
### Manual APK Install ### 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. 2. Download the latest `.apk` file.
3. If prompted, allow installation from unknown sources, then install the APK. 3. If prompted, allow installation from unknown sources, then install the APK.
@@ -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: The workflow takes the notes from the section of `CHANGELOG.md` whose heading starts with the version number:
```markdown ```markdown
## 1.1.3 ## [1.1.3] - 2026-10-03
- Added Weblate translations - Added Weblate translations
- Fixed widget update at the start of a new week - 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 ## Translations
WeekFocus is translated via [Weblate](https://weblate.schamagusa.de/engage/weekfocus/). ~~WeekFocus is translated via [Weblate](https://weblate.schamagusa.de/engage/weekfocus/).
Help translate the app into your language! Help translate the app into your language!~~
<!--[![Translation status](https://weblate.schamagusa.de/widgets/weekfocus/-/multi-auto.svg)](https://weblate.schamagusa.de/engage/weekfocus/)-->
[![Translation status](https://weblate.schamagusa.de/widgets/weekfocus/-/multi-auto.svg)](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.
+1
View File
@@ -95,4 +95,5 @@ dependencies {
implementation(libs.androidx.material.icons.extended) implementation(libs.androidx.material.icons.extended)
implementation("androidx.core:core-splashscreen:1.0.1") implementation("androidx.core:core-splashscreen:1.0.1")
implementation("androidx.lifecycle:lifecycle-runtime-compose:2.8.7") implementation("androidx.lifecycle:lifecycle-runtime-compose:2.8.7")
implementation("androidx.navigation:navigation-compose:2.8.5")
} }
@@ -5,8 +5,10 @@ import android.os.Bundle
import androidx.activity.ComponentActivity import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge import androidx.activity.enableEdgeToEdge
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*
import androidx.compose.material.icons.Icons 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.Home
import androidx.compose.material.icons.filled.List import androidx.compose.material.icons.filled.List
import androidx.compose.material.icons.filled.Settings import androidx.compose.material.icons.filled.Settings
@@ -19,11 +21,25 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import de.schanbro.weekfocus.ui.theme.WeekFocusTheme import androidx.navigation.NavGraph.Companion.findStartDestination
import androidx.navigation.compose.*
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import de.schanbro.weekfocus.screens.AboutScreen
import de.schanbro.weekfocus.screens.SettingsScreen
import de.schanbro.weekfocus.screens.WordListScreen 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.NetworkPermissionGate
import de.schanbro.weekfocus.update.UpdateHandler import de.schanbro.weekfocus.update.UpdateHandler
import de.schanbro.weekfocus.update.WhatsNewHandler
private object Routes {
const val HOME = "home"
const val WORDS = "words"
const val SETTINGS = "settings"
const val ABOUT = "about"
}
class MainActivity : ComponentActivity() { class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
@@ -31,8 +47,16 @@ class MainActivity : ComponentActivity() {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
enableEdgeToEdge() enableEdgeToEdge()
setContent { 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() MainScreen()
WhatsNewHandler()
NetworkPermissionGate { NetworkPermissionGate {
UpdateHandler() UpdateHandler()
} }
@@ -42,8 +66,6 @@ class MainActivity : ComponentActivity() {
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
// Falls das Widget (z.B. durch Energiesparmodus) nicht rechtzeitig aktualisiert
// wurde, wird es beim Öffnen der App nachgezogen.
updateWidget(this) updateWidget(this)
} }
} }
@@ -51,7 +73,9 @@ class MainActivity : ComponentActivity() {
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable
fun MainScreen() { 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() val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
Scaffold( Scaffold(
@@ -62,14 +86,25 @@ fun MainScreen() {
LargeTopAppBar( LargeTopAppBar(
title = { title = {
Text( Text(
when (selectedTab) { when (currentRoute) {
0 -> stringResource(R.string.title_home) Routes.HOME -> stringResource(R.string.title_weekly_focus)
1 -> stringResource(R.string.title_words) Routes.WORDS -> stringResource(R.string.title_words)
2 -> stringResource(R.string.title_settings) Routes.SETTINGS -> stringResource(R.string.title_settings)
Routes.ABOUT -> stringResource(R.string.title_about)
else -> stringResource(R.string.app_name) else -> stringResource(R.string.app_name)
} }
) )
}, },
navigationIcon = {
if (currentRoute == Routes.ABOUT) {
IconButton(onClick = { navController.popBackStack() }) {
Icon(
Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = stringResource(R.string.action_back)
)
}
}
},
scrollBehavior = scrollBehavior, scrollBehavior = scrollBehavior,
colors = TopAppBarDefaults.largeTopAppBarColors( colors = TopAppBarDefaults.largeTopAppBarColors(
containerColor = MaterialTheme.colorScheme.surface, containerColor = MaterialTheme.colorScheme.surface,
@@ -78,35 +113,60 @@ fun MainScreen() {
) )
}, },
bottomBar = { bottomBar = {
if (currentRoute != Routes.ABOUT) {
NavigationBar { NavigationBar {
NavigationBarItem( NavigationBarItem(
selected = selectedTab == 0, selected = currentRoute == Routes.HOME,
onClick = { selectedTab = 0 }, onClick = {
navController.navigate(Routes.HOME) {
popUpTo(navController.graph.findStartDestination().id) {
saveState = true
}
launchSingleTop = true
restoreState = true
}
},
icon = { icon = {
Icon( Icon(
imageVector = if (selectedTab == 0) Icons.Filled.Home else Icons.Outlined.Home, imageVector = if (currentRoute == Routes.HOME) Icons.Filled.Home else Icons.Outlined.Home,
contentDescription = stringResource(R.string.title_home) contentDescription = stringResource(R.string.title_home)
) )
}, },
label = { Text(stringResource(R.string.title_home)) } label = { Text(stringResource(R.string.title_home)) }
) )
NavigationBarItem( NavigationBarItem(
selected = selectedTab == 1, selected = currentRoute == Routes.WORDS,
onClick = { selectedTab = 1 }, onClick = {
navController.navigate(Routes.WORDS) {
popUpTo(navController.graph.findStartDestination().id) {
saveState = true
}
launchSingleTop = true
restoreState = true
}
},
icon = { icon = {
Icon( Icon(
imageVector = if (selectedTab == 1) Icons.Filled.List else Icons.Outlined.List, imageVector = if (currentRoute == Routes.WORDS) Icons.Filled.List else Icons.Outlined.List,
contentDescription = stringResource(R.string.title_words) contentDescription = stringResource(R.string.title_words)
) )
}, },
label = { Text(stringResource(R.string.title_words)) } label = { Text(stringResource(R.string.title_words)) }
) )
NavigationBarItem( NavigationBarItem(
selected = selectedTab == 2, selected = currentRoute == Routes.SETTINGS,
onClick = { selectedTab = 2 }, onClick = {
navController.navigate(Routes.SETTINGS) {
popUpTo(navController.graph.findStartDestination().id) {
saveState = true
}
launchSingleTop = true
restoreState = true
}
},
icon = { icon = {
Icon( Icon(
imageVector = if (selectedTab == 2) Icons.Filled.Settings else Icons.Outlined.Settings, imageVector = if (currentRoute == Routes.SETTINGS) Icons.Filled.Settings else Icons.Outlined.Settings,
contentDescription = stringResource(R.string.title_settings) contentDescription = stringResource(R.string.title_settings)
) )
}, },
@@ -114,6 +174,7 @@ fun MainScreen() {
) )
} }
} }
}
) { innerPadding -> ) { innerPadding ->
Surface( Surface(
modifier = Modifier modifier = Modifier
@@ -121,10 +182,17 @@ fun MainScreen() {
.padding(innerPadding), .padding(innerPadding),
color = MaterialTheme.colorScheme.background color = MaterialTheme.colorScheme.background
) { ) {
when (selectedTab) { NavHost(
0 -> PlaceholderScreen(title = stringResource(R.string.title_weekly_focus)) navController = navController,
1 -> WordListScreen() startDestination = Routes.HOME,
2 -> PlaceholderScreen(title = stringResource(R.string.title_settings)) modifier = Modifier.fillMaxSize()
) {
composable(Routes.HOME) { PlaceholderScreen(title = stringResource(R.string.title_weekly_focus)) }
composable(Routes.WORDS) { WordListScreen() }
composable(Routes.SETTINGS) {
SettingsScreen(onOpenAbout = { navController.navigate(Routes.ABOUT) })
}
composable(Routes.ABOUT) { AboutScreen() }
} }
} }
} }
@@ -144,9 +212,6 @@ fun PlaceholderScreen(title: String) {
} }
} }
/**
* Bleibt als Top-Level-Funktion erhalten, damit WordListScreen unverändert weiter funktioniert.
*/
fun updateWidget(context: Context) { fun updateWidget(context: Context) {
SimpleWidget.updateAllWidgets(context) SimpleWidget.updateAllWidgets(context)
} }
@@ -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,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 org.json.JSONObject
import java.net.HttpURLConnection import java.net.HttpURLConnection
import java.net.URL import java.net.URL
import org.json.JSONArray
data class ReleaseInfo( data class ReleaseInfo(
val version: String, val version: String,
@@ -15,37 +16,53 @@ data class ReleaseInfo(
object UpdateChecker { object UpdateChecker {
private const val LATEST_RELEASE_URL = private const val RELEASES_URL =
"https://git.schamagusa.de/api/v1/repos/robin/WeekFocus/releases/latest" "https://git.schamagusa.de/api/v1/repos/robin/WeekFocus/releases"
/** Liefert das neueste stabile Release oder null (bei Fehler / ohne APK). */ suspend fun fetchLatestRelease(includePrereleases: Boolean = false): ReleaseInfo? =
suspend fun fetchLatestRelease(): ReleaseInfo? = withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
try { 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.connectTimeout = 10_000
conn.readTimeout = 10_000 conn.readTimeout = 10_000
conn.setRequestProperty("Accept", "application/json") conn.setRequestProperty("Accept", "application/json")
try { return try {
if (conn.responseCode != HttpURLConnection.HTTP_OK) return@withContext null 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 assets = json.getJSONArray("assets")
val apk = (0 until assets.length()) val apk = (0 until assets.length())
.map { assets.getJSONObject(it) } .map { assets.getJSONObject(it) }
.firstOrNull { it.getString("name").endsWith(".apk", ignoreCase = true) } .firstOrNull { it.getString("name").endsWith(".apk", ignoreCase = true) }
?: return@withContext null ?: return null
return ReleaseInfo(
ReleaseInfo(
version = json.getString("tag_name"), version = json.getString("tag_name"),
notes = json.optString("body", ""), notes = json.optString("body", ""),
apkUrl = apk.getString("browser_download_url") apkUrl = apk.getString("browser_download_url")
) )
} finally {
conn.disconnect()
}
} catch (e: Exception) {
null // Netzwerk- oder Parse-Fehler: still ignorieren
}
} }
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
@@ -12,6 +12,7 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import de.schanbro.weekfocus.R import de.schanbro.weekfocus.R
import de.schanbro.weekfocus.settings.SettingsRepository
import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@@ -21,21 +22,20 @@ private const val CHECK_INTERVAL_MS = 24L * 60 * 60 * 1000
@Composable @Composable
fun UpdateHandler() { fun UpdateHandler() {
val context = LocalContext.current val context = LocalContext.current
val scope = rememberCoroutineScope() val settings = remember { SettingsRepository.get(context) }
val prefs = remember { val prefs = remember {
context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE) context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE)
} }
var release by remember { mutableStateOf<ReleaseInfo?>(null) } 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) { LaunchedEffect(Unit) {
if (!settings.autoCheckUpdates) return@LaunchedEffect
val now = System.currentTimeMillis() val now = System.currentTimeMillis()
if (now - prefs.getLong("last_update_check", 0L) < CHECK_INTERVAL_MS) return@LaunchedEffect 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() prefs.edit().putLong("last_update_check", now).apply()
if (UpdateChecker.isNewer(latest.version, UpdateChecker.currentVersion(context))) { 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 val downloading = progress != null
AlertDialog( AlertDialog(
onDismissRequest = { if (!downloading) release = null }, onDismissRequest = { if (!downloading) onDismiss() },
title = { Text(stringResource(R.string.update_title)) }, title = { Text(stringResource(R.string.update_title)) },
text = { text = {
Column(Modifier.verticalScroll(rememberScrollState())) { Column(Modifier.verticalScroll(rememberScrollState())) {
@@ -86,7 +94,7 @@ fun UpdateHandler() {
progress = it progress = it
} }
progress = null progress = null
release = null onDismiss()
ApkInstaller.install(context, apk) ApkInstaller.install(context, apk)
} catch (e: CancellationException) { } catch (e: CancellationException) {
throw e throw e
@@ -106,7 +114,7 @@ fun UpdateHandler() {
onClick = { onClick = {
downloadJob?.cancel() downloadJob?.cancel()
progress = null progress = null
release = null onDismiss()
} }
) { ) {
Text( Text(
@@ -117,5 +125,4 @@ 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))
}
}
)
}
+42
View File
@@ -28,4 +28,46 @@
<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_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_allow">Allow</string>
<string name="permission_not_now">Not now</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>
</resources> </resources>
+44
View File
@@ -9,6 +9,7 @@
<string name="title_settings">Einstellungen</string> <string name="title_settings">Einstellungen</string>
<string name="title_words">Wörter</string> <string name="title_words">Wörter</string>
<string name="title_home">Start</string> <string name="title_home">Start</string>
<string name="title_about">Über</string>
<!-- Aktionen --> <!-- Aktionen -->
<string name="action_delete">Löschen</string> <string name="action_delete">Löschen</string>
@@ -33,4 +34,47 @@
<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_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_allow">Erlauben</string>
<string name="permission_not_now">Nicht jetzt</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>
</resources> </resources>