Skip to content

Migrate Application Notice View from XML to Compose #649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DongJun-H merged 6 commits into from
May 22, 2025
Merged

Migrate Application Notice View from XML to Compose #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5bffa98
Create Notice Layout
DongJun-H May 5, 2025
9f2e795
Create navigating notices, Change notice id parameter type (Int -> Long)
DongJun-H May 5, 2025
40d409e
Connect notice screens to API and lift NoticeViewModel to MainScreen …
DongJun-H May 5, 2025
9150699
Remove unnecessary resources
DongJun-H May 5, 2025
b023265
Merge remote-tracking branch 'origin/develop' into layout/issue-644
DongJun-H May 21, 2025
2e44b94
Apply shared bounds transition for title and date between notice list…
DongJun-H May 21, 2025
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: 1 addition & 1 deletion data/src/main/java/daily/dayo/data/datasource/remote/notice/NoticeApiService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ interface NoticeApiService {
suspend fun requestAllNoticeList(@Query("end") end: Int): NetworkResponse<NoticeListResponse>

@GET("/api/v1/notice/{noticeId}")
suspend fun requestDetailNotice(@Path("noticeId") noticeId: Int): NetworkResponse<NoticeDetailResponse>
suspend fun requestDetailNotice(@Path("noticeId") noticeId: Long): NetworkResponse<NoticeDetailResponse>
}
2 changes: 1 addition & 1 deletion data/src/main/java/daily/dayo/data/datasource/remote/notice/NoticeResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ data class NoticeDetailResponse(

data class NoticeDto(
@SerializedName("id")
val id: Int,
val id: Long,
@SerializedName("title")
val title: String,
@SerializedName("createdDate")
Expand Down
2 changes: 1 addition & 1 deletion data/src/main/java/daily/dayo/data/repository/NoticeRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class NoticeRepositoryImpl @Inject constructor(
NoticePagingSource(noticeApiService, NOTICE_PAGE_SIZE)
}.flow

override suspend fun requestDetailNotice(noticeId: Int): NetworkResponse<NoticeDetail> =
override suspend fun requestDetailNotice(noticeId: Long): NetworkResponse<NoticeDetail> =
when (
val response = noticeApiService.requestDetailNotice(noticeId)) {
is NetworkResponse.Success -> NetworkResponse.Success(response.body?.toNoticeDetail())
Expand Down
2 changes: 1 addition & 1 deletion domain/src/main/java/daily/dayo/domain/model/Notice.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package daily.dayo.domain.model
import java.io.Serializable

data class Notice(
val noticeId: Int,
val noticeId: Long,
val title: String,
val uploadDate: String
) : Serializable
Expand Down
2 changes: 1 addition & 1 deletion domain/src/main/java/daily/dayo/domain/repository/NoticeRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ import kotlinx.coroutines.flow.Flow

interface NoticeRepository {
suspend fun requestAllNoticeList(): Flow<PagingData<Notice>>
suspend fun requestDetailNotice(noticeId: Int): NetworkResponse<NoticeDetail>
suspend fun requestDetailNotice(noticeId: Long): NetworkResponse<NoticeDetail>
}
2 changes: 1 addition & 1 deletion domain/src/main/java/daily/dayo/domain/usecase/notice/RequestDetailNoticeUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ import javax.inject.Inject
class RequestDetailNoticeUseCase @Inject constructor(
private val noticeRepository: NoticeRepository
) {
suspend operator fun invoke(noticeId: Int) =
suspend operator fun invoke(noticeId: Long) =
noticeRepository.requestDetailNotice(noticeId)
}
51 changes: 0 additions & 51 deletions presentation/src/main/java/daily/dayo/presentation/adapter/NoticeListAdapter.kt
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions presentation/src/main/java/daily/dayo/presentation/fragment/setting/SettingFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,6 @@ class SettingFragment : Fragment() {

private fun setNoticeButtonClickListener() {
binding.layoutSettingNotice.setOnDebounceClickListener {
findNavController().navigateSafe(
currentDestinationId = R.id.SettingFragment,
action = R.id.action_settingFragment_to_noticeFragment
)
}
}

Expand Down
62 changes: 0 additions & 62 deletions ...ion/src/main/java/daily/dayo/presentation/fragment/setting/notice/NoticeDetailFragment.kt
View file
Open in desktop

This file was deleted.

87 changes: 0 additions & 87 deletions ...ation/src/main/java/daily/dayo/presentation/fragment/setting/notice/NoticeListFragment.kt
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions presentation/src/main/java/daily/dayo/presentation/screen/main/MainNavigator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import daily.dayo.presentation.screen.mypage.navigateFolderPostMove
import daily.dayo.presentation.screen.mypage.navigateFollowMenu
import daily.dayo.presentation.screen.mypage.navigateMyPage
import daily.dayo.presentation.screen.mypage.navigateProfileEdit
import daily.dayo.presentation.screen.notice.navigateNotices
import daily.dayo.presentation.screen.notice.navigateNoticeDetail
import daily.dayo.presentation.screen.post.navigatePost
import daily.dayo.presentation.screen.post.navigatePostLikeUsers
import daily.dayo.presentation.screen.profile.navigateProfile
Expand Down Expand Up @@ -69,6 +71,14 @@ class MainNavigator(
navController.navigateSearchPostHashtag(hashtag = hashtag)
}

fun navigateNotices() {
navController.navigateNotices()
}

fun navigateNoticeDetail(noticeId: Long) {
navController.navigateNoticeDetail(noticeId = noticeId)
}

fun navigateSettings() {
navController.navigateSettings()
}
Expand Down
Loading