♻️ :: 링크 옵셔널 처리

Team-SIGNAL · Nov 25, 2023 · 851446d · 851446d
1 parent ae4f45d
commit 851446d
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/data/src/main/kotlin/com/signal/data/model/recommend/FetchRecommendDetailsResponse.kt b/data/src/main/kotlin/com/signal/data/model/recommend/FetchRecommendDetailsResponse.kt
@@ -5,9 +5,9 @@ import com.signal.domain.entity.RecommendDetailsEntity
 
 data class FetchRecommendDetailsResponse(
     @SerializedName("title") val title: String,
-    @SerializedName("image") val image: String,
+    @SerializedName("image") val image: String?,
     @SerializedName("content") val content: String,
-    @SerializedName("link") val link: String,
+    @SerializedName("link") val link: String?,
     @SerializedName("name") val name: String,
     @SerializedName("profile") val profile: String?,
     @SerializedName("create_date") val createDate: String,

diff --git a/data/src/main/kotlin/com/signal/data/model/recommend/FetchRecommendsResponse.kt b/data/src/main/kotlin/com/signal/data/model/recommend/FetchRecommendsResponse.kt
@@ -12,7 +12,7 @@ data class FetchRecommendsResponse(
         @SerializedName("title") val title: String,
         @SerializedName("content") val content: String,
         @SerializedName("image") val image: String,
-        @SerializedName("link") val link: String,
+        @SerializedName("link") val link: String?,
     )
 }
 

diff --git a/domain/src/main/kotlin/com/signal/domain/entity/RecommendDetailsEntity.kt b/domain/src/main/kotlin/com/signal/domain/entity/RecommendDetailsEntity.kt
@@ -2,9 +2,9 @@ package com.signal.domain.entity
 
 data class RecommendDetailsEntity(
     val title: String,
-    val image: String,
+    val image: String?,
     val content: String,
-    val link: String,
+    val link: String?,
     val name: String,
     val profile: String?,
     val createDate: String,

diff --git a/domain/src/main/kotlin/com/signal/domain/entity/RecommendsEntity.kt b/domain/src/main/kotlin/com/signal/domain/entity/RecommendsEntity.kt
@@ -10,6 +10,6 @@ data class RecommendsEntity(
         val title: String,
         val content: String,
         val image: String,
-        val link: String,
+        val link: String?,
     )
 }
diff --git a/...tation/src/main/java/com/signal/signal_android/feature/main/recommend/RecommendDetails.kt b/...tation/src/main/java/com/signal/signal_android/feature/main/recommend/RecommendDetails.kt
@@ -48,8 +48,10 @@ internal fun RecommendDetails(
     }
 
     val intentToUrl: () -> Unit = {
-        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(details.link))
-        context.startActivity(intent)
+        details.link?.run {
+            val intent = Intent(Intent.ACTION_VIEW, Uri.parse(this))
+            context.startActivity(intent)
+        }
     }
 
     Column(

diff --git a/presentation/src/main/java/com/signal/signal_android/feature/main/recommend/Recommends.kt b/presentation/src/main/java/com/signal/signal_android/feature/main/recommend/Recommends.kt
@@ -123,7 +123,9 @@ internal fun Recommends(
                 content = it.content,
                 imageUrl = it.image,
                 iconEnabled = true,
-                onIconClicked = { moveToLink(it.link) },
+                onIconClicked = {
+                    it.link?.run(moveToLink)
+                },
             )
         }
     }