Merge remote-tracking branch 'origin/feature/#19-home' into feature/#19…

…-home
YAPP-Github · Aug 17, 2024 · 17a8a2c · 17a8a2c
2 parents 3f5f11d + d940280
commit 17a8a2c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/data/src/main/java/pokitmons/pokit/data/mapper/pokit/PokitMapper.kt b/data/src/main/java/pokitmons/pokit/data/mapper/pokit/PokitMapper.kt
@@ -18,8 +18,8 @@ object PokitMapper {
  id = data.categoryImage.imageId,
  url = data.categoryImage.imageUrl
  ),
- linkCount = data.contentCount,
  createdAt = data.createdAt
+ linkCount = data.contentCount
  )
  }
  }

diff --git a/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/paging/LinkPaging.kt b/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/paging/LinkPaging.kt
@@ -27,6 +27,7 @@ class LinkPaging(
  override val pagingState: StateFlow<SimplePagingState> = _pagingState.asStateFlow()
 
  val _pagingData: MutableStateFlow<List<Link>> = MutableStateFlow(emptyList())
+
  override val pagingData: StateFlow<List<Link>> = _pagingData.asStateFlow()
  private var currentPageIndex = initPage
  private var requestJob: Job? = null

diff --git a/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/paging/PokitPaging.kt b/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/paging/PokitPaging.kt
@@ -24,6 +24,7 @@ class PokitPaging(
  override val pagingState: StateFlow<SimplePagingState> = _pagingState.asStateFlow()
 
  val _pagingData: MutableStateFlow<List<Pokit>> = MutableStateFlow(emptyList())
+
  override val pagingData: StateFlow<List<Pokit>> = _pagingData.asStateFlow()
  private var currentPageIndex = initPage
  private var requestJob: Job? = null