refactor: make actor details screen stateless

Author: thatfiredev

dataconnect/app/src/main/java/com/google/firebase/example/dataconnect/feature/actordetail/ActorDetailScreen.kt

@@ -40,49 +40,60 @@ fun ActorDetailScreen(
 ) {
     actorDetailViewModel.setActorId(actorId)
     val uiState by actorDetailViewModel.uiState.collectAsState()
-    Scaffold { innerPadding ->
-        when (uiState) {
-            is ActorDetailUIState.Error -> {
-                ErrorCard((uiState as ActorDetailUIState.Error).errorMessage)
-            }
+    ActorDetailScreen(
+        uiState = uiState,
+        onMovieClicked = {
+            // TODO
+        },
+        onFavoriteToggled = {
+            actorDetailViewModel.toggleFavorite(it)
+        }
+    )
+}
+
+@Composable
+fun ActorDetailScreen(
+    uiState: ActorDetailUIState,
+    onMovieClicked: (actorId: String) -> Unit,
+    onFavoriteToggled: (newValue: Boolean) -> Unit
+) {
+    when (uiState) {
+        is ActorDetailUIState.Error -> ErrorCard(uiState.errorMessage)
 
-            ActorDetailUIState.Loading -> LoadingScreen()
+        ActorDetailUIState.Loading -> LoadingScreen()
 
-            is ActorDetailUIState.Success -> {
-                val ui = uiState as ActorDetailUIState.Success
+        is ActorDetailUIState.Success -> {
+            val ui = uiState
+            Scaffold { innerPadding ->
                 val scrollState = rememberScrollState()
                 Column(
-                    modifier = Modifier.verticalScroll(scrollState)
+                    modifier = Modifier
+                        .padding(innerPadding)
+                        .verticalScroll(scrollState)
                 ) {
                     ActorInformation(
-                        modifier = Modifier.padding(innerPadding),
                         actor = ui.actor,
                         isActorFavorite = ui.isFavorite,
-                        onFavoriteToggled = {
-                            actorDetailViewModel.toggleFavorite(it)
-                        }
+                        onFavoriteToggled = onFavoriteToggled
                     )
                     MoviesList(
                         listTitle = stringResource(R.string.title_main_roles),
                         movies = ui.actor?.mainActors?.mapNotNull {
                             Movie(it.id.toString(), it.imageUrl, it.title)
                         },
-                        onMovieClicked = { movieId ->
-                            // TODO(thatfiredev): Support navigating to movie
-                        }
+                        onMovieClicked = onMovieClicked
                     )
                     Spacer(modifier = Modifier.height(8.dp))
                     MoviesList(
                         listTitle = stringResource(R.string.title_supporting_actors),
                         movies = ui.actor?.supportingActors?.mapNotNull {
                             Movie(it.id.toString(), it.imageUrl, it.title)
                         },
-                        onMovieClicked = { movieId ->
-                            // TODO(thatfiredev): Support navigating to movie
-                        }
+                        onMovieClicked = onMovieClicked
                     )
                 }
             }
+
         }
     }
 }
@@ -95,7 +106,7 @@ fun ActorInformation(
     onFavoriteToggled: (newValue: Boolean) -> Unit
 ) {
     if (actor == null) {
-        ErrorCard(stringResource(R.string.error_movie_not_found))
+        ErrorCard(stringResource(R.string.error_actor_not_found))
     } else {
         Column(
             modifier = modifier

dataconnect/app/src/main/res/values/strings.xml

@@ -17,7 +17,7 @@
     <string name="title_most_recent">Most Recent</string>
 
     <!-- Movie Detail Screen -->
-    <string name="error_movie_not_found">Couldnt find movie in the database</string>
+    <string name="error_movie_not_found">Couldn\'t find movie in the database</string>
     <string name="description_not_available">Description not available</string>
     <string name="button_mark_watched">Mark as watched</string>
     <string name="button_unmark_watched">Watched</string>
@@ -30,6 +30,7 @@
     <string name="button_submit_review">Submit Review</string>
 
     <!-- Actor Detail Screen -->
+    <string name="error_actor_not_found">Couldn\'t find actor in the database</string>
     <string name="biography_not_available">Biography not available</string>
     <string name="title_main_roles">Main Roles</string>
     <string name="title_supporting_roles">Supporting Roles</string>