Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/src/main/java/com/into/websoso/data/mapper/FeedMapper.kt
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ fun FeedResponseDto.toData(): FeedEntity = FeedEntity(
isModified = isModified,
isSpoiler = isSpoiler,
isMyFeed = isMyFeed,
isPublic = isPublic,
novel = NovelEntity(
id = novelId,
title = title,
Expand Down Expand Up @@ -83,6 +84,7 @@ fun FeedDetailResponseDto.toData(): FeedEntity = FeedEntity(
isModified = isModified,
isSpoiler = isSpoiler,
isMyFeed = isMyFeed,
isPublic = isPublic,
novel = NovelEntity(
id = novelId,
title = title,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ fun UserFeedResponseDto.toData(): UserFeedEntity =
createdDate = this.createdDate,
isModified = this.isModified,
isLiked = this.isLiked,
isPublic = this.isPublic,
likeCount = this.likeCount,
commentCount = this.commentCount,
novelId = this.novelId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ data class FeedEntity(
val isModified: Boolean,
val isSpoiler: Boolean,
val isMyFeed: Boolean,
val isPublic: Boolean,
val novel: NovelEntity,
) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ data class UserFeedsEntity(
val createdDate: String,
val isModified: Boolean,
val isLiked: Boolean,
val isPublic: Boolean,
val likeCount: Int,
val commentCount: Int,
val novelId: Long?,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,6 @@ data class FeedDetailResponseDto(
val isModified: Boolean,
@SerialName("isMyFeed")
val isMyFeed: Boolean,
@SerialName("isPublic")
val isPublic: Boolean,
)
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,6 @@ data class FeedResponseDto(
val isModified: Boolean,
@SerialName("isMyFeed")
val isMyFeed: Boolean,
@SerialName("isPublic")
val isPublic: Boolean,
)
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ data class UserFeedsResponseDto(
val isModified: Boolean,
@SerialName("isSpoiler")
val isSpoiler: Boolean,
@SerialName("isPublic")
val isPublic: Boolean,
@SerialName("likeCount")
val likeCount: Int,
@SerialName("novelId")
Expand All @@ -40,4 +42,4 @@ data class UserFeedsResponseDto(
@SerialName("title")
val title: String?,
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ fun FeedEntity.toDomain(): Feed = Feed(
isModified = isModified,
isSpoiler = isSpoiler,
isMyFeed = isMyFeed,
isPublic = isPublic,
novel = Feed.Novel(
id = novel.id,
title = novel.title,
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/into/websoso/domain/model/Feed.kt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ data class Feed(
val isModified: Boolean,
val isSpoiler: Boolean,
val isMyFeed: Boolean,
val isPublic: Boolean,
val novel: Novel,
) {
data class User(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ class ActivityDetailActivity : BaseActivity<ActivityActivityDetailBinding>(R.lay
novelId = feed.novelId,
novelTitle = feed.title,
isSpoiler = feed.isSpoiler,
isPublic = feed.isPublic,
feedContent = feed.feedContent,
feedCategory = feed.relevantCategories?.split(", ") ?: emptyList(),
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ class FeedDetailActivity : BaseActivity<ActivityFeedDetailBinding>(activity_feed
novelId = feed.novel.id,
novelTitle = feed.novel.title,
isSpoiler = feed.isSpoiler,
isPublic = feed.isPublic,
feedContent = feed.content,
feedCategory = feed.relevantCategories,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ data class FeedDetailUiState(
val previousStack: PreviousStack = PreviousStack(Feed),
val feedDetail: FeedDetailModel = FeedDetailModel(),
) {

data class PreviousStack(
val from: ResultFrom,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ class FeedFragment : BaseFragment<FragmentFeedBinding>(fragment_feed) {
novelId = feed.novel.id,
novelTitle = feed.novel.title,
isSpoiler = feed.isSpoiler,
isPublic = feed.isPublic,
feedContent = feed.content,
feedCategory = feed.relevantCategories,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ data class FeedModel(
val isSpoiler: Boolean,
val isLiked: Boolean,
val isMyFeed: Boolean,
val isPublic: Boolean,
val novel: NovelModel,
val categories: String = relevantCategories.joinToString(prefix = "", postfix = ""),
) {
Expand All @@ -30,7 +31,6 @@ data class FeedModel(
val rating: Float?,
val ratingCount: Int?,
) {

val isNothing: Boolean = id == null
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ class MyActivityFragment : BaseFragment<FragmentMyActivityBinding>(R.layout.frag
novelId = feed.novelId,
novelTitle = feed.title,
isSpoiler = feed.isSpoiler,
isPublic = feed.isPublic,
feedContent = feed.feedContent,
feedCategory = feed.relevantCategories?.split(", ") ?: emptyList(),
)
Expand All @@ -257,7 +258,6 @@ class MyActivityFragment : BaseFragment<FragmentMyActivityBinding>(R.layout.frag

override fun onResume() {
super.onResume()

view?.requestLayout()
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,4 @@ class MyActivityViewModel @Inject constructor(
const val ACTIVITY_LOAD_SIZE = 10
const val ACTIVITY_LIMIT_COUNT = 5
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ data class ActivitiesModel(
val createdDate: String,
val isModified: Boolean,
val isLiked: Boolean,
val isPublic: Boolean,
val likeCount: Int,
val commentCount: Int,
val novelId: Long?,
Expand Down Expand Up @@ -52,4 +53,4 @@ data class ActivitiesModel(
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ fun UserFeedEntity.toUi(): ActivityModel =
createdDate = ActivityModel.formatDate(createdDate),
isModified = isModified,
isLiked = isLiked,
isPublic = isPublic,
likeCount = likeCount,
commentCount = commentCount,
novelId = novelId,
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/into/websoso/ui/mapper/FeedMapper.kt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ fun Feed.toUi(): FeedModel = FeedModel(
isSpoiler = isSpoiler,
isLiked = isLiked,
isMyFeed = isMyFeed,
isPublic = isPublic,
novel = NovelModel(
id = novel.id,
title = novel.title,
Expand All @@ -48,6 +49,7 @@ fun FeedEntity.toUi(): FeedModel = FeedModel(
isSpoiler = isSpoiler,
isLiked = isLiked,
isMyFeed = isMyFeed,
isPublic = isPublic,
novel = NovelModel(
id = novel.id,
title = novel.title,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,14 @@ class NovelDetailActivity : BaseActivity<ActivityNovelDetailBinding>(R.layout.ac
}

private fun setupOnPageChangeCallback() {
binding.vpNovelDetail.registerOnPageChangeCallback(object :
ViewPager2.OnPageChangeCallback() {
override fun onPageSelected(position: Int) {
updateNovelFeedWriteButtonVisibility(position)
}
})
binding.vpNovelDetail.registerOnPageChangeCallback(
object :
ViewPager2.OnPageChangeCallback() {
override fun onPageSelected(position: Int) {
updateNovelFeedWriteButtonVisibility(position)
}
},
)
}

private fun updateNovelFeedWriteButtonVisibility(position: Int) {
Expand Down Expand Up @@ -207,18 +209,20 @@ class NovelDetailActivity : BaseActivity<ActivityNovelDetailBinding>(R.layout.ac
}

private fun setupTooltipBottomFramePosition() {
binding.ctlNovelDetail.viewTreeObserver.addOnPreDrawListener(object :
ViewTreeObserver.OnPreDrawListener {
override fun onPreDraw(): Boolean {
binding.ctlNovelDetail.viewTreeObserver.removeOnPreDrawListener(this)
binding.ctlNovelDetail.viewTreeObserver.addOnPreDrawListener(
object :
ViewTreeObserver.OnPreDrawListener {
override fun onPreDraw(): Boolean {
binding.ctlNovelDetail.viewTreeObserver.removeOnPreDrawListener(this)

val layoutParams = binding.viewNovelDetailTooltipFrameBottom.layoutParams as ConstraintLayout.LayoutParams
layoutParams.topMargin = binding.ctlNovelDetail.height
binding.viewNovelDetailTooltipFrameBottom.layoutParams = layoutParams
val layoutParams = binding.viewNovelDetailTooltipFrameBottom.layoutParams as ConstraintLayout.LayoutParams
layoutParams.topMargin = binding.ctlNovelDetail.height
binding.viewNovelDetailTooltipFrameBottom.layoutParams = layoutParams

return true
}
})
return true
}
},
)
}

private fun showTooltipWindow() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ class NovelFeedFragment : BaseFragment<FragmentNovelFeedBinding>(R.layout.fragme
novelId = feed.novel.id,
novelTitle = feed.novel.title,
isSpoiler = feed.isSpoiler,
isPublic = feed.isPublic,
feedContent = feed.content,
feedCategory = feed.relevantCategories,
)
Expand Down