-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feat/ui-my
- Loading branch information
Showing
8 changed files
with
1,151 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
app/src/main/java/org/android/bbangzip/presentation/type/PieceViewType.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package org.android.bbangzip.presentation.type | ||
|
|
||
| enum class PieceViewType { | ||
| EMPTY, | ||
| DEFAULT, | ||
| DELETE, | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
194 changes: 194 additions & 0 deletions
194
.../java/org/android/bbangzip/presentation/ui/subject/subjectdetail/SubjectDetailContract.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,194 @@ | ||
| package org.android.bbangzip.presentation.ui.subject.subjectdetail | ||
|
|
||
| import android.os.Parcelable | ||
| import kotlinx.parcelize.Parcelize | ||
| import org.android.bbangzip.presentation.component.card.BbangZipCardState | ||
| import org.android.bbangzip.presentation.model.card.ToDoCardModel | ||
| import org.android.bbangzip.presentation.type.PieceViewType | ||
| import org.android.bbangzip.presentation.util.base.BaseContract | ||
|
|
||
| class SubjectDetailContract { | ||
| @Parcelize | ||
| data class SubjectDetailState( | ||
| val tabIndex: Int = 0, | ||
| val isMenuOpen: Boolean = false, | ||
| val isTopBarShadowed: Boolean = false, | ||
| val pieceViewType: PieceViewType = PieceViewType.DEFAULT, | ||
| val selectedItemSet: Set<Int> = setOf(), | ||
| val revertCompleteBottomSheetState: Boolean = false, | ||
| val selectedItemId: Int = -1, | ||
| val todoList: List<ToDoCardModel> = | ||
| listOf( | ||
| ToDoCardModel( | ||
| pieceId = 1, | ||
| subjectName = "", | ||
| examName = "", | ||
| studyContents = "Review Chapters 1-3", | ||
| startPage = 1, | ||
| finishPage = 50, | ||
| deadline = "2025-01-20", | ||
| remainingDays = 2, | ||
| cardState = BbangZipCardState.COMPLETE, | ||
| ), | ||
| ToDoCardModel( | ||
| pieceId = 2, | ||
| subjectName = "", | ||
| examName = "", | ||
| studyContents = "Notes on WWII", | ||
| startPage = 5, | ||
| finishPage = 30, | ||
| deadline = "2025-01-22", | ||
| remainingDays = -3, | ||
| BbangZipCardState.DEFAULT, | ||
| ), | ||
| ToDoCardModel( | ||
| pieceId = 3, | ||
| subjectName = "", | ||
| examName = "", | ||
| studyContents = "Kinematics and Dynamics", | ||
| startPage = 20, | ||
| finishPage = 80, | ||
| deadline = "2025-01-25", | ||
| remainingDays = 7, | ||
| cardState = BbangZipCardState.COMPLETE, | ||
| ), | ||
| ToDoCardModel( | ||
| pieceId = 4, | ||
| subjectName = "", | ||
| examName = "", | ||
| studyContents = "Checkable abstract art piece", | ||
| startPage = 0, | ||
| finishPage = 0, | ||
| deadline = "2025-01-28", | ||
| remainingDays = -2, | ||
| cardState = BbangZipCardState.DEFAULT, | ||
| ), | ||
| ToDoCardModel( | ||
| pieceId = 5, | ||
| subjectName = "", | ||
| examName = "", | ||
| studyContents = "Notes on WWII", | ||
| startPage = 5, | ||
| finishPage = 30, | ||
| deadline = "2025-01-22", | ||
| remainingDays = 4, | ||
| BbangZipCardState.DEFAULT, | ||
| ), | ||
| ToDoCardModel( | ||
| pieceId = 6, | ||
| subjectName = "", | ||
| examName = "", | ||
| studyContents = "Kinematics and Dynamics", | ||
| startPage = 20, | ||
| finishPage = 80, | ||
| deadline = "2025-01-25", | ||
| remainingDays = -1, | ||
| BbangZipCardState.DEFAULT, | ||
| ), | ||
| ToDoCardModel( | ||
| pieceId = 7, | ||
| subjectName = "", | ||
| examName = "", | ||
| studyContents = "Checkable abstract art piece", | ||
| startPage = 0, | ||
| finishPage = 0, | ||
| deadline = "2025-01-28", | ||
| remainingDays = 5, | ||
| BbangZipCardState.DEFAULT, | ||
| ), | ||
| ToDoCardModel( | ||
| pieceId = 8, | ||
| subjectName = "", | ||
| examName = "", | ||
| studyContents = "Notes on WWII", | ||
| startPage = 5, | ||
| finishPage = 30, | ||
| deadline = "2025-01-22", | ||
| remainingDays = -4, | ||
| BbangZipCardState.DEFAULT, | ||
| ), | ||
| ToDoCardModel( | ||
| pieceId = 9, | ||
| subjectName = "", | ||
| examName = "", | ||
| studyContents = "Kinematics and Dynamics", | ||
| startPage = 20, | ||
| finishPage = 80, | ||
| deadline = "2025-01-25", | ||
| remainingDays = 3, | ||
| BbangZipCardState.DEFAULT, | ||
| ), | ||
| ToDoCardModel( | ||
| pieceId = 10, | ||
| subjectName = "", | ||
| examName = "", | ||
| studyContents = "CHECKABLE abstract art piece", | ||
| startPage = 0, | ||
| finishPage = 0, | ||
| deadline = "2025-01-28", | ||
| remainingDays = -5, | ||
| BbangZipCardState.DEFAULT, | ||
| ), | ||
| ), | ||
| ) : BaseContract.State, Parcelable { | ||
| override fun toParcelable(): Parcelable = this | ||
| } | ||
|
|
||
| sealed interface SubjectDetailEvent : BaseContract.Event { | ||
| data object Initialize : SubjectDetailEvent | ||
|
|
||
| data object OnPlusIconClicked : SubjectDetailEvent | ||
|
|
||
| data object OnTrashIconClicked : SubjectDetailEvent | ||
|
|
||
| data object OnCloseIconClicked : SubjectDetailEvent | ||
|
|
||
| data object OnDeleteButtonClicked : SubjectDetailEvent | ||
|
|
||
| data object OnRevertCompleteBottomSheetApproveButtonClicked : SubjectDetailEvent | ||
|
|
||
| data object OnRevertCompleteBottomSheetDismissButtonClicked : SubjectDetailEvent | ||
|
|
||
| data object OnRevertCompleteBottomSheetDissmissRequest : SubjectDetailEvent | ||
|
|
||
| data class OnDeleteModeCardClicked( | ||
| val pieceId: Int, | ||
| ) : SubjectDetailEvent | ||
|
|
||
| data class OnDefaultCardClicked( | ||
| val pieceId: Int, | ||
| ) : SubjectDetailEvent | ||
|
|
||
| data class OnCompleteCardClicked( | ||
| val pieceId: Int, | ||
| ) : SubjectDetailEvent | ||
| } | ||
|
|
||
| sealed interface SubjectDetailReduce : BaseContract.Reduce { | ||
| data object UpdateToDeleteMode : SubjectDetailReduce | ||
|
|
||
| data object UpdateToDefaultMode : SubjectDetailReduce | ||
|
|
||
| data class UpdateDeleteModeCardState(val pieceId: Int) : SubjectDetailReduce | ||
|
|
||
| data class UpdateDeleteSet(val pieceId: Int) : SubjectDetailReduce | ||
|
|
||
| data class UpdateDefaultCardState(val pieceId: Int) : SubjectDetailReduce | ||
|
|
||
| data object UpdateCompleteCardState : SubjectDetailReduce | ||
|
|
||
| data class DeleteSelectedItemSet(val pieceId: Int) : SubjectDetailReduce | ||
|
|
||
| data object UpdateRevertCompleteBottomSheetState : SubjectDetailReduce | ||
|
|
||
| data class UpdateSelectedId(val pieceId: Int) : SubjectDetailReduce | ||
| } | ||
|
|
||
| sealed interface SubjectDetailSideEffect : BaseContract.SideEffect { | ||
| data object NavigateToAddSubject : SubjectDetailSideEffect | ||
|
|
||
| data object NavigateToAddStudy : SubjectDetailSideEffect | ||
|
|
||
| data object ShowDeleteSuccessSnackBar : SubjectDetailSideEffect | ||
| } | ||
| } |
26 changes: 26 additions & 0 deletions
26
...ava/org/android/bbangzip/presentation/ui/subject/subjectdetail/SubjectDetailNavigation.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package org.android.bbangzip.presentation.ui.subject.subjectdetail | ||
|
|
||
| import androidx.compose.foundation.layout.PaddingValues | ||
| import androidx.navigation.NavController | ||
| import androidx.navigation.NavGraphBuilder | ||
| import androidx.navigation.compose.composable | ||
| import kotlinx.serialization.Serializable | ||
|
|
||
| fun NavController.navigateSubjectDetail() { | ||
| navigate( | ||
| route = SubjectDetailRoute, | ||
| ) | ||
| } | ||
|
|
||
| fun NavGraphBuilder.subjectDetailNavGraph( | ||
| padding: PaddingValues, | ||
| ) { | ||
| composable<SubjectDetailRoute> { | ||
| SubjectDetailRoute( | ||
| padding = padding, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Serializable | ||
| object SubjectDetailRoute |
32 changes: 32 additions & 0 deletions
32
...ain/java/org/android/bbangzip/presentation/ui/subject/subjectdetail/SubjectDetailRoute.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| package org.android.bbangzip.presentation.ui.subject.subjectdetail | ||
|
|
||
| import androidx.compose.foundation.layout.PaddingValues | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.hilt.navigation.compose.hiltViewModel | ||
| import androidx.lifecycle.compose.collectAsStateWithLifecycle | ||
|
|
||
| @Composable | ||
| fun SubjectDetailRoute( | ||
| padding: PaddingValues, | ||
| viewModel: SubjectDetailViewModel = hiltViewModel(), | ||
| ) { | ||
| val subjectDetailState by viewModel.uiState.collectAsStateWithLifecycle() | ||
|
|
||
| SubjectDetailScreen( | ||
| padding = padding, | ||
| todoList = subjectDetailState.todoList, | ||
| pieceViewType = subjectDetailState.pieceViewType, | ||
| deletedSet = subjectDetailState.selectedItemSet, | ||
| revertCompleteBottomSheetState = subjectDetailState.revertCompleteBottomSheetState, | ||
| selectedItemId = subjectDetailState.selectedItemId, | ||
| onCloseIconClicked = { viewModel.setEvent(SubjectDetailContract.SubjectDetailEvent.OnCloseIconClicked) }, | ||
| onTrashIconClicked = { viewModel.setEvent(SubjectDetailContract.SubjectDetailEvent.OnTrashIconClicked) }, | ||
| onDeleteModeCardClicked = { id -> viewModel.setEvent(SubjectDetailContract.SubjectDetailEvent.OnDeleteModeCardClicked(id)) }, | ||
| onDefaultCardClicked = { id -> viewModel.setEvent(SubjectDetailContract.SubjectDetailEvent.OnDefaultCardClicked(id)) }, | ||
| onCompleteCardClicked = { id -> viewModel.setEvent(SubjectDetailContract.SubjectDetailEvent.OnCompleteCardClicked(id)) }, | ||
| onRevertCompleteBottomSheetDismissRequest = { viewModel.setEvent(SubjectDetailContract.SubjectDetailEvent.OnRevertCompleteBottomSheetDissmissRequest) }, | ||
| onRevertCompleteBottomSheetApproveButtonClicked = { viewModel.setEvent(SubjectDetailContract.SubjectDetailEvent.OnRevertCompleteBottomSheetApproveButtonClicked) }, | ||
| onRevertCompleteBottomSheetDismissButtonClicked = { viewModel.setEvent(SubjectDetailContract.SubjectDetailEvent.OnRevertCompleteBottomSheetDismissButtonClicked) }, | ||
| ) | ||
| } |
Oops, something went wrong.