-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* feat(FestivalDetailFragment): 축제 상세 화면 생성 및 프레그먼트 기본 세팅 * feat(FestivalViewModel): FestivalDetailViewModel 생성 * refactor(FestivalItemUiState): rename StageUiState * refactor(ArtistRepository): 가수의 축제들을 불러온다 * refactor(Stages): 복수 공연 객체 제거 * feat(FestivalDetail): 축제 상세 객체 정의 * feat(Stage): 공연 객체 생성 * feat(FestivalDetailUiState): FestivalDetailUiState 정의 * feat(StageResponse): 공연 response 객체 정의 * feat(FestivalDetailResponse): 축제 상세 Response 객체 정의 * feat(FestivalRepository): 축제 상세 조희 메서드 정의 * feat(FestivalRetrofitService): 축제 상세 조회 API 에 파라미터로 id 를 전달한다. * feat(FestivalDetailViewModel): 축제 상세 뷰모델 작성 * feat(FestivalDetail): 축제 상세 프레그먼트 화면 작성 * feat(FestivalDetail): 축제 상세 공연 가수 화면 정의 * feat(FestivalDetail): 축제 상세 공연 화면 정의 * feat(ArtistItemUiState): 가수 uiState 정의 * feat(adapter/artist): Artist 리사이클러뷰 어댑터 및 뷰홀더 정의 * feat(adapter/stage): 공연 목록 어댑터 및 뷰홀더 정의 * refactor: 사용하지 않는 import 제거 * feat(FestivalDetailViewModel): 가수 uiState 변환 로직 추가 * feat(FestivalDetailFragment): 축제 상세 Fragment 정의 * feat(FestivalDetailFragment): Media 에 이름이 포함된다. * feat(FestivalListEvent): 축제 목록에서 축제 상세를 보여주는 이벤트 정의 * feat(FestivalDetail): 축제 상세 디자인 수정 * feat(FestivalList): 축제 선택 시 SingleClick 으로 축제 상세를 불러온다. * feat(FestivalDetail): 축제 이름 스타일 수정 * refactor(FestivalDetail): 가짜 축제 저장소에서 가짜 축제 상세를 분리한다 * feat(FestivalDetail): 타이틀에는 축제이름만 보인다 * feat(FakeFestival): 부경대 축제 이름 추가 * feat(item_media): 소셜 미디어 이름을 보여주지 않는다 * feat: 축제 이름 말줄임 표시 처리 * fix: 상태바 색깔 역전 * feat(FestivalDetail): 축제 상세에서 아티스트를 선택하면 아티스트 상세를 보여준다 * feat(FestivalDetail): 축제 상세의 DDay 를 보여준다 * feat(FestivalDetail): 스크롤 시 기준 선 밑으로 아이템이 사라진다 * fix(fragment): clickable true 로 클릭 중복 현상 해결 * feat(FestivalDetail): 축제 상세 dday 디자인 변경 반영
- Loading branch information
1 parent
ee2cfc9
commit 8897f89
Showing
46 changed files
with
1,138 additions
and
58 deletions.
There are no files selected for viewing
31 changes: 31 additions & 0 deletions
31
...estago/data/src/main/java/com/festago/festago/data/dto/festival/FestivalDetailResponse.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,31 @@ | ||
| package com.festago.festago.data.dto.festival | ||
|
|
||
| import com.festago.festago.data.dto.school.SchoolResponse | ||
| import com.festago.festago.data.dto.school.SocialMediaResponse | ||
| import com.festago.festago.data.dto.stage.StageResponse | ||
| import com.festago.festago.domain.model.festival.FestivalDetail | ||
| import kotlinx.serialization.Serializable | ||
| import java.time.LocalDate | ||
|
|
||
| @Serializable | ||
| data class FestivalDetailResponse( | ||
| val id: Long, | ||
| val name: String, | ||
| val startDate: String, | ||
| val endDate: String, | ||
| val posterImageUrl: String, | ||
| val school: SchoolResponse, | ||
| val socialMedias: List<SocialMediaResponse>, | ||
| val stages: List<StageResponse>, | ||
| ) { | ||
| fun toDomain() = FestivalDetail( | ||
| id, | ||
| name, | ||
| LocalDate.parse(startDate), | ||
| LocalDate.parse(endDate), | ||
| posterImageUrl, | ||
| school.toDomain(), | ||
| socialMedias.map { it.toDomain() }, | ||
| stages.map { it.toDomain() }, | ||
| ) | ||
| } |
19 changes: 19 additions & 0 deletions
19
android/festago/data/src/main/java/com/festago/festago/data/dto/stage/StageResponse.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,19 @@ | ||
| package com.festago.festago.data.dto.stage | ||
|
|
||
| import com.festago.festago.data.dto.artist.ArtistResponse | ||
| import com.festago.festago.domain.model.stage.Stage | ||
| import kotlinx.serialization.Serializable | ||
| import java.time.LocalDateTime | ||
|
|
||
| @Serializable | ||
| data class StageResponse( | ||
| val id: Long, | ||
| val startDateTime: String, | ||
| val artists: List<ArtistResponse>, | ||
| ) { | ||
| fun toDomain() = Stage( | ||
| id = id, | ||
| startDateTime = LocalDateTime.parse(startDateTime), | ||
| artists = artists.map { it.toDomain() }, | ||
| ) | ||
| } |
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
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
8 changes: 0 additions & 8 deletions
8
android/festago/domain/src/main/java/com/festago/festago/domain/model/artist/Stages.kt
This file was deleted.
Oops, something went wrong.
17 changes: 17 additions & 0 deletions
17
.../festago/domain/src/main/java/com/festago/festago/domain/model/festival/FestivalDetail.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,17 @@ | ||
| package com.festago.festago.domain.model.festival | ||
|
|
||
| import com.festago.festago.domain.model.school.School | ||
| import com.festago.festago.domain.model.social.SocialMedia | ||
| import com.festago.festago.domain.model.stage.Stage | ||
| import java.time.LocalDate | ||
|
|
||
| data class FestivalDetail( | ||
| val id: Long, | ||
| val name: String, | ||
| val startDate: LocalDate, | ||
| val endDate: LocalDate, | ||
| val posterImageUrl: String, | ||
| val school: School, | ||
| val socialMedias: List<SocialMedia>, | ||
| val stages: List<Stage>, | ||
| ) |
10 changes: 10 additions & 0 deletions
10
android/festago/domain/src/main/java/com/festago/festago/domain/model/stage/Stage.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,10 @@ | ||
| package com.festago.festago.domain.model.stage | ||
|
|
||
| import com.festago.festago.domain.model.artist.Artist | ||
| import java.time.LocalDateTime | ||
|
|
||
| class Stage( | ||
| val id: Long, | ||
| val startDateTime: LocalDateTime, | ||
| val artists: List<Artist>, | ||
| ) |
4 changes: 2 additions & 2 deletions
4
...id/festago/domain/src/main/java/com/festago/festago/domain/repository/ArtistRepository.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 |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| package com.festago.festago.domain.repository | ||
|
|
||
| import com.festago.festago.domain.model.artist.ArtistDetail | ||
| import com.festago.festago.domain.model.artist.Stages | ||
| import com.festago.festago.domain.model.festival.FestivalsPage | ||
|
|
||
| interface ArtistRepository { | ||
| suspend fun loadArtistDetail(id: Long): Result<ArtistDetail> | ||
|
|
||
| suspend fun loadArtistStages(id: Long, size: Int): Result<Stages> | ||
| suspend fun loadArtistFestivals(id: Long, size: Int): Result<FestivalsPage> | ||
| } |
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
Oops, something went wrong.