Compare commits

..
Author SHA1 Message Date
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
11 changed files with 614 additions and 53 deletions

No files matched your search

+8
View File
@@ -1,5 +1,13 @@
# Changelog
## [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
+1
View File
@@ -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,8 +5,10 @@ import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.*
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
@@ -19,19 +21,39 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.input.nestedscroll.nestedScroll
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 de.schanbro.weekfocus.screens.AboutScreen
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
private object Routes {
const val HOME = "home"
const val WORDS = "words"
const val SETTINGS = "settings"
const val ABOUT = "about"
}
class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
installSplashScreen()
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()
NetworkPermissionGate {
UpdateHandler()
@@ -42,8 +64,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,7 +71,9 @@ 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()
Scaffold(
@@ -62,14 +84,25 @@ fun MainScreen() {
LargeTopAppBar(
title = {
Text(
when (selectedTab) {
0 -> stringResource(R.string.title_home)
1 -> stringResource(R.string.title_words)
2 -> stringResource(R.string.title_settings)
when (currentRoute) {
Routes.HOME -> stringResource(R.string.title_weekly_focus)
Routes.WORDS -> stringResource(R.string.title_words)
Routes.SETTINGS -> stringResource(R.string.title_settings)
Routes.ABOUT -> stringResource(R.string.title_about)
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,
colors = TopAppBarDefaults.largeTopAppBarColors(
containerColor = MaterialTheme.colorScheme.surface,
@@ -78,35 +111,60 @@ fun MainScreen() {
)
},
bottomBar = {
if (currentRoute != Routes.ABOUT) {
NavigationBar {
NavigationBarItem(
selected = selectedTab == 0,
onClick = { selectedTab = 0 },
selected = currentRoute == Routes.HOME,
onClick = {
navController.navigate(Routes.HOME) {
popUpTo(navController.graph.findStartDestination().id) {
saveState = true
}
launchSingleTop = true
restoreState = true
}
},
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)
)
},
label = { Text(stringResource(R.string.title_home)) }
)
NavigationBarItem(
selected = selectedTab == 1,
onClick = { selectedTab = 1 },
selected = currentRoute == Routes.WORDS,
onClick = {
navController.navigate(Routes.WORDS) {
popUpTo(navController.graph.findStartDestination().id) {
saveState = true
}
launchSingleTop = true
restoreState = true
}
},
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)
)
},
label = { Text(stringResource(R.string.title_words)) }
)
NavigationBarItem(
selected = selectedTab == 2,
onClick = { selectedTab = 2 },
selected = currentRoute == Routes.SETTINGS,
onClick = {
navController.navigate(Routes.SETTINGS) {
popUpTo(navController.graph.findStartDestination().id) {
saveState = true
}
launchSingleTop = true
restoreState = true
}
},
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)
)
},
@@ -114,6 +172,7 @@ fun MainScreen() {
)
}
}
}
) { innerPadding ->
Surface(
modifier = Modifier
@@ -121,10 +180,17 @@ fun MainScreen() {
.padding(innerPadding),
color = MaterialTheme.colorScheme.background
) {
when (selectedTab) {
0 -> PlaceholderScreen(title = stringResource(R.string.title_weekly_focus))
1 -> WordListScreen()
2 -> PlaceholderScreen(title = stringResource(R.string.title_settings))
NavHost(
navController = navController,
startDestination = Routes.HOME,
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 +210,6 @@ fun PlaceholderScreen(title: String) {
}
}
/**
* Bleibt als Top-Level-Funktion erhalten, damit WordListScreen unverändert weiter funktioniert.
*/
fun updateWidget(context: 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,87 @@
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.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.UpdateChecker
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") }
)
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 }
}
}
}
@@ -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(
@@ -117,5 +125,4 @@ fun UpdateHandler() {
}
}
)
}
}
+36
View File
@@ -28,4 +28,40 @@
<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>
</resources>
+38
View File
@@ -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,41 @@
<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>
</resources>