diff --git a/app/src/main/res/layout/fragment_calendar_select.xml b/app/src/main/res/layout/fragment_calendar_select.xml index ddebf30..93e75d9 100644 --- a/app/src/main/res/layout/fragment_calendar_select.xml +++ b/app/src/main/res/layout/fragment_calendar_select.xml @@ -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" android:elevation="0dp" diff --git a/app/src/main/res/layout/fragment_onboarding1.xml b/app/src/main/res/layout/fragment_onboarding1.xml index 1bb7d5b..eb4a20f 100644 --- a/app/src/main/res/layout/fragment_onboarding1.xml +++ b/app/src/main/res/layout/fragment_onboarding1.xml @@ -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"/> @@ -73,13 +75,16 @@ 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" /> + /> @@ -87,7 +92,7 @@ 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" /> + android:textAppearance="@style/TextAppearance.App.CaptionMd.Regular" + android:textColor="@color/text_secondary" /> @@ -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" 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" /> + android:textAppearance="@style/TextAppearance.App.CaptionMd.Regular" + android:textColor="@color/text_secondary" /> @@ -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" diff --git a/app/src/main/res/layout/item_calendar_account.xml b/app/src/main/res/layout/item_calendar_account.xml index 6ff1a63..e46612c 100644 --- a/app/src/main/res/layout/item_calendar_account.xml +++ b/app/src/main/res/layout/item_calendar_account.xml @@ -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" />