From 065f7ee038693e2abf798d09ee3df6bb5c880814 Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Tue, 15 Apr 2025 19:42:44 +0900
Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EC=9B=90=ED=83=88=ED=87=B4=20-=20?=
 =?UTF-8?q?=EC=86=8C=EC=85=9C=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=83=88?=
 =?UTF-8?q?=ED=87=B4=20=EC=95=88=EB=82=B4=20=EB=AC=B8=EA=B5=AC=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                    |  4 ++--
 .../sodalive/settings/signout/SignOutViewModel.kt   |  7 +------
 app/src/main/res/layout/activity_sign_out.xml       | 13 +++++++++++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index cd10efa..77e4c23 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,8 +35,8 @@ android {
         applicationId "kr.co.vividnext.sodalive"
         minSdk 23
         targetSdk 34
-        versionCode 159
-        versionName "1.34.0"
+        versionCode 161
+        versionName "1.34.1"
     }
 
     buildTypes {
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/settings/signout/SignOutViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/settings/signout/SignOutViewModel.kt
index fbf1c24..af0411e 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/settings/signout/SignOutViewModel.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/settings/signout/SignOutViewModel.kt
@@ -29,13 +29,8 @@ class SignOutViewModel(private val repository: UserRepository) : BaseViewModel()
                 return
             }
 
-            if (password.isBlank()) {
-                _toastLiveData.postValue("비밀번호를 입력해 주세요.")
-                return
-            }
-
             _isLoading.value = true
-            val request = SignOutRequest(reason.trim(), password)
+            val request = SignOutRequest(reason.trim(), password.trim())
 
             compositeDisposable.add(
                 repository.signOut(request, "Bearer ${SharedPreferenceManager.token}")
diff --git a/app/src/main/res/layout/activity_sign_out.xml b/app/src/main/res/layout/activity_sign_out.xml
index da6cfa3..1c7273e 100644
--- a/app/src/main/res/layout/activity_sign_out.xml
+++ b/app/src/main/res/layout/activity_sign_out.xml
@@ -30,7 +30,7 @@
                 android:layout_marginTop="13.3dp"
                 android:fontFamily="@font/gmarket_sans_bold"
                 android:text="정말로 탈퇴하실 거에요?\n한 번 더 생각해보지 않으실래요?"
-                android:textColor="@color/color_a285eb"
+                android:textColor="@color/color_3bb9f1"
                 android:textSize="20sp" />
 
             <TextView
@@ -266,9 +266,18 @@
                     android:textSize="13.3sp"
                     android:theme="@style/EditTextStyle"
                     tools:ignore="LabelFor" />
-
             </LinearLayout>
 
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="26.7dp"
+                android:layout_marginTop="8dp"
+                android:fontFamily="@font/gmarket_sans_medium"
+                android:text="※ 소셜 로그인 이용자는 비밀번호를 입력하지 말고 '탈퇴하기'를 클릭하면 자동 탈퇴됩니다."
+                android:textColor="@color/color_eeeeee"
+                android:textSize="12sp" />
+
             <TextView
                 android:id="@+id/tv_sign_out"
                 android:layout_width="match_parent"