feat: adding mappers and responses

git-jr · git-jr · commit 7068886deb2e · 2023-10-05T09:56:42.000-03:00
diff --git a/app/src/main/java/com/paradoxo/materialgram/data/PostRepository.kt b/app/src/main/java/com/paradoxo/materialgram/data/PostRepository.kt
@@ -3,6 +3,7 @@ package com.paradoxo.materialgram.data
 import com.paradoxo.materialgram.data.local.PostLocalDataSource
 import com.paradoxo.materialgram.data.network.PostService
 import com.paradoxo.materialgram.domain.model.Post
+import com.paradoxo.materialgram.domain.toPost
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import javax.inject.Inject
@@ -24,7 +25,7 @@ class PostRepositoryImpl @Inject constructor(
                 emit(localPosts)
             }
 
-            val remotePosts = postService.getPosts()
+            val remotePosts = postService.getPosts().map { it.toPost() }
             emit(localPosts + remotePosts)
         }
     }
diff --git a/app/src/main/java/com/paradoxo/materialgram/data/VideoRepository.kt b/app/src/main/java/com/paradoxo/materialgram/data/VideoRepository.kt
@@ -3,6 +3,7 @@ package com.paradoxo.materialgram.data
 import com.paradoxo.materialgram.data.local.VideoLocalDataSource
 import com.paradoxo.materialgram.data.network.VideoService
 import com.paradoxo.materialgram.domain.model.Reels
+import com.paradoxo.materialgram.domain.toReels
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import javax.inject.Inject
@@ -24,7 +25,7 @@ class VideoRepositoryImpl @Inject constructor(
                 emit(localVideos)
             }
 
-            val remoteVideos = videoService.getVideos()
+            val remoteVideos = videoService.getVideos().map { it.toReels() }
             emit(localVideos + remoteVideos)
         }
     }
diff --git a/app/src/main/java/com/paradoxo/materialgram/data/local/PostLocalDataSource.kt b/app/src/main/java/com/paradoxo/materialgram/data/local/PostLocalDataSource.kt
@@ -48,7 +48,7 @@ class PostLocalDataSource {
     val posts = listOf(
         Post(
             basePost = basePosts[0],
-            medias = medias,
+            images = medias,
         )
     )
 }
diff --git a/app/src/main/java/com/paradoxo/materialgram/data/model/PostResponse.kt b/app/src/main/java/com/paradoxo/materialgram/data/model/PostResponse.kt
@@ -0,0 +1,10 @@
+package com.paradoxo.materialgram.data.model
+
+import com.paradoxo.materialgram.domain.model.BasePost
+import com.paradoxo.materialgram.domain.model.Media
+
+data class PostResponse(
+    val basePost: BasePost,
+    val medias: List<Media>,
+)
+
diff --git a/app/src/main/java/com/paradoxo/materialgram/data/model/VideoResponse.kt b/app/src/main/java/com/paradoxo/materialgram/data/model/VideoResponse.kt
@@ -0,0 +1,11 @@
+package com.paradoxo.materialgram.data.model
+
+import com.paradoxo.materialgram.domain.model.BasePost
+
+
+data class VideoResponse(
+    val video: String,
+    val thumbnail: String,
+    val basePost: BasePost,
+)
+
diff --git a/app/src/main/java/com/paradoxo/materialgram/data/network/PostService.kt b/app/src/main/java/com/paradoxo/materialgram/data/network/PostService.kt
@@ -1,10 +1,10 @@
 package com.paradoxo.materialgram.data.network
 
-import com.paradoxo.materialgram.domain.model.Post
+import com.paradoxo.materialgram.data.model.PostResponse
 import retrofit2.http.GET
 
 interface PostService {
 
-    @GET("posts.json")
-    suspend fun getPosts(): List<Post>
+    @GET("posts.json") // ".json" in the and because api is a mock from github pages
+    suspend fun getPosts(): List<PostResponse>
 }
diff --git a/app/src/main/java/com/paradoxo/materialgram/data/network/VideoService.kt b/app/src/main/java/com/paradoxo/materialgram/data/network/VideoService.kt
@@ -1,10 +1,10 @@
 package com.paradoxo.materialgram.data.network
 
-import com.paradoxo.materialgram.domain.model.Reels
+import com.paradoxo.materialgram.data.model.VideoResponse
 import retrofit2.http.GET
 
 interface VideoService {
 
-    @GET("reels.json")
-    suspend fun getVideos(): List<Reels>
+    @GET("reels.json") // ".json" in the and because api is a mock from github pages
+    suspend fun getVideos(): List<VideoResponse>
 }
