diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/MyPageActivity.kt b/app/src/main/java/com/eatssu/android/ui/mypage/MyPageActivity.kt index 272e07e8..ea6d9036 100644 --- a/app/src/main/java/com/eatssu/android/ui/mypage/MyPageActivity.kt +++ b/app/src/main/java/com/eatssu/android/ui/mypage/MyPageActivity.kt @@ -7,6 +7,7 @@ import android.app.PendingIntent import android.content.Context import android.content.Intent import android.content.pm.PackageManager +import android.graphics.Paint import android.net.Uri import android.os.Build import android.os.Bundle @@ -58,6 +59,9 @@ class MyPageActivity : BaseActivity(ActivityMyPageBinding initViewModel() setOnClickListener() + binding.tvSignout.paintFlags = Paint.UNDERLINE_TEXT_FLAG + + lifecycleScope.launch { repeatOnLifecycle(Lifecycle.State.STARTED) { myPageViewModel.uiState.collect { @@ -115,7 +119,7 @@ class MyPageActivity : BaseActivity(ActivityMyPageBinding showLogoutDialog() } - binding.tvSignout.setOnClickListener { + binding.llSignout.setOnClickListener { val intent = Intent(this, SignOutActivity::class.java) intent.putExtra("nickname", myPageViewModel.uiState.value.nickname) startActivity(intent) diff --git a/app/src/main/res/drawable/ic_unsubscribe_16.png b/app/src/main/res/drawable/ic_unsubscribe_16.png new file mode 100644 index 00000000..dc3f0fad Binary files /dev/null and b/app/src/main/res/drawable/ic_unsubscribe_16.png differ diff --git a/app/src/main/res/drawable/selector_toggle.xml b/app/src/main/res/drawable/selector_toggle.xml index d4933754..9e5b45b8 100644 --- a/app/src/main/res/drawable/selector_toggle.xml +++ b/app/src/main/res/drawable/selector_toggle.xml @@ -2,16 +2,16 @@ - + - + - + - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_toggle.xml b/app/src/main/res/drawable/shape_toggle.xml index a44d30e5..89f78d8a 100644 --- a/app/src/main/res/drawable/shape_toggle.xml +++ b/app/src/main/res/drawable/shape_toggle.xml @@ -2,10 +2,10 @@ + android:width="30dp" + android:height="30dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_my_page.xml b/app/src/main/res/layout/activity_my_page.xml index 531ad205..91b62f4c 100644 --- a/app/src/main/res/layout/activity_my_page.xml +++ b/app/src/main/res/layout/activity_my_page.xml @@ -13,8 +13,7 @@ + android:orientation="vertical"> @@ -63,7 +62,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:layout_marginTop="16dp"> + android:layout_marginTop="4dp"> - + + android:layout_marginTop="16dp" + android:orientation="horizontal" + android:paddingStart="24dp" + android:paddingEnd="24dp"> + + + + + + + + + + + + @@ -138,7 +173,7 @@ android:background="@android:color/transparent" android:scaleType="fitCenter" android:src="@drawable/ic_arrow_right" - android:tint="@color/gray300" /> + app:tint="@color/gray300" /> @@ -173,7 +208,7 @@ android:background="@android:color/transparent" android:scaleType="fitCenter" android:src="@drawable/ic_arrow_right" - android:tint="@color/gray300" /> + app:tint="@color/gray300" /> @@ -209,7 +244,7 @@ android:background="@android:color/transparent" android:scaleType="fitCenter" android:src="@drawable/ic_arrow_right" - android:tint="@color/gray300" /> + app:tint="@color/gray300" /> @@ -245,11 +280,10 @@ android:background="@android:color/transparent" android:scaleType="fitCenter" android:src="@drawable/ic_arrow_right" - android:tint="@color/gray300" /> + app:tint="@color/gray300" /> - + app:tint="@color/gray300" /> - - + + @@ -329,7 +363,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" - android:textColor="@color/black" + android:textColor="@color/gray400" app:layout_constraintBottom_toBottomOf="@+id/tv_app_version_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/tv_app_version_title" /> @@ -351,7 +385,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/store_app_version" - android:textColor="@color/black" + android:textColor="@color/gray400" app:layout_constraintStart_toStartOf="@+id/ll_my_page" app:layout_constraintTop_toBottomOf="@+id/ll_my_page" /> @@ -366,25 +400,41 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" - android:textColor="@color/black" + android:textColor="@color/gray400" app:layout_constraintBottom_toBottomOf="@+id/tv_app_version_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/tv_app_version_title" /> - + + + + android:textColor="@color/gray400" /> + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 55503662..7c8e9819 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -42,11 +42,11 @@ - 내가 쓴 리뷰 + 내 리뷰 비밀번호 변경 공지사항 로그아웃 - 탈퇴하기 + 회원탈퇴 앱 버전 영문자과 숫자를 포함하여 8자 이상을 입력해주세요. 완료하기