v1.3: smooth 30fps rotation (6° steps), guaranteed minimum one full spin per tap

app/build.gradle.kts

@@ -11,8 +11,8 @@ android {
         applicationId = "me.khodak.claudeusage"
         minSdk = 26
         targetSdk = 34
-        versionCode = 3
+        versionCode = 4
-        versionName = "1.2"
+        versionName = "1.3"
     }
 
     signingConfigs {

app/src/main/java/me/khodak/claudeusage/ClaudeUsageWidget.kt

@@ -39,6 +39,7 @@ class ClaudeUsageWidget : AppWidgetProvider() {
     companion object {
         const val ACTION_REFRESH = "me.khodak.claudeusage.ACTION_REFRESH"
         @Volatile internal var isRefreshing = false
+        @Volatile internal var currentRotation = 0f
 
         fun updateWidget(context: Context, manager: AppWidgetManager, widgetId: Int) {
             val prefs = PreferencesManager(context)
@@ -149,7 +150,7 @@ class ClaudeUsageWidget : AppWidgetProvider() {
                 if (status.isNotBlank()) status else if (updatedMs > 0) formatTime(updatedMs) else "")
             v.setInt(R.id.btn_refresh, "setColorFilter",
                 if (isRefreshing) 0xFFCC785C.toInt() else 0xFF999999.toInt())
-            v.setFloat(R.id.btn_refresh, "setRotation", 0f)
+            v.setFloat(R.id.btn_refresh, "setRotation", currentRotation)
             return v
         }
 
@@ -231,7 +232,7 @@ class ClaudeUsageWidget : AppWidgetProvider() {
             )
             v.setInt(R.id.btn_refresh, "setColorFilter",
                 if (isRefreshing) 0xFFCC785C.toInt() else 0xFF999999.toInt())
-            v.setFloat(R.id.btn_refresh, "setRotation", 0f)
+            v.setFloat(R.id.btn_refresh, "setRotation", currentRotation)
 
             return v
         }

app/src/main/java/me/khodak/claudeusage/UsageUpdateWorker.kt

@@ -6,16 +6,14 @@ import android.appwidget.AppWidgetManager
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
-import android.os.Build
 import android.os.SystemClock
-import android.util.SizeF
-import android.widget.RemoteViews
 import androidx.work.*
+import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import me.khodak.claudeusage.data.PreferencesManager
-import java.util.concurrent.TimeUnit
 
 class UsageUpdateWorker(
     private val context: Context,
@@ -35,6 +33,7 @@ class UsageUpdateWorker(
                 prefs.saveUsageData(data)
             } catch (_: Exception) {}
             animJob.cancel()
+            animJob.join() // wait for the minimum-rotation finally block to finish
         }
 
         pushWidgetUpdate()
@@ -44,30 +43,31 @@ class UsageUpdateWorker(
     private suspend fun rotateRefreshIcon() {
         val manager = AppWidgetManager.getInstance(context)
         val ids = manager.getAppWidgetIds(ComponentName(context, ClaudeUsageWidget::class.java))
-        var angle = 0f
+        var totalDegrees = 0f
+
+        try {
             while (true) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                ClaudeUsageWidget.currentRotation = (ClaudeUsageWidget.currentRotation + 6f) % 360f
-                val small = RemoteViews(context.packageName, R.layout.widget_layout_small)
+                totalDegrees += 6f
-                small.setFloat(R.id.btn_refresh, "setRotation", angle)
+                ids.forEach { id -> ClaudeUsageWidget.updateWidget(context, manager, id) }
-                val large = RemoteViews(context.packageName, R.layout.widget_layout)
+                delay(33) // 30 fps, one full rotation per second
-                large.setFloat(R.id.btn_refresh, "setRotation", angle)
+            }
-                val rv = RemoteViews(mapOf(
+        } finally {
-                    SizeF(50f, 50f)  to small,
+            // Even if the fetch finishes early, complete at least one full 360°
-                    SizeF(50f, 120f) to large
+            withContext(NonCancellable) {
-                ))
+                while (totalDegrees < 360f) {
-                ids.forEach { id -> manager.partiallyUpdateAppWidget(id, rv) }
+                    ClaudeUsageWidget.currentRotation = (ClaudeUsageWidget.currentRotation + 6f) % 360f
-            } else {
+                    totalDegrees += 6f
-                val rv = RemoteViews(context.packageName, R.layout.widget_layout)
+                    ids.forEach { id -> ClaudeUsageWidget.updateWidget(context, manager, id) }
-                rv.setFloat(R.id.btn_refresh, "setRotation", angle)
+                    delay(33)
-                ids.forEach { id -> manager.partiallyUpdateAppWidget(id, rv) }
+                }
             }
-            angle = (angle + 30f) % 360f
-            delay(83) // ~12 fps, one full rotation per second
         }
     }
 
     private fun pushWidgetUpdate() {
         ClaudeUsageWidget.isRefreshing = false
+        ClaudeUsageWidget.currentRotation = 0f
         val manager = AppWidgetManager.getInstance(context)
         val ids = manager.getAppWidgetIds(ComponentName(context, ClaudeUsageWidget::class.java))
         ids.forEach { id -> ClaudeUsageWidget.updateWidget(context, manager, id) }
@@ -88,7 +88,8 @@ class UsageUpdateWorker(
         }
 
         fun cancelPeriodicRefresh(context: Context) =
-            (context.getSystemService(Context.ALARM_SERVICE) as AlarmManager)                .cancel(alarmIntent(context))
+            (context.getSystemService(Context.ALARM_SERVICE) as AlarmManager)
+                .cancel(alarmIntent(context))
 
         fun triggerImmediateRefresh(context: Context) {
             WorkManager.getInstance(context).enqueueUniqueWork(