Moves Wear OS to install over Data Layer

Author: garanj

feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt

@@ -130,6 +130,9 @@ fun CustomizeAndExportScreen(
         onInstallWatchFaceClicked = {
             viewModel.installWatchFace()
         },
+        onInstallAndroidifyClicked = {
+            viewModel.installAndroidifyOnWatch()
+        },
         onResetWatchFaceSend = {
             viewModel.resetWatchFaceSend()
         },
@@ -151,6 +154,7 @@ private fun CustomizeExportContents(
     onToolSelected: (CustomizeTool) -> Unit,
     onSelectedToolStateChanged: (ToolState) -> Unit,
     onInstallWatchFaceClicked: () -> Unit,
+    onInstallAndroidifyClicked: () -> Unit,
     onResetWatchFaceSend: () -> Unit,
     layoutType: CustomizeExportLayoutType,
     snackbarHostState: SnackbarHostState,
@@ -263,6 +267,9 @@ private fun CustomizeExportContents(
                 onWatchFaceInstallClick = {
                     onInstallWatchFaceClicked()
                 },
+                onAndroidifyInstallClick = {
+                    onInstallAndroidifyClicked()
+                },
                 onLoad = loadWatchFaces,
                 watchFaceSelectionState = state.watchFaceSelectionState,
                 onWatchFaceSelect = onWatchFaceSelect,
@@ -599,6 +606,7 @@ fun CustomizeExportPreview() {
                     layoutType = CustomizeExportLayoutType.Compact,
                     onSelectedToolStateChanged = {},
                     onInstallWatchFaceClicked = {},
+                    onInstallAndroidifyClicked = {},
                     onResetWatchFaceSend = {},
                     loadWatchFaces = {},
                     onWatchFaceSelect = {},
@@ -640,6 +648,7 @@ fun CustomizeExportPreviewLarge() {
                     layoutType = CustomizeExportLayoutType.Medium,
                     onSelectedToolStateChanged = {},
                     onInstallWatchFaceClicked = {},
+                    onInstallAndroidifyClicked = {},
                     onResetWatchFaceSend = {},
                     loadWatchFaces = {},
                     onWatchFaceSelect = {},

feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt

@@ -22,6 +22,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.application
 import androidx.lifecycle.viewModelScope
 import com.android.developers.androidify.RemoteConfigDataSource
 import com.android.developers.androidify.customize.watchface.WatchFaceSelectionState
@@ -367,6 +368,15 @@ class CustomizeExportViewModel @AssistedInject constructor(
         }
     }
 
+    fun installAndroidifyOnWatch() {
+        viewModelScope.launch {
+            val watch = state.value.connectedWatch
+            watch?.let {
+                watchfaceInstallationRepository.installAndroidify(application.applicationContext, it.nodeId)
+            }
+        }
+    }
+
     fun installWatchFace() {
         val watchFaceToInstall = _state.value.watchFaceSelectionState.selectedWatchFace ?: return
         val bitmap = state.value.exportImageCanvas.imageBitmap

feature/results/src/main/java/com/android/developers/androidify/customize/watchface/InstallAndroidifyPanel.kt

@@ -15,7 +15,6 @@
  */
 package com.android.developers.androidify.customize.watchface
 
-import android.content.Intent
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -24,24 +23,31 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.core.net.toUri
 import com.android.developers.androidify.results.R
 import com.android.developers.androidify.theme.AndroidifyTheme
 import com.android.developers.androidify.watchface.WatchFaceAsset
 
 @Composable
 fun InstallAndroidifyPanel(
+    onInstallClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val context = LocalContext.current
+    var isPlayLaunched by remember { mutableStateOf(false) }
     val placeholderWatchFace = WatchFaceAsset(
         id = "watch_face_1",
         previewPath = R.drawable.watch_app_placeholder,
@@ -60,21 +66,42 @@ fun InstallAndroidifyPanel(
         ) {
             WatchFacePreviewItem(
                 watchFace = placeholderWatchFace,
-                isSelected = false,
+                isSelected = true,
                 onClick = { },
             )
         }
 
         Spacer(modifier = Modifier.height(24.dp))
+
+        val buttonText = if (isPlayLaunched) {
+            stringResource(R.string.continue_on_watch)
+        } else {
+            stringResource(R.string.install_androidify)
+        }
+        val launchedColors = ButtonDefaults.buttonColors(
+            contentColor = MaterialTheme.colorScheme.onSurface,
+            containerColor = MaterialTheme.colorScheme.secondaryContainer,
+        )
+        val installColors = ButtonDefaults.buttonColors(
+            contentColor = MaterialTheme.colorScheme.surface,
+            containerColor = MaterialTheme.colorScheme.onSurface,
+        )
         WatchFacePanelButton(
             modifier = modifier.padding(horizontal = 16.dp),
-            buttonText = stringResource(R.string.install_androidify),
+            buttonText = buttonText,
             iconResId = R.drawable.watch_arrow_24,
             onClick = {
-                val uri = "market://details?id=${context.packageName}".toUri()
-                val intent = Intent(Intent.ACTION_VIEW, uri)
-                context.startActivity(intent)
+                if (!isPlayLaunched) {
+                    isPlayLaunched = true
+                    onInstallClick()
+                }
+            },
+            colors = if (isPlayLaunched) {
+                launchedColors
+            } else {
+                installColors
             },
+            isSending = isPlayLaunched,
         )
     }
 }
@@ -84,6 +111,6 @@ fun InstallAndroidifyPanel(
 @Composable
 private fun InstallAndroidifyPanelPreview() {
     AndroidifyTheme {
-        InstallAndroidifyPanel()
+        InstallAndroidifyPanel({})
     }
 }

feature/results/src/main/java/com/android/developers/androidify/customize/watchface/WatchFaceModalSheet.kt

@@ -64,6 +64,7 @@ import com.android.developers.androidify.wear.common.WatchFaceInstallationStatus
 fun WatchFaceModalSheet(
     connectedWatch: ConnectedWatch,
     onWatchFaceInstallClick: (String) -> Unit,
+    onAndroidifyInstallClick: () -> Unit,
     installationStatus: WatchFaceInstallationStatus,
     sheetState: SheetState,
     watchFaceSelectionState: WatchFaceSelectionState,
@@ -202,7 +203,9 @@ fun WatchFaceModalSheet(
                 }
 
                 else -> {
-                    InstallAndroidifyPanel()
+                    InstallAndroidifyPanel(
+                        onInstallClick = onAndroidifyInstallClick,
+                    )
                 }
             }
         }
@@ -243,6 +246,7 @@ private fun WatchFaceModalSheetPreview() {
             onLoad = {},
             onDismiss = {},
             onWatchFaceInstallClick = {},
+            onAndroidifyInstallClick = {},
             sheetState = sheetState,
         )
     }

feature/results/src/main/res/values/strings.xml

@@ -59,4 +59,5 @@
     <string name="complete_error_message">Check your watch is connected and try again</string>
     <string name="no_watch_faces">"No available watch faces"</string>
     <string name="error_dismiss">OK</string>
+    <string name="continue_on_watch">Continue on watch</string>
 </resources>

watchface/build.gradle.kts

@@ -61,6 +61,7 @@ dependencies {
     implementation(libs.validator.push.android) {
         exclude(group = "com.google.guava", "listenablefuture")
     }
+    implementation(libs.androidx.wear.remote.interactions)
     implementation(libs.bcpkix.jdk18on)
     implementation(libs.play.services.wearable)
     implementation(libs.kotlinx.coroutines.play.services)

watchface/src/main/java/com/android/developers/androidify/watchface/transfer/EmptyWatchFaceInstallationRepository.kt

@@ -15,6 +15,7 @@
  */
 package com.android.developers.androidify.watchface.transfer
 
+import android.content.Context
 import android.graphics.Bitmap
 import com.android.developers.androidify.watchface.WatchFaceAsset
 import com.android.developers.androidify.wear.common.ConnectedWatch
@@ -48,4 +49,6 @@ class EmptyWatchFaceInstallationRepositoryImpl @Inject constructor() : WatchFace
     override suspend fun resetInstallationStatus() { }
 
     override suspend fun prepareForTransfer() { }
+
+    override suspend fun installAndroidify(context: Context, nodeId: String) { }
 }

watchface/src/main/java/com/android/developers/androidify/watchface/transfer/WatchFaceInstallationRepository.kt

@@ -16,14 +16,19 @@
 package com.android.developers.androidify.watchface.transfer
 
 import android.content.Context
+import android.content.Intent
 import android.graphics.Bitmap
+import android.net.Uri
+import androidx.concurrent.futures.await
+import androidx.wear.remote.interactions.RemoteActivityHelper
 import com.android.developers.androidify.watchface.WatchFaceAsset
 import com.android.developers.androidify.watchface.creator.WatchFaceCreator
 import com.android.developers.androidify.wear.common.ConnectedWatch
 import com.android.developers.androidify.wear.common.WatchFaceInstallError
 import com.android.developers.androidify.wear.common.WatchFaceInstallationStatus
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.asExecutor
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -70,6 +75,8 @@ interface WatchFaceInstallationRepository {
     suspend fun resetInstallationStatus()
 
     suspend fun prepareForTransfer()
+
+    suspend fun installAndroidify(context: Context, nodeId: String)
 }
 
 class WatchFaceInstallationRepositoryImpl @Inject constructor(
@@ -133,4 +140,18 @@ class WatchFaceInstallationRepositoryImpl @Inject constructor(
     override suspend fun prepareForTransfer() {
         manualStatusUpdates.tryEmit(WatchFaceInstallationStatus.Preparing)
     }
+
+    override suspend fun installAndroidify(context: Context, nodeId: String) {
+        val backgroundExecutor = Dispatchers.IO.asExecutor()
+        val remoteActivityHelper = RemoteActivityHelper(context, backgroundExecutor)
+
+        remoteActivityHelper.startRemoteActivity(
+            Intent(Intent.ACTION_VIEW)
+                .setData(
+                    Uri.parse("market://details?id=${context.packageName}"),
+                )
+                .addCategory(Intent.CATEGORY_BROWSABLE),
+            nodeId,
+        ).await()
+    }
 }