Dynamic layouts

CHANGELOG.md

@@ -1,4 +1,13 @@
-Last updated: 2023-11-25
+Last updated: 2024-03-25
+
+- v3.0.2-alpha
+  - Use single animator to help avoid data races/bugs
+
+- v3.0.1-alpha
+  - Use LruCache instead of BitmapCache
+
+- v3.0.0-alpha
+  - Dynamic layouts
 
 - v2.12.1
   - Remove heartrate complication prefix style

app/build.gradle

@@ -27,8 +27,8 @@ android {
     applicationId "dev.rdnt.m8face"
     minSdk 28
     targetSdk 33
-    versionCode 56
-    versionName '2.12.1'
+    versionCode 62
+    versionName '3.0.5'
   }
 
   buildFeatures {
@@ -51,6 +51,7 @@ android {
       minifyEnabled true
       proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
       versionNameSuffix '-preview'
+      signingConfig signingConfigs.debug
     }
 
     release {

app/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   Copyright 2020 The Android Open Source Project
 
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,69 +14,71 @@
   limitations under the License.
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+  xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-feature android:name="android.hardware.type.watch" />
+  <uses-feature android:name="android.hardware.type.watch" />
 
-    <uses-permission android:name="com.google.android.permission.PROVIDE_BACKGROUND" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="com.google.android.wearable.permission.RECEIVE_COMPLICATION_DATA" />
-    <uses-permission android:name="com.google.android.wearable.permission.RECEIVE_COMPLICATION_DATA_PRIVILEGED" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>
+  <uses-permission android:name="com.google.android.permission.PROVIDE_BACKGROUND" />
+  <uses-permission android:name="android.permission.WAKE_LOCK" />
+  <uses-permission android:name="com.google.android.wearable.permission.RECEIVE_COMPLICATION_DATA" />
+  <uses-permission android:name="com.google.android.wearable.permission.RECEIVE_COMPLICATION_DATA_PRIVILEGED" />
+  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+  <uses-permission
+    android:name="com.google.android.gms.permission.AD_ID"
+    tools:node="remove" />
 
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:supportsRtl="false"
-        >
+  <application
+    android:allowBackup="true"
+    android:icon="@mipmap/ic_launcher"
+    android:label="@string/app_name"
+    android:supportsRtl="false">
 
-        <meta-data
-            android:name="com.google.android.wearable.standalone"
-            android:value="true" />
+    <meta-data
+      android:name="com.google.android.wearable.standalone"
+      android:value="true" />
 
-        <service
-            android:name=".WatchFaceService"
-            android:directBootAware="true"
-            android:exported="true"
-            android:label="@string/analog_watch_face_name"
-            android:permission="android.permission.BIND_WALLPAPER">
-            <intent-filter>
-                <action android:name="android.service.wallpaper.WallpaperService" />
-                <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
-            </intent-filter>
+    <service
+      android:name=".WatchFaceService"
+      android:directBootAware="true"
+      android:exported="true"
+      android:label="@string/watch_face_name"
+      android:permission="android.permission.BIND_WALLPAPER">
+      <intent-filter>
+        <action android:name="android.service.wallpaper.WallpaperService" />
+        <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
+      </intent-filter>
 
-            <meta-data
-                android:name="com.google.android.wearable.watchface.preview"
-                android:resource="@drawable/watch_preview" />
-            <meta-data
-                android:name="com.google.android.wearable.watchface.preview_circular"
-                android:resource="@drawable/watch_preview" />
-            <meta-data
-                android:name="android.service.wallpaper"
-                android:resource="@xml/watch_face" />
+      <meta-data
+        android:name="com.google.android.wearable.watchface.preview"
+        android:resource="@drawable/watch_preview" />
+      <meta-data
+        android:name="com.google.android.wearable.watchface.preview_circular"
+        android:resource="@drawable/watch_preview" />
+      <meta-data
+        android:name="android.service.wallpaper"
+        android:resource="@xml/watch_face" />
 
-            <meta-data
-                android:name="com.google.android.wearable.watchface.wearableConfigurationAction"
-                android:value="androidx.wear.watchface.editor.action.WATCH_FACE_EDITOR" />
+      <meta-data
+        android:name="com.google.android.wearable.watchface.wearableConfigurationAction"
+        android:value="androidx.wear.watchface.editor.action.WATCH_FACE_EDITOR" />
 
-            <meta-data
-                android:name="com.google.android.wearable.watchface.companionBuiltinConfigurationEnabled"
-                android:value="true" />
-        </service>
+      <meta-data
+        android:name="com.google.android.wearable.watchface.companionBuiltinConfigurationEnabled"
+        android:value="true" />
+    </service>
 
-        <activity
-            android:name=".editor.WatchFaceConfigActivity"
-            android:exported="true"
-            android:label="@string/title_activity_watch_face_config">
+    <activity
+      android:name=".editor.WatchFaceConfigActivity"
+      android:exported="true"
+      android:label="@string/title_activity_watch_face_config"
+      android:taskAffinity="dev.rdnt.m8face">
 
-            <intent-filter>
-                <action android:name="androidx.wear.watchface.editor.action.WATCH_FACE_EDITOR" />
+      <intent-filter>
+        <action android:name="androidx.wear.watchface.editor.action.WATCH_FACE_EDITOR" />
 
-                <category android:name="com.google.android.wearable.watchface.category.WEARABLE_CONFIGURATION" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-    </application>
+        <category android:name="com.google.android.wearable.watchface.category.WEARABLE_CONFIGURATION" />
+        <category android:name="android.intent.category.DEFAULT" />
+      </intent-filter>
+    </activity>
+  </application>
 </manifest>

app/src/main/java/dev/rdnt/m8face/BitmapCache.kt

@@ -0,0 +1,68 @@
+package dev.rdnt.m8face
+
+import android.graphics.Bitmap
+import android.util.Log
+
+//const val HOURS_BITMAP_KEY = "hours"
+//const val MINUTES_BITMAP_KEY = "minutes"
+//const val SECONDS_BITMAP_KEY = "seconds"
+//const val AMPM_BITMAP_KEY = "ampm"
+//
+//const val TIME_BITMAP_KEY = "time"
+//const val AUX_BITMAP_KEY = "aux"
+
+class BitmapCacheOld {
+  private val entries: MutableMap<String, BitmapCacheEntry> = mutableMapOf()
+
+  override fun toString(): String {
+    //loop entries
+    var result = ""
+    entries.forEach { (k, v) -> result += "{$k: $v} " }
+    return "(entries= $result)"
+  }
+
+  fun get(k: String, h: String): Bitmap? {
+    return entries[k]?.get(h)
+  }
+
+  fun set(k: String, h: String, b: Bitmap?) {
+    val entry = entries.getOrPut(k) { BitmapCacheEntry() }
+    entry.set(h, b)
+  }
+
+  fun renders(k: String): Int {
+    return entries[k]?.renders ?: 1
+  }
+
+  fun loads(k: String): Int {
+    return entries[k]?.loads ?: 1
+  }
+}
+
+class BitmapCacheEntry {
+  var renders: Int = 1
+  var loads: Int = 1
+  private var hash: String = ""
+  private var bitmap: Bitmap? = null
+
+  override fun toString(): String {
+    return "(renders=$renders, loads=$loads)"
+  }
+
+  fun get(h: String): Bitmap? {
+    loads++
+
+    if (bitmap != null && h == hash) {
+      return bitmap
+    }
+
+    return null
+  }
+
+  fun set(h: String, b: Bitmap?) {
+    renders++
+
+    hash = h
+    bitmap = b
+  }
+}