Compare commits
32
Commits
dfd0b75521
..
v1.4.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1f0f556e82 | ||
|
|
2a4b5f54a8 | ||
|
|
31a1f5158f | ||
|
|
3aedc51b97 | ||
|
|
8e88e9601a | ||
|
|
8f65bb05b7 | ||
|
|
6be81093e0 | ||
|
|
1b90010bbc | ||
|
|
ade61c0850 | ||
|
|
e97498a148 | ||
|
|
584ec246d1 | ||
|
|
200b834d1c | ||
|
|
0fcc9ba514 | ||
|
|
8d38c319a2 | ||
|
|
90ce637846 | ||
|
|
f77080f6f2 | ||
|
|
f161db3345 | ||
|
|
32ae274da3 | ||
|
|
431f61e683 | ||
|
|
2cadfa8972 | ||
|
|
77bcaddc55 | ||
|
|
a2d049e280 | ||
|
|
a393624d03 | ||
|
|
27d1a4b6ea | ||
|
|
5ae35c4cac | ||
|
|
75c4a43d57 | ||
|
|
0c75afab4e | ||
|
|
0c2ec3f20c | ||
|
|
daf16f0e67 | ||
|
|
8ccd4430da | ||
|
|
98ffa47fa4 | ||
|
|
7cc3245b97 |
No files matched your search
@@ -50,7 +50,7 @@ jobs:
|
||||
|
||||
"$SDKMANAGER" --sdk_root="$SDK_PATH" \
|
||||
"platform-tools" \
|
||||
"platforms;android-37" \
|
||||
"platforms;android-35" \
|
||||
"build-tools;35.0.0"
|
||||
|
||||
echo "ANDROID_HOME=$SDK_PATH" >> $GITHUB_ENV
|
||||
|
||||
+31
-1
@@ -1,5 +1,35 @@
|
||||
# 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
|
||||
|
||||
### Fixed
|
||||
* show app icon on splash screen
|
||||
|
||||
## [1.2.12] - 2026-10-29
|
||||
### New
|
||||
* dark mode support on the splash screen
|
||||
|
||||
## [1.2.11] - 2026-10-29
|
||||
### New
|
||||
* ability to edit words (with swiping to the left)
|
||||
### Changed
|
||||
* delete words with swiping to the right (instead of pressing the button)
|
||||
|
||||
## [1.2.10] - 2026-10-08
|
||||
### Changed
|
||||
* implemented a better choosing of the focus word.
|
||||
* reduced apk file size from 44MB to 2.2MB
|
||||
|
||||
## [1.2.0] - 2026-10-04
|
||||
### New
|
||||
* navigation
|
||||
@@ -8,7 +38,7 @@
|
||||
|
||||
## [1.1.3] - 2026-10-03
|
||||
### Changed
|
||||
- chore: refactor: switch from release github action to bash
|
||||
- chore: refactor: switch from release GitHub Action to bash
|
||||
|
||||
## [1.1.1] - 2026-10-03
|
||||
### Changed
|
||||
|
||||
@@ -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.
|
||||
@@ -78,6 +78,7 @@ android {
|
||||
dependencies {
|
||||
implementation(platform(libs.androidx.compose.bom))
|
||||
implementation(libs.androidx.activity.compose)
|
||||
implementation(libs.androidx.compose.animation)
|
||||
implementation(libs.androidx.compose.material3)
|
||||
implementation(libs.androidx.compose.ui)
|
||||
implementation(libs.androidx.compose.ui.graphics)
|
||||
@@ -92,4 +93,7 @@ dependencies {
|
||||
debugImplementation(libs.androidx.compose.ui.test.manifest)
|
||||
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")
|
||||
implementation("androidx.navigation:navigation-compose:2.8.5")
|
||||
}
|
||||
Vendored
+6
@@ -0,0 +1,6 @@
|
||||
# Project-specific R8/ProGuard rules for WeekFocus.
|
||||
# Default Android and Compose rules are applied automatically via consumer rules.
|
||||
|
||||
# Keep line numbers for readable stack traces
|
||||
-keepattributes SourceFile,LineNumberTable
|
||||
-renamesourcefileattribute SourceFile
|
||||
@@ -1,6 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<!-- Nötig, damit der Wochenwechsel-Alarm nach einem Neustart neu geplant wird -->
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
||||
|
||||
<!-- used for auto-update -->
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
|
||||
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
@@ -15,7 +21,7 @@
|
||||
android:name=".MainActivity"
|
||||
android:exported="true"
|
||||
android:label="@string/app_name"
|
||||
android:theme="@style/Theme.WeekFocus"
|
||||
android:theme="@style/Theme.WeekFocus.Splash"
|
||||
android:windowSoftInputMode="adjustResize">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
@@ -28,11 +34,24 @@
|
||||
android:exported="true">
|
||||
<intent-filter>
|
||||
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
|
||||
<action android:name="android.intent.action.BOOT_COMPLETED" />
|
||||
<action android:name="android.intent.action.DATE_CHANGED" />
|
||||
<action android:name="android.intent.action.TIME_SET" />
|
||||
<action android:name="android.intent.action.TIMEZONE_CHANGED" />
|
||||
</intent-filter>
|
||||
<meta-data
|
||||
android:name="android.appwidget.provider"
|
||||
android:resource="@xml/widget_info" />
|
||||
</receiver>
|
||||
<provider
|
||||
android:name="androidx.core.content.FileProvider"
|
||||
android:authorities="${applicationId}.fileprovider"
|
||||
android:exported="false"
|
||||
android:grantUriPermissions="true">
|
||||
<meta-data
|
||||
android:name="android.support.FILE_PROVIDER_PATHS"
|
||||
android:resource="@xml/file_paths" />
|
||||
</provider>
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
@@ -1,14 +1,14 @@
|
||||
package de.schanbro.weekfocus
|
||||
|
||||
import android.appwidget.AppWidgetManager
|
||||
import android.content.ComponentName
|
||||
import android.content.Context
|
||||
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
|
||||
@@ -21,26 +21,59 @@ 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()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
updateWidget(this)
|
||||
}
|
||||
}
|
||||
|
||||
@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(
|
||||
@@ -51,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,
|
||||
@@ -67,40 +111,66 @@ fun MainScreen() {
|
||||
)
|
||||
},
|
||||
bottomBar = {
|
||||
NavigationBar {
|
||||
NavigationBarItem(
|
||||
selected = selectedTab == 0,
|
||||
onClick = { selectedTab = 0 },
|
||||
icon = {
|
||||
Icon(
|
||||
imageVector = if (selectedTab == 0) 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 },
|
||||
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)) }
|
||||
)
|
||||
if (currentRoute != Routes.ABOUT) {
|
||||
NavigationBar {
|
||||
NavigationBarItem(
|
||||
selected = currentRoute == Routes.HOME,
|
||||
onClick = {
|
||||
navController.navigate(Routes.HOME) {
|
||||
popUpTo(navController.graph.findStartDestination().id) {
|
||||
saveState = true
|
||||
}
|
||||
launchSingleTop = true
|
||||
restoreState = true
|
||||
}
|
||||
},
|
||||
icon = {
|
||||
Icon(
|
||||
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 = currentRoute == Routes.WORDS,
|
||||
onClick = {
|
||||
navController.navigate(Routes.WORDS) {
|
||||
popUpTo(navController.graph.findStartDestination().id) {
|
||||
saveState = true
|
||||
}
|
||||
launchSingleTop = true
|
||||
restoreState = true
|
||||
}
|
||||
},
|
||||
icon = {
|
||||
Icon(
|
||||
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 = currentRoute == Routes.SETTINGS,
|
||||
onClick = {
|
||||
navController.navigate(Routes.SETTINGS) {
|
||||
popUpTo(navController.graph.findStartDestination().id) {
|
||||
saveState = true
|
||||
}
|
||||
launchSingleTop = true
|
||||
restoreState = true
|
||||
}
|
||||
},
|
||||
icon = {
|
||||
Icon(
|
||||
imageVector = if (currentRoute == Routes.SETTINGS) Icons.Filled.Settings else Icons.Outlined.Settings,
|
||||
contentDescription = stringResource(R.string.title_settings)
|
||||
)
|
||||
},
|
||||
label = { Text(stringResource(R.string.title_settings)) }
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
) { innerPadding ->
|
||||
@@ -110,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() }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -134,11 +211,5 @@ fun PlaceholderScreen(title: String) {
|
||||
}
|
||||
|
||||
fun updateWidget(context: Context) {
|
||||
val appWidgetManager = AppWidgetManager.getInstance(context)
|
||||
val componentName = ComponentName(context, SimpleWidget::class.java)
|
||||
val appWidgetIds = appWidgetManager.getAppWidgetIds(componentName)
|
||||
|
||||
for (appWidgetId in appWidgetIds) {
|
||||
SimpleWidget.updateAppWidget(context, appWidgetManager, appWidgetId)
|
||||
}
|
||||
SimpleWidget.updateAllWidgets(context)
|
||||
}
|
||||
@@ -1,15 +1,35 @@
|
||||
package de.schanbro.weekfocus
|
||||
|
||||
import android.app.AlarmManager
|
||||
import android.app.PendingIntent
|
||||
import android.appwidget.AppWidgetManager
|
||||
import android.appwidget.AppWidgetProvider
|
||||
import android.content.ComponentName
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.widget.RemoteViews
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import java.util.Calendar
|
||||
import java.util.Random
|
||||
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_DATE_CHANGED,
|
||||
Intent.ACTION_TIME_CHANGED, // "android.intent.action.TIME_SET"
|
||||
Intent.ACTION_TIMEZONE_CHANGED -> updateAllWidgets(context)
|
||||
}
|
||||
}
|
||||
|
||||
override fun onUpdate(
|
||||
context: Context,
|
||||
appWidgetManager: AppWidgetManager,
|
||||
@@ -18,40 +38,141 @@ 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)
|
||||
}
|
||||
|
||||
companion object {
|
||||
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"
|
||||
|
||||
/**
|
||||
* Aktualisiert alle Widget-Instanzen und plant den nächsten Wochenwechsel.
|
||||
*/
|
||||
fun updateAllWidgets(context: Context) {
|
||||
val appWidgetManager = AppWidgetManager.getInstance(context)
|
||||
val componentName = ComponentName(context, SimpleWidget::class.java)
|
||||
val appWidgetIds = appWidgetManager.getAppWidgetIds(componentName)
|
||||
if (appWidgetIds.isEmpty()) return
|
||||
|
||||
for (appWidgetId in appWidgetIds) {
|
||||
updateAppWidget(context, appWidgetManager, appWidgetId)
|
||||
}
|
||||
scheduleNextWeekChange(context)
|
||||
}
|
||||
|
||||
fun updateAppWidget(
|
||||
context: Context,
|
||||
appWidgetManager: AppWidgetManager,
|
||||
appWidgetId: Int
|
||||
) {
|
||||
// 1. SharedPreferences auslesen
|
||||
val sharedPrefs = context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE)
|
||||
val savedSet = sharedPrefs.getStringSet("words_key", emptySet()) ?: emptySet()
|
||||
val wordList = savedSet.toList()
|
||||
val displayText = resolveWordOfWeek(context)
|
||||
?: context.getString(R.string.msg_no_words)
|
||||
|
||||
// 2. Aktuelle Kalenderwoche & Jahr bestimmen
|
||||
val calendar = Calendar.getInstance()
|
||||
val weekOfYear = calendar.get(Calendar.WEEK_OF_YEAR)
|
||||
val year = calendar.get(Calendar.YEAR)
|
||||
|
||||
// 3. Wort für die aktuelle Kalenderwoche auswählen
|
||||
val displayText = if (wordList.isNotEmpty()) {
|
||||
// Kombinierter Seed aus Jahr und Kalenderwoche
|
||||
val seed = (year * 100 + weekOfYear).toLong()
|
||||
val random = Random(seed)
|
||||
val randomIndex = random.nextInt(wordList.size)
|
||||
wordList[randomIndex]
|
||||
} else {
|
||||
context.getString(R.string.msg_no_words)
|
||||
}
|
||||
|
||||
// 4. RemoteViews aktualisieren
|
||||
val views = RemoteViews(context.packageName, R.layout.widget_main)
|
||||
views.setTextViewText(R.id.appwidget_text, displayText)
|
||||
|
||||
appWidgetManager.updateAppWidget(appWidgetId, views)
|
||||
}
|
||||
|
||||
/**
|
||||
* 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.
|
||||
*/
|
||||
private fun resolveWordOfWeek(context: Context): String? {
|
||||
val prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
|
||||
val words = (prefs.getStringSet(KEY_WORDS, emptySet()) ?: emptySet()).sorted()
|
||||
|
||||
if (words.isEmpty()) {
|
||||
prefs.edit().remove(KEY_WEEK).remove(KEY_WORD).apply()
|
||||
return null
|
||||
}
|
||||
|
||||
val weekKey = weekKeyFor(LocalDate.now())
|
||||
val storedWord = prefs.getString(KEY_WORD, null)
|
||||
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()]
|
||||
|
||||
prefs.edit()
|
||||
.putInt(KEY_WEEK, weekKey)
|
||||
.putString(KEY_WORD, word)
|
||||
.apply()
|
||||
return word
|
||||
}
|
||||
|
||||
/**
|
||||
* 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
|
||||
.atStartOfDay(ZoneId.systemDefault())
|
||||
.toInstant()
|
||||
.toEpochMilli()
|
||||
|
||||
alarmManager.setAndAllowWhileIdle(
|
||||
AlarmManager.RTC_WAKEUP,
|
||||
triggerAtMillis,
|
||||
weekChangePendingIntent(context)
|
||||
)
|
||||
}
|
||||
|
||||
private fun cancelWeekChange(context: Context) {
|
||||
val alarmManager = context.getSystemService(AlarmManager::class.java) ?: return
|
||||
alarmManager.cancel(weekChangePendingIntent(context))
|
||||
}
|
||||
|
||||
private fun weekChangePendingIntent(context: Context): PendingIntent {
|
||||
val intent = Intent(context, SimpleWidget::class.java).apply {
|
||||
action = ACTION_WEEK_CHANGED
|
||||
}
|
||||
return PendingIntent.getBroadcast(
|
||||
context,
|
||||
0,
|
||||
intent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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 })
|
||||
}
|
||||
}
|
||||
@@ -2,29 +2,177 @@ package de.schanbro.weekfocus.screens
|
||||
|
||||
import android.content.Context
|
||||
import androidx.compose.animation.AnimatedVisibility
|
||||
import androidx.compose.animation.animateColorAsState
|
||||
import androidx.compose.animation.fadeIn
|
||||
import androidx.compose.animation.fadeOut
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.gestures.detectTapGestures
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
import androidx.compose.foundation.lazy.itemsIndexed
|
||||
import androidx.compose.foundation.lazy.items
|
||||
import androidx.compose.foundation.text.KeyboardActions
|
||||
import androidx.compose.foundation.text.KeyboardOptions
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Add
|
||||
import androidx.compose.material.icons.filled.Delete
|
||||
import androidx.compose.material.icons.filled.Edit
|
||||
import androidx.compose.material3.*
|
||||
import androidx.compose.runtime.*
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.input.pointer.pointerInput
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.platform.LocalFocusManager
|
||||
import androidx.compose.ui.platform.LocalHapticFeedback
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.input.ImeAction
|
||||
import androidx.compose.ui.unit.dp
|
||||
import de.schanbro.weekfocus.R
|
||||
import de.schanbro.weekfocus.updateWidget
|
||||
import androidx.compose.ui.hapticfeedback.HapticFeedbackType
|
||||
import androidx.compose.ui.graphics.Color
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun SwipeableWordItem(
|
||||
word: String,
|
||||
onDeleteRequest: () -> Unit,
|
||||
onEditRequest: () -> Unit,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
val haptic = LocalHapticFeedback.current
|
||||
|
||||
val dismissState = rememberSwipeToDismissBoxState(
|
||||
confirmValueChange = { value ->
|
||||
when (value) {
|
||||
SwipeToDismissBoxValue.StartToEnd -> onDeleteRequest() // nach rechts
|
||||
SwipeToDismissBoxValue.EndToStart -> onEditRequest() // nach links
|
||||
SwipeToDismissBoxValue.Settled -> Unit
|
||||
}
|
||||
false // Karte springt immer zurück, Dialog übernimmt
|
||||
},
|
||||
positionalThreshold = { totalDistance -> totalDistance * 0.4f }
|
||||
)
|
||||
|
||||
// Haptisches Feedback, sobald die Schwelle überschritten wird
|
||||
LaunchedEffect(dismissState.targetValue) {
|
||||
if (dismissState.targetValue != SwipeToDismissBoxValue.Settled) {
|
||||
haptic.performHapticFeedback(HapticFeedbackType.LongPress)
|
||||
}
|
||||
}
|
||||
|
||||
SwipeToDismissBox(
|
||||
state = dismissState,
|
||||
modifier = modifier,
|
||||
backgroundContent = {
|
||||
val direction = dismissState.dismissDirection
|
||||
val isDelete = direction == SwipeToDismissBoxValue.StartToEnd
|
||||
val isEdit = direction == SwipeToDismissBoxValue.EndToStart
|
||||
|
||||
val color by animateColorAsState(
|
||||
targetValue = when {
|
||||
isDelete -> MaterialTheme.colorScheme.errorContainer
|
||||
isEdit -> MaterialTheme.colorScheme.secondaryContainer
|
||||
else -> Color.Transparent
|
||||
},
|
||||
label = "swipeBackground"
|
||||
)
|
||||
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.clip(MaterialTheme.shapes.medium)
|
||||
.background(color)
|
||||
.padding(horizontal = 20.dp),
|
||||
contentAlignment = if (isDelete) Alignment.CenterStart else Alignment.CenterEnd
|
||||
) {
|
||||
when {
|
||||
isDelete -> Icon(
|
||||
Icons.Default.Delete,
|
||||
contentDescription = null,
|
||||
tint = MaterialTheme.colorScheme.onErrorContainer
|
||||
)
|
||||
isEdit -> Icon(
|
||||
Icons.Default.Edit,
|
||||
contentDescription = null,
|
||||
tint = MaterialTheme.colorScheme.onSecondaryContainer
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
) {
|
||||
ElevatedCard(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
shape = MaterialTheme.shapes.medium,
|
||||
colors = CardDefaults.elevatedCardColors(
|
||||
containerColor = MaterialTheme.colorScheme.surfaceContainerLow
|
||||
)
|
||||
) {
|
||||
Text(
|
||||
text = word,
|
||||
style = MaterialTheme.typography.bodyLarge,
|
||||
color = MaterialTheme.colorScheme.onSurface,
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(horizontal = 16.dp, vertical = 16.dp)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun DeleteWordDialog(
|
||||
word: String,
|
||||
onConfirm: () -> Unit,
|
||||
onDismiss: () -> Unit
|
||||
) {
|
||||
AlertDialog(
|
||||
onDismissRequest = onDismiss,
|
||||
icon = { Icon(Icons.Default.Delete, contentDescription = null) },
|
||||
title = { Text(stringResource(R.string.dialog_delete_title)) },
|
||||
text = { Text(stringResource(R.string.dialog_delete_message, word)) },
|
||||
confirmButton = {
|
||||
TextButton(onClick = onConfirm) { Text(stringResource(R.string.action_delete)) }
|
||||
},
|
||||
dismissButton = {
|
||||
TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) }
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun EditWordDialog(
|
||||
word: String,
|
||||
onSave: (String) -> Unit,
|
||||
onDismiss: () -> Unit
|
||||
) {
|
||||
var text by remember(word) { mutableStateOf(word) }
|
||||
|
||||
AlertDialog(
|
||||
onDismissRequest = onDismiss,
|
||||
icon = { Icon(Icons.Default.Edit, contentDescription = null) },
|
||||
title = { Text(stringResource(R.string.dialog_edit_title)) },
|
||||
text = {
|
||||
OutlinedTextField(
|
||||
value = text,
|
||||
onValueChange = { text = it },
|
||||
singleLine = true,
|
||||
keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
|
||||
keyboardActions = KeyboardActions(onDone = { onSave(text) })
|
||||
)
|
||||
},
|
||||
confirmButton = {
|
||||
TextButton(
|
||||
onClick = { onSave(text) },
|
||||
enabled = text.isNotBlank()
|
||||
) { Text(stringResource(R.string.action_save)) }
|
||||
},
|
||||
dismissButton = {
|
||||
TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) }
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun WordListScreen(modifier: Modifier = Modifier) {
|
||||
@@ -43,25 +191,40 @@ fun WordListScreen(modifier: Modifier = Modifier) {
|
||||
}
|
||||
}
|
||||
|
||||
val haptic = LocalHapticFeedback.current
|
||||
var wordToDelete by remember { mutableStateOf<String?>(null) }
|
||||
var wordToEdit by remember { mutableStateOf<String?>(null) }
|
||||
|
||||
fun saveWords() {
|
||||
sharedPrefs.edit().putStringSet("words_key", wordList.toSet()).apply()
|
||||
}
|
||||
|
||||
fun addCurrentWord() {
|
||||
val trimmed = textInput.trim()
|
||||
if (trimmed.isNotEmpty()) {
|
||||
if (trimmed.isNotEmpty() && trimmed !in wordList) {
|
||||
wordList.add(0, trimmed)
|
||||
saveWords()
|
||||
updateWidget(context)
|
||||
textInput = ""
|
||||
focusManager.clearFocus() // Fokus aufheben & Tastatur schließen
|
||||
focusManager.clearFocus()
|
||||
}
|
||||
}
|
||||
|
||||
fun updateWord(old: String, new: String) {
|
||||
val trimmed = new.trim()
|
||||
val index = wordList.indexOf(old)
|
||||
// Duplikate vermeiden, da das Set ohnehin keine doppelten Einträge speichert
|
||||
if (index >= 0 && trimmed.isNotEmpty() && (trimmed == old || trimmed !in wordList)) {
|
||||
wordList[index] = trimmed
|
||||
saveWords()
|
||||
updateWidget(context)
|
||||
}
|
||||
}
|
||||
|
||||
Column(
|
||||
modifier = modifier
|
||||
.fillMaxSize()
|
||||
// Auf Klicks im leeren Bereich reagieren -> Fokus aufheben
|
||||
// Auf Klicks im leeren Bereich reagieren → Fokus aufheben
|
||||
.pointerInput(Unit) {
|
||||
detectTapGestures(onTap = {
|
||||
focusManager.clearFocus()
|
||||
@@ -127,43 +290,39 @@ fun WordListScreen(modifier: Modifier = Modifier) {
|
||||
verticalArrangement = Arrangement.spacedBy(8.dp),
|
||||
contentPadding = PaddingValues(bottom = 16.dp)
|
||||
) {
|
||||
itemsIndexed(wordList) { index, word ->
|
||||
ElevatedCard(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
shape = MaterialTheme.shapes.medium,
|
||||
colors = CardDefaults.elevatedCardColors(
|
||||
containerColor = MaterialTheme.colorScheme.surfaceContainerLow
|
||||
)
|
||||
) {
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(horizontal = 16.dp, vertical = 12.dp),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.SpaceBetween
|
||||
) {
|
||||
Text(
|
||||
text = word,
|
||||
style = MaterialTheme.typography.bodyLarge,
|
||||
color = MaterialTheme.colorScheme.onSurface,
|
||||
modifier = Modifier.weight(1f)
|
||||
)
|
||||
IconButton(
|
||||
onClick = {
|
||||
wordList.removeAt(index)
|
||||
saveWords()
|
||||
updateWidget(context)
|
||||
}
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.Delete,
|
||||
contentDescription = "Entfernen",
|
||||
tint = MaterialTheme.colorScheme.error
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
items(items = wordList, key = { it }) { word ->
|
||||
SwipeableWordItem(
|
||||
word = word,
|
||||
onDeleteRequest = { wordToDelete = word },
|
||||
onEditRequest = { wordToEdit = word },
|
||||
modifier = Modifier.animateItem() // ältere Compose-Versionen: animateItemPlacement()
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
wordToDelete?.let { word ->
|
||||
DeleteWordDialog(
|
||||
word = word,
|
||||
onConfirm = {
|
||||
wordList.remove(word)
|
||||
saveWords()
|
||||
updateWidget(context)
|
||||
haptic.performHapticFeedback(HapticFeedbackType.LongPress)
|
||||
wordToDelete = null
|
||||
},
|
||||
onDismiss = { wordToDelete = null }
|
||||
)
|
||||
}
|
||||
|
||||
wordToEdit?.let { word ->
|
||||
EditWordDialog(
|
||||
word = word,
|
||||
onSave = { new ->
|
||||
updateWord(word, new)
|
||||
wordToEdit = null
|
||||
},
|
||||
onDismiss = { wordToEdit = 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,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)
|
||||
}
|
||||
}
|
||||
@@ -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)
|
||||
}
|
||||
@@ -0,0 +1,88 @@
|
||||
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
|
||||
import org.json.JSONArray
|
||||
|
||||
data class ReleaseInfo(
|
||||
val version: String,
|
||||
val notes: String,
|
||||
val apkUrl: String
|
||||
)
|
||||
|
||||
object UpdateChecker {
|
||||
|
||||
private const val RELEASES_URL =
|
||||
"https://git.schamagusa.de/api/v1/repos/robin/WeekFocus/releases"
|
||||
|
||||
suspend fun fetchLatestRelease(includePrereleases: Boolean = false): ReleaseInfo? =
|
||||
withContext(Dispatchers.IO) {
|
||||
try {
|
||||
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")
|
||||
return try {
|
||||
if (conn.responseCode == HttpURLConnection.HTTP_OK) {
|
||||
conn.inputStream.bufferedReader().use { it.readText() }
|
||||
} else null
|
||||
} finally {
|
||||
conn.disconnect()
|
||||
}
|
||||
}
|
||||
|
||||
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 null
|
||||
return ReleaseInfo(
|
||||
version = json.getString("tag_name"),
|
||||
notes = json.optString("body", ""),
|
||||
apkUrl = apk.getString("browser_download_url")
|
||||
)
|
||||
}
|
||||
|
||||
@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<Int> =
|
||||
version.trim().removePrefix("v").substringBefore("-")
|
||||
.split(".").map { it.toIntOrNull() ?: 0 }
|
||||
}
|
||||
@@ -0,0 +1,128 @@
|
||||
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 de.schanbro.weekfocus.settings.SettingsRepository
|
||||
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 settings = remember { SettingsRepository.get(context) }
|
||||
val prefs = remember {
|
||||
context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE)
|
||||
}
|
||||
var release by remember { mutableStateOf<ReleaseInfo?>(null) }
|
||||
|
||||
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(settings.includePrereleases)
|
||||
?: return@LaunchedEffect
|
||||
prefs.edit().putLong("last_update_check", now).apply()
|
||||
|
||||
if (UpdateChecker.isNewer(latest.version, UpdateChecker.currentVersion(context))) {
|
||||
release = latest
|
||||
}
|
||||
}
|
||||
|
||||
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) onDismiss() },
|
||||
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
|
||||
onDismiss()
|
||||
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
|
||||
onDismiss()
|
||||
}
|
||||
) {
|
||||
Text(
|
||||
stringResource(
|
||||
if (downloading) R.string.action_cancel else R.string.update_later
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
@@ -1,11 +1,67 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="hint_new_word">Enter new Word</string>
|
||||
<string name="hint_new_word">Enter new word</string>
|
||||
<string name="hint_add_word">Add word</string>
|
||||
<string name="msg_no_words_yet">No words yet.</string>
|
||||
<string name="msg_no_words">No words</string>
|
||||
<string name="title_weekly_focus">Weekly Focus</string>
|
||||
<string name="title_weekly_focus">Weekly focus</string>
|
||||
<string name="title_settings">Settings</string>
|
||||
<string name="title_words">Words</string>
|
||||
<string name="title_home">Home</string>
|
||||
|
||||
<string name="action_delete">Delete</string>
|
||||
<string name="action_cancel">Cancel</string>
|
||||
<string name="action_save">Save</string>
|
||||
|
||||
<string name="dialog_delete_title">Delete word?</string>
|
||||
<string name="dialog_delete_message">“%1$s” will be permanently removed.</string>
|
||||
<string name="dialog_edit_title">Edit word</string>
|
||||
|
||||
<string name="update_title">Update available</string>
|
||||
<string name="update_message">Version %1$s is available. Download and install now?</string>
|
||||
<string name="update_action">Update</string>
|
||||
<string name="update_later">Later</string>
|
||||
<string name="update_failed">Update failed. Please try again later.</string>
|
||||
<string name="update_permission_hint">Please allow installs from this source, then tap “Update” again.</string>
|
||||
|
||||
<string name="permission_network_title">Network access needed</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_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>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="splash_background">#121212</color>
|
||||
</resources>
|
||||
@@ -7,4 +7,5 @@
|
||||
<color name="teal_700">#FF018786</color>
|
||||
<color name="black">#FF000000</color>
|
||||
<color name="white">#FFFFFFFF</color>
|
||||
<color name="splash_background">#FFFFFF</color>
|
||||
</resources>
|
||||
@@ -9,4 +9,66 @@
|
||||
<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>
|
||||
<string name="action_cancel">Abbrechen</string>
|
||||
<string name="action_save">Speichern</string>
|
||||
|
||||
<!-- Dialoge -->
|
||||
<string name="dialog_delete_title">Wort löschen?</string>
|
||||
<string name="dialog_delete_message">„%1$s“ wird dauerhaft entfernt.</string>
|
||||
<string name="dialog_edit_title">Wort bearbeiten</string>
|
||||
|
||||
<!-- Auto-Update -->
|
||||
<string name="update_title">Update verfügbar</string>
|
||||
<string name="update_message">Version %1$s ist verfügbar. Jetzt herunterladen und installieren?</string>
|
||||
<string name="update_action">Aktualisieren</string>
|
||||
<string name="update_later">Später</string>
|
||||
<string name="update_failed">Update fehlgeschlagen. Bitte später erneut versuchen.</string>
|
||||
<string name="update_permission_hint">Bitte die Installation aus dieser Quelle erlauben und danach erneut auf „Aktualisieren“ tippen.</string>
|
||||
|
||||
<!-- Berechntigungen -->
|
||||
<string name="permission_network_title">Netzwerkzugriff benötigt</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_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>
|
||||
@@ -1,5 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<style name="Theme.WeekFocus" parent="android:Theme.Material.Light.NoActionBar" />
|
||||
<style name="Theme.WeekFocus.Splash" parent="Theme.SplashScreen">
|
||||
<item name="windowSplashScreenBackground">@color/splash_background</item>
|
||||
<item name="windowSplashScreenAnimatedIcon">@mipmap/ic_launcher</item>
|
||||
<item name="postSplashScreenTheme">@style/Theme.WeekFocus</item>
|
||||
</style>
|
||||
</resources>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<paths>
|
||||
<cache-path name="updates" path="updates/" />
|
||||
</paths>
|
||||
@@ -8,6 +8,7 @@ lifecycleRuntimeKtx = "2.11.0"
|
||||
activityCompose = "1.13.0"
|
||||
kotlin = "2.4.20"
|
||||
composeBom = "2026.09.00"
|
||||
animation = "1.12.1"
|
||||
|
||||
[libraries]
|
||||
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
|
||||
@@ -25,6 +26,7 @@ androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-
|
||||
androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
|
||||
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
|
||||
androidx-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" }
|
||||
androidx-compose-animation = { group = "androidx.compose.animation", name = "animation", version.ref = "animation" }
|
||||
|
||||
[plugins]
|
||||
android-application = { id = "com.android.application", version.ref = "agp" }
|
||||
|
||||
Reference in new issue
Block a user