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.

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

[Feat] 프로필 생성 UI 제작 #58

Merged
merged 28 commits into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
21eaac8
[refacor] : 디자이너, 개발자 아이콘 svg 파일로 변경
ham2174 Feb 11, 2024
45b4944
[refactor] : FunchButton [Full, Large] 타입 ContentVerticalPadding 피그마에…
ham2174 Feb 11, 2024
886f298
[refactor] : FunchTextField 4종 에러상태일때 border 바뀌게끔 수정 및 FunchErrorCapt…
ham2174 Feb 11, 2024
067d52a
[refactor] : FunchFeedbackButton Public으로 변경
ham2174 Feb 11, 2024
c65ca5f
[feat] : 도메인 Entity Blood에 속성값으로 Blood 찾아서 반환해주는 함수 formType() 추가
ham2174 Feb 11, 2024
9589a30
[refactor] : 도메인 Entity Profile의 subways 초기화 변경
ham2174 Feb 11, 2024
2ee6a25
[feat] : FunchLabel 컴포넌트 제작
ham2174 Feb 11, 2024
ff31e13
[feat] : 디자인 시스템에 도메인 Entity name 따른 아이콘 찾는 함수 제작
ham2174 Feb 11, 2024
0cc7409
[feat] : Profile 모듈 MbtiType UI모델 생성
ham2174 Feb 11, 2024
186329b
[feat] : app 모듈 매니패스트 액티비티 단락에 windowSoftInputMode 추가
ham2174 Feb 11, 2024
4164aa6
[TEMP] : (임시) 프로필 생성 UI 제작
ham2174 Feb 11, 2024
c663d04
Merge branch 'develop' of https://github.com/Nexters/Funch-AOS into f…
ham2174 Feb 11, 2024
4dd656c
[refactor] : Funch UX 가이드에 맞게끔 바텀바 변경
ham2174 Feb 12, 2024
4818db0
[refactor] : SearchPainter 3가지로 분리
ham2174 Feb 12, 2024
173269b
[refactor] : 가시성 지시자 변경
ham2174 Feb 12, 2024
1708963
[refactor] : 도메인 엔티티 팩토리 함수 네이밍 컨벤션에 맞게끔 변경
ham2174 Feb 12, 2024
a5b3a23
[refactor] : 드롭다운 메뉴에 'Idle' 항목 나오는 현상 수정
ham2174 Feb 12, 2024
c7d4e10
Merge branch 'develop' of https://github.com/Nexters/Funch-AOS into f…
ham2174 Feb 12, 2024
fa62854
[feat] : mbti 로직 추가
ham2174 Feb 12, 2024
089f29d
Merge branch 'develop' of https://github.com/Nexters/Funch-AOS into f…
ham2174 Feb 12, 2024
8e4a28e
[feat] : 입력항목 모두 입력시 프로필 생성 버튼 활성화
ham2174 Feb 12, 2024
0dd9b3c
[chore] : reformat
ham2174 Feb 12, 2024
841533f
[feat] : 프로필 string res 추가
ham2174 Feb 13, 2024
7996879
[feat] : ProfileLabel '닉네임' 추가
ham2174 Feb 13, 2024
e3dc1c4
[refactor] : CreateProfile string res 적용
ham2174 Feb 13, 2024
ffcf53f
[refactor] : 라벨이름 ProfileLabel의 labelName으로 통일
ham2174 Feb 13, 2024
d18d788
[refactor] : mbtiRow 구문 수정
ham2174 Feb 13, 2024
2ffa494
[refactor] : MyProfile clubPainter 추가로 오류 수정
ham2174 Feb 13, 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: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<activity
android:name=".MainActivity"
android:exported="true"
android:windowSoftInputMode="adjustResize"
android:theme="@style/Theme.FunchAOS">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package com.moya.funch.common

import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.res.painterResource
import com.moya.funch.icon.FunchIconAsset

@Composable
fun jobPainter(value: String): Painter = when (value) {
"개발자" -> painterResource(id = FunchIconAsset.Job.developer_24)
"디자이너" -> painterResource(id = FunchIconAsset.Job.designer_24)
else -> throw IllegalArgumentException("Unknown Icon: $value")
}

@Composable
fun clubPainter(value: String): Painter = when (value) {
"넥스터즈" -> painterResource(id = FunchIconAsset.Club.nexters_24)
"SOPT" -> painterResource(id = FunchIconAsset.Club.sopt_24)
"Depromeet" -> painterResource(id = FunchIconAsset.Club.depromeet_24)
else -> throw IllegalArgumentException("Unknown Icon: $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")
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,13 @@ import com.moya.funch.theme.Gray800
import com.moya.funch.theme.Gray900
import com.moya.funch.theme.Lemon500
import com.moya.funch.theme.Lemon900
import com.moya.funch.theme.White
import com.moya.funch.theme.Yellow500
import com.moya.funch.theme.funchTypography

enum class FunchButtonType(val shape: Shape, val contentVerticalPadding: Dp, val textStyle: TextStyle) {
Full(RoundedCornerShape(16.dp), 21.dp, funchTypography.sbt1),
Large(RoundedCornerShape(16.dp), 21.dp, funchTypography.sbt1),
Full(RoundedCornerShape(16.dp), 20.5f.dp, funchTypography.sbt1),
Large(RoundedCornerShape(16.dp), 20.5f.dp, funchTypography.sbt1),
ham2174 marked this conversation as resolved.
Show resolved Hide resolved
Medium(RoundedCornerShape(16.dp), 16.dp, funchTypography.sbt2),
Small(RoundedCornerShape(12.dp), 12.dp, funchTypography.b),
XSmall(RoundedCornerShape(12.dp), 8.dp, funchTypography.b)
Expand Down Expand Up @@ -139,7 +140,7 @@ fun FunchSubButton(
) {
val color =
if (enabled) {
FunchTheme.colors.white
White
} else {
Gray400
}
Expand Down
44 changes: 44 additions & 0 deletions core/designsystem/src/main/java/com/moya/funch/component/Label.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package com.moya.funch.component

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.width
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import com.moya.funch.theme.FunchTheme
import com.moya.funch.theme.Gray400

@Composable
fun FunchSmallLabel(modifier: Modifier = Modifier, text: String) {
Box(
modifier = Modifier
.width(52.dp)
.height(48.dp),
contentAlignment = Alignment.CenterStart
) {
Text(
text = text,
color = Gray400,
style = FunchTheme.typography.b
)
}
}

@Composable
fun FunchLargeLabel(modifier: Modifier = Modifier, text: String) {
Box(
modifier = modifier
.width(52.dp)
.height(56.dp),
contentAlignment = Alignment.CenterStart
) {
Text(
text = text,
color = Gray400,
style = FunchTheme.typography.b
)
}
}
Loading
Loading