Merge branch 'trunk' into woomob-1855-create-refund

Author: samiuelson

RELEASE-NOTES.txt

@@ -12,6 +12,7 @@
 - [*] Fixed a rare crash in the refund flow [https://github.com/woocommerce/woocommerce-android/pull/15109]
 - [*][Woo POS] Prepopulate orders cache after opening POS to improve performance [https://github.com/woocommerce/woocommerce-android/pull/15066]
 - [*][Internal] Migrated legacy Material Icons to Material Symbols [https://github.com/woocommerce/woocommerce-android/pull/15081]
+- [*] Fix widget sizing issues and improve refresh rate upon switching site or logging out [https://github.com/woocommerce/woocommerce-android/pull/15127]
 - [*] Unified transition animations across screens [https://github.com/woocommerce/woocommerce-android/pull/15128]
 
 23.8

WooCommerce-Wear/src/main/java/com/woocommerce/android/app/WooCommerceWear.kt

@@ -8,7 +8,6 @@ import dagger.hilt.android.HiltAndroidApp
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import org.wordpress.android.fluxc.persistence.WellSqlConfig
-import org.wordpress.android.fluxc.persistence.WellSqlConfig.Companion.ADDON_WOOCOMMERCE
 import org.wordpress.android.fluxc.utils.ErrorUtils.OnUnexpectedError
 import javax.inject.Inject
 
@@ -20,7 +19,7 @@ open class WooCommerceWear : Application() {
 
     override fun onCreate() {
         super.onCreate()
-        WellSql.init(WellSqlConfig(applicationContext, ADDON_WOOCOMMERCE))
+        WellSql.init(WellSqlConfig(applicationContext))
         crashLogging.get().initialize()
     }
 

WooCommerce/build.gradle

@@ -445,6 +445,7 @@ dependencies {
 
     implementation(libs.google.protobuf.kotlinlite)
 
+    testImplementation(testFixtures(project(":libs:fluxc")))
     testImplementation(testFixtures(project(":libs:fluxc-plugin")))
     testImplementation(testFixtures(project(":libs:commons")))
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/appwidgets/stats/today/TodayStatsWidgetUpdater.kt

@@ -5,6 +5,8 @@ import android.content.ComponentName
 import android.content.Context
 import androidx.work.BackoffPolicy
 import androidx.work.ExistingPeriodicWorkPolicy
+import androidx.work.ExistingWorkPolicy
+import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.WorkRequest
@@ -33,6 +35,23 @@ class TodayStatsWidgetUpdater @Inject constructor() : WidgetUpdater {
 
         WorkManager.getInstance(context)
             .enqueueUniquePeriodicWork(uniqueName, ExistingPeriodicWorkPolicy.UPDATE, workRequest)
+
+        val immediateWorkRequest =
+            OneTimeWorkRequestBuilder<UpdateTodayStatsWorker>()
+                .setInputData(data)
+                .setBackoffCriteria(
+                    BackoffPolicy.EXPONENTIAL,
+                    WorkRequest.MIN_BACKOFF_MILLIS,
+                    TimeUnit.MILLISECONDS
+                )
+                .build()
+
+        WorkManager.getInstance(context)
+            .enqueueUniqueWork(
+                uniqueWorkName = "$uniqueName-immediate",
+                existingWorkPolicy = ExistingWorkPolicy.REPLACE,
+                request = immediateWorkRequest
+            )
     }
 
     override fun componentName(context: Context) = ComponentName(context, TodayStatsWidgetProvider::class.java)

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/BookingMapper.kt

@@ -16,6 +16,7 @@ import com.woocommerce.android.ui.bookings.details.AttendanceUpdateStatus
 import com.woocommerce.android.ui.bookings.details.CancelStatus
 import com.woocommerce.android.ui.bookings.list.BookingListItem
 import com.woocommerce.android.util.CurrencyFormatter
+import com.woocommerce.android.util.DateFormatter
 import com.woocommerce.android.util.normalizeDuration
 import com.woocommerce.android.util.toHumanReadableFormat
 import com.woocommerce.android.viewmodel.ResourceProvider
@@ -33,23 +34,17 @@ import java.time.format.FormatStyle
 import javax.inject.Inject
 
 class BookingMapper @Inject constructor(
+    private val dateFormatter: DateFormatter,
     private val currencyFormatter: CurrencyFormatter,
     private val getLocations: GetLocations,
     private val resourceProvider: ResourceProvider
 ) {
-    private val summaryDateFormatter: DateTimeFormatter = DateTimeFormatter.ofLocalizedDateTime(
-        FormatStyle.MEDIUM,
-        FormatStyle.SHORT
-    ).withZone(ZoneOffset.UTC)
-
     private val detailsDateFormatter: DateTimeFormatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL)
         .withZone(ZoneOffset.UTC)
-    private val timeRangeFormatter: DateTimeFormatter = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
-        .withZone(ZoneOffset.UTC)
 
     fun Booking.toBookingSummaryModel(attendanceUpdateStatus: AttendanceUpdateStatus): BookingSummaryModel {
         return BookingSummaryModel(
-            date = summaryDateFormatter.format(start),
+            date = dateFormatter.formatDateTime(start),
             name = order.productInfo?.name ?: "-",
             customerName = order.customerInfo?.fullName(),
             status = status.toUiModel(order.status, order.paymentInfo?.paymentMethodId),
@@ -74,7 +69,7 @@ class BookingMapper @Inject constructor(
             .toHumanReadableFormat(resourceProvider)
         return BookingAppointmentDetailsModel(
             date = detailsDateFormatter.format(start),
-            time = "${timeRangeFormatter.format(start)} - ${timeRangeFormatter.format(end)}",
+            time = "${dateFormatter.formatTime(start)} - ${dateFormatter.formatTime(end)}",
             staff = staffMemberStatus,
             // TODO replace mocked values when available from API
             location = "238 Willow Creek Drive, Montgomery AL 36109",
@@ -147,7 +142,7 @@ class BookingMapper @Inject constructor(
             ?: UiString.UiStringRes(R.string.customer_detail_guest_customer)
         val serviceName = booking.order.productInfo?.name ?: "-"
         val date = detailsDateFormatter.format(booking.start)
-        val time = timeRangeFormatter.format(booking.start)
+        val time = dateFormatter.formatTime(booking.start)
         return UiString.UiStringRes(
             R.string.booking_cancel_dialog_message_v2,
             listOf(

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/filter/datetime/DateTimeFilterViewModel.kt

@@ -7,6 +7,7 @@ import com.woocommerce.android.R
 import com.woocommerce.android.ui.bookings.filter.datetime.PickerDialogState.DateDialog
 import com.woocommerce.android.ui.bookings.filter.datetime.PickerDialogState.TimeDialog
 import com.woocommerce.android.ui.compose.component.Time
+import com.woocommerce.android.util.DateFormatter
 import com.woocommerce.android.viewmodel.MultiLiveEvent
 import com.woocommerce.android.viewmodel.ScopedViewModel
 import dagger.assisted.Assisted
@@ -22,22 +23,18 @@ import java.time.LocalDateTime
 import java.time.LocalTime
 import java.time.ZoneId
 import java.time.ZoneOffset
-import java.time.format.DateTimeFormatter
-import java.time.format.FormatStyle
 
 @HiltViewModel(assistedFactory = DateTimeFilterViewModel.Factory::class)
 class DateTimeFilterViewModel @AssistedInject constructor(
     savedStateHandle: SavedStateHandle,
     private val clock: Clock,
+    private val dateFormatter: DateFormatter,
     @Assisted private val initialRange: BookingsFilterOption.DateRange? = null,
     @Assisted private val onTypeFilterChanged: (BookingsFilterOption.DateRange) -> Unit,
 ) : ScopedViewModel(savedStateHandle) {
 
     private val zone: ZoneId = ZoneOffset.UTC
 
-    private val dateFormatter: DateTimeFormatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM)
-    private val timeFormatter: DateTimeFormatter = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
-
     private val _uiState = MutableStateFlow(
         DateTimeFilterUiState(
             onDateClick = { openDateDialog(it) },
@@ -255,8 +252,8 @@ class DateTimeFilterViewModel @AssistedInject constructor(
         )
     }
 
-    private fun LocalDateTime?.formatDate(): String = this?.let { dateFormatter.format(it) }.orEmpty()
-    private fun LocalDateTime?.formatTime(): String = this?.let { timeFormatter.format(it) }.orEmpty()
+    private fun LocalDateTime?.formatDate(): String = this?.let { dateFormatter.formatDate(it) }.orEmpty()
+    private fun LocalDateTime?.formatTime(): String = this?.let { dateFormatter.formatTime(it) }.orEmpty()
 
     @AssistedFactory
     interface Factory {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/plugins/PluginsViewModel.kt

@@ -52,8 +52,9 @@ class PluginsViewModel @Inject constructor(
                 _viewState.emit(
                     Loaded(
                         plugins = response.model!!
-                            .filter { it.version.isNotNullOrEmpty() && it.name.isNotNullOrEmpty() }
-                            .map {
+                            .filter { pluginDto: SystemPluginModel ->
+                                pluginDto.version.isNotNullOrEmpty() && pluginDto.name.isNotNullOrEmpty()
+                            }.map {
                                 Plugin(
                                     name = StringEscapeUtils.unescapeHtml4(it.name),
                                     authorName = StringEscapeUtils.unescapeHtml4(it.authorName),

WooCommerce/src/main/kotlin/com/woocommerce/android/util/DateFormatter.kt

@@ -0,0 +1,55 @@
+package com.woocommerce.android.util
+
+import android.content.Context
+import android.text.format.DateFormat
+import dagger.hilt.android.qualifiers.ApplicationContext
+import java.time.Instant
+import java.time.LocalDateTime
+import java.time.ZoneOffset
+import java.time.format.DateTimeFormatter
+import java.time.format.FormatStyle
+import java.util.Locale
+import javax.inject.Inject
+
+class DateFormatter @Inject constructor(@ApplicationContext private val context: Context) {
+
+    /**
+     * Formats date and time respecting system 12h/24h preference.
+     * Example: "Dec 12, 2025, 10:47 PM" or "Dec 12, 2025, 22:47"
+     */
+    fun formatDateTime(
+        instant: Instant
+    ): String = createSkeletonFormatter(skeleton = "MMMdyyyyhm", skeleton24h = "MMMdyyyyHm").format(instant)
+
+    /**
+     * Formats time only respecting system 12h/24h preference.
+     * Example: "10:47 PM" or "22:47"
+     */
+    fun formatTime(instant: Instant): String = getTimeFormatter().format(instant)
+
+    /**
+     * Formats date only using localized medium style.
+     * Example: "Dec 12, 2025"
+     */
+    fun formatDate(
+        localDateTime: LocalDateTime
+    ): String = DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM).format(localDateTime)
+
+    /**
+     * Formats time only respecting system 12h/24h preference.
+     * Example: "10:47 PM" or "22:47"
+     */
+    fun formatTime(localDateTime: LocalDateTime): String = getTimeFormatter().format(localDateTime)
+
+    private fun createSkeletonFormatter(skeleton: String, skeleton24h: String? = null): DateTimeFormatter {
+        val isSystem24h = DateFormat.is24HourFormat(context)
+
+        val finalSkeleton = if (isSystem24h && skeleton24h != null) skeleton24h else skeleton
+
+        val bestPattern = DateFormat.getBestDateTimePattern(Locale.getDefault(), finalSkeleton)
+
+        return DateTimeFormatter.ofPattern(bestPattern, Locale.getDefault()).withZone(ZoneOffset.UTC)
+    }
+
+    private fun getTimeFormatter() = createSkeletonFormatter(skeleton = "hm", skeleton24h = "Hm")
+}