diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 8065c882..4c56ac00 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -21,11 +21,12 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:itemIconSize="24dp" + app:itemIconSize="16dp" app:itemIconTint="@color/sel_bottom_nav_icon" app:menu="@menu/menu_bottom" app:itemBackground="@drawable/sel_bottom_nav_indicator" app:itemActiveIndicatorStyle="@null" + android:background="@color/umbba_white" app:itemTextColor="@color/sel_bottom_nav_text"/> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_manage_account.xml b/app/src/main/res/layout/activity_manage_account.xml index bddf8af9..82d2a810 100644 --- a/app/src/main/res/layout/activity_manage_account.xml +++ b/app/src/main/res/layout/activity_manage_account.xml @@ -33,8 +33,8 @@ android:layout_height="wrap_content" android:layout_marginStart="24dp" android:layout_marginTop="26dp" - android:text="로그아웃" - android:textColor="@color/black_opacity60" + android:textColor="@color/umbba_black" + android:text="@string/logout" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -56,8 +56,8 @@ android:layout_height="wrap_content" android:layout_marginStart="24dp" android:layout_marginTop="26dp" - android:text="회원 탈퇴" - android:textColor="@color/black_opacity60" + android:textColor="@color/umbba_black" + android:text="@string/delete_account" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9f2e19b0..fad42ced 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -100,5 +100,7 @@ 회원탈퇴를 진행하시겠습니까? 작성한 모든 문답 내역이 삭제되며 상대측에게는 더 이상 알림이 가지 않습니다.삭제한 내역은 복구할 수 없으니 신중하게 선택해주세요. 탈퇴하기 + 로그아웃 + 회원 탈퇴 \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 7eedf726..0ec0afaf 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,6 +1,6 @@ -