From 5d2370599ce40d5951a756bac1f0eb3ae2e0aa05 Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Wed, 1 May 2024 23:58:13 +0900
Subject: [PATCH 01/36] =?UTF-8?q?feat#10/:=204=EC=B0=A8=20=EC=84=B8?=
 =?UTF-8?q?=EB=AF=B8=EB=82=98=20api=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              | 16 +++++
 app/src/main/AndroidManifest.xml              |  3 +-
 app/src/main/java/com/sopt/now/ApiFactory.kt  | 23 ++++++
 app/src/main/java/com/sopt/now/AuthService.kt | 12 ++++
 .../java/com/sopt/now/RequestSignUpDto.kt     | 16 +++++
 .../java/com/sopt/now/ResponseSignUpDto.kt    | 12 ++++
 .../main/java/com/sopt/now/SignUpActivity.kt  | 70 ++++++++++++++++++-
 app/src/main/res/layout/activity_sign_up.xml  | 56 +++++++--------
 app/src/main/res/values/strings.xml           |  4 +-
 9 files changed, 180 insertions(+), 32 deletions(-)
 create mode 100644 app/src/main/java/com/sopt/now/ApiFactory.kt
 create mode 100644 app/src/main/java/com/sopt/now/AuthService.kt
 create mode 100644 app/src/main/java/com/sopt/now/RequestSignUpDto.kt
 create mode 100644 app/src/main/java/com/sopt/now/ResponseSignUpDto.kt

