Merge pull request #105 from garanj/main

Adds watch face support using Watch Face Push

Author: garanj

app/build.gradle.kts

@@ -37,8 +37,8 @@ android {
         applicationId = "com.android.developers.androidify"
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = 36
-        versionCode = 5
-        versionName = "1.1.3"
+        versionCode = libs.versions.appVersionCode.get().toInt()
+        versionName = libs.versions.appVersionName.get()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -96,6 +96,12 @@ android {
             isIncludeAndroidResources = true
         }
     }
+    // To avoid packaging conflicts when using bouncycastle
+    packaging {
+        resources {
+            excludes.add("META-INF/versions/9/OSGI-INF/MANIFEST.MF")
+        }
+    }
 }
 
 baselineProfile() {

app/proguard-rules.pro

@@ -33,3 +33,13 @@
 -keepattributes Signature
 -keepattributes *Annotation*
 -keepattributes InnerClasses
+
+# Ignore missing Java SE image classes from TwelveMonkeys ImageIO
+-dontwarn javax.imageio.**
+
+# Ignore missing Java SE XML classes from Xerces and other XML processors
+-dontwarn org.apache.xml.resolver.**
+-dontwarn org.eclipse.wst.xml.xpath2.processor.**
+
+# Ignore missing Java SE annotation processing classes, often from libraries like AutoValue
+-dontwarn javax.lang.model.**

app/src/main/AndroidManifest.xml

@@ -78,6 +78,14 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <!-- Required deeplink to make the app launchable from the watch -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="androidify"
+                    android:host="launch" />
+            </intent-filter>
         </activity>
         <!-- need to use Theme.AppCompat -->
         <activity

build.gradle.kts

@@ -50,4 +50,4 @@ subprojects {
             licenseHeaderFile(rootProject.file("spotless/copyright.xml"), "(<[^!?])")
         }
     }
-}
+}

core/network/src/main/java/com/android/developers/androidify/RemoteConfigDataSource.kt

@@ -43,6 +43,8 @@ interface RemoteConfigDataSource {
     fun getImageGenerationEditsModelName(): String
 
     fun getBotBackgroundInstructionPrompt(): String
+
+    fun watchfaceFeatureEnabled(): Boolean
 }
 
 @Singleton
@@ -111,4 +113,8 @@ class RemoteConfigDataSourceImpl @Inject constructor() : RemoteConfigDataSource
     override fun getBotBackgroundInstructionPrompt(): String {
         return remoteConfig.getString("bot_background_instruction_prompt")
     }
+
+    override fun watchfaceFeatureEnabled(): Boolean {
+        return remoteConfig.getBoolean("watchface_feature_enabled")
+    }
 }

core/network/src/main/res/xml/remote_config_defaults.xml

@@ -15,6 +15,10 @@
      limitations under the License.
 -->
 <defaults>
+    <entry>
+        <key>watchface_feature_enabled</key>
+        <value>false</value>
+    </entry>
     <entry>
         <key>background_vibes_feature_enabled</key>
         <value>false</value>

core/testing/build.gradle.kts

@@ -59,6 +59,8 @@ dependencies {
     implementation(projects.core.network)
     implementation(projects.core.util)
     implementation(projects.feature.results)
+    implementation(projects.watchface)
+    implementation(projects.wear.common)
 
     ksp(libs.hilt.compiler)
 

core/testing/src/main/java/com/android/developers/testing/network/TestRemoteConfigDataSource.kt

@@ -79,4 +79,8 @@ class TestRemoteConfigDataSource(private val useGeminiNano: Boolean) : RemoteCon
     override fun getBotBackgroundInstructionPrompt(): String {
         return "bot_background_instruction_prompt"
     }
+
+    override fun watchfaceFeatureEnabled(): Boolean {
+        return true
+    }
 }

core/testing/src/main/java/com/android/developers/testing/repository/FakeWatchFaceInstallationRepository.kt

@@ -0,0 +1,68 @@
+package com.android.developers.testing.repository
+
+import android.graphics.Bitmap
+import com.android.developers.androidify.watchface.WatchFaceAsset
+import com.android.developers.androidify.watchface.transfer.WatchFaceInstallationRepository
+import com.android.developers.androidify.wear.common.ConnectedWatch
+import com.android.developers.androidify.wear.common.WatchFaceActivationStrategy
+import com.android.developers.androidify.wear.common.WatchFaceInstallError
+import com.android.developers.androidify.wear.common.WatchFaceInstallationStatus
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import java.util.UUID
+
+class FakeWatchFaceInstallationRepository : WatchFaceInstallationRepository {
+    private val watch = ConnectedWatch(
+        nodeId = "1234",
+        displayName = "Pixel Watch",
+        hasAndroidify = true,
+    )
+
+    private val watchFaceAsset = WatchFaceAsset(
+        id = "watch_face_1",
+        previewPath = com.android.developers.androidify.results.R.drawable.watch_face_preview,
+    )
+
+    private var transferId = generateTransferId()
+
+    private val _connectedWatch = MutableStateFlow<ConnectedWatch?>(null)
+    override val connectedWatch = _connectedWatch.asStateFlow()
+
+    private val _watchFaceInstallationStatus =
+        MutableStateFlow<WatchFaceInstallationStatus>(WatchFaceInstallationStatus.NotStarted)
+    override val watchFaceInstallationUpdates = _watchFaceInstallationStatus.asStateFlow()
+
+    override suspend fun createAndTransferWatchFace(
+        connectedWatch: ConnectedWatch,
+        watchFace: WatchFaceAsset,
+        bitmap: Bitmap,
+    ): WatchFaceInstallError {
+        transferId = generateTransferId()
+        delay(5_000)
+        _watchFaceInstallationStatus.value = WatchFaceInstallationStatus.Complete(
+            success = true,
+            otherNodeId = "5678",
+            transferId = transferId,
+            activationStrategy = WatchFaceActivationStrategy.NO_ACTION_NEEDED,
+            validationToken = "1234abcd",
+            installError = WatchFaceInstallError.NO_ERROR,
+        )
+        return WatchFaceInstallError.NO_ERROR
+    }
+
+    override suspend fun getAvailableWatchFaces(): Result<List<WatchFaceAsset>> {
+        return Result.success(listOf(watchFaceAsset))
+    }
+
+    override suspend fun resetInstallationStatus() {
+        transferId = generateTransferId()
+        _watchFaceInstallationStatus.value = WatchFaceInstallationStatus.NotStarted
+    }
+
+    private fun generateTransferId() = UUID.randomUUID().toString().take(8)
+
+    public fun setWatchAsConnected() {
+        _connectedWatch.value = watch
+    }
+}

core/theme/build.gradle.kts

@@ -48,7 +48,12 @@ android {
     kotlinOptions {
         jvmTarget = libs.versions.jvmTarget.get()
     }
-
+    // To avoid packaging conflicts when using bouncycastle
+    packaging {
+        resources {
+            excludes.add("META-INF/versions/9/OSGI-INF/MANIFEST.MF")
+        }
+    }
 }
 
 dependencies {
@@ -57,6 +62,7 @@ dependencies {
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.material3)
     implementation(projects.core.util)
+    implementation(libs.guava)
 
     implementation(libs.androidx.adaptive)
     implementation(libs.androidx.adaptive.layout)