From f5e28eae8df5ad14856a5b3485d46d5086996603 Mon Sep 17 00:00:00 2001 From: Jean-Luc Makiola Date: Wed, 28 Oct 2026 15:34:16 +0100 Subject: [PATCH] Widget fixes and tweaks from the 2.24 beta feedback (#449) Feedback on 2.24.0-beta.1 from #90, #376 and #71. floret-kit is pinned to its main after floret-kit#24, which carries the shared parts. - Transparent background: switching to or from it now shows right away on Date, Countdown, Week strip, Quick add, Upcoming and Today (and the Month and day grid). Their backings always set a fill, so a reapplied rendering can't keep the old one. - App language: changing it in Settings redraws every widget, which now render in the app language. Below Android 13 the choice is mirrored for the widget process, since AppCompat only applies it inside an activity. - Picker previews: Countdown and Week strip previews inflate on Android 14 and below (they used View/Space, which RemoteViews refuses). - Month widget: days outside the month take a 40% lighter shade, in the widget and its XML preview. - Add button: the filled header action is 44dp instead of 36dp wide (floret-kit). - Tinted background: the tonal header and weekday pills had the same tone as the fill and disappeared; they now use inversePrimary there (floret-kit). Not in the issues, found while testing. - Dimmed past events (Month and day, Today, Agenda): the fill fades to 30% and the text to 65% instead of both to 40%, so the title stays readable. - Widget picker: names drop the Calendula prefix, and each widget gets its own description instead of repeating its name (#71). The config screen stalling until touched (#90, item 2) is not addressed: it didn't reproduce on an Android 12 emulator. Closes #376 Closes #71 Co-authored-by: Jean-Luc Makiola Reviewed-on: https://codeberg.org/jlmakiola/calendula/pulls/449 --- .../jeanlucmakiola/calendula/CalendulaApp.kt | 4 +++ .../jeanlucmakiola/calendula/MainActivity.kt | 2 ++ .../calendula/ui/settings/SettingsScreen.kt | 4 ++- .../calendula/widget/WidgetEventRow.kt | 19 ++++++++----- .../calendula/widget/WidgetRedraw.kt | 11 ++++++++ .../calendula/widget/WidgetTheme.kt | 22 +++++++++++++++ .../calendula/widget/WidgetUpdateReceiver.kt | 10 ++++--- .../calendula/widget/agenda/AgendaWidget.kt | 27 ++++++++++--------- .../widget/countdown/CountdownWidget.kt | 15 +++++------ .../calendula/widget/date/DateWidget.kt | 14 ++++------ .../calendula/widget/month/MonthGridViews.kt | 6 ++--- .../calendula/widget/month/MonthWidget.kt | 15 ++++++----- .../widget/quickadd/QuickAddWidget.kt | 5 +++- .../calendula/widget/split/MonthDayWidget.kt | 13 ++++----- .../calendula/widget/today/TodayWidget.kt | 13 ++++----- .../widget/upcoming/UpcomingWidget.kt | 13 ++++----- .../calendula/widget/week/WeekStripWidget.kt | 5 +++- .../drawable/preview_widget_outside_bg.xml | 15 +++++++---- .../res/layout/widget_preview_countdown.xml | 4 +-- .../res/layout/widget_preview_week_strip.xml | 20 +++++++------- .../widget_preview_colors.xml | 1 - .../values-night/widget_preview_colors.xml | 2 +- .../res/values-v31/widget_preview_colors.xml | 1 - app/src/main/res/values/strings.xml | 27 ++++++++++++------- .../main/res/values/widget_preview_colors.xml | 2 +- .../main/res/xml/appwidget_info_agenda.xml | 2 +- .../main/res/xml/appwidget_info_countdown.xml | 2 +- app/src/main/res/xml/appwidget_info_date.xml | 2 +- app/src/main/res/xml/appwidget_info_month.xml | 2 +- .../main/res/xml/appwidget_info_month_day.xml | 2 +- .../main/res/xml/appwidget_info_quick_add.xml | 2 +- app/src/main/res/xml/appwidget_info_today.xml | 2 +- .../main/res/xml/appwidget_info_upcoming.xml | 2 +- .../res/xml/appwidget_info_week_strip.xml | 2 +- floret-kit | 2 +- 35 files changed, 174 insertions(+), 116 deletions(-) diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/CalendulaApp.kt b/app/src/main/java/de/jeanlucmakiola/calendula/CalendulaApp.kt index d7cc8465..2a5a2b36 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/CalendulaApp.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/CalendulaApp.kt @@ -15,6 +15,7 @@ import de.jeanlucmakiola.calendula.widget.syncWidgetRollover import de.jeanlucmakiola.calendula.widget.widgetEntryPoint import de.jeanlucmakiola.floret.crash.CrashConfig import de.jeanlucmakiola.floret.crash.CrashReporter +import de.jeanlucmakiola.floret.locale.AppLanguage import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob @@ -45,6 +46,9 @@ class CalendulaApp : Application() { chooseIssueUrl = getString(R.string.report_issue_choose_url), ), ) + // Below API 33 only AppCompat activities get the app language; a process + // woken for a widget formats in it too (#90). + AppLanguage.applyDefault(this) // Before anything that writes, so the widgets see every change (#420). widgetEntryPoint().widgetRefreshCoordinator().start() reconcileAutoBackup() diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/MainActivity.kt b/app/src/main/java/de/jeanlucmakiola/calendula/MainActivity.kt index e7954336..18e5c242 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/MainActivity.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/MainActivity.kt @@ -30,6 +30,7 @@ import androidx.lifecycle.lifecycleScope import dagger.hilt.android.AndroidEntryPoint import de.jeanlucmakiola.calendula.data.calendar.CalendarRepository import de.jeanlucmakiola.calendula.data.prefs.SettingsPrefs +import de.jeanlucmakiola.floret.locale.AppLanguage import de.jeanlucmakiola.floret.prefs.ThemeMode import de.jeanlucmakiola.floret.prefs.isDark import de.jeanlucmakiola.floret.prefs.isPureBlack @@ -278,6 +279,7 @@ class MainActivity : AppCompatActivity() { super.onResume() // Reaching a running UI means startup succeeded; reset the loop trail. CrashReporter.markHealthy(this) + AppLanguage.syncMirror(this) } override fun onSaveInstanceState(outState: Bundle) { diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsScreen.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsScreen.kt index 2ffe4331..3bab7449 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsScreen.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsScreen.kt @@ -63,6 +63,7 @@ import de.jeanlucmakiola.floret.components.GroupedListInset import de.jeanlucmakiola.floret.components.GroupedRow import de.jeanlucmakiola.floret.components.GroupedSectionHeader import de.jeanlucmakiola.floret.components.LanguagePickerRow +import de.jeanlucmakiola.calendula.widget.requestWidgetRedraw import de.jeanlucmakiola.floret.components.Position import de.jeanlucmakiola.floret.crash.CrashReportDialog import de.jeanlucmakiola.floret.crash.CrashReporter @@ -258,15 +259,16 @@ private fun SettingsHub( leading = { CategoryIcon(Icons.Default.Widgets, ChipAccent.Tertiary) }, onClick = { onOpenSection(SettingsSection.Widgets) }, ) + val context = LocalContext.current LanguagePickerRow( position = Position.Middle, title = stringResource(R.string.settings_language), autoLabel = stringResource(R.string.settings_language_auto), localesConfig = R.xml.locales_config, predictiveBack = true, + onChange = { requestWidgetRedraw(context) }, // Invite contributions right where users pick their language. header = { - val context = LocalContext.current val translateUrl = stringResource(R.string.about_translate_url) GroupedRow( title = stringResource(R.string.settings_translate), diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/widget/WidgetEventRow.kt b/app/src/main/java/de/jeanlucmakiola/calendula/widget/WidgetEventRow.kt index 3e595d9d..90629b9b 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/widget/WidgetEventRow.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/widget/WidgetEventRow.kt @@ -23,7 +23,6 @@ import de.jeanlucmakiola.calendula.R import de.jeanlucmakiola.calendula.domain.EventInstance import de.jeanlucmakiola.calendula.domain.isDeclined import de.jeanlucmakiola.calendula.ui.common.CalendarView -import de.jeanlucmakiola.calendula.ui.common.EventDimAlpha import de.jeanlucmakiola.calendula.ui.common.SECONDARY_INK_ALPHA import de.jeanlucmakiola.calendula.ui.common.eventFill import de.jeanlucmakiola.calendula.ui.common.eventInk @@ -32,6 +31,16 @@ import de.jeanlucmakiola.floret.components.Position import de.jeanlucmakiola.floret.glance.WidgetGroupedRow import de.jeanlucmakiola.floret.glance.themedColor +/** A past event's fill when dimmed: fainter than the app's whole-row dim, so its text can stay readable (#90). */ +internal const val WidgetDimFillAlpha = 0.3f + +/** A dimmed event's ink, held above its fill. */ +private const val WidgetDimInkAlpha = 0.65f + +/** Ink for an event on [fill], picked against the opaque tone and faded when the fill is dimmed. */ +internal fun widgetEventInk(fill: Color, alpha: Float): Color = + eventInk(fill.copy(alpha = 1f), if (fill.alpha < 1f) alpha * WidgetDimInkAlpha else alpha) + /** Text and row sizes of a compact event list, from a widget's [WidgetSize]. */ internal data class EventRowMetrics(val title: TextUnit, val time: TextUnit, val rowHeight: Dp, val message: TextUnit) @@ -63,11 +72,9 @@ internal fun WidgetEventRow( quiet: Boolean = false, ) { val context = LocalContext.current - fun tone(dark: Boolean): Color = eventFill(event.color, dark, soften).let { if (dimmed) it.copy(alpha = EventDimAlpha) else it } + fun tone(dark: Boolean): Color = eventFill(event.color, dark, soften).let { if (dimmed) it.copy(alpha = WidgetDimFillAlpha) else it } val day = tone(dark = false) val night = tone(dark = true) - // Ink is picked against the opaque fill, then carries the dim along with it. - fun ink(fill: Color, alpha: Float) = eventInk(fill.copy(alpha = 1f), alpha * fill.alpha) val card = widgetCardColor() WidgetGroupedRow(position = position, color = if (quiet) card else themedColor(day = day, night = night)) { Column( @@ -91,12 +98,12 @@ internal fun WidgetEventRow( val titleInk = if (quiet) { GlanceTheme.colors.onSurface } else { - themedColor(day = ink(day, 1f), night = ink(night, 1f)) + themedColor(day = widgetEventInk(day, 1f), night = widgetEventInk(night, 1f)) } val timeInk = if (quiet) { GlanceTheme.colors.onSurfaceVariant } else { - themedColor(day = ink(day, SECONDARY_INK_ALPHA), night = ink(night, SECONDARY_INK_ALPHA)) + themedColor(day = widgetEventInk(day, SECONDARY_INK_ALPHA), night = widgetEventInk(night, SECONDARY_INK_ALPHA)) } Text( text = event.title.ifBlank { context.getString(R.string.event_untitled) }, diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/widget/WidgetRedraw.kt b/app/src/main/java/de/jeanlucmakiola/calendula/widget/WidgetRedraw.kt index ec8bd902..71823633 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/widget/WidgetRedraw.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/widget/WidgetRedraw.kt @@ -34,6 +34,17 @@ internal val WIDGET_RECEIVER_CLASSES: List> = WidgetKind.entries.map { /** The app's own midnight wake-up (#228). */ internal const val ACTION_WIDGET_ROLLOVER = "de.jeanlucmakiola.calendula.widget.ROLLOVER" +/** Redraws every widget, for app changes they draw with that no other signal reaches, like its language (#90). */ +internal const val ACTION_WIDGET_REDRAW = "de.jeanlucmakiola.calendula.widget.REDRAW" + +/** + * Asks [WidgetUpdateReceiver] to redraw every widget. A broadcast rather than a + * coroutine, so it outlives the activity a language change recreates. + */ +fun requestWidgetRedraw(context: Context) { + context.sendBroadcast(Intent(context, WidgetUpdateReceiver::class.java).setAction(ACTION_WIDGET_REDRAW)) +} + /** Fixed: there is only ever one rollover alarm, and re-arming must replace it. */ private const val ROLLOVER_REQUEST_CODE = 0x0DA1 diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/widget/WidgetTheme.kt b/app/src/main/java/de/jeanlucmakiola/calendula/widget/WidgetTheme.kt index 8809be42..271fa349 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/widget/WidgetTheme.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/widget/WidgetTheme.kt @@ -1,12 +1,17 @@ package de.jeanlucmakiola.calendula.widget import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.remember +import androidx.compose.runtime.staticCompositionLocalOf +import androidx.glance.LocalContext import androidx.glance.text.TextDecoration import de.jeanlucmakiola.calendula.ui.theme.CalendulaDarkFallback import de.jeanlucmakiola.calendula.ui.theme.CalendulaLightFallback import de.jeanlucmakiola.floret.glance.FloretGlanceTheme import de.jeanlucmakiola.floret.glance.WidgetSurface import de.jeanlucmakiola.floret.glance.WidgetThemeMode +import de.jeanlucmakiola.floret.locale.AppLanguage import de.jeanlucmakiola.floret.prefs.ThemeMode /** @@ -39,3 +44,20 @@ internal fun CalendulaWidgetRoot(appearance: WidgetAppearance, appTheme: ThemeMo */ fun glanceDeclinedDecoration(isDeclined: Boolean): TextDecoration = if (isDeclined) TextDecoration.LineThrough else TextDecoration.None + +/** Static, so a language change recomposes the whole widget rather than letting unchanged parts skip. */ +private val LocalWidgetLanguage = staticCompositionLocalOf { null } + +/** + * Draws [content] in the app's own language (#90): [LocalContext] and the + * default locale follow it, which below API 33 nothing else does outside an + * AppCompat activity. Read on every recomposition, so a redraw picks up a change. + */ +@Composable +internal fun InAppLanguage(content: @Composable () -> Unit) { + val base = LocalContext.current + val tag = AppLanguage.currentTag(base) + AppLanguage.applyDefault(base, tag) + val localized = remember(base, tag) { AppLanguage.localized(base, tag) } + CompositionLocalProvider(LocalContext provides localized, LocalWidgetLanguage provides tag, content = content) +} diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/widget/WidgetUpdateReceiver.kt b/app/src/main/java/de/jeanlucmakiola/calendula/widget/WidgetUpdateReceiver.kt index 45ddeb12..f92de6f7 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/widget/WidgetUpdateReceiver.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/widget/WidgetUpdateReceiver.kt @@ -4,10 +4,11 @@ import android.app.PendingIntent import android.content.Context import android.content.Intent import de.jeanlucmakiola.floret.glance.FloretWidgetUpdateReceiver +import de.jeanlucmakiola.floret.locale.AppLanguage import kotlin.time.Duration.Companion.minutes /** - * Redraws both widgets when their data, day or language goes stale, and keeps + * Redraws the widgets when their data, day or language goes stale, and keeps * the midnight rollover armed. `PROVIDER_CHANGED` covers changes made outside * the app; the app's own writes go through [WidgetRefreshCoordinator]. A data * change also re-arms, at most every 15 minutes: the inexact alarm can be @@ -18,12 +19,15 @@ import kotlin.time.Duration.Companion.minutes class WidgetUpdateReceiver : FloretWidgetUpdateReceiver() { override val rolloverAction = ACTION_WIDGET_ROLLOVER override val widgetReceiverClasses = WIDGET_RECEIVER_CLASSES - override val extraHandledActions = setOf(Intent.ACTION_PROVIDER_CHANGED) + override val extraHandledActions = setOf(Intent.ACTION_PROVIDER_CHANGED, ACTION_WIDGET_REDRAW) override val extraRearmInterval = 15.minutes override fun rolloverPendingIntent(context: Context): PendingIntent = widgetRolloverPendingIntent(context) override fun skipRedraw(action: String) = action == Intent.ACTION_PROVIDER_CHANGED && isProviderEcho() - override suspend fun redraw(context: Context) = redrawWidgets(context) + override suspend fun redraw(context: Context) { + AppLanguage.applyDefault(context) + redrawWidgets(context) + } } diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/widget/agenda/AgendaWidget.kt b/app/src/main/java/de/jeanlucmakiola/calendula/widget/agenda/AgendaWidget.kt index 7afaf487..a7e272d9 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/widget/agenda/AgendaWidget.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/widget/agenda/AgendaWidget.kt @@ -1,5 +1,6 @@ package de.jeanlucmakiola.calendula.widget.agenda +import de.jeanlucmakiola.calendula.widget.InAppLanguage import de.jeanlucmakiola.calendula.widget.WidgetKind import de.jeanlucmakiola.calendula.widget.previewSizeOf import de.jeanlucmakiola.calendula.widget.provideSamplePreview @@ -50,11 +51,11 @@ import de.jeanlucmakiola.calendula.domain.EventInstance import de.jeanlucmakiola.calendula.domain.hasEnded import de.jeanlucmakiola.calendula.ui.agenda.anchorTodayIfMissing import de.jeanlucmakiola.calendula.ui.common.CalendarView -import de.jeanlucmakiola.calendula.ui.common.EventDimAlpha import de.jeanlucmakiola.calendula.ui.common.formatCalendarTitle import de.jeanlucmakiola.floret.locale.localizedDateFormatter import de.jeanlucmakiola.calendula.ui.common.eventFill -import de.jeanlucmakiola.calendula.ui.common.eventInk +import de.jeanlucmakiola.calendula.widget.WidgetDimFillAlpha +import de.jeanlucmakiola.calendula.widget.widgetEventInk import de.jeanlucmakiola.calendula.ui.common.SECONDARY_INK_ALPHA import de.jeanlucmakiola.calendula.widget.AgendaWidgetData import de.jeanlucmakiola.calendula.widget.WidgetSize @@ -110,11 +111,13 @@ class AgendaWidget : GlanceAppWidget() { // A running session never re-runs this preamble, so every redraw // moves the stamp and the data reloads here instead (#420). val loaded = widgetData.current(currentRefreshStamp()) { context.loadAgendaWidget(id) } - AgendaWidgetContent( - data = loaded.content, - appearance = currentState().widgetAppearance, - appTheme = loaded.appTheme, - ) + InAppLanguage { + AgendaWidgetContent( + data = loaded.content, + appearance = currentState().widgetAppearance, + appTheme = loaded.appTheme, + ) + } } } } @@ -392,7 +395,7 @@ private data class EventFill(val day: Color, val night: Color) private fun AgendaRow.Event.fill(data: AgendaWidgetData.Ready): EventFill { val dimmed = data.pastDisplay == PastEventDisplay.DIM && event.hasEnded(data.now) fun tone(dark: Boolean) = eventFill(event.color, dark, data.soften).let { - if (dimmed) it.copy(alpha = EventDimAlpha) else it + if (dimmed) it.copy(alpha = WidgetDimFillAlpha) else it } return EventFill(day = tone(dark = false), night = tone(dark = true)) } @@ -407,12 +410,10 @@ private fun EventRow( ) { val context = androidx.glance.LocalContext.current val title = event.title.ifBlank { context.getString(R.string.event_untitled) } - // Ink is picked against the opaque fill, then carries the dim along with it. - fun ink(fill: Color, alpha: Float) = eventInk(fill.copy(alpha = 1f), alpha * fill.alpha) - val titleInk = themedColor(day = ink(fill.day, 1f), night = ink(fill.night, 1f)) + val titleInk = themedColor(day = widgetEventInk(fill.day, 1f), night = widgetEventInk(fill.night, 1f)) val timeInk = themedColor( - day = ink(fill.day, SECONDARY_INK_ALPHA), - night = ink(fill.night, SECONDARY_INK_ALPHA), + day = widgetEventInk(fill.day, SECONDARY_INK_ALPHA), + night = widgetEventInk(fill.night, SECONDARY_INK_ALPHA), ) Column( modifier = GlanceModifier diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/widget/countdown/CountdownWidget.kt b/app/src/main/java/de/jeanlucmakiola/calendula/widget/countdown/CountdownWidget.kt index 7bca4484..f835c7b2 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/widget/countdown/CountdownWidget.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/widget/countdown/CountdownWidget.kt @@ -1,5 +1,6 @@ package de.jeanlucmakiola.calendula.widget.countdown +import de.jeanlucmakiola.calendula.widget.InAppLanguage import de.jeanlucmakiola.calendula.widget.WidgetKind import de.jeanlucmakiola.calendula.widget.previewSizeOf import de.jeanlucmakiola.calendula.widget.provideSamplePreview @@ -49,9 +50,7 @@ import de.jeanlucmakiola.calendula.widget.formatWidgetTime import de.jeanlucmakiola.calendula.widget.relativeDayLabel import de.jeanlucmakiola.calendula.widget.systemZone import de.jeanlucmakiola.calendula.widget.widgetAppearance -import de.jeanlucmakiola.calendula.widget.widgetCardColor -import de.jeanlucmakiola.floret.glance.LocalWidgetBackground -import de.jeanlucmakiola.floret.glance.WidgetBackground +import de.jeanlucmakiola.floret.glance.wallpaperBacking import de.jeanlucmakiola.floret.glance.WidgetData import de.jeanlucmakiola.floret.glance.WidgetMessage import de.jeanlucmakiola.floret.glance.currentRefreshStamp @@ -82,7 +81,9 @@ class CountdownWidget : GlanceAppWidget() { val widgetData = WidgetData(context.loadPlacedCountdown(id), refreshStamp(context, id)) provideContent { val loaded = widgetData.current(currentRefreshStamp()) { context.loadPlacedCountdown(id) } - CountdownWidgetContent(loaded.content, currentState().widgetAppearance, loaded.appTheme) + InAppLanguage { + CountdownWidgetContent(loaded.content, currentState().widgetAppearance, loaded.appTheme) + } } } } @@ -144,11 +145,7 @@ private fun EventCountdown(event: EventInstance, data: CountdownData.Ready) { ), ) // Over a wallpaper the text sits on its own card, as every other widget's rows do. - val card = if (LocalWidgetBackground.current == WidgetBackground.TRANSPARENT) { - GlanceModifier.cornerRadius(16.dp).background(widgetCardColor()) - } else { - GlanceModifier - } + val card = GlanceModifier.wallpaperBacking(radius = 16.dp) Box(modifier = GlanceModifier.fillMaxSize().padding(6.dp)) { Row( modifier = card.fillMaxSize().clickable(open).padding(horizontal = 10.dp, vertical = 8.dp), diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/widget/date/DateWidget.kt b/app/src/main/java/de/jeanlucmakiola/calendula/widget/date/DateWidget.kt index e75120fc..aa78587e 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/widget/date/DateWidget.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/widget/date/DateWidget.kt @@ -1,5 +1,6 @@ package de.jeanlucmakiola.calendula.widget.date +import de.jeanlucmakiola.calendula.widget.InAppLanguage import de.jeanlucmakiola.calendula.widget.WidgetKind import de.jeanlucmakiola.calendula.widget.previewSizeOf import de.jeanlucmakiola.calendula.widget.provideSamplePreview @@ -24,7 +25,6 @@ import androidx.glance.layout.Column import androidx.glance.layout.Spacer import androidx.glance.layout.fillMaxSize import androidx.glance.layout.height -import androidx.glance.layout.padding import androidx.glance.semantics.contentDescription import androidx.glance.semantics.semantics import androidx.glance.state.PreferencesGlanceStateDefinition @@ -40,8 +40,6 @@ import de.jeanlucmakiola.calendula.widget.WidgetAppearance import de.jeanlucmakiola.calendula.widget.loadToday import de.jeanlucmakiola.calendula.widget.widgetAppearance import de.jeanlucmakiola.calendula.widget.widgetLocale -import de.jeanlucmakiola.floret.glance.LocalWidgetBackground -import de.jeanlucmakiola.floret.glance.WidgetBackground import de.jeanlucmakiola.floret.glance.WidgetData import de.jeanlucmakiola.floret.glance.WidgetShape import de.jeanlucmakiola.floret.glance.WidgetShapedBox @@ -71,7 +69,9 @@ class DateWidget : GlanceAppWidget() { val widgetData = WidgetData(context.loadToday(), refreshStamp(context, id)) provideContent { val loaded = widgetData.current(currentRefreshStamp()) { context.loadToday() } - DateWidgetContent(loaded.content, currentState().widgetAppearance, loaded.appTheme) + InAppLanguage { + DateWidgetContent(loaded.content, currentState().widgetAppearance, loaded.appTheme) + } } } } @@ -105,11 +105,7 @@ internal fun DateWidgetContent(today: LocalDate, appearance: WidgetAppearance, a verticalAlignment = Alignment.CenterVertically, ) { val name = today.dayOfWeek.toJavaDayOfWeek().getDisplayName(JavaTextStyle.SHORT, widgetLocale()) - val backing = if (LocalWidgetBackground.current == WidgetBackground.TRANSPARENT) { - GlanceModifier.wallpaperBacking(radius = 8.dp).padding(horizontal = 6.dp) - } else { - GlanceModifier - } + val backing = GlanceModifier.wallpaperBacking(radius = 8.dp, horizontalPadding = 6.dp) Text(text = name.uppercase(widgetLocale()), maxLines = 1, style = weekday, modifier = backing) Spacer(GlanceModifier.height(2.dp)) WidgetShapedBox(shape = WidgetShape.COOKIE, color = GlanceTheme.colors.primary, size = side) { diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/widget/month/MonthGridViews.kt b/app/src/main/java/de/jeanlucmakiola/calendula/widget/month/MonthGridViews.kt index e8aaa411..80b3ae04 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/widget/month/MonthGridViews.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/widget/month/MonthGridViews.kt @@ -147,9 +147,9 @@ private fun openDayIntent(context: Context, date: LocalDate): PendingIntent = Pe ) private val STRIP_IDS = intArrayOf(R.id.strip_0, R.id.strip_1, R.id.strip_2, R.id.strip_3, R.id.strip_4, R.id.strip_5, R.id.strip_6) -/** The shade over a day outside the month: a dark cell needs more of it to read as dimmed. */ -private val OUTSIDE_SHADE_DAY = Color.Black.copy(alpha = 0.18f) -private val OUTSIDE_SHADE_NIGHT = Color.Black.copy(alpha = 0.50f) +/** The shade over a day outside the month: a dark cell needs more of it to read as dimmed. Mirrored by `widget_preview_outside_shade`. */ +private val OUTSIDE_SHADE_DAY = Color.Black.copy(alpha = 0.11f) +private val OUTSIDE_SHADE_NIGHT = Color.Black.copy(alpha = 0.30f) private val CELL_DIM_IDS = intArrayOf( R.id.cell_dim_0, R.id.cell_dim_1, R.id.cell_dim_2, R.id.cell_dim_3, R.id.cell_dim_4, R.id.cell_dim_5, R.id.cell_dim_6, diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/widget/month/MonthWidget.kt b/app/src/main/java/de/jeanlucmakiola/calendula/widget/month/MonthWidget.kt index f45af966..ad6e635f 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/widget/month/MonthWidget.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/widget/month/MonthWidget.kt @@ -1,5 +1,6 @@ package de.jeanlucmakiola.calendula.widget.month +import de.jeanlucmakiola.calendula.widget.InAppLanguage import de.jeanlucmakiola.calendula.widget.WidgetKind import de.jeanlucmakiola.calendula.widget.previewSizeOf import de.jeanlucmakiola.calendula.widget.provideSamplePreview @@ -169,12 +170,14 @@ class MonthWidget : GlanceAppWidget() { else -> index.coerceIn(source.months) } SideEffect { lastShown = shown } - MonthWidgetContent( - source = source, - index = shown, - appearance = currentState().widgetAppearance, - appTheme = loaded.appTheme, - ) + InAppLanguage { + MonthWidgetContent( + source = source, + index = shown, + appearance = currentState().widgetAppearance, + appTheme = loaded.appTheme, + ) + } } } } diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/widget/quickadd/QuickAddWidget.kt b/app/src/main/java/de/jeanlucmakiola/calendula/widget/quickadd/QuickAddWidget.kt index 97a4642d..7b9d613d 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/widget/quickadd/QuickAddWidget.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/widget/quickadd/QuickAddWidget.kt @@ -1,5 +1,6 @@ package de.jeanlucmakiola.calendula.widget.quickadd +import de.jeanlucmakiola.calendula.widget.InAppLanguage import de.jeanlucmakiola.calendula.widget.WidgetKind import de.jeanlucmakiola.calendula.widget.previewSizeOf import de.jeanlucmakiola.calendula.widget.provideSamplePreview @@ -59,7 +60,9 @@ class QuickAddWidget : GlanceAppWidget() { provideContent { // The rollover moves the stamp, so the editor opens on the new day. val loaded = widgetData.current(currentRefreshStamp()) { context.loadToday() } - QuickAddWidgetContent(loaded.content, currentState().widgetAppearance, loaded.appTheme) + InAppLanguage { + QuickAddWidgetContent(loaded.content, currentState().widgetAppearance, loaded.appTheme) + } } } } diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/widget/split/MonthDayWidget.kt b/app/src/main/java/de/jeanlucmakiola/calendula/widget/split/MonthDayWidget.kt index b6ef071e..f3979987 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/widget/split/MonthDayWidget.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/widget/split/MonthDayWidget.kt @@ -1,5 +1,6 @@ package de.jeanlucmakiola.calendula.widget.split +import de.jeanlucmakiola.calendula.widget.InAppLanguage import de.jeanlucmakiola.calendula.widget.WidgetKind import de.jeanlucmakiola.calendula.widget.previewSizeOf import de.jeanlucmakiola.calendula.widget.provideSamplePreview @@ -84,9 +85,7 @@ import kotlinx.datetime.toJavaLocalDate import de.jeanlucmakiola.calendula.widget.widgetTimeLabel import de.jeanlucmakiola.calendula.data.prefs.is24Hour import de.jeanlucmakiola.floret.components.positionOf -import de.jeanlucmakiola.floret.glance.LocalWidgetBackground import de.jeanlucmakiola.floret.glance.WidgetActionStyle -import de.jeanlucmakiola.floret.glance.WidgetBackground import de.jeanlucmakiola.floret.glance.WidgetData import de.jeanlucmakiola.floret.glance.WidgetHeader import de.jeanlucmakiola.floret.glance.WidgetHeaderAction @@ -168,7 +167,9 @@ class MonthDayWidget : GlanceAppWidget() { val currentStamp = currentRefreshStamp() val loaded = widgetData.current(currentCenter, currentStamp) { load(currentCenter, currentStamp) } val selected = currentState(SELECTED_KEY)?.let(LocalDate::parse) - MonthDayWidgetContent(loaded.content, index, selected, currentState().widgetAppearance, loaded.appTheme) + InAppLanguage { + MonthDayWidgetContent(loaded.content, index, selected, currentState().widgetAppearance, loaded.appTheme) + } } } } @@ -331,11 +332,7 @@ private fun Grid( ) { val locale = widgetLocale() val month = index % 12 + 1 - val backing = if (LocalWidgetBackground.current == WidgetBackground.TRANSPARENT) { - GlanceModifier.cornerRadius(14.dp).background(widgetCardColor()) - } else { - GlanceModifier - } + val backing = GlanceModifier.wallpaperBacking(radius = 14.dp) Column(modifier = backing.fillMaxSize().padding(2.dp)) { Row(modifier = GlanceModifier.fillMaxWidth()) { for (i in 0 until 7) { diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/widget/today/TodayWidget.kt b/app/src/main/java/de/jeanlucmakiola/calendula/widget/today/TodayWidget.kt index bd6e757d..30ac5de2 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/widget/today/TodayWidget.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/widget/today/TodayWidget.kt @@ -1,5 +1,6 @@ package de.jeanlucmakiola.calendula.widget.today +import de.jeanlucmakiola.calendula.widget.InAppLanguage import de.jeanlucmakiola.calendula.widget.WidgetKind import de.jeanlucmakiola.calendula.widget.previewSizeOf import de.jeanlucmakiola.calendula.widget.provideSamplePreview @@ -62,8 +63,6 @@ import de.jeanlucmakiola.calendula.widget.widgetLocale import de.jeanlucmakiola.calendula.widget.widgetLoadContext import de.jeanlucmakiola.calendula.widget.widgetTimeLabel import de.jeanlucmakiola.floret.components.positionOf -import de.jeanlucmakiola.floret.glance.LocalWidgetBackground -import de.jeanlucmakiola.floret.glance.WidgetBackground import de.jeanlucmakiola.floret.glance.WidgetData import de.jeanlucmakiola.floret.glance.WidgetMessage import de.jeanlucmakiola.floret.glance.currentRefreshStamp @@ -99,7 +98,9 @@ class TodayWidget : GlanceAppWidget() { val widgetData = WidgetData(context.loadTodayList(context.widgetLoadContext(id)), refreshStamp(context, id)) provideContent { val loaded = widgetData.current(currentRefreshStamp()) { context.loadTodayList(context.widgetLoadContext(id)) } - TodayWidgetContent(loaded.content, currentState().widgetAppearance, loaded.appTheme) + InAppLanguage { + TodayWidgetContent(loaded.content, currentState().widgetAppearance, loaded.appTheme) + } } } } @@ -189,11 +190,7 @@ private fun NothingLeft(tomorrow: List, data: DaysWidgetData.Read val room = LocalSize.current.height - 12.dp - lineHeight val fits = ((room + RowGap) / (metrics.rowHeight + RowGap)).toInt().coerceIn(0, 2) val ahead = tomorrow.take(fits) - val backing = if (LocalWidgetBackground.current == WidgetBackground.TRANSPARENT) { - GlanceModifier.wallpaperBacking(radius = 8.dp).padding(horizontal = 8.dp) - } else { - GlanceModifier.padding(horizontal = 4.dp) - } + val backing = GlanceModifier.wallpaperBacking(radius = 8.dp, horizontalPadding = 8.dp, filledHorizontalPadding = 4.dp) Column(modifier = GlanceModifier.fillMaxSize(), verticalAlignment = Alignment.CenterVertically) { Text( text = context.getString(R.string.widget_nothing_left_today), diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/widget/upcoming/UpcomingWidget.kt b/app/src/main/java/de/jeanlucmakiola/calendula/widget/upcoming/UpcomingWidget.kt index 1f4ddd72..3687e774 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/widget/upcoming/UpcomingWidget.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/widget/upcoming/UpcomingWidget.kt @@ -1,5 +1,6 @@ package de.jeanlucmakiola.calendula.widget.upcoming +import de.jeanlucmakiola.calendula.widget.InAppLanguage import de.jeanlucmakiola.calendula.widget.WidgetKind import de.jeanlucmakiola.calendula.widget.previewSizeOf import de.jeanlucmakiola.calendula.widget.provideSamplePreview @@ -54,8 +55,6 @@ import de.jeanlucmakiola.calendula.widget.widgetLocale import de.jeanlucmakiola.calendula.widget.widgetLoadContext import de.jeanlucmakiola.calendula.widget.widgetTimeLabel import de.jeanlucmakiola.floret.components.positionOf -import de.jeanlucmakiola.floret.glance.LocalWidgetBackground -import de.jeanlucmakiola.floret.glance.WidgetBackground import de.jeanlucmakiola.floret.glance.WidgetData import de.jeanlucmakiola.floret.glance.WidgetMessage import de.jeanlucmakiola.floret.glance.currentRefreshStamp @@ -89,7 +88,9 @@ class UpcomingWidget : GlanceAppWidget() { val widgetData = WidgetData(context.loadUpcoming(context.widgetLoadContext(id)), refreshStamp(context, id)) provideContent { val loaded = widgetData.current(currentRefreshStamp()) { context.loadUpcoming(context.widgetLoadContext(id)) } - UpcomingWidgetContent(loaded.content, currentState().widgetAppearance, loaded.appTheme) + InAppLanguage { + UpcomingWidgetContent(loaded.content, currentState().widgetAppearance, loaded.appTheme) + } } } } @@ -155,11 +156,7 @@ internal fun UpcomingWidgetContent(data: DaysWidgetData, appearance: WidgetAppea private fun DateHeader(today: LocalDate, height: Dp) { val context = LocalContext.current val locale = widgetLocale() - val backing = if (LocalWidgetBackground.current == WidgetBackground.TRANSPARENT) { - GlanceModifier.wallpaperBacking(radius = 12.dp).padding(horizontal = 8.dp) - } else { - GlanceModifier.padding(horizontal = 4.dp) - } + val backing = GlanceModifier.wallpaperBacking(radius = 12.dp, horizontalPadding = 8.dp, filledHorizontalPadding = 4.dp) Box(modifier = GlanceModifier.fillMaxWidth().height(height), contentAlignment = Alignment.CenterStart) { Row( modifier = backing.clickable(actionStartActivity(MainActivity.openViewIntent(context, CalendarView.Agenda))), diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/widget/week/WeekStripWidget.kt b/app/src/main/java/de/jeanlucmakiola/calendula/widget/week/WeekStripWidget.kt index eac21502..fd660f95 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/widget/week/WeekStripWidget.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/widget/week/WeekStripWidget.kt @@ -1,5 +1,6 @@ package de.jeanlucmakiola.calendula.widget.week +import de.jeanlucmakiola.calendula.widget.InAppLanguage import de.jeanlucmakiola.calendula.widget.WidgetKind import de.jeanlucmakiola.calendula.widget.previewSizeOf import de.jeanlucmakiola.calendula.widget.provideSamplePreview @@ -91,7 +92,9 @@ class WeekStripWidget : GlanceAppWidget() { val widgetData = WidgetData(context.loadWeek(id), refreshStamp(context, id)) provideContent { val loaded = widgetData.current(currentRefreshStamp()) { context.loadWeek(id) } - WeekStripWidgetContent(loaded.content, currentState().widgetAppearance, loaded.appTheme) + InAppLanguage { + WeekStripWidgetContent(loaded.content, currentState().widgetAppearance, loaded.appTheme) + } } } } diff --git a/app/src/main/res/drawable/preview_widget_outside_bg.xml b/app/src/main/res/drawable/preview_widget_outside_bg.xml index 8882d92e..06179af8 100644 --- a/app/src/main/res/drawable/preview_widget_outside_bg.xml +++ b/app/src/main/res/drawable/preview_widget_outside_bg.xml @@ -1,6 +1,11 @@ - - - - + + + + + + + + + + diff --git a/app/src/main/res/layout/widget_preview_countdown.xml b/app/src/main/res/layout/widget_preview_countdown.xml index 966dbc36..b1111507 100644 --- a/app/src/main/res/layout/widget_preview_countdown.xml +++ b/app/src/main/res/layout/widget_preview_countdown.xml @@ -9,9 +9,9 @@ android:gravity="center_vertical" android:orientation="horizontal" android:padding="12dp" - tools:ignore="HardcodedText,NestedWeights,DisableBaselineAlignment,SmallSp,TooManyViews,UselessParent"> + tools:ignore="HardcodedText,NestedWeights,DisableBaselineAlignment,SmallSp,TooManyViews,UselessLeaf,UselessParent"> - + tools:ignore="HardcodedText,NestedWeights,DisableBaselineAlignment,SmallSp,TooManyViews,UselessLeaf,UselessParent"> - - - - - - @@ -146,7 +146,7 @@ android:textColor="@color/widget_preview_on_surface" android:textSize="16sp" android:textStyle="bold" /> - @@ -171,7 +171,7 @@ android:layout_height="6dp" android:gravity="center" android:orientation="horizontal"> - - diff --git a/app/src/main/res/values-night-v31/widget_preview_colors.xml b/app/src/main/res/values-night-v31/widget_preview_colors.xml index f9873410..b9e9d9a0 100644 --- a/app/src/main/res/values-night-v31/widget_preview_colors.xml +++ b/app/src/main/res/values-night-v31/widget_preview_colors.xml @@ -2,7 +2,6 @@ @android:color/system_accent2_700 @android:color/system_accent2_900 - @android:color/system_neutral2_600 @android:color/system_neutral1_50 @android:color/system_neutral2_200 @android:color/system_accent1_200 diff --git a/app/src/main/res/values-night/widget_preview_colors.xml b/app/src/main/res/values-night/widget_preview_colors.xml index 7df62c36..c53c114f 100644 --- a/app/src/main/res/values-night/widget_preview_colors.xml +++ b/app/src/main/res/values-night/widget_preview_colors.xml @@ -2,7 +2,7 @@ #2B3742 #1C252D - #3A4651 + #4D000000 #E1E3E6 #A8ADB2 #A3CBE2 diff --git a/app/src/main/res/values-v31/widget_preview_colors.xml b/app/src/main/res/values-v31/widget_preview_colors.xml index f706cb2e..4500fccc 100644 --- a/app/src/main/res/values-v31/widget_preview_colors.xml +++ b/app/src/main/res/values-v31/widget_preview_colors.xml @@ -2,7 +2,6 @@ @android:color/system_accent2_100 @android:color/system_accent2_10 - @android:color/system_neutral2_300 @android:color/system_neutral1_900 @android:color/system_neutral2_700 @android:color/system_accent1_600 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1e940ae8..5d978215 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -433,21 +433,29 @@ Upcoming - Calendula agenda - Calendula month - Calendula quick add - Calendula date - Calendula week strip + Agenda + Your next events, grouped by day + Month + The month at a glance, with your events + Quick add + Start a new event in one tap + Date + Today\'s date + Week strip + This week, with the days that have events %1$s, %2$d event %1$s, %2$d events - Calendula upcoming + Upcoming + Today\'s date over your next events No upcoming events - Calendula today + Today + Today\'s events, then tomorrow\'s Nothing left today - Calendula countdown + Countdown + Time until an event, or the next one Now Ending now Tomorrow @@ -492,7 +500,8 @@ Couldn\'t load your events. %1$s · repeats - Calendula month and day + Month and day + The month and the events of the day you pick No events Refresh New event diff --git a/app/src/main/res/values/widget_preview_colors.xml b/app/src/main/res/values/widget_preview_colors.xml index b584476b..d131423d 100644 --- a/app/src/main/res/values/widget_preview_colors.xml +++ b/app/src/main/res/values/widget_preview_colors.xml @@ -6,7 +6,7 @@ #D6E4F0 #EEF3F8 - #C2CCD6 + #1C000000 #191C1F #6E7479 #3B5364 diff --git a/app/src/main/res/xml/appwidget_info_agenda.xml b/app/src/main/res/xml/appwidget_info_agenda.xml index b8c707cf..0ecdcb52 100644 --- a/app/src/main/res/xml/appwidget_info_agenda.xml +++ b/app/src/main/res/xml/appwidget_info_agenda.xml @@ -10,7 +10,7 @@ android:widgetCategory="home_screen" android:configure="de.jeanlucmakiola.calendula.widget.config.WidgetConfigActivity" android:widgetFeatures="reconfigurable" - android:description="@string/widget_agenda_label" + android:description="@string/widget_agenda_description" android:updatePeriodMillis="1800000" android:previewLayout="@layout/widget_preview_agenda" android:initialLayout="@layout/glance_default_loading_layout" /> diff --git a/app/src/main/res/xml/appwidget_info_countdown.xml b/app/src/main/res/xml/appwidget_info_countdown.xml index e1a1071a..ef4ee550 100644 --- a/app/src/main/res/xml/appwidget_info_countdown.xml +++ b/app/src/main/res/xml/appwidget_info_countdown.xml @@ -10,7 +10,7 @@ android:widgetCategory="home_screen" android:configure="de.jeanlucmakiola.calendula.widget.config.WidgetConfigActivity" android:widgetFeatures="reconfigurable" - android:description="@string/widget_countdown_label" + android:description="@string/widget_countdown_description" android:updatePeriodMillis="1800000" android:previewLayout="@layout/widget_preview_countdown" android:initialLayout="@layout/glance_default_loading_layout" /> diff --git a/app/src/main/res/xml/appwidget_info_date.xml b/app/src/main/res/xml/appwidget_info_date.xml index 10b83689..88209208 100644 --- a/app/src/main/res/xml/appwidget_info_date.xml +++ b/app/src/main/res/xml/appwidget_info_date.xml @@ -8,7 +8,7 @@ android:widgetCategory="home_screen" android:configure="de.jeanlucmakiola.calendula.widget.config.WidgetConfigActivity" android:widgetFeatures="reconfigurable" - android:description="@string/widget_date_label" + android:description="@string/widget_date_description" android:updatePeriodMillis="1800000" android:previewLayout="@layout/widget_preview_date" android:initialLayout="@layout/glance_default_loading_layout" /> diff --git a/app/src/main/res/xml/appwidget_info_month.xml b/app/src/main/res/xml/appwidget_info_month.xml index 075aa517..ef78262c 100644 --- a/app/src/main/res/xml/appwidget_info_month.xml +++ b/app/src/main/res/xml/appwidget_info_month.xml @@ -10,7 +10,7 @@ android:widgetCategory="home_screen" android:configure="de.jeanlucmakiola.calendula.widget.config.WidgetConfigActivity" android:widgetFeatures="reconfigurable" - android:description="@string/widget_month_label" + android:description="@string/widget_month_description" android:updatePeriodMillis="1800000" android:previewLayout="@layout/widget_preview_month" android:initialLayout="@layout/glance_default_loading_layout" /> diff --git a/app/src/main/res/xml/appwidget_info_month_day.xml b/app/src/main/res/xml/appwidget_info_month_day.xml index 244dbc7a..3f6c8115 100644 --- a/app/src/main/res/xml/appwidget_info_month_day.xml +++ b/app/src/main/res/xml/appwidget_info_month_day.xml @@ -10,7 +10,7 @@ android:widgetCategory="home_screen" android:configure="de.jeanlucmakiola.calendula.widget.config.WidgetConfigActivity" android:widgetFeatures="reconfigurable" - android:description="@string/widget_month_day_label" + android:description="@string/widget_month_day_description" android:updatePeriodMillis="1800000" android:previewLayout="@layout/widget_preview_month_day" android:initialLayout="@layout/glance_default_loading_layout" /> diff --git a/app/src/main/res/xml/appwidget_info_quick_add.xml b/app/src/main/res/xml/appwidget_info_quick_add.xml index 933ce6db..281b8829 100644 --- a/app/src/main/res/xml/appwidget_info_quick_add.xml +++ b/app/src/main/res/xml/appwidget_info_quick_add.xml @@ -8,7 +8,7 @@ android:widgetCategory="home_screen" android:configure="de.jeanlucmakiola.calendula.widget.config.WidgetConfigActivity" android:widgetFeatures="reconfigurable" - android:description="@string/widget_quick_add_label" + android:description="@string/widget_quick_add_description" android:updatePeriodMillis="1800000" android:previewLayout="@layout/widget_preview_quick_add" android:initialLayout="@layout/glance_default_loading_layout" /> diff --git a/app/src/main/res/xml/appwidget_info_today.xml b/app/src/main/res/xml/appwidget_info_today.xml index 753674be..05ef690f 100644 --- a/app/src/main/res/xml/appwidget_info_today.xml +++ b/app/src/main/res/xml/appwidget_info_today.xml @@ -12,7 +12,7 @@ android:widgetCategory="home_screen" android:configure="de.jeanlucmakiola.calendula.widget.config.WidgetConfigActivity" android:widgetFeatures="reconfigurable" - android:description="@string/widget_today_label" + android:description="@string/widget_today_description" android:updatePeriodMillis="1800000" android:previewLayout="@layout/widget_preview_today" android:initialLayout="@layout/glance_default_loading_layout" /> diff --git a/app/src/main/res/xml/appwidget_info_upcoming.xml b/app/src/main/res/xml/appwidget_info_upcoming.xml index e80cddb9..bb06e202 100644 --- a/app/src/main/res/xml/appwidget_info_upcoming.xml +++ b/app/src/main/res/xml/appwidget_info_upcoming.xml @@ -10,7 +10,7 @@ android:widgetCategory="home_screen" android:configure="de.jeanlucmakiola.calendula.widget.config.WidgetConfigActivity" android:widgetFeatures="reconfigurable" - android:description="@string/widget_upcoming_label" + android:description="@string/widget_upcoming_description" android:updatePeriodMillis="1800000" android:previewLayout="@layout/widget_preview_upcoming" android:initialLayout="@layout/glance_default_loading_layout" /> diff --git a/app/src/main/res/xml/appwidget_info_week_strip.xml b/app/src/main/res/xml/appwidget_info_week_strip.xml index 1c17bff1..9f2f4fe0 100644 --- a/app/src/main/res/xml/appwidget_info_week_strip.xml +++ b/app/src/main/res/xml/appwidget_info_week_strip.xml @@ -10,7 +10,7 @@ android:widgetCategory="home_screen" android:configure="de.jeanlucmakiola.calendula.widget.config.WidgetConfigActivity" android:widgetFeatures="reconfigurable" - android:description="@string/widget_week_strip_label" + android:description="@string/widget_week_strip_description" android:updatePeriodMillis="1800000" android:previewLayout="@layout/widget_preview_week_strip" android:initialLayout="@layout/glance_default_loading_layout" /> diff --git a/floret-kit b/floret-kit index 5716402e..aef99a11 160000 --- a/floret-kit +++ b/floret-kit @@ -1 +1 @@ -Subproject commit 5716402e7219c56b025f7ab4556b7147206cf769 +Subproject commit aef99a119f0e50fed3aae9777d808c484d4c1d04