Skip to content
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

Jump to bottom

[Feat] 내 프로필 기능 구현 #68

Merged
merged 9 commits into from
Feb 17, 2024
Merged

[Feat] 내 프로필 기능 구현 #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c369fdf
[refactor] : LocalUserDataSourceImpl 주석 제거
ham2174 Feb 15, 2024
881c343
[refactor] : Profile 팩토리 함수 제거
ham2174 Feb 15, 2024
685343f
[feat] : 내 프로필 기능 구현
ham2174 Feb 15, 2024
38cefb3
[chore] : reformat
ham2174 Feb 15, 2024
5c461aa
[feat] : 지하철 호선 enum값 추가
ham2174 Feb 17, 2024
cb2e477
[feat] : 내 프로필 로딩상태, 에러상태 화면 추가
ham2174 Feb 17, 2024
f1a3283
Merge branch 'develop' of https://github.com/Nexters/Funch-AOS into f…
ham2174 Feb 17, 2024
3f918fe
[feat] : 지하철역 enum 추가됨에 따른 subwayLinePainter 추가
ham2174 Feb 17, 2024
b1be92a
[chore] : reformat
ham2174 Feb 17, 2024
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
1 change: 0 additions & 1 deletion core/data/src/main/java/com/moya/funch/datasource/local/LocalUserDataSourceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ class LocalUserDataSourceImpl @Inject constructor(
) : LocalUserDataSource {

override suspend fun fetchUserProfile(): Result<ProfileModel> {
// userDataStore.clear() 여기 부분 주석 해제하고 한 번 빌드돌리면 데이터가 초기화됩니다!!
if (userDataStore.hasUserId()) {
return Result.success(
ProfileModel(
Expand Down
53 changes: 26 additions & 27 deletions core/designsystem/src/main/java/com/moya/funch/common/SearchPainter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,30 +21,29 @@ fun clubPainter(value: String): Painter = when (value) {
}

@Composable
fun subwayLinePainter(value: String): Painter = // @Gun Hyung TODO : 신림역부터 도메인 Entity 추가 되는데로 수정
when (value) {
"ONE" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_one)
"TWO" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_two)
"THREE" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_three)
"FOUR" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_four)
"FIVE" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_five)
"SIX" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_six)
"SEVEN" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_seven)
"EIGHT" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_eight)
"NINE" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_nine)
"SINBUNDANG" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_shinbundang)
"SUIN" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_suinbundang)
"AIRPORT" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_airport)
"EVERLINE" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_youngin_ever)
"GYEONGCHUN" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_gyeongchun)
"신림" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_sillim)
"경강" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_geonggang)
"서해" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_seohae)
"경의중앙" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_gyeongui_jungang)
"인천1" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_incheon_one)
"의정부" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_uijeongbu)
"우이신설" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_ui_sinseol)
"김포골드라인" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_gimpo_goldline)
"인천2" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_incheon_two)
else -> throw IllegalArgumentException("Unknown Icon: $value")
}
fun subwayLinePainter(value: String): Painter = when (value) {
"ONE" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_one)
"TWO" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_two)
"THREE" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_three)
"FOUR" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_four)
"FIVE" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_five)
"SIX" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_six)
"SEVEN" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_seven)
"EIGHT" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_eight)
"NINE" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_nine)
"SINBUNDANG" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_shinbundang)
"BUNDANG" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_suinbundang)
"AIRPORT" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_airport)
"YOUNGIN" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_youngin_ever)
"GYEONGCHUN" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_gyeongchun)
"SILLIM" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_sillim)
"GYEONGGANG" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_geonggang)
"SEOHAE" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_seohae)
"GYEONGUI" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_gyeongui_jungang)
"INCHEON" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_incheon_one)
"UIJEONGBU" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_uijeongbu)
"UI_SINSEOL" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_ui_sinseol)
"GIMPO" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_gimpo_goldline)
"INCHEON_TWO" -> painterResource(id = FunchIconAsset.SubwayLine.subway_line_incheon_two)
else -> throw IllegalArgumentException("Unknown Icon: $value")
}
14 changes: 11 additions & 3 deletions core/domain/src/main/java/com/moya/funch/entity/SubwayStation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,18 @@ enum class SubwayLine {
SEVEN,
EIGHT,
NINE,
SEOHAE,
AIRPORT,
EVERLINE,
GIMPO,
UI_SINSEOL,
SILLIM,
YOUNGIN,
UIJEONGBU,
BUNDANG,
GYEONGCHUN,
GYEONGUI,
SINBUNDANG,
SUIN
GYEONGGANG,
INCHEON,
INCHEON_TWO,
SINBUNDANG
}
31 changes: 0 additions & 31 deletions core/domain/src/main/java/com/moya/funch/entity/profile/Profile.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import com.moya.funch.entity.Blood
import com.moya.funch.entity.Club
import com.moya.funch.entity.Job
import com.moya.funch.entity.Mbti
import com.moya.funch.entity.SubwayLine
import com.moya.funch.entity.SubwayStation

data class Profile(
Expand All @@ -30,34 +29,4 @@ data class Profile(
"Code must be all numbers or upper case alphabets"
}
}

companion object {
fun default(): Profile {
return Profile(
id = "QW2E213EEADF",
code = "U23C",
name = "김민수",
job = Job.DEVELOPER,
clubs = listOf(Club.NEXTERS, Club.SOPT, Club.DEPROMEET),
mbti = Mbti.ENFP,
blood = Blood.A,
subways = listOf(
SubwayStation(
"동대문역사문화공원",
listOf(
SubwayLine.ONE,
SubwayLine.FOUR
)
),
SubwayStation(
"초지역",
listOf(
SubwayLine.TWO,
SubwayLine.THREE
)
)
)
)
}
}
}
Loading
Loading