-
Notifications
You must be signed in to change notification settings - Fork 0
fix: 온보딩 레이아웃 마진 및 폰트 스타일 수정 #188
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
base: develop
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -14,6 +14,8 @@ | |||||||||||
| android:layout_height="wrap_content" | ||||||||||||
| android:text="어떤 캘린더에 일정을 담아 드릴까요?" | ||||||||||||
| android:gravity="center" | ||||||||||||
| android:textAppearance="@style/TextAppearance.App.BodySm.Regular" | ||||||||||||
| android:textColor="@color/text_primary" | ||||||||||||
| android:layout_marginTop="40dp" | ||||||||||||
| app:layout_constraintTop_toTopOf="parent" | ||||||||||||
| app:layout_constraintEnd_toEndOf="parent" | ||||||||||||
|
|
@@ -24,6 +26,8 @@ | |||||||||||
| android:layout_width="match_parent" | ||||||||||||
| android:layout_height="wrap_content" | ||||||||||||
| android:text="설정에서 기본 캘린더를 변경할 수 있습니다." | ||||||||||||
| android:textAppearance="@style/TextAppearance.App.ModalSm.Regular" | ||||||||||||
| android:textColor="@color/text_secondary" | ||||||||||||
| android:gravity="center" | ||||||||||||
| app:layout_constraintTop_toBottomOf="@id/tv_description"/> | ||||||||||||
|
|
||||||||||||
|
|
@@ -65,6 +69,7 @@ | |||||||||||
| android:layout_marginBottom="24dp" | ||||||||||||
| android:background="@drawable/btn_main_round" | ||||||||||||
| android:text="Pace 시작하기" | ||||||||||||
| android:textAppearance="@style/TextAppearance.App.BodySm.Semibold" | ||||||||||||
| android:textColor="@color/white" | ||||||||||||
| android:textSize="16sp" | ||||||||||||
|
Comment on lines
+72
to
74
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||
| android:elevation="0dp" | ||||||||||||
|
|
||||||||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -25,16 +25,17 @@ | |||||
| app:layout_constraintBottom_toTopOf="@+id/centerLine" | ||||||
| app:layout_constraintEnd_toEndOf="parent" | ||||||
| app:layout_constraintStart_toStartOf="parent" | ||||||
| android:layout_marginBottom="20dp"/> | ||||||
| android:layout_marginBottom="13dp"/> | ||||||
|
|
||||||
| <TextView | ||||||
| android:id="@+id/tvDescription" | ||||||
| android:layout_width="wrap_content" | ||||||
| android:layout_height="wrap_content" | ||||||
| android:layout_marginTop="30dp" | ||||||
| android:layout_marginTop="50dp" | ||||||
| android:gravity="center" | ||||||
| tools:text="일정부터 출발까지 \n하루의 흐름을, 나의 페이스로" | ||||||
| android:textColor="@color/secondary_900" | ||||||
| android:textAppearance="@style/TextAppearance.App.BodyMd.Regular" | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| android:textColor="@color/text_primary" | ||||||
| android:lineSpacingExtra="4dp" | ||||||
| android:alpha="1" | ||||||
| app:layout_constraintEnd_toEndOf="parent" | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -59,9 +59,11 @@ | |||||
| android:id="@+id/tvDescription" | ||||||
| android:layout_width="wrap_content" | ||||||
| android:layout_height="wrap_content" | ||||||
| android:layout_marginTop="30dp" | ||||||
| android:layout_marginTop="50dp" | ||||||
| android:gravity="center" | ||||||
| tools:text="하루의 일정과 이동 사이에서 \n당신의 페이스는 어땠나요?" | ||||||
| android:textAppearance="@style/TextAppearance.App.BodyMd.Regular" | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| android:textColor="@color/text_primary" | ||||||
| android:lineSpacingExtra="4dp" | ||||||
| android:alpha="1" | ||||||
| app:layout_constraintEnd_toEndOf="parent" | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -66,9 +66,11 @@ | |||||
| android:id="@+id/tvDescription" | ||||||
| android:layout_width="wrap_content" | ||||||
| android:layout_height="wrap_content" | ||||||
| android:layout_marginTop="30dp" | ||||||
| android:layout_marginTop="50dp" | ||||||
| android:gravity="center" | ||||||
| tools:text="일정은 캘린더로, 경로는 지도로\n출발 타이밍까지 신경 쓰다 보면\n하루의 흐름과 내 페이스를 놓치곤 해요." | ||||||
| android:textAppearance="@style/TextAppearance.App.BodyMd.Regular" | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| android:textColor="@color/text_primary" | ||||||
| android:lineSpacingExtra="4dp" | ||||||
| android:alpha="1" | ||||||
| app:layout_constraintEnd_toEndOf="parent" | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -49,9 +49,11 @@ | |||||
| android:id="@+id/tvDescription" | ||||||
| android:layout_width="wrap_content" | ||||||
| android:layout_height="wrap_content" | ||||||
| android:layout_marginTop="30dp" | ||||||
| android:layout_marginTop="50dp" | ||||||
| android:gravity="center" | ||||||
| tools:text="이제는 일정과 경로를 하나로\n출발까지의 흐름을 Pace가 이어드려요." | ||||||
| android:textAppearance="@style/TextAppearance.App.BodyMd.Regular" | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| android:textColor="@color/text_primary" | ||||||
| android:lineSpacingExtra="4dp" | ||||||
| android:alpha="1" | ||||||
| app:layout_constraintEnd_toEndOf="parent" | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -25,6 +25,8 @@ | |||||||||||||||||
| android:layout_marginTop="24dp" | ||||||||||||||||||
| android:gravity="center" | ||||||||||||||||||
| android:text="PACE 이용을 위해\n아래 권한을 허용해주세요." | ||||||||||||||||||
| android:textAppearance="@style/TextAppearance.App.BodyMd.Medium" | ||||||||||||||||||
| android:textColor="@color/text_primary" | ||||||||||||||||||
| android:textStyle="bold" | ||||||||||||||||||
|
Comment on lines
+28
to
30
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||||
| app:layout_constraintEnd_toEndOf="parent" | ||||||||||||||||||
| app:layout_constraintStart_toStartOf="parent" | ||||||||||||||||||
|
|
@@ -44,8 +46,8 @@ | |||||||||||||||||
| android:layout_height="wrap_content" | ||||||||||||||||||
| android:layout_marginTop="24dp" | ||||||||||||||||||
| android:text="필수 접근 권한" | ||||||||||||||||||
| android:textColor="@color/black" | ||||||||||||||||||
| android:textSize="14sp" | ||||||||||||||||||
| android:textAppearance="@style/TextAppearance.App.BodySm.Semibold" | ||||||||||||||||||
| android:textColor="@color/text_primary" | ||||||||||||||||||
| android:textStyle="bold" | ||||||||||||||||||
|
Comment on lines
+49
to
51
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||||
| app:layout_constraintStart_toStartOf="parent" | ||||||||||||||||||
| app:layout_constraintTop_toBottomOf="@id/divider" /> | ||||||||||||||||||
|
|
@@ -73,21 +75,24 @@ | |||||||||||||||||
| android:layout_width="wrap_content" | ||||||||||||||||||
| android:layout_height="wrap_content" | ||||||||||||||||||
| android:text="위치" | ||||||||||||||||||
| android:textColor="@color/black" | ||||||||||||||||||
| android:textAppearance="@style/TextAppearance.App.BodySm.Medium" | ||||||||||||||||||
| android:textColor="@color/text_primary" | ||||||||||||||||||
| android:textStyle="bold" /> | ||||||||||||||||||
|
Comment on lines
+78
to
80
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||||
| <TextView | ||||||||||||||||||
| android:layout_width="wrap_content" | ||||||||||||||||||
| android:layout_height="wrap_content" | ||||||||||||||||||
| android:textAppearance="@style/TextAppearance.App.CaptionMd.Regular" | ||||||||||||||||||
| android:textColor="@color/text_secondary" | ||||||||||||||||||
| android:text="내 현재 위치는 장소 검색 및 경로에서 사용자 위치 확인을 \n위한 정보로 활용됩니다." | ||||||||||||||||||
| android:textSize="12sp" /> | ||||||||||||||||||
| /> | ||||||||||||||||||
|
Comment on lines
+84
to
+87
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. PR 설명에서 언급하신 것처럼 폰트 크기가 작아 보일 수 있습니다.
Suggested change
|
||||||||||||||||||
| </LinearLayout> | ||||||||||||||||||
| </LinearLayout> | ||||||||||||||||||
|
|
||||||||||||||||||
| <LinearLayout | ||||||||||||||||||
| android:id="@+id/layout_calendar" | ||||||||||||||||||
| android:layout_width="match_parent" | ||||||||||||||||||
| android:layout_height="wrap_content" | ||||||||||||||||||
| android:layout_marginTop="22dp" | ||||||||||||||||||
| android:layout_marginTop="17dp" | ||||||||||||||||||
| android:orientation="horizontal" | ||||||||||||||||||
| android:gravity="center_vertical" | ||||||||||||||||||
| app:layout_constraintTop_toBottomOf="@id/layout_location"> | ||||||||||||||||||
|
|
@@ -106,13 +111,15 @@ | |||||||||||||||||
| android:layout_width="wrap_content" | ||||||||||||||||||
| android:layout_height="wrap_content" | ||||||||||||||||||
| android:text="캘린더" | ||||||||||||||||||
| android:textColor="@color/black" | ||||||||||||||||||
| android:textAppearance="@style/TextAppearance.App.BodySm.Medium" | ||||||||||||||||||
| android:textColor="@color/text_primary" | ||||||||||||||||||
| android:textStyle="bold" /> | ||||||||||||||||||
|
Comment on lines
+114
to
116
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||||
| <TextView | ||||||||||||||||||
| android:layout_width="wrap_content" | ||||||||||||||||||
| android:layout_height="wrap_content" | ||||||||||||||||||
| android:text="일정 확인, 추가, 수정 및 연동을 위해 권한이 필요합니다." | ||||||||||||||||||
| android:textSize="12sp" /> | ||||||||||||||||||
| android:textAppearance="@style/TextAppearance.App.CaptionMd.Regular" | ||||||||||||||||||
| android:textColor="@color/text_secondary" /> | ||||||||||||||||||
|
Comment on lines
+121
to
+122
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 이 설명 텍스트 또한 12sp에서 10sp로 크기가 줄었습니다. 12sp 크기를 유지하고 싶다면,
Suggested change
|
||||||||||||||||||
| </LinearLayout> | ||||||||||||||||||
| </LinearLayout> | ||||||||||||||||||
|
|
||||||||||||||||||
|
|
@@ -131,8 +138,8 @@ | |||||||||||||||||
| android:layout_height="wrap_content" | ||||||||||||||||||
| android:layout_marginTop="48dp" | ||||||||||||||||||
| android:text="선택 접근 권한" | ||||||||||||||||||
| android:textColor="@color/black" | ||||||||||||||||||
| android:textSize="14sp" | ||||||||||||||||||
| android:textAppearance="@style/TextAppearance.App.BodySm.Semibold" | ||||||||||||||||||
| android:textColor="@color/text_primary" | ||||||||||||||||||
| android:textStyle="bold" | ||||||||||||||||||
|
Comment on lines
+141
to
143
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||||
| app:layout_constraintStart_toStartOf="parent" | ||||||||||||||||||
| app:layout_constraintTop_toBottomOf="@id/layout_calendar" /> | ||||||||||||||||||
|
|
@@ -160,13 +167,15 @@ | |||||||||||||||||
| android:layout_width="wrap_content" | ||||||||||||||||||
| android:layout_height="wrap_content" | ||||||||||||||||||
| android:text="알림" | ||||||||||||||||||
| android:textColor="@color/black" | ||||||||||||||||||
| android:textAppearance="@style/TextAppearance.App.BodySm.Medium" | ||||||||||||||||||
| android:textColor="@color/text_primary" | ||||||||||||||||||
| android:textStyle="bold" /> | ||||||||||||||||||
|
Comment on lines
+170
to
172
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||||
| <TextView | ||||||||||||||||||
| android:layout_width="wrap_content" | ||||||||||||||||||
| android:layout_height="wrap_content" | ||||||||||||||||||
| android:text="일정 및 출발 알림 제공을 위해 권한이 필요합니다." | ||||||||||||||||||
| android:textSize="12sp" /> | ||||||||||||||||||
| android:textAppearance="@style/TextAppearance.App.CaptionMd.Regular" | ||||||||||||||||||
| android:textColor="@color/text_secondary" /> | ||||||||||||||||||
|
Comment on lines
+177
to
+178
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 이 설명 텍스트 또한 12sp에서 10sp로 크기가 줄었습니다. 12sp 크기를 유지하고 싶다면,
Suggested change
|
||||||||||||||||||
| </LinearLayout> | ||||||||||||||||||
| </LinearLayout> | ||||||||||||||||||
|
|
||||||||||||||||||
|
|
@@ -176,6 +185,7 @@ | |||||||||||||||||
| android:layout_height="wrap_content" | ||||||||||||||||||
| android:background="@color/primary_500" | ||||||||||||||||||
| android:text="다음" | ||||||||||||||||||
| android:textAppearance="@style/TextAppearance.App.BodySm.Semibold" | ||||||||||||||||||
| android:textColor="@color/white" | ||||||||||||||||||
| android:textSize="16sp" | ||||||||||||||||||
| android:textStyle="bold" | ||||||||||||||||||
|
Comment on lines
+188
to
191
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 버튼에
16sp 굵은 글씨가 의도된 것이라면,
Suggested change
|
||||||||||||||||||
|
|
||||||||||||||||||
| Original file line number | Diff line number | Diff line change | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -24,15 +24,16 @@ | |||||||||||
| android:layout_width="wrap_content" | ||||||||||||
| android:layout_height="wrap_content" | ||||||||||||
| android:text="내 휴대전화" | ||||||||||||
| android:textColor="@color/black" | ||||||||||||
| android:textSize="14sp" /> | ||||||||||||
| android:textAppearance="@style/TextAppearance.App.BodySm.Regular" | ||||||||||||
| android:textColor="@color/text_primary" /> | ||||||||||||
|
|
||||||||||||
| <TextView | ||||||||||||
| android:id="@+id/tv_account_name" | ||||||||||||
| android:layout_width="wrap_content" | ||||||||||||
| android:layout_height="wrap_content" | ||||||||||||
| android:text="Pace0908@gmail.com" | ||||||||||||
| android:textColor="@color/gray_400" | ||||||||||||
| android:textAppearance="@style/TextAppearance.App.CaptionMd.Regular" | ||||||||||||
| android:textColor="@color/gray_500" | ||||||||||||
| android:textSize="12sp" /> | ||||||||||||
|
Comment on lines
+35
to
37
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||
| </LinearLayout> | ||||||||||||
|
|
||||||||||||
|
|
||||||||||||
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.
TextAppearance.App.ModalSm.Regular스타일이styles.xml에 정의되어 있지 않아 빌드 오류가 발생합니다. 의도한 스타일이TextAppearance.App.CaptionMd.Regular또는 다른 기존 스타일인가요? 혹은 새로운 스타일을 추가해야 한다면styles.xml에 정의해주세요.