diff --git a/app/build.gradle b/app/build.gradle
index 2a5b0d9..528493f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,8 +1,12 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.0'
 }
 
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+
 android {
     namespace 'com.sopt.now'
     compileSdk 34
@@ -15,6 +19,7 @@ android {
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        buildConfigField "String", "AUTH_BASE_URL", properties["base.url"]
     }
 
     buildTypes {
@@ -32,6 +37,7 @@ android {
     }
     buildFeatures {
         viewBinding = true
+        buildConfig true
     }
 }
 
@@ -50,4 +56,14 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
     implementation "androidx.fragment:fragment-ktx:1.6.1"
     implementation "androidx.activity:activity-ktx:1.8.0"
+
+    //api
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1'
+    implementation 'com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0'
+    // define a BOM and its version
+    implementation(platform("com.squareup.okhttp3:okhttp-bom:4.10.0"))
+    // define any required OkHttp artifacts without version
+    implementation("com.squareup.okhttp3:okhttp")
+    implementation("com.squareup.okhttp3:logging-interceptor")
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1466163..8f9e8ed 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
-
+    <uses-permission android:name="android.permission.INTERNET" />
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -11,6 +11,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.NOWSOPTAndroid"
+        android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
             android:name=".SignUpActivity"
diff --git a/app/src/main/java/com/sopt/now/ApiFactory.kt b/app/src/main/java/com/sopt/now/ApiFactory.kt
new file mode 100644
index 0000000..1e8a177
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/ApiFactory.kt
@@ -0,0 +1,23 @@
+package com.sopt.now
+
+import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
+import kotlinx.serialization.json.Json
+import okhttp3.MediaType.Companion.toMediaType
+import retrofit2.Retrofit
+
+object ApiFactory {
+    private const val BASE_URL: String = BuildConfig.AUTH_BASE_URL
+
+    val retrofit: Retrofit by lazy {
+        Retrofit.Builder()
+            .baseUrl(BASE_URL)
+            .addConverterFactory(Json.asConverterFactory("application/json".toMediaType()))
+            .build()
+    }
+
+    inline fun <reified T> create(): T = retrofit.create(T::class.java)
+}
+
+object ServicePool {
+    val authService = ApiFactory.create<AuthService>()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/AuthService.kt b/app/src/main/java/com/sopt/now/AuthService.kt
new file mode 100644
index 0000000..c08c089
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/AuthService.kt
@@ -0,0 +1,12 @@
+package com.sopt.now
+
+import retrofit2.Call
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface AuthService {
+    @POST("member/join") //http 메소드
+    fun signUp(
+        @Body request: RequestSignUpDto,
+    ): Call<ResponseSignUpDto> //비동기->callback
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/RequestSignUpDto.kt b/app/src/main/java/com/sopt/now/RequestSignUpDto.kt
new file mode 100644
index 0000000..2763e87
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/RequestSignUpDto.kt
@@ -0,0 +1,16 @@
+package com.sopt.now
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RequestSignUpDto(
+    @SerialName("authenticationId")
+    val authenticationId: String,
+    @SerialName("password")
+    val password: String,
+    @SerialName("nickname")
+    val nickname: String,
+    @SerialName("phone")
+    val phone: String,
+)
diff --git a/app/src/main/java/com/sopt/now/ResponseSignUpDto.kt b/app/src/main/java/com/sopt/now/ResponseSignUpDto.kt
new file mode 100644
index 0000000..ce55efe
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/ResponseSignUpDto.kt
@@ -0,0 +1,12 @@
+package com.sopt.now
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseSignUpDto(
+    @SerialName("code")
+    val code: Int,
+    @SerialName("message")
+    val message: String,
+)
diff --git a/app/src/main/java/com/sopt/now/SignUpActivity.kt b/app/src/main/java/com/sopt/now/SignUpActivity.kt
index 48b0d23..3178424 100644
--- a/app/src/main/java/com/sopt/now/SignUpActivity.kt
+++ b/app/src/main/java/com/sopt/now/SignUpActivity.kt
@@ -1,11 +1,76 @@
 package com.sopt.now
 
-import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.sopt.now.databinding.ActivitySignUpBinding
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
 
+class SignUpActivity : AppCompatActivity() {
+
+    private val binding by lazy { ActivitySignUpBinding.inflate(layoutInflater) }
+    private val authService by lazy { ServicePool.authService }
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(binding.root)
+        initViews()
+    }
+
+    private fun initViews() {
+        binding.btnSignUp.setOnClickListener {
+            signUp()
+        }
+    }
+
+    private fun signUp() {
+        val signUpRequest = getSignUpRequestDto()
+        authService.signUp(signUpRequest).enqueue(object : Callback<ResponseSignUpDto> {
+            override fun onResponse(
+                call: Call<ResponseSignUpDto>,
+                response: Response<ResponseSignUpDto>,
+            ) {
+                if (response.isSuccessful) {
+                    val data: ResponseSignUpDto? = response.body()
+                    val userId = response.headers()["location"]
+                    Toast.makeText(
+                        this@SignUpActivity,
+                        "회원가입 성공 userID는 $userId 입니다",
+                        Toast.LENGTH_SHORT,
+                    ).show()
+                    Log.d("SignUp", "data: $data, userId: $userId")
+                } else {
+                    val error = response.message()
+                    Toast.makeText(
+                        this@SignUpActivity,
+                        "회원가입에 실패했습니다.$error",
+                        Toast.LENGTH_SHORT,
+                    ).show()
+                }
+            }
+
+            override fun onFailure(call: Call<ResponseSignUpDto>, t: Throwable) {
+                Toast.makeText(this@SignUpActivity, "서버 에러 발생 ", Toast.LENGTH_SHORT).show()
+            }
+        })
+    }
+
+    private fun getSignUpRequestDto(): RequestSignUpDto {
+        val id = binding.etvSignUpId.text.toString()
+        val password = binding.etvSignUpPw.text.toString()
+        val nickname = binding.etvSignUpNick.text.toString()
+        val phoneNumber = binding.etvSignUpPhone.text.toString()
+        return RequestSignUpDto(
+            authenticationId = id,
+            password = password,
+            nickname = nickname,
+            phone = phoneNumber
+        )
+    }
+}
+/**
 class SignUpActivity : AppCompatActivity() {
     private lateinit var binding: ActivitySignUpBinding
 
@@ -60,4 +125,5 @@ class SignUpActivity : AppCompatActivity() {
         const val MIN_PW_LENGTH = 8
         const val MAX_PW_LENGTH = 12
     }
-}
\ No newline at end of file
+}
+        */
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml
index 91ceac3..acce929 100644
--- a/app/src/main/res/layout/activity_sign_up.xml
+++ b/app/src/main/res/layout/activity_sign_up.xml
@@ -8,7 +8,7 @@
     tools:context=".SignUpActivity">
 
     <TextView
-        android:id="@+id/tv_sign_in_title"
+        android:id="@+id/tv_sign_up_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="30dp"
@@ -22,126 +22,126 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
     <TextView
-        android:id="@+id/tv_sign_in_id"
+        android:id="@+id/tv_sign_up_id"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/id"
         android:textStyle="bold"
         android:textSize="20sp"
         android:layout_marginHorizontal="30dp"
-        app:layout_constraintTop_toBottomOf="@id/tv_sign_in_title"
+        app:layout_constraintTop_toBottomOf="@id/tv_sign_up_title"
         app:layout_constraintStart_toStartOf="parent"/>
     <TextView
-        android:id="@+id/tv_sign_in_id_hint"
+        android:id="@+id/tv_sign_up_id_hint"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/sign_up_condition"
         android:textSize="15sp"
         android:layout_marginHorizontal="30dp"
-        app:layout_constraintTop_toBottomOf="@id/tv_sign_in_id"
+        app:layout_constraintTop_toBottomOf="@id/tv_sign_up_id"
         app:layout_constraintStart_toStartOf="parent"/>
     <EditText
-        android:id="@+id/etv_sign_in_id"
+        android:id="@+id/etv_sign_up_id"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:hint="@string/sign_up_id_hint"
         android:singleLine="true"
         android:layout_marginHorizontal="30dp"
-        app:layout_constraintTop_toBottomOf="@id/tv_sign_in_id_hint"
+        app:layout_constraintTop_toBottomOf="@id/tv_sign_up_id_hint"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
     <TextView
-        android:id="@+id/tv_sign_in_pw"
+        android:id="@+id/tv_sign_up_pw"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/pw"
         android:textStyle="bold"
         android:textSize="20sp"
         android:layout_marginHorizontal="30dp"
-        app:layout_constraintTop_toBottomOf="@id/etv_sign_in_id"
+        app:layout_constraintTop_toBottomOf="@id/etv_sign_up_id"
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginTop="30dp"/>
     <TextView
-        android:id="@+id/tv_sign_in_pw_hint"
+        android:id="@+id/tv_sign_up_pw_hint"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/sign_up_pw_condition"
         android:textSize="15sp"
         android:layout_marginHorizontal="30dp"
-        app:layout_constraintTop_toBottomOf="@id/tv_sign_in_pw"
+        app:layout_constraintTop_toBottomOf="@id/tv_sign_up_pw"
         app:layout_constraintStart_toStartOf="parent"/>
     <EditText
-        android:id="@+id/etv_sign_in_pw"
+        android:id="@+id/etv_sign_up_pw"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:hint="@string/sign_up_pw_hint"
         android:singleLine="true"
         android:layout_marginHorizontal="30dp"
-        app:layout_constraintTop_toBottomOf="@id/tv_sign_in_pw_hint"
+        app:layout_constraintTop_toBottomOf="@id/tv_sign_up_pw_hint"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
     <TextView
-        android:id="@+id/tv_sign_in_nick"
+        android:id="@+id/tv_sign_up_nick"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/nick"
         android:textStyle="bold"
         android:textSize="20sp"
         android:layout_marginHorizontal="30dp"
-        app:layout_constraintTop_toBottomOf="@id/etv_sign_in_pw"
+        app:layout_constraintTop_toBottomOf="@id/etv_sign_up_pw"
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginTop="30dp"/>
     <TextView
-        android:id="@+id/tv_sign_in_nivk_hint"
+        android:id="@+id/tv_sign_up_nivk_hint"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/sign_up_nick_text"
         android:textSize="15sp"
         android:layout_marginHorizontal="30dp"
-        app:layout_constraintTop_toBottomOf="@id/tv_sign_in_nick"
+        app:layout_constraintTop_toBottomOf="@id/tv_sign_up_nick"
         app:layout_constraintStart_toStartOf="parent"/>
     <EditText
-        android:id="@+id/etv_sign_in_nick"
+        android:id="@+id/etv_sign_up_nick"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:hint="@string/sign_up_nick_hint"
         android:singleLine="true"
         android:layout_marginHorizontal="30dp"
-        app:layout_constraintTop_toBottomOf="@id/tv_sign_in_nivk_hint"
+        app:layout_constraintTop_toBottomOf="@id/tv_sign_up_nivk_hint"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
     <TextView
-        android:id="@+id/tv_sign_in_etc"
+        android:id="@+id/tv_sign_up_phone"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/etc"
         android:textStyle="bold"
         android:textSize="20sp"
         android:layout_marginHorizontal="30dp"
-        app:layout_constraintTop_toBottomOf="@id/etv_sign_in_nick"
+        app:layout_constraintTop_toBottomOf="@id/etv_sign_up_nick"
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginTop="30dp"/>
     <TextView
-        android:id="@+id/tv_sign_in_etc_hint"
+        android:id="@+id/tv_sign_up_phone_hint"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/sign_up_etc_text"
+        android:text="@string/sign_up_phone_text"
         android:textSize="15sp"
         android:layout_marginHorizontal="30dp"
-        app:layout_constraintTop_toBottomOf="@id/tv_sign_in_etc"
+        app:layout_constraintTop_toBottomOf="@id/tv_sign_up_phone"
         app:layout_constraintStart_toStartOf="parent"/>
     <EditText
-        android:id="@+id/etv_sign_in_etc"
+        android:id="@+id/etv_sign_up_phone"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:hint="@string/sign_up_etc_hint"
+        android:hint="@string/sign_up_phone_hint"
         android:singleLine="true"
         android:layout_marginHorizontal="30dp"
-        app:layout_constraintTop_toBottomOf="@id/tv_sign_in_etc_hint"
+        app:layout_constraintTop_toBottomOf="@id/tv_sign_up_phone_hint"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
     <Button
-        android:id="@+id/btn_sign_in"
+        android:id="@+id/btn_sign_up"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="30dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 209f0d0..e25f865 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,7 +20,7 @@
     <string name="sign_up_title">SIGN UP</string>
     <string name="sign_up_condition">*6-10자 입력해주세요.</string>
     <string name="sign_up_id_hint">아이디를 입력해주세요</string>
-    <string name="sign_up_pw_condition">*8-12자 입력해주세요.</string>
+    <string name="sign_up_pw_condition">*최소 8글자 이상, 숫자, 문자(a-z, A-Z), 특수문자 포함.</string>
     <string name="sign_up_pw_hint">비밀번호를 입력해주세요</string>
     <string name="sign_up_nick_text">*한 글자 이상 입력해주세요.</string>
     <string name="sign_up_nick_hint">닉네임을 입력해주세요</string>
@@ -33,4 +33,6 @@
     <string name="sign_up_error_pw">비밀번호를 다시 설정하세요.</string>
     <string name="sign_up_error_nick">닉네임을 다시 설정하세요.</string>
     <string name="sign_up_error_etc">하고싶은 말을 다시 설정하세요.</string>
+    <string name="sign_up_phone_text">*(-)하이픈을 포함해 입력해주세요.</string>
+    <string name="sign_up_phone_hint">예시)010-0000-0000</string>
 </resources>
\ No newline at end of file

From a6de0faa3b2489cdbf13212e1586856af6f19f01 Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Thu, 2 May 2024 00:09:06 +0900
Subject: [PATCH 02/36] =?UTF-8?q?feat#10/:=20=EB=B9=84=EB=B0=80=EB=B2=88?=
 =?UTF-8?q?=ED=98=B8=20=EB=B3=80=EA=B2=BD=20DTO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/sopt/now/RequestChagePwDto.kt  | 12 ++++++++++++
 .../main/java/com/sopt/now/ResponseChangePwDto.kt    | 10 ++++++++++
 app/src/main/java/com/sopt/now/ResponseSignUpDto.kt  |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/com/sopt/now/RequestChagePwDto.kt
 create mode 100644 app/src/main/java/com/sopt/now/ResponseChangePwDto.kt

diff --git a/app/src/main/java/com/sopt/now/RequestChagePwDto.kt b/app/src/main/java/com/sopt/now/RequestChagePwDto.kt
new file mode 100644
index 0000000..8111c1f
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/RequestChagePwDto.kt
@@ -0,0 +1,12 @@
+package com.sopt.now
+
+import kotlinx.serialization.SerialName
+
+data class RequestChagePwDto (
+    @SerialName("previousPassword")
+    val previousPassword: String,
+    @SerialName("newPassword")
+    val newPassword: String,
+    @SerialName("newPasswordVerification")
+    val newPasswordVerification: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/ResponseChangePwDto.kt b/app/src/main/java/com/sopt/now/ResponseChangePwDto.kt
new file mode 100644
index 0000000..5a61065
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/ResponseChangePwDto.kt
@@ -0,0 +1,10 @@
+package com.sopt.now
+
+import kotlinx.serialization.SerialName
+
+data class ResponseChangePwDto (
+    @SerialName("code")
+    val code: Int,
+    @SerialName("message")
+    val message: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/ResponseSignUpDto.kt b/app/src/main/java/com/sopt/now/ResponseSignUpDto.kt
index ce55efe..998dcc7 100644
--- a/app/src/main/java/com/sopt/now/ResponseSignUpDto.kt
+++ b/app/src/main/java/com/sopt/now/ResponseSignUpDto.kt
@@ -8,5 +8,5 @@ data class ResponseSignUpDto(
     @SerialName("code")
     val code: Int,
     @SerialName("message")
-    val message: String,
+    val message: String
 )

From 1aca77ffb3a4cf55f69cc0b45b108cdc463655db Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Thu, 2 May 2024 00:10:40 +0900
Subject: [PATCH 03/36] =?UTF-8?q?feat#10/:=20=EB=B9=84=EB=B0=80=EB=B2=88?=
 =?UTF-8?q?=ED=98=B8=20=EB=B3=80=EA=B2=BD=20=EC=9D=B8=ED=84=B0=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/sopt/now/AuthService.kt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/sopt/now/AuthService.kt b/app/src/main/java/com/sopt/now/AuthService.kt
index c08c089..f9127b6 100644
--- a/app/src/main/java/com/sopt/now/AuthService.kt
+++ b/app/src/main/java/com/sopt/now/AuthService.kt
@@ -2,11 +2,17 @@ package com.sopt.now
 
 import retrofit2.Call
 import retrofit2.http.Body
+import retrofit2.http.PATCH
 import retrofit2.http.POST
 
 interface AuthService {
     @POST("member/join") //http 메소드
     fun signUp(
-        @Body request: RequestSignUpDto,
+        @Body request: RequestSignUpDto
     ): Call<ResponseSignUpDto> //비동기->callback
+
+    @PATCH("/member/password")
+    fun changePw(
+        @Body request : RequestChagePwDto
+    ) : Call<ResponseChangePwDto>
 }
\ No newline at end of file

From 43c89f724d033960d7e4121e2729ead384d2d933 Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Fri, 3 May 2024 13:35:57 +0900
Subject: [PATCH 04/36] =?UTF-8?q?feat#10/:=20=ED=9A=8C=EC=9B=90=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EC=A1=B0=ED=9A=8C=20(=ED=86=B5=EC=A7=9C=EC=BB=A4?=
 =?UTF-8?q?=EB=B0=8B=20=EC=A3=84=EC=86=A1=ED=95=A9=EB=8B=88=EB=8B=A4...)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |   1 +
 app/src/main/java/com/sopt/now/ApiFactory.kt  |   1 +
 app/src/main/java/com/sopt/now/AuthService.kt |   9 +-
 .../main/java/com/sopt/now/HomeFragment.kt    |  11 +-
 .../main/java/com/sopt/now/LoginActivity.kt   | 163 ++++++++++++------
 .../main/java/com/sopt/now/LoginViewModel.kt  |  51 ++++++
 .../main/java/com/sopt/now/MyPageFragment.kt  |  50 ++++--
 .../main/java/com/sopt/now/RequestLoginDto.kt |  12 ++
 .../java/com/sopt/now/ResponseLoginDto.kt     |  12 ++
 .../java/com/sopt/now/ResponseUserInfoDto.kt  |  23 +++
 .../main/java/com/sopt/now/SignUpActivity.kt  |  82 +++++----
 .../java/com/sopt/now/UserInfoViewModel.kt    |  56 ++++++
 app/src/main/java/com/sopt/now/UserService.kt |  12 ++
 app/src/main/res/layout/activity_sign_up.xml  |   2 +-
 app/src/main/res/layout/fragment_my_page.xml  |   8 +-
 app/src/main/res/values/strings.xml           |   1 +
 16 files changed, 378 insertions(+), 116 deletions(-)
 create mode 100644 app/src/main/java/com/sopt/now/LoginViewModel.kt
 create mode 100644 app/src/main/java/com/sopt/now/RequestLoginDto.kt
 create mode 100644 app/src/main/java/com/sopt/now/ResponseLoginDto.kt
 create mode 100644 app/src/main/java/com/sopt/now/ResponseUserInfoDto.kt
 create mode 100644 app/src/main/java/com/sopt/now/UserInfoViewModel.kt
 create mode 100644 app/src/main/java/com/sopt/now/UserService.kt

diff --git a/app/build.gradle b/app/build.gradle
index 528493f..eddae64 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,6 +48,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.11.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.activity:activity:1.8.0'
+    implementation 'androidx.test:core-ktx:1.5.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
diff --git a/app/src/main/java/com/sopt/now/ApiFactory.kt b/app/src/main/java/com/sopt/now/ApiFactory.kt
index 1e8a177..3dfd3d8 100644
--- a/app/src/main/java/com/sopt/now/ApiFactory.kt
+++ b/app/src/main/java/com/sopt/now/ApiFactory.kt
@@ -20,4 +20,5 @@ object ApiFactory {
 
 object ServicePool {
     val authService = ApiFactory.create<AuthService>()
+    val userService = ApiFactory.create<UserService>()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/AuthService.kt b/app/src/main/java/com/sopt/now/AuthService.kt
index f9127b6..a0dbdd1 100644
--- a/app/src/main/java/com/sopt/now/AuthService.kt
+++ b/app/src/main/java/com/sopt/now/AuthService.kt
@@ -2,7 +2,6 @@ package com.sopt.now
 
 import retrofit2.Call
 import retrofit2.http.Body
-import retrofit2.http.PATCH
 import retrofit2.http.POST
 
 interface AuthService {
@@ -10,9 +9,9 @@ interface AuthService {
     fun signUp(
         @Body request: RequestSignUpDto
     ): Call<ResponseSignUpDto> //비동기->callback
+    @POST("member/login")
+    fun login(
+        @Body request : RequestLoginDto
+    ) : Call<ResponseLoginDto>
 
-    @PATCH("/member/password")
-    fun changePw(
-        @Body request : RequestChagePwDto
-    ) : Call<ResponseChangePwDto>
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/HomeFragment.kt b/app/src/main/java/com/sopt/now/HomeFragment.kt
index aa2b6ef..ae75b4e 100644
--- a/app/src/main/java/com/sopt/now/HomeFragment.kt
+++ b/app/src/main/java/com/sopt/now/HomeFragment.kt
@@ -1,25 +1,25 @@
 package com.sopt.now
 
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.sopt.now.databinding.FragmentHomeBinding
 
 class HomeFragment : Fragment() {
-    private val binding:FragmentHomeBinding
-        get()= requireNotNull(_binding){"_binding이 null이 아닌 경우만 _binding 반환"}
-    private var _binding: FragmentHomeBinding ?= null
+    private val binding: FragmentHomeBinding
+        get() = requireNotNull(_binding) { "_binding이 null이 아닌 경우만 _binding 반환" }
+    private var _binding: FragmentHomeBinding? = null
     private val viewModel by viewModels<HomeViewModel>()
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        _binding = FragmentHomeBinding.inflate(inflater,container,false)
+        _binding = FragmentHomeBinding.inflate(inflater, container, false)
         return binding.root
     }
 
@@ -37,5 +37,4 @@ class HomeFragment : Fragment() {
         super.onDestroyView()
         _binding = null
     }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/LoginActivity.kt b/app/src/main/java/com/sopt/now/LoginActivity.kt
index 769464b..0b1035d 100644
--- a/app/src/main/java/com/sopt/now/LoginActivity.kt
+++ b/app/src/main/java/com/sopt/now/LoginActivity.kt
@@ -3,78 +3,129 @@ package com.sopt.now
 import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
+import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import com.sopt.now.databinding.ActivityLoginBinding
 
 class LoginActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityLoginBinding
-    private lateinit var resultLauncher: ActivityResultLauncher<Intent>
+
+    private val binding by lazy { ActivityLoginBinding.inflate(layoutInflater) }
+    private val viewModel by viewModels<LoginViewModel>()
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivityLoginBinding.inflate(layoutInflater)
         setContentView(binding.root)
-
-        getUserInfo()
-
+        initViews()
+        initObserver()
         moveToSignUp()
     }
-    private fun getUserInfo() {
-        var id = ""
-        var pw = ""
-        var nick = ""
-        resultLauncher = registerForActivityResult(
-            ActivityResultContracts.StartActivityForResult()
-        ) { result ->
-            if (result.resultCode == RESULT_OK) {
-                result.data?.let { data ->
-                    id = data.getStringExtra("id") ?: ""
-                    pw = data.getStringExtra("pw") ?: ""
-                    nick = data.getStringExtra("nick") ?: ""
-                }
-            }
-        }
+
+    private fun initViews() {
         binding.btnLogin.setOnClickListener {
-            moveToMain(id,pw,nick)
-        }
-    }
-    private fun moveToSignUp(){
-        binding.btnLoginSignIn.setOnClickListener {
-            val intent = Intent(this, SignUpActivity::class.java)
-            resultLauncher.launch(intent)
+            viewModel.login(getLoginRequestDto())
         }
     }
-    private fun moveToMain(id:String,pw:String,nick:String){
-        if (isLoginAvailable(id, pw)) {
-            val intent = Intent(this, MainActivity::class.java).apply {
-                saveUserInfo(id, pw, nick)
+
+    private fun initObserver() {
+        viewModel.liveData.observe(this) { LoginState ->
+            if (LoginState.isSuccess) {
+                val intent = Intent(this, MainActivity::class.java)
+                intent.putExtra("userId", viewModel.userId )
+                startActivity(intent)
+            } else {
+                Toast.makeText(
+                    this@LoginActivity,
+                    LoginState.message,
+                    Toast.LENGTH_SHORT,
+                ).show()
             }
-            startActivity(intent)
         }
     }
-    private fun saveUserInfo(id:String,pw:String,nick:String) {
-        val sharedPreferences = getSharedPreferences("userInfo", MODE_PRIVATE)
-        val editor = sharedPreferences.edit()
-        editor
-            .putString("userId", id)
-            .putString("userPw", pw)
-            .putString("userNick", nick)
-            .apply()
+
+    private fun getLoginRequestDto(): RequestLoginDto {
+        val id = binding.etvLoginId.text.toString()
+        val password = binding.etvLoginPw.text.toString()
+        return RequestLoginDto(
+            authenticationId = id,
+            password = password
+        )
     }
-    private fun isLoginAvailable(id: String, pw: String) :Boolean {
-        var loginBool = false
-        val userId = binding.etvLoginId.text.toString()
-        val userPw = binding.etvLoginPw.text.toString()
-        val message = when{
-            userId.isBlank() || userPw.isBlank() -> getString(R.string.login_error_blank)
-            userId != id || userPw != pw -> getString(R.string.login_error_different)
-            else -> {
-                loginBool = true
-                getString(R.string.login_success)
-            }
+
+    private fun moveToSignUp() {
+        binding.btnLoginSignIn.setOnClickListener {
+            val intent = Intent(this, SignUpActivity::class.java)
+            startActivity(intent)
         }
-        Toast.makeText(this,message,Toast.LENGTH_SHORT).show()
-        return loginBool
     }
 }
+/**
+class LoginActivity : AppCompatActivity() {
+private lateinit var binding: ActivityLoginBinding
+private lateinit var resultLauncher: ActivityResultLauncher<Intent>
+override fun onCreate(savedInstanceState: Bundle?) {
+super.onCreate(savedInstanceState)
+binding = ActivityLoginBinding.inflate(layoutInflater)
+setContentView(binding.root)
+
+getUserInfo()
+
+moveToSignUp()
+}
+private fun getUserInfo() {
+var id = ""
+var pw = ""
+var nick = ""
+resultLauncher = registerForActivityResult(
+ActivityResultContracts.StartActivityForResult()
+) { result ->
+if (result.resultCode == RESULT_OK) {
+result.data?.let { data ->
+id = data.getStringExtra("id") ?: ""
+pw = data.getStringExtra("pw") ?: ""
+nick = data.getStringExtra("nick") ?: ""
+}
+}
+}
+binding.btnLogin.setOnClickListener {
+moveToMain(id,pw,nick)
+}
+}
+private fun moveToSignUp(){
+binding.btnLoginSignIn.setOnClickListener {
+val intent = Intent(this, SignUpActivity::class.java)
+resultLauncher.launch(intent)
+}
+}
+private fun moveToMain(id:String,pw:String,nick:String){
+if (isLoginAvailable(id, pw)) {
+val intent = Intent(this, MainActivity::class.java).apply {
+saveUserInfo(id, pw, nick)
+}
+startActivity(intent)
+}
+}
+private fun saveUserInfo(id:String,pw:String,nick:String) {
+val sharedPreferences = getSharedPreferences("userInfo", MODE_PRIVATE)
+val editor = sharedPreferences.edit()
+editor
+.putString("userId", id)
+.putString("userPw", pw)
+.putString("userNick", nick)
+.apply()
+}
+private fun isLoginAvailable(id: String, pw: String) :Boolean {
+var loginBool = false
+val userId = binding.etvLoginId.text.toString()
+val userPw = binding.etvLoginPw.text.toString()
+val message = when{
+userId.isBlank() || userPw.isBlank() -> getString(R.string.login_error_blank)
+userId != id || userPw != pw -> getString(R.string.login_error_different)
+else -> {
+loginBool = true
+getString(R.string.login_success)
+}
+}
+Toast.makeText(this,message,Toast.LENGTH_SHORT).show()
+return loginBool
+}
+}
+ */
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/LoginViewModel.kt b/app/src/main/java/com/sopt/now/LoginViewModel.kt
new file mode 100644
index 0000000..251be39
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/LoginViewModel.kt
@@ -0,0 +1,51 @@
+package com.sopt.now
+
+import android.util.Log
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+
+data class LoginState(
+    val isSuccess: Boolean,
+    val message: String
+)
+
+class LoginViewModel : ViewModel() {
+    private val authService by lazy { ServicePool.authService }
+    val liveData = MutableLiveData<LoginState>()
+    var userId : String?= ""
+    fun login(request: RequestLoginDto) {
+        authService.login(request).enqueue(object : Callback<ResponseLoginDto> {
+            override fun onResponse(
+                call: Call<ResponseLoginDto>,
+                response: Response<ResponseLoginDto>,
+            ) {
+                if (response.isSuccessful) {
+                    val data: ResponseLoginDto? = response.body()
+                    userId = response.headers()["location"]
+                    liveData.value = LoginState(
+                        isSuccess = true,
+                        message = "로그인 성공 유저의 ID는 $userId 입니다"
+                    )
+                    Log.d("Login", "data: $data, userId: $userId")
+                } else {
+                    val error = response.message()
+                    liveData.value = LoginState(
+                        isSuccess = false,
+                        message = "로그인이 실패했습니다 $error"
+                    )
+                }
+            }
+
+            override fun onFailure(call: Call<ResponseLoginDto>, t: Throwable) {
+                liveData.value = LoginState(
+                    isSuccess = false,
+                    message = "서버에러"
+                )
+            }
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/MyPageFragment.kt b/app/src/main/java/com/sopt/now/MyPageFragment.kt
index 3db5ae2..84b9f5b 100644
--- a/app/src/main/java/com/sopt/now/MyPageFragment.kt
+++ b/app/src/main/java/com/sopt/now/MyPageFragment.kt
@@ -1,38 +1,58 @@
 package com.sopt.now
 
-import android.content.Context
 import android.os.Bundle
 import android.util.Log
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.sopt.now.databinding.FragmentHomeBinding
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
 import com.sopt.now.databinding.FragmentMyPageBinding
 
 class MyPageFragment : Fragment() {
     private val binding: FragmentMyPageBinding
-        get()= requireNotNull(_binding){"_binding이 null이 아닌 경우만 _binding 반환"}
-    private var _binding: FragmentMyPageBinding?= null
+        get() = requireNotNull(_binding) { "_binding이 null이 아닌 경우만 _binding 반환" }
+    private var _binding: FragmentMyPageBinding? = null
+    private val viewModel by viewModels<UserInfoViewModel>()
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        _binding = FragmentMyPageBinding.inflate(inflater,container,false)
-        getUserInfo()
+        _binding = FragmentMyPageBinding.inflate(inflater, container, false)
+        initViews()
+        initObserver()
         return binding.root
     }
 
-    private fun getUserInfo() {
-        val userInfo = activity?.getSharedPreferences("userInfo", Context.MODE_PRIVATE)
-        binding.tvMainNick.text = userInfo?.getString("userNick", "")
-        binding.tvMainId.text = userInfo?.getString("userId", "")
-        binding.tvMainPw.text = userInfo?.getString("userPw", "")
-    }
-
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
     }
-}
\ No newline at end of file
+
+    private fun initObserver() {
+        viewModel.liveData.observe(viewLifecycleOwner) { userInfoState ->
+            if (userInfoState.isSuccess) {
+                binding.tvMainNick.text=userInfoState.userNick
+                binding.tvMainId.text=userInfoState.userId
+                binding.tvMainPhone.text=userInfoState.userPhone
+            } else {
+                Toast.makeText(
+                    activity,
+                    userInfoState.message,
+                    Toast.LENGTH_SHORT,
+                ).show()
+            }
+        }
+    }
+
+    private fun initViews() {
+        val userId = requireActivity().intent.getStringExtra("userId")
+        Log.d("UserInfo", "userId: $userId")
+
+        if (userId != null) {
+            viewModel.userInfo(userId.toInt())
+        }
+    }
+}
diff --git a/app/src/main/java/com/sopt/now/RequestLoginDto.kt b/app/src/main/java/com/sopt/now/RequestLoginDto.kt
new file mode 100644
index 0000000..c7ecc52
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/RequestLoginDto.kt
@@ -0,0 +1,12 @@
+package com.sopt.now
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RequestLoginDto(
+    @SerialName("authenticationId")
+    val authenticationId: String,
+    @SerialName("password")
+    val password: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/ResponseLoginDto.kt b/app/src/main/java/com/sopt/now/ResponseLoginDto.kt
new file mode 100644
index 0000000..8bb28b7
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/ResponseLoginDto.kt
@@ -0,0 +1,12 @@
+package com.sopt.now
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseLoginDto (
+    @SerialName("code")
+    val code: Int,
+    @SerialName("message")
+    val message: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/ResponseUserInfoDto.kt b/app/src/main/java/com/sopt/now/ResponseUserInfoDto.kt
new file mode 100644
index 0000000..fb4a8b1
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/ResponseUserInfoDto.kt
@@ -0,0 +1,23 @@
+package com.sopt.now
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseUserInfoDto (
+    @SerialName("code")
+    val code: Int,
+    @SerialName("message")
+    val message: String,
+    @SerialName("data")
+    val data : UserInfo
+)
+@Serializable
+data class UserInfo (
+    @SerialName("authenticationId")
+    val authenticationId: String,
+    @SerialName("nickname")
+    val nickname: String,
+    @SerialName("phone")
+    val phone: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/SignUpActivity.kt b/app/src/main/java/com/sopt/now/SignUpActivity.kt
index 3178424..98de8e1 100644
--- a/app/src/main/java/com/sopt/now/SignUpActivity.kt
+++ b/app/src/main/java/com/sopt/now/SignUpActivity.kt
@@ -3,7 +3,10 @@ package com.sopt.now
 import android.os.Bundle
 import android.util.Log
 import android.widget.Toast
+import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
 import com.sopt.now.databinding.ActivitySignUpBinding
 import retrofit2.Call
 import retrofit2.Callback
@@ -12,22 +15,55 @@ import retrofit2.Response
 class SignUpActivity : AppCompatActivity() {
 
     private val binding by lazy { ActivitySignUpBinding.inflate(layoutInflater) }
-    private val authService by lazy { ServicePool.authService }
+    private val viewModel by viewModels<SignUpViewModel>()
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
         initViews()
+        initObserver()
     }
 
     private fun initViews() {
         binding.btnSignUp.setOnClickListener {
-            signUp()
+            viewModel.signUp(getSignUpRequestDto())
         }
     }
 
-    private fun signUp() {
-        val signUpRequest = getSignUpRequestDto()
-        authService.signUp(signUpRequest).enqueue(object : Callback<ResponseSignUpDto> {
+    private fun initObserver() {
+        viewModel.liveData.observe(this) {
+            Toast.makeText(
+                this@SignUpActivity,
+                it.message,
+                Toast.LENGTH_SHORT,
+            ).show()
+        }
+    }
+
+    private fun getSignUpRequestDto(): RequestSignUpDto {
+        val id = binding.etvSignUpId.text.toString()
+        val password = binding.etvSignUpPw.text.toString()
+        val nickname = binding.etvSignUpNick.text.toString()
+        val phoneNumber = binding.etvSignUpPhone.text.toString()
+        return RequestSignUpDto(
+            authenticationId = id,
+            password = password,
+            nickname = nickname,
+            phone = phoneNumber
+        )
+    }
+}
+
+data class SignUpState(
+    val isSuccess: Boolean,
+    val message: String
+)
+
+class SignUpViewModel : ViewModel() {
+    private val authService by lazy { ServicePool.authService }
+    val liveData = MutableLiveData<SignUpState>()
+
+    fun signUp(request: RequestSignUpDto) {
+        authService.signUp(request).enqueue(object : Callback<ResponseSignUpDto> {
             override fun onResponse(
                 call: Call<ResponseSignUpDto>,
                 response: Response<ResponseSignUpDto>,
@@ -35,40 +71,28 @@ class SignUpActivity : AppCompatActivity() {
                 if (response.isSuccessful) {
                     val data: ResponseSignUpDto? = response.body()
                     val userId = response.headers()["location"]
-                    Toast.makeText(
-                        this@SignUpActivity,
-                        "회원가입 성공 userID는 $userId 입니다",
-                        Toast.LENGTH_SHORT,
-                    ).show()
+                    liveData.value = SignUpState(
+                        isSuccess = true,
+                        message = "회원가입 성공 유저의 ID는 $userId 입니다"
+                    )
                     Log.d("SignUp", "data: $data, userId: $userId")
                 } else {
                     val error = response.message()
-                    Toast.makeText(
-                        this@SignUpActivity,
-                        "회원가입에 실패했습니다.$error",
-                        Toast.LENGTH_SHORT,
-                    ).show()
+                    liveData.value = SignUpState(
+                        isSuccess = false,
+                        message = "회원가입이 실패했습니다 $error"
+                    )
                 }
             }
 
             override fun onFailure(call: Call<ResponseSignUpDto>, t: Throwable) {
-                Toast.makeText(this@SignUpActivity, "서버 에러 발생 ", Toast.LENGTH_SHORT).show()
+                liveData.value = SignUpState(
+                    isSuccess = false,
+                    message = "서버에러"
+                )
             }
         })
     }
-
-    private fun getSignUpRequestDto(): RequestSignUpDto {
-        val id = binding.etvSignUpId.text.toString()
-        val password = binding.etvSignUpPw.text.toString()
-        val nickname = binding.etvSignUpNick.text.toString()
-        val phoneNumber = binding.etvSignUpPhone.text.toString()
-        return RequestSignUpDto(
-            authenticationId = id,
-            password = password,
-            nickname = nickname,
-            phone = phoneNumber
-        )
-    }
 }
 /**
 class SignUpActivity : AppCompatActivity() {
diff --git a/app/src/main/java/com/sopt/now/UserInfoViewModel.kt b/app/src/main/java/com/sopt/now/UserInfoViewModel.kt
new file mode 100644
index 0000000..26c8601
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/UserInfoViewModel.kt
@@ -0,0 +1,56 @@
+package com.sopt.now
+
+import android.util.Log
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+
+data class UserInfoState(
+    val isSuccess: Boolean,
+    val message: String,
+    val userId : String? = "",
+    val userNick : String? = "",
+    val userPhone : String? = ""
+)
+
+class UserInfoViewModel : ViewModel() {
+    private val userService by lazy { ServicePool.userService }
+    val liveData = MutableLiveData<UserInfoState>()
+
+    fun userInfo(userId:Int) {
+        userService.userInfo(userId).enqueue(object : Callback<ResponseUserInfoDto> {
+            override fun onResponse(
+                call: Call<ResponseUserInfoDto>,
+                response: Response<ResponseUserInfoDto>,
+            ) {
+                if (response.isSuccessful) {
+                    val data: ResponseUserInfoDto? = response.body()
+                    liveData.value = UserInfoState(
+                        isSuccess = true,
+                        message = "회원 정보 불러오기에 성공했습니다.",
+                        userId = data?.data?.authenticationId,
+                        userNick = data?.data?.nickname,
+                        userPhone = data?.data?.phone
+                    )
+                    Log.d("UserInfo", "data: $data, userId: $userId")
+                } else {
+                    val error = response.message()
+                    liveData.value = UserInfoState(
+                        isSuccess = false,
+                        message = "회원 정보 불러오기에 실패했습니다.  $error"
+                    )
+                }
+            }
+
+            override fun onFailure(call: Call<ResponseUserInfoDto>, t: Throwable) {
+                liveData.value = UserInfoState(
+                    isSuccess = false,
+                    message = "서버에러"
+                )
+            }
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/UserService.kt b/app/src/main/java/com/sopt/now/UserService.kt
new file mode 100644
index 0000000..79279b4
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/UserService.kt
@@ -0,0 +1,12 @@
+package com.sopt.now
+
+import retrofit2.Call
+import retrofit2.http.GET
+import retrofit2.http.Header
+
+interface UserService {
+    @GET("/member/info")
+    fun userInfo(
+        @Header("memberId") userId : Int
+    ) : Call<ResponseUserInfoDto>
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml
index acce929..0e95769 100644
--- a/app/src/main/res/layout/activity_sign_up.xml
+++ b/app/src/main/res/layout/activity_sign_up.xml
@@ -114,7 +114,7 @@
         android:id="@+id/tv_sign_up_phone"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/etc"
+        android:text="@string/phone"
         android:textStyle="bold"
         android:textSize="20sp"
         android:layout_marginHorizontal="30dp"
diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml
index a323054..e24f48e 100644
--- a/app/src/main/res/layout/fragment_my_page.xml
+++ b/app/src/main/res/layout/fragment_my_page.xml
@@ -52,11 +52,11 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_main_title_id" />
     <TextView
-        android:id="@+id/tv_main_title_pw"
+        android:id="@+id/tv_main_title_phone"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:text="@string/pw"
+        android:text="@string/phone"
         android:textColor="#000000"
         android:textSize="25sp"
         android:textAlignment="center"
@@ -64,7 +64,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_main_id" />
     <TextView
-        android:id="@+id/tv_main_pw"
+        android:id="@+id/tv_main_phone"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:textColor="#000000"
@@ -72,6 +72,6 @@
         android:textAlignment="center"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_main_title_pw" />
+        app:layout_constraintTop_toBottomOf="@id/tv_main_title_phone" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e25f865..b4ab54e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -35,4 +35,5 @@
     <string name="sign_up_error_etc">하고싶은 말을 다시 설정하세요.</string>
     <string name="sign_up_phone_text">*(-)하이픈을 포함해 입력해주세요.</string>
     <string name="sign_up_phone_hint">예시)010-0000-0000</string>
+    <string name="phone">전화번호</string>
 </resources>
\ No newline at end of file

From fbc314a17913c5c146ceaa0010f1bd1268070641 Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Fri, 3 May 2024 13:39:52 +0900
Subject: [PATCH 05/36] =?UTF-8?q?feat#10/:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8?=
 =?UTF-8?q?=20=EC=84=B1=EA=B3=B5=EC=8B=9C=20=ED=86=A0=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EB=A9=94=EC=84=B8=EC=A7=80=EC=97=90=20userID=20=EC=B6=9C?=
 =?UTF-8?q?=EB=A0=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/sopt/now/LoginActivity.kt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/com/sopt/now/LoginActivity.kt b/app/src/main/java/com/sopt/now/LoginActivity.kt
index 0b1035d..cac4b35 100644
--- a/app/src/main/java/com/sopt/now/LoginActivity.kt
+++ b/app/src/main/java/com/sopt/now/LoginActivity.kt
@@ -28,6 +28,11 @@ class LoginActivity : AppCompatActivity() {
     private fun initObserver() {
         viewModel.liveData.observe(this) { LoginState ->
             if (LoginState.isSuccess) {
+                Toast.makeText(
+                    this@LoginActivity,
+                    LoginState.message,
+                    Toast.LENGTH_SHORT,
+                ).show()
                 val intent = Intent(this, MainActivity::class.java)
                 intent.putExtra("userId", viewModel.userId )
                 startActivity(intent)

From e02e46a622613c3acccec753e144d0e8baa75c84 Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Fri, 3 May 2024 13:48:09 +0900
Subject: [PATCH 06/36] add#10/: followerList DTO

---
 .../java/com/sopt/now/ResponseFollowerDto.kt  | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 app/src/main/java/com/sopt/now/ResponseFollowerDto.kt

diff --git a/app/src/main/java/com/sopt/now/ResponseFollowerDto.kt b/app/src/main/java/com/sopt/now/ResponseFollowerDto.kt
new file mode 100644
index 0000000..d1b2b18
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/ResponseFollowerDto.kt
@@ -0,0 +1,40 @@
+package com.sopt.now
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseFollowerDto(
+    @SerialName("data")
+    val data: List<Data>,
+    @SerialName("page")
+    val page: Int,
+    @SerialName("per_page")
+    val perPage: Int,
+    @SerialName("support")
+    val support: Support,
+    @SerialName("total")
+    val total: Int,
+    @SerialName("total_pages")
+    val totalPages: Int
+)
+@Serializable
+data class Data(
+    @SerialName("avatar")
+    val avatar: String,
+    @SerialName("email")
+    val email: String,
+    @SerialName("first_name")
+    val firstName: String,
+    @SerialName("id")
+    val id: Int,
+    @SerialName("last_name")
+    val lastName: String
+)
+@Serializable
+data class Support(
+    @SerialName("text")
+    val text: String,
+    @SerialName("url")
+    val url: String
+)
\ No newline at end of file

From 287ffa89d8d2fa64c273e5a884987667edeb141d Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Fri, 3 May 2024 14:14:45 +0900
Subject: [PATCH 07/36] add#10/: follower service

---
 app/src/main/java/com/sopt/now/ApiFactory.kt  |  1 +
 .../java/com/sopt/now/FollowerViewModel.kt    | 48 +++++++++++++++++++
 .../main/java/com/sopt/now/FollwerService.kt  | 12 +++++
 3 files changed, 61 insertions(+)
 create mode 100644 app/src/main/java/com/sopt/now/FollowerViewModel.kt
 create mode 100644 app/src/main/java/com/sopt/now/FollwerService.kt

diff --git a/app/src/main/java/com/sopt/now/ApiFactory.kt b/app/src/main/java/com/sopt/now/ApiFactory.kt
index 3dfd3d8..b5629d0 100644
--- a/app/src/main/java/com/sopt/now/ApiFactory.kt
+++ b/app/src/main/java/com/sopt/now/ApiFactory.kt
@@ -21,4 +21,5 @@ object ApiFactory {
 object ServicePool {
     val authService = ApiFactory.create<AuthService>()
     val userService = ApiFactory.create<UserService>()
+    val followerService = ApiFactory.create<FollwerService>()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/FollowerViewModel.kt b/app/src/main/java/com/sopt/now/FollowerViewModel.kt
new file mode 100644
index 0000000..0f5f716
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/FollowerViewModel.kt
@@ -0,0 +1,48 @@
+package com.sopt.now
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+
+data class FollowerState(
+    val isSuccess: Boolean,
+    val message: String
+)
+
+class FollowerViewModel : ViewModel() {
+    private val followerService by lazy { ServicePool.followerService }
+    val liveData = MutableLiveData<FollowerState>()
+
+    fun followerInfo(page:Int) {
+        followerService.followerInfo(page).enqueue(object : Callback<ResponseFollowerDto> {
+            override fun onResponse(
+                call: Call<ResponseFollowerDto>,
+                response: Response<ResponseFollowerDto>,
+            ) {
+                if (response.isSuccessful) {
+                    val data: ResponseFollowerDto? = response.body()
+                    liveData.value = FollowerState(
+                        isSuccess = true,
+                        message = "팔로워 정보 불러오기에 성공했습니다.",
+                    )
+                } else {
+                    val error = response.message()
+                    liveData.value = FollowerState(
+                        isSuccess = false,
+                        message = "팔로워 정보 불러오기에 실패했습니다.  $error"
+                    )
+                }
+            }
+
+            override fun onFailure(call: Call<ResponseFollowerDto>, t: Throwable) {
+                liveData.value = FollowerState(
+                    isSuccess = false,
+                    message = "서버에러"
+                )
+            }
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/FollwerService.kt b/app/src/main/java/com/sopt/now/FollwerService.kt
new file mode 100644
index 0000000..ee2d2ab
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/FollwerService.kt
@@ -0,0 +1,12 @@
+package com.sopt.now
+
+import retrofit2.Call
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+interface FollwerService {
+    @GET("/api/users")
+    fun followerInfo(
+       @Query ("page") page : Int
+    ) : Call<ResponseFollowerDto>
+}
\ No newline at end of file

From d9f19fa0dd6003df9108af670112fde35b1a1aef Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Fri, 3 May 2024 14:22:24 +0900
Subject: [PATCH 08/36] =?UTF-8?q?feat#10/:=20userId=20=ED=86=A0=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EB=A9=94=EC=84=B8=EC=A7=80=20=EC=B6=9C=EB=A0=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/sopt/now/SignUpActivity.kt  | 59 +++----------------
 .../main/java/com/sopt/now/SignUpViewModel.kt | 51 ++++++++++++++++
 2 files changed, 59 insertions(+), 51 deletions(-)
 create mode 100644 app/src/main/java/com/sopt/now/SignUpViewModel.kt

diff --git a/app/src/main/java/com/sopt/now/SignUpActivity.kt b/app/src/main/java/com/sopt/now/SignUpActivity.kt
index 98de8e1..570c660 100644
--- a/app/src/main/java/com/sopt/now/SignUpActivity.kt
+++ b/app/src/main/java/com/sopt/now/SignUpActivity.kt
@@ -1,16 +1,10 @@
 package com.sopt.now
 
 import android.os.Bundle
-import android.util.Log
 import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
 import com.sopt.now.databinding.ActivitySignUpBinding
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
 
 class SignUpActivity : AppCompatActivity() {
 
@@ -30,15 +24,20 @@ class SignUpActivity : AppCompatActivity() {
     }
 
     private fun initObserver() {
-        viewModel.liveData.observe(this) {
+        viewModel.liveData.observe(this) { signUpState ->
             Toast.makeText(
                 this@SignUpActivity,
-                it.message,
-                Toast.LENGTH_SHORT,
+                signUpState.message,
+                Toast.LENGTH_SHORT
             ).show()
+
+            if (signUpState.isSuccess) {
+                finish()
+            }
         }
     }
 
+
     private fun getSignUpRequestDto(): RequestSignUpDto {
         val id = binding.etvSignUpId.text.toString()
         val password = binding.etvSignUpPw.text.toString()
@@ -52,48 +51,6 @@ class SignUpActivity : AppCompatActivity() {
         )
     }
 }
-
-data class SignUpState(
-    val isSuccess: Boolean,
-    val message: String
-)
-
-class SignUpViewModel : ViewModel() {
-    private val authService by lazy { ServicePool.authService }
-    val liveData = MutableLiveData<SignUpState>()
-
-    fun signUp(request: RequestSignUpDto) {
-        authService.signUp(request).enqueue(object : Callback<ResponseSignUpDto> {
-            override fun onResponse(
-                call: Call<ResponseSignUpDto>,
-                response: Response<ResponseSignUpDto>,
-            ) {
-                if (response.isSuccessful) {
-                    val data: ResponseSignUpDto? = response.body()
-                    val userId = response.headers()["location"]
-                    liveData.value = SignUpState(
-                        isSuccess = true,
-                        message = "회원가입 성공 유저의 ID는 $userId 입니다"
-                    )
-                    Log.d("SignUp", "data: $data, userId: $userId")
-                } else {
-                    val error = response.message()
-                    liveData.value = SignUpState(
-                        isSuccess = false,
-                        message = "회원가입이 실패했습니다 $error"
-                    )
-                }
-            }
-
-            override fun onFailure(call: Call<ResponseSignUpDto>, t: Throwable) {
-                liveData.value = SignUpState(
-                    isSuccess = false,
-                    message = "서버에러"
-                )
-            }
-        })
-    }
-}
 /**
 class SignUpActivity : AppCompatActivity() {
     private lateinit var binding: ActivitySignUpBinding
diff --git a/app/src/main/java/com/sopt/now/SignUpViewModel.kt b/app/src/main/java/com/sopt/now/SignUpViewModel.kt
new file mode 100644
index 0000000..7187e90
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/SignUpViewModel.kt
@@ -0,0 +1,51 @@
+package com.sopt.now
+
+import android.util.Log
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+
+data class SignUpState(
+    val isSuccess: Boolean,
+    val message: String
+)
+
+class SignUpViewModel : ViewModel() {
+    private val authService by lazy { ServicePool.authService }
+    val liveData = MutableLiveData<SignUpState>()
+
+    fun signUp(request: RequestSignUpDto) {
+        authService.signUp(request).enqueue(object : Callback<ResponseSignUpDto> {
+            override fun onResponse(
+                call: Call<ResponseSignUpDto>,
+                response: Response<ResponseSignUpDto>,
+            ) {
+                if (response.isSuccessful) {
+                    val data: ResponseSignUpDto? = response.body()
+                    val userId = response.headers()["location"]
+                    liveData.value = SignUpState(
+                        isSuccess = true,
+                        message = "회원가입 성공 유저의 ID는 $userId 입니다"
+                    )
+                    Log.d("SignUp", "data: $data, userId: $userId")
+                } else {
+                    val error = response.message()
+                    liveData.value = SignUpState(
+                        isSuccess = false,
+                        message = "회원가입이 실패했습니다 $error"
+                    )
+                }
+            }
+
+            override fun onFailure(call: Call<ResponseSignUpDto>, t: Throwable) {
+                liveData.value = SignUpState(
+                    isSuccess = false,
+                    message = "서버에러"
+                )
+            }
+        })
+    }
+}
\ No newline at end of file

From 4063f4402c4f5bf1f3dfe35d9761c76cf9ec5505 Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Fri, 3 May 2024 14:24:50 +0900
Subject: [PATCH 09/36] =?UTF-8?q?mod#10/:=20initObserver=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/sopt/now/LoginActivity.kt   | 22 +++++++------------
 .../main/java/com/sopt/now/MyPageFragment.kt  | 11 +++++-----
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/sopt/now/LoginActivity.kt b/app/src/main/java/com/sopt/now/LoginActivity.kt
index cac4b35..8c433cf 100644
--- a/app/src/main/java/com/sopt/now/LoginActivity.kt
+++ b/app/src/main/java/com/sopt/now/LoginActivity.kt
@@ -26,22 +26,16 @@ class LoginActivity : AppCompatActivity() {
     }
 
     private fun initObserver() {
-        viewModel.liveData.observe(this) { LoginState ->
-            if (LoginState.isSuccess) {
-                Toast.makeText(
-                    this@LoginActivity,
-                    LoginState.message,
-                    Toast.LENGTH_SHORT,
-                ).show()
+        viewModel.liveData.observe(this) { loginState ->
+            Toast.makeText(
+                this@LoginActivity,
+                loginState.message,
+                Toast.LENGTH_SHORT,
+            ).show()
+            if (loginState.isSuccess) {
                 val intent = Intent(this, MainActivity::class.java)
-                intent.putExtra("userId", viewModel.userId )
+                intent.putExtra("userId", viewModel.userId)
                 startActivity(intent)
-            } else {
-                Toast.makeText(
-                    this@LoginActivity,
-                    LoginState.message,
-                    Toast.LENGTH_SHORT,
-                ).show()
             }
         }
     }
diff --git a/app/src/main/java/com/sopt/now/MyPageFragment.kt b/app/src/main/java/com/sopt/now/MyPageFragment.kt
index 84b9f5b..a6026b4 100644
--- a/app/src/main/java/com/sopt/now/MyPageFragment.kt
+++ b/app/src/main/java/com/sopt/now/MyPageFragment.kt
@@ -33,16 +33,15 @@ class MyPageFragment : Fragment() {
 
     private fun initObserver() {
         viewModel.liveData.observe(viewLifecycleOwner) { userInfoState ->
+            Toast.makeText(
+                activity,
+                userInfoState.message,
+                Toast.LENGTH_SHORT,
+            ).show()
             if (userInfoState.isSuccess) {
                 binding.tvMainNick.text=userInfoState.userNick
                 binding.tvMainId.text=userInfoState.userId
                 binding.tvMainPhone.text=userInfoState.userPhone
-            } else {
-                Toast.makeText(
-                    activity,
-                    userInfoState.message,
-                    Toast.LENGTH_SHORT,
-                ).show()
             }
         }
     }

From b6ff61a85aba4b39125d33ec150e1812a29ed9f3 Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Fri, 3 May 2024 22:07:19 +0900
Subject: [PATCH 10/36] =?UTF-8?q?feat#10/:=20=EC=9D=B8=ED=84=B0=EC=85=89?=
 =?UTF-8?q?=ED=84=B0=20=EC=84=B1=EA=B3=B5=20=EC=99=80=EC=95=84!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/sopt/now/ApiFactory.kt  | 33 +++++++-
 .../main/java/com/sopt/now/LoginActivity.kt   | 78 ++-----------------
 .../main/java/com/sopt/now/LoginViewModel.kt  |  4 +-
 .../main/java/com/sopt/now/MyPageFragment.kt  |  8 +-
 .../main/java/com/sopt/now/PreferenceUtil.kt  | 17 ++++
 .../java/com/sopt/now/UserInfoViewModel.kt    |  6 +-
 app/src/main/java/com/sopt/now/UserService.kt |  5 +-
 7 files changed, 60 insertions(+), 91 deletions(-)
 create mode 100644 app/src/main/java/com/sopt/now/PreferenceUtil.kt

diff --git a/app/src/main/java/com/sopt/now/ApiFactory.kt b/app/src/main/java/com/sopt/now/ApiFactory.kt
index b5629d0..e5e7ada 100644
--- a/app/src/main/java/com/sopt/now/ApiFactory.kt
+++ b/app/src/main/java/com/sopt/now/ApiFactory.kt
@@ -1,9 +1,14 @@
 package com.sopt.now
 
+import android.util.Log
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import kotlinx.serialization.json.Json
+import okhttp3.Interceptor
 import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.Response
 import retrofit2.Retrofit
+import java.io.IOException
 
 object ApiFactory {
     private const val BASE_URL: String = BuildConfig.AUTH_BASE_URL
@@ -15,11 +20,35 @@ object ApiFactory {
             .build()
     }
 
+    val userRetrofit: Retrofit by lazy {
+        Retrofit.Builder()
+            .baseUrl(BASE_URL)
+            .client(provideOkHttpClient(HeaderInterceptor()))
+            .addConverterFactory(Json.asConverterFactory("application/json".toMediaType()))
+            .build()
+    }
+    private fun provideOkHttpClient(interceptor: HeaderInterceptor): OkHttpClient
+            = OkHttpClient.Builder().run {
+        addInterceptor(interceptor)
+        build()
+    }
+    class HeaderInterceptor : Interceptor {
+        @Throws(IOException::class)
+        override fun intercept(chain: Interceptor.Chain): Response = with(chain) {
+            val accessToken = LoginActivity.prefs.getString("userId", "")
+            Log.d("Login", accessToken)
+            val newRequest = request().newBuilder()
+                .addHeader("memberId", accessToken)
+                .build()
+            proceed(newRequest)
+        }
+    }
     inline fun <reified T> create(): T = retrofit.create(T::class.java)
+    inline fun <reified T> createUser(): T = userRetrofit.create(T::class.java)
 }
 
 object ServicePool {
     val authService = ApiFactory.create<AuthService>()
-    val userService = ApiFactory.create<UserService>()
+    val userService = ApiFactory.createUser<UserService>()
     val followerService = ApiFactory.create<FollwerService>()
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/sopt/now/LoginActivity.kt b/app/src/main/java/com/sopt/now/LoginActivity.kt
index 8c433cf..2c8b314 100644
--- a/app/src/main/java/com/sopt/now/LoginActivity.kt
+++ b/app/src/main/java/com/sopt/now/LoginActivity.kt
@@ -14,6 +14,7 @@ class LoginActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
+        prefs = PreferenceUtil(applicationContext)
         initViews()
         initObserver()
         moveToSignUp()
@@ -34,7 +35,6 @@ class LoginActivity : AppCompatActivity() {
             ).show()
             if (loginState.isSuccess) {
                 val intent = Intent(this, MainActivity::class.java)
-                intent.putExtra("userId", viewModel.userId)
                 startActivity(intent)
             }
         }
@@ -55,76 +55,8 @@ class LoginActivity : AppCompatActivity() {
             startActivity(intent)
         }
     }
-}
-/**
-class LoginActivity : AppCompatActivity() {
-private lateinit var binding: ActivityLoginBinding
-private lateinit var resultLauncher: ActivityResultLauncher<Intent>
-override fun onCreate(savedInstanceState: Bundle?) {
-super.onCreate(savedInstanceState)
-binding = ActivityLoginBinding.inflate(layoutInflater)
-setContentView(binding.root)
-
-getUserInfo()
 
-moveToSignUp()
-}
-private fun getUserInfo() {
-var id = ""
-var pw = ""
-var nick = ""
-resultLauncher = registerForActivityResult(
-ActivityResultContracts.StartActivityForResult()
-) { result ->
-if (result.resultCode == RESULT_OK) {
-result.data?.let { data ->
-id = data.getStringExtra("id") ?: ""
-pw = data.getStringExtra("pw") ?: ""
-nick = data.getStringExtra("nick") ?: ""
-}
-}
-}
-binding.btnLogin.setOnClickListener {
-moveToMain(id,pw,nick)
-}
-}
-private fun moveToSignUp(){
-binding.btnLoginSignIn.setOnClickListener {
-val intent = Intent(this, SignUpActivity::class.java)
-resultLauncher.launch(intent)
-}
-}
-private fun moveToMain(id:String,pw:String,nick:String){
-if (isLoginAvailable(id, pw)) {
-val intent = Intent(this, MainActivity::class.java).apply {
-saveUserInfo(id, pw, nick)
-}
-startActivity(intent)
-}
-}
-private fun saveUserInfo(id:String,pw:String,nick:String) {
-val sharedPreferences = getSharedPreferences("userInfo", MODE_PRIVATE)
-val editor = sharedPreferences.edit()
-editor
-.putString("userId", id)
-.putString("userPw", pw)
-.putString("userNick", nick)
-.apply()
-}
-private fun isLoginAvailable(id: String, pw: String) :Boolean {
-var loginBool = false
-val userId = binding.etvLoginId.text.toString()
-val userPw = binding.etvLoginPw.text.toString()
-val message = when{
-userId.isBlank() || userPw.isBlank() -> getString(R.string.login_error_blank)
-userId != id || userPw != pw -> getString(R.string.login_error_different)
-else -> {
-loginBool = true
-getString(R.string.login_success)
-}
-}
-Toast.makeText(this,message,Toast.LENGTH_SHORT).show()
-return loginBool
-}
-}
- */
\ No newline at end of file
+    companion object {
+        lateinit var prefs: PreferenceUtil
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/LoginViewModel.kt b/app/src/main/java/com/sopt/now/LoginViewModel.kt
index 251be39..01754c5 100644
--- a/app/src/main/java/com/sopt/now/LoginViewModel.kt
+++ b/app/src/main/java/com/sopt/now/LoginViewModel.kt
@@ -7,7 +7,6 @@ import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 
-
 data class LoginState(
     val isSuccess: Boolean,
     val message: String
@@ -16,7 +15,7 @@ data class LoginState(
 class LoginViewModel : ViewModel() {
     private val authService by lazy { ServicePool.authService }
     val liveData = MutableLiveData<LoginState>()
-    var userId : String?= ""
+    var userId: String? = ""
     fun login(request: RequestLoginDto) {
         authService.login(request).enqueue(object : Callback<ResponseLoginDto> {
             override fun onResponse(
@@ -26,6 +25,7 @@ class LoginViewModel : ViewModel() {
                 if (response.isSuccessful) {
                     val data: ResponseLoginDto? = response.body()
                     userId = response.headers()["location"]
+                    userId?.let { LoginActivity.prefs.setString("userId", it) }
                     liveData.value = LoginState(
                         isSuccess = true,
                         message = "로그인 성공 유저의 ID는 $userId 입니다"
diff --git a/app/src/main/java/com/sopt/now/MyPageFragment.kt b/app/src/main/java/com/sopt/now/MyPageFragment.kt
index a6026b4..a6f36f0 100644
--- a/app/src/main/java/com/sopt/now/MyPageFragment.kt
+++ b/app/src/main/java/com/sopt/now/MyPageFragment.kt
@@ -1,7 +1,6 @@
 package com.sopt.now
 
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -47,11 +46,6 @@ class MyPageFragment : Fragment() {
     }
 
     private fun initViews() {
-        val userId = requireActivity().intent.getStringExtra("userId")
-        Log.d("UserInfo", "userId: $userId")
-
-        if (userId != null) {
-            viewModel.userInfo(userId.toInt())
-        }
+            viewModel.userInfo()
     }
 }
diff --git a/app/src/main/java/com/sopt/now/PreferenceUtil.kt b/app/src/main/java/com/sopt/now/PreferenceUtil.kt
new file mode 100644
index 0000000..bac67cf
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/PreferenceUtil.kt
@@ -0,0 +1,17 @@
+package com.sopt.now
+
+import android.content.Context
+import android.content.SharedPreferences
+
+class PreferenceUtil(context: Context) {
+    private val prefs: SharedPreferences =
+        context.getSharedPreferences("userId", Context.MODE_PRIVATE)
+
+    fun getString(key: String, defValue: String): String {
+        return prefs.getString(key, defValue).toString()
+    }
+
+    fun setString(key: String, str: String) {
+        prefs.edit().putString(key, str).apply()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/UserInfoViewModel.kt b/app/src/main/java/com/sopt/now/UserInfoViewModel.kt
index 26c8601..86aebcb 100644
--- a/app/src/main/java/com/sopt/now/UserInfoViewModel.kt
+++ b/app/src/main/java/com/sopt/now/UserInfoViewModel.kt
@@ -20,8 +20,8 @@ class UserInfoViewModel : ViewModel() {
     private val userService by lazy { ServicePool.userService }
     val liveData = MutableLiveData<UserInfoState>()
 
-    fun userInfo(userId:Int) {
-        userService.userInfo(userId).enqueue(object : Callback<ResponseUserInfoDto> {
+    fun userInfo() {
+        userService.userInfo().enqueue(object : Callback<ResponseUserInfoDto> {
             override fun onResponse(
                 call: Call<ResponseUserInfoDto>,
                 response: Response<ResponseUserInfoDto>,
@@ -35,7 +35,7 @@ class UserInfoViewModel : ViewModel() {
                         userNick = data?.data?.nickname,
                         userPhone = data?.data?.phone
                     )
-                    Log.d("UserInfo", "data: $data, userId: $userId")
+                    Log.d("UserInfo", "data: $data")
                 } else {
                     val error = response.message()
                     liveData.value = UserInfoState(
diff --git a/app/src/main/java/com/sopt/now/UserService.kt b/app/src/main/java/com/sopt/now/UserService.kt
index 79279b4..935b787 100644
--- a/app/src/main/java/com/sopt/now/UserService.kt
+++ b/app/src/main/java/com/sopt/now/UserService.kt
@@ -2,11 +2,8 @@ package com.sopt.now
 
 import retrofit2.Call
 import retrofit2.http.GET
-import retrofit2.http.Header
 
 interface UserService {
     @GET("/member/info")
-    fun userInfo(
-        @Header("memberId") userId : Int
-    ) : Call<ResponseUserInfoDto>
+    fun userInfo() : Call<ResponseUserInfoDto>
 }
\ No newline at end of file

From 3c478a028c490cfdcbd190c5b6e77a748be22d4f Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Fri, 3 May 2024 22:16:20 +0900
Subject: [PATCH 11/36] =?UTF-8?q?del#10/:=20=EC=82=AC=EC=9A=A9=ED=95=98?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EC=BD=94=EB=93=9C=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/sopt/now/SignUpActivity.kt  | 59 +------------------
 1 file changed, 1 insertion(+), 58 deletions(-)

diff --git a/app/src/main/java/com/sopt/now/SignUpActivity.kt b/app/src/main/java/com/sopt/now/SignUpActivity.kt
index 570c660..056e8f7 100644
--- a/app/src/main/java/com/sopt/now/SignUpActivity.kt
+++ b/app/src/main/java/com/sopt/now/SignUpActivity.kt
@@ -50,61 +50,4 @@ class SignUpActivity : AppCompatActivity() {
             phone = phoneNumber
         )
     }
-}
-/**
-class SignUpActivity : AppCompatActivity() {
-    private lateinit var binding: ActivitySignUpBinding
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivitySignUpBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        getUserInfo()
-    }
-
-    private fun getUserInfo() {
-        binding.btnSignIn.setOnClickListener {
-            val id = binding.etvSignInId.text.toString()
-            val pw = binding.etvSignInPw.text.toString()
-            val nick = binding.etvSignInNick.text.toString()
-            val etc = binding.etvSignInEtc.text.toString()
-
-            sendUserInfo(id, pw, nick, etc)
-        }
-    }
-
-    private fun sendUserInfo(id: String, pw: String, nick: String, etc: String) {
-        if (isSignUpAvailable(id, pw, nick, etc)) {
-            val intent = Intent(this, LoginActivity::class.java)
-            intent.putExtra("id", id).putExtra("pw", pw).putExtra("nick", nick)
-            setResult(RESULT_OK, intent)
-            finish()
-        }
-    }
-
-    private fun isSignUpAvailable(id: String, pw: String, nick: String, etc: String): Boolean {
-        var signUpBool = false
-        val message = when {
-            id.isEmpty() || pw.isEmpty() || nick.isEmpty() || etc.isEmpty() -> getString(R.string.sign_up_error_blank)
-            id.length !in MIN_ID_LENGTH..MAX_ID_LENGTH -> getString(R.string.sign_up_error_id)
-            pw.length !in MIN_PW_LENGTH..MAX_PW_LENGTH -> getString(R.string.sign_up_error_pw)
-            nick.isBlank() || nick.length != nick.trim().length -> getString(R.string.sign_up_error_nick)
-            etc.length !in 1..Int.MAX_VALUE -> getString(R.string.sign_up_error_etc)
-            else -> {
-                signUpBool = true
-                getString(R.string.sign_up_success)
-            }
-        }
-        Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
-        return signUpBool
-    }
-
-    companion object {
-        const val MIN_ID_LENGTH = 6
-        const val MAX_ID_LENGTH = 10
-        const val MIN_PW_LENGTH = 8
-        const val MAX_PW_LENGTH = 12
-    }
-}
-        */
\ No newline at end of file
+}
\ No newline at end of file

From c2722275b219a7c733d6451f11c20ea59618c0b9 Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Fri, 3 May 2024 22:34:23 +0900
Subject: [PATCH 12/36] =?UTF-8?q?chore#10/:=20=ED=8C=A8=ED=82=A4=EC=A7=80?=
 =?UTF-8?q?=20=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD-1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                    |  6 +++---
 app/src/main/java/com/sopt/now/ApiFactory.kt        |  4 ++++
 .../remote/dto/request}/RequestChagePwDto.kt        |  2 +-
 .../remote/dto/request}/RequestLoginDto.kt          |  2 +-
 .../remote/dto/request}/RequestSignUpDto.kt         |  2 +-
 .../remote/dto/response}/ResponseChangePwDto.kt     |  2 +-
 .../remote/dto/response}/ResponseFollowerDto.kt     |  2 +-
 .../remote/dto/response}/ResponseLoginDto.kt        |  2 +-
 .../remote/dto/response}/ResponseSignUpDto.kt       |  2 +-
 .../remote/dto/response}/ResponseUserInfoDto.kt     |  2 +-
 .../now/{ => data/remote/service}/AuthService.kt    |  6 +++++-
 .../now/{ => data/remote/service}/FollwerService.kt |  3 ++-
 .../now/{ => data/remote/service}/UserService.kt    |  3 ++-
 .../{ => presentation/auth/login}/LoginActivity.kt  |  6 +++++-
 .../sopt/now/presentation/auth/login/LoginState.kt  |  6 ++++++
 .../{ => presentation/auth/login}/LoginViewModel.kt |  9 ++++-----
 .../auth/signup}/SignUpActivity.kt                  |  3 ++-
 .../now/presentation/auth/signup/SignUpState.kt     |  6 ++++++
 .../auth/signup}/SignUpViewModel.kt                 | 10 ++++------
 .../now/{ => presentation/main}/MainActivity.kt     |  6 +++++-
 .../now/presentation/main/home/FollowerState.kt     |  6 ++++++
 .../main/home}/FollowerViewModel.kt                 | 10 +++-------
 .../{ => presentation/main/home}/HomeFragment.kt    |  2 +-
 .../now/{ => presentation/main/home}/HomeList.kt    |  2 +-
 .../{ => presentation/main/home}/HomeListAdapter.kt |  2 +-
 .../main/home}/HomeListViewHolder.kt                |  2 +-
 .../{ => presentation/main/home}/HomeViewModel.kt   |  3 ++-
 .../main/mypage}/MyPageFragment.kt                  |  2 +-
 .../now/presentation/main/mypage/UserInfoState.kt   |  9 +++++++++
 .../main/mypage}/UserInfoViewModel.kt               | 13 +++----------
 .../main/search}/SearchFragment.kt                  |  4 ++--
 app/src/main/res/layout/activity_login.xml          |  2 +-
 app/src/main/res/layout/activity_main.xml           |  2 +-
 app/src/main/res/layout/activity_sign_up.xml        |  2 +-
 app/src/main/res/layout/fragment_home.xml           |  2 +-
 app/src/main/res/layout/fragment_my_page.xml        |  2 +-
 app/src/main/res/layout/fragment_search.xml         |  2 +-
 37 files changed, 92 insertions(+), 59 deletions(-)
 rename app/src/main/java/com/sopt/now/{ => data/remote/dto/request}/RequestChagePwDto.kt (86%)
 rename app/src/main/java/com/sopt/now/{ => data/remote/dto/request}/RequestLoginDto.kt (84%)
 rename app/src/main/java/com/sopt/now/{ => data/remote/dto/request}/RequestSignUpDto.kt (88%)
 rename app/src/main/java/com/sopt/now/{ => data/remote/dto/response}/ResponseChangePwDto.kt (78%)
 rename app/src/main/java/com/sopt/now/{ => data/remote/dto/response}/ResponseFollowerDto.kt (94%)
 rename app/src/main/java/com/sopt/now/{ => data/remote/dto/response}/ResponseLoginDto.kt (82%)
 rename app/src/main/java/com/sopt/now/{ => data/remote/dto/response}/ResponseSignUpDto.kt (82%)
 rename app/src/main/java/com/sopt/now/{ => data/remote/dto/response}/ResponseUserInfoDto.kt (91%)
 rename app/src/main/java/com/sopt/now/{ => data/remote/service}/AuthService.kt (56%)
 rename app/src/main/java/com/sopt/now/{ => data/remote/service}/FollwerService.kt (67%)
 rename app/src/main/java/com/sopt/now/{ => data/remote/service}/UserService.kt (58%)
 rename app/src/main/java/com/sopt/now/{ => presentation/auth/login}/LoginActivity.kt (87%)
 create mode 100644 app/src/main/java/com/sopt/now/presentation/auth/login/LoginState.kt
 rename app/src/main/java/com/sopt/now/{ => presentation/auth/login}/LoginViewModel.kt (89%)
 rename app/src/main/java/com/sopt/now/{ => presentation/auth/signup}/SignUpActivity.kt (93%)
 create mode 100644 app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpState.kt
 rename app/src/main/java/com/sopt/now/{ => presentation/auth/signup}/SignUpViewModel.kt (88%)
 rename app/src/main/java/com/sopt/now/{ => presentation/main}/MainActivity.kt (86%)
 create mode 100644 app/src/main/java/com/sopt/now/presentation/main/home/FollowerState.kt
 rename app/src/main/java/com/sopt/now/{ => presentation/main/home}/FollowerViewModel.kt (91%)
 rename app/src/main/java/com/sopt/now/{ => presentation/main/home}/HomeFragment.kt (96%)
 rename app/src/main/java/com/sopt/now/{ => presentation/main/home}/HomeList.kt (86%)
 rename app/src/main/java/com/sopt/now/{ => presentation/main/home}/HomeListAdapter.kt (97%)
 rename app/src/main/java/com/sopt/now/{ => presentation/main/home}/HomeListViewHolder.kt (95%)
 rename app/src/main/java/com/sopt/now/{ => presentation/main/home}/HomeViewModel.kt (97%)
 rename app/src/main/java/com/sopt/now/{ => presentation/main/mypage}/MyPageFragment.kt (97%)
 create mode 100644 app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoState.kt
 rename app/src/main/java/com/sopt/now/{ => presentation/main/mypage}/UserInfoViewModel.kt (89%)
 rename app/src/main/java/com/sopt/now/{ => presentation/main/search}/SearchFragment.kt (91%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8f9e8ed..dce4533 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,13 +14,13 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
-            android:name=".SignUpActivity"
+            android:name=".presentation.auth.signup.SignUpActivity"
             android:exported="false" />
         <activity
-            android:name=".MainActivity"
+            android:name=".presentation.main.MainActivity"
             android:exported="false" />
         <activity
-            android:name=".LoginActivity"
+            android:name=".presentation.auth.login.LoginActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/sopt/now/ApiFactory.kt b/app/src/main/java/com/sopt/now/ApiFactory.kt
index e5e7ada..2637920 100644
--- a/app/src/main/java/com/sopt/now/ApiFactory.kt
+++ b/app/src/main/java/com/sopt/now/ApiFactory.kt
@@ -2,6 +2,10 @@ package com.sopt.now
 
 import android.util.Log
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
+import com.sopt.now.presentation.auth.login.LoginActivity
+import com.sopt.now.data.remote.service.AuthService
+import com.sopt.now.data.remote.service.FollwerService
+import com.sopt.now.data.remote.service.UserService
 import kotlinx.serialization.json.Json
 import okhttp3.Interceptor
 import okhttp3.MediaType.Companion.toMediaType
diff --git a/app/src/main/java/com/sopt/now/RequestChagePwDto.kt b/app/src/main/java/com/sopt/now/data/remote/dto/request/RequestChagePwDto.kt
similarity index 86%
rename from app/src/main/java/com/sopt/now/RequestChagePwDto.kt
rename to app/src/main/java/com/sopt/now/data/remote/dto/request/RequestChagePwDto.kt
index 8111c1f..deb4088 100644
--- a/app/src/main/java/com/sopt/now/RequestChagePwDto.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/dto/request/RequestChagePwDto.kt
@@ -1,4 +1,4 @@
-package com.sopt.now
+package com.sopt.now.data.remote.dto.request
 
 import kotlinx.serialization.SerialName
 
diff --git a/app/src/main/java/com/sopt/now/RequestLoginDto.kt b/app/src/main/java/com/sopt/now/data/remote/dto/request/RequestLoginDto.kt
similarity index 84%
rename from app/src/main/java/com/sopt/now/RequestLoginDto.kt
rename to app/src/main/java/com/sopt/now/data/remote/dto/request/RequestLoginDto.kt
index c7ecc52..80dc1e5 100644
--- a/app/src/main/java/com/sopt/now/RequestLoginDto.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/dto/request/RequestLoginDto.kt
@@ -1,4 +1,4 @@
-package com.sopt.now
+package com.sopt.now.data.remote.dto.request
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/app/src/main/java/com/sopt/now/RequestSignUpDto.kt b/app/src/main/java/com/sopt/now/data/remote/dto/request/RequestSignUpDto.kt
similarity index 88%
rename from app/src/main/java/com/sopt/now/RequestSignUpDto.kt
rename to app/src/main/java/com/sopt/now/data/remote/dto/request/RequestSignUpDto.kt
index 2763e87..abb97ab 100644
--- a/app/src/main/java/com/sopt/now/RequestSignUpDto.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/dto/request/RequestSignUpDto.kt
@@ -1,4 +1,4 @@
-package com.sopt.now
+package com.sopt.now.data.remote.dto.request
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/app/src/main/java/com/sopt/now/ResponseChangePwDto.kt b/app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseChangePwDto.kt
similarity index 78%
rename from app/src/main/java/com/sopt/now/ResponseChangePwDto.kt
rename to app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseChangePwDto.kt
index 5a61065..edf57e6 100644
--- a/app/src/main/java/com/sopt/now/ResponseChangePwDto.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseChangePwDto.kt
@@ -1,4 +1,4 @@
-package com.sopt.now
+package com.sopt.now.data.remote.dto.response
 
 import kotlinx.serialization.SerialName
 
diff --git a/app/src/main/java/com/sopt/now/ResponseFollowerDto.kt b/app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseFollowerDto.kt
similarity index 94%
rename from app/src/main/java/com/sopt/now/ResponseFollowerDto.kt
rename to app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseFollowerDto.kt
index d1b2b18..84221d7 100644
--- a/app/src/main/java/com/sopt/now/ResponseFollowerDto.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseFollowerDto.kt
@@ -1,4 +1,4 @@
-package com.sopt.now
+package com.sopt.now.data.remote.dto.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/app/src/main/java/com/sopt/now/ResponseLoginDto.kt b/app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseLoginDto.kt
similarity index 82%
rename from app/src/main/java/com/sopt/now/ResponseLoginDto.kt
rename to app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseLoginDto.kt
index 8bb28b7..63e0146 100644
--- a/app/src/main/java/com/sopt/now/ResponseLoginDto.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseLoginDto.kt
@@ -1,4 +1,4 @@
-package com.sopt.now
+package com.sopt.now.data.remote.dto.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/app/src/main/java/com/sopt/now/ResponseSignUpDto.kt b/app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseSignUpDto.kt
similarity index 82%
rename from app/src/main/java/com/sopt/now/ResponseSignUpDto.kt
rename to app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseSignUpDto.kt
index 998dcc7..708abaf 100644
--- a/app/src/main/java/com/sopt/now/ResponseSignUpDto.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseSignUpDto.kt
@@ -1,4 +1,4 @@
-package com.sopt.now
+package com.sopt.now.data.remote.dto.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/app/src/main/java/com/sopt/now/ResponseUserInfoDto.kt b/app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseUserInfoDto.kt
similarity index 91%
rename from app/src/main/java/com/sopt/now/ResponseUserInfoDto.kt
rename to app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseUserInfoDto.kt
index fb4a8b1..b3488b7 100644
--- a/app/src/main/java/com/sopt/now/ResponseUserInfoDto.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseUserInfoDto.kt
@@ -1,4 +1,4 @@
-package com.sopt.now
+package com.sopt.now.data.remote.dto.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/app/src/main/java/com/sopt/now/AuthService.kt b/app/src/main/java/com/sopt/now/data/remote/service/AuthService.kt
similarity index 56%
rename from app/src/main/java/com/sopt/now/AuthService.kt
rename to app/src/main/java/com/sopt/now/data/remote/service/AuthService.kt
index a0dbdd1..5d816ff 100644
--- a/app/src/main/java/com/sopt/now/AuthService.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/service/AuthService.kt
@@ -1,5 +1,9 @@
-package com.sopt.now
+package com.sopt.now.data.remote.service
 
+import com.sopt.now.data.remote.dto.request.RequestLoginDto
+import com.sopt.now.data.remote.dto.request.RequestSignUpDto
+import com.sopt.now.data.remote.dto.response.ResponseLoginDto
+import com.sopt.now.data.remote.dto.response.ResponseSignUpDto
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.POST
diff --git a/app/src/main/java/com/sopt/now/FollwerService.kt b/app/src/main/java/com/sopt/now/data/remote/service/FollwerService.kt
similarity index 67%
rename from app/src/main/java/com/sopt/now/FollwerService.kt
rename to app/src/main/java/com/sopt/now/data/remote/service/FollwerService.kt
index ee2d2ab..ce65bcb 100644
--- a/app/src/main/java/com/sopt/now/FollwerService.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/service/FollwerService.kt
@@ -1,5 +1,6 @@
-package com.sopt.now
+package com.sopt.now.data.remote.service
 
+import com.sopt.now.data.remote.dto.response.ResponseFollowerDto
 import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Query
diff --git a/app/src/main/java/com/sopt/now/UserService.kt b/app/src/main/java/com/sopt/now/data/remote/service/UserService.kt
similarity index 58%
rename from app/src/main/java/com/sopt/now/UserService.kt
rename to app/src/main/java/com/sopt/now/data/remote/service/UserService.kt
index 935b787..61e5885 100644
--- a/app/src/main/java/com/sopt/now/UserService.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/service/UserService.kt
@@ -1,5 +1,6 @@
-package com.sopt.now
+package com.sopt.now.data.remote.service
 
+import com.sopt.now.data.remote.dto.response.ResponseUserInfoDto
 import retrofit2.Call
 import retrofit2.http.GET
 
diff --git a/app/src/main/java/com/sopt/now/LoginActivity.kt b/app/src/main/java/com/sopt/now/presentation/auth/login/LoginActivity.kt
similarity index 87%
rename from app/src/main/java/com/sopt/now/LoginActivity.kt
rename to app/src/main/java/com/sopt/now/presentation/auth/login/LoginActivity.kt
index 2c8b314..7167702 100644
--- a/app/src/main/java/com/sopt/now/LoginActivity.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/login/LoginActivity.kt
@@ -1,11 +1,15 @@
-package com.sopt.now
+package com.sopt.now.presentation.auth.login
 
 import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import com.sopt.now.presentation.main.MainActivity
+import com.sopt.now.PreferenceUtil
+import com.sopt.now.presentation.auth.signup.SignUpActivity
 import com.sopt.now.databinding.ActivityLoginBinding
+import com.sopt.now.data.remote.dto.request.RequestLoginDto
 
 class LoginActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/com/sopt/now/presentation/auth/login/LoginState.kt b/app/src/main/java/com/sopt/now/presentation/auth/login/LoginState.kt
new file mode 100644
index 0000000..45b8fdd
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/presentation/auth/login/LoginState.kt
@@ -0,0 +1,6 @@
+package com.sopt.now.presentation.auth.login
+
+data class LoginState(
+    val isSuccess: Boolean,
+    val message: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/LoginViewModel.kt b/app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt
similarity index 89%
rename from app/src/main/java/com/sopt/now/LoginViewModel.kt
rename to app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt
index 01754c5..57cc5a4 100644
--- a/app/src/main/java/com/sopt/now/LoginViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt
@@ -1,16 +1,15 @@
-package com.sopt.now
+package com.sopt.now.presentation.auth.login
 
 import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.sopt.now.ServicePool
+import com.sopt.now.data.remote.dto.request.RequestLoginDto
+import com.sopt.now.data.remote.dto.response.ResponseLoginDto
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 
-data class LoginState(
-    val isSuccess: Boolean,
-    val message: String
-)
 
 class LoginViewModel : ViewModel() {
     private val authService by lazy { ServicePool.authService }
diff --git a/app/src/main/java/com/sopt/now/SignUpActivity.kt b/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpActivity.kt
similarity index 93%
rename from app/src/main/java/com/sopt/now/SignUpActivity.kt
rename to app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpActivity.kt
index 056e8f7..1cd9d72 100644
--- a/app/src/main/java/com/sopt/now/SignUpActivity.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpActivity.kt
@@ -1,10 +1,11 @@
-package com.sopt.now
+package com.sopt.now.presentation.auth.signup
 
 import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import com.sopt.now.databinding.ActivitySignUpBinding
+import com.sopt.now.data.remote.dto.request.RequestSignUpDto
 
 class SignUpActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpState.kt b/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpState.kt
new file mode 100644
index 0000000..b74986e
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpState.kt
@@ -0,0 +1,6 @@
+package com.sopt.now.presentation.auth.signup
+
+data class SignUpState(
+    val isSuccess: Boolean,
+    val message: String
+)
diff --git a/app/src/main/java/com/sopt/now/SignUpViewModel.kt b/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpViewModel.kt
similarity index 88%
rename from app/src/main/java/com/sopt/now/SignUpViewModel.kt
rename to app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpViewModel.kt
index 7187e90..2536872 100644
--- a/app/src/main/java/com/sopt/now/SignUpViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpViewModel.kt
@@ -1,18 +1,16 @@
-package com.sopt.now
+package com.sopt.now.presentation.auth.signup
 
 import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.sopt.now.ServicePool
+import com.sopt.now.data.remote.dto.request.RequestSignUpDto
+import com.sopt.now.data.remote.dto.response.ResponseSignUpDto
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 
 
-data class SignUpState(
-    val isSuccess: Boolean,
-    val message: String
-)
-
 class SignUpViewModel : ViewModel() {
     private val authService by lazy { ServicePool.authService }
     val liveData = MutableLiveData<SignUpState>()
diff --git a/app/src/main/java/com/sopt/now/MainActivity.kt b/app/src/main/java/com/sopt/now/presentation/main/MainActivity.kt
similarity index 86%
rename from app/src/main/java/com/sopt/now/MainActivity.kt
rename to app/src/main/java/com/sopt/now/presentation/main/MainActivity.kt
index 258b069..f152575 100644
--- a/app/src/main/java/com/sopt/now/MainActivity.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/MainActivity.kt
@@ -1,9 +1,13 @@
-package com.sopt.now
+package com.sopt.now.presentation.main
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
+import com.sopt.now.R
 import com.sopt.now.databinding.ActivityMainBinding
+import com.sopt.now.presentation.main.home.HomeFragment
+import com.sopt.now.presentation.main.mypage.MyPageFragment
+import com.sopt.now.presentation.main.search.SearchFragment
 
 class MainActivity : AppCompatActivity() {
     private lateinit var binding: ActivityMainBinding
diff --git a/app/src/main/java/com/sopt/now/presentation/main/home/FollowerState.kt b/app/src/main/java/com/sopt/now/presentation/main/home/FollowerState.kt
new file mode 100644
index 0000000..2f78a0a
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/presentation/main/home/FollowerState.kt
@@ -0,0 +1,6 @@
+package com.sopt.now.presentation.main.home
+
+data class FollowerState(
+    val isSuccess: Boolean,
+    val message: String
+)
diff --git a/app/src/main/java/com/sopt/now/FollowerViewModel.kt b/app/src/main/java/com/sopt/now/presentation/main/home/FollowerViewModel.kt
similarity index 91%
rename from app/src/main/java/com/sopt/now/FollowerViewModel.kt
rename to app/src/main/java/com/sopt/now/presentation/main/home/FollowerViewModel.kt
index 0f5f716..0660707 100644
--- a/app/src/main/java/com/sopt/now/FollowerViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/home/FollowerViewModel.kt
@@ -1,17 +1,13 @@
-package com.sopt.now
+package com.sopt.now.presentation.main.home
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.sopt.now.ServicePool
+import com.sopt.now.data.remote.dto.response.ResponseFollowerDto
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 
-
-data class FollowerState(
-    val isSuccess: Boolean,
-    val message: String
-)
-
 class FollowerViewModel : ViewModel() {
     private val followerService by lazy { ServicePool.followerService }
     val liveData = MutableLiveData<FollowerState>()
diff --git a/app/src/main/java/com/sopt/now/HomeFragment.kt b/app/src/main/java/com/sopt/now/presentation/main/home/HomeFragment.kt
similarity index 96%
rename from app/src/main/java/com/sopt/now/HomeFragment.kt
rename to app/src/main/java/com/sopt/now/presentation/main/home/HomeFragment.kt
index ae75b4e..250f2b6 100644
--- a/app/src/main/java/com/sopt/now/HomeFragment.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/home/HomeFragment.kt
@@ -1,4 +1,4 @@
-package com.sopt.now
+package com.sopt.now.presentation.main.home
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/com/sopt/now/HomeList.kt b/app/src/main/java/com/sopt/now/presentation/main/home/HomeList.kt
similarity index 86%
rename from app/src/main/java/com/sopt/now/HomeList.kt
rename to app/src/main/java/com/sopt/now/presentation/main/home/HomeList.kt
index f3552df..a9c37e8 100644
--- a/app/src/main/java/com/sopt/now/HomeList.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/home/HomeList.kt
@@ -1,4 +1,4 @@
-package com.sopt.now
+package com.sopt.now.presentation.main.home
 
 import androidx.annotation.DrawableRes
 
diff --git a/app/src/main/java/com/sopt/now/HomeListAdapter.kt b/app/src/main/java/com/sopt/now/presentation/main/home/HomeListAdapter.kt
similarity index 97%
rename from app/src/main/java/com/sopt/now/HomeListAdapter.kt
rename to app/src/main/java/com/sopt/now/presentation/main/home/HomeListAdapter.kt
index 3463924..41de13b 100644
--- a/app/src/main/java/com/sopt/now/HomeListAdapter.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/home/HomeListAdapter.kt
@@ -1,4 +1,4 @@
-package com.sopt.now
+package com.sopt.now.presentation.main.home
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
diff --git a/app/src/main/java/com/sopt/now/HomeListViewHolder.kt b/app/src/main/java/com/sopt/now/presentation/main/home/HomeListViewHolder.kt
similarity index 95%
rename from app/src/main/java/com/sopt/now/HomeListViewHolder.kt
rename to app/src/main/java/com/sopt/now/presentation/main/home/HomeListViewHolder.kt
index 2e77535..17490b0 100644
--- a/app/src/main/java/com/sopt/now/HomeListViewHolder.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/home/HomeListViewHolder.kt
@@ -1,4 +1,4 @@
-package com.sopt.now
+package com.sopt.now.presentation.main.home
 
 import androidx.recyclerview.widget.RecyclerView
 import com.sopt.now.databinding.ItemFriendBinding
diff --git a/app/src/main/java/com/sopt/now/HomeViewModel.kt b/app/src/main/java/com/sopt/now/presentation/main/home/HomeViewModel.kt
similarity index 97%
rename from app/src/main/java/com/sopt/now/HomeViewModel.kt
rename to app/src/main/java/com/sopt/now/presentation/main/home/HomeViewModel.kt
index b488844..08069f3 100644
--- a/app/src/main/java/com/sopt/now/HomeViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/home/HomeViewModel.kt
@@ -1,6 +1,7 @@
-package com.sopt.now
+package com.sopt.now.presentation.main.home
 
 import androidx.lifecycle.ViewModel
+import com.sopt.now.R
 
 class HomeViewModel : ViewModel() {
     val homeListData = listOf(
diff --git a/app/src/main/java/com/sopt/now/MyPageFragment.kt b/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
similarity index 97%
rename from app/src/main/java/com/sopt/now/MyPageFragment.kt
rename to app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
index a6f36f0..cad25e4 100644
--- a/app/src/main/java/com/sopt/now/MyPageFragment.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
@@ -1,4 +1,4 @@
-package com.sopt.now
+package com.sopt.now.presentation.main.mypage
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoState.kt b/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoState.kt
new file mode 100644
index 0000000..8568335
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoState.kt
@@ -0,0 +1,9 @@
+package com.sopt.now.presentation.main.mypage
+
+data class UserInfoState(
+    val isSuccess: Boolean,
+    val message: String,
+    val userId : String? = "",
+    val userNick : String? = "",
+    val userPhone : String? = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/UserInfoViewModel.kt b/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt
similarity index 89%
rename from app/src/main/java/com/sopt/now/UserInfoViewModel.kt
rename to app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt
index 86aebcb..5fee56a 100644
--- a/app/src/main/java/com/sopt/now/UserInfoViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt
@@ -1,21 +1,14 @@
-package com.sopt.now
+package com.sopt.now.presentation.main.mypage
 
 import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.sopt.now.ServicePool
+import com.sopt.now.data.remote.dto.response.ResponseUserInfoDto
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 
-
-data class UserInfoState(
-    val isSuccess: Boolean,
-    val message: String,
-    val userId : String? = "",
-    val userNick : String? = "",
-    val userPhone : String? = ""
-)
-
 class UserInfoViewModel : ViewModel() {
     private val userService by lazy { ServicePool.userService }
     val liveData = MutableLiveData<UserInfoState>()
diff --git a/app/src/main/java/com/sopt/now/SearchFragment.kt b/app/src/main/java/com/sopt/now/presentation/main/search/SearchFragment.kt
similarity index 91%
rename from app/src/main/java/com/sopt/now/SearchFragment.kt
rename to app/src/main/java/com/sopt/now/presentation/main/search/SearchFragment.kt
index 5c3307e..832234a 100644
--- a/app/src/main/java/com/sopt/now/SearchFragment.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/search/SearchFragment.kt
@@ -1,11 +1,11 @@
-package com.sopt.now
+package com.sopt.now.presentation.main.search
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.sopt.now.databinding.FragmentMyPageBinding
+import com.sopt.now.R
 import com.sopt.now.databinding.FragmentSearchBinding
 
 class SearchFragment : Fragment() {
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 4e11b9e..235b8d2 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -5,7 +5,7 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".LoginActivity">
+    tools:context=".presentation.auth.login.LoginActivity">
 
     <TextView
         android:id="@+id/tv_login_title"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5f697ed..4fa2144 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".presentation.main.MainActivity">
 
     <TextView
         android:id="@+id/tv_main_title"
diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml
index 0e95769..4e1c9f6 100644
--- a/app/src/main/res/layout/activity_sign_up.xml
+++ b/app/src/main/res/layout/activity_sign_up.xml
@@ -5,7 +5,7 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".SignUpActivity">
+    tools:context=".presentation.auth.signup.SignUpActivity">
 
     <TextView
         android:id="@+id/tv_sign_up_title"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 5815c2f..72419f2 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".HomeFragment">
+    tools:context=".presentation.main.home.HomeFragment">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_friends"
diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml
index e24f48e..17b8ddb 100644
--- a/app/src/main/res/layout/fragment_my_page.xml
+++ b/app/src/main/res/layout/fragment_my_page.xml
@@ -5,7 +5,7 @@
     android:id="@+id/frameLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MyPageFragment">
+    tools:context=".presentation.main.mypage.MyPageFragment">
     <ImageView
         android:id="@+id/iv_main_user_img"
         android:layout_width="200dp"
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 7307b6c..911eae6 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".SearchFragment">
+    tools:context=".presentation.main.search.SearchFragment">
 
    <TextView
         android:layout_width="match_parent"

From e02b3c8f8766dda976f2505f08df56fecdf88a0d Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Tue, 7 May 2024 00:36:00 +0900
Subject: [PATCH 13/36] =?UTF-8?q?feat#10/:=20=EB=B9=84=EB=B0=80=EB=B2=88?=
 =?UTF-8?q?=ED=98=B8=20=EB=B3=80=EA=B2=BD=20=EB=B2=84=ED=8A=BC=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

---
 .../main/mypage/ChangePasswordFragment.kt     | 26 +++++++++++++++++++
 .../res/layout/fragment_change_password.xml   | 20 ++++++++++++++
 app/src/main/res/layout/fragment_my_page.xml  | 12 +++++++++
 app/src/main/res/values/strings.xml           |  6 ++++-
 4 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordFragment.kt
 create mode 100644 app/src/main/res/layout/fragment_change_password.xml

diff --git a/app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordFragment.kt b/app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordFragment.kt
new file mode 100644
index 0000000..4a07a80
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordFragment.kt
@@ -0,0 +1,26 @@
+package com.sopt.now.presentation.main.mypage
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.sopt.now.R
+class ChangePasswordFragment : Fragment() {
+    // TODO: Rename and change types of parameters
+    private var param1: String? = null
+    private var param2: String? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_change_password, container, false)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_change_password.xml b/app/src/main/res/layout/fragment_change_password.xml
new file mode 100644
index 0000000..3a6f395
--- /dev/null
+++ b/app/src/main/res/layout/fragment_change_password.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/frameLayout2"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".presentation.main.mypage.ChangePasswordFragment">
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:text="기존 비밀번호를 입력해주세요."
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml
index 17b8ddb..7d8bfba 100644
--- a/app/src/main/res/layout/fragment_my_page.xml
+++ b/app/src/main/res/layout/fragment_my_page.xml
@@ -74,4 +74,16 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_main_title_phone" />
 
+    <TextView
+        android:id="@+id/tv_change_password"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="@string/my_page_change_password_button"
+        android:textColor="#000000"
+        android:textSize="15sp"
+        android:textAlignment="center"
+        android:layout_marginBottom="20dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b4ab54e..522f208 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,6 +10,7 @@
     <string name="main_title2">SHOUT OUR PASSION TOGETHER</string>
     <string name="nick">닉네임</string>
     <string name="etc">하고싶은 말</string>
+    <string name="phone">전화번호</string>
     <!--LOGIN-->
     <string name="login_error_blank">모든 항목을 입력해주세요.</string>
     <string name="login_error_different">아이디 혹은 비밀번호가 일치하지 않습니다.</string>
@@ -35,5 +36,8 @@
     <string name="sign_up_error_etc">하고싶은 말을 다시 설정하세요.</string>
     <string name="sign_up_phone_text">*(-)하이픈을 포함해 입력해주세요.</string>
     <string name="sign_up_phone_hint">예시)010-0000-0000</string>
-    <string name="phone">전화번호</string>
+    <string name="my_page_change_password_button">비밀번호 변경하기</string>
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
+
 </resources>
\ No newline at end of file

From 8ff14e53c97c03df7b607a363abd660eebc1eede Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Tue, 7 May 2024 00:44:15 +0900
Subject: [PATCH 14/36] =?UTF-8?q?ui#10/:=20=EB=B9=84=EB=B0=80=EB=B2=88?=
 =?UTF-8?q?=ED=98=B8=20=EB=B3=80=EA=B2=BD=20ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/layout/fragment_change_password.xml   | 50 +++++++++++++++++--
 1 file changed, 47 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/fragment_change_password.xml b/app/src/main/res/layout/fragment_change_password.xml
index 3a6f395..cf7ed52 100644
--- a/app/src/main/res/layout/fragment_change_password.xml
+++ b/app/src/main/res/layout/fragment_change_password.xml
@@ -5,16 +5,60 @@
     android:id="@+id/frameLayout2"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:paddingHorizontal="30dp"
     tools:context=".presentation.main.mypage.ChangePasswordFragment">
 
     <TextView
-        android:id="@+id/textView"
+        android:id="@+id/tv_old_password"
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:text="기존 비밀번호를 입력해주세요."
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:textAlignment="center"
+        android:layout_marginTop="50dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
+    <EditText
+        android:id="@+id/et_old_password"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/tv_old_password"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+    <TextView
+        android:id="@+id/tv_new_password"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="새로운 비밀번호를 입력해주세요."
+        android:textAlignment="center"
+        android:layout_marginTop="50dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/et_old_password" />
+    <EditText
+        android:id="@+id/et_new_password"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/tv_new_password"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+    <TextView
+        android:id="@+id/tv_new_password_check"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="새로운 비밀번호를 한 번 더 입력해주세요."
+        android:textAlignment="center"
+        android:layout_marginTop="50dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/et_new_password" />
+    <EditText
+        android:id="@+id/et_new_password_check"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/tv_new_password_check"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From e73c4aa7246b7563054ee1c1003b8d7c401c4a2d Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Tue, 7 May 2024 00:48:58 +0900
Subject: [PATCH 15/36] =?UTF-8?q?add#10/:=20=EB=B9=84=EB=B0=80=EB=B2=88?=
 =?UTF-8?q?=ED=98=B8=20=EB=B3=80=EA=B2=BD=20=20state,viewmodel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../now/data/remote/service/AuthService.kt    |  8 +++
 .../main/mypage/ChangePasswordFragment.kt     | 47 +++++++++++++-----
 .../main/mypage/ChangePasswordState.kt        |  9 ++++
 .../main/mypage/ChangePasswordViewModel.kt    | 49 +++++++++++++++++++
 4 files changed, 102 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordState.kt
 create mode 100644 app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordViewModel.kt

diff --git a/app/src/main/java/com/sopt/now/data/remote/service/AuthService.kt b/app/src/main/java/com/sopt/now/data/remote/service/AuthService.kt
index 5d816ff..cd73fa2 100644
--- a/app/src/main/java/com/sopt/now/data/remote/service/AuthService.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/service/AuthService.kt
@@ -1,11 +1,14 @@
 package com.sopt.now.data.remote.service
 
+import com.sopt.now.data.remote.dto.request.RequestChagePwDto
 import com.sopt.now.data.remote.dto.request.RequestLoginDto
 import com.sopt.now.data.remote.dto.request.RequestSignUpDto
+import com.sopt.now.data.remote.dto.response.ResponseChangePwDto
 import com.sopt.now.data.remote.dto.response.ResponseLoginDto
 import com.sopt.now.data.remote.dto.response.ResponseSignUpDto
 import retrofit2.Call
 import retrofit2.http.Body
+import retrofit2.http.PATCH
 import retrofit2.http.POST
 
 interface AuthService {
@@ -18,4 +21,9 @@ interface AuthService {
         @Body request : RequestLoginDto
     ) : Call<ResponseLoginDto>
 
+    @PATCH("member/password")
+    fun changePassword(
+        @Body request : RequestChagePwDto
+    ) : Call<ResponseChangePwDto>
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordFragment.kt b/app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordFragment.kt
index 4a07a80..edb0b9e 100644
--- a/app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordFragment.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordFragment.kt
@@ -5,22 +5,47 @@ import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
+import androidx.fragment.app.viewModels
 import com.sopt.now.R
-class ChangePasswordFragment : Fragment() {
-    // TODO: Rename and change types of parameters
-    private var param1: String? = null
-    private var param2: String? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+import com.sopt.now.databinding.FragmentMyPageBinding
 
-    }
+class ChangePasswordFragment : Fragment() {
+    private val binding: FragmentMyPageBinding
+        get() = requireNotNull(_binding) { "_binding이 null이 아닌 경우만 _binding 반환" }
+    private var _binding: FragmentMyPageBinding? = null
+    private val viewModel by viewModels<ChangePasswordViewModel>()
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_change_password, container, false)
+        _binding = FragmentMyPageBinding.inflate(inflater, container, false)
+        initViews()
+        initObserver()
+        return binding.root
+    }
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    private fun initObserver() {
+        viewModel.liveData.observe(viewLifecycleOwner) { userInfoState ->
+            Toast.makeText(
+                activity,
+                userInfoState.message,
+                Toast.LENGTH_SHORT,
+            ).show()
+            if (userInfoState.isSuccess) {
+                binding.tvMainNick.text=userInfoState.userNick
+                binding.tvMainId.text=userInfoState.userId
+                binding.tvMainPhone.text=userInfoState.userPhone
+            }
+        }
+    }
+
+    private fun initViews() {
+        viewModel.userInfo()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordState.kt b/app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordState.kt
new file mode 100644
index 0000000..64c3808
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordState.kt
@@ -0,0 +1,9 @@
+package com.sopt.now.presentation.main.mypage
+
+data class ChangePasswordState(
+    val isSuccess: Boolean,
+    val message: String,
+    val userId : String? = "",
+    val userNick : String? = "",
+    val userPhone : String? = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordViewModel.kt b/app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordViewModel.kt
new file mode 100644
index 0000000..4ed06de
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordViewModel.kt
@@ -0,0 +1,49 @@
+package com.sopt.now.presentation.main.mypage
+
+import android.util.Log
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.sopt.now.ServicePool
+import com.sopt.now.data.remote.dto.response.ResponseUserInfoDto
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class ChangePasswordViewModel  : ViewModel() {
+    private val userService by lazy { ServicePool.userService }
+    val liveData = MutableLiveData<UserInfoState>()
+
+    fun userInfo() {
+        userService.userInfo().enqueue(object : Callback<ResponseUserInfoDto> {
+            override fun onResponse(
+                call: Call<ResponseUserInfoDto>,
+                response: Response<ResponseUserInfoDto>,
+            ) {
+                if (response.isSuccessful) {
+                    val data: ResponseUserInfoDto? = response.body()
+                    liveData.value = UserInfoState(
+                        isSuccess = true,
+                        message = "회원 정보 불러오기에 성공했습니다.",
+                        userId = data?.data?.authenticationId,
+                        userNick = data?.data?.nickname,
+                        userPhone = data?.data?.phone
+                    )
+                    Log.d("UserInfo", "data: $data")
+                } else {
+                    val error = response.message()
+                    liveData.value = UserInfoState(
+                        isSuccess = false,
+                        message = "회원 정보 불러오기에 실패했습니다.  $error"
+                    )
+                }
+            }
+
+            override fun onFailure(call: Call<ResponseUserInfoDto>, t: Throwable) {
+                liveData.value = UserInfoState(
+                    isSuccess = false,
+                    message = "서버에러"
+                )
+            }
+        })
+    }
+}
\ No newline at end of file

From 184df33ac5192e57fe82a6d73ad245ec47607a93 Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Tue, 7 May 2024 01:06:42 +0900
Subject: [PATCH 16/36] =?UTF-8?q?mod#10/:=20=EB=B9=84=EB=B0=80=EB=B2=88?=
 =?UTF-8?q?=ED=98=B8=20=EB=B3=80=EA=B2=BD=20fragment=20->=20activity?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../changepassword}/ChangePasswordFragment.kt            | 3 +--
 .../changepassword}/ChangePasswordState.kt               | 2 +-
 .../changepassword}/ChangePasswordViewModel.kt           | 3 ++-
 .../sopt/now/presentation/main/mypage/MyPageFragment.kt  | 9 +++++++++
 app/src/main/res/layout/fragment_change_password.xml     | 2 +-
 5 files changed, 14 insertions(+), 5 deletions(-)
 rename app/src/main/java/com/sopt/now/presentation/{main/mypage => auth/changepassword}/ChangePasswordFragment.kt (95%)
 rename app/src/main/java/com/sopt/now/presentation/{main/mypage => auth/changepassword}/ChangePasswordState.kt (77%)
 rename app/src/main/java/com/sopt/now/presentation/{main/mypage => auth/changepassword}/ChangePasswordViewModel.kt (94%)

diff --git a/app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordFragment.kt b/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordFragment.kt
similarity index 95%
rename from app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordFragment.kt
rename to app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordFragment.kt
index edb0b9e..228532c 100644
--- a/app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordFragment.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordFragment.kt
@@ -1,4 +1,4 @@
-package com.sopt.now.presentation.main.mypage
+package com.sopt.now.presentation.auth.changepassword
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
@@ -7,7 +7,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.viewModels
-import com.sopt.now.R
 import com.sopt.now.databinding.FragmentMyPageBinding
 
 class ChangePasswordFragment : Fragment() {
diff --git a/app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordState.kt b/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordState.kt
similarity index 77%
rename from app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordState.kt
rename to app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordState.kt
index 64c3808..15e2cf6 100644
--- a/app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordState.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordState.kt
@@ -1,4 +1,4 @@
-package com.sopt.now.presentation.main.mypage
+package com.sopt.now.presentation.auth.changepassword
 
 data class ChangePasswordState(
     val isSuccess: Boolean,
diff --git a/app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordViewModel.kt b/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordViewModel.kt
similarity index 94%
rename from app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordViewModel.kt
rename to app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordViewModel.kt
index 4ed06de..5a74c1e 100644
--- a/app/src/main/java/com/sopt/now/presentation/main/mypage/ChangePasswordViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordViewModel.kt
@@ -1,10 +1,11 @@
-package com.sopt.now.presentation.main.mypage
+package com.sopt.now.presentation.auth.changepassword
 
 import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.sopt.now.ServicePool
 import com.sopt.now.data.remote.dto.response.ResponseUserInfoDto
+import com.sopt.now.presentation.main.mypage.UserInfoState
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
diff --git a/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt b/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
index cad25e4..3899c88 100644
--- a/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
@@ -1,5 +1,6 @@
 package com.sopt.now.presentation.main.mypage
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -8,6 +9,7 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import com.sopt.now.databinding.FragmentMyPageBinding
+import com.sopt.now.presentation.auth.changepassword.ChangePasswordFragment
 
 class MyPageFragment : Fragment() {
     private val binding: FragmentMyPageBinding
@@ -48,4 +50,11 @@ class MyPageFragment : Fragment() {
     private fun initViews() {
             viewModel.userInfo()
     }
+
+    private fun moveToChangePassword(){
+        Intent(activity, ChangePasswordFragment::class.java).apply{
+            startActivity(this)
+            activity?.finish()
+        }
+    }
 }
diff --git a/app/src/main/res/layout/fragment_change_password.xml b/app/src/main/res/layout/fragment_change_password.xml
index cf7ed52..af10519 100644
--- a/app/src/main/res/layout/fragment_change_password.xml
+++ b/app/src/main/res/layout/fragment_change_password.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingHorizontal="30dp"
-    tools:context=".presentation.main.mypage.ChangePasswordFragment">
+    tools:context=".presentation.auth.changepassword.ChangePasswordFragment">
 
     <TextView
         android:id="@+id/tv_old_password"

From bedb358001f666eb2fd13df6b5410f45d7449666 Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Tue, 7 May 2024 01:07:06 +0900
Subject: [PATCH 17/36] =?UTF-8?q?feat#10/:=20=EB=B9=84=EB=B0=80=EB=B2=88?=
 =?UTF-8?q?=ED=98=B8=20=EB=B3=80=EA=B2=BD=20=ED=99=94=EB=A9=B4=20=EC=9D=B4?=
 =?UTF-8?q?=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt b/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
index 3899c88..ee372fd 100644
--- a/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
@@ -24,6 +24,7 @@ class MyPageFragment : Fragment() {
         _binding = FragmentMyPageBinding.inflate(inflater, container, false)
         initViews()
         initObserver()
+        moveToChangePassword()
         return binding.root
     }
 

From 875b048e900655b1f3ea8e0d6b13c39beeee33f2 Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Tue, 7 May 2024 01:11:27 +0900
Subject: [PATCH 18/36] =?UTF-8?q?feat#10/:=20string=20=EC=B6=94=EC=B6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  5 +++++
 .../changepassword/ChangePasswordActivity.kt  | 21 +++++++++++++++++++
 ...sword.xml => activity_change_password.xml} | 13 ++++++------
 app/src/main/res/values/strings.xml           |  3 +++
 4 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordActivity.kt
 rename app/src/main/res/layout/{fragment_change_password.xml => activity_change_password.xml} (89%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index dce4533..71b8e05 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
+
     <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -13,6 +15,9 @@
         android:theme="@style/Theme.NOWSOPTAndroid"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
+        <activity
+            android:name=".presentation.auth.changepassword.ChangePasswordActivity"
+            android:exported="false" />
         <activity
             android:name=".presentation.auth.signup.SignUpActivity"
             android:exported="false" />
diff --git a/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordActivity.kt b/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordActivity.kt
new file mode 100644
index 0000000..95a4506
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordActivity.kt
@@ -0,0 +1,21 @@
+package com.sopt.now.presentation.auth.changepassword
+
+import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import com.sopt.now.R
+
+class ChangePasswordActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+        setContentView(R.layout.activity_change_password)
+        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
+            insets
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
similarity index 89%
rename from app/src/main/res/layout/fragment_change_password.xml
rename to app/src/main/res/layout/activity_change_password.xml
index af10519..c115f54 100644
--- a/app/src/main/res/layout/fragment_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -2,17 +2,17 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/frameLayout2"
+    android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingHorizontal="30dp"
-    tools:context=".presentation.auth.changepassword.ChangePasswordFragment">
+    tools:context=".presentation.auth.changepassword.ChangePasswordActivity">
+
 
     <TextView
         android:id="@+id/tv_old_password"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:text="기존 비밀번호를 입력해주세요."
+        android:text="@string/change_password_old_password"
         android:textAlignment="center"
         android:layout_marginTop="50dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -29,7 +29,7 @@
         android:id="@+id/tv_new_password"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:text="새로운 비밀번호를 입력해주세요."
+        android:text="@string/change_password_new_password"
         android:textAlignment="center"
         android:layout_marginTop="50dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -46,7 +46,7 @@
         android:id="@+id/tv_new_password_check"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:text="새로운 비밀번호를 한 번 더 입력해주세요."
+        android:text="@string/change_password_check_password"
         android:textAlignment="center"
         android:layout_marginTop="50dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -60,5 +60,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 522f208..c3d3ffd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -39,5 +39,8 @@
     <string name="my_page_change_password_button">비밀번호 변경하기</string>
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="change_password_old_password">기존 비밀번호를 입력해주세요.</string>
+    <string name="change_password_new_password">새로운 비밀번호를 입력해주세요.</string>
+    <string name="change_password_check_password">새로운 비밀번호를 한 번 더 입력해주세요.</string>
 
 </resources>
\ No newline at end of file

From 023b6357fa5583e95d63a6ecf1396d6d7f0e8843 Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Tue, 7 May 2024 01:23:43 +0900
Subject: [PATCH 19/36] =?UTF-8?q?feat#10/:=20=EB=B9=84=EB=B0=80=EB=B2=88?=
 =?UTF-8?q?=ED=98=B8=20=EB=B3=80=EA=B2=BD=20=EB=B2=84=ED=8A=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../changepassword/ChangePasswordFragment.kt  | 50 -------------------
 .../res/layout/activity_change_password.xml   | 11 ++++
 2 files changed, 11 insertions(+), 50 deletions(-)
 delete mode 100644 app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordFragment.kt

diff --git a/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordFragment.kt b/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordFragment.kt
deleted file mode 100644
index 228532c..0000000
--- a/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordFragment.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.sopt.now.presentation.auth.changepassword
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.fragment.app.viewModels
-import com.sopt.now.databinding.FragmentMyPageBinding
-
-class ChangePasswordFragment : Fragment() {
-    private val binding: FragmentMyPageBinding
-        get() = requireNotNull(_binding) { "_binding이 null이 아닌 경우만 _binding 반환" }
-    private var _binding: FragmentMyPageBinding? = null
-    private val viewModel by viewModels<ChangePasswordViewModel>()
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        _binding = FragmentMyPageBinding.inflate(inflater, container, false)
-        initViews()
-        initObserver()
-        return binding.root
-    }
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-    private fun initObserver() {
-        viewModel.liveData.observe(viewLifecycleOwner) { userInfoState ->
-            Toast.makeText(
-                activity,
-                userInfoState.message,
-                Toast.LENGTH_SHORT,
-            ).show()
-            if (userInfoState.isSuccess) {
-                binding.tvMainNick.text=userInfoState.userNick
-                binding.tvMainId.text=userInfoState.userId
-                binding.tvMainPhone.text=userInfoState.userPhone
-            }
-        }
-    }
-
-    private fun initViews() {
-        viewModel.userInfo()
-    }
-}
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index c115f54..6065016 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -59,5 +59,16 @@
         app:layout_constraintTop_toBottomOf="@id/tv_new_password_check"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
+    <TextView
+        android:layout_width="0dp"
+        android:layout_height="40dp"
+        android:text="비밀번호 변경하기"
+        android:textAlignment="center"
+        android:gravity="center"
+        android:background="@color/color_sopt"
+        android:layout_marginBottom="50dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From fa9f560211a33f8aee643618f38db8adf813b982 Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Tue, 7 May 2024 01:57:04 +0900
Subject: [PATCH 20/36] =?UTF-8?q?feat#10/:=20=EB=B9=84=EB=B0=80=EB=B2=88?=
 =?UTF-8?q?=ED=98=B8=20=EB=B3=80=EA=B2=BD=20api=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../remote/dto/request/RequestChagePwDto.kt   |  3 +
 .../dto/response/ResponseChangePwDto.kt       |  3 +
 .../now/data/remote/service/AuthService.kt    |  5 --
 .../now/data/remote/service/UserService.kt    |  9 +++
 .../changepassword/ChangePasswordActivity.kt  | 59 +++++++++++++++----
 .../changepassword/ChangePasswordState.kt     |  5 +-
 .../changepassword/ChangePasswordViewModel.kt | 31 +++++-----
 .../main/mypage/MyPageFragment.kt             | 10 ++--
 .../res/layout/activity_change_password.xml   | 22 +++++--
 app/src/main/res/values/strings.xml           |  4 +-
 10 files changed, 103 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/com/sopt/now/data/remote/dto/request/RequestChagePwDto.kt b/app/src/main/java/com/sopt/now/data/remote/dto/request/RequestChagePwDto.kt
index deb4088..2d95a8e 100644
--- a/app/src/main/java/com/sopt/now/data/remote/dto/request/RequestChagePwDto.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/dto/request/RequestChagePwDto.kt
@@ -1,6 +1,9 @@
 package com.sopt.now.data.remote.dto.request
 
 import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
 
 data class RequestChagePwDto (
     @SerialName("previousPassword")
diff --git a/app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseChangePwDto.kt b/app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseChangePwDto.kt
index edf57e6..085fb66 100644
--- a/app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseChangePwDto.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseChangePwDto.kt
@@ -1,6 +1,9 @@
 package com.sopt.now.data.remote.dto.response
 
 import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
 
 data class ResponseChangePwDto (
     @SerialName("code")
diff --git a/app/src/main/java/com/sopt/now/data/remote/service/AuthService.kt b/app/src/main/java/com/sopt/now/data/remote/service/AuthService.kt
index cd73fa2..3750d59 100644
--- a/app/src/main/java/com/sopt/now/data/remote/service/AuthService.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/service/AuthService.kt
@@ -21,9 +21,4 @@ interface AuthService {
         @Body request : RequestLoginDto
     ) : Call<ResponseLoginDto>
 
-    @PATCH("member/password")
-    fun changePassword(
-        @Body request : RequestChagePwDto
-    ) : Call<ResponseChangePwDto>
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/data/remote/service/UserService.kt b/app/src/main/java/com/sopt/now/data/remote/service/UserService.kt
index 61e5885..9250749 100644
--- a/app/src/main/java/com/sopt/now/data/remote/service/UserService.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/service/UserService.kt
@@ -1,10 +1,19 @@
 package com.sopt.now.data.remote.service
 
+import com.sopt.now.data.remote.dto.request.RequestChagePwDto
+import com.sopt.now.data.remote.dto.response.ResponseChangePwDto
 import com.sopt.now.data.remote.dto.response.ResponseUserInfoDto
 import retrofit2.Call
+import retrofit2.http.Body
 import retrofit2.http.GET
+import retrofit2.http.PATCH
 
 interface UserService {
     @GET("/member/info")
     fun userInfo() : Call<ResponseUserInfoDto>
+
+    @PATCH("member/password")
+    fun changePassword(
+        @Body request : RequestChagePwDto
+    ) : Call<ResponseChangePwDto>
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordActivity.kt b/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordActivity.kt
index 95a4506..6c0adb7 100644
--- a/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordActivity.kt
@@ -1,21 +1,60 @@
 package com.sopt.now.presentation.auth.changepassword
 
+import android.content.Intent
 import android.os.Bundle
-import androidx.activity.enableEdgeToEdge
+import android.widget.Toast
+import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import com.sopt.now.R
+import com.sopt.now.PreferenceUtil
+import com.sopt.now.data.remote.dto.request.RequestChagePwDto
+import com.sopt.now.databinding.ActivityChangePasswordBinding
+import com.sopt.now.presentation.auth.login.LoginActivity
 
 class ChangePasswordActivity : AppCompatActivity() {
+    private val binding by lazy { ActivityChangePasswordBinding.inflate(layoutInflater) }
+    private val viewModel by viewModels<ChangePasswordViewModel>()
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        enableEdgeToEdge()
-        setContentView(R.layout.activity_change_password)
-        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
-            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
-            insets
+        setContentView(binding.root)
+        prefs = PreferenceUtil(applicationContext)
+        initViews()
+        initObserver()
+    }
+
+    private fun initViews() {
+        binding.tvChangePassword.setOnClickListener {
+            viewModel.changePassword(getChangePasswordRequestDto())
+        }
+    }
+
+    private fun initObserver() {
+        viewModel.liveData.observe(this) { loginState ->
+            Toast.makeText(
+                this@ChangePasswordActivity,
+                loginState.message,
+                Toast.LENGTH_SHORT,
+            ).show()
+            if (loginState.isSuccess) {
+                Intent(this, LoginActivity::class.java).apply {
+                    startActivity(this)
+                }
+                finish()
+            }
         }
     }
+
+    private fun getChangePasswordRequestDto(): RequestChagePwDto {
+        val oldPassword = binding.etvOldPassword.text.toString()
+        val newPassword = binding.etvNewPassword.text.toString()
+        val checkPassword = binding.etvNewPasswordCheck.text.toString()
+        return RequestChagePwDto(
+            previousPassword = oldPassword,
+            newPassword = newPassword,
+            newPasswordVerification = checkPassword
+        )
+    }
+
+    companion object {
+        lateinit var prefs: PreferenceUtil
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordState.kt b/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordState.kt
index 15e2cf6..6d8efa6 100644
--- a/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordState.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordState.kt
@@ -2,8 +2,5 @@ package com.sopt.now.presentation.auth.changepassword
 
 data class ChangePasswordState(
     val isSuccess: Boolean,
-    val message: String,
-    val userId : String? = "",
-    val userNick : String? = "",
-    val userPhone : String? = ""
+    val message: String
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordViewModel.kt b/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordViewModel.kt
index 5a74c1e..02ee7eb 100644
--- a/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordViewModel.kt
@@ -4,43 +4,40 @@ import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.sopt.now.ServicePool
-import com.sopt.now.data.remote.dto.response.ResponseUserInfoDto
-import com.sopt.now.presentation.main.mypage.UserInfoState
+import com.sopt.now.data.remote.dto.request.RequestChagePwDto
+import com.sopt.now.data.remote.dto.response.ResponseChangePwDto
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 
 class ChangePasswordViewModel  : ViewModel() {
     private val userService by lazy { ServicePool.userService }
-    val liveData = MutableLiveData<UserInfoState>()
+    val liveData = MutableLiveData<ChangePasswordState>()
 
-    fun userInfo() {
-        userService.userInfo().enqueue(object : Callback<ResponseUserInfoDto> {
+    fun changePassword(request : RequestChagePwDto) {
+        userService.changePassword(request).enqueue(object : Callback<ResponseChangePwDto> {
             override fun onResponse(
-                call: Call<ResponseUserInfoDto>,
-                response: Response<ResponseUserInfoDto>,
+                call: Call<ResponseChangePwDto>,
+                response: Response<ResponseChangePwDto>,
             ) {
                 if (response.isSuccessful) {
-                    val data: ResponseUserInfoDto? = response.body()
-                    liveData.value = UserInfoState(
+                    val data: ResponseChangePwDto? = response.body()
+                    liveData.value = ChangePasswordState(
                         isSuccess = true,
-                        message = "회원 정보 불러오기에 성공했습니다.",
-                        userId = data?.data?.authenticationId,
-                        userNick = data?.data?.nickname,
-                        userPhone = data?.data?.phone
+                        message = "비밀번호가 성공적으로 변경되었습니다. 재로그인이 필요합니다."
                     )
                     Log.d("UserInfo", "data: $data")
                 } else {
                     val error = response.message()
-                    liveData.value = UserInfoState(
+                    liveData.value = ChangePasswordState(
                         isSuccess = false,
-                        message = "회원 정보 불러오기에 실패했습니다.  $error"
+                        message = "비밀번호 변경에 실패했습니다.  $error"
                     )
                 }
             }
 
-            override fun onFailure(call: Call<ResponseUserInfoDto>, t: Throwable) {
-                liveData.value = UserInfoState(
+            override fun onFailure(call: Call<ResponseChangePwDto>, t: Throwable) {
+                liveData.value = ChangePasswordState(
                     isSuccess = false,
                     message = "서버에러"
                 )
diff --git a/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt b/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
index ee372fd..bd3c040 100644
--- a/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
@@ -9,7 +9,7 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import com.sopt.now.databinding.FragmentMyPageBinding
-import com.sopt.now.presentation.auth.changepassword.ChangePasswordFragment
+import com.sopt.now.presentation.auth.changepassword.ChangePasswordActivity
 
 class MyPageFragment : Fragment() {
     private val binding: FragmentMyPageBinding
@@ -53,9 +53,11 @@ class MyPageFragment : Fragment() {
     }
 
     private fun moveToChangePassword(){
-        Intent(activity, ChangePasswordFragment::class.java).apply{
-            startActivity(this)
-            activity?.finish()
+        binding.tvChangePassword.setOnClickListener {
+            Intent(activity, ChangePasswordActivity::class.java).apply{
+                startActivity(this)
+                activity?.finish()
+            }
         }
     }
 }
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 6065016..d65a4a1 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -5,6 +5,7 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:layout_marginHorizontal="30dp"
     tools:context=".presentation.auth.changepassword.ChangePasswordActivity">
 
 
@@ -13,13 +14,14 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/change_password_old_password"
+        android:textSize="15sp"
         android:textAlignment="center"
         android:layout_marginTop="50dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
     <EditText
-        android:id="@+id/et_old_password"
+        android:id="@+id/etv_old_password"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toBottomOf="@id/tv_old_password"
@@ -30,15 +32,18 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/change_password_new_password"
+        android:textSize="15sp"
         android:textAlignment="center"
         android:layout_marginTop="50dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/et_old_password" />
+        app:layout_constraintTop_toBottomOf="@id/etv_old_password" />
     <EditText
-        android:id="@+id/et_new_password"
+        android:id="@+id/etv_new_password"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:textSize="15sp"
+        android:hint="@string/sign_up_pw_condition"
         app:layout_constraintTop_toBottomOf="@id/tv_new_password"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
@@ -47,22 +52,27 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/change_password_check_password"
+        android:textSize="15sp"
         android:textAlignment="center"
         android:layout_marginTop="50dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/et_new_password" />
+        app:layout_constraintTop_toBottomOf="@id/etv_new_password" />
     <EditText
-        android:id="@+id/et_new_password_check"
+        android:id="@+id/etv_new_password_check"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:textSize="15sp"
+        android:hint="@string/sign_up_pw_condition"
         app:layout_constraintTop_toBottomOf="@id/tv_new_password_check"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
     <TextView
+        android:id="@+id/tv_change_password"
         android:layout_width="0dp"
         android:layout_height="40dp"
-        android:text="비밀번호 변경하기"
+        android:text="@string/change_password"
+        android:textSize="15sp"
         android:textAlignment="center"
         android:gravity="center"
         android:background="@color/color_sopt"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c3d3ffd..25dda62 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -37,10 +37,10 @@
     <string name="sign_up_phone_text">*(-)하이픈을 포함해 입력해주세요.</string>
     <string name="sign_up_phone_hint">예시)010-0000-0000</string>
     <string name="my_page_change_password_button">비밀번호 변경하기</string>
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <!--Change Password-->
     <string name="change_password_old_password">기존 비밀번호를 입력해주세요.</string>
     <string name="change_password_new_password">새로운 비밀번호를 입력해주세요.</string>
     <string name="change_password_check_password">새로운 비밀번호를 한 번 더 입력해주세요.</string>
+    <string name="change_password">비밀번호 변경하기</string>
 
 </resources>
\ No newline at end of file

From 2d1eeb2c4ee240fa04a6f54f24943e840eb287c7 Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Tue, 7 May 2024 02:46:00 +0900
Subject: [PATCH 21/36] =?UTF-8?q?mod#10/:=20key=20USER=5FID=20=EC=83=81?=
 =?UTF-8?q?=EC=88=98=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/sopt/now/ApiFactory.kt                | 5 ++++-
 app/src/main/java/com/sopt/now/PreferenceUtil.kt            | 6 +++++-
 .../com/sopt/now/presentation/auth/login/LoginViewModel.kt  | 5 ++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/sopt/now/ApiFactory.kt b/app/src/main/java/com/sopt/now/ApiFactory.kt
index 2637920..3ae4504 100644
--- a/app/src/main/java/com/sopt/now/ApiFactory.kt
+++ b/app/src/main/java/com/sopt/now/ApiFactory.kt
@@ -16,6 +16,7 @@ import java.io.IOException
 
 object ApiFactory {
     private const val BASE_URL: String = BuildConfig.AUTH_BASE_URL
+    const val USER_ID:String = "userId"
 
     val retrofit: Retrofit by lazy {
         Retrofit.Builder()
@@ -39,7 +40,7 @@ object ApiFactory {
     class HeaderInterceptor : Interceptor {
         @Throws(IOException::class)
         override fun intercept(chain: Interceptor.Chain): Response = with(chain) {
-            val accessToken = LoginActivity.prefs.getString("userId", "")
+            val accessToken = LoginActivity.prefs.getString(USER_ID, "")
             Log.d("Login", accessToken)
             val newRequest = request().newBuilder()
                 .addHeader("memberId", accessToken)
@@ -56,3 +57,5 @@ object ServicePool {
     val userService = ApiFactory.createUser<UserService>()
     val followerService = ApiFactory.create<FollwerService>()
 }
+
+
diff --git a/app/src/main/java/com/sopt/now/PreferenceUtil.kt b/app/src/main/java/com/sopt/now/PreferenceUtil.kt
index bac67cf..1675e65 100644
--- a/app/src/main/java/com/sopt/now/PreferenceUtil.kt
+++ b/app/src/main/java/com/sopt/now/PreferenceUtil.kt
@@ -5,7 +5,7 @@ import android.content.SharedPreferences
 
 class PreferenceUtil(context: Context) {
     private val prefs: SharedPreferences =
-        context.getSharedPreferences("userId", Context.MODE_PRIVATE)
+        context.getSharedPreferences(USER_ID, Context.MODE_PRIVATE)
 
     fun getString(key: String, defValue: String): String {
         return prefs.getString(key, defValue).toString()
@@ -14,4 +14,8 @@ class PreferenceUtil(context: Context) {
     fun setString(key: String, str: String) {
         prefs.edit().putString(key, str).apply()
     }
+
+    companion object {
+        const val USER_ID:String = "userId"
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt b/app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt
index 57cc5a4..e4081b8 100644
--- a/app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt
@@ -24,7 +24,7 @@ class LoginViewModel : ViewModel() {
                 if (response.isSuccessful) {
                     val data: ResponseLoginDto? = response.body()
                     userId = response.headers()["location"]
-                    userId?.let { LoginActivity.prefs.setString("userId", it) }
+                    userId?.let { LoginActivity.prefs.setString(USER_ID, it) }
                     liveData.value = LoginState(
                         isSuccess = true,
                         message = "로그인 성공 유저의 ID는 $userId 입니다"
@@ -47,4 +47,7 @@ class LoginViewModel : ViewModel() {
             }
         })
     }
+    companion object {
+        const val USER_ID:String = "userId"
+    }
 }
\ No newline at end of file

From 8dcb14d645333c03009cc9d4b0c8af623843140e Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Tue, 7 May 2024 02:53:50 +0900
Subject: [PATCH 22/36] =?UTF-8?q?del#10/:=20Log=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/sopt/now/ApiFactory.kt                     | 1 -
 .../presentation/auth/changepassword/ChangePasswordViewModel.kt  | 1 -
 .../java/com/sopt/now/presentation/auth/login/LoginViewModel.kt  | 1 -
 .../com/sopt/now/presentation/auth/signup/SignUpViewModel.kt     | 1 -
 .../com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt   | 1 -
 5 files changed, 5 deletions(-)

diff --git a/app/src/main/java/com/sopt/now/ApiFactory.kt b/app/src/main/java/com/sopt/now/ApiFactory.kt
index 3ae4504..3a1764e 100644
--- a/app/src/main/java/com/sopt/now/ApiFactory.kt
+++ b/app/src/main/java/com/sopt/now/ApiFactory.kt
@@ -41,7 +41,6 @@ object ApiFactory {
         @Throws(IOException::class)
         override fun intercept(chain: Interceptor.Chain): Response = with(chain) {
             val accessToken = LoginActivity.prefs.getString(USER_ID, "")
-            Log.d("Login", accessToken)
             val newRequest = request().newBuilder()
                 .addHeader("memberId", accessToken)
                 .build()
diff --git a/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordViewModel.kt b/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordViewModel.kt
index 02ee7eb..a6ccecf 100644
--- a/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordViewModel.kt
@@ -26,7 +26,6 @@ class ChangePasswordViewModel  : ViewModel() {
                         isSuccess = true,
                         message = "비밀번호가 성공적으로 변경되었습니다. 재로그인이 필요합니다."
                     )
-                    Log.d("UserInfo", "data: $data")
                 } else {
                     val error = response.message()
                     liveData.value = ChangePasswordState(
diff --git a/app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt b/app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt
index e4081b8..fe7ef99 100644
--- a/app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt
@@ -29,7 +29,6 @@ class LoginViewModel : ViewModel() {
                         isSuccess = true,
                         message = "로그인 성공 유저의 ID는 $userId 입니다"
                     )
-                    Log.d("Login", "data: $data, userId: $userId")
                 } else {
                     val error = response.message()
                     liveData.value = LoginState(
diff --git a/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpViewModel.kt b/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpViewModel.kt
index 2536872..ff5aded 100644
--- a/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpViewModel.kt
@@ -28,7 +28,6 @@ class SignUpViewModel : ViewModel() {
                         isSuccess = true,
                         message = "회원가입 성공 유저의 ID는 $userId 입니다"
                     )
-                    Log.d("SignUp", "data: $data, userId: $userId")
                 } else {
                     val error = response.message()
                     liveData.value = SignUpState(
diff --git a/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt b/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt
index 5fee56a..a6582a5 100644
--- a/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt
@@ -28,7 +28,6 @@ class UserInfoViewModel : ViewModel() {
                         userNick = data?.data?.nickname,
                         userPhone = data?.data?.phone
                     )
-                    Log.d("UserInfo", "data: $data")
                 } else {
                     val error = response.message()
                     liveData.value = UserInfoState(

From 9738471b7b235dedd682ec6e47d78d704ad80f23 Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Tue, 7 May 2024 02:59:22 +0900
Subject: [PATCH 23/36] =?UTF-8?q?mod#10/:=20location=20=EC=83=81=EC=88=98?=
 =?UTF-8?q?=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/sopt/now/PreferenceUtil.kt             | 2 +-
 .../com/sopt/now/presentation/auth/login/LoginViewModel.kt   | 5 +++--
 .../com/sopt/now/presentation/auth/signup/SignUpViewModel.kt | 5 ++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/sopt/now/PreferenceUtil.kt b/app/src/main/java/com/sopt/now/PreferenceUtil.kt
index 1675e65..4638997 100644
--- a/app/src/main/java/com/sopt/now/PreferenceUtil.kt
+++ b/app/src/main/java/com/sopt/now/PreferenceUtil.kt
@@ -16,6 +16,6 @@ class PreferenceUtil(context: Context) {
     }
 
     companion object {
-        const val USER_ID:String = "userId"
+        const val USER_ID = "userId"
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt b/app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt
index fe7ef99..deef4b1 100644
--- a/app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt
@@ -23,7 +23,7 @@ class LoginViewModel : ViewModel() {
             ) {
                 if (response.isSuccessful) {
                     val data: ResponseLoginDto? = response.body()
-                    userId = response.headers()["location"]
+                    userId = response.headers()[LOCATION]
                     userId?.let { LoginActivity.prefs.setString(USER_ID, it) }
                     liveData.value = LoginState(
                         isSuccess = true,
@@ -47,6 +47,7 @@ class LoginViewModel : ViewModel() {
         })
     }
     companion object {
-        const val USER_ID:String = "userId"
+        const val USER_ID = "userId"
+        const val LOCATION = "location"
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpViewModel.kt b/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpViewModel.kt
index ff5aded..db17f3b 100644
--- a/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpViewModel.kt
@@ -23,7 +23,7 @@ class SignUpViewModel : ViewModel() {
             ) {
                 if (response.isSuccessful) {
                     val data: ResponseSignUpDto? = response.body()
-                    val userId = response.headers()["location"]
+                    val userId = response.headers()[LOCATION]
                     liveData.value = SignUpState(
                         isSuccess = true,
                         message = "회원가입 성공 유저의 ID는 $userId 입니다"
@@ -45,4 +45,7 @@ class SignUpViewModel : ViewModel() {
             }
         })
     }
+    companion object {
+        const val LOCATION = "location"
+    }
 }
\ No newline at end of file

From b410275fcfe6f3ade6ad63d3b6bca1f7204cf7e6 Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Tue, 7 May 2024 03:11:37 +0900
Subject: [PATCH 24/36] =?UTF-8?q?mod#10/:=20=ED=95=A8=EC=88=98=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C=20=EB=8C=80=EC=8B=A0=20=EB=B0=94=EB=A1=9C=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../now/presentation/auth/login/LoginActivity.kt | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/sopt/now/presentation/auth/login/LoginActivity.kt b/app/src/main/java/com/sopt/now/presentation/auth/login/LoginActivity.kt
index 7167702..20b8bb6 100644
--- a/app/src/main/java/com/sopt/now/presentation/auth/login/LoginActivity.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/login/LoginActivity.kt
@@ -26,7 +26,12 @@ class LoginActivity : AppCompatActivity() {
 
     private fun initViews() {
         binding.btnLogin.setOnClickListener {
-            viewModel.login(getLoginRequestDto())
+            viewModel.login(
+                RequestLoginDto(
+                    authenticationId = binding.etvLoginId.text.toString(),
+                    password = binding.etvLoginPw.text.toString()
+                )
+            )
         }
     }
 
@@ -44,15 +49,6 @@ class LoginActivity : AppCompatActivity() {
         }
     }
 
-    private fun getLoginRequestDto(): RequestLoginDto {
-        val id = binding.etvLoginId.text.toString()
-        val password = binding.etvLoginPw.text.toString()
-        return RequestLoginDto(
-            authenticationId = id,
-            password = password
-        )
-    }
-
     private fun moveToSignUp() {
         binding.btnLoginSignIn.setOnClickListener {
             val intent = Intent(this, SignUpActivity::class.java)

From a7d0c95f4d545605b53453f37dc22fe6af158a91 Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Tue, 7 May 2024 03:18:02 +0900
Subject: [PATCH 25/36] =?UTF-8?q?mod#10/:=20scope=20=ED=95=A8=EC=88=98-=20?=
 =?UTF-8?q?with?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sopt/now/presentation/main/mypage/MyPageFragment.kt   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt b/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
index bd3c040..cc2ccdd 100644
--- a/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
@@ -41,9 +41,11 @@ class MyPageFragment : Fragment() {
                 Toast.LENGTH_SHORT,
             ).show()
             if (userInfoState.isSuccess) {
-                binding.tvMainNick.text=userInfoState.userNick
-                binding.tvMainId.text=userInfoState.userId
-                binding.tvMainPhone.text=userInfoState.userPhone
+                with(binding){
+                    tvMainNick.text=userInfoState.userNick
+                    tvMainId.text=userInfoState.userId
+                    tvMainPhone.text=userInfoState.userPhone
+                }
             }
         }
     }

From 1b4d44ab05857636aca8f608c767b25a6f48121d Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Tue, 7 May 2024 03:18:32 +0900
Subject: [PATCH 26/36] =?UTF-8?q?mod#10/:=20startActivity=20=EA=B0=9D?=
 =?UTF-8?q?=EC=B2=B4=20=EC=83=9D=EC=84=B1=20=EC=97=86=EC=9D=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sopt/now/presentation/auth/login/LoginActivity.kt  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/sopt/now/presentation/auth/login/LoginActivity.kt b/app/src/main/java/com/sopt/now/presentation/auth/login/LoginActivity.kt
index 20b8bb6..64a2112 100644
--- a/app/src/main/java/com/sopt/now/presentation/auth/login/LoginActivity.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/login/LoginActivity.kt
@@ -43,16 +43,18 @@ class LoginActivity : AppCompatActivity() {
                 Toast.LENGTH_SHORT,
             ).show()
             if (loginState.isSuccess) {
-                val intent = Intent(this, MainActivity::class.java)
-                startActivity(intent)
+                Intent(this, MainActivity::class.java).apply {
+                    startActivity(this)
+                }
             }
         }
     }
 
     private fun moveToSignUp() {
         binding.btnLoginSignIn.setOnClickListener {
-            val intent = Intent(this, SignUpActivity::class.java)
-            startActivity(intent)
+            Intent(this, SignUpActivity::class.java).apply {
+                startActivity(this)
+            }
         }
     }
 

From 188c2b5d8b488bc083f85bb3be941e093230223d Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Tue, 7 May 2024 03:32:06 +0900
Subject: [PATCH 27/36] =?UTF-8?q?mod#10/:=20service=20=EB=A9=94=EC=86=8C?=
 =?UTF-8?q?=EB=93=9C=EB=AA=85=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/sopt/now/data/remote/service/AuthService.kt | 4 ++--
 .../java/com/sopt/now/data/remote/service/FollwerService.kt   | 2 +-
 .../main/java/com/sopt/now/data/remote/service/UserService.kt | 4 ++--
 .../auth/changepassword/ChangePasswordViewModel.kt            | 2 +-
 .../com/sopt/now/presentation/auth/login/LoginViewModel.kt    | 2 +-
 .../com/sopt/now/presentation/auth/signup/SignUpViewModel.kt  | 2 +-
 .../com/sopt/now/presentation/main/home/FollowerViewModel.kt  | 2 +-
 .../sopt/now/presentation/main/mypage/UserInfoViewModel.kt    | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/sopt/now/data/remote/service/AuthService.kt b/app/src/main/java/com/sopt/now/data/remote/service/AuthService.kt
index 3750d59..ee3ffb6 100644
--- a/app/src/main/java/com/sopt/now/data/remote/service/AuthService.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/service/AuthService.kt
@@ -13,11 +13,11 @@ import retrofit2.http.POST
 
 interface AuthService {
     @POST("member/join") //http 메소드
-    fun signUp(
+    fun postSignUp(
         @Body request: RequestSignUpDto
     ): Call<ResponseSignUpDto> //비동기->callback
     @POST("member/login")
-    fun login(
+    fun postLogin(
         @Body request : RequestLoginDto
     ) : Call<ResponseLoginDto>
 
diff --git a/app/src/main/java/com/sopt/now/data/remote/service/FollwerService.kt b/app/src/main/java/com/sopt/now/data/remote/service/FollwerService.kt
index ce65bcb..23937f4 100644
--- a/app/src/main/java/com/sopt/now/data/remote/service/FollwerService.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/service/FollwerService.kt
@@ -7,7 +7,7 @@ import retrofit2.http.Query
 
 interface FollwerService {
     @GET("/api/users")
-    fun followerInfo(
+    fun getFollowerInfo(
        @Query ("page") page : Int
     ) : Call<ResponseFollowerDto>
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/data/remote/service/UserService.kt b/app/src/main/java/com/sopt/now/data/remote/service/UserService.kt
index 9250749..d7c03e3 100644
--- a/app/src/main/java/com/sopt/now/data/remote/service/UserService.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/service/UserService.kt
@@ -10,10 +10,10 @@ import retrofit2.http.PATCH
 
 interface UserService {
     @GET("/member/info")
-    fun userInfo() : Call<ResponseUserInfoDto>
+    fun getUserInfo() : Call<ResponseUserInfoDto>
 
     @PATCH("member/password")
-    fun changePassword(
+    fun patchChangePassword(
         @Body request : RequestChagePwDto
     ) : Call<ResponseChangePwDto>
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordViewModel.kt b/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordViewModel.kt
index a6ccecf..0c982bb 100644
--- a/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordViewModel.kt
@@ -15,7 +15,7 @@ class ChangePasswordViewModel  : ViewModel() {
     val liveData = MutableLiveData<ChangePasswordState>()
 
     fun changePassword(request : RequestChagePwDto) {
-        userService.changePassword(request).enqueue(object : Callback<ResponseChangePwDto> {
+        userService.patchChangePassword(request).enqueue(object : Callback<ResponseChangePwDto> {
             override fun onResponse(
                 call: Call<ResponseChangePwDto>,
                 response: Response<ResponseChangePwDto>,
diff --git a/app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt b/app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt
index deef4b1..76e3755 100644
--- a/app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt
@@ -16,7 +16,7 @@ class LoginViewModel : ViewModel() {
     val liveData = MutableLiveData<LoginState>()
     var userId: String? = ""
     fun login(request: RequestLoginDto) {
-        authService.login(request).enqueue(object : Callback<ResponseLoginDto> {
+        authService.postLogin(request).enqueue(object : Callback<ResponseLoginDto> {
             override fun onResponse(
                 call: Call<ResponseLoginDto>,
                 response: Response<ResponseLoginDto>,
diff --git a/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpViewModel.kt b/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpViewModel.kt
index db17f3b..b84c35f 100644
--- a/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpViewModel.kt
@@ -16,7 +16,7 @@ class SignUpViewModel : ViewModel() {
     val liveData = MutableLiveData<SignUpState>()
 
     fun signUp(request: RequestSignUpDto) {
-        authService.signUp(request).enqueue(object : Callback<ResponseSignUpDto> {
+        authService.postSignUp(request).enqueue(object : Callback<ResponseSignUpDto> {
             override fun onResponse(
                 call: Call<ResponseSignUpDto>,
                 response: Response<ResponseSignUpDto>,
diff --git a/app/src/main/java/com/sopt/now/presentation/main/home/FollowerViewModel.kt b/app/src/main/java/com/sopt/now/presentation/main/home/FollowerViewModel.kt
index 0660707..fa765f8 100644
--- a/app/src/main/java/com/sopt/now/presentation/main/home/FollowerViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/home/FollowerViewModel.kt
@@ -13,7 +13,7 @@ class FollowerViewModel : ViewModel() {
     val liveData = MutableLiveData<FollowerState>()
 
     fun followerInfo(page:Int) {
-        followerService.followerInfo(page).enqueue(object : Callback<ResponseFollowerDto> {
+        followerService.getFollowerInfo(page).enqueue(object : Callback<ResponseFollowerDto> {
             override fun onResponse(
                 call: Call<ResponseFollowerDto>,
                 response: Response<ResponseFollowerDto>,
diff --git a/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt b/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt
index a6582a5..39c4ca0 100644
--- a/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt
@@ -14,7 +14,7 @@ class UserInfoViewModel : ViewModel() {
     val liveData = MutableLiveData<UserInfoState>()
 
     fun userInfo() {
-        userService.userInfo().enqueue(object : Callback<ResponseUserInfoDto> {
+        userService.getUserInfo().enqueue(object : Callback<ResponseUserInfoDto> {
             override fun onResponse(
                 call: Call<ResponseUserInfoDto>,
                 response: Response<ResponseUserInfoDto>,

From 2d212435c0f252df7d686df2dbd13437d08cbfed Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Sat, 11 May 2024 00:13:15 +0900
Subject: [PATCH 28/36] =?UTF-8?q?mod#10/:=20=EB=B7=B0=EB=AA=A8=EB=8D=B8=20?=
 =?UTF-8?q?init?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sopt/now/presentation/main/mypage/MyPageFragment.kt  | 5 -----
 .../sopt/now/presentation/main/mypage/UserInfoViewModel.kt   | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt b/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
index cc2ccdd..1a62394 100644
--- a/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
@@ -22,7 +22,6 @@ class MyPageFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View? {
         _binding = FragmentMyPageBinding.inflate(inflater, container, false)
-        initViews()
         initObserver()
         moveToChangePassword()
         return binding.root
@@ -50,10 +49,6 @@ class MyPageFragment : Fragment() {
         }
     }
 
-    private fun initViews() {
-            viewModel.userInfo()
-    }
-
     private fun moveToChangePassword(){
         binding.tvChangePassword.setOnClickListener {
             Intent(activity, ChangePasswordActivity::class.java).apply{
diff --git a/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt b/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt
index 39c4ca0..02c2a1b 100644
--- a/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt
@@ -13,6 +13,10 @@ class UserInfoViewModel : ViewModel() {
     private val userService by lazy { ServicePool.userService }
     val liveData = MutableLiveData<UserInfoState>()
 
+    init{
+        userInfo()
+    }
+
     fun userInfo() {
         userService.getUserInfo().enqueue(object : Callback<ResponseUserInfoDto> {
             override fun onResponse(

From 38c705c1b6f0bf5ac4c3e45d9bbea4e4934a3f53 Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Sat, 11 May 2024 01:36:01 +0900
Subject: [PATCH 29/36] mod#10/: backing properties

---
 .../now/presentation/auth/login/LoginViewModel.kt    | 12 ++++++++----
 .../now/presentation/auth/signup/SignUpViewModel.kt  | 11 +++++++----
 .../now/presentation/main/home/FollowerViewModel.kt  | 11 +++++++----
 .../presentation/main/mypage/UserInfoViewModel.kt    | 12 ++++++++----
 4 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt b/app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt
index 76e3755..53e0a92 100644
--- a/app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt
@@ -1,6 +1,7 @@
 package com.sopt.now.presentation.auth.login
 
 import android.util.Log
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.sopt.now.ServicePool
@@ -13,8 +14,11 @@ import retrofit2.Response
 
 class LoginViewModel : ViewModel() {
     private val authService by lazy { ServicePool.authService }
-    val liveData = MutableLiveData<LoginState>()
+    private val _liveData = MutableLiveData<LoginState>()
+    val liveData : LiveData<LoginState>
+        get() = _liveData
     var userId: String? = ""
+
     fun login(request: RequestLoginDto) {
         authService.postLogin(request).enqueue(object : Callback<ResponseLoginDto> {
             override fun onResponse(
@@ -25,13 +29,13 @@ class LoginViewModel : ViewModel() {
                     val data: ResponseLoginDto? = response.body()
                     userId = response.headers()[LOCATION]
                     userId?.let { LoginActivity.prefs.setString(USER_ID, it) }
-                    liveData.value = LoginState(
+                    _liveData.value = LoginState(
                         isSuccess = true,
                         message = "로그인 성공 유저의 ID는 $userId 입니다"
                     )
                 } else {
                     val error = response.message()
-                    liveData.value = LoginState(
+                    _liveData.value = LoginState(
                         isSuccess = false,
                         message = "로그인이 실패했습니다 $error"
                     )
@@ -39,7 +43,7 @@ class LoginViewModel : ViewModel() {
             }
 
             override fun onFailure(call: Call<ResponseLoginDto>, t: Throwable) {
-                liveData.value = LoginState(
+                _liveData.value = LoginState(
                     isSuccess = false,
                     message = "서버에러"
                 )
diff --git a/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpViewModel.kt b/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpViewModel.kt
index b84c35f..4b15e95 100644
--- a/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpViewModel.kt
@@ -1,6 +1,7 @@
 package com.sopt.now.presentation.auth.signup
 
 import android.util.Log
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.sopt.now.ServicePool
@@ -13,7 +14,9 @@ import retrofit2.Response
 
 class SignUpViewModel : ViewModel() {
     private val authService by lazy { ServicePool.authService }
-    val liveData = MutableLiveData<SignUpState>()
+    val _liveData = MutableLiveData<SignUpState>()
+    val liveData : LiveData<SignUpState>
+        get()= _liveData
 
     fun signUp(request: RequestSignUpDto) {
         authService.postSignUp(request).enqueue(object : Callback<ResponseSignUpDto> {
@@ -24,13 +27,13 @@ class SignUpViewModel : ViewModel() {
                 if (response.isSuccessful) {
                     val data: ResponseSignUpDto? = response.body()
                     val userId = response.headers()[LOCATION]
-                    liveData.value = SignUpState(
+                    _liveData.value = SignUpState(
                         isSuccess = true,
                         message = "회원가입 성공 유저의 ID는 $userId 입니다"
                     )
                 } else {
                     val error = response.message()
-                    liveData.value = SignUpState(
+                    _liveData.value = SignUpState(
                         isSuccess = false,
                         message = "회원가입이 실패했습니다 $error"
                     )
@@ -38,7 +41,7 @@ class SignUpViewModel : ViewModel() {
             }
 
             override fun onFailure(call: Call<ResponseSignUpDto>, t: Throwable) {
-                liveData.value = SignUpState(
+                _liveData.value = SignUpState(
                     isSuccess = false,
                     message = "서버에러"
                 )
diff --git a/app/src/main/java/com/sopt/now/presentation/main/home/FollowerViewModel.kt b/app/src/main/java/com/sopt/now/presentation/main/home/FollowerViewModel.kt
index fa765f8..830ef0f 100644
--- a/app/src/main/java/com/sopt/now/presentation/main/home/FollowerViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/home/FollowerViewModel.kt
@@ -1,5 +1,6 @@
 package com.sopt.now.presentation.main.home
 
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.sopt.now.ServicePool
@@ -10,7 +11,9 @@ import retrofit2.Response
 
 class FollowerViewModel : ViewModel() {
     private val followerService by lazy { ServicePool.followerService }
-    val liveData = MutableLiveData<FollowerState>()
+    private val _liveData = MutableLiveData<FollowerState>()
+    val liveData : LiveData<FollowerState>
+        get()=_liveData
 
     fun followerInfo(page:Int) {
         followerService.getFollowerInfo(page).enqueue(object : Callback<ResponseFollowerDto> {
@@ -20,13 +23,13 @@ class FollowerViewModel : ViewModel() {
             ) {
                 if (response.isSuccessful) {
                     val data: ResponseFollowerDto? = response.body()
-                    liveData.value = FollowerState(
+                    _liveData.value = FollowerState(
                         isSuccess = true,
                         message = "팔로워 정보 불러오기에 성공했습니다.",
                     )
                 } else {
                     val error = response.message()
-                    liveData.value = FollowerState(
+                    _liveData.value = FollowerState(
                         isSuccess = false,
                         message = "팔로워 정보 불러오기에 실패했습니다.  $error"
                     )
@@ -34,7 +37,7 @@ class FollowerViewModel : ViewModel() {
             }
 
             override fun onFailure(call: Call<ResponseFollowerDto>, t: Throwable) {
-                liveData.value = FollowerState(
+                _liveData.value = FollowerState(
                     isSuccess = false,
                     message = "서버에러"
                 )
diff --git a/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt b/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt
index 02c2a1b..ab30afb 100644
--- a/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt
@@ -1,17 +1,21 @@
 package com.sopt.now.presentation.main.mypage
 
 import android.util.Log
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.sopt.now.ServicePool
 import com.sopt.now.data.remote.dto.response.ResponseUserInfoDto
+import com.sopt.now.data.remote.dto.response.UserInfo
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 
 class UserInfoViewModel : ViewModel() {
     private val userService by lazy { ServicePool.userService }
-    val liveData = MutableLiveData<UserInfoState>()
+    private val _liveData = MutableLiveData<UserInfoState>()
+    val liveData : LiveData<UserInfoState>
+        get()=_liveData
 
     init{
         userInfo()
@@ -25,7 +29,7 @@ class UserInfoViewModel : ViewModel() {
             ) {
                 if (response.isSuccessful) {
                     val data: ResponseUserInfoDto? = response.body()
-                    liveData.value = UserInfoState(
+                    _liveData.value = UserInfoState(
                         isSuccess = true,
                         message = "회원 정보 불러오기에 성공했습니다.",
                         userId = data?.data?.authenticationId,
@@ -34,7 +38,7 @@ class UserInfoViewModel : ViewModel() {
                     )
                 } else {
                     val error = response.message()
-                    liveData.value = UserInfoState(
+                    _liveData.value = UserInfoState(
                         isSuccess = false,
                         message = "회원 정보 불러오기에 실패했습니다.  $error"
                     )
@@ -42,7 +46,7 @@ class UserInfoViewModel : ViewModel() {
             }
 
             override fun onFailure(call: Call<ResponseUserInfoDto>, t: Throwable) {
-                liveData.value = UserInfoState(
+                _liveData.value = UserInfoState(
                     isSuccess = false,
                     message = "서버에러"
                 )

From 19e6b141545e131d3de8fa3c290e487bdf6d30f7 Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Sat, 11 May 2024 02:02:32 +0900
Subject: [PATCH 30/36] =?UTF-8?q?feat#10/:=20Binding=20Fragment=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/sopt/now/BindingFragment.kt | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 app/src/main/java/com/sopt/now/BindingFragment.kt

diff --git a/app/src/main/java/com/sopt/now/BindingFragment.kt b/app/src/main/java/com/sopt/now/BindingFragment.kt
new file mode 100644
index 0000000..dd242af
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/BindingFragment.kt
@@ -0,0 +1,30 @@
+package com.sopt.now
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.viewbinding.ViewBinding
+
+abstract class BindingFragment<T : ViewBinding> : Fragment() {
+    private var _binding: T? = null
+    val binding: T
+        get() = requireNotNull(_binding) { "_binding이 null이 아닌 경우만 _binding 반환" }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        _binding = fragmentBinding(inflater, container)
+        return binding.root
+    }
+
+    abstract fun fragmentBinding(inflater: LayoutInflater, container: ViewGroup?): T
+
+    override fun onDestroyView() {
+        _binding = null
+        super.onDestroyView()
+    }
+}
\ No newline at end of file

From c4bc655da17e957a9e31440b3341abb18865d123 Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Sat, 11 May 2024 02:06:06 +0900
Subject: [PATCH 31/36] =?UTF-8?q?mod#10/:=20Binding=20Fragment=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/main/home/HomeFragment.kt    | 24 ++++---------
 .../main/mypage/MyPageFragment.kt             | 36 ++++++++-----------
 .../main/search/SearchFragment.kt             | 25 ++++---------
 3 files changed, 26 insertions(+), 59 deletions(-)

diff --git a/app/src/main/java/com/sopt/now/presentation/main/home/HomeFragment.kt b/app/src/main/java/com/sopt/now/presentation/main/home/HomeFragment.kt
index 250f2b6..21f23af 100644
--- a/app/src/main/java/com/sopt/now/presentation/main/home/HomeFragment.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/home/HomeFragment.kt
@@ -4,24 +4,17 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.sopt.now.BindingFragment
 import com.sopt.now.databinding.FragmentHomeBinding
 
-class HomeFragment : Fragment() {
-    private val binding: FragmentHomeBinding
-        get() = requireNotNull(_binding) { "_binding이 null이 아닌 경우만 _binding 반환" }
-    private var _binding: FragmentHomeBinding? = null
+class HomeFragment : BindingFragment<FragmentHomeBinding>() {
     private val viewModel by viewModels<HomeViewModel>()
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = FragmentHomeBinding.inflate(inflater, container, false)
-        return binding.root
-    }
+    override fun fragmentBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?
+    ): FragmentHomeBinding = FragmentHomeBinding.inflate(inflater, container, false)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -32,9 +25,4 @@ class HomeFragment : Fragment() {
         }
         homeListAdapter.setHomeList(viewModel.homeListData)
     }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt b/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
index 1a62394..0199280 100644
--- a/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
@@ -6,30 +6,22 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
+import com.sopt.now.BindingFragment
 import com.sopt.now.databinding.FragmentMyPageBinding
 import com.sopt.now.presentation.auth.changepassword.ChangePasswordActivity
 
-class MyPageFragment : Fragment() {
-    private val binding: FragmentMyPageBinding
-        get() = requireNotNull(_binding) { "_binding이 null이 아닌 경우만 _binding 반환" }
-    private var _binding: FragmentMyPageBinding? = null
+class MyPageFragment : BindingFragment<FragmentMyPageBinding>() {
     private val viewModel by viewModels<UserInfoViewModel>()
+    override fun fragmentBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?
+    ): FragmentMyPageBinding = FragmentMyPageBinding.inflate(inflater, container, false)
 
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        _binding = FragmentMyPageBinding.inflate(inflater, container, false)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         initObserver()
         moveToChangePassword()
-        return binding.root
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
     }
 
     private fun initObserver() {
@@ -40,18 +32,18 @@ class MyPageFragment : Fragment() {
                 Toast.LENGTH_SHORT,
             ).show()
             if (userInfoState.isSuccess) {
-                with(binding){
-                    tvMainNick.text=userInfoState.userNick
-                    tvMainId.text=userInfoState.userId
-                    tvMainPhone.text=userInfoState.userPhone
+                with(binding) {
+                    tvMainNick.text = userInfoState.userNick
+                    tvMainId.text = userInfoState.userId
+                    tvMainPhone.text = userInfoState.userPhone
                 }
             }
         }
     }
 
-    private fun moveToChangePassword(){
+    private fun moveToChangePassword() {
         binding.tvChangePassword.setOnClickListener {
-            Intent(activity, ChangePasswordActivity::class.java).apply{
+            Intent(activity, ChangePasswordActivity::class.java).apply {
                 startActivity(this)
                 activity?.finish()
             }
diff --git a/app/src/main/java/com/sopt/now/presentation/main/search/SearchFragment.kt b/app/src/main/java/com/sopt/now/presentation/main/search/SearchFragment.kt
index 832234a..a9df7e6 100644
--- a/app/src/main/java/com/sopt/now/presentation/main/search/SearchFragment.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/search/SearchFragment.kt
@@ -1,27 +1,14 @@
 package com.sopt.now.presentation.main.search
 
-import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import com.sopt.now.R
+import com.sopt.now.BindingFragment
 import com.sopt.now.databinding.FragmentSearchBinding
 
-class SearchFragment : Fragment() {
-    private val binding: FragmentSearchBinding
-        get()= requireNotNull(_binding){"_binding이 null이 아닌 경우만 _binding 반환"}
-    private var _binding: FragmentSearchBinding?= null
+class SearchFragment : BindingFragment<FragmentSearchBinding>() {
+    override fun fragmentBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?
+    ): FragmentSearchBinding = FragmentSearchBinding.inflate(inflater, container, false)
 
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_search, container, false)
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
 }
\ No newline at end of file

From 08544b04ea4650eb2378652d8af36a1cc1c30abd Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Sat, 11 May 2024 04:57:57 +0900
Subject: [PATCH 32/36] =?UTF-8?q?mod#10/:=20=EC=B6=95=EC=95=BD=EC=96=B4=20?=
 =?UTF-8?q?nick=20->=20nickname?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../remote/dto/request/RequestSignUpDto.kt     |  4 ++--
 .../remote/dto/response/ResponseUserInfoDto.kt |  4 ++--
 .../presentation/auth/signup/SignUpActivity.kt |  4 ++--
 .../presentation/main/mypage/MyPageFragment.kt |  2 +-
 .../presentation/main/mypage/UserInfoState.kt  |  2 +-
 .../main/mypage/UserInfoViewModel.kt           |  2 +-
 app/src/main/res/layout/activity_main.xml      |  4 ++--
 app/src/main/res/layout/activity_sign_up.xml   | 18 +++++++++---------
 app/src/main/res/layout/fragment_my_page.xml   |  4 ++--
 app/src/main/res/values/strings.xml            |  8 ++++----
 10 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/sopt/now/data/remote/dto/request/RequestSignUpDto.kt b/app/src/main/java/com/sopt/now/data/remote/dto/request/RequestSignUpDto.kt
index abb97ab..70fc97b 100644
--- a/app/src/main/java/com/sopt/now/data/remote/dto/request/RequestSignUpDto.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/dto/request/RequestSignUpDto.kt
@@ -9,8 +9,8 @@ data class RequestSignUpDto(
     val authenticationId: String,
     @SerialName("password")
     val password: String,
-    @SerialName("nickname")
-    val nickname: String,
+    @SerialName("nicknamename")
+    val nicknamename: String,
     @SerialName("phone")
     val phone: String,
 )
diff --git a/app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseUserInfoDto.kt b/app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseUserInfoDto.kt
index b3488b7..6d46336 100644
--- a/app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseUserInfoDto.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseUserInfoDto.kt
@@ -16,8 +16,8 @@ data class ResponseUserInfoDto (
 data class UserInfo (
     @SerialName("authenticationId")
     val authenticationId: String,
-    @SerialName("nickname")
-    val nickname: String,
+    @SerialName("nicknamename")
+    val nicknamename: String,
     @SerialName("phone")
     val phone: String
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpActivity.kt b/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpActivity.kt
index 1cd9d72..97a2b4a 100644
--- a/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpActivity.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpActivity.kt
@@ -42,12 +42,12 @@ class SignUpActivity : AppCompatActivity() {
     private fun getSignUpRequestDto(): RequestSignUpDto {
         val id = binding.etvSignUpId.text.toString()
         val password = binding.etvSignUpPw.text.toString()
-        val nickname = binding.etvSignUpNick.text.toString()
+        val nicknamename = binding.etvSignUpNickname.text.toString()
         val phoneNumber = binding.etvSignUpPhone.text.toString()
         return RequestSignUpDto(
             authenticationId = id,
             password = password,
-            nickname = nickname,
+            nicknamename = nicknamename,
             phone = phoneNumber
         )
     }
diff --git a/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt b/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
index 0199280..74295c0 100644
--- a/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt
@@ -33,7 +33,7 @@ class MyPageFragment : BindingFragment<FragmentMyPageBinding>() {
             ).show()
             if (userInfoState.isSuccess) {
                 with(binding) {
-                    tvMainNick.text = userInfoState.userNick
+                    tvMainNickname.text = userInfoState.userNickname
                     tvMainId.text = userInfoState.userId
                     tvMainPhone.text = userInfoState.userPhone
                 }
diff --git a/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoState.kt b/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoState.kt
index 8568335..f696e16 100644
--- a/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoState.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoState.kt
@@ -4,6 +4,6 @@ data class UserInfoState(
     val isSuccess: Boolean,
     val message: String,
     val userId : String? = "",
-    val userNick : String? = "",
+    val userNickname : String? = "",
     val userPhone : String? = ""
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt b/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt
index ab30afb..a854d49 100644
--- a/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/main/mypage/UserInfoViewModel.kt
@@ -33,7 +33,7 @@ class UserInfoViewModel : ViewModel() {
                         isSuccess = true,
                         message = "회원 정보 불러오기에 성공했습니다.",
                         userId = data?.data?.authenticationId,
-                        userNick = data?.data?.nickname,
+                        userNickname = data?.data?.nicknamename,
                         userPhone = data?.data?.phone
                     )
                 } else {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4fa2144..b31d74f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -64,7 +64,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tv_main_title2" />
     <TextView
-        android:id="@+id/tv_main_nick"
+        android:id="@+id/tv_main_nickname"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="30dp"
@@ -86,7 +86,7 @@
         android:textSize="25sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_main_nick" />
+        app:layout_constraintTop_toBottomOf="@id/tv_main_nickname" />
     <TextView
         android:id="@+id/tv_main_id"
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml
index 4e1c9f6..e414d06 100644
--- a/app/src/main/res/layout/activity_sign_up.xml
+++ b/app/src/main/res/layout/activity_sign_up.xml
@@ -81,10 +81,10 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
     <TextView
-        android:id="@+id/tv_sign_up_nick"
+        android:id="@+id/tv_sign_up_nickname"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/nick"
+        android:text="@string/nickname"
         android:textStyle="bold"
         android:textSize="20sp"
         android:layout_marginHorizontal="30dp"
@@ -92,22 +92,22 @@
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginTop="30dp"/>
     <TextView
-        android:id="@+id/tv_sign_up_nivk_hint"
+        android:id="@+id/tv_sign_up_nickname_hint"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/sign_up_nick_text"
+        android:text="@string/sign_up_nickname_text"
         android:textSize="15sp"
         android:layout_marginHorizontal="30dp"
-        app:layout_constraintTop_toBottomOf="@id/tv_sign_up_nick"
+        app:layout_constraintTop_toBottomOf="@id/tv_sign_up_nickname"
         app:layout_constraintStart_toStartOf="parent"/>
     <EditText
-        android:id="@+id/etv_sign_up_nick"
+        android:id="@+id/etv_sign_up_nickname"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:hint="@string/sign_up_nick_hint"
+        android:hint="@string/sign_up_nickname_hint"
         android:singleLine="true"
         android:layout_marginHorizontal="30dp"
-        app:layout_constraintTop_toBottomOf="@id/tv_sign_up_nivk_hint"
+        app:layout_constraintTop_toBottomOf="@id/tv_sign_up_nickname_hint"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
     <TextView
@@ -118,7 +118,7 @@
         android:textStyle="bold"
         android:textSize="20sp"
         android:layout_marginHorizontal="30dp"
-        app:layout_constraintTop_toBottomOf="@id/etv_sign_up_nick"
+        app:layout_constraintTop_toBottomOf="@id/etv_sign_up_nickname"
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginTop="30dp"/>
     <TextView
diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml
index 7d8bfba..829193b 100644
--- a/app/src/main/res/layout/fragment_my_page.xml
+++ b/app/src/main/res/layout/fragment_my_page.xml
@@ -18,7 +18,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
     <TextView
-        android:id="@+id/tv_main_nick"
+        android:id="@+id/tv_main_nickname"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="30dp"
@@ -40,7 +40,7 @@
         android:textSize="25sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_main_nick" />
+        app:layout_constraintTop_toBottomOf="@id/tv_main_nickname" />
     <TextView
         android:id="@+id/tv_main_id"
         android:layout_width="0dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 25dda62..77fe6fe 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,7 +8,7 @@
     <string name="login_btn">로그인 하기</string>
     <string name="main_title">NOW SOPT</string>
     <string name="main_title2">SHOUT OUR PASSION TOGETHER</string>
-    <string name="nick">닉네임</string>
+    <string name="nickname">닉네임</string>
     <string name="etc">하고싶은 말</string>
     <string name="phone">전화번호</string>
     <!--LOGIN-->
@@ -23,8 +23,8 @@
     <string name="sign_up_id_hint">아이디를 입력해주세요</string>
     <string name="sign_up_pw_condition">*최소 8글자 이상, 숫자, 문자(a-z, A-Z), 특수문자 포함.</string>
     <string name="sign_up_pw_hint">비밀번호를 입력해주세요</string>
-    <string name="sign_up_nick_text">*한 글자 이상 입력해주세요.</string>
-    <string name="sign_up_nick_hint">닉네임을 입력해주세요</string>
+    <string name="sign_up_nickname_text">*한 글자 이상 입력해주세요.</string>
+    <string name="sign_up_nickname_hint">닉네임을 입력해주세요</string>
     <string name="sign_up_etc_text">*한 글자 이상 입력해주세요.</string>
     <string name="sign_up_etc_hint">하고싶은 말을 입력해주세요</string>
     <string name="sign_up_success">회원가입에 성공했습니다.</string>
@@ -32,7 +32,7 @@
     <string name="sign_up_error_blank">모든 항목을 입력해주세요.</string>
     <string name="sign_up_error_id">아이디를 다시 설정하세요.</string>
     <string name="sign_up_error_pw">비밀번호를 다시 설정하세요.</string>
-    <string name="sign_up_error_nick">닉네임을 다시 설정하세요.</string>
+    <string name="sign_up_error_nickname">닉네임을 다시 설정하세요.</string>
     <string name="sign_up_error_etc">하고싶은 말을 다시 설정하세요.</string>
     <string name="sign_up_phone_text">*(-)하이픈을 포함해 입력해주세요.</string>
     <string name="sign_up_phone_hint">예시)010-0000-0000</string>

From da21a0541f65741bfad799cbf28f8ea5ab60cbd9 Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Sat, 11 May 2024 04:58:43 +0900
Subject: [PATCH 33/36] =?UTF-8?q?chore#10/:=20gradle=20kotlin=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index eddae64..8ca63a7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -37,7 +37,7 @@ android {
     }
     buildFeatures {
         viewBinding = true
-        buildConfig true
+        buildConfig = true
     }
 }
 

From c9b42a415b48c1901c7e44e199a2f6a243162bc2 Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Sat, 11 May 2024 05:00:10 +0900
Subject: [PATCH 34/36] =?UTF-8?q?mod#10/:=20=EC=B6=95=EC=95=BD=EC=96=B4=20?=
 =?UTF-8?q?pw=20->=20password?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../remote/dto/request/RequestChagePwDto.kt    |  2 +-
 .../remote/dto/response/ResponseChangePwDto.kt |  2 +-
 .../now/data/remote/service/AuthService.kt     |  4 ++--
 .../now/data/remote/service/UserService.kt     |  8 ++++----
 .../changepassword/ChangePasswordActivity.kt   |  6 +++---
 .../changepassword/ChangePasswordViewModel.kt  | 16 ++++++++--------
 .../presentation/auth/login/LoginActivity.kt   |  2 +-
 .../presentation/auth/signup/SignUpActivity.kt |  2 +-
 .../res/layout/activity_change_password.xml    |  4 ++--
 app/src/main/res/layout/activity_login.xml     | 10 +++++-----
 app/src/main/res/layout/activity_main.xml      |  8 ++++----
 app/src/main/res/layout/activity_sign_up.xml   | 18 +++++++++---------
 app/src/main/res/values/strings.xml            | 10 +++++-----
 gradlew                                        |  4 ++--
 14 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/com/sopt/now/data/remote/dto/request/RequestChagePwDto.kt b/app/src/main/java/com/sopt/now/data/remote/dto/request/RequestChagePwDto.kt
index 2d95a8e..b68bdeb 100644
--- a/app/src/main/java/com/sopt/now/data/remote/dto/request/RequestChagePwDto.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/dto/request/RequestChagePwDto.kt
@@ -5,7 +5,7 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 
-data class RequestChagePwDto (
+data class RequestChagePasswordDto (
     @SerialName("previousPassword")
     val previousPassword: String,
     @SerialName("newPassword")
diff --git a/app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseChangePwDto.kt b/app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseChangePwDto.kt
index 085fb66..ae1e2c7 100644
--- a/app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseChangePwDto.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/dto/response/ResponseChangePwDto.kt
@@ -5,7 +5,7 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 
-data class ResponseChangePwDto (
+data class ResponseChangePasswordDto (
     @SerialName("code")
     val code: Int,
     @SerialName("message")
diff --git a/app/src/main/java/com/sopt/now/data/remote/service/AuthService.kt b/app/src/main/java/com/sopt/now/data/remote/service/AuthService.kt
index ee3ffb6..b903ba7 100644
--- a/app/src/main/java/com/sopt/now/data/remote/service/AuthService.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/service/AuthService.kt
@@ -1,9 +1,9 @@
 package com.sopt.now.data.remote.service
 
-import com.sopt.now.data.remote.dto.request.RequestChagePwDto
+import com.sopt.now.data.remote.dto.request.RequestChagePasswordDto
 import com.sopt.now.data.remote.dto.request.RequestLoginDto
 import com.sopt.now.data.remote.dto.request.RequestSignUpDto
-import com.sopt.now.data.remote.dto.response.ResponseChangePwDto
+import com.sopt.now.data.remote.dto.response.ResponseChangePasswordDto
 import com.sopt.now.data.remote.dto.response.ResponseLoginDto
 import com.sopt.now.data.remote.dto.response.ResponseSignUpDto
 import retrofit2.Call
diff --git a/app/src/main/java/com/sopt/now/data/remote/service/UserService.kt b/app/src/main/java/com/sopt/now/data/remote/service/UserService.kt
index d7c03e3..1b86854 100644
--- a/app/src/main/java/com/sopt/now/data/remote/service/UserService.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/service/UserService.kt
@@ -1,7 +1,7 @@
 package com.sopt.now.data.remote.service
 
-import com.sopt.now.data.remote.dto.request.RequestChagePwDto
-import com.sopt.now.data.remote.dto.response.ResponseChangePwDto
+import com.sopt.now.data.remote.dto.request.RequestChagePasswordDto
+import com.sopt.now.data.remote.dto.response.ResponseChangePasswordDto
 import com.sopt.now.data.remote.dto.response.ResponseUserInfoDto
 import retrofit2.Call
 import retrofit2.http.Body
@@ -14,6 +14,6 @@ interface UserService {
 
     @PATCH("member/password")
     fun patchChangePassword(
-        @Body request : RequestChagePwDto
-    ) : Call<ResponseChangePwDto>
+        @Body request : RequestChagePasswordDto
+    ) : Call<ResponseChangePasswordDto>
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordActivity.kt b/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordActivity.kt
index 6c0adb7..26b7ffa 100644
--- a/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordActivity.kt
@@ -6,7 +6,7 @@ import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import com.sopt.now.PreferenceUtil
-import com.sopt.now.data.remote.dto.request.RequestChagePwDto
+import com.sopt.now.data.remote.dto.request.RequestChagePasswordDto
 import com.sopt.now.databinding.ActivityChangePasswordBinding
 import com.sopt.now.presentation.auth.login.LoginActivity
 
@@ -43,11 +43,11 @@ class ChangePasswordActivity : AppCompatActivity() {
         }
     }
 
-    private fun getChangePasswordRequestDto(): RequestChagePwDto {
+    private fun getChangePasswordRequestDto(): RequestChagePasswordDto {
         val oldPassword = binding.etvOldPassword.text.toString()
         val newPassword = binding.etvNewPassword.text.toString()
         val checkPassword = binding.etvNewPasswordCheck.text.toString()
-        return RequestChagePwDto(
+        return RequestChagePasswordDto(
             previousPassword = oldPassword,
             newPassword = newPassword,
             newPasswordVerification = checkPassword
diff --git a/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordViewModel.kt b/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordViewModel.kt
index 0c982bb..4b9fb45 100644
--- a/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/changepassword/ChangePasswordViewModel.kt
@@ -4,8 +4,8 @@ import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.sopt.now.ServicePool
-import com.sopt.now.data.remote.dto.request.RequestChagePwDto
-import com.sopt.now.data.remote.dto.response.ResponseChangePwDto
+import com.sopt.now.data.remote.dto.request.RequestChagePasswordDto
+import com.sopt.now.data.remote.dto.response.ResponseChangePasswordDto
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -14,14 +14,14 @@ class ChangePasswordViewModel  : ViewModel() {
     private val userService by lazy { ServicePool.userService }
     val liveData = MutableLiveData<ChangePasswordState>()
 
-    fun changePassword(request : RequestChagePwDto) {
-        userService.patchChangePassword(request).enqueue(object : Callback<ResponseChangePwDto> {
+    fun changePassword(request : RequestChagePasswordDto) {
+        userService.patchChangePassword(request).enqueue(object : Callback<ResponseChangePasswordDto> {
             override fun onResponse(
-                call: Call<ResponseChangePwDto>,
-                response: Response<ResponseChangePwDto>,
+                call: Call<ResponseChangePasswordDto>,
+                response: Response<ResponseChangePasswordDto>,
             ) {
                 if (response.isSuccessful) {
-                    val data: ResponseChangePwDto? = response.body()
+                    val data: ResponseChangePasswordDto? = response.body()
                     liveData.value = ChangePasswordState(
                         isSuccess = true,
                         message = "비밀번호가 성공적으로 변경되었습니다. 재로그인이 필요합니다."
@@ -35,7 +35,7 @@ class ChangePasswordViewModel  : ViewModel() {
                 }
             }
 
-            override fun onFailure(call: Call<ResponseChangePwDto>, t: Throwable) {
+            override fun onFailure(call: Call<ResponseChangePasswordDto>, t: Throwable) {
                 liveData.value = ChangePasswordState(
                     isSuccess = false,
                     message = "서버에러"
diff --git a/app/src/main/java/com/sopt/now/presentation/auth/login/LoginActivity.kt b/app/src/main/java/com/sopt/now/presentation/auth/login/LoginActivity.kt
index 64a2112..692cdb4 100644
--- a/app/src/main/java/com/sopt/now/presentation/auth/login/LoginActivity.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/login/LoginActivity.kt
@@ -29,7 +29,7 @@ class LoginActivity : AppCompatActivity() {
             viewModel.login(
                 RequestLoginDto(
                     authenticationId = binding.etvLoginId.text.toString(),
-                    password = binding.etvLoginPw.text.toString()
+                    password = binding.etvLoginPassword.text.toString()
                 )
             )
         }
diff --git a/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpActivity.kt b/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpActivity.kt
index 97a2b4a..24eebb6 100644
--- a/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpActivity.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpActivity.kt
@@ -41,7 +41,7 @@ class SignUpActivity : AppCompatActivity() {
 
     private fun getSignUpRequestDto(): RequestSignUpDto {
         val id = binding.etvSignUpId.text.toString()
-        val password = binding.etvSignUpPw.text.toString()
+        val password = binding.etvSignUpPassword.text.toString()
         val nicknamename = binding.etvSignUpNickname.text.toString()
         val phoneNumber = binding.etvSignUpPhone.text.toString()
         return RequestSignUpDto(
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index d65a4a1..3dd5616 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -43,7 +43,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:textSize="15sp"
-        android:hint="@string/sign_up_pw_condition"
+        android:hint="@string/sign_up_password_condition"
         app:layout_constraintTop_toBottomOf="@id/tv_new_password"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
@@ -63,7 +63,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:textSize="15sp"
-        android:hint="@string/sign_up_pw_condition"
+        android:hint="@string/sign_up_password_condition"
         app:layout_constraintTop_toBottomOf="@id/tv_new_password_check"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 235b8d2..a09684b 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -42,10 +42,10 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
     <TextView
-        android:id="@+id/tv_login_pw"
+        android:id="@+id/tv_login_password"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/pw"
+        android:text="@string/password"
         android:textSize="20sp"
         android:textStyle="bold"
         android:layout_marginHorizontal="30dp"
@@ -53,14 +53,14 @@
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginTop="30dp"/>
     <EditText
-        android:id="@+id/etv_login_pw"
+        android:id="@+id/etv_login_password"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:hint="@string/pw_hint"
+        android:hint="@string/password_hint"
         android:singleLine="true"
         android:inputType="textPassword"
         android:layout_marginHorizontal="30dp"
-        app:layout_constraintTop_toBottomOf="@id/tv_login_pw"
+        app:layout_constraintTop_toBottomOf="@id/tv_login_password"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
     <Button
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b31d74f..36290f0 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -98,11 +98,11 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_main_title_id" />
     <TextView
-        android:id="@+id/tv_main_title_pw"
+        android:id="@+id/tv_main_title_password"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:text="@string/pw"
+        android:text="@string/password"
         android:textColor="#000000"
         android:textSize="25sp"
         android:textAlignment="center"
@@ -110,7 +110,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_main_id" />
     <TextView
-        android:id="@+id/tv_main_pw"
+        android:id="@+id/tv_main_password"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:textColor="#000000"
@@ -118,6 +118,6 @@
         android:textAlignment="center"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_main_title_pw" />
+        app:layout_constraintTop_toBottomOf="@id/tv_main_title_password" />
         -->
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml
index e414d06..f0f91b8 100644
--- a/app/src/main/res/layout/activity_sign_up.xml
+++ b/app/src/main/res/layout/activity_sign_up.xml
@@ -51,10 +51,10 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
     <TextView
-        android:id="@+id/tv_sign_up_pw"
+        android:id="@+id/tv_sign_up_password"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/pw"
+        android:text="@string/password"
         android:textStyle="bold"
         android:textSize="20sp"
         android:layout_marginHorizontal="30dp"
@@ -62,22 +62,22 @@
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginTop="30dp"/>
     <TextView
-        android:id="@+id/tv_sign_up_pw_hint"
+        android:id="@+id/tv_sign_up_password_hint"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/sign_up_pw_condition"
+        android:text="@string/sign_up_password_condition"
         android:textSize="15sp"
         android:layout_marginHorizontal="30dp"
-        app:layout_constraintTop_toBottomOf="@id/tv_sign_up_pw"
+        app:layout_constraintTop_toBottomOf="@id/tv_sign_up_password"
         app:layout_constraintStart_toStartOf="parent"/>
     <EditText
-        android:id="@+id/etv_sign_up_pw"
+        android:id="@+id/etv_sign_up_password"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:hint="@string/sign_up_pw_hint"
+        android:hint="@string/sign_up_password_hint"
         android:singleLine="true"
         android:layout_marginHorizontal="30dp"
-        app:layout_constraintTop_toBottomOf="@id/tv_sign_up_pw_hint"
+        app:layout_constraintTop_toBottomOf="@id/tv_sign_up_password_hint"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
     <TextView
@@ -88,7 +88,7 @@
         android:textStyle="bold"
         android:textSize="20sp"
         android:layout_marginHorizontal="30dp"
-        app:layout_constraintTop_toBottomOf="@id/etv_sign_up_pw"
+        app:layout_constraintTop_toBottomOf="@id/etv_sign_up_password"
         app:layout_constraintStart_toStartOf="parent"
         android:layout_marginTop="30dp"/>
     <TextView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 77fe6fe..de49f5c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,8 +3,8 @@
     <string name="login_title">Welcome to SOPT</string>
     <string name="id">ID</string>
     <string name="id_hint">아이디를 입력해주세요</string>
-    <string name="pw">비밀번호</string>
-    <string name="pw_hint">비밀번호를 입력해주세요</string>
+    <string name="password">비밀번호</string>
+    <string name="password_hint">비밀번호를 입력해주세요</string>
     <string name="login_btn">로그인 하기</string>
     <string name="main_title">NOW SOPT</string>
     <string name="main_title2">SHOUT OUR PASSION TOGETHER</string>
@@ -21,8 +21,8 @@
     <string name="sign_up_title">SIGN UP</string>
     <string name="sign_up_condition">*6-10자 입력해주세요.</string>
     <string name="sign_up_id_hint">아이디를 입력해주세요</string>
-    <string name="sign_up_pw_condition">*최소 8글자 이상, 숫자, 문자(a-z, A-Z), 특수문자 포함.</string>
-    <string name="sign_up_pw_hint">비밀번호를 입력해주세요</string>
+    <string name="sign_up_password_condition">*최소 8글자 이상, 숫자, 문자(a-z, A-Z), 특수문자 포함.</string>
+    <string name="sign_up_password_hint">비밀번호를 입력해주세요</string>
     <string name="sign_up_nickname_text">*한 글자 이상 입력해주세요.</string>
     <string name="sign_up_nickname_hint">닉네임을 입력해주세요</string>
     <string name="sign_up_etc_text">*한 글자 이상 입력해주세요.</string>
@@ -31,7 +31,7 @@
     <!--SIGN UP ERROR-->
     <string name="sign_up_error_blank">모든 항목을 입력해주세요.</string>
     <string name="sign_up_error_id">아이디를 다시 설정하세요.</string>
-    <string name="sign_up_error_pw">비밀번호를 다시 설정하세요.</string>
+    <string name="sign_up_error_password">비밀번호를 다시 설정하세요.</string>
     <string name="sign_up_error_nickname">닉네임을 다시 설정하세요.</string>
     <string name="sign_up_error_etc">하고싶은 말을 다시 설정하세요.</string>
     <string name="sign_up_phone_text">*(-)하이픈을 포함해 입력해주세요.</string>
diff --git a/gradlew b/gradlew
index 4f906e0..135043d 100755
--- a/gradlew
+++ b/gradlew
@@ -35,9 +35,9 @@ while [ -h "$PRG" ] ; do
         PRG=`dirname "$PRG"`"/$link"
     fi
 done
-SAVED="`pwd`"
+SAVED="`passwordd`"
 cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
+APP_HOME="`passwordd -P`"
 cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"

From 770bbbfeaf8325943f49f47dc0b59e2608bc5cde Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Fri, 17 May 2024 23:40:06 +0900
Subject: [PATCH 35/36] =?UTF-8?q?chore#10/:=20request=20nicknamename=20->?=
 =?UTF-8?q?=20nickname=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sopt/now/data/remote/dto/request/RequestSignUpDto.kt | 4 ++--
 .../com/sopt/now/presentation/auth/signup/SignUpActivity.kt  | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/sopt/now/data/remote/dto/request/RequestSignUpDto.kt b/app/src/main/java/com/sopt/now/data/remote/dto/request/RequestSignUpDto.kt
index 70fc97b..abb97ab 100644
--- a/app/src/main/java/com/sopt/now/data/remote/dto/request/RequestSignUpDto.kt
+++ b/app/src/main/java/com/sopt/now/data/remote/dto/request/RequestSignUpDto.kt
@@ -9,8 +9,8 @@ data class RequestSignUpDto(
     val authenticationId: String,
     @SerialName("password")
     val password: String,
-    @SerialName("nicknamename")
-    val nicknamename: String,
+    @SerialName("nickname")
+    val nickname: String,
     @SerialName("phone")
     val phone: String,
 )
diff --git a/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpActivity.kt b/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpActivity.kt
index 24eebb6..5f3b8a4 100644
--- a/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpActivity.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpActivity.kt
@@ -38,16 +38,15 @@ class SignUpActivity : AppCompatActivity() {
         }
     }
 
-
     private fun getSignUpRequestDto(): RequestSignUpDto {
         val id = binding.etvSignUpId.text.toString()
         val password = binding.etvSignUpPassword.text.toString()
-        val nicknamename = binding.etvSignUpNickname.text.toString()
+        val nickname = binding.etvSignUpNickname.text.toString()
         val phoneNumber = binding.etvSignUpPhone.text.toString()
         return RequestSignUpDto(
             authenticationId = id,
             password = password,
-            nicknamename = nicknamename,
+            nickname = nickname,
             phone = phoneNumber
         )
     }

From 7e05a20aa15872ece09b3ab55577563fb048476f Mon Sep 17 00:00:00 2001
From: hyeumm <20221159@sungshin.ac.kr>
Date: Fri, 17 May 2024 23:44:10 +0900
Subject: [PATCH 36/36] =?UTF-8?q?chore#10/:=20string=20=EC=B6=94=EC=B6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth/signup/SignUpActivity.kt             | 19 +++++++++++++------
 app/src/main/res/values/strings.xml           |  4 ++--
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpActivity.kt b/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpActivity.kt
index 5f3b8a4..4c9e865 100644
--- a/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpActivity.kt
+++ b/app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpActivity.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import com.sopt.now.R
 import com.sopt.now.databinding.ActivitySignUpBinding
 import com.sopt.now.data.remote.dto.request.RequestSignUpDto
 
@@ -26,15 +27,21 @@ class SignUpActivity : AppCompatActivity() {
 
     private fun initObserver() {
         viewModel.liveData.observe(this) { signUpState ->
-            Toast.makeText(
-                this@SignUpActivity,
-                signUpState.message,
-                Toast.LENGTH_SHORT
-            ).show()
-
             if (signUpState.isSuccess) {
+                Toast.makeText(
+                    this@SignUpActivity,
+                    getString(R.string.sign_up_success, signUpState.message),
+                    Toast.LENGTH_SHORT
+                ).show()
                 finish()
             }
+            else {
+                Toast.makeText(
+                    this@SignUpActivity,
+                    getString(R.string.sign_up_failed, signUpState.message),
+                    Toast.LENGTH_SHORT
+                ).show()
+            }
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index de49f5c..d85de5d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -27,7 +27,7 @@
     <string name="sign_up_nickname_hint">닉네임을 입력해주세요</string>
     <string name="sign_up_etc_text">*한 글자 이상 입력해주세요.</string>
     <string name="sign_up_etc_hint">하고싶은 말을 입력해주세요</string>
-    <string name="sign_up_success">회원가입에 성공했습니다.</string>
+    <string name="sign_up_success">회원가입에 성공!userID %1$s</string>
     <!--SIGN UP ERROR-->
     <string name="sign_up_error_blank">모든 항목을 입력해주세요.</string>
     <string name="sign_up_error_id">아이디를 다시 설정하세요.</string>
@@ -37,10 +37,10 @@
     <string name="sign_up_phone_text">*(-)하이픈을 포함해 입력해주세요.</string>
     <string name="sign_up_phone_hint">예시)010-0000-0000</string>
     <string name="my_page_change_password_button">비밀번호 변경하기</string>
+    <string name="sign_up_failed">회원가입에 실패했습니다. %1$s</string>
     <!--Change Password-->
     <string name="change_password_old_password">기존 비밀번호를 입력해주세요.</string>
     <string name="change_password_new_password">새로운 비밀번호를 입력해주세요.</string>
     <string name="change_password_check_password">새로운 비밀번호를 한 번 더 입력해주세요.</string>
     <string name="change_password">비밀번호 변경하기</string>
-
 </resources>
\ No newline at end of file