diff --git a/CHANGELOG.md b/CHANGELOG.md index f700ec5..13735f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [1.3.0] +### Fixed +* show app icon on splash screen + ## [1.2.12] - 2026-10-29 ### New * dark mode support on the splash screen diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f2187ce..99af88b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -94,4 +94,5 @@ dependencies { debugImplementation(libs.androidx.compose.ui.tooling) implementation(libs.androidx.material.icons.extended) implementation("androidx.core:core-splashscreen:1.0.1") + implementation("androidx.lifecycle:lifecycle-runtime-compose:2.8.7") } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 41ac7f5..33bffc2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,6 +4,10 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/de/schanbro/weekfocus/MainActivity.kt b/app/src/main/java/de/schanbro/weekfocus/MainActivity.kt index f7fb3f1..24a36c7 100644 --- a/app/src/main/java/de/schanbro/weekfocus/MainActivity.kt +++ b/app/src/main/java/de/schanbro/weekfocus/MainActivity.kt @@ -22,6 +22,8 @@ import androidx.compose.ui.res.stringResource import de.schanbro.weekfocus.ui.theme.WeekFocusTheme import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import de.schanbro.weekfocus.screens.WordListScreen +import de.schanbro.weekfocus.update.NetworkPermissionGate +import de.schanbro.weekfocus.update.UpdateHandler class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { @@ -31,6 +33,9 @@ class MainActivity : ComponentActivity() { setContent { WeekFocusTheme { MainScreen() + NetworkPermissionGate { + UpdateHandler() + } } } } diff --git a/app/src/main/java/de/schanbro/weekfocus/update/ApkInstaller.kt b/app/src/main/java/de/schanbro/weekfocus/update/ApkInstaller.kt new file mode 100644 index 0000000..1fd3487 --- /dev/null +++ b/app/src/main/java/de/schanbro/weekfocus/update/ApkInstaller.kt @@ -0,0 +1,77 @@ +package de.schanbro.weekfocus.update + +import android.content.Context +import android.content.Intent +import android.net.Uri +import android.provider.Settings +import androidx.core.content.FileProvider +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.ensureActive +import kotlinx.coroutines.withContext +import java.io.File +import java.io.IOException +import java.net.HttpURLConnection +import java.net.URL + +object ApkInstaller { + + fun canInstall(context: Context): Boolean = + context.packageManager.canRequestPackageInstalls() + + fun openInstallPermissionSettings(context: Context) { + val intent = Intent( + Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, + Uri.parse("package:${context.packageName}") + ).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + context.startActivity(intent) + } + + suspend fun download( + context: Context, + url: String, + onProgress: (Float) -> Unit + ): File = withContext(Dispatchers.IO) { + val dir = File(context.cacheDir, "updates").apply { + mkdirs() + listFiles()?.forEach { it.delete() } // alte Downloads aufräumen + } + val file = File(dir, "update.apk") + + val conn = URL(url).openConnection() as HttpURLConnection + conn.connectTimeout = 15_000 + conn.readTimeout = 15_000 + try { + if (conn.responseCode != HttpURLConnection.HTTP_OK) { + throw IOException("HTTP ${conn.responseCode}") + } + val total = conn.contentLengthLong + conn.inputStream.use { input -> + file.outputStream().use { output -> + val buffer = ByteArray(16 * 1024) + var done = 0L + var read: Int + while (input.read(buffer).also { read = it } != -1) { + ensureActive() // macht den Abbruch möglich + output.write(buffer, 0, read) + done += read + if (total > 0) onProgress(done.toFloat() / total) + } + } + } + file + } finally { + conn.disconnect() + } + } + + fun install(context: Context, apk: File) { + val uri = FileProvider.getUriForFile( + context, "${context.packageName}.fileprovider", apk + ) + val intent = Intent(Intent.ACTION_VIEW).apply { + setDataAndType(uri, "application/vnd.android.package-archive") + addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK) + } + context.startActivity(intent) + } +} \ No newline at end of file diff --git a/app/src/main/java/de/schanbro/weekfocus/update/NetworkPermissionGate.kt b/app/src/main/java/de/schanbro/weekfocus/update/NetworkPermissionGate.kt new file mode 100644 index 0000000..dcd1478 --- /dev/null +++ b/app/src/main/java/de/schanbro/weekfocus/update/NetworkPermissionGate.kt @@ -0,0 +1,82 @@ +package de.schanbro.weekfocus.update + +import android.Manifest +import android.content.Context +import android.content.Intent +import android.content.pm.PackageManager +import android.net.Uri +import android.provider.Settings +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.* +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.core.content.ContextCompat +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.compose.LifecycleEventEffect +import de.schanbro.weekfocus.R + +private const val KEY_HINT_DISMISSED = "network_hint_dismissed" + +/** Zeigt [content] nur, wenn die App Netzwerkzugriff hat. Fragt sonst einmal danach. */ +@Composable +fun NetworkPermissionGate(content: @Composable () -> Unit) { + val context = LocalContext.current + val prefs = remember { + context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE) + } + + fun isGranted() = ContextCompat.checkSelfPermission( + context, Manifest.permission.INTERNET + ) == PackageManager.PERMISSION_GRANTED + + var granted by remember { mutableStateOf(isGranted()) } + var showDialog by remember { + mutableStateOf(!isGranted() && !prefs.getBoolean(KEY_HINT_DISMISSED, false)) + } + + val launcher = rememberLauncherForActivityResult( + ActivityResultContracts.RequestPermission() + ) { result -> + granted = result || isGranted() + if (!granted) openAppSettings(context) // kein System-Dialog möglich → Einstellungen + } + + // Nach Rückkehr aus den Einstellungen neu prüfen + LifecycleEventEffect(Lifecycle.Event.ON_RESUME) { + granted = isGranted() + } + + if (granted) { + content() + } else if (showDialog) { + AlertDialog( + onDismissRequest = {}, + title = { Text(stringResource(R.string.permission_network_title)) }, + text = { Text(stringResource(R.string.permission_network_message)) }, + confirmButton = { + TextButton(onClick = { + showDialog = false + launcher.launch(Manifest.permission.INTERNET) + }) { Text(stringResource(R.string.permission_allow)) } + }, + dismissButton = { + TextButton(onClick = { + prefs.edit().putBoolean(KEY_HINT_DISMISSED, true).apply() + showDialog = false + }) { Text(stringResource(R.string.permission_not_now)) } + } + ) + } +} + +private fun openAppSettings(context: Context) { + val intent = Intent( + Settings.ACTION_APPLICATION_DETAILS_SETTINGS, + Uri.fromParts("package", context.packageName, null) + ).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + context.startActivity(intent) +} \ No newline at end of file diff --git a/app/src/main/java/de/schanbro/weekfocus/update/UpdateChecker.kt b/app/src/main/java/de/schanbro/weekfocus/update/UpdateChecker.kt new file mode 100644 index 0000000..a7b7382 --- /dev/null +++ b/app/src/main/java/de/schanbro/weekfocus/update/UpdateChecker.kt @@ -0,0 +1,71 @@ +package de.schanbro.weekfocus.update + +import android.content.Context +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import org.json.JSONObject +import java.net.HttpURLConnection +import java.net.URL + +data class ReleaseInfo( + val version: String, + val notes: String, + val apkUrl: String +) + +object UpdateChecker { + + private const val LATEST_RELEASE_URL = + "https://git.schamagusa.de/api/v1/repos/robin/WeekFocus/releases/latest" + + /** Liefert das neueste stabile Release oder null (bei Fehler / ohne APK). */ + suspend fun fetchLatestRelease(): ReleaseInfo? = withContext(Dispatchers.IO) { + try { + val conn = URL(LATEST_RELEASE_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 + + val json = JSONObject(conn.inputStream.bufferedReader().use { it.readText() }) + 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( + 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") + fun currentVersion(context: Context): String = + context.packageManager.getPackageInfo(context.packageName, 0).versionName ?: "0" + + /** Numerischer Vergleich pro Segment, damit 1.2.11 > 1.2.9 gilt. */ + fun isNewer(remote: String, local: String): Boolean { + val r = parse(remote) + val l = parse(local) + for (i in 0 until maxOf(r.size, l.size)) { + val a = r.getOrElse(i) { 0 } + val b = l.getOrElse(i) { 0 } + if (a != b) return a > b + } + // Gleiche Nummer: stabiles Release ist neuer als eine installierte Beta + return local.contains("-") && !remote.contains("-") + } + + private fun parse(version: String): List = + version.trim().removePrefix("v").substringBefore("-") + .split(".").map { it.toIntOrNull() ?: 0 } +} \ No newline at end of file diff --git a/app/src/main/java/de/schanbro/weekfocus/update/UpdateHandler.kt b/app/src/main/java/de/schanbro/weekfocus/update/UpdateHandler.kt new file mode 100644 index 0000000..c1a29fd --- /dev/null +++ b/app/src/main/java/de/schanbro/weekfocus/update/UpdateHandler.kt @@ -0,0 +1,121 @@ +package de.schanbro.weekfocus.update + +import android.content.Context +import android.widget.Toast +import androidx.compose.foundation.layout.* +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 androidx.compose.ui.unit.dp +import de.schanbro.weekfocus.R +import kotlinx.coroutines.CancellationException +import kotlinx.coroutines.Job +import kotlinx.coroutines.launch + +private const val CHECK_INTERVAL_MS = 24L * 60 * 60 * 1000 + +@Composable +fun UpdateHandler() { + val context = LocalContext.current + val scope = rememberCoroutineScope() + val prefs = remember { + context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE) + } + + var release by remember { mutableStateOf(null) } + var progress by remember { mutableStateOf(null) } // null = kein Download + var downloadJob by remember { mutableStateOf(null) } + + // Einmal pro Start, höchstens alle 24 Stunden + LaunchedEffect(Unit) { + val now = System.currentTimeMillis() + if (now - prefs.getLong("last_update_check", 0L) < CHECK_INTERVAL_MS) return@LaunchedEffect + + val latest = UpdateChecker.fetchLatestRelease() ?: return@LaunchedEffect + prefs.edit().putLong("last_update_check", now).apply() + + if (UpdateChecker.isNewer(latest.version, UpdateChecker.currentVersion(context))) { + release = latest + } + } + + release?.let { info -> + val downloading = progress != null + + AlertDialog( + onDismissRequest = { if (!downloading) release = null }, + title = { Text(stringResource(R.string.update_title)) }, + text = { + Column(Modifier.verticalScroll(rememberScrollState())) { + Text(stringResource(R.string.update_message, info.version.removePrefix("v"))) + if (info.notes.isNotBlank()) { + Spacer(Modifier.height(12.dp)) + Text( + text = info.notes, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + progress?.let { p -> + Spacer(Modifier.height(16.dp)) + LinearProgressIndicator( + progress = { p }, + modifier = Modifier.fillMaxWidth() + ) + } + } + }, + confirmButton = { + TextButton( + enabled = !downloading, + onClick = { + if (!ApkInstaller.canInstall(context)) { + Toast.makeText( + context, R.string.update_permission_hint, Toast.LENGTH_LONG + ).show() + ApkInstaller.openInstallPermissionSettings(context) + } else { + downloadJob = scope.launch { + progress = 0f + try { + val apk = ApkInstaller.download(context, info.apkUrl) { + progress = it + } + progress = null + release = null + ApkInstaller.install(context, apk) + } catch (e: CancellationException) { + throw e + } catch (e: Exception) { + progress = null + Toast.makeText( + context, R.string.update_failed, Toast.LENGTH_LONG + ).show() + } + } + } + } + ) { Text(stringResource(R.string.update_action)) } + }, + dismissButton = { + TextButton( + onClick = { + downloadJob?.cancel() + progress = null + release = null + } + ) { + Text( + stringResource( + if (downloading) R.string.action_cancel else R.string.update_later + ) + ) + } + } + ) + } +} \ No newline at end of file diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index f5c8831..997d3ec 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -16,4 +16,16 @@ Delete word? “%1$s” will be permanently removed. Edit word + + Update available + Version %1$s is available. Download and install now? + Update + Later + Update failed. Please try again later. + Please allow installs from this source, then tap “Update” again. + + Network access needed + WeekFocus needs network access to check for updates. Without it the app keeps working, but won’t look for new versions. + Allow + Not now \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b15038c..3a429f4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -19,4 +19,18 @@ Wort löschen? „%1$s“ wird dauerhaft entfernt. Wort bearbeiten + + + Update verfügbar + Version %1$s ist verfügbar. Jetzt herunterladen und installieren? + Aktualisieren + Später + Update fehlgeschlagen. Bitte später erneut versuchen. + Bitte die Installation aus dieser Quelle erlauben und danach erneut auf „Aktualisieren“ tippen. + + + Netzwerkzugriff benötigt + WeekFocus braucht Netzwerkzugriff, um nach Updates zu suchen. Ohne Zugriff funktioniert die App weiterhin, sucht aber nicht nach neuen Versionen. + Erlauben + Nicht jetzt \ No newline at end of file diff --git a/app/src/main/res/xml/file_paths.xml b/app/src/main/res/xml/file_paths.xml new file mode 100644 index 0000000..2519d2f --- /dev/null +++ b/app/src/main/res/xml/file_paths.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file