Compare commits
4
Commits
792047eae4
..
v1.4.4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c87f51017f | ||
|
|
a876465894 | ||
|
|
761ee25642 | ||
|
|
c56ff94a47 |
No files matched your search
@@ -1,5 +1,9 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [1.4.4] - 2026-10-30
|
||||||
|
### New
|
||||||
|
* home screen
|
||||||
|
|
||||||
## [1.4.2] - 2026-10-30
|
## [1.4.2] - 2026-10-30
|
||||||
### New
|
### New
|
||||||
* show changelog after update
|
* show changelog after update
|
||||||
|
|||||||
@@ -6,25 +6,21 @@ import androidx.activity.ComponentActivity
|
|||||||
import androidx.activity.compose.setContent
|
import androidx.activity.compose.setContent
|
||||||
import androidx.activity.enableEdgeToEdge
|
import androidx.activity.enableEdgeToEdge
|
||||||
import androidx.compose.foundation.isSystemInDarkTheme
|
import androidx.compose.foundation.isSystemInDarkTheme
|
||||||
import androidx.compose.foundation.layout.*
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.automirrored.filled.ArrowBack
|
import androidx.compose.material.icons.automirrored.filled.ArrowBack
|
||||||
import androidx.compose.material.icons.filled.Home
|
import androidx.compose.material.icons.filled.Home
|
||||||
import androidx.compose.material.icons.filled.List
|
|
||||||
import androidx.compose.material.icons.filled.Settings
|
import androidx.compose.material.icons.filled.Settings
|
||||||
import androidx.compose.material.icons.outlined.Home
|
import androidx.compose.material.icons.outlined.Home
|
||||||
import androidx.compose.material.icons.outlined.List
|
|
||||||
import androidx.compose.material.icons.outlined.Settings
|
import androidx.compose.material.icons.outlined.Settings
|
||||||
import androidx.compose.material3.*
|
|
||||||
import androidx.compose.runtime.*
|
import androidx.compose.runtime.*
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.input.nestedscroll.nestedScroll
|
import androidx.compose.ui.graphics.vector.ImageVector
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
import androidx.navigation.NavGraph.Companion.findStartDestination
|
import androidx.navigation.NavGraph.Companion.findStartDestination
|
||||||
import androidx.navigation.compose.*
|
|
||||||
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
|
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
|
||||||
import de.schanbro.weekfocus.screens.AboutScreen
|
import de.schanbro.weekfocus.screens.AboutScreen
|
||||||
|
import de.schanbro.weekfocus.screens.HomeScreen
|
||||||
import de.schanbro.weekfocus.screens.SettingsScreen
|
import de.schanbro.weekfocus.screens.SettingsScreen
|
||||||
import de.schanbro.weekfocus.screens.WordListScreen
|
import de.schanbro.weekfocus.screens.WordListScreen
|
||||||
import de.schanbro.weekfocus.settings.SettingsRepository
|
import de.schanbro.weekfocus.settings.SettingsRepository
|
||||||
@@ -33,6 +29,27 @@ import de.schanbro.weekfocus.ui.theme.WeekFocusTheme
|
|||||||
import de.schanbro.weekfocus.update.NetworkPermissionGate
|
import de.schanbro.weekfocus.update.NetworkPermissionGate
|
||||||
import de.schanbro.weekfocus.update.UpdateHandler
|
import de.schanbro.weekfocus.update.UpdateHandler
|
||||||
import de.schanbro.weekfocus.update.WhatsNewHandler
|
import de.schanbro.weekfocus.update.WhatsNewHandler
|
||||||
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.material.icons.automirrored.filled.List
|
||||||
|
import androidx.compose.material.icons.automirrored.outlined.List
|
||||||
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
|
import androidx.compose.material3.Icon
|
||||||
|
import androidx.compose.material3.IconButton
|
||||||
|
import androidx.compose.material3.LargeTopAppBar
|
||||||
|
import androidx.compose.material3.MaterialTheme
|
||||||
|
import androidx.compose.material3.NavigationBar
|
||||||
|
import androidx.compose.material3.NavigationBarItem
|
||||||
|
import androidx.compose.material3.Scaffold
|
||||||
|
import androidx.compose.material3.Text
|
||||||
|
import androidx.compose.material3.TopAppBar
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.navigation.compose.NavHost
|
||||||
|
import androidx.navigation.compose.composable
|
||||||
|
import androidx.navigation.compose.currentBackStackEntryAsState
|
||||||
|
import androidx.navigation.compose.rememberNavController
|
||||||
|
import androidx.compose.material3.TopAppBarDefaults
|
||||||
|
import androidx.compose.ui.input.nestedscroll.nestedScroll
|
||||||
|
|
||||||
private object Routes {
|
private object Routes {
|
||||||
const val HOME = "home"
|
const val HOME = "home"
|
||||||
@@ -41,6 +58,31 @@ private object Routes {
|
|||||||
const val ABOUT = "about"
|
const val ABOUT = "about"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private data class Tab(
|
||||||
|
val route: String,
|
||||||
|
val labelRes: Int,
|
||||||
|
val iconSelected: ImageVector,
|
||||||
|
val iconUnselected: ImageVector
|
||||||
|
)
|
||||||
|
|
||||||
|
private val tabs = listOf(
|
||||||
|
Tab(Routes.HOME, R.string.title_home, Icons.Filled.Home, Icons.Outlined.Home),
|
||||||
|
Tab(
|
||||||
|
Routes.WORDS, R.string.title_words,
|
||||||
|
Icons.AutoMirrored.Filled.List, Icons.AutoMirrored.Outlined.List
|
||||||
|
),
|
||||||
|
Tab(Routes.SETTINGS, R.string.title_settings, Icons.Filled.Settings, Icons.Outlined.Settings)
|
||||||
|
)
|
||||||
|
|
||||||
|
/** Titel im Header je Route. Hier bei Bedarf anpassen. */
|
||||||
|
private fun titleFor(route: String?): Int = when (route) {
|
||||||
|
Routes.HOME -> R.string.title_weekly_focus
|
||||||
|
Routes.WORDS -> R.string.title_words
|
||||||
|
Routes.SETTINGS -> R.string.title_settings
|
||||||
|
Routes.ABOUT -> R.string.title_about
|
||||||
|
else -> R.string.app_name
|
||||||
|
}
|
||||||
|
|
||||||
class MainActivity : ComponentActivity() {
|
class MainActivity : ComponentActivity() {
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
installSplashScreen()
|
installSplashScreen()
|
||||||
@@ -78,23 +120,23 @@ fun MainScreen() {
|
|||||||
val currentRoute = backStackEntry?.destination?.route
|
val currentRoute = backStackEntry?.destination?.route
|
||||||
val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
|
val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
|
||||||
|
|
||||||
|
fun navigateToTab(route: String) {
|
||||||
|
navController.navigate(route) {
|
||||||
|
popUpTo(navController.graph.findStartDestination().id) {
|
||||||
|
saveState = true
|
||||||
|
}
|
||||||
|
launchSingleTop = true
|
||||||
|
restoreState = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Scaffold(
|
Scaffold(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
.nestedScroll(scrollBehavior.nestedScrollConnection),
|
.nestedScroll(scrollBehavior.nestedScrollConnection),
|
||||||
topBar = {
|
topBar = {
|
||||||
LargeTopAppBar(
|
LargeTopAppBar(
|
||||||
title = {
|
title = { Text(stringResource(titleFor(currentRoute))) },
|
||||||
Text(
|
|
||||||
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 = {
|
navigationIcon = {
|
||||||
if (currentRoute == Routes.ABOUT) {
|
if (currentRoute == Routes.ABOUT) {
|
||||||
IconButton(onClick = { navController.popBackStack() }) {
|
IconButton(onClick = { navController.popBackStack() }) {
|
||||||
@@ -113,105 +155,43 @@ fun MainScreen() {
|
|||||||
)
|
)
|
||||||
},
|
},
|
||||||
bottomBar = {
|
bottomBar = {
|
||||||
if (currentRoute != Routes.ABOUT) {
|
if (tabs.any { it.route == currentRoute }) {
|
||||||
NavigationBar {
|
NavigationBar {
|
||||||
NavigationBarItem(
|
tabs.forEach { tab ->
|
||||||
selected = currentRoute == Routes.HOME,
|
val selected = currentRoute == tab.route
|
||||||
onClick = {
|
NavigationBarItem(
|
||||||
navController.navigate(Routes.HOME) {
|
selected = selected,
|
||||||
popUpTo(navController.graph.findStartDestination().id) {
|
onClick = { navigateToTab(tab.route) },
|
||||||
saveState = true
|
icon = {
|
||||||
}
|
Icon(
|
||||||
launchSingleTop = true
|
imageVector = if (selected) tab.iconSelected else tab.iconUnselected,
|
||||||
restoreState = true
|
contentDescription = null
|
||||||
}
|
)
|
||||||
},
|
},
|
||||||
icon = {
|
label = { Text(stringResource(tab.labelRes)) }
|
||||||
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 ->
|
) { padding ->
|
||||||
Surface(
|
NavHost(
|
||||||
modifier = Modifier
|
navController = navController,
|
||||||
.fillMaxSize()
|
startDestination = Routes.HOME,
|
||||||
.padding(innerPadding),
|
modifier = Modifier.padding(padding)
|
||||||
color = MaterialTheme.colorScheme.background
|
|
||||||
) {
|
) {
|
||||||
NavHost(
|
composable(Routes.HOME) {
|
||||||
navController = navController,
|
HomeScreen(onOpenWords = { navigateToTab(Routes.WORDS) })
|
||||||
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() }
|
|
||||||
}
|
}
|
||||||
|
composable(Routes.WORDS) { WordListScreen() }
|
||||||
|
composable(Routes.SETTINGS) {
|
||||||
|
SettingsScreen(onOpenAbout = { navController.navigate(Routes.ABOUT) })
|
||||||
|
}
|
||||||
|
composable(Routes.ABOUT) { AboutScreen() }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun PlaceholderScreen(title: String) {
|
|
||||||
Box(
|
|
||||||
modifier = Modifier.fillMaxSize(),
|
|
||||||
contentAlignment = Alignment.Center
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
text = title,
|
|
||||||
style = MaterialTheme.typography.headlineMedium,
|
|
||||||
color = MaterialTheme.colorScheme.onSurfaceVariant
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun updateWidget(context: Context) {
|
fun updateWidget(context: Context) {
|
||||||
SimpleWidget.updateAllWidgets(context)
|
SimpleWidget.updateAllWidgets(context)
|
||||||
}
|
}
|
||||||
@@ -11,21 +11,18 @@ import android.widget.RemoteViews
|
|||||||
import java.time.DayOfWeek
|
import java.time.DayOfWeek
|
||||||
import java.time.LocalDate
|
import java.time.LocalDate
|
||||||
import java.time.ZoneId
|
import java.time.ZoneId
|
||||||
import java.time.temporal.ChronoUnit
|
|
||||||
import java.time.temporal.IsoFields
|
|
||||||
import java.time.temporal.TemporalAdjusters
|
import java.time.temporal.TemporalAdjusters
|
||||||
|
|
||||||
class SimpleWidget : AppWidgetProvider() {
|
class SimpleWidget : AppWidgetProvider() {
|
||||||
|
|
||||||
override fun onReceive(context: Context, intent: Intent) {
|
override fun onReceive(context: Context, intent: Intent) {
|
||||||
// Verarbeitet u.a. APPWIDGET_UPDATE / ENABLED / DISABLED und ruft die Callbacks unten auf
|
|
||||||
super.onReceive(context, intent)
|
super.onReceive(context, intent)
|
||||||
|
|
||||||
when (intent.action) {
|
when (intent.action) {
|
||||||
ACTION_WEEK_CHANGED,
|
ACTION_WEEK_CHANGED,
|
||||||
Intent.ACTION_BOOT_COMPLETED, // Alarme überleben keinen Neustart
|
Intent.ACTION_BOOT_COMPLETED,
|
||||||
Intent.ACTION_DATE_CHANGED,
|
Intent.ACTION_DATE_CHANGED,
|
||||||
Intent.ACTION_TIME_CHANGED, // "android.intent.action.TIME_SET"
|
Intent.ACTION_TIME_CHANGED,
|
||||||
Intent.ACTION_TIMEZONE_CHANGED -> updateAllWidgets(context)
|
Intent.ACTION_TIMEZONE_CHANGED -> updateAllWidgets(context)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -38,17 +35,14 @@ class SimpleWidget : AppWidgetProvider() {
|
|||||||
for (appWidgetId in appWidgetIds) {
|
for (appWidgetId in appWidgetIds) {
|
||||||
updateAppWidget(context, appWidgetManager, appWidgetId)
|
updateAppWidget(context, appWidgetManager, appWidgetId)
|
||||||
}
|
}
|
||||||
// Selbstheilung: stellt sicher, dass immer ein Wochenwechsel-Alarm existiert
|
|
||||||
scheduleNextWeekChange(context)
|
scheduleNextWeekChange(context)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onEnabled(context: Context) {
|
override fun onEnabled(context: Context) {
|
||||||
// Erstes Widget wurde platziert
|
|
||||||
scheduleNextWeekChange(context)
|
scheduleNextWeekChange(context)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDisabled(context: Context) {
|
override fun onDisabled(context: Context) {
|
||||||
// Letztes Widget wurde entfernt
|
|
||||||
cancelWeekChange(context)
|
cancelWeekChange(context)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -56,7 +50,6 @@ class SimpleWidget : AppWidgetProvider() {
|
|||||||
const val ACTION_WEEK_CHANGED = "de.schanbro.weekfocus.ACTION_WEEK_CHANGED"
|
const val ACTION_WEEK_CHANGED = "de.schanbro.weekfocus.ACTION_WEEK_CHANGED"
|
||||||
|
|
||||||
private const val PREFS_NAME = "WeekFocusPrefs"
|
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_WEEK = "current_week_key"
|
||||||
private const val KEY_WORD = "current_word"
|
private const val KEY_WORD = "current_word"
|
||||||
|
|
||||||
@@ -90,63 +83,50 @@ class SimpleWidget : AppWidgetProvider() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ISO-Kalenderwoche (Montag = Wochenbeginn, unabhängig von der Geräte-Locale)
|
* Holt das Wort für die aktuelle Woche unter Verwendung von WordOfWeek
|
||||||
* kombiniert mit dem zugehörigen Wochenjahr, z.B. 202641.
|
* und speichert es persistent ab, solange sich die Woche nicht ändert.
|
||||||
*
|
|
||||||
* 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? {
|
private fun resolveWordOfWeek(context: Context): String? {
|
||||||
val prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
|
// Wörter sortiert laden, damit die Reihenfolge deterministisch bleibt
|
||||||
val words = (prefs.getStringSet(KEY_WORDS, emptySet()) ?: emptySet()).sorted()
|
val words = WordOfWeek.loadWords(context).sorted()
|
||||||
|
|
||||||
if (words.isEmpty()) {
|
if (words.isEmpty()) {
|
||||||
prefs.edit().remove(KEY_WEEK).remove(KEY_WORD).apply()
|
context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
|
||||||
|
.edit().remove(KEY_WEEK).remove(KEY_WORD).apply()
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
val weekKey = weekKeyFor(LocalDate.now())
|
val currentWeek = WordOfWeek.weekOf(0)
|
||||||
|
val weekKey = currentWeek.weekYear * 100 + currentWeek.weekNumber
|
||||||
|
|
||||||
|
val prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
|
||||||
val storedWord = prefs.getString(KEY_WORD, null)
|
val storedWord = prefs.getString(KEY_WORD, null)
|
||||||
|
|
||||||
|
// Wenn die gespeicherte Woche passt und das gespeicherte Wort noch in der Liste existiert: behalten
|
||||||
if (prefs.getInt(KEY_WEEK, -1) == weekKey && storedWord != null && storedWord in words) {
|
if (prefs.getInt(KEY_WEEK, -1) == weekKey && storedWord != null && storedWord in words) {
|
||||||
return storedWord
|
return storedWord
|
||||||
}
|
}
|
||||||
|
|
||||||
val currentMonday = LocalDate.now().with(DayOfWeek.MONDAY)
|
// Ansonsten neu über WordOfWeek bestimmen
|
||||||
val weeksSinceEpoch = ChronoUnit.WEEKS.between(LocalDate.ofEpochDay(4), currentMonday) // 5.1.1970 war ein Montag
|
val newWord = WordOfWeek.wordFor(words, currentWeek) ?: return null
|
||||||
val word = words[(weeksSinceEpoch % words.size).toInt()]
|
|
||||||
|
|
||||||
|
// Speichern für den Rest der Woche
|
||||||
prefs.edit()
|
prefs.edit()
|
||||||
.putInt(KEY_WEEK, weekKey)
|
.putInt(KEY_WEEK, weekKey)
|
||||||
.putString(KEY_WORD, word)
|
.putString(KEY_WORD, newWord)
|
||||||
.apply()
|
.apply()
|
||||||
return word
|
|
||||||
|
return newWord
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Plant einen Alarm für den nächsten Montag, 00:00 Uhr (lokale Zeit).
|
* 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) {
|
private fun scheduleNextWeekChange(context: Context) {
|
||||||
val alarmManager = context.getSystemService(AlarmManager::class.java) ?: return
|
val alarmManager = context.getSystemService(AlarmManager::class.java) ?: return
|
||||||
|
|
||||||
val triggerAtMillis = LocalDate.now()
|
val triggerAtMillis = LocalDate.now()
|
||||||
.with(TemporalAdjusters.next(DayOfWeek.MONDAY)) // "next" schließt heute aus
|
.with(TemporalAdjusters.next(DayOfWeek.MONDAY))
|
||||||
.atStartOfDay(ZoneId.systemDefault())
|
.atStartOfDay(ZoneId.systemDefault())
|
||||||
.toInstant()
|
.toInstant()
|
||||||
.toEpochMilli()
|
.toEpochMilli()
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
package de.schanbro.weekfocus
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import java.time.DayOfWeek
|
||||||
|
import java.time.LocalDate
|
||||||
|
import java.time.temporal.IsoFields
|
||||||
|
import java.util.Random
|
||||||
|
|
||||||
|
data class WeekInfo(val monday: LocalDate) {
|
||||||
|
val sunday: LocalDate get() = monday.plusDays(6)
|
||||||
|
val weekNumber: Int get() = monday.get(IsoFields.WEEK_OF_WEEK_BASED_YEAR)
|
||||||
|
val weekYear: Int get() = monday.get(IsoFields.WEEK_BASED_YEAR)
|
||||||
|
}
|
||||||
|
|
||||||
|
object WordOfWeek {
|
||||||
|
|
||||||
|
fun loadWords(context: Context): List<String> =
|
||||||
|
context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE)
|
||||||
|
.getStringSet("words_key", emptySet())
|
||||||
|
?.toList()
|
||||||
|
.orEmpty()
|
||||||
|
|
||||||
|
/** offset 0 = diese Woche, -1 = letzte, 1 = nächste ... */
|
||||||
|
fun weekOf(offset: Int = 0, today: LocalDate = LocalDate.now()): WeekInfo =
|
||||||
|
WeekInfo(today.with(DayOfWeek.MONDAY).plusWeeks(offset.toLong()))
|
||||||
|
|
||||||
|
fun wordFor(words: List<String>, week: WeekInfo): String? {
|
||||||
|
if (words.isEmpty()) return null
|
||||||
|
val seed = (week.weekYear * 100 + week.weekNumber).toLong()
|
||||||
|
return words[Random(seed).nextInt(words.size)]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,328 @@
|
|||||||
|
package de.schanbro.weekfocus.screens
|
||||||
|
|
||||||
|
import android.appwidget.AppWidgetManager
|
||||||
|
import android.content.ComponentName
|
||||||
|
import android.content.Context
|
||||||
|
import android.text.format.DateUtils
|
||||||
|
import androidx.compose.animation.AnimatedContent
|
||||||
|
import androidx.compose.animation.fadeIn
|
||||||
|
import androidx.compose.animation.fadeOut
|
||||||
|
import androidx.compose.animation.slideInHorizontally
|
||||||
|
import androidx.compose.animation.slideOutHorizontally
|
||||||
|
import androidx.compose.animation.togetherWith
|
||||||
|
import androidx.compose.foundation.clickable
|
||||||
|
import androidx.compose.foundation.layout.*
|
||||||
|
import androidx.compose.foundation.rememberScrollState
|
||||||
|
import androidx.compose.foundation.verticalScroll
|
||||||
|
import androidx.compose.material.icons.Icons
|
||||||
|
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowLeft
|
||||||
|
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
|
||||||
|
import androidx.compose.material.icons.filled.Check
|
||||||
|
import androidx.compose.material3.*
|
||||||
|
import androidx.compose.runtime.*
|
||||||
|
import androidx.compose.runtime.saveable.rememberSaveable
|
||||||
|
import androidx.compose.ui.Alignment
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.graphics.Color
|
||||||
|
import androidx.compose.ui.hapticfeedback.HapticFeedbackType
|
||||||
|
import androidx.compose.ui.platform.LocalContext
|
||||||
|
import androidx.compose.ui.platform.LocalHapticFeedback
|
||||||
|
import androidx.compose.ui.res.stringResource
|
||||||
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
|
import androidx.compose.ui.text.style.TextAlign
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
|
import androidx.lifecycle.Lifecycle
|
||||||
|
import androidx.lifecycle.compose.LifecycleEventEffect
|
||||||
|
import de.schanbro.weekfocus.R
|
||||||
|
import de.schanbro.weekfocus.SimpleWidget
|
||||||
|
import de.schanbro.weekfocus.WeekInfo
|
||||||
|
import de.schanbro.weekfocus.WordOfWeek
|
||||||
|
import java.time.LocalDate
|
||||||
|
import java.time.ZoneId
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun HomeScreen(
|
||||||
|
onOpenWords: () -> Unit,
|
||||||
|
modifier: Modifier = Modifier
|
||||||
|
) {
|
||||||
|
val context = LocalContext.current
|
||||||
|
val haptic = LocalHapticFeedback.current
|
||||||
|
|
||||||
|
var words by remember { mutableStateOf(WordOfWeek.loadWords(context)) }
|
||||||
|
var widgetPlaced by remember { mutableStateOf(true) } // true = kein Flackern beim Start
|
||||||
|
var weekOffset by rememberSaveable { mutableIntStateOf(0) }
|
||||||
|
val canPinWidget = remember {
|
||||||
|
AppWidgetManager.getInstance(context).isRequestPinAppWidgetSupported
|
||||||
|
}
|
||||||
|
|
||||||
|
// Beim Zurückkehren (Wörter-Tab, Launcher, Widget) neu laden
|
||||||
|
LifecycleEventEffect(Lifecycle.Event.ON_RESUME) {
|
||||||
|
words = WordOfWeek.loadWords(context)
|
||||||
|
widgetPlaced = isWidgetPlaced(context)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun changeOffset(new: Int) {
|
||||||
|
haptic.performHapticFeedback(HapticFeedbackType.TextHandleMove)
|
||||||
|
weekOffset = new
|
||||||
|
}
|
||||||
|
|
||||||
|
Column(
|
||||||
|
modifier = modifier
|
||||||
|
.fillMaxSize()
|
||||||
|
.verticalScroll(rememberScrollState())
|
||||||
|
.padding(horizontal = 16.dp, vertical = 8.dp),
|
||||||
|
verticalArrangement = Arrangement.spacedBy(16.dp)
|
||||||
|
) {
|
||||||
|
if (words.isEmpty()) {
|
||||||
|
EmptyCard(onOpenWords)
|
||||||
|
} else {
|
||||||
|
WordHeroCard(words, weekOffset, ::changeOffset)
|
||||||
|
WeeksCard(words, weekOffset, ::changeOffset)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!widgetPlaced && canPinWidget) {
|
||||||
|
WidgetCard(
|
||||||
|
onAdd = {
|
||||||
|
AppWidgetManager.getInstance(context).requestPinAppWidget(
|
||||||
|
ComponentName(context, SimpleWidget::class.java), null, null
|
||||||
|
)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
Spacer(Modifier.height(8.dp))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
private fun WordHeroCard(
|
||||||
|
words: List<String>,
|
||||||
|
weekOffset: Int,
|
||||||
|
onOffsetChange: (Int) -> Unit
|
||||||
|
) {
|
||||||
|
val context = LocalContext.current
|
||||||
|
val week = WordOfWeek.weekOf(weekOffset)
|
||||||
|
val onColor = MaterialTheme.colorScheme.onPrimaryContainer
|
||||||
|
|
||||||
|
Card(
|
||||||
|
modifier = Modifier.fillMaxWidth(),
|
||||||
|
shape = MaterialTheme.shapes.extraLarge,
|
||||||
|
colors = CardDefaults.cardColors(
|
||||||
|
containerColor = MaterialTheme.colorScheme.primaryContainer,
|
||||||
|
contentColor = onColor
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
Column(
|
||||||
|
modifier = Modifier.padding(16.dp),
|
||||||
|
horizontalAlignment = Alignment.CenterHorizontally
|
||||||
|
) {
|
||||||
|
Row(
|
||||||
|
modifier = Modifier.fillMaxWidth(),
|
||||||
|
verticalAlignment = Alignment.CenterVertically
|
||||||
|
) {
|
||||||
|
IconButton(onClick = { onOffsetChange(weekOffset - 1) }) {
|
||||||
|
Icon(
|
||||||
|
Icons.AutoMirrored.Filled.KeyboardArrowLeft,
|
||||||
|
contentDescription = stringResource(R.string.home_cd_previous)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
Column(
|
||||||
|
modifier = Modifier.weight(1f),
|
||||||
|
horizontalAlignment = Alignment.CenterHorizontally
|
||||||
|
) {
|
||||||
|
Text(
|
||||||
|
text = weekLabel(weekOffset, week),
|
||||||
|
style = MaterialTheme.typography.labelLarge
|
||||||
|
)
|
||||||
|
Text(
|
||||||
|
text = stringResource(
|
||||||
|
R.string.home_week_range,
|
||||||
|
week.weekNumber,
|
||||||
|
formatRange(context, week)
|
||||||
|
),
|
||||||
|
style = MaterialTheme.typography.bodySmall
|
||||||
|
)
|
||||||
|
}
|
||||||
|
IconButton(onClick = { onOffsetChange(weekOffset + 1) }) {
|
||||||
|
Icon(
|
||||||
|
Icons.AutoMirrored.Filled.KeyboardArrowRight,
|
||||||
|
contentDescription = stringResource(R.string.home_cd_next)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
AnimatedContent(
|
||||||
|
targetState = weekOffset,
|
||||||
|
transitionSpec = {
|
||||||
|
val dir = if (targetState > initialState) 1 else -1
|
||||||
|
(slideInHorizontally { width -> width * dir } + fadeIn()) togetherWith
|
||||||
|
(slideOutHorizontally { width -> -width * dir } + fadeOut())
|
||||||
|
},
|
||||||
|
label = "word"
|
||||||
|
) { offset ->
|
||||||
|
Text(
|
||||||
|
text = WordOfWeek.wordFor(words, WordOfWeek.weekOf(offset)).orEmpty(),
|
||||||
|
style = MaterialTheme.typography.displaySmall,
|
||||||
|
fontWeight = FontWeight.Bold,
|
||||||
|
textAlign = TextAlign.Center,
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.padding(vertical = 32.dp, horizontal = 8.dp)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (weekOffset == 0) {
|
||||||
|
val day = remember { LocalDate.now().dayOfWeek.value } // 1 = Mo ... 7 = So
|
||||||
|
LinearProgressIndicator(
|
||||||
|
progress = { day / 7f },
|
||||||
|
modifier = Modifier.fillMaxWidth(),
|
||||||
|
color = onColor,
|
||||||
|
trackColor = onColor.copy(alpha = 0.15f)
|
||||||
|
)
|
||||||
|
Spacer(Modifier.height(8.dp))
|
||||||
|
Text(
|
||||||
|
text = stringResource(R.string.home_day_progress, day),
|
||||||
|
style = MaterialTheme.typography.bodySmall
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
FilledTonalButton(onClick = { onOffsetChange(0) }) {
|
||||||
|
Text(stringResource(R.string.home_back_to_current))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
private fun WeeksCard(
|
||||||
|
words: List<String>,
|
||||||
|
selectedOffset: Int,
|
||||||
|
onOffsetChange: (Int) -> Unit
|
||||||
|
) {
|
||||||
|
val context = LocalContext.current
|
||||||
|
|
||||||
|
Column {
|
||||||
|
Text(
|
||||||
|
text = stringResource(R.string.home_more_weeks),
|
||||||
|
style = MaterialTheme.typography.labelLarge,
|
||||||
|
color = MaterialTheme.colorScheme.primary,
|
||||||
|
modifier = Modifier.padding(start = 4.dp, bottom = 8.dp)
|
||||||
|
)
|
||||||
|
Card(
|
||||||
|
modifier = Modifier.fillMaxWidth(),
|
||||||
|
shape = MaterialTheme.shapes.large,
|
||||||
|
colors = CardDefaults.cardColors(
|
||||||
|
containerColor = MaterialTheme.colorScheme.surfaceContainerLow
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
listOf(-2, -1, 0, 1, 2, 3).forEach { offset ->
|
||||||
|
val week = WordOfWeek.weekOf(offset)
|
||||||
|
ListItem(
|
||||||
|
overlineContent = {
|
||||||
|
Text(
|
||||||
|
stringResource(
|
||||||
|
R.string.home_week_range,
|
||||||
|
week.weekNumber,
|
||||||
|
formatRange(context, week)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
},
|
||||||
|
headlineContent = {
|
||||||
|
Text(WordOfWeek.wordFor(words, week).orEmpty())
|
||||||
|
},
|
||||||
|
trailingContent = {
|
||||||
|
if (offset == selectedOffset) {
|
||||||
|
Icon(Icons.Default.Check, contentDescription = null)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
colors = ListItemDefaults.colors(containerColor = Color.Transparent),
|
||||||
|
modifier = Modifier.clickable { onOffsetChange(offset) }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Text(
|
||||||
|
text = stringResource(R.string.home_preview_hint),
|
||||||
|
style = MaterialTheme.typography.bodySmall,
|
||||||
|
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||||
|
modifier = Modifier.padding(start = 4.dp, top = 8.dp)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
private fun EmptyCard(onOpenWords: () -> Unit) {
|
||||||
|
Card(
|
||||||
|
modifier = Modifier.fillMaxWidth(),
|
||||||
|
shape = MaterialTheme.shapes.extraLarge,
|
||||||
|
colors = CardDefaults.cardColors(
|
||||||
|
containerColor = MaterialTheme.colorScheme.surfaceContainerLow
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
Column(
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.padding(24.dp),
|
||||||
|
horizontalAlignment = Alignment.CenterHorizontally,
|
||||||
|
verticalArrangement = Arrangement.spacedBy(16.dp)
|
||||||
|
) {
|
||||||
|
Text(
|
||||||
|
text = stringResource(R.string.msg_no_words_yet),
|
||||||
|
style = MaterialTheme.typography.bodyLarge,
|
||||||
|
color = MaterialTheme.colorScheme.onSurfaceVariant
|
||||||
|
)
|
||||||
|
Button(onClick = onOpenWords) {
|
||||||
|
Text(stringResource(R.string.hint_add_word))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
private fun WidgetCard(onAdd: () -> Unit) {
|
||||||
|
Card(
|
||||||
|
modifier = Modifier.fillMaxWidth(),
|
||||||
|
shape = MaterialTheme.shapes.large,
|
||||||
|
colors = CardDefaults.cardColors(
|
||||||
|
containerColor = MaterialTheme.colorScheme.secondaryContainer,
|
||||||
|
contentColor = MaterialTheme.colorScheme.onSecondaryContainer
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) {
|
||||||
|
Text(
|
||||||
|
text = stringResource(R.string.home_widget_title),
|
||||||
|
style = MaterialTheme.typography.titleMedium
|
||||||
|
)
|
||||||
|
Text(
|
||||||
|
text = stringResource(R.string.home_widget_message),
|
||||||
|
style = MaterialTheme.typography.bodyMedium
|
||||||
|
)
|
||||||
|
Spacer(Modifier.height(8.dp))
|
||||||
|
FilledTonalButton(onClick = onAdd) {
|
||||||
|
Text(stringResource(R.string.home_widget_action))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
private fun weekLabel(offset: Int, week: WeekInfo): String = when (offset) {
|
||||||
|
0 -> stringResource(R.string.home_this_week)
|
||||||
|
1 -> stringResource(R.string.home_next_week)
|
||||||
|
-1 -> stringResource(R.string.home_last_week)
|
||||||
|
else -> stringResource(R.string.home_calendar_week, week.weekNumber)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun formatRange(context: Context, week: WeekInfo): String {
|
||||||
|
val zone = ZoneId.systemDefault()
|
||||||
|
val start = week.monday.atStartOfDay(zone).toInstant().toEpochMilli()
|
||||||
|
val end = week.sunday.atStartOfDay(zone).toInstant().toEpochMilli()
|
||||||
|
return DateUtils.formatDateRange(
|
||||||
|
context, start, end,
|
||||||
|
DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_ABBREV_MONTH or DateUtils.FORMAT_NO_YEAR
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun isWidgetPlaced(context: Context): Boolean =
|
||||||
|
AppWidgetManager.getInstance(context)
|
||||||
|
.getAppWidgetIds(ComponentName(context, SimpleWidget::class.java))
|
||||||
|
.isNotEmpty()
|
||||||
@@ -70,4 +70,19 @@
|
|||||||
<string name="about_whats_new_title">What’s new</string>
|
<string name="about_whats_new_title">What’s new</string>
|
||||||
<string name="about_whats_new_summary">See the changes in this version</string>
|
<string name="about_whats_new_summary">See the changes in this version</string>
|
||||||
<string name="about_whats_new_section_title">Changes</string>
|
<string name="about_whats_new_section_title">Changes</string>
|
||||||
|
|
||||||
|
<string name="home_this_week">This week</string>
|
||||||
|
<string name="home_next_week">Next week</string>
|
||||||
|
<string name="home_last_week">Last week</string>
|
||||||
|
<string name="home_calendar_week">Week %1$d</string>
|
||||||
|
<string name="home_week_range">Week %1$d · %2$s</string>
|
||||||
|
<string name="home_cd_previous">Previous week</string>
|
||||||
|
<string name="home_cd_next">Show next week</string>
|
||||||
|
<string name="home_back_to_current">Back to this week</string>
|
||||||
|
<string name="home_day_progress">Day %1$d of 7</string>
|
||||||
|
<string name="home_more_weeks">More weeks</string>
|
||||||
|
<string name="home_preview_hint">The preview is based on your current word list and changes whenever you add, edit or remove words.</string>
|
||||||
|
<string name="home_widget_title">Add widget</string>
|
||||||
|
<string name="home_widget_message">Show your word of the week right on your home screen.</string>
|
||||||
|
<string name="home_widget_action">Add</string>
|
||||||
</resources>
|
</resources>
|
||||||
@@ -77,4 +77,20 @@
|
|||||||
<string name="about_whats_new_title">Was ist neu</string>
|
<string name="about_whats_new_title">Was ist neu</string>
|
||||||
<string name="about_whats_new_summary">Änderungen dieser Version ansehen</string>
|
<string name="about_whats_new_summary">Änderungen dieser Version ansehen</string>
|
||||||
<string name="about_whats_new_section_title">Änderungen</string>
|
<string name="about_whats_new_section_title">Änderungen</string>
|
||||||
|
|
||||||
|
<!-- Home Screen-->
|
||||||
|
<string name="home_this_week">Diese Woche</string>
|
||||||
|
<string name="home_next_week">Nächste Woche</string>
|
||||||
|
<string name="home_last_week">Letzte Woche</string>
|
||||||
|
<string name="home_calendar_week">Kalenderwoche %1$d</string>
|
||||||
|
<string name="home_week_range">KW %1$d · %2$s</string>
|
||||||
|
<string name="home_cd_previous">Vorherige Woche</string>
|
||||||
|
<string name="home_cd_next">Nächste Woche anzeigen</string>
|
||||||
|
<string name="home_back_to_current">Zur aktuellen Woche</string>
|
||||||
|
<string name="home_day_progress">Tag %1$d von 7</string>
|
||||||
|
<string name="home_more_weeks">Weitere Wochen</string>
|
||||||
|
<string name="home_preview_hint">Die Vorschau richtet sich nach deiner aktuellen Wortliste und ändert sich, sobald du Wörter hinzufügst, bearbeitest oder entfernst.</string>
|
||||||
|
<string name="home_widget_title">Widget hinzufügen</string>
|
||||||
|
<string name="home_widget_message">Zeige dein Wort der Woche direkt auf dem Startbildschirm.</string>
|
||||||
|
<string name="home_widget_action">Hinzufügen</string>
|
||||||
</resources>
|
</resources>
|
||||||
Reference in new issue
Block a user