Fix wear target

xxfast · Sep 24, 2024 · a9e84ed · a9e84ed
1 parent 8f723e5
commit a9e84ed
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/.idea/runConfigurations/wear.xml b/.idea/runConfigurations/wear.xml
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
@@ -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/...wear/src/main/kotlin/io/github/xxfast/nytimes/wear/screens/topStories/TopStoriesScreen.kt b/...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) })
           }