Merge pull request #20 from hyunjung-choi/feature/excessive-image-width-in-bookmark

Feature/excessive image width in bookmark

Author: hyunjung-choi

app/src/main/java/com/prography/android/test/hyunjung/data/local/PhotoDatabase.kt

@@ -4,7 +4,7 @@ import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
 
-@Database(entities = [PhotoEntity::class], version = 2, exportSchema = false)
+@Database(entities = [PhotoEntity::class], version = 3, exportSchema = false)
 @TypeConverters(PhotoTypeConverters::class)
 abstract class PhotoDatabase : RoomDatabase() {
     abstract fun photoDao(): PhotoDao

app/src/main/java/com/prography/android/test/hyunjung/data/local/PhotoEntity.kt

@@ -21,7 +21,9 @@ data class PhotoEntity(
     val altDescription: String? = null,
     val tags: List<Tag> = emptyList(),
     val urls: Urls? = null,
-    val user: User? = null
+    val user: User? = null,
+    val width: Int?,
+    val height: Int?
 )
 
 fun PhotoEntity.toDomain(): Photo {
@@ -33,7 +35,9 @@ fun PhotoEntity.toDomain(): Photo {
         tags = this.tags,
         urls = Urls(this.urls?.regular ?: ""),
         user = this.user,
-        isBookmarked = true
+        isBookmarked = true,
+        width = this.width,
+        height = this.height
     )
 }
 
@@ -46,7 +50,9 @@ fun Photo.toEntity(): PhotoEntity {
         altDescription = this.altDescription,
         tags = this.tags,
         urls = this.urls,
-        user = this.user
+        user = this.user,
+        width = this.width,
+        height = this.height
     )
 }
 

app/src/main/java/com/prography/android/test/hyunjung/data/model/Photo.kt

@@ -14,10 +14,8 @@ data class Photo(
     val tags: List<Tag> = emptyList(),
     val urls: Urls,
     val user: User? = null,
+    val width: Int? = null,
+    val height: Int? = null,
     @Transient
     var isBookmarked: Boolean = false,
-    @Transient
-    var width: Long = 1,
-    @Transient
-    var height: Long = 1
 )

app/src/main/java/com/prography/android/test/hyunjung/ui/component/ImageItem.kt

@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Card
 import androidx.compose.material3.Text
@@ -84,11 +85,14 @@ fun ImageItem(
                     )
                 }
             } else {
+                val isPortrait = (photo.height ?: 1) > (photo.width ?: 1)
+
                 AsyncImage(
                     model = photo.urls.regular,
                     contentDescription = null,
                     modifier = Modifier
                         .height(128.dp)
+                        .widthIn(max = if (isPortrait) 100.dp else 160.dp)
                         .clip(RoundedCornerShape(10.dp)),
                     contentScale = ContentScale.Crop
                 )

app/src/main/java/com/prography/android/test/hyunjung/ui/detail/PhotoDetailScreen.kt

@@ -47,7 +47,7 @@ fun PhotoDetailScreen(
     Box(
         modifier = Modifier
             .fillMaxSize()
-            .background(Black)
+            .background(Black.copy(alpha = 0.9f))
     ) {
         when {
             isLoading -> {