Skip to content

Commit ea2cbf7

Browse files
committed
[ui]: 컬러, string 추출(#37)
1 parent 6e8de2d commit ea2cbf7

3 files changed

Lines changed: 18 additions & 1 deletion

File tree

.idea/gradle.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/main/java/com/texthip/thip/ui/theme/Color.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ val Pink = Color(0xFFFF8BAC)
2424
val Lavendar = Color(0xFFC8A5FF)
2525
val LavendaSub = Color(0xFFA76FFF)
2626
val Yellow = Color(0xFFFFECA7)
27+
val KakaoYellow = Color(0xFFFEE500)
2728

2829
val PureWhite = Color(0xFFFFFFFF)
2930
val White = Color(0xFFFEFEFE)
@@ -61,6 +62,7 @@ data class ThipColors(
6162
val Lavendar: Color,
6263
val LavendaSub: Color,
6364
val Yellow: Color,
65+
val KakaoYellow: Color,
6466
val PureWhite: Color,
6567
val White: Color,
6668
val Grey50: Color,
@@ -96,6 +98,7 @@ val defaultThipColors = ThipColors(
9698
Lavendar = Lavendar,
9799
LavendaSub = LavendaSub,
98100
Yellow = Yellow,
101+
KakaoYellow = KakaoYellow,
99102
PureWhite = PureWhite,
100103
White = White,
101104
Grey50 = Grey50,

app/src/main/res/values/strings.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,4 +158,18 @@
158158
<string name="comment_to">님에게 답글 작성</string>
159159
<string name="group_room_chat_hint">메이트들과 간단한 인사를 나눠보세요!</string>
160160

161+
<!-- splash screen -->
162+
<string name="thip">띱!</string>
163+
<string name="splash_ment">하고 떠오른 그 문장을 나눠요</string>
164+
165+
<!-- signin -->
166+
<string name="kakao_login">카카오계정 로그인</string>
167+
<string name="google_login">구글계정 로그인</string>
168+
<string name="settings_1">설정 1/2</string>
169+
<string name="settings_2">설정 2/2</string>
170+
<string name="nickname">닉네임 (필수)</string>
171+
<string name="nickname_condition">한글/영어/숫자로 구성</string>
172+
<string name="hello_user">안녕하세요, %1$s님</string>
173+
<string name="signin_done">이제 Thip에서 활동할 준비를 모두 마쳤어요!</string>
174+
<string name="start_thip">지금 바로 Thip 시작하기</string>
161175
</resources>

0 commit comments

Comments
 (0)