-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
[ISSUE-56] 약속 관리 UI 구현 #80
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
dc5d37b
fix - 패딩 속성이 잘못 적용된 부분 수정
jihee-dev 85f6ed2
design - 아이콘 추가 및 변경
jihee-dev 5a4417b
chore - accompanist pager 의존성 추가
jihee-dev 201d52e
feat - 약속 관리 UI 구현
jihee-dev da91c87
feat - 네비게이션 추가
jihee-dev 77e2ad0
refactor - 리스트를 LazyColumn으로 구성
jihee-dev 324248e
Merge remote-tracking branch 'origin/develop' into feature/issue-56-m…
jihee-dev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
41 changes: 41 additions & 0 deletions
41
domain/src/main/java/com/yapp/growth/domain/entity/Plan.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,41 @@ | ||
package com.yapp.growth.domain.entity | ||
|
||
sealed class Plan( | ||
open val id: Int, | ||
open val title: String, | ||
open val isLeader: Boolean, | ||
open val category: String, // type? | ||
open val members: List<String>, | ||
) { | ||
data class WaitingPlan( | ||
override val id: Int, | ||
override val title: String, | ||
override val isLeader: Boolean = false, | ||
override val category: String, | ||
override val members: List<String>, | ||
val startTime: String, | ||
val endTime: String, | ||
) : Plan( | ||
id = id, | ||
title = title, | ||
isLeader = isLeader, | ||
category = category, | ||
members = members, | ||
) | ||
|
||
data class FixedPlan( | ||
override val id: Int, | ||
override val title: String, | ||
override val isLeader: Boolean = false, | ||
override val category: String, | ||
override val members: List<String>, | ||
val place: String, | ||
val date: String, | ||
) : Plan( | ||
id = id, | ||
title = title, | ||
isLeader = isLeader, | ||
category = category, | ||
members = members, | ||
) | ||
} |
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
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
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
28 changes: 28 additions & 0 deletions
28
presentation/src/main/java/com/yapp/growth/presentation/ui/main/manage/ManageContract.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,28 @@ | ||
package com.yapp.growth.presentation.ui.main.manage | ||
|
||
import com.yapp.growth.base.ViewEvent | ||
import com.yapp.growth.base.ViewSideEffect | ||
import com.yapp.growth.base.ViewState | ||
import com.yapp.growth.domain.entity.Plan | ||
|
||
class ManageContract { | ||
data class ManageViewState( | ||
val waitingPlans: List<Plan.WaitingPlan> = emptyList(), | ||
val fixedPlans: List<Plan.FixedPlan> = emptyList(), | ||
) : ViewState | ||
|
||
sealed class ManageSideEffect : ViewSideEffect { | ||
object NavigateToCreateScreen : ManageSideEffect() | ||
data class NavigateToFixPlanScreen(val planId: Int) : ManageSideEffect() | ||
data class NavigateToMemberResponseScreen(val planId: Int) : ManageSideEffect() | ||
data class NavigateToInvitationScreen(val planId: Int) : ManageSideEffect() | ||
data class SwitchTab(val tabIndex: Int) : ManageSideEffect() | ||
} | ||
|
||
sealed class ManageEvent : ViewEvent { | ||
object OnClickCreateButton : ManageEvent() | ||
data class OnClickWaitingPlan(val planId: Int) : ManageEvent() | ||
data class OnClickFixedPlan(val planId: Int) : ManageEvent() | ||
data class OnClickTab(val tabIndex: Int) : ManageEvent() | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
이렇게 도메인 모델 구축한거 되게 좋은 것 같아요..!
저였으면 대기중 약속, 확정 약속 다 따로 만들었을듯....