From a9e84ed9e91c6c2b42d5e383528aedebd7782e50 Mon Sep 17 00:00:00 2001
From: xxfast <isurukusumal36@gmail.com>
Date: Tue, 24 Sep 2024 18:55:03 +1000
Subject: [PATCH] Fix wear target

---
 .idea/runConfigurations/wear.xml                   |  3 +--
 .../nytimes/wear/screens/story/StoryScreen.kt      | 14 ++------------
 .../wear/screens/topStories/TopStoriesScreen.kt    |  6 +++---
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/.idea/runConfigurations/wear.xml b/.idea/runConfigurations/wear.xml
index 66e5079..d29f412 100644
--- a/.idea/runConfigurations/wear.xml
+++ b/.idea/runConfigurations/wear.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="wear" type="AndroidRunConfigurationType" factoryName="Android App">
-    <module name="NYTimes-KMP.client.wear.main" />
+    <module name="NYTimes-KMP.app.wear.main" />
     <option name="DEPLOY" value="true" />
     <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
     <option name="DEPLOY_AS_INSTANT" value="false" />
@@ -14,7 +14,6 @@
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="false" />
     <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
-    <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
     <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
     <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
     <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
diff --git a/app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/screens/story/StoryScreen.kt b/app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/screens/story/StoryScreen.kt
index 498445b..247c903 100644
--- a/app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/screens/story/StoryScreen.kt
+++ b/app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/screens/story/StoryScreen.kt
@@ -13,8 +13,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.platform.UriHandler
 import androidx.compose.ui.text.style.TextAlign
@@ -29,12 +27,12 @@ import androidx.wear.compose.ui.tooling.preview.WearPreviewLargeRound
 import androidx.wear.compose.ui.tooling.preview.WearPreviewSmallRound
 import com.google.android.horologist.annotations.ExperimentalHorologistApi
 import com.google.android.horologist.compose.layout.ScalingLazyColumn
-import com.seiko.imageloader.rememberAsyncImagePainter
 import io.github.xxfast.decompose.router.rememberOnRoute
 import io.github.xxfast.nytimes.wear.navigation.NavigationBox
 import io.github.xxfast.nytimes.models.Article
 import io.github.xxfast.nytimes.models.ArticleUri
 import io.github.xxfast.nytimes.models.TopStorySection
+import io.github.xxfast.nytimes.screens.story.ArticleImage
 import io.github.xxfast.nytimes.screens.story.Loading
 import io.github.xxfast.nytimes.screens.story.StoryState
 import io.github.xxfast.nytimes.screens.story.StoryViewModel
@@ -114,15 +112,7 @@ fun StoryView(
       val url = article.multimedia?.firstOrNull()?.url
       if (url != null) {
         item {
-          Image(
-            painter = rememberAsyncImagePainter(
-              url = url,
-              contentScale = ContentScale.Crop,
-            ),
-            contentDescription = null,
-            modifier = Modifier
-              .clip(MaterialTheme.shapes.large)
-          )
+          ArticleImage(imageUrl = url)
         }
       }
 
diff --git a/app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/screens/topStories/TopStoriesScreen.kt b/app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/screens/topStories/TopStoriesScreen.kt
index 2fde527..c8b332b 100644
--- a/app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/screens/topStories/TopStoriesScreen.kt
+++ b/app/wear/src/main/kotlin/io/github/xxfast/nytimes/wear/screens/topStories/TopStoriesScreen.kt
@@ -32,7 +32,7 @@ import androidx.wear.compose.ui.tooling.preview.WearPreviewLargeRound
 import androidx.wear.compose.ui.tooling.preview.WearPreviewSmallRound
 import com.google.android.horologist.annotations.ExperimentalHorologistApi
 import com.google.android.horologist.compose.layout.ScalingLazyColumn
-import com.seiko.imageloader.rememberAsyncImagePainter
+import com.seiko.imageloader.rememberImagePainter
 import io.github.xxfast.decompose.router.rememberOnRoute
 import io.github.xxfast.nytimes.models.ArticleUri
 import io.github.xxfast.nytimes.models.TopStorySection
@@ -134,13 +134,13 @@ fun TopStoriesView(
             onClick = { onSelectArticle(article.section, article.uri, article.title) },
             title = { Text(article.title) },
             backgroundPainter = CardDefaults.imageWithScrimBackgroundPainter(
-              backgroundImagePainter = rememberAsyncImagePainter(
+              backgroundImagePainter = rememberImagePainter(
                 url = article.imageUrl.orEmpty(),
-                contentScale = ContentScale.Crop,
               )
             ),
             contentColor = MaterialTheme.colors.onSurface,
             titleColor = MaterialTheme.colors.onSurface,
+            modifier = Modifier.height(120.dp),
           ) {
             CompactChip(onClick = {}, label = { Text(article.section.name) })
           }