diff --git a/app/src/main/java/com/paradoxo/materialgram/domain/PostMapper.kt b/app/src/main/java/com/paradoxo/materialgram/domain/PostMapper.kt
@@ -0,0 +1,9 @@
+package com.paradoxo.materialgram.domain
+
+import com.paradoxo.materialgram.data.model.PostResponse
+import com.paradoxo.materialgram.domain.model.Post
+
+fun PostResponse.toPost(): Post = Post(
+    basePost = basePost,
+    images = medias
+)
diff --git a/app/src/main/java/com/paradoxo/materialgram/domain/ReelsMapper.kt b/app/src/main/java/com/paradoxo/materialgram/domain/ReelsMapper.kt
@@ -0,0 +1,10 @@
+package com.paradoxo.materialgram.domain
+
+import com.paradoxo.materialgram.data.model.VideoResponse
+import com.paradoxo.materialgram.domain.model.Reels
+
+fun VideoResponse.toReels(): Reels = Reels(
+    video = video,
+    thumbnail = thumbnail,
+    basePost = basePost
+)
diff --git a/app/src/main/java/com/paradoxo/materialgram/domain/VideoUseCase.kt b/app/src/main/java/com/paradoxo/materialgram/domain/VideoUseCase.kt
@@ -15,5 +15,4 @@ class VideoUseCaseImpl @Inject constructor(
     override suspend fun getVideos(): Flow<List<Reels>> {
         return repository.getVideos()
     }
-
 }
diff --git a/app/src/main/java/com/paradoxo/materialgram/domain/model/Post.kt b/app/src/main/java/com/paradoxo/materialgram/domain/model/Post.kt
@@ -2,6 +2,6 @@ package com.paradoxo.materialgram.domain.model
 
 data class Post(
     val basePost: BasePost,
-    val medias: List<Media>,
+    val images: List<Media>,
 )
 
diff --git a/app/src/main/java/com/paradoxo/materialgram/presentation/components/ReelsVideoHud.kt b/app/src/main/java/com/paradoxo/materialgram/presentation/components/ReelsVideoHud.kt
@@ -1,4 +1,4 @@
-package com.paradoxo.materialgram.presentation.screens.reels
+package com.paradoxo.materialgram.presentation.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -33,7 +33,6 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.paradoxo.materialgram.R
 import com.paradoxo.materialgram.domain.model.BasePost
-import com.paradoxo.materialgram.presentation.components.AsyncImageWithShimmer
 
 
 @Composable
diff --git a/app/src/main/java/com/paradoxo/materialgram/presentation/screens/feed/ListPostsScreen.kt b/app/src/main/java/com/paradoxo/materialgram/presentation/screens/feed/ListPostsScreen.kt
@@ -70,7 +70,7 @@ private fun ItemPost(post: Post) {
     Column {
         PostHeader(post)
         Spacer(modifier = Modifier.height(8.dp))
-        PostMedias(post.medias)
+        PostMedias(post.images)
         PostMetadata(post.basePost)
     }
 }
diff --git a/app/src/main/java/com/paradoxo/materialgram/presentation/screens/reels/ReelsScreen.kt b/app/src/main/java/com/paradoxo/materialgram/presentation/screens/reels/ReelsScreen.kt
@@ -47,6 +47,7 @@ import androidx.media3.common.util.UnstableApi
 import androidx.media3.ui.AspectRatioFrameLayout
 import androidx.media3.ui.PlayerView
 import com.paradoxo.materialgram.R
+import com.paradoxo.materialgram.presentation.components.VideoHud
 
 @OptIn(ExperimentalMaterial3Api::class)
 @UnstableApi

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package com.paradoxo.materialgram.data`
`3`	`3`	`import com.paradoxo.materialgram.data.local.PostLocalDataSource`
`4`	`4`	`import com.paradoxo.materialgram.data.network.PostService`
`5`	`5`	`import com.paradoxo.materialgram.domain.model.Post`
	`6`	`+import com.paradoxo.materialgram.domain.toPost`
`6`	`7`	`import kotlinx.coroutines.flow.Flow`
`7`	`8`	`import kotlinx.coroutines.flow.flow`
`8`	`9`	`import javax.inject.Inject`
`@@ -24,7 +25,7 @@ class PostRepositoryImpl @Inject constructor(`
`24`	`25`	`emit(localPosts)`
`25`	`26`	`}`
`26`	`27`
`27`		`- val remotePosts = postService.getPosts()`
	`28`	`+ val remotePosts = postService.getPosts().map { it.toPost() }`
`28`	`29`	`emit(localPosts + remotePosts)`
`29`	`30`	`}`
`30`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class PostLocalDataSource {`
`48`	`48`	`val posts = listOf(`
`49`	`49`	`Post(`
`50`	`50`	`basePost = basePosts[0],`
`51`		`- medias = medias,`
	`51`	`+ images = medias,`
`52`	`52`	`)`
`53`	`53`	`)`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,4 @@ class VideoUseCaseImpl @Inject constructor(`
`15`	`15`	`override suspend fun getVideos(): Flow<List<Reels>> {`
`16`	`16`	`return repository.getVideos()`
`17`	`17`	`}`
`18`		`-`
`19`	`18`	`}`