Addresses comments

Author: garanj

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

@@ -80,6 +80,8 @@ class FakeWatchFaceInstallationRepository : WatchFaceInstallationRepository {
         _watchFaceInstallationStatus.value = WatchFaceInstallationStatus.Preparing
     }
 
+    override suspend fun installAndroidify(nodeId: String) { }
+
     private fun generateTransferId() = UUID.randomUUID().toString().take(8)
 
     public fun setWatchAsConnected() {

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

@@ -131,7 +131,7 @@ fun CustomizeAndExportScreen(
             viewModel.installWatchFace()
         },
         onInstallAndroidifyClicked = {
-            viewModel.installAndroidifyOnWatch()
+            viewModel.launchPlayInstallOnWatch()
         },
         onResetWatchFaceSend = {
             viewModel.resetWatchFaceSend()
@@ -154,7 +154,7 @@ private fun CustomizeExportContents(
     onToolSelected: (CustomizeTool) -> Unit,
     onSelectedToolStateChanged: (ToolState) -> Unit,
     onInstallWatchFaceClicked: () -> Unit,
-    onInstallAndroidifyClicked: () -> Unit,
+    onInstallAndroidifyClicked: suspend () -> Boolean,
     onResetWatchFaceSend: () -> Unit,
     layoutType: CustomizeExportLayoutType,
     snackbarHostState: SnackbarHostState,
@@ -606,7 +606,7 @@ fun CustomizeExportPreview() {
                     layoutType = CustomizeExportLayoutType.Compact,
                     onSelectedToolStateChanged = {},
                     onInstallWatchFaceClicked = {},
-                    onInstallAndroidifyClicked = {},
+                    onInstallAndroidifyClicked = { true },
                     onResetWatchFaceSend = {},
                     loadWatchFaces = {},
                     onWatchFaceSelect = {},
@@ -648,7 +648,7 @@ fun CustomizeExportPreviewLarge() {
                     layoutType = CustomizeExportLayoutType.Medium,
                     onSelectedToolStateChanged = {},
                     onInstallWatchFaceClicked = {},
-                    onInstallAndroidifyClicked = {},
+                    onInstallAndroidifyClicked = { true },
                     onResetWatchFaceSend = {},
                     loadWatchFaces = {},
                     onWatchFaceSelect = {},

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

@@ -368,13 +368,17 @@ class CustomizeExportViewModel @AssistedInject constructor(
         }
     }
 
-    fun installAndroidifyOnWatch() {
-        viewModelScope.launch {
+    suspend fun launchPlayInstallOnWatch(): Boolean {
+        try {
             val watch = state.value.connectedWatch
             watch?.let {
                 watchfaceInstallationRepository.installAndroidify(application.applicationContext, it.nodeId)
             }
+            return true
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to open Play Store on watch")
         }
+        return false
     }
 
     fun installWatchFace() {

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

@@ -30,6 +30,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -40,10 +41,11 @@ import androidx.compose.ui.unit.dp
 import com.android.developers.androidify.results.R
 import com.android.developers.androidify.theme.AndroidifyTheme
 import com.android.developers.androidify.watchface.WatchFaceAsset
+import kotlinx.coroutines.launch
 
 @Composable
 fun InstallAndroidifyPanel(
-    onInstallClick: () -> Unit,
+    onInstallClick: suspend () -> Boolean,
     modifier: Modifier = Modifier,
 ) {
     val context = LocalContext.current
@@ -86,14 +88,19 @@ fun InstallAndroidifyPanel(
             contentColor = MaterialTheme.colorScheme.surface,
             containerColor = MaterialTheme.colorScheme.onSurface,
         )
+        val scope = rememberCoroutineScope()
         WatchFacePanelButton(
             modifier = modifier.padding(horizontal = 16.dp),
             buttonText = buttonText,
             iconResId = R.drawable.watch_arrow_24,
             onClick = {
                 if (!isPlayLaunched) {
-                    isPlayLaunched = true
-                    onInstallClick()
+                    scope.launch {
+                        val launchResult = onInstallClick()
+                        if (launchResult) {
+                            isPlayLaunched = true
+                        }
+                    }
                 }
             },
             colors = if (isPlayLaunched) {
@@ -111,6 +118,6 @@ fun InstallAndroidifyPanel(
 @Composable
 private fun InstallAndroidifyPanelPreview() {
     AndroidifyTheme {
-        InstallAndroidifyPanel({})
+        InstallAndroidifyPanel({ true })
     }
 }

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

@@ -64,7 +64,7 @@ import com.android.developers.androidify.wear.common.WatchFaceInstallationStatus
 fun WatchFaceModalSheet(
     connectedWatch: ConnectedWatch,
     onWatchFaceInstallClick: (String) -> Unit,
-    onAndroidifyInstallClick: () -> Unit,
+    onAndroidifyInstallClick: suspend () -> Boolean,
     installationStatus: WatchFaceInstallationStatus,
     sheetState: SheetState,
     watchFaceSelectionState: WatchFaceSelectionState,
@@ -246,7 +246,7 @@ private fun WatchFaceModalSheetPreview() {
             onLoad = {},
             onDismiss = {},
             onWatchFaceInstallClick = {},
-            onAndroidifyInstallClick = {},
+            onAndroidifyInstallClick = { true },
             sheetState = sheetState,
         )
     }

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

@@ -15,7 +15,6 @@
  */
 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
@@ -50,5 +49,5 @@ class EmptyWatchFaceInstallationRepositoryImpl @Inject constructor() : WatchFace
 
     override suspend fun prepareForTransfer() { }
 
-    override suspend fun installAndroidify(context: Context, nodeId: String) { }
+    override suspend fun installAndroidify(nodeId: String) { }
 }

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

@@ -76,7 +76,7 @@ interface WatchFaceInstallationRepository {
 
     suspend fun prepareForTransfer()
 
-    suspend fun installAndroidify(context: Context, nodeId: String)
+    suspend fun installAndroidify(nodeId: String)
 }
 
 class WatchFaceInstallationRepositoryImpl @Inject constructor(
@@ -141,7 +141,7 @@ class WatchFaceInstallationRepositoryImpl @Inject constructor(
         manualStatusUpdates.tryEmit(WatchFaceInstallationStatus.Preparing)
     }
 
-    override suspend fun installAndroidify(context: Context, nodeId: String) {
+    override suspend fun installAndroidify(nodeId: String) {
         val backgroundExecutor = Dispatchers.IO.asExecutor()
         val remoteActivityHelper = RemoteActivityHelper(context, backgroundExecutor)