modify: change mypage design

EAT-SSU · Sep 22, 2024 · 8a9bef9 · 8a9bef9
1 parent c8c60c9
commit 8a9bef9
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 40 deletions.
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
@@ -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>(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>(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
diff --git a/app/src/main/res/drawable/selector_toggle.xml b/app/src/main/res/drawable/selector_toggle.xml
@@ -2,16 +2,16 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true">
         <shape android:shape="rectangle">
-            <size android:width="50dp" android:height="25dp" />
+            <size android:width="45dp" android:height="31dp" />
             <solid android:color="@color/primary" />
-            <corners android:radius="46dp" />
+            <corners android:radius="15dp" />
         </shape>
     </item>
     <item android:state_checked="false">
         <shape android:shape="rectangle">
-            <size android:width="50dp" android:height="25dp" />
+            <size android:width="45dp" android:height="31dp" />
             <solid android:color="@color/gray400" />
-            <corners android:radius="46dp" />
+            <corners android:radius="15dp" />
         </shape>
     </item>
 </selector>
diff --git a/app/src/main/res/drawable/shape_toggle.xml b/app/src/main/res/drawable/shape_toggle.xml
@@ -2,10 +2,10 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
     <size
-        android:width="25dp"
-        android:height="25dp" />
+        android:width="30dp"
+        android:height="30dp" />
     <solid android:color="@color/white" />
     <stroke
-        android:width="5dp"
+        android:width="3dp"
         android:color="@android:color/transparent" />
 </shape>
diff --git a/app/src/main/res/layout/activity_my_page.xml b/app/src/main/res/layout/activity_my_page.xml
@@ -13,8 +13,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="16dp">
+            android:orientation="vertical">
 
             <ImageView
                 android:id="@+id/ib_profile"
@@ -39,9 +38,9 @@
                 <TextView
                     android:id="@+id/tv_nickname"
                     style="@style/Body1"
-                    android:layout_gravity="center"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center"
                     android:text="@string/nickname"
                     android:textColor="@color/black" />
 
@@ -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">
 
                 <TextView
                     android:id="@+id/tv_account"
@@ -91,20 +90,56 @@
                     android:src="@drawable/ic_kakao_login" />
             </LinearLayout>
 
-            <androidx.appcompat.widget.SwitchCompat
-                android:id="@+id/alarm_switch"
-                android:layout_width="wrap_content"
+            <!--푸시알림-->
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                style="@style/category_toggle"
-                android:text="푸시 알림 설정\n매일 오전 11시에 알림을 보내드려요" />
+                android:layout_marginTop="16dp"
+                android:orientation="horizontal"
+                android:paddingStart="24dp"
+                android:paddingEnd="24dp">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <TextView
+                        style="@style/Body1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="푸시 알림 설정"
+                        android:textColor="@color/black" />
+
+                    <TextView
+                        style="@style/Caption2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="매일 오전 11시에 알림을 보내드려요"
+                        android:textColor="@color/gray400" />
+                </LinearLayout>
+
+                <android.widget.Space
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
+
+                <androidx.appcompat.widget.SwitchCompat
+                    android:id="@+id/alarm_switch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:thumb="@drawable/shape_toggle"
+                    app:switchMinWidth="0dp"
+                    app:thumbTextPadding="24dp"
+                    app:track="@drawable/selector_toggle" />
+            </LinearLayout>
 
             <!-- 나머지 레이아웃들 -->
             <LinearLayout
                 android:id="@+id/ll_my_page"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
                 android:orientation="vertical">
 
                 <!-- 내가 쓴 리뷰 -->
@@ -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" />
                 </LinearLayout>
 
                 <!-- 문의하기 -->
@@ -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" />
 
                 </LinearLayout>
 
@@ -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" />
                 </LinearLayout>
 
                 <!--  개인정보 처리방침   -->
@@ -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" />
                 </LinearLayout>
 
 
-
                 <!--  만든 사람들    -->
                 <LinearLayout
                     android:id="@+id/ll_developer"
@@ -283,10 +317,9 @@
                         android:background="@android:color/transparent"
                         android:scaleType="fitCenter"
                         android:src="@drawable/ic_arrow_right"
-                        android:tint="@color/gray300" />
+                        app:tint="@color/gray300" />
                 </LinearLayout>
-
-                <!--  로그아웃    -->
+                <!--  탈퇴하기   -->
                 <TextView
                     android:id="@+id/tv_logout"
                     style="@style/Body1"
@@ -299,6 +332,7 @@
                     android:paddingBottom="18dp"
                     android:text="@string/logout"
                     android:textColor="@color/black" />
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -314,7 +348,7 @@
                         android:layout_height="wrap_content"
                         android:background="?android:attr/selectableItemBackground"
                         android:text="@string/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" />
 
@@ -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" />
                 </LinearLayout>
 
                 <!--  탈퇴하기   -->
-                <TextView
-                    android:id="@+id/tv_signout"
-                    style="@style/Body1"
-                    android:layout_width="match_parent"
+                <LinearLayout
+                    android:id="@+id/ll_signout"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="?android:attr/selectableItemBackground"
+                    android:layout_gravity="end"
+                    android:gravity="center"
+                    android:orientation="horizontal"
                     android:paddingStart="24dp"
                     android:paddingTop="18dp"
                     android:paddingEnd="24dp"
-                    android:paddingBottom="18dp"
+                    android:paddingBottom="18dp">
+
+
+                    <TextView
+                    android:id="@+id/tv_signout"
+                        style="@style/Caption2"
+                        android:gravity="end"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?android:attr/selectableItemBackground"
                     android:text="@string/signout"
-                    android:textColor="@color/black" />
+                        android:textColor="@color/gray400" />
+
+                    <ImageView
+                        android:layout_width="16dp"
+                        android:layout_height="16dp"
+                        android:src="@drawable/ic_unsubscribe_16" />
+            </LinearLayout>
             </LinearLayout>
 
         </LinearLayout>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -42,11 +42,11 @@
     </string-array>
 
 
-    <string name="my_review">내가 쓴 리뷰</string>
+    <string name="my_review">내 리뷰</string>
     <string name="change_pw">비밀번호 변경</string>
     <string name="announce">공지사항</string>
     <string name="logout">로그아웃</string>
-    <string name="signout">탈퇴하기</string>
+    <string name="signout">회원탈퇴</string>
     <string name="app_version">앱 버전</string>
     <string name="pw_rules">영문자과 숫자를 포함하여 8자 이상을 입력해주세요.</string>
     <string name="complete">완료하기</string>