animation + reparsing

Author: 0xbrayo

mobile/src/main/java/net/activitywatch/android/widget/CategoryTimeWidgetProvider.kt

@@ -7,8 +7,10 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.util.Log
+import android.view.View
 import android.widget.RemoteViews
 import net.activitywatch.android.R
+import net.activitywatch.android.watcher.UsageStatsWatcher
 
 private const val TAG = "CategoryTimeWidget"
 private const val ACTION_REFRESH = "net.activitywatch.android.widget.ACTION_REFRESH"
@@ -36,12 +38,27 @@ class CategoryTimeWidgetProvider : AppWidgetProvider() {
         super.onReceive(context, intent)
 
         if (intent.action == ACTION_REFRESH) {
-            Log.d(TAG, "Refresh button clicked - updating all widgets")
+            Log.d(TAG, "Refresh button clicked - re-parsing usage events and updating widgets")
 
             val appWidgetManager = AppWidgetManager.getInstance(context)
             val componentName = ComponentName(context, CategoryTimeWidgetProvider::class.java)
             val appWidgetIds = appWidgetManager.getAppWidgetIds(componentName)
 
+            // Show loading indicator first
+            for (appWidgetId in appWidgetIds) {
+                showLoadingState(context, appWidgetManager, appWidgetId)
+            }
+            
+            // Re-parse usage events
+            try {
+                val usageStatsWatcher = UsageStatsWatcher(context)
+                usageStatsWatcher.sendHeartbeats()
+                Log.d(TAG, "Triggered usage events re-parsing")
+            } catch (e: Exception) {
+                Log.e(TAG, "Error re-parsing usage events", e)
+            }
+            
+            // Then update with fresh data
             for (appWidgetId in appWidgetIds) {
                 updateWidgetWithRefreshButton(context, appWidgetManager, appWidgetId)
             }
@@ -59,6 +76,21 @@ class CategoryTimeWidgetProvider : AppWidgetProvider() {
     }
 
     companion object {
+        /**
+         * Show loading state - hide refresh button and show spinner
+         */
+        private fun showLoadingState(
+            context: Context,
+            appWidgetManager: AppWidgetManager,
+            appWidgetId: Int
+        ) {
+            val views = RemoteViews(context.packageName, R.layout.widget_category_time)
+            views.setViewVisibility(R.id.widget_refresh_button, View.GONE)
+            views.setViewVisibility(R.id.widget_loading_indicator, View.VISIBLE)
+            appWidgetManager.updateAppWidget(appWidgetId, views)
+            Log.d(TAG, "Showing loading indicator for widget $appWidgetId")
+        }
+
         /**
          * Update widget and set up the refresh button click handler
          */
@@ -70,9 +102,13 @@ class CategoryTimeWidgetProvider : AppWidgetProvider() {
             // First update the widget data
             CategoryTimeWidgetWorker.updateSingleWidget(context, appWidgetManager, appWidgetId)
 
-            // Then set up the refresh button click handler
+            // Then set up the refresh button click handler and hide loading
             val views = RemoteViews(context.packageName, R.layout.widget_category_time)
 
+            // Hide loading indicator and show refresh button
+            views.setViewVisibility(R.id.widget_loading_indicator, View.GONE)
+            views.setViewVisibility(R.id.widget_refresh_button, View.VISIBLE)
+            
             val refreshIntent = Intent(context, CategoryTimeWidgetProvider::class.java).apply {
                 action = ACTION_REFRESH
             }

mobile/src/main/res/layout/widget_category_time.xml

@@ -214,12 +214,21 @@
 
             <ImageButton
                 android:id="@+id/widget_refresh_button"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+                android:layout_width="22dp"
+                android:layout_height="22dp"
                 android:layout_marginStart="8dp"
                 android:src="@drawable/ic_refresh"
                 android:background="@android:color/transparent"
                 android:contentDescription="Refresh widget" />
+
+            <ProgressBar
+                android:id="@+id/widget_loading_indicator"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_marginStart="8dp"
+                android:visibility="gone"
+                android:indeterminate="true"
+                style="?android:attr/progressBarStyleSmall" />
         </LinearLayout>
 
     </LinearLayout>

mobile/src/main/res/xml/category_time_widget_info.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
     android:minWidth="250dp"
-    android:minHeight="180dp"
+    android:minHeight="40dp"
     android:updatePeriodMillis="1800000"
     android:initialLayout="@layout/widget_category_time"
     android:resizeMode="horizontal|vertical"
     android:widgetCategory="home_screen"
-    android:description="@string/widget_category_time_description" />
+    android:description="@string/widget_category_time_description" />