diff --git a/SPOTeam_android/.idea/deploymentTargetSelector.xml b/SPOTeam_android/.idea/deploymentTargetSelector.xml
index ff865cc7..b616e4e6 100644
--- a/SPOTeam_android/.idea/deploymentTargetSelector.xml
+++ b/SPOTeam_android/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-05-05T11:14:39.383475400Z">
+        <DropdownSelection timestamp="2025-05-28T05:01:04.745350Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=R3CX60FL88A" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/fredleejh/.android/avd/TEST_API_35.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/SPOTeam_android/.idea/kotlinc.xml b/SPOTeam_android/.idea/kotlinc.xml
index 0e1c4ec5..93b5d15c 100644
--- a/SPOTeam_android/.idea/kotlinc.xml
+++ b/SPOTeam_android/.idea/kotlinc.xml
@@ -4,10 +4,10 @@
     <option name="jvmTarget" value="1.8" />
   </component>
   <component name="KotlinCommonCompilerArguments">
-    <option name="apiVersion" value="1.9" />
-    <option name="languageVersion" value="1.9" />
+    <option name="apiVersion" value="2.0" />
+    <option name="languageVersion" value="2.0" />
   </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.0" />
+    <option name="version" value="2.0.21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/SPOTeam_android/.idea/misc.xml b/SPOTeam_android/.idea/misc.xml
index 1fc5ddcc..0ad17cbd 100644
--- a/SPOTeam_android/.idea/misc.xml
+++ b/SPOTeam_android/.idea/misc.xml
@@ -7,11 +7,4 @@
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
-  <component name="VisualizationToolProject">
-    <option name="state">
-      <ProjectState>
-        <option name="scale" value="0.45" />
-      </ProjectState>
-    </option>
-  </component>
 </project>
\ No newline at end of file
diff --git a/SPOTeam_android/app/build.gradle.kts b/SPOTeam_android/app/build.gradle.kts
index 16780c15..4de74516 100644
--- a/SPOTeam_android/app/build.gradle.kts
+++ b/SPOTeam_android/app/build.gradle.kts
@@ -1,9 +1,15 @@
+import java.util.Properties
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.jetbrains.kotlin.android)
-    id("kotlin-kapt")  // kapt 플러그인 직접 선언
-    id("com.google.dagger.hilt.android")
-    id("com.google.devtools.ksp")
+    alias(libs.plugins.kotlin.serialization)
+    alias(libs.plugins.hilt)
+    alias(libs.plugins.ksp)
+    id("kotlin-kapt")
+}
+val properties = Properties().apply {
+    load(project.rootProject.file("local.properties").inputStream())
 }
 
 android {
@@ -18,6 +24,11 @@ android {
         versionName = "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        buildConfigField("String", "BASE_URL", properties["base.url"].toString())
+        buildConfigField("String", "KAKAO_NATIVE_KEY", "\"${properties["kakao.native.key"]}\"")
+        buildConfigField("String", "NAVER_CLIENT_ID", "\"${properties["naver.client.id"]}\"")
+        buildConfigField("String", "NAVER_CLIENT_SECRET", "\"${properties["naver.client.secret"]}\"")
+        buildConfigField("String", "PUBLIC_API_KEY", "\"${properties["public.api.key"]}\"")
     }
 
     buildTypes {
@@ -29,60 +40,86 @@ android {
             )
         }
     }
+
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
+
     buildFeatures {
         viewBinding = true
         dataBinding = true
+        buildConfig = true
     }
 }
 
 dependencies {
-    implementation(libs.androidx.splashscreen)
-    implementation(libs.circleimageview)
+    // AndroidX & UI
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.material)
     implementation(libs.androidx.constraintlayout)
-    implementation(libs.androidx.lifecycle.livedata.ktx)
-    implementation(libs.androidx.lifecycle.viewmodel.ktx)
-    implementation(libs.androidx.navigation.fragment.ktx)
-    implementation(libs.androidx.navigation.ui.ktx)
-    implementation(libs.androidx.activity)
-    implementation(libs.flexbox)
-    implementation(libs.kakaoSdkAll)
-    implementation(libs.kakaoSdkUser)
     implementation(libs.androidx.recyclerview)
     implementation(libs.androidx.viewpager2)
+    implementation(libs.androidx.activity)
+    implementation(libs.androidx.splashscreen)
     implementation(libs.androidx.material3.android)
     implementation(libs.androidx.media3.common)
-    implementation(libs.filament.android)
-    implementation(libs.firebase.crashlytics.buildtools)
-    testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.junit)
-    androidTestImplementation(libs.androidx.espresso.core)
-    implementation(libs.androidx.viewpager2)
+    implementation(libs.flexbox)
+
+    // Lifecycle & Navigation
+    implementation(libs.androidx.lifecycle.viewmodel.ktx)
+    implementation(libs.androidx.lifecycle.livedata.ktx)
+    implementation(libs.androidx.navigation.fragment.ktx)
+    implementation(libs.androidx.navigation.ui.ktx)
+
+    // Network & Serialization
     implementation(libs.retrofit)
     implementation(libs.retrofit.converter.scalars)
-    implementation(libs.kotlin.stdlib)
     implementation(libs.gson)
-    implementation(libs.glide)
+    implementation(libs.retrofit.kotlinx.serialization.json)
+
+    // Hilt
+    implementation(libs.hilt)
+    kapt(libs.hilt.compiler)
+
+    // Room
     implementation(libs.room.runtime)
     implementation(libs.room.ktx)
-    ksp("androidx.room:room-compiler:2.6.1")
-    implementation ("com.github.prolificinteractive:material-calendarview:2.0.1")
+    ksp(libs.room.compiler)
+
+    // Glide & Calendar & Coil
+    implementation(libs.glide)
+    implementation(libs.circleimageview)
+    implementation("com.github.prolificinteractive:material-calendarview:2.0.1")
+
+    // Login SDKs
+    implementation(libs.kakaoSdkAll)
+    implementation(libs.kakaoSdkUser)
     implementation("com.navercorp.nid:oauth:5.9.1")
-    implementation("com.squareup.retrofit2:converter-simplexml:2.9.0")
-    implementation("com.google.dagger:hilt-android:2.51.1")
-    kapt("com.google.dagger:hilt-android-compiler:2.51.1")
+
+    // Date-Time
     implementation("com.jakewharton.threetenabp:threetenabp:1.4.4")
 
+    // Firebase & Crashlytics
+    implementation(libs.firebase.crashlytics.buildtools)
 
+    // 기타
+    implementation(libs.filament.android)
+    implementation("com.squareup.retrofit2:converter-simplexml:2.9.0")
+
+    // Kotlin
+    implementation(libs.kotlin.stdlib)
+    implementation(libs.kotlinx.serialization.json)
+
+    // Test
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
 }
 
 kapt {
@@ -92,8 +129,6 @@ kapt {
     correctErrorTypes = true
 }
 
-configurations {
-    all {
-        exclude(group = "com.android.support", module = "support-compat")
-    }
-}
\ No newline at end of file
+configurations.all {
+    exclude(group = "com.android.support", module = "support-compat")
+}
diff --git a/SPOTeam_android/app/src/main/AndroidManifest.xml b/SPOTeam_android/app/src/main/AndroidManifest.xml
index d1276296..2eedc762 100644
--- a/SPOTeam_android/app/src/main/AndroidManifest.xml
+++ b/SPOTeam_android/app/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
 
     <application
-        android:name=".GlobalApplication"
+        android:name=".SpotApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -16,69 +16,46 @@
         android:theme="@style/Theme.SPOTeam_android"
         android:usesCleartextTraffic="true"
         tools:targetApi="34">
-        <activity
-            android:name=".login.EmailVerificationActivity"
-            android:exported="false" />
-        <activity
-            android:name=".login.NicNameActivity"
-            android:exported="false" />
-        <activity
-            android:name=".login.NormalLoginActivity"
-            android:exported="false" />
 
-        <service
-            android:name=".ui.study.StudyRegisterApiService"
-            android:enabled="true"
-            android:exported="true" />
-        <service
-            android:name=".login.LoginAPiService"
-            android:enabled="true"
-            android:exported="true" />
-
-        <activity
-            android:name=".ui.study.MyStudyPostContentActivity"
-            android:exported="false" />
-        <activity
-            android:name=".login.LocationSearchActivity"
-            android:exported="false" />
         <activity
-            android:name=".login.LogoutActivity"
+            android:name=".presentation.login.checklist.CheckListStudyPurposeActivity"
             android:exported="false">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ui.community.CommunityContentActivity"
-            android:exported="false" />
-        <activity
-            android:name=".checklist.CheckListLocationActivity"
+            android:name=".presentation.login.checklist.CheckListCategoryActivity"
             android:exported="false">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".checklist.CheckListStudyPurposeActivity"
+            android:name=".presentation.login.checklist.LocationSearchActivity"
             android:exported="false">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".checklist.CheckListCategoryActivity"
+            android:name=".presentation.login.checklist.CheckListLocationActivity"
             android:exported="false">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".login.RegisterInformation"
+            android:name=".presentation.login.nickname.NicknameActivity"
             android:exported="false">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
+
         </activity>
+        <activity
+            android:name=".presentation.login.checklist.RegisterInformation"
+            android:exported="false" />
         <activity
             android:name=".MainActivity"
             android:exported="false">
@@ -92,14 +69,7 @@
 
         </activity>
         <activity
-            android:name=".login.CellPhoneLoginActivity"
-            android:exported="false">
-            <meta-data
-                android:name="android.app.lib_name"
-                android:value="" />
-        </activity>
-        <activity
-            android:name=".login.StartLoginActivity"
+            android:name=".presentation.login.StartLoginActivity"
             android:exported="true"
             android:theme="@style/Theme.SPOTeam_android.SplashScreen">
             <meta-data
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/AuthInterceptor.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/AuthInterceptor.kt
new file mode 100644
index 00000000..fa6d58fd
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/AuthInterceptor.kt
@@ -0,0 +1,84 @@
+package com.example.spoteam_android.interceptor
+
+import android.content.Intent
+import com.example.spoteam_android.AuthApiService
+import com.example.spoteam_android.data.login.datasource.local.TokenDataSource
+import com.example.spoteam_android.presentation.login.StartLoginActivity
+import dagger.hilt.android.qualifiers.ApplicationContext
+import okhttp3.Interceptor
+import okhttp3.Response
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import javax.inject.Inject
+
+class AuthInterceptor @Inject constructor(
+    private val tokenDataSource: TokenDataSource,
+    @ApplicationContext private val context: android.content.Context
+) : Interceptor {
+
+    override fun intercept(chain: Interceptor.Chain): Response {
+        var request = chain.request()
+        val currentToken = tokenDataSource.getAccessToken()
+
+        if (!currentToken.isNullOrEmpty()) {
+            request = request.newBuilder()
+                .header("Authorization", "Bearer $currentToken")
+                .build()
+        }
+
+        var response = chain.proceed(request)
+
+        if (response.code == 401 || response.code == 400) {
+            synchronized(this) {
+                val updatedToken = tokenDataSource.getAccessToken()
+                val token = if (currentToken != updatedToken) {
+                    updatedToken
+                } else {
+                    refreshToken()?.also { tokenDataSource.saveTokens(it, tokenDataSource.getRefreshToken() ?: "") }
+                }
+
+                token?.let {
+                    response.close()
+                    request = request.newBuilder()
+                        .header("Authorization", "Bearer $it")
+                        .build()
+                    return chain.proceed(request)
+                } ?: run {
+                    handleInvalidRefreshToken()
+                }
+            }
+        }
+        return response
+    }
+
+    private fun refreshToken(): String? {
+        val refreshToken = tokenDataSource.getRefreshToken() ?: return null
+        val retrofit = Retrofit.Builder()
+            .baseUrl("https://www.teamspot.site/")
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+
+        val authApi = retrofit.create(AuthApiService::class.java)
+        val response = authApi.refreshToken(refreshToken).execute()
+
+        return if (response.isSuccessful) {
+            val body = response.body()
+            if (body?.isSuccess == true) {
+                body.result?.accessToken
+            } else {
+                if (body?.code == "COMMON4009") handleInvalidRefreshToken()
+                null
+            }
+        } else {
+            null
+        }
+    }
+
+    private fun handleInvalidRefreshToken() {
+        tokenDataSource.saveTokens("", "")
+        val intent = Intent(context, StartLoginActivity::class.java).apply {
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        }
+        context.startActivity(intent)
+    }
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/Authenticator.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/Authenticator.kt
deleted file mode 100644
index 7cc5d657..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/Authenticator.kt
+++ /dev/null
@@ -1,164 +0,0 @@
-package com.example.spoteam_android
-
-import android.content.Context
-import android.content.Intent
-import android.util.Log
-import com.example.spoteam_android.login.StartLoginActivity
-import okhttp3.Interceptor
-import okhttp3.Response
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-
-class AuthInterceptor(private val context: Context) : Interceptor {
-
-    override fun intercept(chain: Interceptor.Chain): Response {
-        var request = chain.request()
-
-        val currentToken = getAccessTokenFromPreferences()
-
-        if (currentToken != null &&
-            !request.url.toString().contains("/spot/check/login-id") &&
-            !request.url.toString().contains("/spot/check/email")
-        ) {
-            request = request.newBuilder()
-                .header("Authorization", "Bearer $currentToken")
-                .build()
-        }
-
-        // 요청 실행
-        var response = chain.proceed(request)
-
-        // 토큰 만료 처리: 401 또는 400 상태 코드 확인
-        if (response.code == 401 || response.code == 400) {
-
-            synchronized(this) {
-                // 갱신된 액세스 토큰 확인
-                val updatedToken = getAccessTokenFromPreferences()
-
-                val token = if (currentToken != updatedToken) {
-                    // 이미 갱신된 토큰이 있는 경우
-                    updatedToken
-                } else {
-                    // 리프레시 토큰으로 새로운 토큰 갱신 시도
-                    refreshToken()?.also {
-                        saveAccessTokenToPreferences(it)
-                        RetrofitInstance.setAuthToken(it)
-                    }
-                }
-
-                token?.let {
-                    Log.d("AuthInterceptor", "Token refresh successful.")
-                    response.close()
-
-                    // 새로운 토큰으로 요청 재시도
-                    request = request.newBuilder()
-                        .header("Authorization", "Bearer $it")
-                        .build()
-                    response = chain.proceed(request)
-                } ?: run {
-                    Log.d("AuthInterceptor", "Token refresh failed. Navigating to login screen...")
-                    handleInvalidRefreshToken()
-                }
-            }
-        }
-        return response
-    }
-
-    // 새로운 액세스 및 리프레시 토큰 요청
-    private fun getNewTokens(refreshToken: String): TokenResult? {
-        val retrofit = Retrofit.Builder()
-            .baseUrl("https://www.teamspot.site/")
-            .addConverterFactory(GsonConverterFactory.create())
-            .build()
-
-        val authApi = retrofit.create(AuthApiService::class.java)
-
-        // 리프레시 토큰을 사용해 새로운 토큰 요청
-        val response = authApi.refreshToken(refreshToken).execute()
-
-        return if (response.isSuccessful) {
-            val body = response.body()
-            if (body?.isSuccess == true) {
-                Log.d("AuthInterceptor", "Token refresh succeeded: ${body.result}")
-                body.result
-            } else {
-                Log.e("AuthInterceptor", "Token refresh failed: code: ${body?.code}, message: ${body?.message}")
-
-                // 리프레시 토큰이 유효하지 않을 경우 로그인 화면으로 이동
-                if (body?.code == "COMMON4009") {
-                    handleInvalidRefreshToken()
-                }
-                null
-            }
-        } else {
-            Log.e("AuthInterceptor", "Token refresh request failed with code: ${response.code()}, errorBody: ${response.errorBody()?.string()}")
-            null
-        }
-    }
-
-    // 리프레시 토큰으로 새로운 액세스 토큰 요청
-    private fun refreshToken(): String? {
-        val refreshToken = getRefreshTokenFromPreferences()
-        return refreshToken?.let {
-            val newTokens = getNewTokens(it)
-            if (newTokens != null) {
-                saveTokensToPreferences(newTokens.accessToken, newTokens.refreshToken)
-                RetrofitInstance.setAuthToken(newTokens.accessToken)
-                newTokens.accessToken
-            } else {
-                handleInvalidRefreshToken()
-                null // 토큰 갱신 실패 시 null 반환
-            }
-        }
-    }
-
-    // SharedPreferences에서 액세스 토큰 가져오기
-    private fun getAccessTokenFromPreferences(): String? {
-        val sharedPreferences = context.getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val email = sharedPreferences.getString("currentEmail", null)
-        return email?.let { sharedPreferences.getString("${it}_accessToken", null) }
-    }
-
-    // SharedPreferences에서 리프레시 토큰 가져오기
-    private fun getRefreshTokenFromPreferences(): String? {
-        val sharedPreferences = context.getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val email = sharedPreferences.getString("currentEmail", null)
-        return email?.let { sharedPreferences.getString("${it}_refreshToken", null) }
-    }
-
-    // SharedPreferences에 새로운 액세스 토큰 저장
-    private fun saveAccessTokenToPreferences(accessToken: String) {
-        val sharedPreferences = context.getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val email = sharedPreferences.getString("currentEmail", null)
-        email?.let {
-            sharedPreferences.edit().putString("${it}_accessToken", accessToken).apply()
-        }
-    }
-
-    // SharedPreferences에 새로운 액세스 및 리프레시 토큰 저장
-    private fun saveTokensToPreferences(accessToken: String, refreshToken: String) {
-        val sharedPreferences = context.getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val email = sharedPreferences.getString("currentEmail", null)
-        email?.let {
-            with(sharedPreferences.edit()) {
-                putString("${it}_accessToken", accessToken)
-                putString("${it}_refreshToken", refreshToken)
-                apply()
-            }
-        }
-    }
-
-    // 리프레시 토큰이 유효하지 않을 때 로그인 화면으로 이동
-    private fun handleInvalidRefreshToken() {
-        Log.d("AuthInterceptor", "Invalid token. Clearing SharedPreferences and navigating to login screen...")
-        // SharedPreferences 초기화
-        val sharedPreferences = context.getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        sharedPreferences.edit().clear().apply()
-
-        // 로그인 화면으로 이동
-        val intent = Intent(context, StartLoginActivity::class.java).apply {
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-        }
-        context.startActivity(intent)
-    }
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/Data.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/Data.kt
index a379b305..3cae5e60 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/Data.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/Data.kt
@@ -1,273 +1,9 @@
 package com.example.spoteam_android
 
-import Gender
-import android.os.Parcel
-import android.os.Parcelable
-import com.example.spoteam_android.data.ApiModels
 import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
 
-
-//카카오 로그인 서버 응답
-data class YourResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String,
-    val result: KaKaoResult
-)
-
-
-// 카카오 로그인 서버 응답 결과 담기
-data class KaKaoResult(
-  val isSpotMember: Boolean,
-    val signInDTO: SignInDTO
-)
-// 카카오 로그인 토큰 정보 담기
-data class Tokens(
-    val accessToken: String,
-    val refreshToken: String,
-    val accessTokenExpiresIn: Long
-)
-
-
-// 네이버 로그인 서버 응답 결과 담기
-data class  NaverResult(
-    val isSpotMember: Boolean,
-    val signInDTO: SignInDTO
-)
-
-data class SignInDTO(
-    val tokens: Tokens,
-    val email: String,
-    val memberId: Int,
-    val loginType: String
-)
-//네이버 로그인 서버 응답
-data class NaverResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String,
-    val result: NaverResult?
-)
-data class NaverLoginRequest(
-    val access_token: String,
-    val refresh_token: String,
-    val token_type: String,
-    val expires_in: Long,
-    val error: String? = null,
-    val error_description: String? = null
-)
-
-
-data class UserInfo( //일반 로그인
-    val name: String,
-    val nickname: String = "TEMP_NICKNAME", // 임시 닉네임
-    val frontRID: String,
-    val backRID: String,
-    val email: String,
-    val loginId: String,
-    val password: String,
-    val pwCheck: String,
-    val personalInfo: Boolean = false, // 임시 값
-    val idInfo: Boolean = false        // 임시 값
-)
-
-data class IdResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String,
-    val result: IdResult?,
-)
-
-data class IdResult(
-    val reason: String,
-    val available: Boolean,
-)
-
-data class EmailResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String,
-    val result: EmailResult?,
-)
-
-data class EmailResult(
-    val reason: String,
-    val available: Boolean
-)
-
-data class EmailVerifyResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String
-)
-
-data class ValidateEmailResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String,
-    val result: ValidateEmailResult?,
-)
-data class ValidateEmailResult(
-    val tempToken: String,
-    val tempTokenExpiresIn: Int
-)
-
-data class NickNameRequest(
-    val nickname: String,
-    val personalInfo: Boolean,
-    val idInfo: Boolean
-)
-
-
-data class NickNameResult(
-    val name: String,
-    val nickname: String,
-    val email: String,
-    val idInfo: Boolean,
-    val personalInfo: Boolean
-)
-data class NickNameResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String,
-    val result: NickNameResult
-)
-
-data class BoardItem (
-    val studyId: Int,
-    val title: String,
-    val goal: String,
-    val introduction: String,
-    val memberCount: Int,
-    var heartCount: Int,
-    val hitNum: Int,
-    val maxPeople: Int,
-    val studyState: String,
-    val themeTypes: List<String>,
-    val regions: List<String>,
-    val imageUrl: String,
-    var liked: Boolean,
-    val isOwned: Boolean = false,
-    val isHost : Boolean
-)
-
-
-data class StudyItem( //StudyFragment에서 사용
-    val studyId: Int,
-    val title: String,
-    val goal: String,
-    val introduction: String,
-    val memberCount: Int,
-    var heartCount: Int,
-    val hitNum: Int,
-    val maxPeople: Int,
-    val studyState: String,
-    val themeTypes: List<String>,
-    val regions: List<String>,
-    val imageUrl: String,
-    var liked: Boolean
-)
-
-data class StudyDetailsResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String,
-    val result: StudyDetailsResult
-)
-
-data class StudyDetailsResult( //StudyFragment에서 detail하게 들어갔을때 사용
-    val studyId: Int,
-    val studyName: String,
-    val studyOwner: Owner,
-    val hitNum: Int,
-    val heartCount: Int,
-    val memberCount: Int,
-    val maxPeople: Int,
-    val gender: Gender,
-    val minAge: Int,
-    val maxAge: Int,
-    val fee: Int,
-    val isOnline: Boolean,
-    val profileImage: String,
-    val themes: List<String>,
-    val regions: List<String>,
-    val goal: String,
-    val introduction: String,
-)
-
-data class Owner(
-    val ownerId: Int,
-    val ownerName: String
-)
-
-data class StudyRequest(
-    val themes: List<String>,
-    val title: String,
-    val goal: String,
-    val introduction: String,
-    val isOnline: Boolean,
-    val profileImage: String?,
-    val regions: List<String>?,
-    val maxPeople: Int,
-    val gender: Gender,
-    val minAge: Int,
-    val maxAge: Int,
-    val fee: Int,
-    val hasFee: Boolean
-)
-
-data class MemberResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String,
-    val result: MemberResult
-)
-
-data class MemberResult(
-    val totalElements: Int,
-    val members: List<Member>
-)
-
-data class Member(
-    val memberId: Int,
-    val nickname: String,
-    val profileImage: String
-)
-
-data class StudyResponse(
-    val isSuccess : Boolean,
-    val code : String ,
-    val message: String ,
-    val result: StudyResult
-)
-
-data class StudyResult(
-    val totalPages: Int,
-    val totalElements: Int,
-    val first: Boolean,
-    val last: Boolean,
-    val size: Int,
-    val content: List<StudyData>,
-    val number: Int
-)
-
-data class StudyData(
-    val studyId: Int,
-    val imageUrl: String,
-    val title: String,
-    val introduction: String,
-    val goal: String,
-    val memberCount: Int,
-    val heartCount: Int,
-    val hitNum: Int,
-    val maxPeople: Int,
-    val studyState: String,
-    val themeTypes: List<String>,
-    val regions: List<String>,
-    val createdAt: String,
-    val liked: Boolean
-)
-
+@Serializable
 data class SceduleItem (
     val dday: String,
     val day: String,
@@ -275,81 +11,26 @@ data class SceduleItem (
     val concreteTime: String,
     val place: String,
 )
-
+@Serializable
 data class ProfileItem(
     val profileImage: String,
     val nickname: String
 )
-
-data class GalleryItem (
-    val imgId : Int
-)
-
+@Serializable
 data class ProfileTemperatureItem(
     val profileImage: Int,
     val nickname: String,
     val temperature: String
 )
 
-data class AlertInfo(
-    val contentText : String,
-    val type : Int
-)
-
-
-data class StudyInfo(
-    val studyName : String
-)
-
-
-data class CommentInfo(
-    val commentWriter : String,
-    val Comment : String,
-    val commentType : Int
-)
-
-data class ThemeApiResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String,
-    val result: ThemeResult
-)
 
+@Serializable
 data class ThemeResult(
     val memberId: Int,
     val themes: List<String>
 )
 
-
-data class ThemePreferences(
-    @SerializedName("themes")
-    val themes: List<String>
-)
-
-data class ReasonApiResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String,
-    val result: ReasonResult
-)
-
-data class ReasonResult(
-    val memberId: Int,
-    val reasons: List<String>
-)
-
-data class RegionApiResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String,
-    val result: RegionResult
-)
-
-data class RegionResult(
-    val memberId: Int,
-    val regions: List<Region>
-)
-
+@Serializable
 data class Region(
     val province: String,
     val district: String,
@@ -358,199 +39,11 @@ data class Region(
 )
 
 
-data class StudyReasons(
-    @SerializedName("reasons")
-    val reasons: List<Int>
-)
-
-data class RegionsPreferences(
-    @SerializedName("regions")
-    val regions: List<String>
-)
-
-
-//일정 생성
-data class ScheduleRequest(
-    val title: String,
-    val location: String,
-    val startedAt: String,
-    val finishedAt: String,
-    val isAllDay: Boolean,
-    val period: String
-)
-
-data class ScheduleResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String,
-    val result: ScheduleResult
-)
-
-data class ScheduleResult(
-    val title: String,
-    val location: String,
-    val startedAt: String,
-    val finishedAt: String,
-    val isAllDay: Boolean,
-    val period: String
-)
-
-
-//일정 불러오기
-data class ScheduleListResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String,
-    val result: ScheduleListResult
-)
-
-data class ScheduleListResult(
-    val totalPages: Int,
-    val totalElements: Int,
-    val first: Boolean,
-    val last: Boolean,
-    val size: Int,
-    val schedules: List<ScheduleItem>
-)
-
-data class ScheduleItem(
-    val startedAt: String,
-    val finishedAt: String,
-    val title: String,
-    val location: String
-)
-
-//최근 공지 불러오기
-data class RecentAnnounceResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String,
-    val result: RecentAnnounceResult
-)
-
-data class RecentAnnounceResult(
-    val title: String,
-    val content: String
-)
-
-
-//스터디 신청
-data class StudyApplyResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String,
-    val result: StudyResponseResult
-)
-
-data class StudyResponseResult(
-    val memberId: Int,
-    val study: StudyApplyInfo
-)
-
-data class StudyApplyInfo(
-    val studyId: Int,
-    val title: String
-)
-
-
-//찜 구현
-data class LikeResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String,
-    val result: LikeResult
-)
-
-data class LikeResult(
-    val studyTitle: String,
-    val createdAt: String,
-    val status: String // LIKE 또는 DISLIKE
-)
-
-//스터디 신청여부
-data class IsAppliedResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String,
-    val result: IsAppliedResult
-)
-
-data class  IsAppliedResult(
-    val studyId: Int,
-    val applied: Boolean
-)
-
-
-data class BookmarkResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String,
-    val result: BookmarkResult
-)
-
-data class BookmarkResult(
-    val totalPages: Int,
-    val totalElements: Int,
-    val first: Boolean,
-    val last: Boolean,
-    val size: Int,
-    val content: List<BookmarkStudyItem>,
-    val number: Int
-)
-
-data class BookmarkStudyItem(
-    val studyId: Int,
-    val imageUrl: String,
-    val title: String,
-    val introduction: String,
-    val goal: String,
-    val memberCount: Int,
-    val heartCount: Int,
-    val hitNum: Int,
-    val maxPeople: Int,
-    val studyState: String,
-    val themeTypes: List<String>,
-    val regions: List<String>,
-    val createdAt: String,
-    val liked: Boolean
-)
 
 
 
-data class BookmarkItem( //StudyFragment에서 사용
-    val studyId: Int,
-    val title: String,
-    val goal: String,
-    val introduction: String,
-    val memberCount: Int,
-    var heartCount: Int,
-    val hitNum: Int,
-    val maxPeople: Int,
-    val studyState: String,
-    val themeTypes: List<String>,
-    val regions: List<String>,
-    val imageUrl: String,
-    var liked: Boolean
-)
 
 
-data class GalleryResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String,
-    val result: GalleryResult
-)
-
-data class GalleryResult(
-    val studyId: Int,
-    val images: List<GalleryItems>
-)
-
-data class GalleryItems(
-    val imageId: Int,
-    val imageUrl: String,
-    val postId: Int
-)
 
 data class RegionData(
     val category: String,              // 구분
@@ -571,73 +64,33 @@ data class RegionData(
     val locationUpdate: String?        // 위치업데이트
 )
 
-
+@Serializable
 data class attendanceMemberData(
     val memberId : Int,
     var nickname: String,
     val profileImage: String,
     var introduction : String
 )
-
-data class HostApiResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String,
-    val result: HostResult
-)
-
-data class HostResult(
-    val isOwned: Boolean,
-    val host: HostData
-)
-
-data class HostData(
-    val memberId: Int,
-    val nickname: String
-)
-
+@Serializable
 data class HostWithDrawl(
     val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: WithDrawlData
 )
-
+@Serializable
 data class WithDrawlData(
     val studyId: Int,
     val studyName: String,
     val memberId: Int,
     val memberName: String
 )
-
+@Serializable
 data class WithdrawHostRequest(
     val newHostId: Int,
     val reason: String
 )
 
-data class SpotMemberCheckResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String,
-    val result: SpotMemberResult
-)
-
-data class SpotMemberResult(
-    val isSpotMember: Boolean
-)
-data class NicknameCheckResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String,
-    val result: NicknameCheckResult
-)
-
-data class NicknameCheckResult(
-    val nickname: String,
-    val duplicate: Boolean
-)
-
-
 data class FinishedStudyResponse(
     val isSuccess: Boolean,
     val code: String,
@@ -667,20 +120,19 @@ data class FinishedStudyItem(
     val createdAt: String,
     val finishedAt: String?
 )
-
-data class WithdrawResponse(
+data class HostApiResponse(
     val isSuccess: Boolean,
     val code: String,
     val message: String,
-    val result: WithdrawResult?
+    val result: HostResult
 )
 
-data class WithdrawResult(
-    val memberId: Int,
-    val name: String,
-    val email: String,
-    val inactive: String
+data class HostResult(
+    val isOwned: Boolean,
+    val host: HostData
 )
 
-
-
+data class HostData(
+    val memberId: Int,
+    val nickname: String
+)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/HouseFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/HouseFragment.kt
deleted file mode 100644
index 8529fc88..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/HouseFragment.kt
+++ /dev/null
@@ -1,567 +0,0 @@
-package com.example.spoteam_android
-
-import StudyApiService
-import StudyViewModel
-import android.content.Context
-import android.content.Intent
-import android.content.res.ColorStateList
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import android.widget.Toast
-import androidx.activity.viewModels
-import androidx.core.content.ContextCompat
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.ViewModelProvider
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.databinding.FragmentHouseBinding
-import com.example.spoteam_android.search.SearchFragment
-import com.example.spoteam_android.ui.alert.AlertFragment
-import com.example.spoteam_android.ui.category.CategoryFragment
-import com.example.spoteam_android.ui.category.CategoryFragment_1
-import com.example.spoteam_android.ui.category.CategoryInterestViewModel
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.community.CommunityContentActivity
-import com.example.spoteam_android.ui.community.CommunityHomeFragment
-import com.example.spoteam_android.ui.community.CommunityResponse
-import com.example.spoteam_android.ui.home.HomeFragment
-import com.example.spoteam_android.ui.interestarea.ApiResponse
-import com.example.spoteam_android.ui.interestarea.InterestAreaApiService
-import com.example.spoteam_android.ui.interestarea.InterestFilterViewModel
-import com.example.spoteam_android.ui.interestarea.InterestFragment
-import com.example.spoteam_android.ui.interestarea.InterestVPAdapter
-import com.example.spoteam_android.ui.interestarea.RecommendStudyApiService
-import com.example.spoteam_android.ui.myinterest.MyInterestStudyFragment
-import com.example.spoteam_android.ui.recruiting.RecruitingStudyFragment
-import com.example.spoteam_android.ui.study.DetailStudyFragment
-import com.example.spoteam_android.ui.study.RegisterStudyFragment
-import com.example.spoteam_android.weather.WeatherViewModel
-import com.google.android.material.floatingactionbutton.FloatingActionButton
-import dagger.hilt.android.AndroidEntryPoint
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-@AndroidEntryPoint
-class HouseFragment : Fragment() {
-
-    lateinit var binding: FragmentHouseBinding
-    private val studyViewModel: StudyViewModel by activityViewModels()
-    private lateinit var interestBoardAdapter: InterestVPAdapter
-    private lateinit var recommendBoardAdapter: InterestVPAdapter
-    private var popularContentId : Int = -1
-    private lateinit var studyApiService: StudyApiService
-    private lateinit var weatherViewModel: WeatherViewModel
-    private lateinit var presentTemperature: TextView
-    private val viewModel: InterestFilterViewModel by activityViewModels()
-    private val categoryViewModel : CategoryInterestViewModel by activityViewModels()
-
-
-
-    override fun onResume() {
-        super.onResume()
-        (activity as? MainActivity)?.let {
-            it.findViewById<FloatingActionButton>(R.id.add_study_btn)?.visibility = View.VISIBLE
-            it.findViewById<FloatingActionButton>(R.id.add_study_btn)?.setImageTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.white)))
-            it.findViewById<FloatingActionButton>(R.id.add_study_btn)?.setOnClickListener {
-                val fragment = RegisterStudyFragment()
-                parentFragmentManager.beginTransaction()
-                    .replace(R.id.main_frm, fragment)
-                    .addToBackStack(null)
-                    .commit()
-            }
-        }
-
-        val mainActivity = requireActivity() as MainActivity
-        mainActivity.isOnCommunityHome(this@HouseFragment)
-    }
-
-    override fun onPause() {
-        super.onPause()
-        (activity as? MainActivity)?.let {
-            it.findViewById<FloatingActionButton>(R.id.add_study_btn)?.visibility = View.GONE
-        }
-    }
-
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        // Inflate the layout for this fragment
-        binding = FragmentHouseBinding.inflate(inflater, container, false)
-        val activity = requireActivity() as? MainActivity
-
-        //날씨 배경 정의
-        val backgroundRes = activity?.getWeatherBackground()
-
-        // 🟢 기본값은 ic_weather_background로 설정되어 있으므로 밤일 경우에만 업데이트
-        if (backgroundRes == R.drawable.ic_weather_night_background) {
-            binding.icWeatherBackground.setImageResource(backgroundRes)
-        }
-
-        fetchLivePopularContent()
-
-
-        studyApiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-        presentTemperature = binding.txTemperature
-        fetchLivePopularContent()
-
-        //InterestFilterFragment 요소 초기화
-        viewModel.reset()
-
-        binding.goPopularContentIv.setOnClickListener{
-            activity?.let {
-                it.supportFragmentManager.beginTransaction()
-                    .replace(R.id.main_frm, CommunityHomeFragment())
-                    .addToBackStack(null)
-                    .commitAllowingStateLoss()
-
-                it.isOnCommunityHome(CommunityHomeFragment())
-            }
-        }
-
-        binding.popularContentTv.setOnClickListener {
-            if(popularContentId != -1) {
-                val intent = Intent(requireContext(), CommunityContentActivity::class.java)
-                intent.putExtra("postInfo", popularContentId.toString())
-                startActivity(intent)
-            }
-        }
-
-
-        interestBoardAdapter = InterestVPAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-            toggleLikeStatus(selectedItem, likeButton)
-        },studyViewModel = studyViewModel)
-
-        interestBoardAdapter.setItemClickListener(object : InterestVPAdapter.OnItemClickListeners {
-            override fun onItemClick(data: BoardItem) {
-                studyViewModel.setStudyData(
-                    data.studyId,
-                    data.imageUrl,
-                    data.introduction
-                )
-
-                val fragment = DetailStudyFragment()
-                parentFragmentManager.beginTransaction()
-                    .replace(R.id.main_frm, fragment)
-                    .addToBackStack(null)
-                    .commit()
-            }
-        })
-
-
-
-        recommendBoardAdapter = InterestVPAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-        toggleLikeStatus(selectedItem, likeButton)
-        },studyViewModel = studyViewModel)
-
-        recommendBoardAdapter.setItemClickListener(object : InterestVPAdapter.OnItemClickListeners {
-            override fun onItemClick(data: BoardItem) {
-                studyViewModel.setStudyData(
-                    data.studyId,
-                    data.imageUrl,
-                    data.introduction
-                )
-
-                val fragment = DetailStudyFragment()
-                fetchStudyMembers(data.studyId)
-                parentFragmentManager.beginTransaction()
-                    .replace(R.id.main_frm, fragment)
-                    .addToBackStack(null)
-                    .commit()
-            }
-        })
-
-        binding.rvBoard.apply {
-            layoutManager = LinearLayoutManager(context)
-            adapter = interestBoardAdapter
-        }
-
-        binding.rvBoard2.apply {
-            layoutManager = LinearLayoutManager(context)
-            adapter = recommendBoardAdapter
-        }
-
-        fetchDataMostPopular() //관심 지역 스터디
-        fetchRecommendStudy() //추천 스터디
-
-        binding.icFind.setOnClickListener {
-            activity?.let {
-                it.supportFragmentManager.beginTransaction()
-                    .replace(R.id.main_frm, SearchFragment())
-                    .addToBackStack(null)
-                    .commitAllowingStateLoss()
-
-                it.isOnCommunityHome(HomeFragment())
-            }
-        }
-
-
-        binding.icAlarm.setOnClickListener {
-            activity?.let {
-                it.supportFragmentManager.beginTransaction()
-                    .replace(R.id.main_frm, AlertFragment())
-                    .addToBackStack(null)
-                    .commitAllowingStateLoss()
-
-                it.isOnCommunityHome(HomeFragment())
-            }
-        }
-
-
-        val bundle = Bundle()
-        val bundle2 = Bundle()
-        val bundle3 = Bundle()
-        val bundle4 = Bundle()
-
-        val interestFragment = InterestFragment()
-        val myInterestStudyFragment = MyInterestStudyFragment()
-        val recruitingStudyFragment = RecruitingStudyFragment()
-        val categoryFragment = CategoryFragment()
-        interestFragment.arguments = bundle
-        myInterestStudyFragment.arguments = bundle2
-        recruitingStudyFragment.arguments = bundle3
-        categoryFragment.arguments = bundle4
-
-
-        binding.houseLocationCl.setOnClickListener {
-            bundle.putString("source", "HouseFragment")
-            activity?.let {
-                it.supportFragmentManager.beginTransaction()
-                    .replace(R.id.main_frm, interestFragment)
-                    .addToBackStack(null)
-                    .commitAllowingStateLoss()
-
-                it.isOnCommunityHome(interestFragment)
-            }
-        }
-
-        binding.houseRecruitCl.setOnClickListener {
-            bundle3.putString("source", "HouseFragment")
-            activity?.let {
-                it.supportFragmentManager.beginTransaction()
-                    .replace(R.id.main_frm, recruitingStudyFragment)
-                    .addToBackStack(null)
-                    .commitAllowingStateLoss()
-
-                it.isOnCommunityHome(recruitingStudyFragment)
-            }
-        }
-
-        binding.houseInterestCl.setOnClickListener {
-            bundle2.putString("source", "HouseFragment")
-            activity?.let {
-                it.supportFragmentManager.beginTransaction()
-                    .replace(R.id.main_frm, myInterestStudyFragment)
-                    .addToBackStack(null)
-                    .commitAllowingStateLoss()
-
-                it.isOnCommunityHome(myInterestStudyFragment)
-            }
-        }
-
-        binding.icGoInterest.setOnClickListener {
-            val bundle4 = Bundle().apply {
-                putInt("categoryType", 0)
-            }
-            val categoryFragment = CategoryFragment_1().apply {
-                arguments = bundle4
-            }
-
-            categoryViewModel.reset()
-
-            activity?.let {
-                it.supportFragmentManager.beginTransaction()
-                    .replace(R.id.main_frm, categoryFragment)
-                    .addToBackStack(null)
-                    .commitAllowingStateLoss()
-
-                it.isOnCommunityHome(categoryFragment)
-            }
-        }
-
-        binding.houseCommunityCl.setOnClickListener {
-            activity?.let {
-                it.supportFragmentManager.beginTransaction()
-                    .replace(R.id.main_frm, CommunityHomeFragment())
-                    .addToBackStack(null)
-                    .commitAllowingStateLoss()
-
-                it.isOnCommunityHome(CommunityHomeFragment())
-            }
-        }
-
-        binding.icRecommendationRefresh.setOnClickListener {
-            fetchRecommendStudy()
-        }
-
-        weatherViewModel = ViewModelProvider(requireActivity()).get(WeatherViewModel::class.java)
-
-        weatherViewModel.weatherResponse.observe(viewLifecycleOwner) { response ->
-            Log.d("HouseFragment", "Observer triggered")
-
-            if (response.isSuccessful) {
-                val responseBody = response.body()?.response
-                Log.d("HouseFragment", "Response: ${response.body()}")
-                if (responseBody?.body != null) {
-                    val items = responseBody.body.items
-                    if (!items?.item.isNullOrEmpty()) {
-                        Log.d("HouseFragment", "Weather data received: ${items.item.size} items")
-
-                        val tmpItem = items.item.find { it.category.trim() == "TMP" }
-                        val tmnItem = items.item.find { it.category.trim() == "TMN" }
-                        val pcpItem = items.item.find { it.category.trim() == "PCP" }
-                        val snoItem = items.item.find { it.category.trim() == "SNO" }
-                        val wsdItem = items.item.find { it.category.trim() == "WSD" }
-
-                        if (tmpItem != null || pcpItem != null || snoItem != null || wsdItem != null || tmnItem != null) {
-                            val temperature = tmpItem?.fcstValue?.toDoubleOrNull() ?: 0.0
-                            val precipitation = parseDouble(pcpItem?.fcstValue ?: "-")
-                            val snowfall = parseDouble(snoItem?.fcstValue ?: "-")
-                            val windSpeed = wsdItem?.fcstValue?.toDoubleOrNull() ?: 0.0
-
-                            presentTemperature.text = String.format("%.1f °C", temperature)
-                            Log.d("HouseFragment","$temperature,$precipitation,$snowfall,$windSpeed")
-
-                            // 날씨에 맞는 메시지 & 이미지 가져오기
-                            val (weatherMessage, weatherImage) = getWeatherInfo(temperature,precipitation,snowfall, windSpeed)
-
-                            // UI 업데이트
-                            binding.txExplainWeather.text = weatherMessage
-                            binding.icSun.setImageResource(weatherImage)
-                        } else {
-                            Log.e("HouseFragment", "TMP, TMN, PCP, SNO, WSD 데이터 중 일부가 누락됨")
-                        }
-                    } else {
-                        Log.e("HouseFragment", "날씨 데이터가 비어 있음")
-                    }
-                } else {
-                    Log.e("HouseFragment", "응답 body가 null")
-                }
-            } else {
-                Log.e("HouseFragment", "Weather API 응답 실패: ${response.errorBody()} ")
-            }
-        }
-
-
-        return binding.root
-    }
-
-    // 날씨 상태에 따른 메시지와 이미지 설정 함수
-    fun getWeatherInfo(tmp:Double, pcp: Double, sno: Double, wsd: Double): Pair<String, Int> {
-        return when {
-            pcp >= 10 -> "실내에서 집중! 목표는 선명히!" to R.drawable.ic_rainy // 강한 비
-            sno >= 5 -> "눈길 조심! 한 걸음씩 나아가요!" to R.drawable.ic_snow // 폭설
-            wsd >= 9 -> "바람 조심! 흔들려도 전진!" to R.drawable.ic_gale // 강풍
-            tmp >= 0 && tmp <= 10 -> "따뜻하게! 오늘도 열정 가득!" to R.drawable.ic_cold // 추운 날씨
-            tmp >= 25 -> "수분 보충! 더위도 이겨내요!" to R.drawable.ic_hot // 더운 날씨
-            pcp in 1.0..4.0 -> "우산 챙기고 오늘도 파이팅!" to R.drawable.ic_light_rainy // 약한 비
-            pcp == 0.0 && tmp in 10.0..25.0 -> "좋은 날! 목표 향해 달려요!" to R.drawable.ic_sun // 맑고 쾌적한 날씨
-            else -> "오늘도 힘내세요!" to R.drawable.ic_sun // 기본 메시지
-        }
-    }
-
-
-    fun parseDouble(value: String): Double {
-        return when (value) {
-            "-", "강수없음", "적설없음" -> 0.0
-            else -> value.toDoubleOrNull() ?: 0.0
-        }
-    }
-
-
-    private fun fetchDataMostPopular() {
-        val service = RetrofitInstance.retrofit.create(InterestAreaApiService::class.java)
-        service.getInterestedBestStudies().enqueue(object : Callback<ApiResponse> {
-            override fun onResponse(call: Call<ApiResponse>, response: Response<ApiResponse>) {
-                if (response.isSuccessful) {
-                    val boardItems = response.body()?.result?.content?.map { study ->
-                        BoardItem(studyId = study.studyId, title = study.title, goal = study.goal, introduction = study.introduction, memberCount = study.memberCount, heartCount = study.heartCount, hitNum = study.hitNum, maxPeople = study.maxPeople, studyState = study.studyState, themeTypes = study.themeTypes, regions = study.regions, imageUrl = study.imageUrl, liked = study.liked, isHost = false
-                        )
-                    } ?: emptyList()
-                    if (boardItems.isNotEmpty()) {
-                        interestBoardAdapter.updateList(boardItems)
-                        binding.rvBoard.visibility = View.VISIBLE
-                    } else {
-                        binding.rvBoard.visibility = View.GONE
-                        Toast.makeText(requireContext(), "조건에 맞는 항목이 없습니다.", Toast.LENGTH_SHORT)
-                            .show()
-                    }
-                }
-            }
-
-            override fun onFailure(call: Call<ApiResponse>, t: Throwable) {
-            }
-        })
-    }
-
-
-    private fun toggleLikeStatus(studyItem: BoardItem, likeButton: ImageView) {
-        val memberId = getMemberId(requireContext())
-
-        if (memberId != -1) {
-            studyApiService.toggleStudyLike(studyItem.studyId).enqueue(object : Callback<LikeResponse> {
-                override fun onResponse(call: Call<LikeResponse>, response: Response<LikeResponse>) {
-                    if (response.isSuccessful) {
-                        val newStatus = response.body()?.result?.status
-                        studyItem.liked = newStatus == "LIKE"
-                        val newIcon = if (studyItem.liked) R.drawable.ic_heart_filled else R.drawable.study_like
-                        likeButton.setImageResource(newIcon)
-
-                        // heartCount 즉시 증가 또는 감소
-                        studyItem.heartCount = if (studyItem.liked) studyItem.heartCount + 1 else studyItem.heartCount - 1
-
-                        // 최신 데이터 동기화를 위해 fetchDataAnyWhere와 fetchRecommendStudy를 다시 호출
-                        fetchDataMostPopular()
-                        fetchRecommendStudy()
-                    } else {
-                        Toast.makeText(requireContext(), "찜 상태 업데이트 실패", Toast.LENGTH_SHORT).show()
-                    }
-                }
-
-                override fun onFailure(call: Call<LikeResponse>, t: Throwable) {
-                    Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
-                }
-            })
-        } else {
-            Toast.makeText(requireContext(), "회원 정보를 불러올 수 없습니다.", Toast.LENGTH_SHORT).show()
-        }
-    }
-
-    private fun fetchLivePopularContent() {
-        val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
-        service.getBestCommunityContent("REAL_TIME")
-            .enqueue(object : Callback<CommunityResponse> {
-                override fun onResponse(
-                    call: Call<CommunityResponse>,
-                    response: Response<CommunityResponse>
-                ) {
-                    if (response.isSuccessful) {
-                        val popularResponse = response.body()
-                        if (popularResponse?.isSuccess == "true") {
-                            val postList = popularResponse.result.postBest5Responses
-                            if (!postList.isNullOrEmpty()) {
-                                binding.popularContentTv.text = postList[0].postTitle
-                                popularContentId = postList[0].postId
-                            } else {
-                                binding.popularContentTv.text = "인기 게시글이 없습니다"
-                                popularContentId = -1 // 또는 클릭 불가하게 처리
-                            }
-                        } else {
-                            showError(popularResponse?.message)
-                        }
-
-                    } else {
-                        showError(response.code().toString())
-                    }
-                }
-
-                override fun onFailure(call: Call<CommunityResponse>, t: Throwable) {
-                    Log.e("LivePopularContent", "Failure: ${t.message}", t)
-                }
-            })
-    }
-
-    private fun showError(message: String?) {
-        Toast.makeText(context, "Error: $message", Toast.LENGTH_SHORT).show()
-    }
-
-
-    private fun fetchRecommendStudy() {
-        val service = RetrofitInstance.retrofit.create(RecommendStudyApiService::class.java)
-        service.GetRecommendStudy().enqueue(object : Callback<ApiResponse> {
-            override fun onResponse(call: Call<ApiResponse>, response: Response<ApiResponse>) {
-                if (response.isSuccessful) {
-                    val boardItems = response.body()?.result?.content?.map { study ->
-                        BoardItem(
-                            studyId = study.studyId,
-                            title = study.title,
-                            goal = study.goal,
-                            introduction = study.introduction,
-                            memberCount = study.memberCount,
-                            heartCount = study.heartCount,
-                            hitNum = study.hitNum,
-                            maxPeople = study.maxPeople,
-                            studyState = study.studyState,
-                            themeTypes = study.themeTypes,
-                            regions = study.regions,
-                            imageUrl = study.imageUrl,
-                            liked = study.liked,
-                            isHost = false
-                        )
-                    } ?: emptyList()
-
-                    if (boardItems.isNotEmpty()) {
-                        recommendBoardAdapter.updateList(boardItems)
-                        binding.rvBoard2.visibility = View.VISIBLE
-                    } else {
-                        binding.rvBoard2.visibility = View.GONE
-                        Toast.makeText(requireContext(), "조건에 맞는 항목이 없습니다.", Toast.LENGTH_SHORT)
-                            .show()
-                    }
-                } else {
-                    Log.d("HouseFragment", "연결 실패: ${response.code()}")
-                }
-            }
-
-            override fun onFailure(call: Call<ApiResponse>, t: Throwable) {
-                Log.d("HouseFragment", "API 호출 실패: ${t.message}")
-            }
-        })
-    }
-
-
-
-    fun getMemberId(context: Context): Int {
-
-        var memberId: Int = -1
-
-        val sharedPreferences =
-            context.getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val currentEmail = sharedPreferences.getString("currentEmail", null)
-
-        // 현재 로그인된 사용자 정보를 로그
-        memberId = if (currentEmail != null) sharedPreferences.getInt(
-            "${currentEmail}_memberId",
-            -1
-        ) else -1
-
-        return memberId // 저장된 memberId 없을 시 기본값 -1 반환
-    }
-
-    private fun fetchStudyMembers(studyId: Int) {
-        val api = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val currentMemberId = sharedPreferences.getInt("${sharedPreferences.getString("currentEmail", "")}_memberId", -1)
-
-        api.getStudyMembers(studyId).enqueue(object : Callback<MemberResponse> {
-            override fun onResponse(call: Call<MemberResponse>, response: Response<MemberResponse>) {
-                if (response.isSuccessful) {
-                    response.body()?.let { memberResponse ->
-                        val members = memberResponse.result?.members ?: emptyList()
-                        members.forEach { member ->
-                            Log.d("StudyMembers", "Member ID: ${member.memberId}, Nickname: ${member.nickname}, Profile Image: ${member.profileImage ?: "NULL"}")
-                        }
-
-
-                    }
-                } else {
-                    Toast.makeText(requireContext(), "Failed to fetch study members", Toast.LENGTH_SHORT).show()
-                }
-            }
-
-            override fun onFailure(call: Call<MemberResponse>, t: Throwable) {
-                Toast.makeText(requireContext(), "Error: ${t.message}", Toast.LENGTH_SHORT).show()
-            }
-        })
-    }
-}
-
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/MainActivity.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/MainActivity.kt
index 5ea5bfb6..340936af 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/MainActivity.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/MainActivity.kt
@@ -1,65 +1,39 @@
 package com.example.spoteam_android
 
-import StudyViewModel
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
-import android.content.res.ColorStateList
 import android.os.Bundle
 import android.util.Log
 import android.view.View
-import android.widget.TextView
-import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContentProviderCompat.requireContext
-import androidx.core.content.ContextCompat
-import androidx.core.view.GravityCompat
-import androidx.drawerlayout.widget.DrawerLayout
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.fragment.app.viewModels
-import androidx.navigation.NavController
-import androidx.navigation.fragment.NavHostFragment
 import com.example.spoteam_android.data.ApiModels
 import com.example.spoteam_android.databinding.ActivityMainBinding
-import com.example.spoteam_android.login.LoginApiService
-import com.example.spoteam_android.login.TokenUtil
-import com.example.spoteam_android.ui.study.todolist.TodoViewModel
-import com.example.spoteam_android.ui.alert.AlertFragment
-import com.example.spoteam_android.ui.bookMark.BookmarkFragment
-//import com.example.spoteam_android.ui.bookMark.BookmarkFragment
-//import com.example.spoteam_android.ui.bookMark.BookmarkFragment
-import com.example.spoteam_android.ui.category.CategoryFragment
-import com.example.spoteam_android.ui.category.CategoryFragment_1
-import com.example.spoteam_android.ui.category.CategoryInterestViewModel
-import com.example.spoteam_android.ui.category.CategoryNavViewFragment
-import com.example.spoteam_android.ui.community.CommunityFragment
-import com.example.spoteam_android.ui.community.CommunityHomeFragment
-import com.example.spoteam_android.ui.community.WriteContentFragment
-import com.example.spoteam_android.ui.interestarea.BottomNavVisibilityController
-import com.example.spoteam_android.ui.interestarea.InterestFilterFragment
-import com.example.spoteam_android.ui.myinterest.MyInterestStudyFilterFragment
-import com.example.spoteam_android.ui.myinterest.MyInterestStudyFragment
-//import com.example.spoteam_android.ui.mypage.ConsiderAttendanceMemberFragment
-import com.example.spoteam_android.ui.mypage.MyPageFragment
-import com.example.spoteam_android.ui.recruiting.RecruitingStudyFilterFragment
-import com.example.spoteam_android.ui.study.DetailStudyFragment
-import com.example.spoteam_android.ui.study.MyStudyCommunityFragment
-import com.example.spoteam_android.ui.study.MyStudyWriteContentFragment
-import com.example.spoteam_android.ui.study.RegisterStudyFragment
-import com.example.spoteam_android.ui.study.StudyFragment
-import com.example.spoteam_android.weather.WeatherViewModel
-import com.example.spoteam_android.weather.parseCsv
+
+import com.example.spoteam_android.presentation.home.WeatherViewModel
+import com.example.spoteam_android.presentation.alert.AlertFragment
+import com.example.spoteam_android.presentation.bookMark.BookmarkFragment
+import com.example.spoteam_android.presentation.category.CategoryFragment
+import com.example.spoteam_android.presentation.category.CategoryFragment_1
+import com.example.spoteam_android.presentation.category.CategoryNavViewFragment
+import com.example.spoteam_android.presentation.community.CommunityFragment
+import com.example.spoteam_android.presentation.community.CommunityHomeFragment
+import com.example.spoteam_android.presentation.community.WriteContentFragment
+import com.example.spoteam_android.presentation.home.HomeFragment
+import com.example.spoteam_android.presentation.interestarea.BottomNavVisibilityController
+import com.example.spoteam_android.presentation.interestarea.InterestFilterFragment
+import com.example.spoteam_android.presentation.myinterest.MyInterestStudyFilterFragment
+import com.example.spoteam_android.presentation.mypage.MyPageFragment
+import com.example.spoteam_android.presentation.recruiting.RecruitingStudyFilterFragment
+import com.example.spoteam_android.presentation.study.MyStudyWriteContentFragment
+import com.example.spoteam_android.presentation.study.StudyFragment
+import com.example.spoteam_android.presentation.study.StudyViewModel
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.floatingactionbutton.FloatingActionButton
-import com.google.android.material.navigation.NavigationView
 import com.google.gson.Gson
 import dagger.hilt.android.AndroidEntryPoint
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import java.sql.Time
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Locale
@@ -70,10 +44,11 @@ class MainActivity : AppCompatActivity(), BottomNavVisibilityController {
     private lateinit var binding: ActivityMainBinding
     private lateinit var fab: FloatingActionButton
     private val weatherViewModel: WeatherViewModel by viewModels() // Hilt 사용
-    private val categoryViewModel : CategoryInterestViewModel by viewModels()
+    private val categoryViewModel : com.example.spoteam_android.presentation.category.CategoryInterestViewModel by viewModels()
     private val viewModel: StudyViewModel by viewModels()
 
 
+
     @SuppressLint("ClickableViewAccessibility")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -87,7 +62,7 @@ class MainActivity : AppCompatActivity(), BottomNavVisibilityController {
         val baseDate = getUpdatedDate()
         val baseTime = getUpdatedTime()
 
-        fetchRegions(baseDate.toInt(), baseTime)
+//        fetchRegions(baseDate.toInt(), baseTime)
 
 
 
@@ -125,37 +100,37 @@ class MainActivity : AppCompatActivity(), BottomNavVisibilityController {
                 if(it is CommunityFragment) {
                     writeCommunityFragment.show(supportFragmentManager, "Write Content")
                 }
-                if(it is DetailStudyFragment) {
+                if(it is com.example.spoteam_android.presentation.study.DetailStudyFragment) {
                     myStudyWriteCommunityFragment.show(supportFragmentManager, "My Study Write Content")
                 }
             }
         }
 
         init()
-        isOnCommunityHome(HouseFragment())
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        val (accessToken, refreshToken) = TokenUtil.getStoredTokens(this)
-
-        if (TokenUtil.isExpired(accessToken)) {
-            val newToken = TokenUtil.refreshTokenSync(this, refreshToken ?: "")
-
-            if (newToken == null) {
-                Log.e("MainActivity", "토큰 갱신 실패. 로그인 화면으로 이동.")
-                return // 이미 이동 처리됨
-            } else {
-                Log.d("MainActivity", "토큰 갱신 성공. 최신 토큰으로 유지됨.")
-            }
-        } else {
-            Log.d("MainActivity", "토큰 유효함.")
-        }
-
-
+        isOnCommunityHome(HomeFragment())
     }
 
+//    override fun onResume() {
+//        super.onResume()
+//
+//        val (accessToken, refreshToken) = TokenUtil.getStoredTokens(this)
+//
+//        if (TokenUtil.isExpired(accessToken)) {
+//            val newToken = TokenUtil.refreshTokenSync(this, refreshToken ?: "")
+//
+//            if (newToken == null) {
+//                Log.e("MainActivity", "토큰 갱신 실패. 로그인 화면으로 이동.")
+//                return // 이미 이동 처리됨
+//            } else {
+//                Log.d("MainActivity", "토큰 갱신 성공. 최신 토큰으로 유지됨.")
+//            }
+//        } else {
+//            Log.d("MainActivity", "토큰 유효함.")
+//        }
+//
+//
+//    }
+//
 
     private fun getCurrentFragment(): Fragment? {
         return supportFragmentManager.findFragmentById(R.id.main_frm)
@@ -164,7 +139,7 @@ class MainActivity : AppCompatActivity(), BottomNavVisibilityController {
     private fun init() {
         // 초기 화면 설정: 기본으로 HouseFragment를 보이도록 설정
         supportFragmentManager.beginTransaction()
-            .replace(R.id.main_frm, HouseFragment())
+            .replace(R.id.main_frm, HomeFragment())
             .commitAllowingStateLoss()
 
         // BottomNavigationView의 아이템 선택 리스너 설정
@@ -172,9 +147,9 @@ class MainActivity : AppCompatActivity(), BottomNavVisibilityController {
             when (item.itemId) {
                 R.id.navigation_home -> {
                     hideBlur()
-                    showFragment(HouseFragment())
-                    isOnCommunityHome(HouseFragment())
-                    isOnAlertFragment(HouseFragment())
+                    showFragment(HomeFragment())
+                    isOnCommunityHome(HomeFragment())
+                    isOnAlertFragment(HomeFragment())
                     logTokens(this)
                     return@setOnItemSelectedListener true
                 }
@@ -249,7 +224,7 @@ class MainActivity : AppCompatActivity(), BottomNavVisibilityController {
         when (fragment) {
             is InterestFilterFragment,
             is MyInterestStudyFilterFragment,
-            is RecruitingStudyFilterFragment-> {
+            is RecruitingStudyFilterFragment -> {
                 binding.mainBnv.visibility = View.GONE
             }
             else -> {
@@ -318,53 +293,53 @@ class MainActivity : AppCompatActivity(), BottomNavVisibilityController {
         Log.d("TokenLogger", "Current RefreshToken: $refreshToken")
     }
 
-    private fun fetchRegions(myDate: Int, myTime: String) {
-        val service = RetrofitInstance.retrofit.create(LoginApiService::class.java)
-
-        service.getRegion().enqueue(object : Callback<RegionApiResponse> {
-            override fun onResponse(call: Call<RegionApiResponse>, response: Response<RegionApiResponse>) {
-                if (response.isSuccessful) {
-                    val apiResponse = response.body()
-                    if (apiResponse != null && apiResponse.isSuccess) {
-                        val regions = apiResponse.result.regions
-                        if (regions.isNotEmpty()) {
-                            Log.d("region", "Received regions: $regions")
-
-                            val regionDataList = parseCsv(this@MainActivity)
-                            regions.firstOrNull()?.let { region ->
-                                val gridCoordinates = findGridByCode(region.code, regionDataList)
-                                if (gridCoordinates != null) {
-                                    val (gridX, gridY) = gridCoordinates
-                                    Log.d("RegionGrid", "Region: ${region.neighborhood}, GridX: $gridX, GridY: $gridY")
-
-                                    // WeatherViewModel을 통해 날씨 데이터 요청
-                                    weatherViewModel.getWeather(
-                                        dataType = "JSON",
-                                        numOfRows = 14,
-                                        pageNo = 1,
-                                        baseDate = myDate,
-                                        baseTime = myTime,
-                                        nx = gridX.toString(),
-                                        ny = gridY.toString()
-                                    )
-                                } else {
-                                    Log.e("RegionGrid", "Grid coordinates not found for region code: ${region.code}")
-                                }
-                            }
-                        }
-                    } else {
-                        Log.e("RegionAPI", "Failed to get region data")
-                    }
-                } else {
-                    Log.e("RegionAPI", "API Response failed")
-                }
-            }
-
-            override fun onFailure(call: Call<RegionApiResponse>, t: Throwable) {
-                Log.e("RegionAPI", "Network error: ${t.message}")
-            }
-        })
-    }
+//    private fun fetchRegions(myDate: Int, myTime: String) {
+//        val service = RetrofitInstance.retrofit.create(LoginService::class.java)
+//
+//        service.getRegion().enqueue(object : Callback<RegionApiResponse> {
+//            override fun onResponse(call: Call<RegionApiResponse>, response: Response<RegionApiResponse>) {
+//                if (response.isSuccessful) {
+//                    val apiResponse = response.body()
+//                    if (apiResponse != null && apiResponse.isSuccess) {
+//                        val regions = apiResponse.result.regions
+//                        if (regions.isNotEmpty()) {
+//                            Log.d("region", "Received regions: $regions")
+//
+//                            val regionDataList = parseCsv(this@MainActivity)
+//                            regions.firstOrNull()?.let { region ->
+//                                val gridCoordinates = findGridByCode(region.code, regionDataList)
+//                                if (gridCoordinates != null) {
+//                                    val (gridX, gridY) = gridCoordinates
+//                                    Log.d("RegionGrid", "Region: ${region.neighborhood}, GridX: $gridX, GridY: $gridY")
+//
+//                                    // WeatherViewModel을 통해 날씨 데이터 요청
+//                                    weatherViewModel.getWeather(
+//                                        dataType = "JSON",
+//                                        numOfRows = 14,
+//                                        pageNo = 1,
+//                                        baseDate = myDate,
+//                                        baseTime = myTime,
+//                                        nx = gridX.toString(),
+//                                        ny = gridY.toString()
+//                                    )
+//                                } else {
+//                                    Log.e("RegionGrid", "Grid coordinates not found for region code: ${region.code}")
+//                                }
+//                            }
+//                        }
+//                    } else {
+//                        Log.e("RegionAPI", "Failed to get region data")
+//                    }
+//                } else {
+//                    Log.e("RegionAPI", "API Response failed")
+//                }
+//            }
+//
+//            override fun onFailure(call: Call<RegionApiResponse>, t: Throwable) {
+//                Log.e("RegionAPI", "Network error: ${t.message}")
+//            }
+//        })
+//    }
 
     fun findGridByCode(regionCode: String, regionDataList: List<RegionData>): Pair<Int, Int>? {
         val regionData = regionDataList.find { it.administrativeCode == regionCode }
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/RetrofitInstance.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/RetrofitInstance.kt
index 0105c60a..1a77e9f6 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/RetrofitInstance.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/RetrofitInstance.kt
@@ -40,7 +40,7 @@ object RetrofitInstance {
 
 
     private fun loadAuthTokenFromPreferences() {
-        if (!::appContext.isInitialized) {
+        if (!RetrofitInstance::appContext.isInitialized) {
             Log.e("RetrofitInstance", "initialize() 호출 필요!")
             return
         }
@@ -51,7 +51,7 @@ object RetrofitInstance {
 
 
     private fun saveAuthTokenToPreferences(token: String) {
-        if (!::appContext.isInitialized) {
+        if (!RetrofitInstance::appContext.isInitialized) {
             Log.e("RetrofitInstance", "initialize() 호출 필요!")
             return
         }
@@ -67,7 +67,7 @@ object RetrofitInstance {
 
 
     private fun clearAuthTokenFromPreferences() {
-        if (!::appContext.isInitialized) {
+        if (!RetrofitInstance::appContext.isInitialized) {
             Log.e("RetrofitInstance", "initialize() 호출 필요!")
             return
         }
@@ -84,7 +84,7 @@ object RetrofitInstance {
 
     val okHttpClient: OkHttpClient by lazy {
         OkHttpClient.Builder()
-            .addInterceptor(AuthInterceptor(appContext))
+            .addInterceptor(RetrofitInstanceAuthInterceptor(appContext))
             .connectTimeout(60, TimeUnit.SECONDS)
             .readTimeout(60, TimeUnit.SECONDS)
             .writeTimeout(60, TimeUnit.SECONDS)
@@ -105,4 +105,4 @@ object RetrofitInstance {
             .addConverterFactory(GsonConverterFactory.create(gson))
             .build()
     }
-}
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/RetrofitInstanceAuthInterceptor.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/RetrofitInstanceAuthInterceptor.kt
new file mode 100644
index 00000000..6ead1ed5
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/RetrofitInstanceAuthInterceptor.kt
@@ -0,0 +1,38 @@
+package com.example.spoteam_android
+
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import com.example.spoteam_android.presentation.login.StartLoginActivity
+import okhttp3.Interceptor
+import okhttp3.Response
+
+class RetrofitInstanceAuthInterceptor(
+    private val context: Context
+) : Interceptor {
+
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val sharedPreferences = context.getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
+        val email = sharedPreferences.getString("currentEmail", null)
+        val token = email?.let { sharedPreferences.getString("${it}_accessToken", null) }
+
+        var request = chain.request()
+        token?.let {
+            request = request.newBuilder()
+                .header("Authorization", "Bearer $it")
+                .build()
+        }
+
+        val response = chain.proceed(request)
+
+        if (response.code == 401) {
+            Log.e("AuthInterceptor", "401 Unauthorized - redirecting to login")
+            val intent = Intent(context, StartLoginActivity::class.java).apply {
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+            }
+            context.startActivity(intent)
+        }
+
+        return response
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/GlobalApplication.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/SpotApplication.kt
similarity index 55%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/GlobalApplication.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/SpotApplication.kt
index cb440c20..2d2f78e7 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/GlobalApplication.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/SpotApplication.kt
@@ -1,5 +1,6 @@
 package com.example.spoteam_android
 
+
 import android.app.Application
 import android.util.Log
 import com.kakao.sdk.common.KakaoSdk
@@ -8,20 +9,20 @@ import com.navercorp.nid.NaverIdLoginSDK
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
-class GlobalApplication: Application() {
+class SpotApplication: Application() {
     override fun onCreate() {
         super.onCreate()
-        KakaoSdk.init(this, "7878cb24cec56458df067991de5e7786")
+        KakaoSdk.init(this, BuildConfig.KAKAO_NATIVE_KEY)
         NaverIdLoginSDK.initialize(
             this,
-            "PgLxwOn8SAdjXBkdilNA",
-            "jx5U6lWiCq",
-            "SPOT",
+            BuildConfig.NAVER_CLIENT_ID,
+            BuildConfig.NAVER_CLIENT_SECRET,
+            "SPOT"
         )
-        var keyHash = Utility.getKeyHash(this)
-
-        Log.i("GlobalApplication", "$keyHash")
-
+        if (BuildConfig.DEBUG) {
+            val keyHash = Utility.getKeyHash(this)
+            Log.i("SpotApplication", "KeyHash: $keyHash")
+        }
         RetrofitInstance.initialize(this)
 
     }
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/checklist/CheckListCategoryActivity.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/checklist/CheckListCategoryActivity.kt
deleted file mode 100644
index d07b87cb..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/checklist/CheckListCategoryActivity.kt
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.example.spoteam_android.checklist
-
-import android.content.Intent
-import android.os.Bundle
-import android.util.Log
-import android.widget.CompoundButton
-import androidx.appcompat.app.AppCompatActivity
-import com.example.spoteam_android.databinding.ActivityCheckListCategoryBinding
-import com.google.android.material.chip.Chip
-
-class CheckListCategoryActivity : AppCompatActivity() {
-    lateinit var binding: ActivityCheckListCategoryBinding
-    private val selectedThemes = mutableListOf<String>()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        binding = ActivityCheckListCategoryBinding.inflate(layoutInflater)
-        super.onCreate(savedInstanceState)
-        setContentView(binding.root)
-
-        setSupportActionBar(binding.activityChecklistTb)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        title = ""
-        binding.activityChecklistTb.setNavigationOnClickListener {
-            onBackPressedDispatcher.onBackPressed()
-
-        }
-
-        setChipGroup()
-
-        binding.checklistspotNextBt.setOnClickListener {
-            // 선택된 테마 리스트를 다음 액티비티로 전달
-            val themeIntent = Intent(this, CheckListStudyPurposeActivity::class.java)
-            themeIntent.putStringArrayListExtra("selectedThemes", ArrayList(selectedThemes))
-            startActivity(themeIntent)
-        }
-    }
-
-    private fun setChipGroup() {
-        // 초기 버튼 비활성화
-        binding.checklistspotNextBt.isEnabled = false
-
-        // Chip 선택 상태 리스너
-        val chipCheckedChangeListener = CompoundButton.OnCheckedChangeListener { buttonView, isChecked ->
-            val chip = buttonView as Chip
-            val chipText = chip.text.toString()
-            val processedText = when {
-                chipText.contains("전공") -> chipText.replace("/", "및") //
-                else -> chipText.replace("/", "").replace(" ", "") // 공백 및 슬래시를 제거
-            }
-
-            if (isChecked) {
-                if (chipText !in selectedThemes) {
-                    selectedThemes.add(processedText)
-                }
-            } else {
-                selectedThemes.remove(processedText)
-            }
-
-            // 선택된 칩이 하나라도 있으면 버튼 활성화
-            val isAnyChipChecked = selectedThemes.isNotEmpty()
-            binding.checklistspotNextBt.isEnabled = isAnyChipChecked
-
-            Log.d("CheckListCategoryActivity", "Selected Themes: $selectedThemes")
-        }
-
-        // Chip 그룹의 모든 칩에 리스너 설정
-        for (i in 0 until binding.activityChecklistChipGroup.childCount) {
-            val chip = binding.activityChecklistChipGroup.getChildAt(i) as? Chip
-            chip?.setOnCheckedChangeListener(chipCheckedChangeListener)
-        }
-    }
-
-
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/checklist/CheckListStudyPurposeActivity.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/checklist/CheckListStudyPurposeActivity.kt
deleted file mode 100644
index 2d12b459..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/checklist/CheckListStudyPurposeActivity.kt
+++ /dev/null
@@ -1,82 +0,0 @@
-    package com.example.spoteam_android.checklist
-
-    import android.content.Intent
-    import android.os.Bundle
-    import android.util.Log
-    import android.widget.CompoundButton
-    import androidx.appcompat.app.AppCompatActivity
-    import com.example.spoteam_android.R
-    import com.example.spoteam_android.databinding.ActivityCheckListStudyPurposeBinding
-    import com.google.android.material.chip.Chip
-
-    class CheckListStudyPurposeActivity : AppCompatActivity() {
-        lateinit var binding: ActivityCheckListStudyPurposeBinding
-        private val selectedPurpose = mutableListOf<Int>()
-
-        override fun onCreate(savedInstanceState: Bundle?) {
-            super.onCreate(savedInstanceState)
-            binding = ActivityCheckListStudyPurposeBinding.inflate(layoutInflater)
-            setContentView(binding.root)
-
-            val selectedThemes = intent.getStringArrayListExtra("selectedThemes")
-
-
-            setSupportActionBar(binding.activityChecklistStudypurposeTb)
-            supportActionBar?.setDisplayHomeAsUpEnabled(true)
-            title = ""
-            binding.activityChecklistStudypurposeTb.setNavigationOnClickListener {
-                val intent = Intent(this, CheckListCategoryActivity::class.java)
-                intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
-                startActivity(intent)
-
-
-            }
-
-            binding.activityChecklistStudypurposeChecklistspotNextBt.setOnClickListener {
-                val locationIntent = Intent(this, CheckListLocationActivity::class.java).apply {
-                    putStringArrayListExtra("selectedThemes", ArrayList(selectedThemes))
-                    putIntegerArrayListExtra("selectedPurpose", ArrayList(selectedPurpose))
-                }
-                startActivity(locationIntent)
-            }
-
-            setChipGroup()
-        }
-
-        private fun setChipGroup() {
-            // 초기 버튼 비활성화
-            binding.activityChecklistStudypurposeChecklistspotNextBt.isEnabled = false
-
-            val chipMap = mapOf(
-                R.id.activity_checklist_studypurpose_chip_habit to 1,
-                R.id.activity_checklist_studypurpose_chip_feedback to 2,
-                R.id.activity_checklist_studypurpose_chip_network to 3,
-                R.id.activity_checklist_studypurpose_chip_license to 4,
-                R.id.activity_checklist_studypurpose_chip_contest to 5,
-                R.id.activity_checklist_studypurpose_chip_opinion to 6
-            )
-
-            // chip 선택 상태 리스너
-            val chipCheckedChangeListener = CompoundButton.OnCheckedChangeListener { buttonView, isChecked ->
-                val chip = buttonView as Chip
-                val chipId= chip.id
-                val associatedNumber = chipMap[chipId]
-
-                if (isChecked) {
-                    associatedNumber?.let { selectedPurpose.add(it) }
-                } else {
-                    associatedNumber?.let { selectedPurpose.remove(it) }
-                }
-
-                // 버튼 활성화 상태 업데이트
-                val isAnyChipChecked = selectedPurpose.isNotEmpty()
-                binding.activityChecklistStudypurposeChecklistspotNextBt.isEnabled = isAnyChipChecked
-            }
-
-            // FlexboxLayout의 각 칩에 리스너 설정
-            for (i in 0 until binding.flexboxLayout.childCount) {
-                val chip = binding.flexboxLayout.getChildAt(i) as? Chip
-                chip?.setOnCheckedChangeListener(chipCheckedChangeListener)
-            }
-        }
-    }
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/core/network/BaseResponse.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/core/network/BaseResponse.kt
new file mode 100644
index 00000000..ffa33930
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/core/network/BaseResponse.kt
@@ -0,0 +1,16 @@
+package com.example.spoteam_android.core.network
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class BaseResponse<T>(
+    @SerialName("isSuccess")
+    val isSuccess: Boolean,
+    @SerialName("code")
+    val code: String,
+    @SerialName("message")
+    val message: String,
+    @SerialName("result")
+    val result: T? = null
+)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/core/util/ApiKey.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/core/util/ApiKey.kt
new file mode 100644
index 00000000..84d3a2c1
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/core/util/ApiKey.kt
@@ -0,0 +1,9 @@
+package com.example.spoteam_android.core.util
+
+import com.example.spoteam_android.BuildConfig
+
+class ApiKey {
+    companion object{
+        const val API_KEY = BuildConfig.PUBLIC_API_KEY
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/core/util/ContextExtensions.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/core/util/ContextExtensions.kt
new file mode 100644
index 00000000..b4890d0b
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/core/util/ContextExtensions.kt
@@ -0,0 +1,16 @@
+
+
+package com.example.spoteam_android.core.util
+
+import android.app.Activity
+import android.content.Context
+import android.content.ContextWrapper
+
+fun Context.findActivity(): Activity? {
+    var context = this
+    while (context is ContextWrapper) {
+        if (context is Activity) return context
+        context = context.baseContext
+    }
+    return null
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/util/LocationParser.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/core/util/LocationParser.kt
similarity index 83%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/util/LocationParser.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/core/util/LocationParser.kt
index e57ea8ac..765cb4e8 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/util/LocationParser.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/core/util/LocationParser.kt
@@ -1,7 +1,7 @@
-package com.example.spoteam_android.util
+package com.example.spoteam_android.core.util
 
 import android.content.Context
-import com.example.spoteam_android.login.LocationItem
+import com.example.spoteam_android.presentation.login.checklist.LocationItem
 import java.io.BufferedReader
 import java.io.InputStreamReader
 
@@ -12,7 +12,7 @@ fun parseLocationTsv(context: Context): List<LocationItem> {
     val reader = BufferedReader(InputStreamReader(inputStream))
     val tsvData = reader.use { it.readText() }
 
-    val rows = tsvData.split("\n").drop(1) // 첫 줄은 헤더
+    val rows = tsvData.split("\n").drop(1)
 
     for (row in rows) {
         val columns = row.split("\t")
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/ApiModels.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/ApiModels.kt
index a83e87ac..7e79c8fe 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/ApiModels.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/ApiModels.kt
@@ -1,33 +1,35 @@
 package com.example.spoteam_android.data
 
-class ApiModels {
+import kotlinx.serialization.Serializable
 
+class ApiModels {
+    @Serializable
     data class Regions(
         val regions: List<String>
     )
-
+    @Serializable
     data class Themes(
         val themes: List<String>
     )
-
+    @Serializable
     data class RequestData(
         val regions: Regions,
         val themes: Themes
     )
-
+    @Serializable
     // 응답 데이터 클래스 정의
     data class Tokens(
         val accessToken: String,
         val refreshToken: String,
         val accessTokenExpiresIn: Long
     )
-
+    @Serializable
     data class Result(
         val memberId: Int,
         val email: String,
         val tokens: Tokens
     )
-
+    @Serializable
     data class ResponseData(
         val isSuccess: Boolean,
         val code: String,
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/datasource/DummyDataSource.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/datasource/DummyDataSource.kt
new file mode 100644
index 00000000..598b071e
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/datasource/DummyDataSource.kt
@@ -0,0 +1,9 @@
+package com.example.spoteam_android.data.dummy.datasource
+
+import com.example.spoteam_android.core.network.BaseResponse
+import com.example.spoteam_android.data.dummy.dto.request.DummyRequestDto
+import com.example.spoteam_android.data.dummy.dto.response.DummyResponseDto
+
+interface DummyDataSource {
+    suspend fun getService(request: DummyRequestDto): BaseResponse<DummyResponseDto>
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/datasourceimpl/DummyDataSourceImpl.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/datasourceimpl/DummyDataSourceImpl.kt
new file mode 100644
index 00000000..6bb29c96
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/datasourceimpl/DummyDataSourceImpl.kt
@@ -0,0 +1,15 @@
+package com.example.spoteam_android.data.dummy.datasourceimpl
+
+import com.example.spoteam_android.core.network.BaseResponse
+import com.example.spoteam_android.data.dummy.datasource.DummyDataSource
+import com.example.spoteam_android.data.dummy.dto.request.DummyRequestDto
+import com.example.spoteam_android.data.dummy.dto.response.DummyResponseDto
+import com.example.spoteam_android.data.dummy.service.DummyService
+import javax.inject.Inject
+
+class DummyDataSourceImpl @Inject constructor(
+    private val dummyService: DummyService
+) : DummyDataSource {
+    override suspend fun getService(request: DummyRequestDto): BaseResponse<DummyResponseDto> =
+        dummyService.getServiceData(request)
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/di/DataSourceModule.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/di/DataSourceModule.kt
new file mode 100644
index 00000000..14f51795
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/di/DataSourceModule.kt
@@ -0,0 +1,19 @@
+package com.example.spoteam_android.data.dummy.di
+
+import com.example.spoteam_android.data.dummy.datasource.DummyDataSource
+import com.example.spoteam_android.data.dummy.datasourceimpl.DummyDataSourceImpl
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class DataSourceModule {
+    @Binds
+    @Singleton
+    abstract fun bindDummyDataSource(
+        impl: DummyDataSourceImpl
+    ): DummyDataSource
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/di/RepositoryModule.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/di/RepositoryModule.kt
new file mode 100644
index 00000000..9e121b71
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/di/RepositoryModule.kt
@@ -0,0 +1,19 @@
+package com.example.spoteam_android.data.dummy.di
+
+import com.example.spoteam_android.data.dummy.repositoryimpl.DummyRepositoryImpl
+import com.example.spoteam_android.domain.dummy.repository.DummyRepository
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class RepositoryModule {
+    @Binds
+    @Singleton
+    abstract fun bindsDummyRepository(
+        dummyRepositoryImpl: DummyRepositoryImpl
+    ): DummyRepository
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/di/ServiceModule.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/di/ServiceModule.kt
new file mode 100644
index 00000000..aab2559f
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/di/ServiceModule.kt
@@ -0,0 +1,19 @@
+package com.example.spoteam_android.data.dummy.di
+
+import com.example.spoteam_android.data.dummy.service.DummyService
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import retrofit2.Retrofit
+import javax.inject.Singleton
+
+
+@Module
+@InstallIn(SingletonComponent::class)
+object ServiceModule {
+    @Provides
+    @Singleton
+    fun providesDummyService(retrofit: Retrofit): DummyService =
+        retrofit.create(DummyService::class.java)
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/dto/request/DummyRequestDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/dto/request/DummyRequestDto.kt
new file mode 100644
index 00000000..90061c8a
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/dto/request/DummyRequestDto.kt
@@ -0,0 +1,10 @@
+package com.example.spoteam_android.data.dummy.dto.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class DummyRequestDto(
+    @SerialName("id")
+    val id: Long
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/dto/response/DummyResponseDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/dto/response/DummyResponseDto.kt
new file mode 100644
index 00000000..f2155842
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/dto/response/DummyResponseDto.kt
@@ -0,0 +1,11 @@
+package com.example.spoteam_android.data.dummy.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+
+@Serializable
+data class DummyResponseDto(
+    @SerialName("info")
+    val info: List<String>
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/mapper/DummyMapper.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/mapper/DummyMapper.kt
new file mode 100644
index 00000000..48db6f62
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/mapper/DummyMapper.kt
@@ -0,0 +1,14 @@
+package com.example.spoteam_android.data.dummy.mapper
+
+import com.example.spoteam_android.data.dummy.dto.request.DummyRequestDto
+import com.example.spoteam_android.data.dummy.dto.response.DummyResponseDto
+import com.example.spoteam_android.domain.dummy.entity.DummyResponse
+import com.example.spoteam_android.domain.dummy.entity.DummyRequest
+
+fun DummyResponseDto.toDummyServiceModel() = DummyRequest(
+    info = info
+)
+
+fun DummyResponse.toDummyServiceRequest() = DummyRequestDto(
+    id = id
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/repositoryimpl/DummyRepositoryImpl.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/repositoryimpl/DummyRepositoryImpl.kt
new file mode 100644
index 00000000..f9f7984b
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/repositoryimpl/DummyRepositoryImpl.kt
@@ -0,0 +1,21 @@
+package com.example.spoteam_android.data.dummy.repositoryimpl
+
+import com.example.spoteam_android.data.dummy.mapper.toDummyServiceModel
+import com.example.spoteam_android.data.dummy.mapper.toDummyServiceRequest
+import com.example.spoteam_android.data.dummy.service.DummyService
+import com.example.spoteam_android.domain.dummy.entity.DummyResponse
+import com.example.spoteam_android.domain.dummy.entity.DummyRequest
+import com.example.spoteam_android.domain.dummy.repository.DummyRepository
+import javax.inject.Inject
+
+class DummyRepositoryImpl @Inject constructor(
+    private val dummyService: DummyService
+) : DummyRepository {
+    override suspend fun getService(request: DummyResponse): Result<DummyRequest> =
+        runCatching {
+            val response = dummyService.getServiceData(
+                request = request.toDummyServiceRequest()
+            )
+            response.result?.toDummyServiceModel() ?: throw Exception("Response data is null")
+        }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/service/DummyService.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/service/DummyService.kt
new file mode 100644
index 00000000..254a6c83
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/dummy/service/DummyService.kt
@@ -0,0 +1,22 @@
+package com.example.spoteam_android.data.dummy.service
+
+import com.example.spoteam_android.core.network.BaseResponse
+import com.example.spoteam_android.data.dummy.dto.request.DummyRequestDto
+import com.example.spoteam_android.data.dummy.dto.response.DummyResponseDto
+import retrofit2.http.Body
+import retrofit2.http.GET
+
+interface DummyService {
+
+    companion object {
+        const val API = "api"
+        const val V1 = "v1"
+        const val SERVICE = "service"
+    }
+
+    @GET("/$API/$V1/$SERVICE")
+    suspend fun getServiceData(
+        @Body request: DummyRequestDto
+    ): BaseResponse<DummyResponseDto>
+
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/datasource/local/TokenDataSource.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/datasource/local/TokenDataSource.kt
new file mode 100644
index 00000000..a4698419
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/datasource/local/TokenDataSource.kt
@@ -0,0 +1,36 @@
+package com.example.spoteam_android.data.login.datasource.local
+
+interface TokenDataSource {
+    fun saveUserInfo(
+        platform: String,
+        email: String,
+        profileImageUrl: String,
+        accessToken: String,
+        refreshToken: String,
+        memberId: Int,
+    )
+
+    fun saveNickname(nickname: String)
+
+    fun getAccessToken(): String?
+
+    fun getRefreshToken(): String?
+
+    fun saveTokens(accessToken: String, refreshToken: String)
+
+    fun getIsSpotMember(): Boolean
+
+    fun isUserLoggedIn(): Boolean
+
+    fun getMemberId(): Int
+
+    fun getNickname(): String?
+
+    fun getEmail(): String?
+
+    fun getLoginPlatform(): String?
+
+    fun getProfileImageUrl(platform: String): String?
+
+    fun clearAll()
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/datasource/remote/LoginDataSource.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/datasource/remote/LoginDataSource.kt
new file mode 100644
index 00000000..79821f38
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/datasource/remote/LoginDataSource.kt
@@ -0,0 +1,36 @@
+package com.example.spoteam_android.data.login.datasource.remote
+
+import com.example.spoteam_android.core.network.BaseResponse
+import com.example.spoteam_android.data.login.dto.request.NaverLoginRequestDto
+import com.example.spoteam_android.data.login.dto.request.NickNameRequestDto
+import com.example.spoteam_android.data.login.dto.request.RegionRequestDto
+import com.example.spoteam_android.data.login.dto.request.StudyReasonRequestDto
+import com.example.spoteam_android.data.login.dto.request.ThemeRequestDto
+import com.example.spoteam_android.data.login.dto.response.CheckSpotMemberResponseDto
+import com.example.spoteam_android.data.login.dto.response.MemberInfoResponseDto
+import com.example.spoteam_android.data.login.dto.response.NickNameCheckResponseDto
+import com.example.spoteam_android.data.login.dto.response.NickNameResponseDto
+import com.example.spoteam_android.data.login.dto.response.SocialLoginResponseDto
+import com.example.spoteam_android.data.login.dto.response.WithdrawResponseDto
+
+interface LoginDataSource {
+    suspend fun updateThemes(themes: ThemeRequestDto): BaseResponse<MemberInfoResponseDto>
+
+    suspend fun updateRegions(regions: RegionRequestDto): BaseResponse<MemberInfoResponseDto>
+
+    suspend fun updateStudyReasons(studyReasons: StudyReasonRequestDto): BaseResponse<MemberInfoResponseDto>
+
+    suspend fun signInWithKakao(accessToken: String): BaseResponse<SocialLoginResponseDto>
+
+    suspend fun signInWithNaver(request: NaverLoginRequestDto): BaseResponse<SocialLoginResponseDto>
+
+    suspend fun updateNickName(request: NickNameRequestDto): BaseResponse<NickNameResponseDto>
+
+    suspend fun checkNickName(nickname: String): BaseResponse<NickNameCheckResponseDto>
+
+    suspend fun getNickname() : BaseResponse<String>
+
+    suspend fun checkSpotMember(): BaseResponse<CheckSpotMemberResponseDto>
+
+    suspend fun withdrawSpot(): BaseResponse<WithdrawResponseDto>
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/datasource/remote/SocialLoginDataSource.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/datasource/remote/SocialLoginDataSource.kt
new file mode 100644
index 00000000..5535527d
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/datasource/remote/SocialLoginDataSource.kt
@@ -0,0 +1,10 @@
+package com.example.spoteam_android.data.login.datasource.remote
+
+import android.app.Activity
+import com.example.spoteam_android.domain.login.entity.KakaoLoginResponse
+import com.example.spoteam_android.domain.login.entity.NaverLoginRequest
+
+interface SocialLoginDataSource {
+    suspend fun loginWithKakao(activity: Activity): Result<KakaoLoginResponse>
+    suspend fun loginWithNaver(activity: Activity): Result<NaverLoginRequest>
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/datasourceimpl/local/TokenDataSourceImpl.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/datasourceimpl/local/TokenDataSourceImpl.kt
new file mode 100644
index 00000000..4aef29bf
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/datasourceimpl/local/TokenDataSourceImpl.kt
@@ -0,0 +1,122 @@
+package com.example.spoteam_android.data.datasource.local
+
+import android.content.Context
+import android.content.SharedPreferences
+import com.example.spoteam_android.data.login.datasource.local.TokenDataSource
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+
+class TokenDataSourceImpl @Inject constructor(
+    @ApplicationContext context: Context
+) : TokenDataSource {
+
+    private val sharedPreferences: SharedPreferences =
+        context.getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
+
+    private fun getCurrentEmail(): String? =
+        sharedPreferences.getString("currentEmail", null)
+
+    override fun saveUserInfo(
+        platform: String,
+        email: String,
+        profileImageUrl: String,
+        accessToken: String,
+        refreshToken: String,
+        memberId: Int,
+    ) {
+        with(sharedPreferences.edit()) {
+            putBoolean("${email}_isLoggedIn", true)
+            putString("${email}_accessToken", accessToken)
+            putString("${email}_refreshToken", refreshToken)
+            putInt("${email}_memberId", memberId)
+            putString("${email}_${platform}ProfileImageUrl", profileImageUrl)
+            putString("currentEmail", email)
+            putString("loginPlatform", platform)
+            commit()
+        }
+    }
+
+    override fun saveNickname(nickname: String) {
+        val email = getCurrentEmail()
+        email?.let {
+            with(sharedPreferences.edit()) {
+                putString("${it}_nickname", nickname)
+                apply()
+            }
+        }
+    }
+
+
+    override fun getAccessToken(): String? {
+        val email = getCurrentEmail()
+        return email?.let { sharedPreferences.getString("${it}_accessToken", null) }
+    }
+
+    override fun getRefreshToken(): String? {
+        val email = getCurrentEmail()
+        return email?.let { sharedPreferences.getString("${it}_refreshToken", null) }
+    }
+
+    override fun saveTokens(accessToken: String, refreshToken: String) {
+        val email = getCurrentEmail()
+        email?.let {
+            with(sharedPreferences.edit()) {
+                putString("${it}_accessToken", accessToken)
+                putString("${it}_refreshToken", refreshToken)
+                apply()
+            }
+        }
+    }
+
+    override fun getIsSpotMember(): Boolean {
+        val email = getCurrentEmail()
+        return email?.let {
+            sharedPreferences.getBoolean("${it}_is_spot_member", false)
+        } ?: false
+    }
+
+
+    override fun isUserLoggedIn(): Boolean {
+        val accessToken = getAccessToken()
+        val refreshToken = getRefreshToken()
+        return !accessToken.isNullOrEmpty() || !refreshToken.isNullOrEmpty()
+    }
+
+    override fun getMemberId(): Int {
+        val email = getCurrentEmail()
+        return email?.let {
+            sharedPreferences.getInt("${it}_memberId", -1)
+        } ?: -1
+    }
+
+    override fun getNickname(): String? {
+        val email = getCurrentEmail()
+        return email?.let {
+            sharedPreferences.getString("${it}_nickname", null)
+        }
+    }
+
+    override fun getEmail(): String? {
+        return sharedPreferences.getString("currentEmail", null)
+    }
+
+    override fun getLoginPlatform(): String? {
+        return sharedPreferences.getString("loginPlatform", null)
+    }
+
+    override fun getProfileImageUrl(platform: String): String? {
+        val email = getCurrentEmail()
+        return email?.let {
+            sharedPreferences.getString("${it}_${platform}ProfileImageUrl", null)
+        }
+    }
+
+    override fun clearAll() {
+        with(sharedPreferences.edit()) {
+            clear()
+            apply()
+        }
+
+
+    }
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/datasourceimpl/remote/LoginDataSourceImpl.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/datasourceimpl/remote/LoginDataSourceImpl.kt
new file mode 100644
index 00000000..529db5e7
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/datasourceimpl/remote/LoginDataSourceImpl.kt
@@ -0,0 +1,40 @@
+package com.example.spoteam_android.data.login.datasourceimpl.remote
+
+import com.example.spoteam_android.data.login.datasource.remote.LoginDataSource
+import com.example.spoteam_android.core.network.BaseResponse
+import com.example.spoteam_android.data.login.dto.request.NaverLoginRequestDto
+import com.example.spoteam_android.data.login.dto.request.NickNameRequestDto
+import com.example.spoteam_android.data.login.dto.request.RegionRequestDto
+import com.example.spoteam_android.data.login.dto.request.StudyReasonRequestDto
+import com.example.spoteam_android.data.login.dto.request.ThemeRequestDto
+import com.example.spoteam_android.data.login.dto.response.CheckSpotMemberResponseDto
+import com.example.spoteam_android.data.login.dto.response.MemberInfoResponseDto
+import com.example.spoteam_android.data.login.dto.response.NickNameCheckResponseDto
+import com.example.spoteam_android.data.login.dto.response.NickNameResponseDto
+import com.example.spoteam_android.data.login.dto.response.SocialLoginResponseDto
+import com.example.spoteam_android.data.login.dto.response.WithdrawResponseDto
+import com.example.spoteam_android.data.login.service.LoginService
+import javax.inject.Inject
+
+class LoginDataSourceImpl @Inject constructor(private val loginService: LoginService) :
+    LoginDataSource {
+    override suspend fun updateThemes(themes: ThemeRequestDto): BaseResponse<MemberInfoResponseDto> = loginService.updateThemes(themes)
+
+    override suspend fun updateRegions(regions: RegionRequestDto): BaseResponse<MemberInfoResponseDto> = loginService.updateRegions(regions)
+
+    override suspend fun updateStudyReasons(studyReasons: StudyReasonRequestDto): BaseResponse<MemberInfoResponseDto> = loginService.updateStudyReasons(studyReasons)
+
+    override suspend fun signInWithKakao(accessToken: String): BaseResponse<SocialLoginResponseDto> = loginService.signInWithKakao(accessToken)
+
+    override suspend fun signInWithNaver(request: NaverLoginRequestDto): BaseResponse<SocialLoginResponseDto> = loginService.signInWithNaver(request)
+
+    override suspend fun updateNickName(request: NickNameRequestDto): BaseResponse<NickNameResponseDto> = loginService.updateNickName(request)
+
+    override suspend fun checkNickName(nickname: String): BaseResponse<NickNameCheckResponseDto> = loginService.checkNickname(nickname)
+
+    override suspend fun getNickname(): BaseResponse<String> = loginService.getNickname()
+
+    override suspend fun checkSpotMember(): BaseResponse<CheckSpotMemberResponseDto> = loginService.checkSpotMember()
+
+    override suspend fun withdrawSpot(): BaseResponse<WithdrawResponseDto> = loginService.withdrawSpot()
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/datasourceimpl/remote/SocialLoginDataSourceImpl.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/datasourceimpl/remote/SocialLoginDataSourceImpl.kt
new file mode 100644
index 00000000..29c4f5cd
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/datasourceimpl/remote/SocialLoginDataSourceImpl.kt
@@ -0,0 +1,83 @@
+package com.example.spoteam_android.data.login.datasourceimpl.remote
+
+import android.app.Activity
+import com.example.spoteam_android.data.login.datasource.remote.SocialLoginDataSource
+import com.example.spoteam_android.domain.login.entity.KakaoLoginResponse
+import com.example.spoteam_android.domain.login.entity.NaverLoginRequest
+import com.kakao.sdk.auth.model.OAuthToken
+import com.kakao.sdk.user.UserApiClient
+import com.navercorp.nid.NaverIdLoginSDK
+import com.navercorp.nid.oauth.OAuthLoginCallback
+import kotlinx.coroutines.CompletableDeferred
+import javax.inject.Inject
+
+class SocialLoginDataSourceImpl @Inject constructor() : SocialLoginDataSource {
+
+
+    override suspend fun loginWithKakao(activity: Activity): Result<KakaoLoginResponse> {
+        val result = CompletableDeferred<Result<KakaoLoginResponse>>()
+
+        val callback: (OAuthToken?, Throwable?) -> Unit = { token, error ->
+            if (error != null) {
+                result.complete(Result.failure(error))
+            } else if (token != null) {
+                result.complete(Result.success(KakaoLoginResponse(token.accessToken)))
+            } else {
+                result.complete(Result.failure(Exception("카카오 로그인 실패")))
+            }
+        }
+
+        if (UserApiClient.instance.isKakaoTalkLoginAvailable(activity)) {
+            UserApiClient.instance.loginWithKakaoTalk(
+                context = activity,
+                callback = callback
+            )
+        } else {
+            UserApiClient.instance.loginWithKakaoAccount(
+                context = activity,
+                callback = callback
+            )
+        }
+        return result.await()
+    }
+
+
+
+    override suspend fun loginWithNaver(activity: Activity): Result<NaverLoginRequest> {
+        val result = CompletableDeferred<Result<NaverLoginRequest>>()
+
+        val callback = object : OAuthLoginCallback {
+            override fun onSuccess() {
+                val accessToken = NaverIdLoginSDK.getAccessToken()
+                val refreshToken = NaverIdLoginSDK.getRefreshToken()
+                val expiresIn = NaverIdLoginSDK.getExpiresAt().toInt()
+                val tokenType = NaverIdLoginSDK.getTokenType() !!
+
+                if (!accessToken.isNullOrEmpty() && !refreshToken.isNullOrEmpty()) {
+                    val info = NaverLoginRequest(
+                        accessToken = accessToken,
+                        refreshToken = refreshToken,
+                        tokenType = tokenType,
+                        expiresIn = expiresIn
+                    )
+                    result.complete(Result.success(info))
+                } else {
+                    result.complete(Result.failure(Exception("네이버 토큰이 유효하지 않습니다")))
+                }
+            }
+
+            override fun onFailure(httpStatus: Int, message: String) {
+                result.complete(Result.failure(Exception("네이버 로그인 실패: $message")))
+            }
+
+            override fun onError(errorCode: Int, message: String) {
+                result.complete(Result.failure(Exception("네이버 로그인 오류: $message")))
+            }
+        }
+
+        NaverIdLoginSDK.authenticate(activity, callback)
+
+        return result.await()
+    }
+
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/di/DataSourceModule.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/di/DataSourceModule.kt
new file mode 100644
index 00000000..4cfc4228
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/di/DataSourceModule.kt
@@ -0,0 +1,37 @@
+package com.example.spoteam_android.data.login.di
+
+import com.example.spoteam_android.data.login.datasource.local.TokenDataSource
+import com.example.spoteam_android.data.datasource.local.TokenDataSourceImpl
+import com.example.spoteam_android.data.login.datasource.remote.LoginDataSource
+import com.example.spoteam_android.data.login.datasource.remote.SocialLoginDataSource
+import com.example.spoteam_android.data.login.datasourceimpl.remote.LoginDataSourceImpl
+import com.example.spoteam_android.data.login.datasourceimpl.remote.SocialLoginDataSourceImpl
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class DataSourceModule {
+    @Binds
+    @Singleton
+    abstract fun bindLoginDataSource(
+        impl: LoginDataSourceImpl
+    ): LoginDataSource
+
+    @Binds
+    @Singleton
+    abstract fun bindSocialLoginDataSource(
+        impl: SocialLoginDataSourceImpl
+    ): SocialLoginDataSource
+
+    @Binds
+    @Singleton
+    abstract fun bindTokenDataSource(
+        impl: TokenDataSourceImpl
+    ): TokenDataSource
+
+
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/di/RepositoryModule.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/di/RepositoryModule.kt
new file mode 100644
index 00000000..b24c26dc
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/di/RepositoryModule.kt
@@ -0,0 +1,28 @@
+package com.example.spoteam_android.data.login.di
+
+import com.example.spoteam_android.data.login.repositoryimpl.LoginRepositoryImpl
+import com.example.spoteam_android.data.login.repositoryimpl.SocialLoginRepositoryImpl
+import com.example.spoteam_android.domain.login.repository.LoginRepository
+import com.example.spoteam_android.domain.login.repository.SocialLoginRepository
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class RepositoryModule {
+    @Binds
+    @Singleton
+    abstract fun bindsLoginRepository(
+        loginRepositoryImpl: LoginRepositoryImpl
+    ): LoginRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindsSocialLoginRepository(
+        socialLoginRepositoryImpl: SocialLoginRepositoryImpl
+    ): SocialLoginRepository
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/di/ServiceModule.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/di/ServiceModule.kt
new file mode 100644
index 00000000..5b551503
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/di/ServiceModule.kt
@@ -0,0 +1,19 @@
+package com.example.spoteam_android.data.login.di
+
+import com.example.spoteam_android.data.login.service.LoginService
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import retrofit2.Retrofit
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object ServiceModule {
+
+    @Provides
+    @Singleton
+    fun providesLoginService(retrofit: Retrofit): LoginService =
+        retrofit.create(LoginService::class.java)
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/request/NaverLoginRequestDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/request/NaverLoginRequestDto.kt
new file mode 100644
index 00000000..d0d4e00e
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/request/NaverLoginRequestDto.kt
@@ -0,0 +1,20 @@
+package com.example.spoteam_android.data.login.dto.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class NaverLoginRequestDto(
+    @SerialName("access_token")
+    val accessToken: String,
+    @SerialName("refresh_token")
+    val refreshToken: String,
+    @SerialName("token_type")
+    val tokenType: String,
+    @SerialName("expires_in")
+    val expiresIn: Int,
+    @SerialName("error")
+    val error: String? = null,
+    @SerialName("error_description")
+    val errorDescription: String? = null
+)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/request/NickNameRequestDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/request/NickNameRequestDto.kt
new file mode 100644
index 00000000..7d432270
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/request/NickNameRequestDto.kt
@@ -0,0 +1,14 @@
+package com.example.spoteam_android.data.login.dto.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class NickNameRequestDto(
+    @SerialName("nickname")
+    val nickname: String,
+    @SerialName("personalInfo")
+    val personalInfo: Boolean,
+    @SerialName("idInfo")
+    val idInfo: Boolean
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/request/RegionRequestDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/request/RegionRequestDto.kt
new file mode 100644
index 00000000..1bd06cdc
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/request/RegionRequestDto.kt
@@ -0,0 +1,10 @@
+package com.example.spoteam_android.data.login.dto.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RegionRequestDto (
+    @SerialName("regions")
+    val regions: List<String>
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/request/StudyReasonRequestDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/request/StudyReasonRequestDto.kt
new file mode 100644
index 00000000..44a10ca7
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/request/StudyReasonRequestDto.kt
@@ -0,0 +1,10 @@
+package com.example.spoteam_android.data.login.dto.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class StudyReasonRequestDto(
+    @SerialName("reasons")
+    val reasons: List<Int>
+)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/request/ThemeRequestDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/request/ThemeRequestDto.kt
new file mode 100644
index 00000000..7332aa46
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/request/ThemeRequestDto.kt
@@ -0,0 +1,10 @@
+package com.example.spoteam_android.data.login.dto.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ThemeRequestDto(
+    @SerialName("themes")
+    val themes: List<String>
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/CheckSpotMemberResponseDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/CheckSpotMemberResponseDto.kt
new file mode 100644
index 00000000..87b16928
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/CheckSpotMemberResponseDto.kt
@@ -0,0 +1,11 @@
+package com.example.spoteam_android.data.login.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CheckSpotMemberResponseDto(
+    @SerialName("isSpotMember")
+    val isSpotMember: Boolean
+
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/MemberInfoResponseDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/MemberInfoResponseDto.kt
new file mode 100644
index 00000000..d83fe48b
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/MemberInfoResponseDto.kt
@@ -0,0 +1,12 @@
+package com.example.spoteam_android.data.login.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class MemberInfoResponseDto(
+    @SerialName("memberId")
+    val memberId: Int,
+    @SerialName("updatedAt")
+    val updatedAt: String
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/NickNameCheckResponseDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/NickNameCheckResponseDto.kt
new file mode 100644
index 00000000..d761e6d2
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/NickNameCheckResponseDto.kt
@@ -0,0 +1,12 @@
+package com.example.spoteam_android.data.login.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class NickNameCheckResponseDto(
+    @SerialName("nickname")
+    val nickname: String,
+    @SerialName("duplicate")
+    val duplicate: Boolean
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/NickNameResponseDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/NickNameResponseDto.kt
new file mode 100644
index 00000000..fc910ce5
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/NickNameResponseDto.kt
@@ -0,0 +1,19 @@
+package com.example.spoteam_android.data.login.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class NickNameResponseDto(
+    @SerialName("name")
+    val name: String,
+    @SerialName("nickname")
+    val nickname: String,
+    @SerialName("email")
+    val email: String,
+    @SerialName("idInfo")
+    val idInfo: Boolean,
+    @SerialName("personalInfo")
+    val personalInfo: Boolean
+
+)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/SignInResponseDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/SignInResponseDto.kt
new file mode 100644
index 00000000..0d9a9b2a
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/SignInResponseDto.kt
@@ -0,0 +1,16 @@
+package com.example.spoteam_android.data.login.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SignInResponseDto(
+    @SerialName("tokens")
+    val tokens: TokenResponseDto,
+    @SerialName("email")
+    val email: String,
+    @SerialName("memberId")
+    val memberId: Int,
+    @SerialName("loginType")
+    val loginType: String
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/SocialLoginResponseDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/SocialLoginResponseDto.kt
new file mode 100644
index 00000000..8f1e7b93
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/SocialLoginResponseDto.kt
@@ -0,0 +1,12 @@
+package com.example.spoteam_android.data.login.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SocialLoginResponseDto(
+    @SerialName("isSpotMember")
+    val isSpotMember: Boolean,
+    @SerialName("signInDTO")
+    val signInDTO: SignInResponseDto
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/TokenResponseDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/TokenResponseDto.kt
new file mode 100644
index 00000000..7dcff238
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/TokenResponseDto.kt
@@ -0,0 +1,14 @@
+package com.example.spoteam_android.data.login.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TokenResponseDto(
+    @SerialName("accessToken")
+    val accessToken: String,
+    @SerialName("refreshToken")
+    val refreshToken: String,
+    @SerialName("accessTokenExpiresIn")
+    val accessTokenExpiresIn: Int
+)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/WithdrawResponseDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/WithdrawResponseDto.kt
new file mode 100644
index 00000000..50b52ee5
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/dto/response/WithdrawResponseDto.kt
@@ -0,0 +1,16 @@
+package com.example.spoteam_android.data.login.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class WithdrawResponseDto(
+    @SerialName("memberId")
+    val memberId: Int,
+    @SerialName("name")
+    val name: String,
+    @SerialName("email")
+    val email: String,
+    @SerialName("inactive")
+    val inactive: String
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/mapper/CheckSpotMemberMapper.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/mapper/CheckSpotMemberMapper.kt
new file mode 100644
index 00000000..3d129271
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/mapper/CheckSpotMemberMapper.kt
@@ -0,0 +1,9 @@
+package com.example.spoteam_android.data.login.mapper
+
+import com.example.spoteam_android.data.login.dto.response.CheckSpotMemberResponseDto
+import com.example.spoteam_android.domain.login.entity.CheckSpotMemberResponse
+
+
+fun CheckSpotMemberResponseDto.toCheckSpotMemberModel(): CheckSpotMemberResponse = CheckSpotMemberResponse(
+    isSpotMember = isSpotMember
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/mapper/MemberInfoMapper.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/mapper/MemberInfoMapper.kt
new file mode 100644
index 00000000..6d672551
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/mapper/MemberInfoMapper.kt
@@ -0,0 +1,9 @@
+package com.example.spoteam_android.data.login.mapper
+
+import com.example.spoteam_android.data.login.dto.response.MemberInfoResponseDto
+import com.example.spoteam_android.domain.login.entity.MemberInfoResponse
+
+fun MemberInfoResponseDto.toMemberInfoModel(): MemberInfoResponse = MemberInfoResponse(
+    memberId = memberId,
+    updatedAt = updatedAt
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/mapper/NickNameCheckMapper.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/mapper/NickNameCheckMapper.kt
new file mode 100644
index 00000000..c7788b88
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/mapper/NickNameCheckMapper.kt
@@ -0,0 +1,9 @@
+package com.example.spoteam_android.data.login.mapper
+
+import com.example.spoteam_android.data.login.dto.response.NickNameCheckResponseDto
+import com.example.spoteam_android.domain.login.entity.NickNameCheckResponse
+
+fun NickNameCheckResponseDto.toNickNameCheckModel(): NickNameCheckResponse = NickNameCheckResponse(
+    nickname = nickname,
+    duplicate = duplicate
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/mapper/NickNameMapper.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/mapper/NickNameMapper.kt
new file mode 100644
index 00000000..55f20551
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/mapper/NickNameMapper.kt
@@ -0,0 +1,19 @@
+package com.example.spoteam_android.data.login.mapper
+
+import com.example.spoteam_android.data.login.dto.request.NickNameRequestDto
+import com.example.spoteam_android.data.login.dto.response.NickNameResponseDto
+import com.example.spoteam_android.domain.login.entity.NickNameRequest
+import com.example.spoteam_android.domain.login.entity.NickNameResponse
+
+fun NickNameResponseDto.toNickNameModel(): NickNameResponse = NickNameResponse(
+    name = name,
+    nickname = nickname,
+    email = email,
+    personalInfo = personalInfo
+)
+
+fun NickNameRequest.toNickNameInfoModel(): NickNameRequestDto = NickNameRequestDto(
+    nickname = nickname,
+    personalInfo = personalInfo,
+    idInfo = idInfo
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/mapper/SocialLoginMapper.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/mapper/SocialLoginMapper.kt
new file mode 100644
index 00000000..88293577
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/mapper/SocialLoginMapper.kt
@@ -0,0 +1,36 @@
+package com.example.spoteam_android.data.login.mapper
+
+import com.example.spoteam_android.data.login.dto.response.SocialLoginResponseDto
+import com.example.spoteam_android.domain.login.entity.SocialLoginResponse
+import com.example.spoteam_android.data.login.dto.request.NaverLoginRequestDto
+import com.example.spoteam_android.domain.login.entity.NaverLoginRequest
+import com.example.spoteam_android.domain.login.entity.TokenResponse
+
+fun SocialLoginResponseDto.toSocialLoginModel(): SocialLoginResponse {
+    val dto = signInDTO
+    val tokens = dto.tokens
+
+    return SocialLoginResponse(
+        isSpotMember = isSpotMember,
+        tokens = TokenResponse(
+            accessToken = tokens.accessToken,
+            refreshToken = tokens.refreshToken,
+            accessTokenExpiresIn = tokens.accessTokenExpiresIn
+        ),
+        email = dto.email,
+        memberId = dto.memberId,
+        loginType = dto.loginType
+    )
+}
+
+
+
+fun NaverLoginRequest.toNaverLoginRequest(): NaverLoginRequestDto = NaverLoginRequestDto(
+    accessToken = accessToken,
+    refreshToken = refreshToken,
+    tokenType = tokenType,
+    expiresIn = expiresIn,
+    error = error,
+    errorDescription = errorDescription
+)
+
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/mapper/WithdrawMapper.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/mapper/WithdrawMapper.kt
new file mode 100644
index 00000000..1b34d11e
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/mapper/WithdrawMapper.kt
@@ -0,0 +1,11 @@
+package com.example.spoteam_android.data.login.mapper
+
+import com.example.spoteam_android.data.login.dto.response.WithdrawResponseDto
+import com.example.spoteam_android.domain.login.entity.WithdrawResponse
+
+fun WithdrawResponseDto.toWithdrawModel(): WithdrawResponse = WithdrawResponse(
+    memberId = memberId,
+    name = name,
+    email = email,
+    inactive = inactive
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/repositoryimpl/LoginRepositoryImpl.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/repositoryimpl/LoginRepositoryImpl.kt
new file mode 100644
index 00000000..cc40e4e7
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/repositoryimpl/LoginRepositoryImpl.kt
@@ -0,0 +1,78 @@
+package com.example.spoteam_android.data.login.repositoryimpl
+
+import com.example.spoteam_android.data.login.datasource.remote.LoginDataSource
+import com.example.spoteam_android.data.login.dto.request.RegionRequestDto
+import com.example.spoteam_android.data.login.dto.request.StudyReasonRequestDto
+import com.example.spoteam_android.data.login.dto.request.ThemeRequestDto
+import com.example.spoteam_android.data.login.mapper.toCheckSpotMemberModel
+import com.example.spoteam_android.data.login.mapper.toMemberInfoModel
+import com.example.spoteam_android.data.login.mapper.toNaverLoginRequest
+import com.example.spoteam_android.data.login.mapper.toNickNameCheckModel
+import com.example.spoteam_android.data.login.mapper.toNickNameInfoModel
+import com.example.spoteam_android.data.login.mapper.toNickNameModel
+import com.example.spoteam_android.data.login.mapper.toSocialLoginModel
+import com.example.spoteam_android.data.login.mapper.toWithdrawModel
+import com.example.spoteam_android.domain.login.entity.CheckSpotMemberResponse
+import com.example.spoteam_android.domain.login.entity.MemberInfoResponse
+import com.example.spoteam_android.domain.login.entity.NaverLoginRequest
+import com.example.spoteam_android.domain.login.entity.NickNameCheckResponse
+import com.example.spoteam_android.domain.login.entity.NickNameRequest
+import com.example.spoteam_android.domain.login.entity.NickNameResponse
+import com.example.spoteam_android.domain.login.entity.SocialLoginResponse
+import com.example.spoteam_android.domain.login.entity.WithdrawResponse
+import com.example.spoteam_android.domain.login.repository.LoginRepository
+import javax.inject.Inject
+
+class LoginRepositoryImpl @Inject constructor(
+    private val loginDataSource: LoginDataSource
+) : LoginRepository {
+    override suspend fun updateThemes(themes: List<String>): Result<MemberInfoResponse> = runCatching {
+        val response = loginDataSource.updateThemes(ThemeRequestDto(themes))
+        response.result?.toMemberInfoModel() ?: throw IllegalStateException("No result")
+    }
+
+    override suspend fun updateRegions(regions: List<String>): Result<MemberInfoResponse> = runCatching {
+        val response = loginDataSource.updateRegions(RegionRequestDto(regions))
+        response.result?.toMemberInfoModel() ?: throw IllegalStateException("No result")
+    }
+
+    override suspend fun updateStudyReasons(reasons: List<Int>): Result<MemberInfoResponse> = runCatching {
+        val response = loginDataSource.updateStudyReasons(StudyReasonRequestDto(reasons))
+        response.result?.toMemberInfoModel() ?: throw IllegalStateException("No result")
+    }
+
+    override suspend fun signInWithKakao(accessToken: String): Result<SocialLoginResponse> = runCatching {
+        val response = loginDataSource.signInWithKakao(accessToken)
+        response.result?.toSocialLoginModel() ?: throw IllegalStateException("No result")
+    }
+
+    override suspend fun signInWithNaver(request: NaverLoginRequest): Result<SocialLoginResponse> = runCatching {
+        val response = loginDataSource.signInWithNaver(request.toNaverLoginRequest())
+        response.result?.toSocialLoginModel() ?: throw IllegalStateException("No result")
+    }
+
+    override suspend fun updateNickName(request: NickNameRequest): Result<NickNameResponse> = runCatching {
+        val response = loginDataSource.updateNickName(request.toNickNameInfoModel())
+        response.result?.toNickNameModel() ?: throw IllegalStateException("No result")
+    }
+
+    override suspend fun checkNickName(nickname: String): Result<NickNameCheckResponse> = runCatching {
+        val response = loginDataSource.checkNickName(nickname)
+        response.result?.toNickNameCheckModel() ?: throw IllegalStateException("No result")
+    }
+
+    override suspend fun getNickname(): Result<String> = runCatching {
+        val response = loginDataSource.getNickname()
+        response.result ?: throw IllegalStateException("No result")
+    }
+
+    override suspend fun checkSpotMember(): Result<CheckSpotMemberResponse> = kotlin.runCatching {
+        val response = loginDataSource.checkSpotMember()
+        response.result?.toCheckSpotMemberModel() ?: throw  IllegalStateException("No result")
+    }
+
+    override suspend fun withdrawSpot(): Result<WithdrawResponse> = runCatching {
+        val response = loginDataSource.withdrawSpot()
+        response.result?.toWithdrawModel() ?: throw IllegalStateException("No result")
+    }
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/repositoryimpl/SocialLoginRepositoryImpl.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/repositoryimpl/SocialLoginRepositoryImpl.kt
new file mode 100644
index 00000000..168e9b22
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/repositoryimpl/SocialLoginRepositoryImpl.kt
@@ -0,0 +1,91 @@
+package com.example.spoteam_android.data.login.repositoryimpl
+
+import android.app.Activity
+import android.util.Log
+import com.example.spoteam_android.data.login.datasource.remote.SocialLoginDataSource
+import com.example.spoteam_android.domain.login.entity.SocialLoginResponse
+import com.example.spoteam_android.domain.login.repository.LoginRepository
+import com.example.spoteam_android.domain.login.repository.SocialLoginRepository
+import com.kakao.sdk.user.UserApiClient
+import com.navercorp.nid.oauth.NidOAuthLogin
+import com.navercorp.nid.profile.NidProfileCallback
+import com.navercorp.nid.profile.data.NidProfileResponse
+import kotlinx.coroutines.CompletableDeferred
+import javax.inject.Inject
+
+class SocialLoginRepositoryImpl @Inject constructor(
+    private val socialLoginDataSource: SocialLoginDataSource,
+    private val loginRepository: LoginRepository
+) : SocialLoginRepository {
+
+    override suspend fun loginWithKakao(activity: Activity): Result<SocialLoginResponse> {
+        val kakaoTokenResult = socialLoginDataSource.loginWithKakao(activity)
+        return kakaoTokenResult.fold(
+            onSuccess = { kakaoLoginResult ->
+                val serverResult = loginRepository.signInWithKakao(kakaoLoginResult.accessToken)
+                serverResult.map { model ->
+                    var profileImage = ""
+                    val done = CompletableDeferred<Unit>()
+
+                    UserApiClient.instance.me { user, error ->
+                        if (error != null) {
+                            Log.e("KakaoProfile", "사용자 정보 요청 실패", error)
+                        } else if (user != null) {
+                            profileImage = user.kakaoAccount?.profile?.profileImageUrl ?: ""
+                        }
+                        done.complete(Unit)
+                    }
+
+                    done.await()
+
+                    model.copy(
+                        profileImage = profileImage
+                    )
+                }
+            },
+            onFailure = {
+                Log.e("KakaoLogin", "카카오 로그인 실패", it)
+                return Result.failure(it)
+            }
+        )
+    }
+
+    override suspend fun loginWithNaver(activity: Activity): Result<SocialLoginResponse> {
+        val naverResult = socialLoginDataSource.loginWithNaver(activity)
+        return naverResult.fold(
+            onSuccess = { tokenInfo ->
+                val serverResult = loginRepository.signInWithNaver(tokenInfo)
+                serverResult.map { model ->
+                    var profileImage = ""
+                    val done = CompletableDeferred<Unit>()
+
+                    NidOAuthLogin().callProfileApi(object : NidProfileCallback<NidProfileResponse> {
+                        override fun onSuccess(response: NidProfileResponse) {
+                            val profile = response.profile
+                            profileImage = profile?.profileImage ?: ""
+                            done.complete(Unit)
+                        }
+
+                        override fun onError(errorCode: Int, message: String) {
+                            done.complete(Unit)
+                        }
+
+                        override fun onFailure(httpStatus: Int, message: String) {
+                            done.complete(Unit)
+                        }
+                    })
+
+                    done.await()
+
+                    model.copy(
+                        profileImage = profileImage
+                    )
+                }
+            },
+            onFailure = {
+                Log.e("NaverLogin", "네이버 로그인 실패", it)
+                return Result.failure(it)
+            }
+        )
+    }
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/service/LoginService.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/service/LoginService.kt
new file mode 100644
index 00000000..4c13a3a7
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/login/service/LoginService.kt
@@ -0,0 +1,62 @@
+package com.example.spoteam_android.data.login.service
+
+import com.example.spoteam_android.core.network.BaseResponse
+import com.example.spoteam_android.data.login.dto.request.NaverLoginRequestDto
+import com.example.spoteam_android.data.login.dto.request.NickNameRequestDto
+import com.example.spoteam_android.data.login.dto.request.RegionRequestDto
+import com.example.spoteam_android.data.login.dto.request.StudyReasonRequestDto
+import com.example.spoteam_android.data.login.dto.request.ThemeRequestDto
+import com.example.spoteam_android.data.login.dto.response.CheckSpotMemberResponseDto
+import com.example.spoteam_android.data.login.dto.response.MemberInfoResponseDto
+import com.example.spoteam_android.data.login.dto.response.NickNameCheckResponseDto
+import com.example.spoteam_android.data.login.dto.response.NickNameResponseDto
+import com.example.spoteam_android.data.login.dto.response.SocialLoginResponseDto
+import com.example.spoteam_android.data.login.dto.response.WithdrawResponseDto
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.PATCH
+import retrofit2.http.POST
+import retrofit2.http.Query
+
+interface LoginService {
+    //update themes
+    @POST("spot/members/theme")
+    suspend fun updateThemes(@Body request: ThemeRequestDto): BaseResponse<MemberInfoResponseDto>
+
+    //update regions
+    @POST("spot/members/region")
+    suspend fun updateRegions(@Body request: RegionRequestDto): BaseResponse<MemberInfoResponseDto>
+
+    //update reasons
+    @POST("spot/members/study-reasons")
+    suspend fun updateStudyReasons(@Body request: StudyReasonRequestDto): BaseResponse<MemberInfoResponseDto>
+
+    //kakao login
+    @GET("spot/members/sign-in/kakao")
+    suspend fun signInWithKakao(@Query("accessToken") accessToken: String): BaseResponse<SocialLoginResponseDto>
+
+    //naver login
+    @POST("spot/members/sign-in/naver")
+    suspend fun signInWithNaver(@Body request: NaverLoginRequestDto): BaseResponse<SocialLoginResponseDto>
+
+    //update nickname
+    @POST("spot/sign-up/update")
+    suspend fun updateNickName(@Body request: NickNameRequestDto): BaseResponse<NickNameResponseDto>
+
+    //check nickname
+    @GET("spot/check/nickname")
+    suspend fun checkNickname(@Query("nickname") nickname: String): BaseResponse<NickNameCheckResponseDto>
+
+    //get nickname
+    @GET("/spot/members/nickname")
+    suspend fun getNickname(): BaseResponse<String>
+
+    //check spot member
+    @GET("spot/check")
+    suspend fun checkSpotMember(): BaseResponse<CheckSpotMemberResponseDto>
+
+    //withdraw spot
+    @PATCH("spot/withdraw")
+    suspend fun withdrawSpot(): BaseResponse<WithdrawResponseDto>
+
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/datasource/StudyDataSource.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/datasource/StudyDataSource.kt
new file mode 100644
index 00000000..cdb56292
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/datasource/StudyDataSource.kt
@@ -0,0 +1,49 @@
+package com.example.spoteam_android.data.study.datasource
+
+import com.example.spoteam_android.core.network.BaseResponse
+import com.example.spoteam_android.data.study.dto.request.MakeScheduleRequestDto
+import com.example.spoteam_android.data.study.dto.request.StudyRegisterRequestDto
+import com.example.spoteam_android.data.study.dto.response.ImagesResponseDto
+import com.example.spoteam_android.data.study.dto.response.IsAppliedResponseDto
+import com.example.spoteam_android.data.study.dto.response.MakeScheduleResponseDto
+import com.example.spoteam_android.data.study.dto.response.RecentAnnounceResponseDto
+import com.example.spoteam_android.data.study.dto.response.ScheduleListResponseDto
+import com.example.spoteam_android.data.study.dto.response.StudyApplyResponseDto
+import com.example.spoteam_android.data.study.dto.response.StudyDataResponseDto
+import com.example.spoteam_android.data.study.dto.response.StudyDetailResponseDto
+import com.example.spoteam_android.data.study.dto.response.StudyLikeResponseDto
+import com.example.spoteam_android.data.study.dto.response.StudyMemberResponseDto
+import com.example.spoteam_android.data.study.dto.response.StudyRegisterResponseDto
+import com.example.spoteam_android.data.study.dto.response.UploadImageResponseDto
+import okhttp3.MultipartBody
+
+interface StudyDataSource {
+
+    suspend fun registerStudy(request: StudyRegisterRequestDto): BaseResponse<StudyRegisterResponseDto>
+
+    suspend fun getStudies(page: Int, size: Int): BaseResponse<StudyDataResponseDto>
+
+    suspend fun getBookmarkStudies(page: Int, size: Int): BaseResponse<StudyDataResponseDto>
+
+    suspend fun getStudyMembers(studyId: Int): BaseResponse<StudyMemberResponseDto>
+
+    suspend fun getStudyDetails(studyId: Int): BaseResponse<StudyDetailResponseDto>
+
+    suspend fun makeSchedules(studyId: Int, request: MakeScheduleRequestDto): BaseResponse<MakeScheduleResponseDto>
+
+    suspend fun getStudySchedules(studyId: Int, page: Int, size: Int): BaseResponse<ScheduleListResponseDto>
+
+    suspend fun getRecentAnnounce(studyId: Int): BaseResponse<RecentAnnounceResponseDto>
+
+    suspend fun applyStudy(studyId: Int, memberId: Int, introduction: String): BaseResponse<StudyApplyResponseDto>
+
+    suspend fun toggleStudyLike(studyId: Int): BaseResponse<StudyLikeResponseDto>
+
+    suspend fun getIsApplied(studyId: Int): BaseResponse<IsAppliedResponseDto>
+
+    suspend fun patchStudy(studyId: Int, request: StudyRegisterRequestDto): BaseResponse<StudyRegisterResponseDto>
+
+    suspend fun uploadImages(images: List<MultipartBody.Part>): BaseResponse<UploadImageResponseDto>
+
+    suspend fun getStudyImages(studyId: Int, offset: Int, limit: Int): BaseResponse<ImagesResponseDto>
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/datasourceimpl/StudyDataSourceImpl.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/datasourceimpl/StudyDataSourceImpl.kt
new file mode 100644
index 00000000..a9cce921
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/datasourceimpl/StudyDataSourceImpl.kt
@@ -0,0 +1,55 @@
+package com.example.spoteam_android.data.study.datasourceimpl
+
+import com.example.spoteam_android.data.study.datasource.StudyDataSource
+import com.example.spoteam_android.data.study.dto.request.MakeScheduleRequestDto
+import com.example.spoteam_android.data.study.dto.request.StudyRegisterRequestDto
+import com.example.spoteam_android.data.study.service.StudyService
+import okhttp3.MultipartBody
+import javax.inject.Inject
+
+class StudyDataSourceImpl @Inject constructor(
+    private val studyService: StudyService
+) : StudyDataSource {
+
+    override suspend fun registerStudy(request: StudyRegisterRequestDto) =
+        studyService.registerStudy(request)
+
+    override suspend fun getStudies(page: Int, size: Int) =
+        studyService.getStudies(page, size)
+
+    override suspend fun getBookmarkStudies(page: Int, size: Int) =
+        studyService.getBookmarkStudies(page, size)
+
+    override suspend fun getStudyMembers(studyId: Int) =
+        studyService.getStudyMembers(studyId)
+
+    override suspend fun getStudyDetails(studyId: Int) =
+        studyService.getStudyDetails(studyId)
+
+    override suspend fun makeSchedules(studyId: Int, request: MakeScheduleRequestDto) =
+        studyService.makeSchedules(studyId, request)
+
+    override suspend fun getStudySchedules(studyId: Int, page: Int, size: Int) =
+        studyService.getStudySchedules(studyId, page, size)
+
+    override suspend fun getRecentAnnounce(studyId: Int) =
+        studyService.getRecentAnnounce(studyId)
+
+    override suspend fun applyStudy(studyId: Int, memberId: Int, introduction: String) =
+        studyService.applyStudy(studyId, memberId, introduction)
+
+    override suspend fun toggleStudyLike(studyId: Int) =
+        studyService.toggleStudyLike(studyId)
+
+    override suspend fun getIsApplied(studyId: Int) =
+        studyService.getIsApplied(studyId)
+
+    override suspend fun patchStudy(studyId: Int, request: StudyRegisterRequestDto) =
+        studyService.patchStudy(studyId, request)
+
+    override suspend fun uploadImages(images: List<MultipartBody.Part>) =
+        studyService.uploadImages(images)
+
+    override suspend fun getStudyImages(studyId: Int, offset: Int, limit: Int) =
+        studyService.getStudyImages(studyId, offset, limit)
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/di/DataSourceModule.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/di/DataSourceModule.kt
new file mode 100644
index 00000000..d928cc3c
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/di/DataSourceModule.kt
@@ -0,0 +1,19 @@
+package com.example.spoteam_android.data.study.di
+
+import com.example.spoteam_android.data.study.datasource.StudyDataSource
+import com.example.spoteam_android.data.study.datasourceimpl.StudyDataSourceImpl
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class DataSourceModule {
+    @Binds
+    @Singleton
+    abstract fun bindStudyDataSource(
+        impl: StudyDataSourceImpl
+    ): StudyDataSource
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/di/RepositoryModule.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/di/RepositoryModule.kt
new file mode 100644
index 00000000..11c5f147
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/di/RepositoryModule.kt
@@ -0,0 +1,19 @@
+package com.example.spoteam_android.data.study.di
+
+import com.example.spoteam_android.data.study.repositoryimpl.StudyRepositoryImpl
+import com.example.spoteam_android.domain.study.repository.StudyRepository
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class RepositoryModule {
+    @Binds
+    @Singleton
+    abstract fun bindsStudyRepository(
+        studyRepositoryImpl: StudyRepositoryImpl
+    ): StudyRepository
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/di/ServiceModule.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/di/ServiceModule.kt
new file mode 100644
index 00000000..455dedd3
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/di/ServiceModule.kt
@@ -0,0 +1,19 @@
+package com.example.spoteam_android.data.study.di
+
+import com.example.spoteam_android.data.study.service.StudyService
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import retrofit2.Retrofit
+import javax.inject.Singleton
+
+
+@Module
+@InstallIn(SingletonComponent::class)
+object ServiceModule {
+    @Provides
+    @Singleton
+    fun providesStudyService(retrofit: Retrofit): StudyService =
+        retrofit.create(StudyService::class.java)
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/request/MakeScheduleRequestDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/request/MakeScheduleRequestDto.kt
new file mode 100644
index 00000000..c518a281
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/request/MakeScheduleRequestDto.kt
@@ -0,0 +1,20 @@
+package com.example.spoteam_android.data.study.dto.request
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class MakeScheduleRequestDto(
+    @SerializedName("title")
+    val title: String,
+    @SerializedName("location")
+    val location: String,
+    @SerializedName("startedAt")
+    val startedAt: String,
+    @SerializedName("finishedAt")
+    val finishedAt: String,
+    @SerializedName("isAllDay")
+    val isAllDay: Boolean,
+    @SerializedName("period")
+    val period: String
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/request/StudyRegisterRequestDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/request/StudyRegisterRequestDto.kt
new file mode 100644
index 00000000..70909c61
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/request/StudyRegisterRequestDto.kt
@@ -0,0 +1,46 @@
+package com.example.spoteam_android.data.study.dto.request
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class StudyRegisterRequestDto(
+    @SerializedName("themes")
+    val themes: List<String>,
+
+    @SerializedName("title")
+    val title: String,
+
+    @SerializedName("goal")
+    val goal: String,
+
+    @SerializedName("introduction")
+    val introduction: String,
+
+    @SerializedName("isOnline")
+    val isOnline: Boolean,
+
+    @SerializedName("profileImage")
+    val profileImage: String? = null,
+
+    @SerializedName("regions")
+    val regions: List<String>? = null,
+
+    @SerializedName("maxPeople")
+    val maxPeople: Int,
+
+    @SerializedName("gender")
+    val gender: String,
+
+    @SerializedName("minAge")
+    val minAge: Int,
+
+    @SerializedName("maxAge")
+    val maxAge: Int,
+
+    @SerializedName("fee")
+    val fee: Int,
+
+    @SerializedName("hasFee")
+    val hasFee: Boolean? = null
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/ImagesResponseDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/ImagesResponseDto.kt
new file mode 100644
index 00000000..b89479f0
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/ImagesResponseDto.kt
@@ -0,0 +1,22 @@
+package com.example.spoteam_android.data.study.dto.response
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ImagesResponseDto(
+    @SerializedName("studyId")
+    val studyId: Int,
+    @SerializedName("images")
+    val images: List<ImagesDto>
+) {
+    @Serializable
+    data class ImagesDto(
+        @SerializedName("imageId")
+        val imageId: Int,
+        @SerializedName("imageUrl")
+        val imageUrl: String,
+        @SerializedName("postId")
+        val postId: Int
+    )
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/IsAppliedResponseDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/IsAppliedResponseDto.kt
new file mode 100644
index 00000000..5f9d7b5c
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/IsAppliedResponseDto.kt
@@ -0,0 +1,12 @@
+package com.example.spoteam_android.data.study.dto.response
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class IsAppliedResponseDto(
+    @SerializedName("studyId")
+    val studyId: Int,
+    @SerializedName("applied")
+    val applied: Boolean
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/MakeScheduleResponseDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/MakeScheduleResponseDto.kt
new file mode 100644
index 00000000..9129e30f
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/MakeScheduleResponseDto.kt
@@ -0,0 +1,20 @@
+package com.example.spoteam_android.data.study.dto.response
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class MakeScheduleResponseDto(
+    @SerializedName("title")
+    val title: String,
+    @SerializedName("location")
+    val location: String,
+    @SerializedName("statedAt")
+    val startedAt: String,
+    @SerializedName("finishedAt")
+    val finishedAt: String,
+    @SerializedName("isAllDay")
+    val isAllDay: Boolean,
+    @SerializedName("period")
+    val period: String
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/RecentAnnounceResponseDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/RecentAnnounceResponseDto.kt
new file mode 100644
index 00000000..171656c4
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/RecentAnnounceResponseDto.kt
@@ -0,0 +1,12 @@
+package com.example.spoteam_android.data.study.dto.response
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RecentAnnounceResponseDto(
+    @SerializedName("title")
+    val title: String,
+    @SerializedName("content")
+    val content: String
+)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/ScheduleListResponseDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/ScheduleListResponseDto.kt
new file mode 100644
index 00000000..01c034a0
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/ScheduleListResponseDto.kt
@@ -0,0 +1,33 @@
+package com.example.spoteam_android.data.study.dto.response
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ScheduleListResponseDto(
+    @SerializedName("totalPages")
+    val totalPages: Int,
+    @SerializedName("totalElements")
+    val totalElements: Int,
+    @SerializedName("first")
+    val first: Boolean,
+    @SerializedName("last")
+    val last: Boolean,
+    @SerializedName("size")
+    val size: Int,
+    @SerializedName("schedules")
+    val schedules: List<ScheduleDto>
+) {
+
+    @Serializable
+    data class ScheduleDto(
+        @SerializedName("startedAt")
+        val startedAt: String,
+        @SerializedName("finishedAt")
+        val finishedAt: String,
+        @SerializedName("title")
+        val title: String,
+        @SerializedName("location")
+        val location: String
+    )
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/StudyApplyResponseDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/StudyApplyResponseDto.kt
new file mode 100644
index 00000000..06359d61
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/StudyApplyResponseDto.kt
@@ -0,0 +1,20 @@
+package com.example.spoteam_android.data.study.dto.response
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class StudyApplyResponseDto(
+    @SerializedName("memberId")
+    val memberId: Int,
+    @SerializedName("study")
+    val study: StudyApplyInfoDto
+) {
+    @Serializable
+    data class StudyApplyInfoDto(
+        @SerializedName("studyId")
+        val studyId: Int,
+        @SerializedName("title")
+        val title: String
+    )
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/StudyDataResponseDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/StudyDataResponseDto.kt
new file mode 100644
index 00000000..1d339ef6
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/StudyDataResponseDto.kt
@@ -0,0 +1,55 @@
+package com.example.spoteam_android.data.study.dto.response
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class StudyDataResponseDto(
+    @SerialName("totalPages")
+    val totalPages: Int,
+    @SerialName("totalElements")
+    val totalElements: Int,
+    @SerialName("first")
+    val first: Boolean,
+    @SerialName("last")
+    val last: Boolean,
+    @SerialName("size")
+    val size: Int,
+    @SerialName("content")
+    val content: List<StudyContentResponseDto>,
+    @SerialName("pageNumber")
+    val pageNumber: Int
+){
+    @Serializable
+    data class StudyContentResponseDto(
+        @SerializedName("studyId")
+        val studyId: Int,
+        @SerializedName("imageUrl")
+        val imageUrl: String,
+        @SerializedName("title")
+        val title: String,
+        @SerializedName("introduction")
+        val introduction: String,
+        @SerializedName("goal")
+        val goal: String,
+        @SerializedName("memberCount")
+        val memberCount: Int,
+        @SerializedName("heartCount")
+        val heartCount: Int,
+        @SerializedName("hitNum")
+        val hitNum: Int,
+        @SerializedName("maxPeople")
+        val maxPeople: Int,
+        @SerializedName("studyState")
+        val studyState: String,
+        @SerializedName("themeTypes")
+        val themeTypes: List<String>,
+        @SerializedName("regions")
+        val regions: List<String>,
+        @SerializedName("createdAt")
+        val createdAt: String,
+        @SerializedName("liked")
+        val liked: Boolean
+    )
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/StudyDetailResponseDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/StudyDetailResponseDto.kt
new file mode 100644
index 00000000..58204e0e
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/StudyDetailResponseDto.kt
@@ -0,0 +1,49 @@
+package com.example.spoteam_android.data.study.dto.response
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class StudyDetailResponseDto(
+    @SerializedName("studyId")
+    val studyId: Int,
+    @SerializedName("studyName")
+    val studyName: String,
+    @SerializedName("studyOwner")
+    val studyOwner: StudyOwnerDataResponseDto,
+    @SerializedName("hitNum")
+    val hitNum: Int,
+    @SerializedName("heartCount")
+    val heartCount: Int,
+    @SerializedName("memberCount")
+    val memberCount: Int,
+    @SerializedName("maxPeople")
+    val maxPeople: Int,
+    @SerializedName("gender")
+    val gender: String,
+    @SerializedName("minAge")
+    val minAge: Int,
+    @SerializedName("maxAge")
+    val maxAge: Int,
+    @SerializedName("fee")
+    val fee: Int,
+    @SerializedName("isOnline")
+    val isOnline: Boolean,
+    @SerializedName("profileImage")
+    val profileImage: String,
+    @SerializedName("themes")
+    val themes: List<String>,
+    @SerializedName("regions")
+    val regions: List<String>,
+    @SerializedName("goal")
+    val goal: String,
+    @SerializedName("introduction")
+    val introduction: String,
+) {
+    @Serializable
+    data class StudyOwnerDataResponseDto(
+        val ownerId: Int,
+        val ownerName: String
+    )
+}
+
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/StudyLikeResponseDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/StudyLikeResponseDto.kt
new file mode 100644
index 00000000..061a9b98
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/StudyLikeResponseDto.kt
@@ -0,0 +1,14 @@
+package com.example.spoteam_android.data.study.dto.response
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class StudyLikeResponseDto(
+    @SerializedName("studyTitle")
+    val studyTitle: String,
+    @SerializedName("createdAt")
+    val createdAt: String,
+    @SerializedName("status")
+    val status: String
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/StudyMemberResponseDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/StudyMemberResponseDto.kt
new file mode 100644
index 00000000..c1168724
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/StudyMemberResponseDto.kt
@@ -0,0 +1,22 @@
+package com.example.spoteam_android.data.study.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class StudyMemberResponseDto(
+    @SerialName("totalElements")
+    val totalElements: Int,
+    @SerialName("members")
+    val members: List<StudyMemberDataResponse>
+) {
+    @Serializable
+    data class StudyMemberDataResponse(
+        @SerialName("memberId")
+        val memberId: Int,
+        @SerialName("nickname")
+        val nickname: String,
+        @SerialName("profileImage")
+        val profileImage: String
+    )
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/StudyRegisterResponseDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/StudyRegisterResponseDto.kt
new file mode 100644
index 00000000..a451d097
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/StudyRegisterResponseDto.kt
@@ -0,0 +1,12 @@
+package com.example.spoteam_android.data.study.dto.response
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class StudyRegisterResponseDto(
+    @SerializedName("studyId")
+    val studyId: Int,
+    @SerializedName("title")
+    val title: String
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/UploadImageResponseDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/UploadImageResponseDto.kt
new file mode 100644
index 00000000..9be93212
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/dto/response/UploadImageResponseDto.kt
@@ -0,0 +1,20 @@
+package com.example.spoteam_android.data.study.dto.response
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class UploadImageResponseDto(
+    @SerializedName("imageUrls")
+    val imageUrls: List<ImageUrlDataDto>,
+    @SerializedName("imageCount")
+    val imageCount: Int
+) {
+    @Serializable
+    data class ImageUrlDataDto(
+        @SerializedName("imageUrl")
+        val imageUrl: String,
+        @SerializedName("uploadAt")
+        val uploadAt: String
+    )
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/ImageMapper.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/ImageMapper.kt
new file mode 100644
index 00000000..f02ad3d0
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/ImageMapper.kt
@@ -0,0 +1,15 @@
+package com.example.spoteam_android.data.study.mapper
+
+import com.example.spoteam_android.data.study.dto.response.ImagesResponseDto
+import com.example.spoteam_android.domain.study.entity.ImageResponse
+
+fun ImagesResponseDto.toDomain() = ImageResponse(
+    studyId = studyId,
+    images = images.map {
+        ImageResponse.ImagesInfo(
+            imageId = it.imageId,
+            imageUrl = it.imageUrl,
+            postId = it.postId
+        )
+    }
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/IsAppliedMapper.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/IsAppliedMapper.kt
new file mode 100644
index 00000000..cefb09c6
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/IsAppliedMapper.kt
@@ -0,0 +1,9 @@
+package com.example.spoteam_android.data.study.mapper
+
+import com.example.spoteam_android.data.study.dto.response.IsAppliedResponseDto
+import com.example.spoteam_android.domain.study.entity.IsAppliedResponse
+
+fun IsAppliedResponseDto.toDomain() = IsAppliedResponse(
+    studyId = studyId,
+    applied = applied
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/MakeScheduleMapper.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/MakeScheduleMapper.kt
new file mode 100644
index 00000000..00811ea4
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/MakeScheduleMapper.kt
@@ -0,0 +1,26 @@
+package com.example.spoteam_android.data.study.mapper
+
+import com.example.spoteam_android.data.study.dto.request.MakeScheduleRequestDto
+import com.example.spoteam_android.data.study.dto.response.MakeScheduleResponseDto
+import com.example.spoteam_android.domain.study.entity.MakeScheduleRequest
+import com.example.spoteam_android.domain.study.entity.MakeScheduleResponse
+
+fun MakeScheduleResponseDto.toDomain() = MakeScheduleResponse(
+    title = title,
+    location = location,
+    startedAt = startedAt,
+    finishedAt = finishedAt,
+    isAllDay = isAllDay,
+    period = period
+)
+
+fun MakeScheduleRequest.toDto(): MakeScheduleRequestDto {
+    return MakeScheduleRequestDto(
+        title = title,
+        location = location,
+        startedAt = startedAt,
+        finishedAt = finishedAt,
+        isAllDay = isAllDay,
+        period = period
+    )
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/RecentAnnounceMapper.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/RecentAnnounceMapper.kt
new file mode 100644
index 00000000..1dbf65f7
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/RecentAnnounceMapper.kt
@@ -0,0 +1,9 @@
+package com.example.spoteam_android.data.study.mapper
+
+import com.example.spoteam_android.data.study.dto.response.RecentAnnounceResponseDto
+import com.example.spoteam_android.domain.study.entity.RecentAnnounceResponse
+
+fun RecentAnnounceResponseDto.toDomain() = RecentAnnounceResponse(
+    title = title,
+    content = content
+)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/ScheduleListMapper.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/ScheduleListMapper.kt
new file mode 100644
index 00000000..2083e750
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/ScheduleListMapper.kt
@@ -0,0 +1,20 @@
+package com.example.spoteam_android.data.study.mapper
+
+import com.example.spoteam_android.data.study.dto.response.ScheduleListResponseDto
+import com.example.spoteam_android.domain.study.entity.ScheduleListResponse
+
+fun ScheduleListResponseDto.toDomain() = ScheduleListResponse(
+    totalPages = totalPages,
+    totalElements = totalElements,
+    first = first,
+    last = last,
+    size = size,
+    schedules = schedules.map { it.toDomain() }
+)
+
+fun ScheduleListResponseDto.ScheduleDto.toDomain() = ScheduleListResponse.Schedule(
+    startedAt = startedAt,
+    finishedAt = finishedAt,
+    title = title,
+    location = location
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/StudyApplyMapper.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/StudyApplyMapper.kt
new file mode 100644
index 00000000..241f88c3
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/StudyApplyMapper.kt
@@ -0,0 +1,12 @@
+package com.example.spoteam_android.data.study.mapper
+
+import com.example.spoteam_android.data.study.dto.response.StudyApplyResponseDto
+import com.example.spoteam_android.domain.study.entity.StudyApplyResponse
+
+fun StudyApplyResponseDto.toDomain() = StudyApplyResponse(
+    memberId = memberId,
+    study = StudyApplyResponse.StudyApplyInfo(
+        studyId = study.studyId,
+        title = study.title
+    )
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/StudyDataMapper.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/StudyDataMapper.kt
new file mode 100644
index 00000000..341196ae
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/StudyDataMapper.kt
@@ -0,0 +1,35 @@
+package com.example.spoteam_android.data.study.mapper
+
+import com.example.spoteam_android.data.study.dto.response.StudyDataResponseDto
+import com.example.spoteam_android.domain.study.entity.StudyDataResponse
+
+fun StudyDataResponseDto.toDomain(): StudyDataResponse {
+    return StudyDataResponse(
+        totalPages = totalPages,
+        totalElements = totalElements,
+        first = first,
+        last = last,
+        size = size,
+        number = pageNumber,
+        content = content.map { it.toDomain() }
+    )
+}
+
+fun StudyDataResponseDto.StudyContentResponseDto.toDomain(): StudyDataResponse.StudyContent {
+    return StudyDataResponse.StudyContent(
+        studyId = studyId,
+        imageUrl = imageUrl,
+        title = title,
+        introduction = introduction,
+        goal = goal,
+        memberCount = memberCount,
+        heartCount = heartCount,
+        hitNum = hitNum,
+        maxPeople = maxPeople,
+        studyState = studyState,
+        themeTypes = themeTypes,
+        regions = regions,
+        createdAt = createdAt,
+        liked = liked
+    )
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/StudyDetailMapper.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/StudyDetailMapper.kt
new file mode 100644
index 00000000..15eab3b7
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/StudyDetailMapper.kt
@@ -0,0 +1,27 @@
+package com.example.spoteam_android.data.study.mapper
+
+import com.example.spoteam_android.data.study.dto.response.StudyDetailResponseDto
+import com.example.spoteam_android.domain.study.entity.StudyDetailResponse
+
+fun StudyDetailResponseDto.toDomain(): StudyDetailResponse {
+    return StudyDetailResponse(
+        studyId = studyId,
+        studyName = studyName,
+        ownerId = studyOwner.ownerId,
+        ownerName = studyOwner.ownerName,
+        hitNum = hitNum,
+        heartCount = heartCount,
+        memberCount = memberCount,
+        maxPeople = maxPeople,
+        gender = gender,
+        minAge = minAge,
+        maxAge = maxAge,
+        fee = fee,
+        isOnline = isOnline,
+        profileImage = profileImage,
+        themes = themes,
+        regions = regions,
+        goal = goal,
+        introduction = introduction
+    )
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/StudyLikeMapper.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/StudyLikeMapper.kt
new file mode 100644
index 00000000..a7224521
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/StudyLikeMapper.kt
@@ -0,0 +1,10 @@
+package com.example.spoteam_android.data.study.mapper
+
+import com.example.spoteam_android.data.study.dto.response.StudyLikeResponseDto
+import com.example.spoteam_android.domain.study.entity.StudyLikeResponse
+
+fun StudyLikeResponseDto.toDomain() = StudyLikeResponse(
+    studyTitle = studyTitle,
+    createdAt = createdAt,
+    status = status
+)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/StudyMemberMapper.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/StudyMemberMapper.kt
new file mode 100644
index 00000000..d8323d7d
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/StudyMemberMapper.kt
@@ -0,0 +1,18 @@
+package com.example.spoteam_android.data.study.mapper
+
+import com.example.spoteam_android.data.study.dto.response.StudyMemberResponseDto
+import com.example.spoteam_android.domain.study.entity.StudyMemberResponse
+
+
+fun StudyMemberResponseDto.toDomain(): StudyMemberResponse {
+    return StudyMemberResponse(
+        totalCount = this.totalElements,
+        members = this.members.map {
+            StudyMemberResponse.StudyMember(
+                memberId = it.memberId,
+                nickname = it.nickname,
+                profileImage = it.profileImage
+            )
+        }
+    )
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/StudyRegisterMapper.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/StudyRegisterMapper.kt
new file mode 100644
index 00000000..b6b7b1e0
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/StudyRegisterMapper.kt
@@ -0,0 +1,31 @@
+package com.example.spoteam_android.data.study.mapper
+
+import com.example.spoteam_android.data.study.dto.request.StudyRegisterRequestDto
+import com.example.spoteam_android.data.study.dto.response.StudyRegisterResponseDto
+import com.example.spoteam_android.domain.study.entity.StudyRegisterRequest
+import com.example.spoteam_android.domain.study.entity.StudyRegisterResponse
+
+fun StudyRegisterResponseDto.toDomain(): StudyRegisterResponse {
+    return StudyRegisterResponse(
+        studyId = studyId,
+        title = title,
+
+    )
+}
+fun StudyRegisterRequest.toDto(): StudyRegisterRequestDto {
+    return StudyRegisterRequestDto(
+        themes = themes,
+        title = title,
+        goal = goal,
+        introduction = introduction,
+        isOnline = isOnline,
+        profileImage = profileImage,
+        regions = regions,
+        maxPeople = maxPeople,
+        gender = gender,
+        minAge = minAge,
+        maxAge = maxAge,
+        fee = fee,
+        hasFee = hasFee
+    )
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/UploadImageMapper.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/UploadImageMapper.kt
new file mode 100644
index 00000000..210c4bb3
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/mapper/UploadImageMapper.kt
@@ -0,0 +1,14 @@
+package com.example.spoteam_android.data.study.mapper
+
+import com.example.spoteam_android.data.study.dto.response.UploadImageResponseDto
+import com.example.spoteam_android.domain.study.entity.UploadImageResponse
+
+fun UploadImageResponseDto.toDomain() = UploadImageResponse(
+    imageUrls = imageUrls.map {
+        UploadImageResponse.ImageUrlData(
+            imageUrl = it.imageUrl,
+            uploadAt = it.uploadAt
+        )
+    },
+    imageCount = imageCount
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/repositoryimpl/StudyRepositoryImpl.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/repositoryimpl/StudyRepositoryImpl.kt
new file mode 100644
index 00000000..1cabfc68
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/repositoryimpl/StudyRepositoryImpl.kt
@@ -0,0 +1,97 @@
+package com.example.spoteam_android.data.study.repositoryimpl
+
+import com.example.spoteam_android.data.study.datasource.StudyDataSource
+import com.example.spoteam_android.data.study.mapper.toDomain
+import com.example.spoteam_android.data.study.mapper.toDto
+import com.example.spoteam_android.domain.study.entity.ImageResponse
+import com.example.spoteam_android.domain.study.entity.IsAppliedResponse
+import com.example.spoteam_android.domain.study.entity.MakeScheduleRequest
+import com.example.spoteam_android.domain.study.entity.MakeScheduleResponse
+import com.example.spoteam_android.domain.study.entity.RecentAnnounceResponse
+import com.example.spoteam_android.domain.study.entity.ScheduleListResponse
+import com.example.spoteam_android.domain.study.entity.StudyApplyResponse
+import com.example.spoteam_android.domain.study.entity.StudyDataResponse
+import com.example.spoteam_android.domain.study.entity.StudyDetailResponse
+import com.example.spoteam_android.domain.study.entity.StudyLikeResponse
+import com.example.spoteam_android.domain.study.entity.StudyMemberResponse
+import com.example.spoteam_android.domain.study.entity.StudyRegisterRequest
+import com.example.spoteam_android.domain.study.entity.StudyRegisterResponse
+import com.example.spoteam_android.domain.study.entity.UploadImageResponse
+import com.example.spoteam_android.domain.study.repository.StudyRepository
+import okhttp3.MultipartBody
+import javax.inject.Inject
+
+class StudyRepositoryImpl @Inject constructor(
+    private val studyDataSource: StudyDataSource
+) : StudyRepository {
+
+    override suspend fun registerStudy(request: StudyRegisterRequest): Result<StudyRegisterResponse> = runCatching {
+        val response = studyDataSource.registerStudy(request.toDto())
+        response.result?.toDomain() ?: throw IllegalStateException("No result")
+    }
+
+    override suspend fun patchStudy(studyId: Int, request: StudyRegisterRequest): Result<StudyRegisterResponse> = runCatching {
+        val response = studyDataSource.patchStudy(studyId, request.toDto())
+        response.result?.toDomain() ?: throw IllegalStateException("No result")
+    }
+
+    override suspend fun getStudies(page: Int, size: Int): Result<StudyDataResponse> = runCatching {
+        val response = studyDataSource.getStudies(page, size)
+        response.result?.toDomain() ?: throw IllegalStateException("No result")
+    }
+
+    override suspend fun getBookmarkStudies(page: Int, size: Int): Result<StudyDataResponse> = runCatching {
+        val response = studyDataSource.getBookmarkStudies(page, size)
+        response.result?.toDomain() ?: throw IllegalStateException("No result")
+    }
+
+    override suspend fun getStudyDetails(studyId: Int): Result<StudyDetailResponse> = runCatching {
+        val response = studyDataSource.getStudyDetails(studyId)
+        response.result?.toDomain() ?: throw IllegalStateException("No result")
+    }
+
+    override suspend fun getStudyMembers(studyId: Int): Result<StudyMemberResponse> = runCatching {
+        val response = studyDataSource.getStudyMembers(studyId)
+        response.result?.toDomain() ?: throw IllegalStateException("No result")
+    }
+
+    override suspend fun makeSchedules(studyId: Int, schedule: MakeScheduleRequest): Result<MakeScheduleResponse> = runCatching {
+        val response = studyDataSource.makeSchedules(studyId, schedule.toDto())
+        response.result?.toDomain() ?: throw IllegalStateException("No result")
+    }
+
+    override suspend fun getStudySchedules(studyId: Int, page: Int, size: Int): Result<ScheduleListResponse> = runCatching {
+        val response = studyDataSource.getStudySchedules(studyId, page, size)
+        response.result?.toDomain() ?: throw IllegalStateException("No result")
+    }
+
+    override suspend fun getRecentAnnounce(studyId: Int): Result<RecentAnnounceResponse> = runCatching {
+        val response = studyDataSource.getRecentAnnounce(studyId)
+        response.result?.toDomain() ?: throw IllegalStateException("No result")
+    }
+
+    override suspend fun applyStudy(studyId: Int, memberId: Int, introduction: String): Result<StudyApplyResponse> = runCatching {
+        val response = studyDataSource.applyStudy(studyId, memberId, introduction)
+        response.result?.toDomain() ?: throw IllegalStateException("No result")
+    }
+
+    override suspend fun toggleStudyLike(studyId: Int): Result<StudyLikeResponse> = runCatching {
+        val response = studyDataSource.toggleStudyLike(studyId)
+        response.result?.toDomain() ?: throw IllegalStateException("No result")
+    }
+
+    override suspend fun getIsApplied(studyId: Int): Result<IsAppliedResponse> = runCatching {
+        val response = studyDataSource.getIsApplied(studyId)
+        response.result?.toDomain() ?: throw IllegalStateException("No result")
+    }
+
+    override suspend fun uploadImages(images: List<MultipartBody.Part>): Result<UploadImageResponse> = runCatching {
+        val response = studyDataSource.uploadImages(images)
+        response.result?.toDomain() ?: throw IllegalStateException("No result")
+    }
+
+    override suspend fun getStudyImages(studyId: Int, offset: Int, limit: Int): Result<ImageResponse> = runCatching {
+        val response = studyDataSource.getStudyImages(studyId, offset, limit)
+        response.result?.toDomain() ?: throw IllegalStateException("No result")
+    }
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/service/StudyService.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/service/StudyService.kt
new file mode 100644
index 00000000..6f0f0bb3
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/study/service/StudyService.kt
@@ -0,0 +1,123 @@
+package com.example.spoteam_android.data.study.service
+
+import com.example.spoteam_android.core.network.BaseResponse
+import com.example.spoteam_android.data.study.dto.request.MakeScheduleRequestDto
+import com.example.spoteam_android.data.study.dto.request.StudyRegisterRequestDto
+import com.example.spoteam_android.data.study.dto.response.ImagesResponseDto
+import com.example.spoteam_android.data.study.dto.response.IsAppliedResponseDto
+import com.example.spoteam_android.data.study.dto.response.MakeScheduleResponseDto
+import com.example.spoteam_android.data.study.dto.response.RecentAnnounceResponseDto
+import com.example.spoteam_android.data.study.dto.response.ScheduleListResponseDto
+import com.example.spoteam_android.data.study.dto.response.StudyApplyResponseDto
+import com.example.spoteam_android.data.study.dto.response.StudyDataResponseDto
+import com.example.spoteam_android.data.study.dto.response.StudyDetailResponseDto
+import com.example.spoteam_android.data.study.dto.response.StudyLikeResponseDto
+import com.example.spoteam_android.data.study.dto.response.StudyMemberResponseDto
+import com.example.spoteam_android.data.study.dto.response.StudyRegisterResponseDto
+import com.example.spoteam_android.data.study.dto.response.UploadImageResponseDto
+import okhttp3.MultipartBody
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.HTTP
+import retrofit2.http.Multipart
+import retrofit2.http.PATCH
+import retrofit2.http.POST
+import retrofit2.http.Part
+import retrofit2.http.Path
+import retrofit2.http.Query
+
+interface StudyService {
+
+    //register study
+    @POST("/spot/studies")
+    suspend fun registerStudy(@Body request: StudyRegisterRequestDto): BaseResponse<StudyRegisterResponseDto>
+
+    //search on studies
+    @GET("/spot/search/studies/on-studies")
+    suspend fun getStudies(
+        @Query("page") page: Int,
+        @Query("size") size: Int = 5
+    ): BaseResponse<StudyDataResponseDto>
+
+    //get bookmark studies
+    @GET("/spot/search/studies/liked")
+    suspend fun getBookmarkStudies(
+        @Query("page") page: Int,
+        @Query("size") size: Int = 5
+    ): BaseResponse<StudyDataResponseDto>
+
+    //get study members
+    @GET("/spot/studies/{studyId}/members")
+    suspend fun getStudyMembers(
+        @Path("studyId") studyId: Int
+    ): BaseResponse<StudyMemberResponseDto>
+
+    //get study details
+    @GET("/spot/studies/{studyId}")
+    suspend fun getStudyDetails(
+        @Path("studyId") studyId: Int
+    ): BaseResponse<StudyDetailResponseDto>
+
+    //make schedule
+    @POST("/spot/studies/{studyId}/schedules")
+    suspend fun makeSchedules(
+        @Path("studyId") studyId: Int,
+        @Body scheduleRequest: MakeScheduleRequestDto
+    ): BaseResponse<MakeScheduleResponseDto>
+
+    //get schedule
+    @GET("/spot/studies/{studyId}/upcoming-schedules")
+    suspend fun getStudySchedules(
+        @Path("studyId") studyId: Int,
+        @Query("page") page: Int,
+        @Query("size") size: Int = 2,
+    ): BaseResponse<ScheduleListResponseDto>
+
+    //get recent announce
+    @GET("/spot/studies/{studyId}/announce")
+    suspend fun getRecentAnnounce(
+        @Path("studyId") studyId: Int,
+    ): BaseResponse<RecentAnnounceResponseDto>
+
+    //apply Study
+    @POST("/spot/studies/{studyId}")
+    suspend fun applyStudy(
+        @Path("studyId") studyId: Int,
+        @Query("memberId") memberId: Int,
+        @Body introduction: String
+    ): BaseResponse<StudyApplyResponseDto>
+
+    //toggle study like
+    @POST("/spot/studies/{studyId}/like")
+    suspend fun toggleStudyLike(
+        @Path("studyId") studyId: Int,
+    ): BaseResponse<StudyLikeResponseDto>
+
+    //get is applied study
+    @GET("/spot/studies/{studyId}/is-applied")
+    suspend fun getIsApplied(
+        @Path("studyId") studyId: Int
+    ): BaseResponse<IsAppliedResponseDto>
+
+    //patch study
+    @PATCH("/spot/studies/{studyId}")
+    suspend fun patchStudy(
+        @Path("studyId") studyId: Int,
+        @Body request: StudyRegisterRequestDto
+    ): BaseResponse<StudyRegisterResponseDto>
+
+    //upload image
+    @Multipart
+    @POST("/spot/util/images")
+    suspend fun uploadImages(
+        @Part images: List<MultipartBody.Part>
+    ): BaseResponse<UploadImageResponseDto>
+
+    //get Images
+    @GET("/spot/studies/{studyId}/images")
+    suspend fun getStudyImages(
+        @Path("studyId") studyId: Int,
+        @Query("offset") offset: Int,
+        @Query("limit") limit: Int
+    ): BaseResponse<ImagesResponseDto>
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/datasource/WeatherDataSource.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/datasource/WeatherDataSource.kt
new file mode 100644
index 00000000..a9114357
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/datasource/WeatherDataSource.kt
@@ -0,0 +1,15 @@
+package com.example.spoteam_android.data.weather.datasource
+
+import com.example.spoteam_android.data.weather.dto.WeatherDto
+
+interface WeatherDataSource {
+    suspend fun getWeather(
+        dataType: String,
+        numOfRows: Int,
+        pageNo: Int,
+        baseDate: Int,
+        baseTime: String,
+        nx: String,
+        ny: String
+    ): WeatherDto
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/datasourceimpl/WeatherDataSourceImpl.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/datasourceimpl/WeatherDataSourceImpl.kt
new file mode 100644
index 00000000..9e4c7c81
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/datasourceimpl/WeatherDataSourceImpl.kt
@@ -0,0 +1,23 @@
+package com.example.spoteam_android.data.weather.datasourceimpl
+
+import com.example.spoteam_android.data.weather.datasource.WeatherDataSource
+import com.example.spoteam_android.data.weather.dto.WeatherDto
+import com.example.spoteam_android.data.weather.service.WeatherService
+import javax.inject.Inject
+
+class WeatherDataSourceImpl @Inject constructor(
+    private val api: WeatherService
+) : WeatherDataSource {
+    override suspend fun getWeather(
+        dataType: String,
+        numOfRows: Int,
+        pageNo: Int,
+        baseDate: Int,
+        baseTime: String,
+        nx: String,
+        ny: String
+    ): WeatherDto {
+        val response = api.getWeather(dataType, numOfRows, pageNo, baseDate, baseTime, nx, ny)
+        return response.body() ?: throw Exception("날씨 데이터 없음")
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/di/DataSourceModule.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/di/DataSourceModule.kt
new file mode 100644
index 00000000..96116cfe
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/di/DataSourceModule.kt
@@ -0,0 +1,17 @@
+package com.example.spoteam_android.data.weather.di
+
+import com.example.spoteam_android.data.weather.datasource.WeatherDataSource
+import com.example.spoteam_android.data.weather.datasourceimpl.WeatherDataSourceImpl
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class DataSourceModule {
+    @Binds
+    abstract fun bindWeatherDataSource(
+        impl: WeatherDataSourceImpl
+    ): WeatherDataSource
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/di/RepositoryModule.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/di/RepositoryModule.kt
new file mode 100644
index 00000000..3bad533d
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/di/RepositoryModule.kt
@@ -0,0 +1,17 @@
+package com.example.spoteam_android.data.weather.di
+
+import com.example.spoteam_android.data.weather.repositoryimpl.WeatherRepositoryImpl
+import com.example.spoteam_android.domain.weather.repository.WeatherRepository
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class RepositoryModule {
+    @Binds
+    abstract fun bindWeatherRepository(
+        impl: WeatherRepositoryImpl
+    ): WeatherRepository
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/di/ServiceModule.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/di/ServiceModule.kt
new file mode 100644
index 00000000..e46367b5
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/di/ServiceModule.kt
@@ -0,0 +1,19 @@
+package com.example.spoteam_android.data.weather.di
+
+import com.example.spoteam_android.data.weather.service.WeatherService
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import retrofit2.Retrofit
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object ServiceModule {
+    @Provides
+    @Singleton
+    fun provideWeatherApi(retrofit: Retrofit): WeatherService {
+        return retrofit.create(WeatherService::class.java)
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/dto/WeatherDto.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/dto/WeatherDto.kt
new file mode 100644
index 00000000..34bff0cf
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/dto/WeatherDto.kt
@@ -0,0 +1,61 @@
+package com.example.spoteam_android.data.weather.dto
+
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class WeatherDto(
+    @SerialName("response")
+    val response: Response
+) {
+    @Serializable
+    data class Response(
+        @SerialName("header")
+        val header: Header,
+        @SerialName("body")
+        val body: Body
+    )
+
+    @Serializable
+    data class Header(
+        @SerialName("resultCode")
+        val resultCode: Int,
+        @SerialName("resultMsg")
+        val resultMsg: String
+    )
+
+    @Serializable
+    data class Body(
+        @SerialName("dataType")
+        val dataType: String,
+        @SerialName("items")
+        val items: Items
+    )
+
+    @Serializable
+    data class Items(
+        @SerialName("item")
+        val item: List<Item>
+    )
+
+    @Serializable
+    data class Item(
+        @SerialName("baseData")
+        val baseData: Int,
+        @SerialName("baseTime")
+        val baseTime: Int,
+        @SerialName("category")
+        val category: String,
+        @SerialName("fcstDate")
+        val fcstDate: Int,
+        @SerialName("fcstTime")
+        val fcstTime: Int,
+        @SerialName("fcstValue")
+        val fcstValue: String,
+        @SerialName("nx")
+        val nx: Int,
+        @SerialName("ny")
+        val ny: Int
+    )
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/mapper/WeatherMapper.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/mapper/WeatherMapper.kt
new file mode 100644
index 00000000..507feab3
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/mapper/WeatherMapper.kt
@@ -0,0 +1,55 @@
+package com.example.spoteam_android.data.weather.mapper
+
+import com.example.spoteam_android.data.weather.dto.WeatherDto
+import com.example.spoteam_android.domain.weather.entity.WeatherUiState
+import com.example.spoteam_android.R
+
+object WeatherMapper {
+    fun toUiState(dto: WeatherDto): WeatherUiState {
+        val items = dto.response.body.items.item
+        val tmp = items.find { it.category == "TMP" }?.fcstValue?.toDoubleOrNull() ?: 0.0
+        val pcp = items.find { it.category == "PCP" }?.fcstValue ?: "-"
+        val sno = items.find { it.category == "SNO" }?.fcstValue ?: "-"
+        val wsd = items.find { it.category == "WSD" }?.fcstValue?.toDoubleOrNull() ?: 0.0
+
+        return WeatherUiState(
+            temperature = "%.1f °C".format(tmp),
+            message = getMessage(tmp, pcp, sno, wsd),
+            imageRes = getIcon(tmp, pcp, sno, wsd)
+        )
+    }
+
+    private fun getMessage(tmp: Double, pcp: String, sno: String, wsd: Double): String {
+        val rainVal = parse(pcp)
+        val snowVal = parse(sno)
+        return when {
+            rainVal >= 10 -> "실내에서 집중! 목표는 선명히!"
+            snowVal >= 5 -> "눈길 조심! 한 걸음씩 나아가요!"
+            wsd >= 9 -> "바람 조심! 흔들려도 전진!"
+            tmp in 0.0..10.0 -> "따뜻하게! 오늘도 열정 가득!"
+            tmp >= 25 -> "수분 보충! 더위도 이겨내요!"
+            rainVal in 1.0..4.0 -> "우산 챙기고 오늘도 파이팅!"
+            else -> "좋은 날! 목표 향해 달려요!"
+        }
+    }
+
+    private fun getIcon(tmp: Double, pcp: String, sno: String, wsd: Double): Int {
+        val rainVal = parse(pcp)
+        val snowVal = parse(sno)
+        return when {
+            rainVal >= 10 -> R.drawable.ic_rainy
+            snowVal >= 5 -> R.drawable.ic_snow
+            wsd >= 9 -> R.drawable.ic_gale
+            tmp in 0.0..10.0 -> R.drawable.ic_cold
+            tmp >= 25 -> R.drawable.ic_hot
+            rainVal in 1.0..4.0 -> R.drawable.ic_light_rainy
+            else -> R.drawable.ic_sun
+        }
+    }
+
+    private fun parse(value: String): Double =
+        when (value) {
+            "-", "강수없음", "적설없음" -> 0.0
+            else -> value.toDoubleOrNull() ?: 0.0
+        }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/repositoryimpl/WeatherRepositoryImpl.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/repositoryimpl/WeatherRepositoryImpl.kt
new file mode 100644
index 00000000..c66aa746
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/repositoryimpl/WeatherRepositoryImpl.kt
@@ -0,0 +1,17 @@
+package com.example.spoteam_android.data.weather.repositoryimpl
+
+import com.example.spoteam_android.data.weather.datasource.WeatherDataSource
+import com.example.spoteam_android.data.weather.mapper.WeatherMapper
+import com.example.spoteam_android.domain.weather.repository.WeatherRepository
+import com.example.spoteam_android.domain.weather.entity.WeatherUiState
+import javax.inject.Inject
+
+class WeatherRepositoryImpl @Inject constructor(
+    private val dataSource: WeatherDataSource
+) : WeatherRepository {
+    override suspend fun getTodayWeather(): Result<WeatherUiState> = runCatching {
+        val today = java.time.LocalDate.now().format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd")).toInt()
+        val dto = dataSource.getWeather("JSON", 100, 1, today, "0500", "60", "127")
+        WeatherMapper.toUiState(dto)
+    }
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/service/WeatherService.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/service/WeatherService.kt
new file mode 100644
index 00000000..e6b9b3b0
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/weather/service/WeatherService.kt
@@ -0,0 +1,20 @@
+package com.example.spoteam_android.data.weather.service
+
+import retrofit2.http.Query
+import com.example.spoteam_android.core.util.ApiKey.Companion.API_KEY
+import com.example.spoteam_android.data.weather.dto.WeatherDto
+import retrofit2.Response
+import retrofit2.http.GET
+
+interface WeatherService {
+    @GET("getVilageFcst?serviceKey=$API_KEY")
+    suspend fun getWeather(
+        @Query("dataType") dataType: String,
+        @Query("numOfRows") numOfRows: Int,
+        @Query("pageNo") pageNo: Int,
+        @Query("base_date") baseDate: Int,
+        @Query("base_time") baseTime: String,
+        @Query("nx") nx: String,
+        @Query("ny") ny: String
+    ): Response<WeatherDto>
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/di/ApiModule.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/di/ApiModule.kt
new file mode 100644
index 00000000..e7c83fcd
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/di/ApiModule.kt
@@ -0,0 +1,36 @@
+package com.example.spoteam_android.di
+
+import com.example.spoteam_android.data.login.service.LoginService
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.interestarea.InterestAreaApiService
+import com.example.spoteam_android.presentation.interestarea.RecommendStudyApiService
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import retrofit2.Retrofit
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object ApiModule {
+
+    // TODO: 나중에 패키지 위치 이동
+    @Provides
+    @Singleton
+    fun provideInterestAreaApiService(retrofit: Retrofit): InterestAreaApiService =
+        retrofit.create(InterestAreaApiService::class.java)
+
+    // TODO: 나중에 패키지 위치 이동
+    @Provides
+    @Singleton
+    fun provideRecommendStudyApiService(retrofit: Retrofit): RecommendStudyApiService =
+        retrofit.create(RecommendStudyApiService::class.java)
+    // TODO: 나중에 패키지 위치 이동
+    @Provides
+    @Singleton
+    fun provideCommunityApiService(retrofit: Retrofit): CommunityAPIService =
+        retrofit.create(CommunityAPIService::class.java)
+
+
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/di/AppModule.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/di/AppModule.kt
deleted file mode 100644
index 8355c79a..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/di/AppModule.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.example.spoteam_android.di
-
-import com.example.spoteam_android.weather.Constants.Companion.BASE_URL
-import com.example.spoteam_android.weather.WeatherApi
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-object AppModule {
-
-    @Provides
-    @Singleton
-    fun provideRetrofit() : Retrofit =
-        Retrofit.Builder()
-            .baseUrl(BASE_URL)
-            .addConverterFactory(GsonConverterFactory.create())
-            .build()
-
-    @Provides
-    @Singleton
-    fun provideWeatherApi(retrofit : Retrofit) : WeatherApi =
-        retrofit.create(WeatherApi::class.java)
-
-}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/di/NetworkModule.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/di/NetworkModule.kt
new file mode 100644
index 00000000..53097af9
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/di/NetworkModule.kt
@@ -0,0 +1,68 @@
+package com.example.spoteam_android.di
+
+import android.content.Context
+import com.example.spoteam_android.BuildConfig
+import com.example.spoteam_android.data.login.datasource.local.TokenDataSource
+import com.example.spoteam_android.interceptor.AuthInterceptor
+import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import kotlinx.serialization.json.Json
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.Converter
+import retrofit2.Retrofit
+import javax.inject.Singleton
+
+
+@Module
+@InstallIn(SingletonComponent::class)
+object NetworkModule {
+    @Provides
+    @Singleton
+    fun provideJson(): Json = Json {
+        ignoreUnknownKeys = true
+    }
+    @Provides
+    @Singleton
+    fun providesLoggingInterceptor() = HttpLoggingInterceptor().apply {
+        level = HttpLoggingInterceptor.Level.BODY
+    }
+
+    @Provides
+    @Singleton
+    fun providesOkHttpClient(
+        loggingInterceptor: HttpLoggingInterceptor,
+        authInterceptor: AuthInterceptor
+    ): OkHttpClient = OkHttpClient.Builder()
+        .addInterceptor(loggingInterceptor)
+        .addInterceptor(authInterceptor)
+        .build()
+
+    @Provides
+    @Singleton
+    fun providesConverterFactory(): Converter.Factory =
+        Json.asConverterFactory("application/json".toMediaType())
+
+    @Provides
+    @Singleton
+    fun providesRetrofit(
+        client: OkHttpClient,
+        converterFactory: Converter.Factory
+    ): Retrofit = Retrofit.Builder()
+        .baseUrl(BuildConfig.BASE_URL)
+        .client(client)
+        .addConverterFactory(converterFactory)
+        .build()
+
+    @Provides
+    @Singleton
+    fun providesAuthInterceptor(
+        tokenDataSource: TokenDataSource,
+        @ApplicationContext context: Context
+    ): AuthInterceptor = AuthInterceptor(tokenDataSource, context)
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/dummy/entity/DummyRequest.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/dummy/entity/DummyRequest.kt
new file mode 100644
index 00000000..65dcee74
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/dummy/entity/DummyRequest.kt
@@ -0,0 +1,5 @@
+package com.example.spoteam_android.domain.dummy.entity
+
+data class DummyRequest(
+    val info: List<String>
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/dummy/entity/DummyResponse.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/dummy/entity/DummyResponse.kt
new file mode 100644
index 00000000..25638b86
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/dummy/entity/DummyResponse.kt
@@ -0,0 +1,5 @@
+package com.example.spoteam_android.domain.dummy.entity
+
+data class DummyResponse(
+    val id: Long
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/dummy/repository/DummyRepository.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/dummy/repository/DummyRepository.kt
new file mode 100644
index 00000000..f1b14858
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/dummy/repository/DummyRepository.kt
@@ -0,0 +1,8 @@
+package com.example.spoteam_android.domain.dummy.repository
+
+import com.example.spoteam_android.domain.dummy.entity.DummyResponse
+import com.example.spoteam_android.domain.dummy.entity.DummyRequest
+
+interface DummyRepository {
+    suspend fun getService(request: DummyResponse): Result<DummyRequest>
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/CheckSpotMemberResponse.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/CheckSpotMemberResponse.kt
new file mode 100644
index 00000000..721f4c1d
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/CheckSpotMemberResponse.kt
@@ -0,0 +1,5 @@
+package com.example.spoteam_android.domain.login.entity
+
+data class CheckSpotMemberResponse (
+    val isSpotMember: Boolean
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/KakaoLoginResponse.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/KakaoLoginResponse.kt
new file mode 100644
index 00000000..853585f1
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/KakaoLoginResponse.kt
@@ -0,0 +1,3 @@
+package com.example.spoteam_android.domain.login.entity
+
+data class KakaoLoginResponse(val accessToken: String)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/MemberInfoResponse.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/MemberInfoResponse.kt
new file mode 100644
index 00000000..249353e4
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/MemberInfoResponse.kt
@@ -0,0 +1,6 @@
+package com.example.spoteam_android.domain.login.entity
+
+data class MemberInfoResponse (
+    val memberId: Int,
+    val updatedAt: String
+)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/NaverLoginRequest.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/NaverLoginRequest.kt
new file mode 100644
index 00000000..772f716f
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/NaverLoginRequest.kt
@@ -0,0 +1,10 @@
+package com.example.spoteam_android.domain.login.entity
+
+data class NaverLoginRequest(
+    val accessToken: String,
+    val refreshToken: String,
+    val tokenType: String,
+    val expiresIn: Int,
+    val error: String? = null,
+    val errorDescription: String? = null
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/NickNameCheckResponse.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/NickNameCheckResponse.kt
new file mode 100644
index 00000000..171578db
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/NickNameCheckResponse.kt
@@ -0,0 +1,7 @@
+package com.example.spoteam_android.domain.login.entity
+
+
+data class NickNameCheckResponse(
+    val nickname: String,
+    val duplicate: Boolean
+)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/NickNameRequest.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/NickNameRequest.kt
new file mode 100644
index 00000000..8b572af2
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/NickNameRequest.kt
@@ -0,0 +1,7 @@
+package com.example.spoteam_android.domain.login.entity
+
+data class NickNameRequest(
+    val nickname: String,
+    val personalInfo: Boolean,
+    val idInfo: Boolean
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/NickNameResponse.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/NickNameResponse.kt
new file mode 100644
index 00000000..4aec2253
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/NickNameResponse.kt
@@ -0,0 +1,8 @@
+package com.example.spoteam_android.domain.login.entity
+
+data class NickNameResponse(
+    val name: String,
+    val nickname: String,
+    val email: String,
+    val personalInfo: Boolean
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/SocialLoginResponse.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/SocialLoginResponse.kt
new file mode 100644
index 00000000..8a182a71
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/SocialLoginResponse.kt
@@ -0,0 +1,10 @@
+package com.example.spoteam_android.domain.login.entity
+data class SocialLoginResponse(
+    val isSpotMember: Boolean,
+    val tokens: TokenResponse,
+    val email: String,
+    val memberId: Int,
+    val loginType: String,
+    val profileImage: String = ""
+)
+
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/TokenResponse.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/TokenResponse.kt
new file mode 100644
index 00000000..e7d8fbed
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/TokenResponse.kt
@@ -0,0 +1,7 @@
+package com.example.spoteam_android.domain.login.entity
+
+data class TokenResponse(
+    val accessToken: String,
+    val refreshToken: String,
+    val accessTokenExpiresIn: Int
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/WithdrawResponse.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/WithdrawResponse.kt
new file mode 100644
index 00000000..75f9e9f9
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/entity/WithdrawResponse.kt
@@ -0,0 +1,8 @@
+package com.example.spoteam_android.domain.login.entity
+
+data class WithdrawResponse(
+    val memberId: Int,
+    val name: String,
+    val email: String,
+    val inactive: String
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/repository/LoginRepository.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/repository/LoginRepository.kt
new file mode 100644
index 00000000..9237ca0d
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/repository/LoginRepository.kt
@@ -0,0 +1,32 @@
+package com.example.spoteam_android.domain.login.repository
+
+import com.example.spoteam_android.domain.login.entity.CheckSpotMemberResponse
+import com.example.spoteam_android.domain.login.entity.MemberInfoResponse
+import com.example.spoteam_android.domain.login.entity.NaverLoginRequest
+import com.example.spoteam_android.domain.login.entity.NickNameCheckResponse
+import com.example.spoteam_android.domain.login.entity.NickNameRequest
+import com.example.spoteam_android.domain.login.entity.NickNameResponse
+import com.example.spoteam_android.domain.login.entity.SocialLoginResponse
+import com.example.spoteam_android.domain.login.entity.WithdrawResponse
+
+interface LoginRepository {
+    suspend fun updateThemes(themes: List<String>): Result<MemberInfoResponse>
+
+    suspend fun updateRegions(regions: List<String>): Result<MemberInfoResponse>
+
+    suspend fun updateStudyReasons(reasons: List<Int>): Result<MemberInfoResponse>
+
+    suspend fun signInWithKakao(accessToken: String): Result<SocialLoginResponse>
+
+    suspend fun signInWithNaver(request: NaverLoginRequest): Result<SocialLoginResponse>
+
+    suspend fun updateNickName(request: NickNameRequest): Result<NickNameResponse>
+
+    suspend fun checkNickName(nickname: String): Result<NickNameCheckResponse>
+
+    suspend fun getNickname(): Result<String>
+
+    suspend fun checkSpotMember(): Result<CheckSpotMemberResponse>
+
+    suspend fun withdrawSpot(): Result<WithdrawResponse>
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/repository/SocialLoginRepository.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/repository/SocialLoginRepository.kt
new file mode 100644
index 00000000..16d6c083
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/login/repository/SocialLoginRepository.kt
@@ -0,0 +1,9 @@
+package com.example.spoteam_android.domain.login.repository
+
+import android.app.Activity
+import com.example.spoteam_android.domain.login.entity.SocialLoginResponse
+
+interface SocialLoginRepository {
+    suspend fun loginWithKakao(activity: Activity): Result<SocialLoginResponse>
+    suspend fun loginWithNaver(activity: Activity): Result<SocialLoginResponse>
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/BoardItem.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/BoardItem.kt
new file mode 100644
index 00000000..d7a1f200
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/BoardItem.kt
@@ -0,0 +1,19 @@
+package com.example.spoteam_android.domain.study.entity
+
+data class BoardItem (
+    val studyId: Int,
+    val title: String,
+    val goal: String,
+    val introduction: String,
+    val memberCount: Int,
+    var heartCount: Int,
+    val hitNum: Int,
+    val maxPeople: Int,
+    val studyState: String,
+    val themeTypes: List<String>,
+    val regions: List<String>,
+    val imageUrl: String,
+    var liked: Boolean,
+    val isOwned: Boolean = false,
+    val isHost : Boolean
+)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/ImageResponse.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/ImageResponse.kt
new file mode 100644
index 00000000..30dacc7d
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/ImageResponse.kt
@@ -0,0 +1,12 @@
+package com.example.spoteam_android.domain.study.entity
+
+data class ImageResponse(
+    val studyId: Int,
+    val images: List<ImagesInfo>
+) {
+    data class ImagesInfo(
+        val imageId: Int,
+        val imageUrl: String,
+        val postId: Int
+    )
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/IsAppliedResponse.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/IsAppliedResponse.kt
new file mode 100644
index 00000000..da3e49bf
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/IsAppliedResponse.kt
@@ -0,0 +1,7 @@
+package com.example.spoteam_android.domain.study.entity
+
+
+data class IsAppliedResponse(
+    val studyId: Int,
+    val applied: Boolean
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/MakeScheduleRequest.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/MakeScheduleRequest.kt
new file mode 100644
index 00000000..f1948ccf
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/MakeScheduleRequest.kt
@@ -0,0 +1,10 @@
+package com.example.spoteam_android.domain.study.entity
+
+data class MakeScheduleRequest(
+    val title: String,
+    val location: String,
+    val startedAt: String,
+    val finishedAt: String,
+    val isAllDay: Boolean,
+    val period: String
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/MakeScheduleResponse.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/MakeScheduleResponse.kt
new file mode 100644
index 00000000..02c8efe9
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/MakeScheduleResponse.kt
@@ -0,0 +1,10 @@
+package com.example.spoteam_android.domain.study.entity
+
+data class MakeScheduleResponse(
+    val title: String,
+    val location: String,
+    val startedAt: String,
+    val finishedAt: String,
+    val isAllDay: Boolean,
+    val period: String
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/RecentAnnounceResponse.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/RecentAnnounceResponse.kt
new file mode 100644
index 00000000..003bcb54
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/RecentAnnounceResponse.kt
@@ -0,0 +1,6 @@
+package com.example.spoteam_android.domain.study.entity
+
+data class RecentAnnounceResponse(
+    val title: String,
+    val content: String
+)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/ScheduleListResponse.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/ScheduleListResponse.kt
new file mode 100644
index 00000000..5fa03e69
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/ScheduleListResponse.kt
@@ -0,0 +1,17 @@
+package com.example.spoteam_android.domain.study.entity
+
+data class ScheduleListResponse(
+    val totalPages: Int,
+    val totalElements: Int,
+    val first: Boolean,
+    val last: Boolean,
+    val size: Int,
+    val schedules: List<Schedule>
+) {
+    data class Schedule(
+        val startedAt: String,
+        val finishedAt: String,
+        val title: String,
+        val location: String
+    )
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/StudyApplyResponse.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/StudyApplyResponse.kt
new file mode 100644
index 00000000..9d50bedd
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/StudyApplyResponse.kt
@@ -0,0 +1,11 @@
+package com.example.spoteam_android.domain.study.entity
+
+data class StudyApplyResponse(
+    val memberId: Int,
+    val study: StudyApplyInfo
+) {
+    data class StudyApplyInfo(
+        val studyId: Int,
+        val title: String
+    )
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/StudyDataResponse.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/StudyDataResponse.kt
new file mode 100644
index 00000000..199e7e61
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/StudyDataResponse.kt
@@ -0,0 +1,30 @@
+package com.example.spoteam_android.domain.study.entity
+
+
+data class StudyDataResponse(
+    val totalPages: Int,
+    val totalElements: Int,
+    val first: Boolean,
+    val last: Boolean,
+    val size: Int,
+    val number: Int,
+    val content: List<StudyContent>
+) {
+    data class StudyContent(
+        val studyId: Int,
+        val title: String,
+        val goal: String,
+        val introduction: String,
+        val memberCount: Int,
+        var heartCount: Int,
+        val hitNum: Int,
+        val maxPeople: Int,
+        val studyState: String,
+        val themeTypes: List<String>,
+        val regions: List<String>,
+        val imageUrl: String,
+        var liked: Boolean,
+        val createdAt: String
+    )
+}
+
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/StudyDetailResponse.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/StudyDetailResponse.kt
new file mode 100644
index 00000000..552e930f
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/StudyDetailResponse.kt
@@ -0,0 +1,22 @@
+package com.example.spoteam_android.domain.study.entity
+
+data class StudyDetailResponse(
+    val studyId: Int,
+    val studyName: String,
+    val ownerId: Int,
+    val ownerName: String,
+    val hitNum: Int,
+    val heartCount: Int,
+    val memberCount: Int,
+    val maxPeople: Int,
+    val gender: String,
+    val minAge: Int,
+    val maxAge: Int,
+    val fee: Int,
+    val isOnline: Boolean,
+    val profileImage: String,
+    val themes: List<String>,
+    val regions: List<String>,
+    val goal: String,
+    val introduction: String
+)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/StudyLikeResponse.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/StudyLikeResponse.kt
new file mode 100644
index 00000000..0828bb35
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/StudyLikeResponse.kt
@@ -0,0 +1,7 @@
+package com.example.spoteam_android.domain.study.entity
+
+data class StudyLikeResponse(
+    val studyTitle: String,
+    val createdAt: String,
+    val status: String
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/StudyMemberResponse.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/StudyMemberResponse.kt
new file mode 100644
index 00000000..74e6cd9f
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/StudyMemberResponse.kt
@@ -0,0 +1,13 @@
+package com.example.spoteam_android.domain.study.entity
+
+
+data class StudyMemberResponse(
+    val totalCount: Int,
+    val members: List<StudyMember>
+) {
+    data class StudyMember(
+        val memberId: Int,
+        val nickname: String,
+        val profileImage: String
+    )
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/StudyRegisterRequest.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/StudyRegisterRequest.kt
new file mode 100644
index 00000000..c4b7dbda
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/StudyRegisterRequest.kt
@@ -0,0 +1,18 @@
+package com.example.spoteam_android.domain.study.entity
+
+
+data class StudyRegisterRequest(
+    val themes: List<String>,
+    val title: String,
+    val goal: String,
+    val introduction: String,
+    val isOnline: Boolean,
+    val profileImage: String? = null,
+    val regions: List<String>? = null,
+    val maxPeople: Int,
+    val gender: String,
+    val minAge: Int,
+    val maxAge: Int,
+    val fee: Int,
+    val hasFee: Boolean? = null
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/StudyRegisterResponse.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/StudyRegisterResponse.kt
new file mode 100644
index 00000000..922744c4
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/StudyRegisterResponse.kt
@@ -0,0 +1,6 @@
+package com.example.spoteam_android.domain.study.entity
+
+data class StudyRegisterResponse(
+    val studyId: Int,
+    val title: String
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/UploadImageResponse.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/UploadImageResponse.kt
new file mode 100644
index 00000000..82d6a7c3
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/entity/UploadImageResponse.kt
@@ -0,0 +1,12 @@
+package com.example.spoteam_android.domain.study.entity
+
+
+data class UploadImageResponse(
+    val imageUrls: List<ImageUrlData>,
+    val imageCount: Int
+) {
+    data class ImageUrlData(
+        val imageUrl: String,
+        val uploadAt: String
+    )
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/repository/StudyRepository.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/repository/StudyRepository.kt
new file mode 100644
index 00000000..ee9ed85f
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/study/repository/StudyRepository.kt
@@ -0,0 +1,47 @@
+package com.example.spoteam_android.domain.study.repository
+
+import com.example.spoteam_android.domain.study.entity.ImageResponse
+import com.example.spoteam_android.domain.study.entity.IsAppliedResponse
+import com.example.spoteam_android.domain.study.entity.MakeScheduleRequest
+import com.example.spoteam_android.domain.study.entity.MakeScheduleResponse
+import com.example.spoteam_android.domain.study.entity.RecentAnnounceResponse
+import com.example.spoteam_android.domain.study.entity.ScheduleListResponse
+import com.example.spoteam_android.domain.study.entity.StudyApplyResponse
+import com.example.spoteam_android.domain.study.entity.StudyDataResponse
+import com.example.spoteam_android.domain.study.entity.StudyDetailResponse
+import com.example.spoteam_android.domain.study.entity.StudyLikeResponse
+import com.example.spoteam_android.domain.study.entity.StudyMemberResponse
+import com.example.spoteam_android.domain.study.entity.StudyRegisterRequest
+import com.example.spoteam_android.domain.study.entity.StudyRegisterResponse
+import com.example.spoteam_android.domain.study.entity.UploadImageResponse
+import okhttp3.MultipartBody
+
+interface StudyRepository {
+    suspend fun registerStudy(request: StudyRegisterRequest): Result<StudyRegisterResponse>
+
+    suspend fun patchStudy(studyId: Int, request: StudyRegisterRequest): Result<StudyRegisterResponse>
+
+    suspend fun getStudies(page: Int, size: Int): Result<StudyDataResponse>
+
+    suspend fun getBookmarkStudies(page: Int, size: Int): Result<StudyDataResponse>
+
+    suspend fun getStudyDetails(studyId: Int): Result<StudyDetailResponse>
+
+    suspend fun getStudyMembers(studyId: Int): Result<StudyMemberResponse>
+
+    suspend fun makeSchedules(studyId: Int, schedule: MakeScheduleRequest): Result<MakeScheduleResponse>
+
+    suspend fun getStudySchedules(studyId: Int, page: Int, size: Int): Result<ScheduleListResponse>
+
+    suspend fun getRecentAnnounce(studyId: Int): Result<RecentAnnounceResponse>
+
+    suspend fun applyStudy(studyId: Int, memberId: Int, introduction: String): Result<StudyApplyResponse>
+
+    suspend fun toggleStudyLike(studyId: Int): Result<StudyLikeResponse>
+
+    suspend fun getIsApplied(studyId: Int): Result<IsAppliedResponse>
+
+    suspend fun uploadImages(images: List<MultipartBody.Part>): Result<UploadImageResponse>
+
+    suspend fun getStudyImages(studyId: Int, offset: Int, limit: Int): Result<ImageResponse>
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/weather/entity/WeatherForecast.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/weather/entity/WeatherForecast.kt
new file mode 100644
index 00000000..73fd36dd
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/weather/entity/WeatherForecast.kt
@@ -0,0 +1,8 @@
+package com.example.spoteam_android.domain.weather.entity
+
+data class WeatherForecast(
+    val temperature: Double,
+    val precipitation: Double,
+    val snowfall: Double,
+    val windSpeed: Double
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/weather/entity/WeatherUiState.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/weather/entity/WeatherUiState.kt
new file mode 100644
index 00000000..d9741162
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/weather/entity/WeatherUiState.kt
@@ -0,0 +1,7 @@
+package com.example.spoteam_android.domain.weather.entity
+
+data class WeatherUiState(
+    val temperature: String,
+    val message: String,
+    val imageRes: Int
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/weather/repository/WeatherRepository.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/weather/repository/WeatherRepository.kt
new file mode 100644
index 00000000..f5e1ca19
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/domain/weather/repository/WeatherRepository.kt
@@ -0,0 +1,8 @@
+package com.example.spoteam_android.domain.weather.repository
+
+import com.example.spoteam_android.domain.weather.entity.WeatherUiState
+
+interface WeatherRepository {
+    suspend fun getTodayWeather(): Result<WeatherUiState>
+}
+
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/CategorySpinnerAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/CategorySpinnerAdapter.kt
deleted file mode 100644
index 3726f88a..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/CategorySpinnerAdapter.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.example.spoteam_android.login
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ArrayAdapter
-import com.example.spoteam_android.databinding.ItemSpinnerHomeRegisterBinding
-
-class CategorySpinnerAdapter(
-    context: Context,
-    private val categoryList: List<String>
-) : ArrayAdapter<String>(context, 0, categoryList) {
-
-    override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-        val binding: ItemSpinnerHomeRegisterBinding
-        val view: View
-
-        if (convertView == null) {
-            binding = ItemSpinnerHomeRegisterBinding.inflate(LayoutInflater.from(context), parent, false)
-            view = binding.root
-            view.tag = binding
-        } else {
-            binding = convertView.tag as ItemSpinnerHomeRegisterBinding
-            view = convertView
-        }
-
-        binding.itemSpinnerTv.text = categoryList[position]
-        return view
-    }
-
-    override fun getDropDownView(position: Int, convertView: View?, parent: ViewGroup): View {
-        return getView(position, convertView, parent)
-    }
-
-    override fun getCount(): Int {
-        return categoryList.size
-    }
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/CellPhoneLoginActivity.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/CellPhoneLoginActivity.kt
deleted file mode 100644
index 9c540de7..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/CellPhoneLoginActivity.kt
+++ /dev/null
@@ -1,194 +0,0 @@
-package com.example.spoteam_android.login
-
-import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
-import android.view.View
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import androidx.core.content.ContextCompat
-import com.example.spoteam_android.R
-import com.example.spoteam_android.databinding.ActivityCellPhoneLoginBinding
-
-class CellPhoneLoginActivity : AppCompatActivity() {
-
-    private lateinit var binding: ActivityCellPhoneLoginBinding
-    private val certificationCode = "1234"
-    private var isPhoneNumberValid = false // 휴대폰 번호 입력 유효성 체크용 변수
-    private var isNameSelected = false // 이름 입력 여부 체크 변수
-    private var isBirthdaySelected = false // 생년월일 선택 여부 체크 변수
-    private var selectedNationality: String? = null // 선택된 국적 값 저장 변수
-    private var selectedGender: String? = null // 선택된 성별 값 저장 변수
-    private var selectedAgency: String? = null // 선택된 통신사 값 저장 변수
-    private var isChecked1 = false // 체크박스1 체크 여부 변수
-    private var isChecked2 = false // 체크박스2 체크 여부 변수
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        binding = ActivityCellPhoneLoginBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        setSupportActionBar(binding.activityStartloginTb)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        title = ""
-        binding.activityStartloginTb.setNavigationOnClickListener {
-            onBackPressed()
-        }
-        val intent = Intent(this, RegisterInformation::class.java)
-        binding.activityStartloginLoginwithspotNextBt.setOnClickListener { startActivity(intent) }
-
-        // 인증번호 요청 버튼 클릭 리스너
-        binding.activityStartloginAuthenticationBt.setOnClickListener {
-            if (isPhoneNumberValid && isNameSelected && isBirthdaySelected &&
-                selectedNationality != null && selectedGender != null && selectedAgency != null) {
-                binding.activityStartloginCertificationnumberNumInputLl.visibility = View.VISIBLE
-            }
-        }
-
-        // 인증번호 확인 버튼 클릭 리스너
-        binding.activityStartloginUthenticationResultBt.setOnClickListener {
-            val input = binding.activityStartloginCertificationnumberNumInputEt.text.toString()
-            validateCode(input)
-            updateButtonStateForCheckboxes()
-        }
-
-        // EditText 입력 감지 - 휴대폰 번호
-        binding.activityStartloginPhonenumberNumInputEt.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-
-            override fun afterTextChanged(s: Editable?) {
-                // 입력 값이 휴대폰 번호인 경우에만 인증번호 요청 버튼의 상태를 업데이트
-                isPhoneNumberValid = s?.isNotBlank() ?: false
-                updateButtonState()
-            }
-        })
-
-        // EditText 입력 감지 - 이름
-        binding.activityStartloginIdTextInputEt.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-
-            override fun afterTextChanged(s: Editable?) {
-                // 입력 값이 있는 경우에만 이름 입력 완료로 처리
-                isNameSelected = s?.isNotBlank() ?: false
-                updateButtonState()
-            }
-        })
-
-        // EditText 입력 감지 - 생년월일
-        binding.activityBirthTextInputEt.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-
-            override fun afterTextChanged(s: Editable?) {
-                // 입력 값이 있는 경우에만 생년월일 선택 완료로 처리
-                isBirthdaySelected = s?.isNotBlank() ?: false
-                updateButtonState()
-            }
-        })
-
-        // 체크박스1 상태 감지
-        binding.activityStartloginCheckBox1.setOnCheckedChangeListener { buttonView, isChecked ->
-            isChecked1 = isChecked
-            updateButtonStateForCheckboxes()
-        }
-
-        // 체크박스2 상태 감지
-        binding.activityStartloginCheckBox2.setOnCheckedChangeListener { buttonView, isChecked ->
-            isChecked2 = isChecked
-            updateButtonStateForCheckboxes()
-        }
-
-        // 국적 Spinner 설정
-        val nationalityAdapter = ArrayAdapter(this, R.layout.item_spinner_home_register, listOf("내국인", "외국인"))
-        binding.activityStartloginNationalitySp.adapter = nationalityAdapter
-
-        binding.activityStartloginNationalitySp.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                selectedNationality = parent?.getItemAtPosition(position).toString()
-                updateButtonState()
-            }
-
-            override fun onNothingSelected(parent: AdapterView<*>?) {
-                selectedNationality = null
-                updateButtonState()
-            }
-        }
-
-        // 성별 Spinner 설정
-        val genderAdapter = ArrayAdapter(this, R.layout.item_spinner_home_register, listOf("남성", "여성"))
-        binding.activityStartloginMfSp.adapter = genderAdapter
-
-        binding.activityStartloginMfSp.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                selectedGender = parent?.getItemAtPosition(position).toString()
-                updateButtonState()
-            }
-
-            override fun onNothingSelected(parent: AdapterView<*>?) {
-                selectedGender = null
-                updateButtonState()
-            }
-        }
-
-        // 통신사 Spinner 설정
-        val agencyAdapter = ArrayAdapter(this, R.layout.item_spinner_home_register, listOf("SKT", "LG", "KT"))
-        binding.activityStartloginAgencySp.adapter = agencyAdapter
-
-        binding.activityStartloginAgencySp.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                selectedAgency = parent?.getItemAtPosition(position).toString()
-                updateButtonState()
-            }
-
-            override fun onNothingSelected(parent: AdapterView<*>?) {
-                selectedAgency = null
-                updateButtonState()
-            }
-        }
-    }
-
-    // 인증번호 유효성 검사
-    private fun validateCode(input: String) {
-        val drawable = if (input == certificationCode) {
-            ContextCompat.getDrawable(this, R.drawable.true_check)
-        } else {
-            ContextCompat.getDrawable(this, R.drawable.false_check)
-        }
-
-        // 아이콘의 크기를 EditText의 글자 크기의 1.5배로 설정
-        drawable?.let {
-            val textSizeInPx = binding.activityStartloginCertificationnumberNumInputEt.textSize.toInt()
-            val iconSize = (textSizeInPx * 1.5).toInt() // EditText 글자 크기의 1.5배
-            it.setBounds(0, 0, iconSize, iconSize)
-            binding.activityStartloginCertificationnumberNumInputEt.setCompoundDrawables(null, null, it, null)
-        }
-
-        // 인증 실패 시 오류 메시지 표시
-        if (input != certificationCode) {
-            binding.activityStartloginCheckCertificationTv.visibility = View.VISIBLE
-        } else {
-            binding.activityStartloginCheckCertificationTv.visibility = View.GONE
-        }
-    }
-
-    // 인증번호 요청 버튼 상태 업데이트
-    private fun updateButtonState() {
-        binding.activityStartloginAuthenticationBt.isEnabled = isPhoneNumberValid &&
-                isNameSelected && isBirthdaySelected && selectedNationality != null &&
-                selectedGender != null && selectedAgency != null
-    }
-
-    // 체크박스 상태에 따른 Next 버튼 상태 업데이트
-    private fun updateButtonStateForCheckboxes() {
-        binding.activityStartloginLoginwithspotNextBt.isEnabled = isChecked1 && isChecked2 &&
-                binding.activityStartloginCertificationnumberNumInputEt.text.toString() == certificationCode
-    }
-}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/EmailVerificationActivity.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/EmailVerificationActivity.kt
deleted file mode 100644
index c4a5ed3f..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/EmailVerificationActivity.kt
+++ /dev/null
@@ -1,228 +0,0 @@
-package com.example.spoteam_android.login
-
-import android.content.Intent
-import android.os.Bundle
-import android.os.CountDownTimer
-import android.text.Editable
-import android.text.TextWatcher
-import android.view.View
-import android.widget.EditText
-import android.widget.TextView
-import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat
-import com.example.spoteam_android.EmailVerifyResponse
-import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.ValidateEmailResponse
-import com.example.spoteam_android.databinding.ActivityEmailVerificationBinding
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class EmailVerificationActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityEmailVerificationBinding
-    private var countDownTimer: CountDownTimer? = null
-    private val timerDuration = 1 * 60 * 1000L // 1분 타이머
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityEmailVerificationBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        setupTextWatchers()
-        setupVerifyButtonListener()
-        setupResendButtonListener()
-        setupNextButtonListener()
-    }
-
-    private fun setupTextWatchers() {
-        val textWatcher = object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                updateNextButtonState()
-                updateVerifyButtonState()
-            }
-
-            override fun afterTextChanged(s: Editable?) {}
-        }
-
-        binding.activityNormalLoginEmailTextInputEt.addTextChangedListener(textWatcher)
-        binding.activityNormalLoginEmailNumberInputEt.addTextChangedListener(textWatcher)
-    }
-
-    private fun updateVerifyButtonState() {
-        val email = binding.activityNormalLoginEmailTextInputEt.text.toString().trim()
-
-        if (email.isNotEmpty()) {
-            binding.activityEmailVerificationLoginVerifyBt.isEnabled = true
-            binding.activityEmailVerificationLoginVerifyBt.setTextColor(ContextCompat.getColor(this, R.color.b500))
-        } else {
-            binding.activityEmailVerificationLoginVerifyBt.isEnabled = false
-            binding.activityEmailVerificationLoginVerifyBt.setTextColor(ContextCompat.getColor(this, R.color.gray))
-        }
-    }
-
-    private fun setupVerifyButtonListener() {
-        binding.activityEmailVerificationLoginVerifyBt.setOnClickListener {
-            val email = binding.activityNormalLoginEmailTextInputEt.text.toString().trim()
-            if (email.isEmpty()) {
-                Toast.makeText(this, "이메일을 입력해주세요", Toast.LENGTH_SHORT).show()
-                return@setOnClickListener
-            }
-
-            sendVerificationCode(email)
-            startTimer()
-
-            binding.activityEmailVerficationNumberTv.visibility = View.VISIBLE
-            binding.activityNormalLoginEmailNumberInputEt.visibility = View.VISIBLE
-            binding.activityNormalLoginEmailErrorTv.visibility = View.GONE
-            binding.activityEmailVerficationProblemTv.visibility = View.VISIBLE
-            binding.activityEmailVerficationRetransmitTv.visibility = View.VISIBLE
-        }
-    }
-
-    private fun setupResendButtonListener() {
-        binding.activityEmailVerficationRetransmitTv.setOnClickListener {
-            val email = binding.activityNormalLoginEmailTextInputEt.text.toString().trim()
-            if (email.isEmpty()) {
-                Toast.makeText(this, "이메일을 입력해주세요", Toast.LENGTH_SHORT).show()
-                return@setOnClickListener
-            }
-
-            sendVerificationCode(email)
-            startTimer()
-
-            binding.activityNormalLoginEmailNumberInputEt.isEnabled = true
-        }
-    }
-
-    private fun setupNextButtonListener() {
-        binding.activityEmailVerficationEmailNextBt.setOnClickListener {
-            validateEmailCode()
-        }
-    }
-
-    private fun sendVerificationCode(email: String) {
-        val api = RetrofitInstance.retrofit.create(LoginApiService::class.java)
-        val call = api.getVerifyCode(email) // **반환 타입이 EmailVerifyResponse인지 확인**
-        call.enqueue(object : Callback<EmailVerifyResponse> {
-            override fun onResponse(call: Call<EmailVerifyResponse>, response: Response<EmailVerifyResponse>) {
-                if (response.isSuccessful) {
-                    val result = response.body()
-                    if (result != null && result.isSuccess) {
-                        Toast.makeText(this@EmailVerificationActivity, "인증번호가 $email 로 전송되었습니다.", Toast.LENGTH_SHORT).show()
-                    } else {
-                        Toast.makeText(this@EmailVerificationActivity, "인증번호 전송 실패: ${result?.message}", Toast.LENGTH_SHORT).show()
-                    }
-                } else {
-                    Toast.makeText(this@EmailVerificationActivity, "서버 응답 오류: ${response.code()}", Toast.LENGTH_SHORT).show()
-                }
-            }
-
-            override fun onFailure(call: Call<EmailVerifyResponse>, t: Throwable) {
-                Toast.makeText(this@EmailVerificationActivity, "네트워크 오류 발생", Toast.LENGTH_SHORT).show()
-            }
-        })
-    }
-
-    private fun validateEmailCode() {
-        val email = binding.activityNormalLoginEmailTextInputEt.text.toString().trim()
-        val verificationCode = binding.activityNormalLoginEmailNumberInputEt.text.toString().trim()
-
-        if (email.isEmpty() || verificationCode.isEmpty()) {
-            Toast.makeText(this, "이메일과 인증번호를 입력해주세요.", Toast.LENGTH_SHORT).show()
-            return
-        }
-
-        val api = RetrofitInstance.retrofit.create(LoginApiService::class.java)
-        val call = api.validateEmailCode(verificationCode, email)
-
-        call.enqueue(object : Callback<ValidateEmailResponse> {
-            override fun onResponse(call: Call<ValidateEmailResponse>, response: Response<ValidateEmailResponse>) {
-                if (response.isSuccessful) {
-                    val result = response.body()
-                    val isSuccess = result?.isSuccess == true
-
-                    updateValidationUI(
-                        isValid = isSuccess,
-                        editText = binding.activityNormalLoginEmailNumberInputEt,
-                        errorTextView = binding.activityNormalLoginEmailErrorTv,
-                        successMessage = "인증이 완료되었습니다.",
-                        errorMessage = "인증번호가 일치하지 않습니다."
-                    )
-
-                    if (isSuccess) {
-                        binding.activityNormalLoginEmailNumberInputEt.setBackgroundResource(R.drawable.button_enabled)
-                        moveToNextScreen()
-                    } else {
-                        binding.activityNormalLoginEmailNumberInputEt.setBackgroundResource(R.drawable.error_background)
-                        binding.activityEmailVerficationEmailNextBt.isEnabled = false
-                    }
-                } else {
-                    Toast.makeText(this@EmailVerificationActivity, "서버 응답 오류: ${response.code()}", Toast.LENGTH_SHORT).show()
-                }
-            }
-
-            override fun onFailure(call: Call<ValidateEmailResponse>, t: Throwable) {
-                Toast.makeText(this@EmailVerificationActivity, "네트워크 오류 발생", Toast.LENGTH_SHORT).show()
-            }
-        })
-    }
-
-    private fun moveToNextScreen() {
-        val intent = Intent(this, NormalLoginActivity::class.java) // 다음 화면 액티비티 변경
-        startActivity(intent)
-        finish()
-    }
-
-    private fun updateNextButtonState() {
-        val email = binding.activityNormalLoginEmailTextInputEt.text.toString().trim()
-        val verificationCode = binding.activityNormalLoginEmailNumberInputEt.text.toString().trim()
-        binding.activityEmailVerficationEmailNextBt.isEnabled = email.isNotEmpty() && verificationCode.isNotEmpty()
-    }
-
-    private fun updateValidationUI(isValid: Boolean, editText: EditText, errorTextView: TextView, successMessage: String, errorMessage: String) {
-        val drawable = if (isValid) ContextCompat.getDrawable(this, R.drawable.aftercheck) else ContextCompat.getDrawable(this, R.drawable.after_alert)
-        drawable?.let {
-            val textSizeInPx = editText.textSize.toInt()
-            val iconSize = (textSizeInPx * 1.5).toInt()
-            it.setBounds(0, 0, iconSize, iconSize)
-            editText.setCompoundDrawables(null, null, it, null)
-        }
-        errorTextView.apply {
-            visibility = View.VISIBLE
-            text = if (isValid) successMessage else errorMessage
-            setTextColor(ContextCompat.getColor(context, if (isValid) R.color.selector_blue else R.color.selector_red))
-        }
-    }
-
-    private fun startTimer() {
-        countDownTimer?.cancel()
-
-        // 버튼 비활성화 및 타이머 시작
-        binding.activityNormalLoginEmailTextInputEt.background = ContextCompat.getDrawable(this, R.drawable.email_input)
-        binding.activityEmailVerificationLoginVerifyBt.isEnabled = false
-        binding.activityEmailVerificationLoginVerifyBt.background = ContextCompat.getDrawable(this, R.drawable.email_timer)
-        binding.activityEmailVerificationLoginVerifyBt.setTextColor(getColor(R.color.white))
-
-        countDownTimer = object : CountDownTimer(timerDuration, 1000) {
-            override fun onTick(millisUntilFinished: Long) {
-                val minutes = millisUntilFinished / 1000 / 60
-                val seconds = millisUntilFinished / 1000 % 60
-                binding.activityEmailVerificationLoginVerifyBt.text = String.format("%02d:%02d", minutes, seconds)
-            }
-
-            override fun onFinish() {
-                // 타이머 종료 후 버튼 복원
-                binding.activityNormalLoginEmailTextInputEt.background = ContextCompat.getDrawable(applicationContext, R.drawable.email_timer_finished_input)
-                binding.activityEmailVerificationLoginVerifyBt.text = "00:00"
-                binding.activityEmailVerificationLoginVerifyBt.isEnabled = false
-                binding.activityEmailVerificationLoginVerifyBt.background = ContextCompat.getDrawable(applicationContext, R.drawable.email_timer_finished)
-                binding.activityEmailVerificationLoginVerifyBt.setTextColor(getColor(R.color.white))
-            }
-        }
-        countDownTimer?.start()
-    }
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationApiService.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationApiService.kt
deleted file mode 100644
index 91ca0ba6..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationApiService.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.example.spoteam_android.login
-
-import StudyRequest
-import retrofit2.Call
-import retrofit2.http.Body
-import retrofit2.http.POST
-import retrofit2.http.Query
-
-interface LocationApiService {
-    @POST("your/endpoint")
-    fun sendLocationCode(@Query("regions") code: String): Call<Void> // 반환 타입은 서버의 응답에 따라 조정
-    fun sendStudyData(@Body requestBody: StudyRequest): Call<Void>
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationSearchActivity.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationSearchActivity.kt
deleted file mode 100644
index a355fd0c..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationSearchActivity.kt
+++ /dev/null
@@ -1,226 +0,0 @@
-package com.example.spoteam_android.login
-
-import LocationSearchAdapter
-import android.content.Intent
-import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
-import android.view.MotionEvent
-import android.view.View
-import androidx.appcompat.app.AppCompatActivity
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.databinding.ActivityLocationSearchBinding
-import java.io.BufferedReader
-import java.io.InputStreamReader
-
-class LocationSearchActivity : AppCompatActivity() {
-
-    private lateinit var binding: ActivityLocationSearchBinding
-    private lateinit var locationSearchAdapter: LocationSearchAdapter
-    private val locationItemList = mutableListOf<LocationItem>()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityLocationSearchBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        setSupportActionBar(binding.activityChecklistLocationSearchTb)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        title = ""
-        binding.activityChecklistLocationSearchTb.setNavigationOnClickListener {
-            onBackPressedDispatcher.onBackPressed()
-        }
-
-        setupRecyclerView()
-        setupSearchFunctionality()
-        loadLocalTsvFile()
-    }
-
-    private fun setupRecyclerView() {
-        locationSearchAdapter = LocationSearchAdapter(locationItemList) { item ->
-            val resultIntent = Intent().apply {
-                putExtra("SELECTED_ADDRESS", item.address)
-                putExtra("SELECTED_CODE", item.code)
-            }
-            setResult(RESULT_OK, resultIntent)
-            finish()
-        }
-        binding.activityLocationRv.apply {
-            layoutManager = LinearLayoutManager(this@LocationSearchActivity)
-            adapter = locationSearchAdapter
-            visibility = View.GONE
-        }
-    }
-
-    private fun setupSearchFunctionality() {
-        binding.activityLocationSearchEt.setOnTouchListener { v, event ->
-            if (event.action == MotionEvent.ACTION_UP) {
-                val drawableEnd = binding.activityLocationSearchEt.compoundDrawables[2]
-                if (drawableEnd != null && event.rawX >= (binding.activityLocationSearchEt.right - drawableEnd.bounds.width())) {
-                    performSearch()
-                    return@setOnTouchListener true
-                }
-            }
-            false
-        }
-
-        binding.activityLocationSearchEt.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-            override fun afterTextChanged(s: Editable?) {
-                performSearch()
-            }
-        })
-    }
-
-    private fun loadLocalTsvFile() {
-        val inputStream = assets.open("region_data_processed.tsv")
-        val reader = BufferedReader(InputStreamReader(inputStream))
-        val tsvData = reader.use { it.readText() }
-        parseTsvData(tsvData)
-    }
-
-    private fun parseTsvData(tsvData: String) {
-        val rows = tsvData.split("\n").drop(1)
-
-        locationItemList.clear()
-        for (row in rows) {
-            val columns = row.split("\t")
-            if (columns.size >= 5) {
-                val item = LocationItem(
-                    code = columns[0],
-                    city = columns[1],
-                    districtCity = columns[2],
-                    districtGu = columns[3],
-                    subdistrict = columns[4]
-                )
-                locationItemList.add(item)
-            }
-        }
-
-        locationSearchAdapter.notifyDataSetChanged()
-        binding.activityLocationRv.visibility = if (locationSearchAdapter.itemCount > 0) View.VISIBLE else View.GONE
-    }
-
-    private fun performSearch() {
-        val query = binding.activityLocationSearchEt.text.toString()
-        locationSearchAdapter.filter(query)
-        binding.activityLocationRv.visibility = if (locationSearchAdapter.itemCount > 0) {
-            View.VISIBLE
-        } else {
-            View.GONE
-        }
-    }
-}
-
-//package com.example.spoteam_android.login
-//
-//import LocationSearchAdapter
-//import android.content.Intent
-//import android.os.Bundle
-//import android.text.Editable
-//import android.text.TextWatcher
-//import android.view.MotionEvent
-//import android.view.View
-//import androidx.appcompat.app.AppCompatActivity
-//import androidx.recyclerview.widget.LinearLayoutManager
-//import com.example.spoteam_android.databinding.ActivityLocationSearchBinding
-//import java.io.BufferedReader
-//import java.io.InputStreamReader
-//
-//class LocationSearchActivity : AppCompatActivity() {
-//
-//    private lateinit var binding: ActivityLocationSearchBinding
-//    private lateinit var locationSearchAdapter: LocationSearchAdapter
-//    private val locationItemList = mutableListOf<LocationItem>()
-//
-//    override fun onCreate(savedInstanceState: Bundle?) {
-//        super.onCreate(savedInstanceState)
-//        binding = ActivityLocationSearchBinding.inflate(layoutInflater)
-//        setContentView(binding.root)
-//
-//        setupRecyclerView()
-//        setupSearchFunctionality()
-//        loadLocalTsvFile() // TSV 파일을 읽어 데이터 초기화
-//    }
-//
-//    private fun setupRecyclerView() {
-//        locationSearchAdapter = LocationSearchAdapter(locationItemList) { item ->
-//            // 아이템 클릭 시 CheckListLocationActivity에 결과 반환
-//            val resultIntent = Intent().apply {
-//                putExtra("SELECTED_ADDRESS", item.address)
-//                putExtra("SELECTED_CODE", item.code)
-//            }
-//            setResult(RESULT_OK, resultIntent)
-//            finish()
-//        }
-//        binding.activityLocationRv.apply {
-//            layoutManager = LinearLayoutManager(this@LocationSearchActivity)
-//            adapter = locationSearchAdapter
-//            visibility = View.GONE // 초기에는 RecyclerView를 숨김
-//        }
-//    }
-//
-//    private fun setupSearchFunctionality() {
-//        binding.activityLocationSearchEt.setOnTouchListener { v, event ->
-//            if (event.action == MotionEvent.ACTION_UP) {
-//                val drawableEnd = binding.activityLocationSearchEt.compoundDrawables[2]
-//                if (drawableEnd != null && event.rawX >= (binding.activityLocationSearchEt.right - drawableEnd.bounds.width())) {
-//                    performSearch()
-//                    return@setOnTouchListener true
-//                }
-//            }
-//            false
-//        }
-//
-//        binding.activityLocationSearchEt.addTextChangedListener(object : TextWatcher {
-//            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-//            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-//            override fun afterTextChanged(s: Editable?) {
-//                // 텍스트가 변경될 때마다 자동으로 검색 수행
-//                performSearch()
-//            }
-//        })
-//    }
-//
-//    private fun loadLocalTsvFile() {
-//        val inputStream = assets.open("region_data_processed.tsv")
-//        val reader = BufferedReader(InputStreamReader(inputStream))
-//        val tsvData = reader.use { it.readText() }
-//        parseTsvData(tsvData)
-//    }
-//
-//    private fun parseTsvData(tsvData: String) {
-//        val rows = tsvData.split("\n").drop(1) // 첫 번째 줄은 헤더이므로 제외
-//
-//        locationItemList.clear()
-//        for (row in rows) {
-//            val columns = row.split("\t")
-//            if (columns.size >= 5) {
-//                val item = LocationItem(
-//                    code = columns[0],
-//                    city = columns[1],
-//                    districtCity = columns[2],
-//                    districtGu = columns[3],
-//                    subdistrict = columns[4]
-//                )
-//                locationItemList.add(item)
-//            }
-//        }
-//
-//        locationSearchAdapter.notifyDataSetChanged()
-//
-//        // 검색 결과가 있을 때 RecyclerView를 보이게 함
-//        binding.activityLocationRv.visibility = if (locationSearchAdapter.itemCount > 0) View.VISIBLE else View.GONE
-//    }
-//
-//    private fun performSearch() {
-//        val query = binding.activityLocationSearchEt.text.toString()
-//        locationSearchAdapter.filter(query)
-//        binding.activityLocationRv.visibility = if (locationSearchAdapter.itemCount > 0) {
-//            View.VISIBLE
-//        } else {
-//            View.GONE
-//        }
-//    }
-//}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginApiService.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginApiService.kt
deleted file mode 100644
index 3c3499f0..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginApiService.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.example.spoteam_android.login
-
-import com.example.spoteam_android.EmailResponse
-import com.example.spoteam_android.EmailVerifyResponse
-import com.example.spoteam_android.IdResponse
-import com.example.spoteam_android.NaverLoginRequest
-import com.example.spoteam_android.NaverResponse
-import com.example.spoteam_android.NaverResult
-import com.example.spoteam_android.NickNameRequest
-import com.example.spoteam_android.NickNameResponse
-import com.example.spoteam_android.NicknameCheckResponse
-import com.example.spoteam_android.ReasonApiResponse
-import com.example.spoteam_android.RegionApiResponse
-import com.example.spoteam_android.RegionsPreferences
-import com.example.spoteam_android.SpotMemberCheckResponse
-import com.example.spoteam_android.StudyReasons
-import com.example.spoteam_android.ThemeApiResponse
-import com.example.spoteam_android.ThemePreferences
-import com.example.spoteam_android.ValidateEmailResponse
-import com.example.spoteam_android.WithdrawResponse
-import com.example.spoteam_android.YourResponse
-import retrofit2.Call
-import retrofit2.Response
-import retrofit2.http.Body
-import retrofit2.http.Field
-import retrofit2.http.FormUrlEncoded
-import retrofit2.http.GET
-import retrofit2.http.Header
-import retrofit2.http.Headers
-import retrofit2.http.PATCH
-import retrofit2.http.POST
-import retrofit2.http.Path
-import retrofit2.http.Query
-
-interface LoginApiService {
-    @POST("spot/members/theme")
-    fun postThemes(@Body themePreferences: ThemePreferences): Call<Void>
-
-    @POST("spot/members/region")
-    fun postRegions(@Body regionsPreferences: RegionsPreferences): Call<Void>
-
-    @POST("spot/members/study-reasons")
-    fun postPurposes(@Body purposePreferences: StudyReasons): Call<Void>
-
-    @GET("spot/members/theme")
-    fun getThemes(): Call<ThemeApiResponse>
-
-    @GET("spot/members/study-reasons")
-    fun getReasons(): Call<ReasonApiResponse>
-
-    @GET("spot/members/region")
-    fun getRegion(): Call<RegionApiResponse>
-
-
-    //카카오 로그인 api 서비스
-    @GET("/spot/members/sign-in/kakao")
-    suspend fun getUserInfo(@Query("accessToken") accessToken: String): Response<YourResponse>
-
-    //네이버 로그인 api 서비스
-    @POST("/spot/members/sign-in/naver")
-    suspend fun signInWithNaver(@Body request: NaverLoginRequest): Response<NaverResponse>
-
-    //일반 로그인 아이디 사용 가능 여부 확인
-    @GET("/spot/check/login-id")
-    fun checkID(@Query("loginId") loginId: String): Call<IdResponse>
-
-    //일반 로그인 이메일 사용 가능 여부 확인
-    @GET("/spot/check/email")
-    fun checkEmail(@Query("email") email: String): Call<EmailResponse>
-    //이메일 인증 코드 발급 api
-    @POST("/spot/send-verification-code")
-    fun getVerifyCode(@Query("email") email: String) : Call<EmailVerifyResponse>
-
-    //이메일 인증 코드를 입력해 이메일의 유효성 확인
-    @POST("/spot/verify")
-    fun validateEmailCode(
-        @Query("verificationCode") verificationCode: String, @Query("email") email: String)
-    :Call<ValidateEmailResponse>
-
-    @GET("/spot/check")
-    fun checkIsSpotMember(): Call<SpotMemberCheckResponse>
-
-    @GET("/spot/check/nickname")
-    fun checkNickname(
-        @Query("nickname") nickname: String
-    ): Call<NicknameCheckResponse>
-
-
-    @POST("/spot/sign-up/update")
-    fun updateNickName(
-        @Body request: NickNameRequest
-    ): Call<NickNameResponse>
-
-    //회원 탈퇴
-    @PATCH("spot/withdraw")
-    fun withdraw(): Call<WithdrawResponse>
-
-
-
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginRepository.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginRepository.kt
deleted file mode 100644
index 77b9c253..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginRepository.kt
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.example.spoteam_android.login
-
-import android.util.Log
-import com.example.spoteam_android.YourResponse
-import com.example.spoteam_android.KaKaoResult
-import com.example.spoteam_android.NaverLoginRequest
-import com.example.spoteam_android.NaverResult
-import com.example.spoteam_android.RetrofitInstance
-import com.kakao.sdk.friend.d.e
-import com.kakao.sdk.user.UserApiClient
-import com.navercorp.nid.oauth.NidOAuthLogin
-import com.navercorp.nid.profile.NidProfileCallback
-import com.navercorp.nid.profile.data.NidProfileResponse
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import okhttp3.internal.userAgent
-import retrofit2.create
-
-class LoginRepository(private val tokenManager: TokenManager) {
-    private val api: LoginApiService =
-        SocialLoginRetrofitInstance.retrofit.create(LoginApiService::class.java)
-
-    suspend fun sendKakaoTokenToServer(accessToken: String): Result<KaKaoResult> =
-        withContext(Dispatchers.IO) {
-            return@withContext try {
-                val response = api.getUserInfo(accessToken) // suspend 함수이므로 execute() 불필요
-
-                if (response.isSuccessful) {
-                    val userInfo = response.body()?.result
-                    if (userInfo != null) {
-                        tokenManager.saveIsSpotMember(userInfo.isSpotMember)
-                        val newAccessToken = userInfo.signInDTO.tokens.accessToken
-                        val newRefreshToken = userInfo.signInDTO.tokens.refreshToken
-                        val memberId = userInfo.signInDTO.memberId
-
-                        UserApiClient.instance.me { user, error ->
-                            if (error == null && user != null) {
-                                val nickname = user.kakaoAccount?.profile?.nickname ?: "Unknown"
-                                val profileImageUrl = user.kakaoAccount?.profile?.profileImageUrl ?: ""
-
-                                tokenManager.saveUserInfo(
-                                    platform = "kakao",
-                                    email = userInfo.signInDTO.email,
-                                    nickname = nickname,
-                                    profileImageUrl = profileImageUrl,
-                                    accessToken = newAccessToken,
-                                    refreshToken = newRefreshToken,
-                                    memberId = memberId
-                                )
-                            }
-                        }
-                        RetrofitInstance.setAuthToken(newAccessToken)
-                        Result.success(userInfo)
-                    } else {
-                        val errorBody = response.errorBody()?.string()
-                        Log.e("LoginRepository", "API 응답 실패: $errorBody")
-                        Result.failure(Exception("API 응답 실패: $errorBody"))
-                    }
-                } else {
-                    Result.failure(Exception("API 응답 실패: ${response.errorBody()?.string()}"))
-                }
-            } catch (e: Exception) {
-                Log.e("LoginRepository", "예외 발생: ${e.message}")
-                Result.failure(e)
-            }
-        }
-
-    suspend fun sendNaverTokenToServer(
-        accessToken: String,
-        refreshToken: String,
-        tokenType: String,
-        expiresIn: Long
-    ): Result<NaverResult> = withContext(Dispatchers.IO) {
-        try {
-            val request = NaverLoginRequest(accessToken, refreshToken, tokenType, expiresIn)
-            val response = api.signInWithNaver(request)
-
-            if (response.isSuccessful) {
-                val userInfo = response.body()?.result
-                if (userInfo != null) {
-                    tokenManager.saveIsSpotMember(userInfo.isSpotMember)
-                    NidOAuthLogin().callProfileApi(object : NidProfileCallback<NidProfileResponse> {
-                        override fun onSuccess(response: NidProfileResponse) {
-                            val profile = response.profile
-                            if (profile != null) {
-                                val nickname = profile.nickname ?: "Unknown"
-                                val profileImageUrl = profile.profileImage ?: ""
-
-                                // ✅ 사용자 정보 저장
-                                tokenManager.saveUserInfo(
-                                    platform = "naver",
-                                    email = userInfo.signInDTO.email,
-                                    nickname = nickname,
-                                    profileImageUrl = profileImageUrl,
-                                    accessToken = userInfo.signInDTO.tokens.accessToken,
-                                    refreshToken = userInfo.signInDTO.tokens.refreshToken,
-                                    memberId = userInfo.signInDTO.memberId
-                                )
-                                RetrofitInstance.setAuthToken(userInfo.signInDTO.tokens.accessToken)
-                            } else {
-                                Log.e("Naver", "네이버 프로필 정보를 가져올 수 없습니다.")
-                            }
-                        }
-
-                        override fun onError(errorCode: Int, message: String) {
-                            Log.e("Naver", "네이버 프로필 API 오류: $message")
-                        }
-
-                        override fun onFailure(httpStatus: Int, message: String) {
-                            Log.e("Naver", "네이버 프로필 요청 실패: $message")
-                        }
-                    })
-
-                    return@withContext Result.success(userInfo)
-                } else {
-                    return@withContext Result.failure(Exception("네이버 로그인 응답 실패"))
-                }
-            } else {
-                return@withContext Result.failure(Exception("네이버 로그인 API 오류: ${response.errorBody()?.string()}"))
-            }
-        } catch (e: Exception) {
-            Log.e("NaverAPI", "API 호출 중 예외 발생", e)
-            return@withContext Result.failure(e)
-        }
-    }
-
-
-
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginViewModel.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginViewModel.kt
deleted file mode 100644
index 8a9bb7d3..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginViewModel.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.example.spoteam_android.login
-
-import android.app.Activity
-import android.util.Log
-import android.widget.Toast
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.example.spoteam_android.KaKaoResult
-import com.example.spoteam_android.NaverResult
-import com.example.spoteam_android.RetrofitInstance
-import com.kakao.sdk.auth.model.OAuthToken
-import com.kakao.sdk.common.model.AuthErrorCause
-import com.kakao.sdk.user.UserApiClient
-import com.navercorp.nid.NaverIdLoginSDK
-import com.navercorp.nid.oauth.OAuthLoginCallback
-import kotlinx.coroutines.launch
-
-class LoginViewModel(private val loginRepository: LoginRepository): ViewModel() {
-
-    private val _loginResult = MutableLiveData<Result<KaKaoResult>>()
-    val loginResult: LiveData<Result<KaKaoResult>> get() = _loginResult
-
-    private val _naverLoginResult = MutableLiveData<Result<NaverResult>>()
-    val naverLoginResult: LiveData<Result<NaverResult>> get() = _naverLoginResult
-
-
-
-    fun startKakaoLogin(activity: Activity) {
-        val callback: (OAuthToken?, Throwable?) -> Unit = { token, error ->
-            if (error != null) {
-                _loginResult.postValue(Result.failure(Exception(error.message ?: "카카오 로그인 실패")))
-            } else if (token != null) {
-                viewModelScope.launch {
-                    val result = loginRepository.sendKakaoTokenToServer(token.accessToken)
-                    _loginResult.postValue(result)
-                }
-            }
-        }
-
-        if (UserApiClient.instance.isKakaoTalkLoginAvailable(activity)) {
-            UserApiClient.instance.loginWithKakaoTalk(activity, callback = callback)
-        } else {
-            UserApiClient.instance.loginWithKakaoAccount(activity, callback = callback)
-        }
-    }
-
-    fun startNaverLogin(activity: Activity) {
-        val naverCallback = object : OAuthLoginCallback {
-            override fun onSuccess() {
-                val accessToken = NaverIdLoginSDK.getAccessToken()
-                val refreshToken = NaverIdLoginSDK.getRefreshToken()
-                val expiresAt = NaverIdLoginSDK.getExpiresAt()
-                val tokenType = NaverIdLoginSDK.getTokenType() !!
-
-                if (!accessToken.isNullOrEmpty() && !refreshToken.isNullOrEmpty()) {
-                    viewModelScope.launch {
-                        val result = loginRepository.sendNaverTokenToServer(
-                            accessToken = accessToken,
-                            refreshToken = refreshToken,
-                            tokenType = tokenType,
-                            expiresIn = expiresAt
-                        )
-                        _naverLoginResult.postValue(result) // UI에서 로그인 결과 감지
-                    }
-                } else {
-                    _naverLoginResult.postValue(Result.failure(Exception("네이버 토큰이 유효하지 않습니다.")))
-                }
-            }
-
-            override fun onFailure(httpStatus: Int, message: String) {
-                _naverLoginResult.postValue(Result.failure(Exception("네이버 로그인 실패: $message")))
-            }
-
-            override fun onError(errorCode: Int, message: String) {
-                _naverLoginResult.postValue(Result.failure(Exception("네이버 로그인 오류: $message")))
-            }
-        }
-
-        NaverIdLoginSDK.authenticate(activity, naverCallback)
-    }
-
-}
-
-
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginViewModelFactory.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginViewModelFactory.kt
deleted file mode 100644
index 882f1bbd..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginViewModelFactory.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.example.spoteam_android.login
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-
-class LoginViewModelFactory(
-    private val loginRepository: LoginRepository,
-) : ViewModelProvider.Factory {
-
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        if (modelClass.isAssignableFrom(LoginViewModel::class.java)) {
-            @Suppress("UNCHECKED_CAST")
-            return LoginViewModel(loginRepository) as T
-        }
-        throw IllegalArgumentException("Unknown ViewModel class")
-    }
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LogoutActivity.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LogoutActivity.kt
deleted file mode 100644
index 83f828d2..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LogoutActivity.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.example.spoteam_android.login
-
-import android.content.Intent
-import android.os.Bundle
-import android.util.Log
-import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
-import com.example.spoteam_android.MainActivity
-import com.example.spoteam_android.databinding.ActivityLogoutBinding
-import com.kakao.sdk.user.UserApiClient
-
-class LogoutActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityLogoutBinding
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityLogoutBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        // 로그아웃 버튼 클릭 리스너 설정
-        binding.activityLogoutBt.setOnClickListener {
-            UserApiClient.instance.logout { error ->
-                if (error != null) {
-                    Toast.makeText(this, "로그아웃 실패: $error", Toast.LENGTH_SHORT).show()
-                    Log.d("error","$error")
-
-                } else {
-                    Toast.makeText(this, "로그아웃 성공", Toast.LENGTH_SHORT).show()
-
-                    // 로그아웃 성공 시, SharedPreferences의 isLoggedIn 값을 false로 변경
-                    val sharedPreferences = getSharedPreferences("MyPrefs", MODE_PRIVATE)
-                    with(sharedPreferences.edit()) {
-                        putBoolean("isLoggedIn", false)
-                        apply()
-                    }
-
-                    // 로그인 창으로 이동
-                    val intent = Intent(this, StartLoginActivity::class.java)
-                    startActivity(intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP))
-                    finish()
-                }
-            }
-        }
-
-        // 회원탈퇴 버튼 클릭 리스너 설정
-        binding.activityUserlogoutBt.setOnClickListener {
-            UserApiClient.instance.unlink { error ->
-                if (error != null) {
-                    Toast.makeText(this, "회원탈퇴 실패: $error", Toast.LENGTH_SHORT).show()
-                } else {
-                    Toast.makeText(this, "회원탈퇴 성공", Toast.LENGTH_SHORT).show()
-
-                    // 회원탈퇴 성공 시, SharedPreferences의 isLoggedIn 값을 false로 변경
-                    val sharedPreferences = getSharedPreferences("MyPrefs", MODE_PRIVATE)
-                    with(sharedPreferences.edit()) {
-                        putBoolean("isLoggedIn", false)
-                        apply()
-                    }
-
-                    // MainActivity로 이동
-                    val intent = Intent(this, StartLoginActivity::class.java)
-                    startActivity(intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP))
-                    finish()
-                }
-            }
-        }
-    }
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/NicNameActivity.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/NicNameActivity.kt
deleted file mode 100644
index c109bcf6..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/NicNameActivity.kt
+++ /dev/null
@@ -1,287 +0,0 @@
-package com.example.spoteam_android.login
-
-import android.app.Dialog
-import android.content.Intent
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import android.graphics.drawable.InsetDrawable
-import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.Window
-import android.widget.EditText
-import android.widget.TextView
-import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat
-import com.example.spoteam_android.NickNameRequest
-import com.example.spoteam_android.NickNameResponse
-import com.example.spoteam_android.NicknameCheckResponse
-import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.databinding.ActivityNicNameBinding
-import com.example.spoteam_android.databinding.DialogAgreementBinding
-import com.example.spoteam_android.databinding.DialogIdentificationAgreementBinding
-import okhttp3.logging.HttpLoggingInterceptor
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class NicNameActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityNicNameBinding
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityNicNameBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        binding.activityNicknameLoginTb.setOnClickListener {
-            startActivity(Intent(this, StartLoginActivity::class.java))
-        }
-        binding.activityNickNameNicknameEt.addTextChangedListener(object : TextWatcher {
-            override fun afterTextChanged(s: Editable?) {
-                val nickname = s.toString().trim()
-                checkNicknameDuplicate(nickname)
-            }
-
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-        })
-
-
-        binding.activityStartloginCheckBox1.isClickable = false
-        binding.activityStartloginCheckBox1.isFocusable = false
-        binding.activityStartloginCheckBox2.isClickable = false
-        binding.activityStartloginCheckBox2.isFocusable = false
-
-        binding.activityStartloginCheckBox1Ll.setOnClickListener {
-            showAgreementDialog()
-        }
-        binding.activityStartloginCheckBox2Ll.setOnClickListener {
-            showIdentifyAgreementDialog()
-        }
-
-        binding.activityStartloginLoginwithspotNextBt.setOnClickListener {
-            val nickname = binding.activityNickNameNicknameEt.text.toString().trim()
-            val personalInfo = binding.activityStartloginCheckBox1.isChecked
-            val idInfo = binding.activityStartloginCheckBox2.isChecked
-
-            if (nickname.isEmpty()) {
-                Toast.makeText(this, "닉네임을 입력해주세요", Toast.LENGTH_SHORT).show()
-                return@setOnClickListener
-            }
-
-            sendNicknameToServer(nickname, personalInfo, idInfo)
-        }
-
-
-    }
-
-
-    private fun showAgreementDialog() {
-        val dialog = Dialog(this)
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
-        dialog.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        val dialogBinding = DialogAgreementBinding.inflate(LayoutInflater.from(this))
-        dialog.setContentView(dialogBinding.root)
-        dialog.window?.setLayout(
-            (325 * resources.displayMetrics.density).toInt(),
-            (400 * resources.displayMetrics.density).toInt()
-        )
-
-
-        dialogBinding.dialogAgreementAcceptBtn.setOnClickListener {
-            binding.activityStartloginCheckBox1.isChecked = true
-            binding.activityStartloginCheckBox1Ll.setBackgroundResource(R.drawable.agreement_background)
-            val nickname = binding.activityNickNameNicknameEt.text.toString().trim()
-            checkNicknameDuplicate(nickname)
-            dialog.dismiss()
-        }
-        dialogBinding.dialogCloseBtn.setOnClickListener {
-            dialog.dismiss()
-        }
-        dialog.show()
-    }
-
-    private fun showIdentifyAgreementDialog() {
-        val dialog = Dialog(this)
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
-        dialog.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        val dialogBinding = DialogIdentificationAgreementBinding.inflate(LayoutInflater.from(this))
-        dialog.setContentView(dialogBinding.root)
-        dialog.window?.setLayout(
-            (325 * resources.displayMetrics.density).toInt(),
-            (400 * resources.displayMetrics.density).toInt()
-        )
-
-
-        dialogBinding.dialogAgreementAcceptBtn.setOnClickListener {
-            binding.activityStartloginCheckBox2.isChecked = true
-            binding.activityStartloginCheckBox2Ll.setBackgroundResource(R.drawable.agreement_background)
-            val nickname = binding.activityNickNameNicknameEt.text.toString().trim()
-            checkNicknameDuplicate(nickname)
-            dialog.dismiss()
-        }
-        dialogBinding.dialogCloseBtn.setOnClickListener {
-            dialog.dismiss()
-        }
-        dialog.show()
-    }
-
-    private fun sendNicknameToServer(nickname: String, personalInfo: Boolean, idInfo: Boolean) {
-        val nicknameRequest = NickNameRequest(
-            nickname = nickname,
-            personalInfo = personalInfo,
-            idInfo = idInfo
-        )
-        val token = TokenManager(this).getAccessToken()
-        Log.d("토큰 체크", "token=$token")
-        if (token.isNullOrEmpty()) {
-            Toast.makeText(this, "로그인이 만료되었습니다. 다시 로그인해주세요.", Toast.LENGTH_SHORT).show()
-            return
-        }
-
-        val logging = HttpLoggingInterceptor()
-        logging.level = HttpLoggingInterceptor.Level.BODY
-        RetrofitInstance.setAuthToken(token)
-        val api = RetrofitInstance.retrofit.create(LoginApiService::class.java)
-        api.updateNickName(nicknameRequest)
-            .enqueue(object : Callback<NickNameResponse> {
-                override fun onResponse(call: Call<NickNameResponse>, response: Response<NickNameResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == true) {
-                        val intent = Intent(this@NicNameActivity, RegisterInformation::class.java)
-                        intent.putExtra("mode", "START")
-                        startActivity(intent)
-                        finish()
-                    } else {
-                        val errorMsg = response.errorBody()?.string()
-                        Log.e("서버 응답", "code=${response.code()}, error=$errorMsg")
-
-                        if (errorMsg?.contains("만료된 JWT token") == true) {
-                            val tokenManager = TokenManager(this@NicNameActivity)
-                            tokenManager.clearTokens()
-                            Toast.makeText(this@NicNameActivity, "로그인이 만료되었습니다. 다시 로그인해주세요.", Toast.LENGTH_SHORT).show()
-                            val intent = Intent(this@NicNameActivity, StartLoginActivity::class.java)
-                            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-                            startActivity(intent)
-                            finish()
-                        } else {
-                            Toast.makeText(this@NicNameActivity, "서버 오류: ${response.code()}", Toast.LENGTH_SHORT).show()
-                        }
-                    }
-                }
-
-                override fun onFailure(call: Call<NickNameResponse>, t: Throwable) {
-                    Toast.makeText(this@NicNameActivity, "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
-                    Log.e("닉네임 API 실패", t.toString())
-                }
-            })
-    }
-    private fun checkNicknameDuplicate(nickname: String) {
-        if (nickname.isBlank()) {
-            binding.activityNickNameValidMessageTv.apply {
-                text = getString(R.string.nick_name) // 원래 문구 복원
-                setTextColor(ContextCompat.getColor(this@NicNameActivity, R.color.g400))
-                visibility = View.VISIBLE
-            }
-            binding.activityNickNameNicknameEt.setCompoundDrawables(null, null, null, null)
-            binding.activityNickNameNicknameEt.background =
-                ContextCompat.getDrawable(this, R.drawable.normal_login_edittext_corner_rectangle)
-            binding.activityStartloginLoginwithspotNextBt.isEnabled = false
-            return
-        }
-        if (!isNicknameValidFormat(nickname)) {
-            updateValidationUI(
-                isValid = false,
-                editText = binding.activityNickNameNicknameEt,
-                errorTextView = binding.activityNickNameValidMessageTv,
-                successMessage = "",
-                errorMessage = "사용 가능한 닉네임입니다."
-            )
-            return
-        }
-
-        RetrofitInstance.retrofit.create(LoginApiService::class.java)
-            .checkNickname(nickname)
-            .enqueue(object : Callback<NicknameCheckResponse> {
-                override fun onResponse(
-                    call: Call<NicknameCheckResponse>,
-                    response: Response<NicknameCheckResponse>
-                ) {
-                    val isDuplicate = response.body()?.result?.duplicate ?: false
-
-                    if (isDuplicate) {
-                        updateValidationUI(
-                            isValid = false,
-                            editText = binding.activityNickNameNicknameEt,
-                            errorTextView = binding.activityNickNameValidMessageTv,
-                            successMessage = "",
-                            errorMessage = "사용 불가능한 닉네임입니다."
-                        )
-                    } else {
-                        updateValidationUI(
-                            isValid = true,
-                            editText = binding.activityNickNameNicknameEt,
-                            errorTextView = binding.activityNickNameValidMessageTv,
-                            successMessage = "사용 가능한 닉네임입니다.",
-                            errorMessage = ""
-                        )
-                    }
-
-                }
-
-                override fun onFailure(call: Call<NicknameCheckResponse>, t: Throwable) {
-                    Log.e("닉네임 중복 확인 실패", t.toString())
-                }
-            })
-    }
-    private fun updateValidationUI(
-        isValid: Boolean,
-        editText: EditText,
-        errorTextView: TextView,
-        successMessage: String,
-        errorMessage: String
-    ) {
-        val icon = if (isValid) R.drawable.aftercheck else R.drawable.after_alert
-        val background = if (isValid) R.drawable.normal_login_edittext_corner_rectangle else R.drawable.error_edittext_background
-
-
-        // 아이콘 설정
-        ContextCompat.getDrawable(this, icon)?.let { drawable ->
-            val iconDrawable = ContextCompat.getDrawable(this, icon)
-            val insetDrawable = InsetDrawable(iconDrawable, 0, 0, 30, 0)
-            val iconSize = (binding.activityNickNameNicknameEt.textSize * 2).toInt()
-            insetDrawable.setBounds(0, 0, iconSize, iconSize)
-            binding.activityNickNameNicknameEt.setCompoundDrawables(null, null, insetDrawable, null)
-
-        }
-
-        // 텍스트 메시지 설정
-        errorTextView.apply {
-            visibility = View.VISIBLE
-            text = if (isValid) successMessage else errorMessage
-            setTextColor(ContextCompat.getColor(context, if (isValid) R.color.b500 else R.color.r500))
-        }
-
-        // EditText 배경 변경
-        editText.background = ContextCompat.getDrawable(this, background)
-
-        // 다음 버튼 활성화 여부 갱신
-        val allAgreed = binding.activityStartloginCheckBox1.isChecked && binding.activityStartloginCheckBox2.isChecked
-        binding.activityStartloginLoginwithspotNextBt.isEnabled = isValid && allAgreed
-    }
-
-    private val nicknameRegex = Regex("^[가-힣a-zA-Z0-9_/]{1,8}$")
-    private fun isNicknameValidFormat(nickname: String): Boolean {
-        return nicknameRegex.matches(nickname)
-    }
-
-
-
-
-
-
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/NormalLoginActivity.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/NormalLoginActivity.kt
deleted file mode 100644
index 7b9dcb4f..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/NormalLoginActivity.kt
+++ /dev/null
@@ -1,237 +0,0 @@
-package com.example.spoteam_android.login
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
-import android.util.Log
-import android.view.View
-import android.widget.EditText
-import android.widget.TextView
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat
-import com.example.spoteam_android.R
-import com.example.spoteam_android.UserInfo
-import com.example.spoteam_android.databinding.ActivityNormalLoginBinding
-import com.google.gson.Gson
-
-class NormalLoginActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityNormalLoginBinding
-    private val inputStates = mutableMapOf(
-        "name" to false,
-        "birth" to false,
-        "birthSuffix" to false,
-        "password" to false
-    )
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityNormalLoginBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        // 🔥 데이터 초기화
-        clearSharedPreferences()
-        clearInputFields()
-        setupTextWatchers()
-        setupFocusListeners()
-
-        binding.activityStartloginLoginwithspotNextBt.setOnClickListener {
-            saveAllInputsToSharedPrefs()
-            logUserInfo()
-            startActivity(Intent(this, NicNameActivity::class.java))
-        }
-    }
-
-    private fun setupTextWatchers() {
-        binding.activityNormalLoginNameInputEt.addTextChangedListener(createTextWatcher("name", binding.activityNormalLoginNameInputEt))
-        binding.activityNormalLoginBirthTextInputEt.addTextChangedListener(createTextWatcher("birth", binding.activityNormalLoginBirthTextInputEt))
-        binding.activityNormalLoginBirthBehindTextInputEt.addTextChangedListener(createTextWatcher("birthSuffix", binding.activityNormalLoginBirthBehindTextInputEt))
-
-        // 이름 & 생년월일 입력 후 비밀번호 필드 표시
-        binding.activityNormalLoginNameInputEt.addTextChangedListener(showPasswordFieldsWatcher)
-        binding.activityNormalLoginBirthTextInputEt.addTextChangedListener(showPasswordFieldsWatcher)
-        binding.activityNormalLoginBirthBehindTextInputEt.addTextChangedListener(showPasswordFieldsWatcher)
-
-        // ✅ 비밀번호는 먼저 입력하고, 비밀번호 확인 필드가 실시간 감지되도록 함
-        binding.activityNormalLoginPasswordInputEt.addTextChangedListener(passwordWatcher)
-        binding.activityNormalLoginPasswordCheckInputEt.addTextChangedListener(passwordConfirmWatcher)
-    }
-    // ✅ 비밀번호 입력 감지 (비밀번호 확인 X)
-    private val passwordWatcher = object : TextWatcher {
-        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-
-        override fun afterTextChanged(s: Editable?) {
-            // 🔥 비밀번호 입력 후에도 버튼 활성화는 안 함 (비밀번호 확인을 기다림)
-            updateButtonState()
-        }
-    }
-
-    // ✅ 비밀번호 확인 필드 실시간 감지 (비밀번호와 비교)
-    private val passwordConfirmWatcher = object : TextWatcher {
-        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-            updateButtonState() // ✅ 비밀번호 확인이 변경될 때만 버튼 활성화 검토
-        }
-
-        override fun afterTextChanged(s: Editable?) {}
-    }
-
-    private fun setupFocusListeners() {
-        binding.activityNormalLoginPasswordCheckInputEt.setOnFocusChangeListener { _, hasFocus ->
-            if (hasFocus) validatePassword()
-        }
-    }
-
-    private val showPasswordFieldsWatcher = object : TextWatcher {
-        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-            val name = binding.activityNormalLoginNameInputEt.text.toString().trim()
-            val birth = binding.activityNormalLoginBirthTextInputEt.text.toString().trim()
-            val birthSuffix = binding.activityNormalLoginBirthBehindTextInputEt.text.toString().trim()
-
-            if (name.isNotEmpty() && birth.length == 6 && birthSuffix.isNotEmpty()) {
-                showPasswordFields()
-            } else {
-                hidePasswordFields()
-            }
-        }
-
-        override fun afterTextChanged(s: Editable?) {}
-    }
-
-    private fun showPasswordFields() {
-        binding.activityNormalLoginPasswordTv.visibility = View.VISIBLE
-        binding.activityNormalLoginPasswordInputEt.visibility = View.VISIBLE
-        binding.activityNormalLoginPasswordErrorTv.visibility = View.VISIBLE
-        binding.activityNormalLoginPasswordCheckTv.visibility = View.VISIBLE
-        binding.activityNormalLoginPasswordCheckInputEt.visibility = View.VISIBLE
-    }
-
-    private fun hidePasswordFields() {
-        binding.activityNormalLoginPasswordTv.visibility = View.GONE
-        binding.activityNormalLoginPasswordInputEt.visibility = View.GONE
-        binding.activityNormalLoginPasswordErrorTv.visibility = View.GONE
-        binding.activityNormalLoginPasswordCheckTv.visibility = View.GONE
-        binding.activityNormalLoginPasswordCheckInputEt.visibility = View.GONE
-    }
-
-    private fun createTextWatcher(key: String, editText: EditText) = object : TextWatcher {
-        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-        override fun afterTextChanged(s: Editable?) {
-            val input = s?.toString().orEmpty()
-            inputStates[key] = input.isNotBlank()
-            updateBackground(editText, inputStates[key] ?: false)
-            updateButtonState()
-        }
-    }
-
-    private fun updateBackground(editText: EditText, isSelected: Boolean) {
-        val background = if (isSelected) R.drawable.edittext_with_text_background else R.drawable.edittext_rounded_corner_rectangle
-        editText.setBackgroundResource(background)
-    }
-
-    private fun updateButtonState() {
-        val isNameValid = inputStates["name"] == true
-        val isBirthValid = inputStates["birth"] == true
-        val isBirthSuffixValid = inputStates["birthSuffix"] == true
-        val isPasswordValid = binding.activityNormalLoginPasswordInputEt.text.toString().length >= 10
-        val isPasswordMatch = binding.activityNormalLoginPasswordInputEt.text.toString() ==
-                binding.activityNormalLoginPasswordCheckInputEt.text.toString()
-
-        // 🔥 비밀번호 확인 필드가 입력 중일 때만 버튼 활성화 검토
-        binding.activityStartloginLoginwithspotNextBt.isEnabled =
-            isNameValid && isBirthValid && isBirthSuffixValid && isPasswordValid && isPasswordMatch
-    }
-
-    private fun validatePassword() {
-        val password = binding.activityNormalLoginPasswordInputEt.text.toString().trim()
-        val confirmPassword = binding.activityNormalLoginPasswordCheckInputEt.text.toString().trim()
-
-        val passwordPattern = "^(?=.*[A-Za-z])(?=.*\\d)[A-Za-z\\d]{10,}$".toRegex()
-        val isPasswordValid = passwordPattern.matches(password)
-        val isMatch = password == confirmPassword
-
-        inputStates["password"] = isPasswordValid && isMatch
-
-        updateValidationUI(
-            isValid = isPasswordValid,
-            editText = binding.activityNormalLoginPasswordInputEt,
-            errorTextView = binding.activityNormalLoginPasswordErrorTv,
-            successMessage = "사용 가능한 비밀번호입니다.",
-            errorMessage = "비밀번호는 영문+숫자+특수문자 포함 10자 이상 입력해야 합니다."
-        )
-
-        updateButtonState()
-    }
-
-    private fun updateValidationUI(
-        isValid: Boolean,
-        editText: EditText,
-        errorTextView: TextView,
-        successMessage: String,
-        errorMessage: String
-    ) {
-        val drawable = if (isValid) ContextCompat.getDrawable(this, R.drawable.aftercheck)
-        else ContextCompat.getDrawable(this, R.drawable.after_alert)
-
-        drawable?.let {
-            val textSizeInPx = editText.textSize.toInt()
-            val iconSize = (textSizeInPx * 1.5).toInt()
-            it.setBounds(0, 0, iconSize, iconSize)
-            editText.setCompoundDrawables(null, null, it, null)
-        }
-
-        editText.setBackgroundResource(if (isValid) R.drawable.edittext_with_text_background else R.drawable.error_background)
-
-        errorTextView.apply {
-            visibility = View.VISIBLE
-            text = if (isValid) successMessage else errorMessage
-            setTextColor(ContextCompat.getColor(context, if (isValid) R.color.selector_blue else R.color.selector_red))
-        }
-    }
-
-    private fun clearSharedPreferences() {
-        val sharedPref = getSharedPreferences("UserPrefs", Context.MODE_PRIVATE)
-        sharedPref.edit().clear().apply()
-    }
-
-    private fun clearInputFields() {
-        binding.activityNormalLoginNameInputEt.text.clear()
-        binding.activityNormalLoginBirthTextInputEt.text.clear()
-        binding.activityNormalLoginBirthBehindTextInputEt.text.clear()
-        binding.activityNormalLoginPasswordInputEt.text.clear()
-        binding.activityNormalLoginPasswordCheckInputEt.text.clear()
-    }
-
-    private fun saveAllInputsToSharedPrefs() {
-        val userInfo = UserInfo(
-            name = "Temp",
-            nickname = "",
-            frontRID = "",
-            backRID = "",
-            email = "",
-            loginId = "",
-            password = "",
-            pwCheck = "",
-            personalInfo = false, // Boolean 값
-            idInfo = false        // Boolean 값
-        )
-
-        val sharedPref = getSharedPreferences("UserPrefs", Context.MODE_PRIVATE)
-        val editor = sharedPref.edit()
-        val userInfoJson = Gson().toJson(userInfo)
-
-        editor.putString("USER_INFO", userInfoJson) // JSON 형태로 저장
-        editor.apply()
-    }
-
-    private fun logUserInfo() {
-        Log.d("NormalLoginActivity", "Saved User Info: ${getSharedPreferences("UserPrefs", Context.MODE_PRIVATE).getString("USER_INFO", "No Data")}")
-    }
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/RegisterInformation.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/RegisterInformation.kt
deleted file mode 100644
index c25038c8..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/RegisterInformation.kt
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.example.spoteam_android.login
-
-import android.content.Intent
-import android.os.Bundle
-import android.util.Log
-import androidx.activity.ComponentActivity
-import androidx.core.content.ContextCompat.startActivity
-import androidx.lifecycle.lifecycleScope
-import com.example.spoteam_android.MainActivity
-import com.example.spoteam_android.RegionsPreferences
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.StudyReasons
-import com.example.spoteam_android.ThemePreferences
-import com.example.spoteam_android.checklist.CheckListCategoryActivity
-import com.example.spoteam_android.databinding.ActivityRegisterInformationBinding
-import com.google.gson.Gson
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class RegisterInformation : ComponentActivity() {
-    private lateinit var binding: ActivityRegisterInformationBinding
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityRegisterInformationBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        val mode = intent.getStringExtra("mode") ?: "START"
-
-        if (mode == "FINAL") {
-            val selectedThemes = intent.getStringArrayListExtra("selectedThemes") ?: listOf()
-            val selectedPurpose = intent.getIntegerArrayListExtra("selectedPurpose") ?: listOf()
-            val selectedLocations = intent.getStringArrayListExtra("selectedLocations") ?: listOf()
-
-            binding.registerMsgTv.text = "체크리스트 등록 중.."
-
-            val sharedPreferences = getSharedPreferences("MyPrefs", MODE_PRIVATE)
-            val email = sharedPreferences.getString("currentEmail", null)
-            val memberId = sharedPreferences.getInt("${email}_memberId", -1)
-
-            if (email == null || memberId == -1) {
-                Log.e("RegisterInformation", "SharedPreferences에 사용자 정보 없음")
-                return
-            }
-
-            postPreferencesToServer(
-                memberId = memberId,
-                themes = selectedThemes,
-                purposes = selectedPurpose,
-                regions = selectedLocations
-            )
-        }
-
-        setupProgressBar(mode)
-    }
-
-
-    private fun navigateToCheckList() {
-        val intent = Intent(this, CheckListCategoryActivity::class.java)
-        startActivity(intent)
-        finish()
-    }
-
-    private fun setupProgressBar(mode: String) {
-        lifecycleScope.launch {
-            val totalSteps = 5
-            for (i in 1..totalSteps) {
-                delay(500)
-                updateProgressBar(i * 20)
-            }
-
-            if (mode == "FINAL") {
-                binding.registerMsgTv.text = "내 정보 등록 완료!"
-                delay(500)
-                navigateToMainScreen()
-            } else if (mode == "START") {
-                navigateToCheckList()
-            }
-        }
-    }
-
-
-
-    private fun updateProgressBar(progress: Int) {
-        binding.activityRegisterProgressbar.progress = progress
-    }
-
-    private fun navigateToMainScreen() {
-        startActivity(Intent(this, MainActivity::class.java))
-        finish()
-    }
-
-    private fun postPreferencesToServer(
-        memberId: Int,
-        themes: List<String>,
-        purposes: List<Int>,
-        regions: List<String>
-    ) {
-        val service = RetrofitInstance.retrofit.create(LoginApiService::class.java)
-
-        val themePreferences = ThemePreferences(themes)
-        val purposePreferences = StudyReasons(purposes)
-        val regionsPreferences = RegionsPreferences(regions)
-
-        val gson = Gson()
-        Log.d("RegisterInformation", "Theme: ${gson.toJson(themePreferences)}")
-        Log.d("RegisterInformation", "Purpose: ${gson.toJson(purposePreferences)}")
-        Log.d("RegisterInformation", "Regions: ${gson.toJson(regionsPreferences)}")
-
-        service.postThemes(themePreferences).enqueue(object : Callback<Void> {
-            override fun onResponse(call: Call<Void>, response: Response<Void>) {
-                Log.d("RegisterInformation", "Themes POST success")
-            }
-
-            override fun onFailure(call: Call<Void>, t: Throwable) {
-                Log.e("RegisterInformation", "Themes POST failed", t)
-            }
-        })
-
-        service.postPurposes(purposePreferences).enqueue(object : Callback<Void> {
-            override fun onResponse(call: Call<Void>, response: Response<Void>) {
-                Log.d("RegisterInformation", "Purposes POST success")
-            }
-
-            override fun onFailure(call: Call<Void>, t: Throwable) {
-                Log.e("RegisterInformation", "Purposes POST failed", t)
-            }
-        })
-
-        service.postRegions(regionsPreferences).enqueue(object : Callback<Void> {
-            override fun onResponse(call: Call<Void>, response: Response<Void>) {
-                Log.d("RegisterInformation", "Regions POST success")
-            }
-
-            override fun onFailure(call: Call<Void>, t: Throwable) {
-                Log.e("RegisterInformation", "Regions POST failed", t)
-            }
-        })
-    }
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/SocialLoginRetrofitInstance.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/SocialLoginRetrofitInstance.kt
deleted file mode 100644
index be16ffbe..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/SocialLoginRetrofitInstance.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.example.spoteam_android.login
-
-import com.example.spoteam_android.RetrofitInstance
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-
-//Retrofit설정 인스턴스
-object SocialLoginRetrofitInstance {
-
-    private const val BASE_URL = "https://www.teamspot.site/"
-    private var authToken: String?= null
-
-    fun setToken(token: String){
-        authToken = token
-
-    }
-
-    private val okHttpClient: OkHttpClient by lazy {
-        OkHttpClient.Builder()
-            .addInterceptor { chain ->
-                val requestBuilder: Request.Builder = chain.request().newBuilder()
-                // authToken이 설정되어 있으면 Authorization 헤더를 추가합니다.
-                authToken?.let {
-                    requestBuilder.addHeader("Authorization", "Bearer $it")
-                }
-                chain.proceed(requestBuilder.build())
-            }
-            .build()
-    }
-
-    val retrofit: Retrofit by lazy{
-        Retrofit.Builder()
-            .baseUrl(BASE_URL)
-            .client(okHttpClient)
-            .addConverterFactory(GsonConverterFactory.create())
-            .build()
-    }
-
-}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/StartLoginActivity.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/StartLoginActivity.kt
deleted file mode 100644
index 55e8d48f..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/StartLoginActivity.kt
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.example.spoteam_android.login
-
-import android.content.Intent
-import android.os.Bundle
-import android.util.Log
-import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import com.example.spoteam_android.MainActivity
-import com.example.spoteam_android.databinding.ActivityStartLoginBinding
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-
-
-class StartLoginActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityStartLoginBinding
-    private lateinit var loginViewModel: LoginViewModel
-    private lateinit var tokenManager: TokenManager
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        installSplashScreen()
-        super.onCreate(savedInstanceState)
-
-        binding = ActivityStartLoginBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        tokenManager = TokenManager(this)
-        val token = tokenManager.getAccessToken()
-        val isMember = tokenManager.getIsSpotMember()
-
-        if (!token.isNullOrEmpty()) {
-            if (isMember) {
-                startActivity(Intent(this, MainActivity::class.java))
-            } else {
-                startActivity(Intent(this, NicNameActivity::class.java))
-            }
-            finish()
-            return
-        }
-        val loginRepository = LoginRepository(tokenManager)
-        val viewModelFactory = LoginViewModelFactory(loginRepository)
-        loginViewModel = ViewModelProvider(this, viewModelFactory)[LoginViewModel::class.java]
-
-        setupObservers()
-
-        binding.itemLogoKakaoIb.setOnClickListener {
-            loginViewModel.startKakaoLogin(this)
-            }
-        binding.itemLogoNaverIb.setOnClickListener { loginViewModel.startNaverLogin(this) }
-
-        //테스트
-        binding.activityStartLoginLogoIv.setOnClickListener {
-            val intent = Intent(this, NicNameActivity::class.java)
-            startActivity(intent)
-        }
-    }
-
-    private fun waitForTokenAndNavigate() {
-        lifecycleScope.launch {
-            var token: String?
-            repeat(10) { //토큰 체크 후 화면 이동이 필요함.
-                token = tokenManager.getAccessToken()
-                if (!token.isNullOrEmpty()) {
-                    navigateToNextScreen()
-                    return@launch
-                }
-                Log.w("Login", "토큰 대기 (${it + 1}/10)")
-                delay(500) // 0.5초씩 기다림
-            }
-            Log.e("Login", "토큰 발급지연")
-            navigateToNextScreen() // 그래도 이동
-        }
-    }
-
-
-    private fun setupObservers() {
-        loginViewModel.loginResult.observe(this) { result ->
-            result.onSuccess { kakaoResult ->
-                if (kakaoResult.isSpotMember) {
-                    waitForTokenAndNavigate()
-                } else {
-                    goToNicknameActivity()
-                }
-            }.onFailure {
-                showErrorToast("카카오 로그인 실패: ${it.message}")
-            }
-        }
-
-        loginViewModel.naverLoginResult.observe(this) { result ->
-            result.onSuccess { naverResult ->
-                if (naverResult.isSpotMember) {
-                    waitForTokenAndNavigate()
-                } else {
-                    goToNicknameActivity()
-                }
-            }.onFailure {
-                showErrorToast("네이버 로그인 실패: ${it.message}")
-            }
-        }
-    }
-
-    private fun goToNicknameActivity() {
-        val intent = Intent(this, NicNameActivity::class.java)
-        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-        startActivity(intent)
-        finish()
-    }
-
-
-
-
-    private fun navigateToNextScreen() {
-        val intent = Intent(this, MainActivity::class.java)
-        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-        startActivity(intent)
-        finish()
-    }
-
-
-    private fun showErrorToast(message: String) {
-        Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
-    }
-
-
-
-
-}
-
-
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/TokenManager.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/TokenManager.kt
deleted file mode 100644
index 343b5afb..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/TokenManager.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.example.spoteam_android.login
-
-import android.content.Context
-import android.content.SharedPreferences
-
-class TokenManager(context: Context) {
-    private val sharedPreferences: SharedPreferences =
-        context.getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-
-    fun saveUserInfo(
-        platform: String,
-        email: String,
-        nickname: String,
-        profileImageUrl: String,
-        accessToken: String,
-        refreshToken: String,
-        memberId: Int
-    ) {
-        with(sharedPreferences.edit()) {
-            putBoolean("${email}_isLoggedIn", true)
-            putString("${email}_accessToken", accessToken)
-            putString("${email}_refreshToken", refreshToken)
-            putInt("${email}_memberId", memberId)
-            putString("${email}_nickname", nickname)
-            putString("${email}_${platform}ProfileImageUrl", profileImageUrl)
-            putString("currentEmail", email)
-            putString("loginPlatform", platform)
-            apply()
-        }
-    }
-
-    fun getCurrentEmail(): String? =
-        sharedPreferences.getString("currentEmail", null)
-
-    fun getAccessToken(): String? {
-        val email = getCurrentEmail()
-        return email?.let { sharedPreferences.getString("${it}_accessToken", null) }
-    }
-
-    fun getRefreshToken(): String? {
-        val email = getCurrentEmail()
-        return email?.let { sharedPreferences.getString("${it}_refreshToken", null) }
-    }
-
-    fun saveTokens(accessToken: String, refreshToken: String) {
-        val email = getCurrentEmail()
-        email?.let {
-            with(sharedPreferences.edit()) {
-                putString("${it}_accessToken", accessToken)
-                putString("${it}_refreshToken", refreshToken)
-                apply()
-            }
-        }
-    }
-
-    fun saveIsSpotMember(isMember: Boolean) {
-        sharedPreferences.edit().putBoolean("is_spot_member", isMember).apply()
-    }
-
-    fun getIsSpotMember(): Boolean {
-        return sharedPreferences.getBoolean("is_spot_member", false)
-    }
-
-    fun clearTokens() {
-        sharedPreferences.edit().clear().apply()
-    }
-
-    fun isUserLoggedIn(): Boolean {
-        val accessToken = getAccessToken()
-        val refreshToken = getRefreshToken()
-        return !accessToken.isNullOrEmpty() || !refreshToken.isNullOrEmpty()
-    }
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/TokenUtil.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/TokenUtil.kt
deleted file mode 100644
index 62f4b094..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/TokenUtil.kt
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.example.spoteam_android.login
-
-import android.content.Context
-import android.content.Intent
-import android.util.Log
-import com.example.spoteam_android.AuthApiService
-import com.example.spoteam_android.RetrofitInstance
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-
-object TokenUtil {
-
-    fun getStoredTokens(context: Context): Pair<String?, String?> {
-        val prefs = context.getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val email = prefs.getString("currentEmail", null)
-        val accessToken = email?.let { prefs.getString("${it}_accessToken", null) }
-        val refreshToken = email?.let { prefs.getString("${it}_refreshToken", null) }
-        return Pair(accessToken, refreshToken)
-    }
-
-    fun isExpired(token: String?): Boolean {
-        return token.isNullOrEmpty() // 추후 JWT 파싱 후 만료 검사 추가 가능
-    }
-
-    fun refreshTokenSync(context: Context, refreshToken: String): String? {
-        val retrofit = Retrofit.Builder()
-            .baseUrl("https://www.teamspot.site/")
-            .addConverterFactory(GsonConverterFactory.create())
-            .build()
-
-        val api = retrofit.create(AuthApiService::class.java)
-        val call = api.refreshToken(refreshToken)
-        val response = call.execute()
-
-        return if (response.isSuccessful) {
-            val result = response.body()?.result
-            if (result != null) {
-                saveTokensToPreferences(context, result.accessToken, result.refreshToken)
-                RetrofitInstance.setAuthToken(result.accessToken)
-                result.accessToken
-            } else null
-        } else {
-            Log.e("TokenUtils", "Token refresh failed. Redirecting to login.")
-            goToLoginScreen(context)
-            null
-        }
-    }
-
-    fun saveTokensToPreferences(context: Context, accessToken: String, refreshToken: String) {
-        val prefs = context.getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val email = prefs.getString("currentEmail", null)
-        email?.let {
-            with(prefs.edit()) {
-                putString("${it}_accessToken", accessToken)
-                putString("${it}_refreshToken", refreshToken)
-                apply()
-            }
-        }
-    }
-
-    fun goToLoginScreen(context: Context) {
-        val prefs = context.getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        prefs.edit().clear().apply()
-
-        val intent = Intent(context, StartLoginActivity::class.java).apply {
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-        }
-        context.startActivity(intent)
-    }
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/AlertFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/alert/AlertFragment.kt
similarity index 83%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/AlertFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/alert/AlertFragment.kt
index 9257f74c..deefb9aa 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/AlertFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/alert/AlertFragment.kt
@@ -1,6 +1,5 @@
-package com.example.spoteam_android.ui.alert
+package com.example.spoteam_android.presentation.alert
 
-import StudyViewModel
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
@@ -10,24 +9,26 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.HouseFragment
+import com.example.spoteam_android.presentation.home.HomeFragment
 import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentAlertBinding
-import com.example.spoteam_android.ui.community.AlertDetail
-import com.example.spoteam_android.ui.community.AlertResponse
-import com.example.spoteam_android.ui.community.AlertStudyResponse
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.community.NotificationStateResponse
-import com.example.spoteam_android.ui.study.DetailStudyFragment
+import com.example.spoteam_android.presentation.community.AlertDetail
+import com.example.spoteam_android.presentation.community.AlertResponse
+import com.example.spoteam_android.presentation.community.AlertStudyResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.NotificationStateResponse
+import com.example.spoteam_android.presentation.study.StudyViewModel
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
+import javax.inject.Inject
 
 class AlertFragment : Fragment() {
 
     private val studyViewModel: StudyViewModel by activityViewModels()
+    @Inject
+    lateinit var communityAPIService: CommunityAPIService
 
 
     private lateinit var binding: FragmentAlertBinding
@@ -50,7 +51,9 @@ class AlertFragment : Fragment() {
         studyViewModel.studyId.observe(viewLifecycleOwner) { id ->
             if (id != null && id > 0 && isChanged) {
                 parentFragmentManager.beginTransaction()
-                    .replace(R.id.main_frm, DetailStudyFragment())
+                    .replace(R.id.main_frm,
+                        com.example.spoteam_android.presentation.study.DetailStudyFragment()
+                    )
                     .addToBackStack(null)
                     .commitAllowingStateLoss()
             }
@@ -68,8 +71,7 @@ class AlertFragment : Fragment() {
     }
 
     private fun fetchAlert() {
-        val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
-        service.getAlert(page, size)
+        communityAPIService.getAlert(page, size)
             .enqueue(object : Callback<AlertResponse> {
                 override fun onResponse(
                     call: Call<AlertResponse>,
@@ -77,7 +79,7 @@ class AlertFragment : Fragment() {
                 ) {
                     if (response.isSuccessful) {
                         val alertResponse = response.body()
-                        if (alertResponse?.isSuccess == "true") {
+                        if (alertResponse?.isSuccess == true) {
                             val alertInfo = alertResponse.result.notifications
                             binding.emptyAlert.visibility = View.GONE
                             initMultiViewRecyclerView(alertInfo)
@@ -98,14 +100,13 @@ class AlertFragment : Fragment() {
     }
 
     private fun fetchStudyAlert(adapter: AlertMultiViewRVAdapter) {
-        val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
-        service.getStudyAlert(page, size)
+        communityAPIService.getStudyAlert(page, size)
             .enqueue(object : Callback<AlertStudyResponse> {
                 override fun onResponse(
                     call: Call<AlertStudyResponse>,
                     response: Response<AlertStudyResponse>
                 ) {
-                    val enabled = response.body()?.isSuccess == "true"
+                    val enabled = response.body()?.isSuccess == true
                     adapter.isExistAlert = enabled
                     adapter.notifyItemChanged(0) // 헤더만 갱신
                 }
@@ -151,7 +152,9 @@ class AlertFragment : Fragment() {
 
         adapter.onNavigateToDetail = {
             parentFragmentManager.beginTransaction()
-                .replace(R.id.main_frm, DetailStudyFragment())
+                .replace(R.id.main_frm,
+                    com.example.spoteam_android.presentation.study.DetailStudyFragment()
+                )
                 .addToBackStack(null)
                 .commitAllowingStateLoss()
         }
@@ -169,8 +172,7 @@ class AlertFragment : Fragment() {
 
         val scrollInfo = Pair(firstVisibleItemPosition, offset)
 
-        val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
-        service.postNotificationState(data.notificationId)
+        communityAPIService.postNotificationState(data.notificationId)
             .enqueue(object : Callback<NotificationStateResponse> {
                 override fun onResponse(
                     call: Call<NotificationStateResponse>,
@@ -178,7 +180,7 @@ class AlertFragment : Fragment() {
                 ) {
                     if (response.isSuccessful) {
                         val studyAlertResponse = response.body()
-                        if (studyAlertResponse?.isSuccess == "true") {
+                        if (studyAlertResponse?.isSuccess == true) {
 //                            Log.d("CurrentScrollPosition", "pos: $firstVisibleItemPosition, offset: $offset")
                             fetchAlertWithoutScroll(scrollInfo) // ✅ 스크롤 복원 포함
                         }
@@ -196,8 +198,7 @@ class AlertFragment : Fragment() {
     private fun fetchAlertWithoutScroll(scrollInfo: Pair<Int, Int>) {
         val (scrollPosition, offset) = scrollInfo
 
-        val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
-        service.getAlert(page, size)
+        communityAPIService.getAlert(page, size)
             .enqueue(object : Callback<AlertResponse> {
                 override fun onResponse(
                     call: Call<AlertResponse>,
@@ -205,7 +206,7 @@ class AlertFragment : Fragment() {
                 ) {
                     if (response.isSuccessful) {
                         val alertResponse = response.body()
-                        if (alertResponse?.isSuccess == "true") {
+                        if (alertResponse?.isSuccess == true) {
                             val alertInfo = alertResponse.result.notifications
                             initMultiViewRecyclerView(alertInfo)
 
@@ -230,8 +231,8 @@ class AlertFragment : Fragment() {
 
     override fun onPause() {
         super.onPause()
-        (context as MainActivity).isOnAlertFragment(HouseFragment())
-        (context as MainActivity).isOnCommunityHome(HouseFragment())
+        (context as MainActivity).isOnAlertFragment(HomeFragment())
+        (context as MainActivity).isOnCommunityHome(HomeFragment())
     }
 
     override fun onResume() {
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/AlertMultiViewRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/alert/AlertMultiViewRVAdapter.kt
similarity index 92%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/AlertMultiViewRVAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/alert/AlertMultiViewRVAdapter.kt
index b3c254cf..795e5a74 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/AlertMultiViewRVAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/alert/AlertMultiViewRVAdapter.kt
@@ -1,25 +1,15 @@
-package com.example.spoteam_android.ui.alert
+package com.example.spoteam_android.presentation.alert
 
-import StudyViewModel
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
-import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
-import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
-import com.example.spoteam_android.AlertInfo
 import com.example.spoteam_android.R
-import com.example.spoteam_android.databinding.ItemAlertEnrollStudyBinding
 import com.example.spoteam_android.databinding.ItemAlertLiveBinding
 import com.example.spoteam_android.databinding.ItemAlertUpdateBinding
-import com.example.spoteam_android.ui.community.AlertDetail
-import com.example.spoteam_android.ui.study.DetailStudyFragment
-import com.google.android.material.card.MaterialCardView
-
+import com.example.spoteam_android.presentation.community.AlertDetail
 class AlertMultiViewRVAdapter(
     private val dataList: List<AlertDetail>
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/CheckAppliedStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/alert/CheckAppliedStudyFragment.kt
similarity index 83%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/CheckAppliedStudyFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/alert/CheckAppliedStudyFragment.kt
index 8e343716..612859c7 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/CheckAppliedStudyFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/alert/CheckAppliedStudyFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.alert
+package com.example.spoteam_android.presentation.alert
 
 import android.os.Bundle
 import android.util.Log
@@ -9,20 +9,23 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentCheckAppliedStudyBinding
-import com.example.spoteam_android.ui.category.CategoryFragment_1
-import com.example.spoteam_android.ui.community.AcceptedAlertStudyResponse
-import com.example.spoteam_android.ui.community.AlertStudyDetail
-import com.example.spoteam_android.ui.community.AlertStudyResponse
-import com.example.spoteam_android.ui.community.CommunityAPIService
+import com.example.spoteam_android.presentation.category.CategoryFragment_1
+import com.example.spoteam_android.presentation.community.AcceptedAlertStudyResponse
+import com.example.spoteam_android.presentation.community.AlertStudyDetail
+import com.example.spoteam_android.presentation.community.AlertStudyResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
+import javax.inject.Inject
 
-class CheckAppliedStudyFragment : Fragment(), AttendStudyCompleteListener, AttendStudyRejectListener{
+class CheckAppliedStudyFragment : Fragment(), AttendStudyCompleteListener,
+    AttendStudyRejectListener {
 
     lateinit var binding: FragmentCheckAppliedStudyBinding
+    @Inject
+    lateinit var communityAPIService: CommunityAPIService
     private var page : Int = 0
     private var size : Int = 10
 
@@ -55,8 +58,7 @@ class CheckAppliedStudyFragment : Fragment(), AttendStudyCompleteListener, Atten
     }
 
     private fun fetchStudyAlert() {
-        val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
-        service.getStudyAlert(page, size)
+        communityAPIService.getStudyAlert(page, size)
             .enqueue(object : Callback<AlertStudyResponse> {
                 override fun onResponse(
                     call: Call<AlertStudyResponse>,
@@ -64,7 +66,7 @@ class CheckAppliedStudyFragment : Fragment(), AttendStudyCompleteListener, Atten
                 ) {
                     if (response.isSuccessful) {
                         val studyAlertResponse = response.body()
-                        if (studyAlertResponse?.isSuccess == "true") {
+                        if (studyAlertResponse?.isSuccess == true) {
                             val studyAlertInfo = studyAlertResponse.result.notifications
                             binding.emptyAttendStudy.visibility = View.GONE
                             binding.communityCategoryContentRv.visibility = View.VISIBLE
@@ -97,7 +99,8 @@ class CheckAppliedStudyFragment : Fragment(), AttendStudyCompleteListener, Atten
 
         binding.communityCategoryContentRv.adapter = dataRVAdapter
 
-        dataRVAdapter.setItemClickListener(object :CheckAppliedStudyFragmentRVAdapter.OnItemClickListener{
+        dataRVAdapter.setItemClickListener(object :
+            CheckAppliedStudyFragmentRVAdapter.OnItemClickListener {
             override fun onOKClick(data : AlertStudyDetail) {
                 postStudyAccept(data.studyId)
 //                val dlgOK = OkDialog(requireContext(), this@CheckAppliedStudyFragment)
@@ -117,8 +120,7 @@ class CheckAppliedStudyFragment : Fragment(), AttendStudyCompleteListener, Atten
     }
 
     private fun postStudyAccept(studyId : Int) {
-        val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
-        service.postAcceptedStudyAlert(studyId, true)
+       communityAPIService.postAcceptedStudyAlert(studyId, true)
             .enqueue(object : Callback<AcceptedAlertStudyResponse> {
                 override fun onResponse(
                     call: Call<AcceptedAlertStudyResponse>,
@@ -126,7 +128,7 @@ class CheckAppliedStudyFragment : Fragment(), AttendStudyCompleteListener, Atten
                 ) {
                     if (response.isSuccessful) {
                         val studyAlertResponse = response.body()
-                        if (studyAlertResponse?.isSuccess == "true") {
+                        if (studyAlertResponse?.isSuccess == true) {
                             val dlgOK = OkDialog(requireContext(), this@CheckAppliedStudyFragment)
                             dlgOK.setStudyId(studyId)
                             dlgOK.start()
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/CheckAppliedStudyFragmentRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/alert/CheckAppliedStudyFragmentRVAdapter.kt
similarity index 92%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/CheckAppliedStudyFragmentRVAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/alert/CheckAppliedStudyFragmentRVAdapter.kt
index 8472a78d..34e0670c 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/CheckAppliedStudyFragmentRVAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/alert/CheckAppliedStudyFragmentRVAdapter.kt
@@ -1,13 +1,12 @@
-package com.example.spoteam_android.ui.alert
+package com.example.spoteam_android.presentation.alert
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.example.spoteam_android.R
-import com.example.spoteam_android.StudyInfo
 import com.example.spoteam_android.databinding.ItemAppliedStudyBinding
-import com.example.spoteam_android.ui.community.AlertStudyDetail
+import com.example.spoteam_android.presentation.community.AlertStudyDetail
 
 class CheckAppliedStudyFragmentRVAdapter(private val dataList: List<AlertStudyDetail>) : RecyclerView.Adapter<CheckAppliedStudyFragmentRVAdapter.ViewHolder>() {
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/OkDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/alert/OkDialog.kt
similarity index 92%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/OkDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/alert/OkDialog.kt
index b263ea1d..11b317ec 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/OkDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/alert/OkDialog.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.alert
+package com.example.spoteam_android.presentation.alert
 
 import android.content.Context
 import android.graphics.Color
@@ -8,7 +8,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
-import com.example.spoteam_android.ui.study.StudyFragment
+import com.example.spoteam_android.presentation.study.StudyFragment
 
 interface AttendStudyCompleteListener {
     fun onAttendComplete()
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/RefuseDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/alert/RefuseDialog.kt
similarity index 86%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/RefuseDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/alert/RefuseDialog.kt
index 0f6cee0a..268182d1 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/RefuseDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/alert/RefuseDialog.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.alert
+package com.example.spoteam_android.presentation.alert
 
 import android.content.Context
 import android.graphics.Color
@@ -10,18 +10,20 @@ import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
 import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.ui.community.AcceptedAlertStudyResponse
-import com.example.spoteam_android.ui.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.AcceptedAlertStudyResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
+import javax.inject.Inject
 
 interface AttendStudyRejectListener {
     fun onAttendRejected()
 }
 
 class RefuseDialog(private val context: Context, private val listener : AttendStudyRejectListener) {
+    @Inject
+    lateinit var communityAPIService: CommunityAPIService
 
     private val dlg = android.app.Dialog(context)
     private var studyId : Int = -1
@@ -60,8 +62,7 @@ class RefuseDialog(private val context: Context, private val listener : AttendSt
     }
 
     private fun postStudyDeny(studyId : Int) {
-        val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
-        service.postAcceptedStudyAlert(studyId, false)
+       communityAPIService.postAcceptedStudyAlert(studyId, false)
             .enqueue(object : Callback<AcceptedAlertStudyResponse> {
                 override fun onResponse(
                     call: Call<AcceptedAlertStudyResponse>,
@@ -71,7 +72,7 @@ class RefuseDialog(private val context: Context, private val listener : AttendSt
                     if (response.isSuccessful) {
                         val studyAlertResponse = response.body()
 //                        Log.d("MyStudyAttendance", "responseBody: ${studyAlertResponse?.isSuccess}")
-                        if (studyAlertResponse?.isSuccess == "true") {
+                        if (studyAlertResponse?.isSuccess == true) {
                             listener.onAttendRejected()
                             dlg.dismiss()
                         }
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/bookMark/BookMarkRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/bookMark/BookMarkRVAdapter.kt
similarity index 67%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/bookMark/BookMarkRVAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/bookMark/BookMarkRVAdapter.kt
index 443747d9..8be3a91f 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/bookMark/BookMarkRVAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/bookMark/BookMarkRVAdapter.kt
@@ -1,20 +1,18 @@
-package com.example.spoteam_android.ui.bookMark
+package com.example.spoteam_android.presentation.bookMark
 
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
-import com.example.spoteam_android.BookmarkItem
 import com.example.spoteam_android.R
-import com.example.spoteam_android.StudyItem
 import com.example.spoteam_android.databinding.ItemRecyclerViewBinding
+import com.example.spoteam_android.domain.study.entity.StudyDataResponse
 
 class BookMarkRVAdapter(
-    private var bookmarkitemList: ArrayList<BookmarkItem>,
-    private val onItemClick: (BookmarkItem) -> Unit,
-    private val onLikeClick: (BookmarkItem, ImageView) -> Unit
+    private var bookmarkitemList: ArrayList<StudyDataResponse.StudyContent>,
+    private val onItemClick: (StudyDataResponse.StudyContent) -> Unit,
+    private val onLikeClick: (StudyDataResponse.StudyContent, ImageView) -> Unit
 ) : RecyclerView.Adapter<BookMarkRVAdapter.BookmarkViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BookmarkViewHolder {
@@ -43,7 +41,7 @@ class BookMarkRVAdapter(
     inner class BookmarkViewHolder(val binding: ItemRecyclerViewBinding) : RecyclerView.ViewHolder(binding.root) {
         val likeButton: ImageView = binding.heartCountIv
 
-        fun bind(item: BookmarkItem) {
+        fun bind(item: StudyDataResponse.StudyContent) {
             binding.tvTime.text = item.title
             binding.tvTitle.text = item.goal
             binding.tvName.text = item.maxPeople.toString()
@@ -51,25 +49,21 @@ class BookMarkRVAdapter(
             binding.tvName3.text = item.heartCount.toString()
             binding.tvName4.text = item.hitNum.toString()
 
-            // Glide를 사용하여 imageUrl을 ImageView에 로드
             Glide.with(binding.root.context)
                 .load(item.imageUrl)
-                .error(R.drawable.fragment_calendar_spot_logo) // URL이 잘못되었거나 404일 경우 기본 이미지 사용
-                .fallback(R.drawable.fragment_calendar_spot_logo) // URL이 null일 경우 기본 이미지 사용
+                .error(R.drawable.fragment_calendar_spot_logo)
+                .fallback(R.drawable.fragment_calendar_spot_logo)
                 .into(binding.ImageView4)
 
-            // 하트 아이콘 상태 설정
             val heartIcon = if (item.liked) R.drawable.ic_heart_filled else R.drawable.study_like
             binding.heartCountIv.setImageResource(heartIcon)
         }
     }
 
-    fun updateList(newList: List<BookmarkItem>) {
-        //Log.d("BookMarkRVAdapter", "updateList called with ${newList.size} items")
+    fun updateList(newList: List<StudyDataResponse.StudyContent>) {
 
-        bookmarkitemList = ArrayList() // 새 ArrayList로 초기화
+        bookmarkitemList = ArrayList()
         bookmarkitemList.addAll(newList)
-        //Log.d("BookMarkRVAdapter", "itemList size after addAll: ${bookmarkitemList.size}")
 
         notifyDataSetChanged()
     }
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/bookMark/BookmarkFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/bookMark/BookmarkFragment.kt
new file mode 100644
index 00000000..9d0001be
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/bookMark/BookmarkFragment.kt
@@ -0,0 +1,182 @@
+package com.example.spoteam_android.presentation.bookMark
+
+import com.example.spoteam_android.R
+import com.example.spoteam_android.databinding.FragmentBookmarkBinding
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Observer
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.spoteam_android.domain.study.entity.StudyDataResponse.StudyContent
+import com.example.spoteam_android.presentation.study.DetailStudyFragment
+import com.example.spoteam_android.presentation.study.StudyViewModel
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class BookmarkFragment : Fragment() {
+
+    private lateinit var binding: FragmentBookmarkBinding
+    private lateinit var bookMarkRVAdapter: BookMarkRVAdapter
+    private var bookitemList = ArrayList<StudyContent>()
+    private val studyViewModel: StudyViewModel by activityViewModels()
+    private var startPage = 0
+    private var currentPage = 0
+    private val size = 5
+    private var totalPages = 0
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentBookmarkBinding.inflate(inflater, container, false)
+
+        binding.prevIv.setOnClickListener {
+            parentFragmentManager.popBackStack()
+        }
+
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        bookMarkRVAdapter = BookMarkRVAdapter(bookitemList, onItemClick = { selectedItem ->
+            studyViewModel.setStudyData(
+                selectedItem.studyId,
+                selectedItem.imageUrl,
+                selectedItem.introduction
+            )
+            val detailStudyFragment = DetailStudyFragment()
+            parentFragmentManager.beginTransaction()
+                .replace(R.id.main_frm, detailStudyFragment)
+                .addToBackStack(null)
+                .commit()
+        }, onLikeClick = { selectedItem, likeButton ->
+            toggleLikeStatus(selectedItem, likeButton)
+        })
+
+        binding.fragmentBookmarkRv.apply {
+            adapter = bookMarkRVAdapter
+            layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
+        }
+
+        val pageButtons = listOf(
+            binding.page1,
+            binding.page2,
+            binding.page3,
+            binding.page4,
+            binding.page5
+        )
+
+        pageButtons.forEachIndexed { index, textView ->
+            textView.setOnClickListener {
+                val selectedPage = startPage + index
+                if (currentPage != selectedPage) {
+                    currentPage = selectedPage
+                    studyViewModel.getBookmarkList(currentPage, size)
+                }
+            }
+        }
+
+        setupPageNavigationButtons()
+        observeBookmarkList()
+        studyViewModel.getBookmarkList(currentPage, size)
+    }
+
+    private fun setupPageNavigationButtons() {
+        binding.previousPage.setOnClickListener {
+            if (currentPage > 0) {
+                currentPage--
+                studyViewModel.getBookmarkList(currentPage, size)
+            }
+        }
+
+        binding.nextPage.setOnClickListener {
+            if (currentPage < totalPages - 1) {
+                currentPage++
+                studyViewModel.getBookmarkList(currentPage, size)
+            }
+        }
+    }
+
+    private fun observeBookmarkList() {
+        studyViewModel.bookmarkListLiveData.observe(viewLifecycleOwner, Observer { content ->
+            if (!content.isNullOrEmpty()) {
+                bookitemList.clear()
+                bookitemList.addAll(content)
+                bookMarkRVAdapter.updateList(bookitemList)
+                binding.bookmarkEmpty.visibility = View.GONE
+                binding.fragmentBookmarkRv.visibility = View.VISIBLE
+            } else {
+                binding.bookmarkEmpty.visibility = View.VISIBLE
+                binding.fragmentBookmarkRv.visibility = View.GONE
+            }
+            updatePageUI()
+        })
+
+        studyViewModel.totalPages.observe(viewLifecycleOwner, Observer { pages ->
+            totalPages = pages
+            updatePageUI()
+        })
+    }
+
+    private fun toggleLikeStatus(studyItem: StudyContent, likeButton: ImageView) {
+        studyViewModel.toggleLikeStatus(studyItem.studyId) { result ->
+            requireActivity().runOnUiThread {
+                result.onSuccess { liked ->
+                    studyItem.liked = liked
+                    val newIcon = if (liked) R.drawable.ic_heart_filled else R.drawable.study_like
+                    likeButton.setImageResource(newIcon)
+                    studyItem.heartCount += if (liked) 1 else -1
+                    bookMarkRVAdapter.notifyItemChanged(bookitemList.indexOf(studyItem))
+                }.onFailure {
+                    Toast.makeText(requireContext(), "찜 실패: ${it.message}", Toast.LENGTH_SHORT).show()
+                }
+            }
+        }
+    }
+
+    private fun updatePageUI() {
+        startPage = if (currentPage <= 2) {
+            0
+        } else {
+            minOf(totalPages - 5, maxOf(0, currentPage - 2))
+        }
+
+        val pageButtons = listOf(
+            binding.page1,
+            binding.page2,
+            binding.page3,
+            binding.page4,
+            binding.page5
+        )
+
+        pageButtons.forEachIndexed { index, textView ->
+            val pageNum = startPage + index
+            if (pageNum < totalPages) {
+                textView.text = (pageNum + 1).toString()
+                textView.setBackgroundResource(
+                    if (pageNum == currentPage) R.drawable.btn_page_bg else 0
+                )
+                textView.isEnabled = true
+                textView.alpha = 1.0f
+                textView.visibility = View.VISIBLE
+            } else {
+                textView.text = ""
+                textView.setBackgroundResource(0)
+                textView.isEnabled = false
+                textView.alpha = 0.3f
+                textView.visibility = View.INVISIBLE
+            }
+        }
+
+        binding.previousPage.isEnabled = currentPage > 0
+        binding.nextPage.isEnabled = currentPage < totalPages - 1
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/CategoryFragment.kt
similarity index 91%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/CategoryFragment.kt
index ddc8d27b..cef576b5 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/CategoryFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.category
+package com.example.spoteam_android.presentation.category
 
 import android.graphics.Color
 import android.os.Bundle
@@ -11,9 +11,9 @@ import androidx.fragment.app.Fragment
 import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.FragmentCategoryBinding
-import com.example.spoteam_android.search.SearchFragment
-import com.example.spoteam_android.ui.alert.AlertFragment
-import com.example.spoteam_android.ui.home.HomeFragment
+import com.example.spoteam_android.presentation.search.SearchFragment
+import com.example.spoteam_android.presentation.alert.AlertFragment
+import com.example.spoteam_android.presentation.home.HomeFragment
 import com.google.android.material.tabs.TabLayoutMediator
 
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryFragment_1.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/CategoryFragment_1.kt
similarity index 72%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryFragment_1.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/CategoryFragment_1.kt
index 74a65798..61ff6445 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryFragment_1.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/CategoryFragment_1.kt
@@ -1,9 +1,6 @@
-package com.example.spoteam_android.ui.category
+package com.example.spoteam_android.presentation.category
 
-import StudyApiService
-import StudyViewModel
 import android.content.Context
-import android.graphics.PorterDuff
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -12,35 +9,37 @@ import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
-import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.BoardItem
-import com.example.spoteam_android.HouseFragment
-import com.example.spoteam_android.LikeResponse
+import com.example.spoteam_android.presentation.home.HomeFragment
 import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentCategoryBinding
-import com.example.spoteam_android.search.SearchFragment
-import com.example.spoteam_android.ui.alert.AlertFragment
-import com.example.spoteam_android.ui.community.CategoryStudyResponse
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.interestarea.ApiResponse
-import com.example.spoteam_android.ui.interestarea.MyInterestStudySpecificApiService
-import com.example.spoteam_android.ui.study.DetailStudyFragment
+import com.example.spoteam_android.RetrofitInstance
+import com.example.spoteam_android.domain.study.entity.BoardItem
+import com.example.spoteam_android.domain.study.entity.StudyDataResponse
+import com.example.spoteam_android.presentation.search.SearchFragment
+import com.example.spoteam_android.presentation.alert.AlertFragment
+import com.example.spoteam_android.presentation.category.category_tabs.CategoryStudyContentRVAdapter
+import com.example.spoteam_android.presentation.community.CategoryStudyResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.interestarea.ApiResponse
+import com.example.spoteam_android.presentation.interestarea.MyInterestStudySpecificApiService
+import com.example.spoteam_android.presentation.study.StudyViewModel
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.tabs.TabLayout
+import dagger.hilt.android.AndroidEntryPoint
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 
+@AndroidEntryPoint
 class CategoryFragment_1 : Fragment() {
 
     lateinit var binding: FragmentCategoryBinding
     private lateinit var tabLayout: TabLayout
-    private lateinit var studyApiService: StudyApiService
+    lateinit var communityAPIService: CommunityAPIService
     private val studyViewModel: StudyViewModel by activityViewModels()
     private lateinit var interestBoardAdapter: CategoryVPAdapter
     private var gender: String? = null
@@ -52,13 +51,14 @@ class CategoryFragment_1 : Fragment() {
     private var source: Boolean = false
     private var selectedStudyCategory: String? = "전체"
     private var selectedItem: String = "ALL"
-    private var selectedStudyTheme: String ="전체"
-    private val viewModel: CategoryInterestViewModel by activityViewModels()
+    private var selectedStudyTheme: String = "전체"
+    private val viewModel: com.example.spoteam_android.presentation.category.CategoryInterestViewModel by activityViewModels()
     private var currentPage = 0
     private var totalPages = 0
     private var startPage = 0
 
-    private val tabList = arrayListOf("전체", "어학", "자격증", "취업", "토론", "시사/뉴스", "자율학습", "프로젝트", "공모전", "전공/진로", "기타")
+    private val tabList =
+        arrayListOf("전체", "어학", "자격증", "취업", "토론", "시사/뉴스", "자율학습", "프로젝트", "공모전", "전공/진로", "기타")
 
 
     override fun onCreateView(
@@ -67,8 +67,7 @@ class CategoryFragment_1 : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         binding = FragmentCategoryBinding.inflate(inflater, container, false)
-        studyApiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)  // ← 이거 추가
-
+        communityAPIService = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         initArguments()
         setupRecyclerView()
         setupTabs()
@@ -95,13 +94,22 @@ class CategoryFragment_1 : Fragment() {
 
     private fun initialFetch() {
         if (!source) {
-                binding.icFilter.visibility = View.VISIBLE
-                binding.icFilterActive.visibility = View.GONE
+            binding.icFilter.visibility = View.VISIBLE
+            binding.icFilterActive.visibility = View.GONE
         } else {
             binding.icFilter.visibility = View.GONE
             binding.icFilterActive.visibility = View.VISIBLE
         }
-        fetchMyInterestAll(selectedItem, gender, minAge, maxAge,hasFee,minFee,maxFee,currentPage)
+        fetchMyInterestAll(
+            selectedItem,
+            gender,
+            minAge,
+            maxAge,
+            hasFee,
+            minFee,
+            maxFee,
+            currentPage
+        )
     }
 
     private fun setupTabs() {
@@ -134,10 +142,11 @@ class CategoryFragment_1 : Fragment() {
 
     private fun createTab(text: String): TabLayout.Tab {
         return tabLayout.newTab().apply {
-            customView = LayoutInflater.from(context).inflate(R.layout.custom_tab_text, null).apply {
-                val textView = findViewById<TextView>(R.id.tabText)
-                textView.text = text
-            }
+            customView =
+                LayoutInflater.from(context).inflate(R.layout.custom_tab_text, null).apply {
+                    val textView = findViewById<TextView>(R.id.tabText)
+                    textView.text = text
+                }
             tag = text
         }
     }
@@ -152,9 +161,28 @@ class CategoryFragment_1 : Fragment() {
         currentPage = 0  // ⭐ 페이지 초기화
 
         if (selectedStudyCategory == "전체") {
-            fetchMyInterestAll(selectedItem, gender, minAge, maxAge,hasFee,minFee,maxFee,currentPage)
+            fetchMyInterestAll(
+                selectedItem,
+                gender,
+                minAge,
+                maxAge,
+                hasFee,
+                minFee,
+                maxFee,
+                currentPage
+            )
         } else {
-            fetchMyInterestSpecific(selectedStudyTheme,selectedItem, gender, minAge, maxAge, hasFee, minFee, maxFee, currentPage)
+            fetchMyInterestSpecific(
+                selectedStudyTheme,
+                selectedItem,
+                gender,
+                minAge,
+                maxAge,
+                hasFee,
+                minFee,
+                maxFee,
+                currentPage
+            )
         }
     }
 
@@ -183,7 +211,7 @@ class CategoryFragment_1 : Fragment() {
         interestBoardAdapter.setItemClickListener(object : CategoryVPAdapter.OnItemClickListeners {
             override fun onItemClick(data: BoardItem) {
                 studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
-                replaceFragment(DetailStudyFragment())
+                replaceFragment(com.example.spoteam_android.presentation.study.DetailStudyFragment())
             }
         })
 
@@ -200,7 +228,8 @@ class CategoryFragment_1 : Fragment() {
 
     private fun setupBottomSheet() {
         val dialogView = layoutInflater.inflate(R.layout.bottom_sheet_interest_spinner, null)
-        val bottomSheetDialog = BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
+        val bottomSheetDialog =
+            BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
         bottomSheetDialog.setContentView(dialogView)
 
         val recentlyLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_recently)
@@ -233,9 +262,28 @@ class CategoryFragment_1 : Fragment() {
     private fun fetchFilteredStudy(selectedItem: String) {
         this.selectedItem = selectedItem
         if (selectedStudyCategory == "전체") {
-            fetchMyInterestAll(selectedItem, gender, minAge, maxAge,hasFee,minFee,maxFee,currentPage)
+            fetchMyInterestAll(
+                selectedItem,
+                gender,
+                minAge,
+                maxAge,
+                hasFee,
+                minFee,
+                maxFee,
+                currentPage
+            )
         } else {
-            fetchMyInterestSpecific(selectedStudyTheme,selectedItem, gender, minAge, maxAge, hasFee, minFee, maxFee, currentPage)
+            fetchMyInterestSpecific(
+                selectedStudyTheme,
+                selectedItem,
+                gender,
+                minAge,
+                maxAge,
+                hasFee,
+                minFee,
+                maxFee,
+                currentPage
+            )
         }
     }
 
@@ -251,9 +299,28 @@ class CategoryFragment_1 : Fragment() {
 
     private fun requestPageUpdate() {
         if (selectedStudyCategory == "전체") {
-            fetchMyInterestAll(selectedItem, gender, minAge, maxAge,hasFee,minFee,maxFee,currentPage)
+            fetchMyInterestAll(
+                selectedItem,
+                gender,
+                minAge,
+                maxAge,
+                hasFee,
+                minFee,
+                maxFee,
+                currentPage
+            )
         } else {
-            fetchMyInterestSpecific(selectedStudyTheme,selectedItem, gender, minAge, maxAge, hasFee, minFee, maxFee, currentPage)
+            fetchMyInterestSpecific(
+                selectedStudyTheme,
+                selectedItem,
+                gender,
+                minAge,
+                maxAge,
+                hasFee,
+                minFee,
+                maxFee,
+                currentPage
+            )
         }
     }
 
@@ -274,24 +341,25 @@ class CategoryFragment_1 : Fragment() {
         hasFee: Boolean?,
         minFee: Int?,
         maxFee: Int?,
-        currentPage: Int?= null
-    )
-    {
+        currentPage: Int? = null
+    ) {
         val boardItems = arrayListOf<BoardItem>()
-        val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
 
-        service.getAllStudyWithDetail(
+        communityAPIService.getAllStudyWithDetail(
             gender = gender,
             minAge = minAge,
             maxAge = maxAge,
             hasFee = hasFee,
             minFee = minFee,
             maxFee = maxFee,
-            page = currentPage ?: 0 ,
+            page = currentPage ?: 0,
             size = 5,
             sortBy = selectedItem ?: "ALL",
         ).enqueue(object : Callback<CategoryStudyResponse> {
-            override fun onResponse(call: Call<CategoryStudyResponse>, response: Response<CategoryStudyResponse>) {
+            override fun onResponse(
+                call: Call<CategoryStudyResponse>,
+                response: Response<CategoryStudyResponse>
+            ) {
                 if (response.isSuccessful) {
                     val apiResponse = response.body()
                     if (apiResponse?.isSuccess != null) {
@@ -324,7 +392,8 @@ class CategoryFragment_1 : Fragment() {
                         updateRecyclerView(boardItems)
                     } else {
                         binding.contentCountTv.text = "00"
-                        Toast.makeText(requireContext(), "조건에 맞는 항목이 없습니다.", Toast.LENGTH_SHORT).show()
+                        Toast.makeText(requireContext(), "조건에 맞는 항목이 없습니다.", Toast.LENGTH_SHORT)
+                            .show()
                         binding.communityCategoryContentRv.visibility = View.GONE
                     }
                 } else {
@@ -347,10 +416,11 @@ class CategoryFragment_1 : Fragment() {
         hasFee: Boolean?,
         minFee: Int?,
         maxFee: Int?,
-        currentPage: Int?= null,
+        currentPage: Int? = null,
     ) {
         val boardItems = arrayListOf<BoardItem>()
-        val service = RetrofitInstance.retrofit.create(MyInterestStudySpecificApiService::class.java)
+        val service =
+            RetrofitInstance.retrofit.create(MyInterestStudySpecificApiService::class.java)
 
         service.GetMyInterestStudys(
             gender = gender,
@@ -419,45 +489,27 @@ class CategoryFragment_1 : Fragment() {
     }
 
     private fun toggleLikeStatus(studyItem: BoardItem, likeButton: ImageView) {
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val memberId = sharedPreferences.getInt("${sharedPreferences.getString("currentEmail", "")}_memberId", -1)
-
-        if (memberId != -1) {
-            studyApiService.toggleStudyLike(studyItem.studyId)
-                .enqueue(object : Callback<LikeResponse> {
-                    override fun onResponse(call: Call<LikeResponse>, response: Response<LikeResponse>) {
-                        if (response.isSuccessful) {
-                            response.body()?.let { likeResponse ->
-                                // 서버에서 반환된 상태에 따라 하트 아이콘 및 BoardItem의 liked 상태 업데이트
-                                val newStatus = likeResponse.result.status
-                                studyItem.liked = newStatus == "LIKE"
-                                val newIcon = if (studyItem.liked) R.drawable.ic_heart_filled else R.drawable.study_like
-                                likeButton.setImageResource(newIcon)
-
-                                // heartCount 즉시 증가 또는 감소
-                                studyItem.heartCount = if (studyItem.liked) studyItem.heartCount + 1 else studyItem.heartCount - 1
-
-                                // 변경된 항목을 어댑터에 알림
-                                val adapter = binding.communityCategoryContentRv.adapter as CategoryVPAdapter
-                                val position = adapter.dataList.indexOf(studyItem)
-                                if (position != -1) {
-                                    adapter.notifyItemChanged(position)
-                                }
-                            }
-                        } else {
-                            Toast.makeText(requireContext(), "찜 상태 업데이트 실패", Toast.LENGTH_SHORT).show()
-                        }
-                    }
-
-                    override fun onFailure(call: Call<LikeResponse>, t: Throwable) {
-                        Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
-                    }
-                })
-        } else {
-            Toast.makeText(requireContext(), "회원 정보를 불러올 수 없습니다.", Toast.LENGTH_SHORT).show()
+        studyViewModel.toggleLikeStatus(studyItem.studyId) { result ->
+            requireActivity().runOnUiThread {
+                result.onSuccess { liked ->
+                    studyItem.liked = liked
+                    studyItem.heartCount += if (liked) 1 else -1
+                    val icon = if (liked) R.drawable.ic_heart_filled else R.drawable.study_like
+                    likeButton.setImageResource(icon)
+
+                    // RecyclerView 갱신
+                    interestBoardAdapter.notifyItemChanged(
+                        interestBoardAdapter.dataList.indexOf(studyItem)
+                    )
+                }.onFailure {
+                    Toast.makeText(requireContext(), "찜 실패: ${it.message}", Toast.LENGTH_SHORT).show()
+                }
+            }
         }
     }
 
+
+
     private fun replaceFragment(fragment: Fragment) {
         (requireActivity() as MainActivity).supportFragmentManager.beginTransaction()
             .replace(R.id.main_frm, fragment)
@@ -471,7 +523,7 @@ class CategoryFragment_1 : Fragment() {
         }
 
         binding.icSpotLogo.setOnClickListener {
-            replaceFragment(HouseFragment())
+            replaceFragment(HomeFragment())
         }
 
         binding.icAlarm.setOnClickListener {
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryInterestFilterFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/CategoryInterestFilterFragment.kt
similarity index 95%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryInterestFilterFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/CategoryInterestFilterFragment.kt
index 419fbe74..ee3d89bb 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryInterestFilterFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/CategoryInterestFilterFragment.kt
@@ -1,8 +1,8 @@
-package com.example.spoteam_android.ui.category
+package com.example.spoteam_android.presentation.category
 
-import com.example.spoteam_android.ui.interestarea.BottomNavVisibilityController
-import com.example.spoteam_android.ui.interestarea.InterestFilterViewModel
-import com.example.spoteam_android.ui.interestarea.InterestFragment
+import com.example.spoteam_android.presentation.interestarea.BottomNavVisibilityController
+import com.example.spoteam_android.presentation.interestarea.InterestFilterViewModel
+import com.example.spoteam_android.presentation.interestarea.InterestFragment
 import android.content.Context
 import android.content.res.ColorStateList
 import android.graphics.Color
@@ -23,7 +23,7 @@ import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.FragmentCategoryFilterBinding
 import com.example.spoteam_android.databinding.FragmentInterestFilterBinding
 import com.example.spoteam_android.databinding.FragmentMyInterestStudyFilterBinding
-import com.example.spoteam_android.ui.myinterest.MyInterestChipViewModel
+import com.example.spoteam_android.presentation.myinterest.MyInterestChipViewModel
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipDrawable
 import com.google.android.material.chip.ChipGroup
@@ -41,7 +41,7 @@ class CategoryInterestFilterFragment : Fragment() {
     private var initialIsRecruiting: String? = null
 
     lateinit var binding: FragmentCategoryFilterBinding
-    private val viewModel: CategoryInterestViewModel by activityViewModels()
+    private val viewModel: com.example.spoteam_android.presentation.category.CategoryInterestViewModel by activityViewModels()
 
     private var navVisibilityController: BottomNavVisibilityController? = null
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryInterestViewModel.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/CategoryInterestViewModel.kt
similarity index 93%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryInterestViewModel.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/CategoryInterestViewModel.kt
index 46471178..ae24e9aa 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryInterestViewModel.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/CategoryInterestViewModel.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.category
+package com.example.spoteam_android.presentation.category
 
 import androidx.lifecycle.ViewModel
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryNavViewFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/CategoryNavViewFragment.kt
similarity index 97%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryNavViewFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/CategoryNavViewFragment.kt
index cdb0a1cb..89f82e8f 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryNavViewFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/CategoryNavViewFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.category
+package com.example.spoteam_android.presentation.category
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryVPAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/CategoryVPAdapter.kt
similarity index 97%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryVPAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/CategoryVPAdapter.kt
index d7731bba..d8bab853 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryVPAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/CategoryVPAdapter.kt
@@ -1,6 +1,5 @@
-package com.example.spoteam_android.ui.category
+package com.example.spoteam_android.presentation.category
 
-import StudyViewModel
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -9,9 +8,10 @@ import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
-import com.example.spoteam_android.BoardItem
 import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.ItemRecyclerViewBinding
+import com.example.spoteam_android.domain.study.entity.BoardItem
+import com.example.spoteam_android.presentation.study.StudyViewModel
 
 class CategoryVPAdapter(
     var dataList: ArrayList<BoardItem>,
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/AllCategoryFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/AllCategoryFragment.kt
new file mode 100644
index 00000000..acbb11e1
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/AllCategoryFragment.kt
@@ -0,0 +1,240 @@
+package com.example.spoteam_android.presentation.category.category_tabs
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.spoteam_android.MainActivity
+import com.example.spoteam_android.R
+import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding
+import com.example.spoteam_android.domain.study.entity.StudyDataResponse
+import com.example.spoteam_android.presentation.community.CategoryStudyResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.interestarea.InterestFilterFragment
+import com.example.spoteam_android.presentation.study.StudyViewModel
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import dagger.hilt.android.AndroidEntryPoint
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+@AndroidEntryPoint
+class AllCategoryFragment : Fragment() {
+
+    private lateinit var binding: FragmentCategoryStudyContentBinding
+    private val studyViewModel: StudyViewModel by activityViewModels()
+
+    private var currentPage = 0
+    private val size = 5
+    private var totalPages = 0
+    private var startPage = 0
+    private var isLoading = false
+    private var selectedSortBy: String = "ALL"
+    private lateinit var categoryStudyAdapter: CategoryStudyContentRVAdapter
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentCategoryStudyContentBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        categoryStudyAdapter = CategoryStudyContentRVAdapter(arrayListOf(), onLikeClick = { selectedItem, likeButton ->
+            toggleLikeStatus(selectedItem, likeButton)
+        })
+
+        categoryStudyAdapter.setItemClickListener(object : CategoryStudyContentRVAdapter.OnItemClickListener {
+            override fun onItemClick(data: StudyDataResponse.StudyContent) {
+                studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
+                val detailFragment = com.example.spoteam_android.presentation.study.DetailStudyFragment()
+                (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
+                    ?.replace(R.id.main_frm, detailFragment)?.addToBackStack(null)?.commit()
+            }
+        })
+
+        binding.communityCategoryContentRv.apply {
+            adapter = categoryStudyAdapter
+            layoutManager = LinearLayoutManager(requireContext())
+        }
+
+        val pageButtons = listOf(
+            binding.page1, binding.page2, binding.page3, binding.page4, binding.page5
+        )
+
+        pageButtons.forEachIndexed { index, textView ->
+            textView.setOnClickListener {
+                val selectedPage = startPage + index
+                if (currentPage != selectedPage) {
+                    currentPage = selectedPage
+                    fetchBestCommunityContent(currentPage, size, selectedSortBy)
+                }
+            }
+        }
+
+        binding.previousPage.setOnClickListener {
+            if (currentPage > 0) {
+                currentPage--
+                fetchBestCommunityContent(currentPage, size, selectedSortBy)
+            }
+        }
+
+        binding.nextPage.setOnClickListener {
+            if (currentPage < totalPages - 1) {
+                currentPage++
+                fetchBestCommunityContent(currentPage, size, selectedSortBy)
+            }
+        }
+
+        initBottomFilterView()
+        fetchBestCommunityContent(currentPage, size, selectedSortBy)
+    }
+
+    private fun initBottomFilterView() {
+        val dialogView = layoutInflater.inflate(R.layout.bottom_sheet_interest_spinner, null)
+        val bottomSheetDialog = BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
+        bottomSheetDialog.setContentView(dialogView)
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_recently).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "최신 순"
+            selectedSortBy = "ALL"
+            fetchBestCommunityContent(currentPage, size, selectedSortBy)
+        }
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_view).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "조회 수 높은 순"
+            selectedSortBy = "HIT"
+            fetchBestCommunityContent(currentPage, size, selectedSortBy)
+        }
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_hot).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "관심 많은 순"
+            selectedSortBy = "LIKED"
+            fetchBestCommunityContent(currentPage, size, selectedSortBy)
+        }
+
+        binding.contentFilterToggleContainer.setOnClickListener {
+            bottomSheetDialog.show()
+        }
+
+        initFilter()
+    }
+
+    private fun initFilter() {
+        binding.icFilter.setOnClickListener {
+            (activity as MainActivity).switchFragment(InterestFilterFragment())
+        }
+        binding.icFilterActive.setOnClickListener {
+            (activity as MainActivity).switchFragment(InterestFilterFragment())
+        }
+    }
+
+    private fun fetchBestCommunityContent(page: Int, size: Int, sortBy: String) {
+
+        isLoading = true
+        val service = com.example.spoteam_android.RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
+        service.getAllStudy(page, size, sortBy).enqueue(object : Callback<CategoryStudyResponse> {
+            override fun onResponse(call: Call<CategoryStudyResponse>, response: Response<CategoryStudyResponse>) {
+                if (response.isSuccessful) {
+                    response.body()?.let { res ->
+                        val contentList = res.result?.content ?: emptyList()
+                        val mappedList = contentList.map {
+                            StudyDataResponse.StudyContent(
+                                studyId = it.studyId,
+                                title = it.title,
+                                goal = "", // CategoryStudyDetail에 없으므로 빈값 처리
+                                introduction = it.introduction,
+                                memberCount = it.memberCount,
+                                heartCount = it.heartCount,
+                                hitNum = it.hitNum,
+                                maxPeople = it.maxPeople,
+                                studyState = it.studyState,
+                                themeTypes = it.themeTypes,
+                                regions = it.regions,
+                                imageUrl = it.imageUrl,
+                                liked = it.liked,
+                                createdAt = it.createdAt
+                            )
+                        }
+                        totalPages = res.result?.totalPages ?: 0
+
+                        binding.contentCountTv.text = res.result?.totalElements?.toString() ?: "0"
+
+                        if (contentList.isNotEmpty()) {
+                            categoryStudyAdapter.updateList(mappedList)
+                            binding.emptyTv.visibility = View.GONE
+                        } else if (currentPage == 0) {
+                            binding.emptyTv.visibility = View.VISIBLE
+                        }
+                        updatePageUI()
+                    }
+                } else {
+                    Toast.makeText(requireContext(), "불러오기 실패: ${response.code()}", Toast.LENGTH_SHORT).show()
+                }
+                isLoading = false
+            }
+
+            override fun onFailure(call: Call<CategoryStudyResponse>, t: Throwable) {
+                Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
+                isLoading = false
+            }
+        })
+    }
+
+    private fun updatePageUI() {
+        startPage = if (currentPage <= 2) 0 else minOf(totalPages - 5, maxOf(0, currentPage - 2))
+
+        val pageButtons = listOf(
+            binding.page1, binding.page2, binding.page3, binding.page4, binding.page5
+        )
+
+        pageButtons.forEachIndexed { index, textView ->
+            val pageNum = startPage + index
+            if (pageNum < totalPages) {
+                textView.text = (pageNum + 1).toString()
+                textView.setBackgroundResource(if (pageNum == currentPage) R.drawable.btn_page_bg else 0)
+                textView.isEnabled = true
+                textView.alpha = 1f
+                textView.visibility = View.VISIBLE
+            } else {
+                textView.text = ""
+                textView.setBackgroundResource(0)
+                textView.isEnabled = false
+                textView.alpha = 0.3f
+                textView.visibility = View.INVISIBLE
+            }
+        }
+
+        binding.previousPage.isEnabled = currentPage > 0
+        binding.nextPage.isEnabled = currentPage < totalPages - 1
+    }
+
+    private fun toggleLikeStatus(studyItem: StudyDataResponse.StudyContent, likeButton: ImageView) {
+        studyViewModel.toggleLikeStatus(studyItem.studyId) { result ->
+            requireActivity().runOnUiThread {
+                result.onSuccess { liked ->
+                    studyItem.liked = liked
+                    val icon = if (liked) R.drawable.ic_heart_filled else R.drawable.study_like
+                    likeButton.setImageResource(icon)
+                    studyItem.heartCount += if (liked) 1 else -1
+                    categoryStudyAdapter.notifyItemChanged(
+                        categoryStudyAdapter.dataList.indexOf(studyItem)
+                    )
+                }.onFailure {
+                    Toast.makeText(requireContext(), "찜 실패: ${it.message}", Toast.LENGTH_SHORT).show()
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/CategoryStudyContentRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/CategoryStudyContentRVAdapter.kt
similarity index 82%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/CategoryStudyContentRVAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/CategoryStudyContentRVAdapter.kt
index 03fea3c5..38eef36d 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/CategoryStudyContentRVAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/CategoryStudyContentRVAdapter.kt
@@ -1,27 +1,20 @@
-package com.example.spoteam_android.ui.category.category_tabs
-
-import android.util.Log
+package com.example.spoteam_android.presentation.category.category_tabs
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
-import com.example.spoteam_android.BoardItem
 import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.ItemRecyclerViewBinding
-import com.example.spoteam_android.ui.community.CategoryStudyDetail
-import java.text.ParseException
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-
+import com.example.spoteam_android.domain.study.entity.StudyDataResponse
+import com.example.spoteam_android.presentation.community.CategoryStudyDetail
 class CategoryStudyContentRVAdapter(
-    var dataList: ArrayList<CategoryStudyDetail>, // ArrayList로 명시적으로 선언
-    private val onLikeClick: (CategoryStudyDetail, ImageView) -> Unit
+    var dataList: ArrayList<StudyDataResponse.StudyContent>, // ArrayList로 명시적으로 선언
+    private val onLikeClick: (StudyDataResponse.StudyContent, ImageView) -> Unit
 ) : RecyclerView.Adapter<CategoryStudyContentRVAdapter.ViewHolder>() {
 
     interface OnItemClickListener {
-        fun onItemClick(data: CategoryStudyDetail)
+        fun onItemClick(data: StudyDataResponse.StudyContent)
     }
 
     private lateinit var itemClickListener: OnItemClickListener
@@ -59,7 +52,7 @@ class CategoryStudyContentRVAdapter(
     inner class ViewHolder(val binding: ItemRecyclerViewBinding) : RecyclerView.ViewHolder(binding.root) {
         val likeButton: ImageView = binding.heartCountIv // 찜 버튼
 
-        fun bind(data: CategoryStudyDetail) {
+        fun bind(data: StudyDataResponse.StudyContent) {
             binding.tvTime.text = data.title
             binding.tvTitle.text = data.goal
             binding.tvName.text = data.maxPeople.toString()
@@ -80,7 +73,7 @@ class CategoryStudyContentRVAdapter(
         }
     }
 
-    fun updateList(newList: List<CategoryStudyDetail>) {
+    fun updateList(newList: List<StudyDataResponse.StudyContent>) {
         dataList.clear()
         dataList.addAll(newList)
         notifyDataSetChanged()
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/ContestFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/ContestFragment.kt
new file mode 100644
index 00000000..cd6e1c77
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/ContestFragment.kt
@@ -0,0 +1,250 @@
+package com.example.spoteam_android.presentation.category.category_tabs
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.spoteam_android.MainActivity
+import com.example.spoteam_android.R
+import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding
+import com.example.spoteam_android.RetrofitInstance
+import com.example.spoteam_android.domain.study.entity.StudyDataResponse
+import com.example.spoteam_android.presentation.community.CategoryStudyResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.study.StudyViewModel
+
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class ContestFragment : Fragment(), AdapterView.OnItemSelectedListener {
+
+    private lateinit var binding: FragmentCategoryStudyContentBinding
+    private val studyViewModel: StudyViewModel by activityViewModels()
+
+    private var currentPage = 0
+    private val size = 5
+    private var totalPages = 0
+    private var startPage = 0
+    private var isLoading = false
+    private var selectedSortBy: String = "ALL"
+    private val theme :String = "공모전"
+    private val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentCategoryStudyContentBinding.inflate(inflater, container, false)
+
+        val categoryStudyAdapter = CategoryStudyContentRVAdapter(
+            ArrayList(),
+            onLikeClick = { selectedItem, likeButton ->
+                toggleLikeStatus(selectedItem, likeButton)
+            })
+
+        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
+
+        categoryStudyAdapter.setItemClickListener(object : CategoryStudyContentRVAdapter.OnItemClickListener {
+            override fun onItemClick(data: StudyDataResponse.StudyContent) {
+                studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
+                val detailStudyFragment = com.example.spoteam_android.presentation.study.DetailStudyFragment()
+                (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
+                    ?.replace(R.id.main_frm, detailStudyFragment)?.addToBackStack(null)?.commit()
+            }
+        })
+
+        binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
+        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        initBottomFilterView()
+        return binding.root
+    }
+
+    private fun initBottomFilterView() {
+        val dialogView = layoutInflater.inflate(R.layout.bottom_sheet_interest_spinner, null)
+        val bottomSheetDialog = BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
+        bottomSheetDialog.setContentView(dialogView)
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_recently).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "최신 순"
+            selectedSortBy = "ALL"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_view).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "조회 수 높은 순"
+            selectedSortBy = "HIT"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_hot).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "관심 많은 순"
+            selectedSortBy = "LIKED"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        binding.contentFilterToggleContainer.setOnClickListener {
+            bottomSheetDialog.show()
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val pageButtons = listOf(
+            binding.page1, binding.page2, binding.page3, binding.page4, binding.page5
+        )
+
+        pageButtons.forEachIndexed { index, textView ->
+            textView.setOnClickListener {
+                val selectedPage = startPage + index
+                if (currentPage != selectedPage) {
+                    currentPage = selectedPage
+                    fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+                }
+            }
+        }
+
+        binding.previousPage.setOnClickListener {
+            if (currentPage > 0) {
+                currentPage--
+                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+            }
+        }
+
+        binding.nextPage.setOnClickListener {
+            if (currentPage < totalPages - 1) {
+                currentPage++
+                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+            }
+        }
+    }
+
+    private fun fetchBestCommunityContent(theme: String, page: Int, size: Int, sortBy: String) {
+        isLoading = true
+        service.getCategoryStudy(theme, page, size, sortBy).enqueue(object : Callback<CategoryStudyResponse> {
+            override fun onResponse(call: Call<CategoryStudyResponse>, response: Response<CategoryStudyResponse>) {
+                if (response.isSuccessful) {
+                    response.body()?.let {
+                        val contentList = it.result?.content ?: emptyList()
+                        val mappedList = contentList?.map {
+                            StudyDataResponse.StudyContent(
+                                studyId = it.studyId,
+                                title = it.title,
+                                goal = it.goal,
+                                introduction = it.introduction,
+                                memberCount = it.memberCount,
+                                heartCount = it.heartCount,
+                                hitNum = it.hitNum,
+                                maxPeople = it.maxPeople,
+                                studyState = it.studyState,
+                                themeTypes = it.themeTypes,
+                                regions = it.regions,
+                                imageUrl = it.imageUrl,
+                                liked = it.liked,
+                                createdAt = it.createdAt
+                            )
+                        } ?: emptyList()
+                        totalPages = it.result?.totalPages ?: 0
+                        binding.contentCountTv.text = it.result?.totalElements?.toString() ?: "0"
+                        if (contentList.isNotEmpty()) {
+                            updateRecyclerView(mappedList)
+                            binding.emptyTv.visibility = View.GONE
+                        } else if (currentPage == 0) {
+                            binding.emptyTv.visibility = View.VISIBLE
+                        }
+                        updatePageUI()
+                    }
+                } else {
+                    showLog(response.code().toString())
+                }
+                isLoading = false
+            }
+
+            override fun onFailure(call: Call<CategoryStudyResponse>, t: Throwable) {
+                showLog(t.message)
+                isLoading = false
+            }
+        })
+    }
+
+    private fun updateRecyclerView(contentList: List<StudyDataResponse.StudyContent>) {
+        val adapter = binding.communityCategoryContentRv.adapter as? CategoryStudyContentRVAdapter
+        adapter?.updateList(contentList)
+    }
+
+    private fun updatePageUI() {
+        startPage = if (currentPage <= 2) 0 else minOf(totalPages - 5, maxOf(0, currentPage - 2))
+        val pageButtons = listOf(binding.page1, binding.page2, binding.page3, binding.page4, binding.page5)
+
+        pageButtons.forEachIndexed { index, textView ->
+            val pageNum = startPage + index
+            if (pageNum < totalPages) {
+                textView.text = (pageNum + 1).toString()
+                textView.setBackgroundResource(if (pageNum == currentPage) R.drawable.btn_page_bg else 0)
+                textView.isEnabled = true
+                textView.alpha = 1f
+                textView.visibility = View.VISIBLE
+            } else {
+                textView.text = ""
+                textView.setBackgroundResource(0)
+                textView.isEnabled = false
+                textView.alpha = 0.3f
+                textView.visibility = View.INVISIBLE
+            }
+        }
+
+        binding.previousPage.isEnabled = currentPage > 0
+        binding.nextPage.isEnabled = currentPage < totalPages - 1
+    }
+
+    private fun toggleLikeStatus(studyItem: StudyDataResponse.StudyContent, likeButton: ImageView) {
+        studyViewModel.toggleLikeStatus(studyItem.studyId) { result ->
+            requireActivity().runOnUiThread {
+                result.onSuccess { liked ->
+                    studyItem.liked = liked
+                    val icon = if (liked) R.drawable.ic_heart_filled else R.drawable.study_like
+                    likeButton.setImageResource(icon)
+                    studyItem.heartCount += if (liked) 1 else -1
+                    val adapter = binding.communityCategoryContentRv.adapter as? CategoryStudyContentRVAdapter
+                    adapter?.notifyItemChanged(adapter.dataList.indexOf(studyItem))
+                }.onFailure {
+                    Toast.makeText(requireContext(), "찜 실패: ${it.message}", Toast.LENGTH_SHORT).show()
+                }
+            }
+        }
+    }
+
+    private fun showLog(message: String?) {
+        Toast.makeText(requireContext(), "Error: $message", Toast.LENGTH_SHORT).show()
+    }
+
+    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+        selectedSortBy = when (parent?.getItemAtPosition(position).toString()) {
+            "전체" -> "ALL"
+            "모집중" -> "RECRUITING"
+            "모집완료" -> "COMPLETED"
+            "조회수순" -> "HIT"
+            "관심순" -> "LIKED"
+            else -> "ALL"
+        }
+        currentPage = 0
+        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+    }
+
+    override fun onNothingSelected(parent: AdapterView<*>?) {
+        selectedSortBy = "ALL"
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/DiscussionFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/DiscussionFragment.kt
new file mode 100644
index 00000000..29a877e5
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/DiscussionFragment.kt
@@ -0,0 +1,249 @@
+package com.example.spoteam_android.presentation.category.category_tabs
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.spoteam_android.MainActivity
+import com.example.spoteam_android.R
+import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding
+import com.example.spoteam_android.RetrofitInstance
+import com.example.spoteam_android.domain.study.entity.StudyDataResponse
+import com.example.spoteam_android.presentation.community.CategoryStudyResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.study.StudyViewModel
+
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class DiscussionFragment : Fragment(), AdapterView.OnItemSelectedListener {
+
+    private lateinit var binding: FragmentCategoryStudyContentBinding
+    private val studyViewModel: StudyViewModel by activityViewModels()
+
+    private var currentPage = 0
+    private val size = 5
+    private var totalPages = 0
+    private var startPage = 0
+    private var isLoading = false
+    private var selectedSortBy: String = "ALL"
+    private val theme :String = "토론"
+    private val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentCategoryStudyContentBinding.inflate(inflater, container, false)
+
+        val categoryStudyAdapter = CategoryStudyContentRVAdapter(
+            ArrayList(),
+            onLikeClick = { selectedItem, likeButton ->
+                toggleLikeStatus(selectedItem, likeButton)
+            })
+
+        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
+
+        categoryStudyAdapter.setItemClickListener(object : CategoryStudyContentRVAdapter.OnItemClickListener {
+            override fun onItemClick(data: StudyDataResponse.StudyContent) {
+                studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
+                val detailStudyFragment = com.example.spoteam_android.presentation.study.DetailStudyFragment()
+                (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
+                    ?.replace(R.id.main_frm, detailStudyFragment)?.addToBackStack(null)?.commit()
+            }
+        })
+
+        binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
+        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        initBottomFilterView()
+        return binding.root
+    }
+
+    private fun initBottomFilterView() {
+        val dialogView = layoutInflater.inflate(R.layout.bottom_sheet_interest_spinner, null)
+        val bottomSheetDialog = BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
+        bottomSheetDialog.setContentView(dialogView)
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_recently).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "최신 순"
+            selectedSortBy = "ALL"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_view).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "조회 수 높은 순"
+            selectedSortBy = "HIT"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_hot).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "관심 많은 순"
+            selectedSortBy = "LIKED"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        binding.contentFilterToggleContainer.setOnClickListener {
+            bottomSheetDialog.show()
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val pageButtons = listOf(
+            binding.page1, binding.page2, binding.page3, binding.page4, binding.page5
+        )
+
+        pageButtons.forEachIndexed { index, textView ->
+            textView.setOnClickListener {
+                val selectedPage = startPage + index
+                if (currentPage != selectedPage) {
+                    currentPage = selectedPage
+                    fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+                }
+            }
+        }
+
+        binding.previousPage.setOnClickListener {
+            if (currentPage > 0) {
+                currentPage--
+                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+            }
+        }
+
+        binding.nextPage.setOnClickListener {
+            if (currentPage < totalPages - 1) {
+                currentPage++
+                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+            }
+        }
+    }
+
+    private fun fetchBestCommunityContent(theme: String, page: Int, size: Int, sortBy: String) {
+        isLoading = true
+        service.getCategoryStudy(theme, page, size, sortBy).enqueue(object : Callback<CategoryStudyResponse> {
+            override fun onResponse(call: Call<CategoryStudyResponse>, response: Response<CategoryStudyResponse>) {
+                if (response.isSuccessful) {
+                    response.body()?.let {
+                        val contentList = it.result?.content ?: emptyList()
+                        val mappedList = contentList?.map {
+                            StudyDataResponse.StudyContent(
+                                studyId = it.studyId,
+                                title = it.title,
+                                goal = it.goal,
+                                introduction = it.introduction,
+                                memberCount = it.memberCount,
+                                heartCount = it.heartCount,
+                                hitNum = it.hitNum,
+                                maxPeople = it.maxPeople,
+                                studyState = it.studyState,
+                                themeTypes = it.themeTypes,
+                                regions = it.regions,
+                                imageUrl = it.imageUrl,
+                                liked = it.liked,
+                                createdAt = it.createdAt
+                            )
+                        } ?: emptyList()
+                        totalPages = it.result?.totalPages ?: 0
+                        binding.contentCountTv.text = it.result?.totalElements?.toString() ?: "0"
+                        if (contentList.isNotEmpty()) {
+                            updateRecyclerView(mappedList)
+                            binding.emptyTv.visibility = View.GONE
+                        } else if (currentPage == 0) {
+                            binding.emptyTv.visibility = View.VISIBLE
+                        }
+                        updatePageUI()
+                    }
+                } else {
+                    showLog(response.code().toString())
+                }
+                isLoading = false
+            }
+
+            override fun onFailure(call: Call<CategoryStudyResponse>, t: Throwable) {
+                showLog(t.message)
+                isLoading = false
+            }
+        })
+    }
+
+    private fun updateRecyclerView(contentList: List<StudyDataResponse.StudyContent>) {
+        val adapter = binding.communityCategoryContentRv.adapter as? CategoryStudyContentRVAdapter
+        adapter?.updateList(contentList)
+    }
+
+    private fun updatePageUI() {
+        startPage = if (currentPage <= 2) 0 else minOf(totalPages - 5, maxOf(0, currentPage - 2))
+        val pageButtons = listOf(binding.page1, binding.page2, binding.page3, binding.page4, binding.page5)
+
+        pageButtons.forEachIndexed { index, textView ->
+            val pageNum = startPage + index
+            if (pageNum < totalPages) {
+                textView.text = (pageNum + 1).toString()
+                textView.setBackgroundResource(if (pageNum == currentPage) R.drawable.btn_page_bg else 0)
+                textView.isEnabled = true
+                textView.alpha = 1f
+                textView.visibility = View.VISIBLE
+            } else {
+                textView.text = ""
+                textView.setBackgroundResource(0)
+                textView.isEnabled = false
+                textView.alpha = 0.3f
+                textView.visibility = View.INVISIBLE
+            }
+        }
+
+        binding.previousPage.isEnabled = currentPage > 0
+        binding.nextPage.isEnabled = currentPage < totalPages - 1
+    }
+
+    private fun toggleLikeStatus(studyItem: StudyDataResponse.StudyContent, likeButton: ImageView) {
+        studyViewModel.toggleLikeStatus(studyItem.studyId) { result ->
+            requireActivity().runOnUiThread {
+                result.onSuccess { liked ->
+                    studyItem.liked = liked
+                    val icon = if (liked) R.drawable.ic_heart_filled else R.drawable.study_like
+                    likeButton.setImageResource(icon)
+                    studyItem.heartCount += if (liked) 1 else -1
+                    val adapter = binding.communityCategoryContentRv.adapter as? CategoryStudyContentRVAdapter
+                    adapter?.notifyItemChanged(adapter.dataList.indexOf(studyItem))
+                }.onFailure {
+                    Toast.makeText(requireContext(), "찜 실패: ${it.message}", Toast.LENGTH_SHORT).show()
+                }
+            }
+        }
+    }
+
+    private fun showLog(message: String?) {
+        Toast.makeText(requireContext(), "Error: $message", Toast.LENGTH_SHORT).show()
+    }
+
+    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+        selectedSortBy = when (parent?.getItemAtPosition(position).toString()) {
+            "전체" -> "ALL"
+            "모집중" -> "RECRUITING"
+            "모집완료" -> "COMPLETED"
+            "조회수순" -> "HIT"
+            "관심순" -> "LIKED"
+            else -> "ALL"
+        }
+        currentPage = 0
+        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+    }
+
+    override fun onNothingSelected(parent: AdapterView<*>?) {
+        selectedSortBy = "ALL"
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/FreeStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/FreeStudyFragment.kt
new file mode 100644
index 00000000..10e2b358
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/FreeStudyFragment.kt
@@ -0,0 +1,250 @@
+package com.example.spoteam_android.presentation.category.category_tabs
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.spoteam_android.MainActivity
+import com.example.spoteam_android.R
+import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding
+import com.example.spoteam_android.RetrofitInstance
+import com.example.spoteam_android.domain.study.entity.StudyDataResponse
+import com.example.spoteam_android.presentation.community.CategoryStudyResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.study.StudyViewModel
+
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class FreeStudyFragment : Fragment(), AdapterView.OnItemSelectedListener {
+
+    private lateinit var binding: FragmentCategoryStudyContentBinding
+    private val studyViewModel: StudyViewModel by activityViewModels()
+
+    private var currentPage = 0
+    private val size = 5
+    private var totalPages = 0
+    private var startPage = 0
+    private var isLoading = false
+    private var selectedSortBy: String = "ALL"
+    private val theme :String = "자율학습"
+    private val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentCategoryStudyContentBinding.inflate(inflater, container, false)
+
+        val categoryStudyAdapter = CategoryStudyContentRVAdapter(
+            ArrayList(),
+            onLikeClick = { selectedItem, likeButton ->
+                toggleLikeStatus(selectedItem, likeButton)
+            })
+
+        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
+
+        categoryStudyAdapter.setItemClickListener(object : CategoryStudyContentRVAdapter.OnItemClickListener {
+            override fun onItemClick(data: StudyDataResponse.StudyContent) {
+                studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
+                val detailStudyFragment = com.example.spoteam_android.presentation.study.DetailStudyFragment()
+                (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
+                    ?.replace(R.id.main_frm, detailStudyFragment)?.addToBackStack(null)?.commit()
+            }
+        })
+
+        binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
+        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        initBottomFilterView()
+        return binding.root
+    }
+
+    private fun initBottomFilterView() {
+        val dialogView = layoutInflater.inflate(R.layout.bottom_sheet_interest_spinner, null)
+        val bottomSheetDialog = BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
+        bottomSheetDialog.setContentView(dialogView)
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_recently).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "최신 순"
+            selectedSortBy = "ALL"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_view).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "조회 수 높은 순"
+            selectedSortBy = "HIT"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_hot).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "관심 많은 순"
+            selectedSortBy = "LIKED"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        binding.contentFilterToggleContainer.setOnClickListener {
+            bottomSheetDialog.show()
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val pageButtons = listOf(
+            binding.page1, binding.page2, binding.page3, binding.page4, binding.page5
+        )
+
+        pageButtons.forEachIndexed { index, textView ->
+            textView.setOnClickListener {
+                val selectedPage = startPage + index
+                if (currentPage != selectedPage) {
+                    currentPage = selectedPage
+                    fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+                }
+            }
+        }
+
+        binding.previousPage.setOnClickListener {
+            if (currentPage > 0) {
+                currentPage--
+                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+            }
+        }
+
+        binding.nextPage.setOnClickListener {
+            if (currentPage < totalPages - 1) {
+                currentPage++
+                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+            }
+        }
+    }
+
+    private fun fetchBestCommunityContent(theme: String, page: Int, size: Int, sortBy: String) {
+        isLoading = true
+        service.getCategoryStudy(theme, page, size, sortBy).enqueue(object : Callback<CategoryStudyResponse> {
+            override fun onResponse(call: Call<CategoryStudyResponse>, response: Response<CategoryStudyResponse>) {
+                if (response.isSuccessful) {
+                    response.body()?.let {
+                        val contentList = it.result?.content ?: emptyList()
+                        val mappedList = contentList?.map {
+                            StudyDataResponse.StudyContent(
+                                studyId = it.studyId,
+                                title = it.title,
+                                goal = it.goal,
+                                introduction = it.introduction,
+                                memberCount = it.memberCount,
+                                heartCount = it.heartCount,
+                                hitNum = it.hitNum,
+                                maxPeople = it.maxPeople,
+                                studyState = it.studyState,
+                                themeTypes = it.themeTypes,
+                                regions = it.regions,
+                                imageUrl = it.imageUrl,
+                                liked = it.liked,
+                                createdAt = it.createdAt
+                            )
+                        } ?: emptyList()
+                        totalPages = it.result?.totalPages ?: 0
+                        binding.contentCountTv.text = it.result?.totalElements?.toString() ?: "0"
+                        if (contentList.isNotEmpty()) {
+                            updateRecyclerView(mappedList)
+                            binding.emptyTv.visibility = View.GONE
+                        } else if (currentPage == 0) {
+                            binding.emptyTv.visibility = View.VISIBLE
+                        }
+                        updatePageUI()
+                    }
+                } else {
+                    showLog(response.code().toString())
+                }
+                isLoading = false
+            }
+
+            override fun onFailure(call: Call<CategoryStudyResponse>, t: Throwable) {
+                showLog(t.message)
+                isLoading = false
+            }
+        })
+    }
+
+    private fun updateRecyclerView(contentList: List<StudyDataResponse.StudyContent>) {
+        val adapter = binding.communityCategoryContentRv.adapter as? CategoryStudyContentRVAdapter
+        adapter?.updateList(contentList)
+    }
+
+    private fun updatePageUI() {
+        startPage = if (currentPage <= 2) 0 else minOf(totalPages - 5, maxOf(0, currentPage - 2))
+        val pageButtons = listOf(binding.page1, binding.page2, binding.page3, binding.page4, binding.page5)
+
+        pageButtons.forEachIndexed { index, textView ->
+            val pageNum = startPage + index
+            if (pageNum < totalPages) {
+                textView.text = (pageNum + 1).toString()
+                textView.setBackgroundResource(if (pageNum == currentPage) R.drawable.btn_page_bg else 0)
+                textView.isEnabled = true
+                textView.alpha = 1f
+                textView.visibility = View.VISIBLE
+            } else {
+                textView.text = ""
+                textView.setBackgroundResource(0)
+                textView.isEnabled = false
+                textView.alpha = 0.3f
+                textView.visibility = View.INVISIBLE
+            }
+        }
+
+        binding.previousPage.isEnabled = currentPage > 0
+        binding.nextPage.isEnabled = currentPage < totalPages - 1
+    }
+
+    private fun toggleLikeStatus(studyItem: StudyDataResponse.StudyContent, likeButton: ImageView) {
+        studyViewModel.toggleLikeStatus(studyItem.studyId) { result ->
+            requireActivity().runOnUiThread {
+                result.onSuccess { liked ->
+                    studyItem.liked = liked
+                    val icon = if (liked) R.drawable.ic_heart_filled else R.drawable.study_like
+                    likeButton.setImageResource(icon)
+                    studyItem.heartCount += if (liked) 1 else -1
+                    val adapter = binding.communityCategoryContentRv.adapter as? CategoryStudyContentRVAdapter
+                    adapter?.notifyItemChanged(adapter.dataList.indexOf(studyItem))
+                }.onFailure {
+                    Toast.makeText(requireContext(), "찜 실패: ${it.message}", Toast.LENGTH_SHORT).show()
+                }
+            }
+        }
+    }
+
+    private fun showLog(message: String?) {
+        Toast.makeText(requireContext(), "Error: $message", Toast.LENGTH_SHORT).show()
+    }
+
+    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+        selectedSortBy = when (parent?.getItemAtPosition(position).toString()) {
+            "전체" -> "ALL"
+            "모집중" -> "RECRUITING"
+            "모집완료" -> "COMPLETED"
+            "조회수순" -> "HIT"
+            "관심순" -> "LIKED"
+            else -> "ALL"
+        }
+        currentPage = 0
+        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+    }
+
+    override fun onNothingSelected(parent: AdapterView<*>?) {
+        selectedSortBy = "ALL"
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/JobFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/JobFragment.kt
new file mode 100644
index 00000000..86862393
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/JobFragment.kt
@@ -0,0 +1,250 @@
+package com.example.spoteam_android.presentation.category.category_tabs
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.spoteam_android.MainActivity
+import com.example.spoteam_android.R
+import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding
+import com.example.spoteam_android.RetrofitInstance
+import com.example.spoteam_android.domain.study.entity.StudyDataResponse
+import com.example.spoteam_android.presentation.community.CategoryStudyResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.study.StudyViewModel
+
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class JobFragment : Fragment(), AdapterView.OnItemSelectedListener {
+
+    private lateinit var binding: FragmentCategoryStudyContentBinding
+    private val studyViewModel: StudyViewModel by activityViewModels()
+
+    private var currentPage = 0
+    private val size = 5
+    private var totalPages = 0
+    private var startPage = 0
+    private var isLoading = false
+    private var selectedSortBy: String = "ALL"
+    private val theme :String = "취업"
+    private val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentCategoryStudyContentBinding.inflate(inflater, container, false)
+
+        val categoryStudyAdapter = CategoryStudyContentRVAdapter(
+            ArrayList(),
+            onLikeClick = { selectedItem, likeButton ->
+                toggleLikeStatus(selectedItem, likeButton)
+            })
+
+        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
+
+        categoryStudyAdapter.setItemClickListener(object : CategoryStudyContentRVAdapter.OnItemClickListener {
+            override fun onItemClick(data: StudyDataResponse.StudyContent) {
+                studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
+                val detailStudyFragment = com.example.spoteam_android.presentation.study.DetailStudyFragment()
+                (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
+                    ?.replace(R.id.main_frm, detailStudyFragment)?.addToBackStack(null)?.commit()
+            }
+        })
+
+        binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
+        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        initBottomFilterView()
+        return binding.root
+    }
+
+    private fun initBottomFilterView() {
+        val dialogView = layoutInflater.inflate(R.layout.bottom_sheet_interest_spinner, null)
+        val bottomSheetDialog = BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
+        bottomSheetDialog.setContentView(dialogView)
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_recently).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "최신 순"
+            selectedSortBy = "ALL"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_view).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "조회 수 높은 순"
+            selectedSortBy = "HIT"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_hot).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "관심 많은 순"
+            selectedSortBy = "LIKED"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        binding.contentFilterToggleContainer.setOnClickListener {
+            bottomSheetDialog.show()
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val pageButtons = listOf(
+            binding.page1, binding.page2, binding.page3, binding.page4, binding.page5
+        )
+
+        pageButtons.forEachIndexed { index, textView ->
+            textView.setOnClickListener {
+                val selectedPage = startPage + index
+                if (currentPage != selectedPage) {
+                    currentPage = selectedPage
+                    fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+                }
+            }
+        }
+
+        binding.previousPage.setOnClickListener {
+            if (currentPage > 0) {
+                currentPage--
+                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+            }
+        }
+
+        binding.nextPage.setOnClickListener {
+            if (currentPage < totalPages - 1) {
+                currentPage++
+                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+            }
+        }
+    }
+
+    private fun fetchBestCommunityContent(theme: String, page: Int, size: Int, sortBy: String) {
+        isLoading = true
+        service.getCategoryStudy(theme, page, size, sortBy).enqueue(object : Callback<CategoryStudyResponse> {
+            override fun onResponse(call: Call<CategoryStudyResponse>, response: Response<CategoryStudyResponse>) {
+                if (response.isSuccessful) {
+                    response.body()?.let {
+                        val contentList = it.result?.content ?: emptyList()
+                        val mappedList = contentList?.map {
+                            StudyDataResponse.StudyContent(
+                                studyId = it.studyId,
+                                title = it.title,
+                                goal = it.goal,
+                                introduction = it.introduction,
+                                memberCount = it.memberCount,
+                                heartCount = it.heartCount,
+                                hitNum = it.hitNum,
+                                maxPeople = it.maxPeople,
+                                studyState = it.studyState,
+                                themeTypes = it.themeTypes,
+                                regions = it.regions,
+                                imageUrl = it.imageUrl,
+                                liked = it.liked,
+                                createdAt = it.createdAt
+                            )
+                        } ?: emptyList()
+                        totalPages = it.result?.totalPages ?: 0
+                        binding.contentCountTv.text = it.result?.totalElements?.toString() ?: "0"
+                        if (contentList.isNotEmpty()) {
+                            updateRecyclerView(mappedList)
+                            binding.emptyTv.visibility = View.GONE
+                        } else if (currentPage == 0) {
+                            binding.emptyTv.visibility = View.VISIBLE
+                        }
+                        updatePageUI()
+                    }
+                } else {
+                    showLog(response.code().toString())
+                }
+                isLoading = false
+            }
+
+            override fun onFailure(call: Call<CategoryStudyResponse>, t: Throwable) {
+                showLog(t.message)
+                isLoading = false
+            }
+        })
+    }
+
+    private fun updateRecyclerView(contentList: List<StudyDataResponse.StudyContent>) {
+        val adapter = binding.communityCategoryContentRv.adapter as? CategoryStudyContentRVAdapter
+        adapter?.updateList(contentList)
+    }
+
+    private fun updatePageUI() {
+        startPage = if (currentPage <= 2) 0 else minOf(totalPages - 5, maxOf(0, currentPage - 2))
+        val pageButtons = listOf(binding.page1, binding.page2, binding.page3, binding.page4, binding.page5)
+
+        pageButtons.forEachIndexed { index, textView ->
+            val pageNum = startPage + index
+            if (pageNum < totalPages) {
+                textView.text = (pageNum + 1).toString()
+                textView.setBackgroundResource(if (pageNum == currentPage) R.drawable.btn_page_bg else 0)
+                textView.isEnabled = true
+                textView.alpha = 1f
+                textView.visibility = View.VISIBLE
+            } else {
+                textView.text = ""
+                textView.setBackgroundResource(0)
+                textView.isEnabled = false
+                textView.alpha = 0.3f
+                textView.visibility = View.INVISIBLE
+            }
+        }
+
+        binding.previousPage.isEnabled = currentPage > 0
+        binding.nextPage.isEnabled = currentPage < totalPages - 1
+    }
+
+    private fun toggleLikeStatus(studyItem: StudyDataResponse.StudyContent, likeButton: ImageView) {
+        studyViewModel.toggleLikeStatus(studyItem.studyId) { result ->
+            requireActivity().runOnUiThread {
+                result.onSuccess { liked ->
+                    studyItem.liked = liked
+                    val icon = if (liked) R.drawable.ic_heart_filled else R.drawable.study_like
+                    likeButton.setImageResource(icon)
+                    studyItem.heartCount += if (liked) 1 else -1
+                    val adapter = binding.communityCategoryContentRv.adapter as? CategoryStudyContentRVAdapter
+                    adapter?.notifyItemChanged(adapter.dataList.indexOf(studyItem))
+                }.onFailure {
+                    Toast.makeText(requireContext(), "찜 실패: ${it.message}", Toast.LENGTH_SHORT).show()
+                }
+            }
+        }
+    }
+
+    private fun showLog(message: String?) {
+        Toast.makeText(requireContext(), "Error: $message", Toast.LENGTH_SHORT).show()
+    }
+
+    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+        selectedSortBy = when (parent?.getItemAtPosition(position).toString()) {
+            "전체" -> "ALL"
+            "모집중" -> "RECRUITING"
+            "모집완료" -> "COMPLETED"
+            "조회수순" -> "HIT"
+            "관심순" -> "LIKED"
+            else -> "ALL"
+        }
+        currentPage = 0
+        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+    }
+
+    override fun onNothingSelected(parent: AdapterView<*>?) {
+        selectedSortBy = "ALL"
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/LanguageFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/LanguageFragment.kt
new file mode 100644
index 00000000..921057a7
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/LanguageFragment.kt
@@ -0,0 +1,250 @@
+package com.example.spoteam_android.presentation.category.category_tabs
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.spoteam_android.MainActivity
+import com.example.spoteam_android.R
+import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding
+import com.example.spoteam_android.RetrofitInstance
+import com.example.spoteam_android.domain.study.entity.StudyDataResponse
+import com.example.spoteam_android.presentation.community.CategoryStudyResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.study.StudyViewModel
+
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class LanguageFragment : Fragment(), AdapterView.OnItemSelectedListener {
+
+    private lateinit var binding: FragmentCategoryStudyContentBinding
+    private val studyViewModel: StudyViewModel by activityViewModels()
+
+    private var currentPage = 0
+    private val size = 5
+    private var totalPages = 0
+    private var startPage = 0
+    private var isLoading = false
+    private var selectedSortBy: String = "ALL"
+    private val theme :String = "어학"
+    private val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentCategoryStudyContentBinding.inflate(inflater, container, false)
+
+        val categoryStudyAdapter = CategoryStudyContentRVAdapter(
+            ArrayList(),
+            onLikeClick = { selectedItem, likeButton ->
+                toggleLikeStatus(selectedItem, likeButton)
+            })
+
+        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
+
+        categoryStudyAdapter.setItemClickListener(object : CategoryStudyContentRVAdapter.OnItemClickListener {
+            override fun onItemClick(data: StudyDataResponse.StudyContent) {
+                studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
+                val detailStudyFragment = com.example.spoteam_android.presentation.study.DetailStudyFragment()
+                (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
+                    ?.replace(R.id.main_frm, detailStudyFragment)?.addToBackStack(null)?.commit()
+            }
+        })
+
+        binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
+        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        initBottomFilterView()
+        return binding.root
+    }
+
+    private fun initBottomFilterView() {
+        val dialogView = layoutInflater.inflate(R.layout.bottom_sheet_interest_spinner, null)
+        val bottomSheetDialog = BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
+        bottomSheetDialog.setContentView(dialogView)
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_recently).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "최신 순"
+            selectedSortBy = "ALL"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_view).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "조회 수 높은 순"
+            selectedSortBy = "HIT"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_hot).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "관심 많은 순"
+            selectedSortBy = "LIKED"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        binding.contentFilterToggleContainer.setOnClickListener {
+            bottomSheetDialog.show()
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val pageButtons = listOf(
+            binding.page1, binding.page2, binding.page3, binding.page4, binding.page5
+        )
+
+        pageButtons.forEachIndexed { index, textView ->
+            textView.setOnClickListener {
+                val selectedPage = startPage + index
+                if (currentPage != selectedPage) {
+                    currentPage = selectedPage
+                    fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+                }
+            }
+        }
+
+        binding.previousPage.setOnClickListener {
+            if (currentPage > 0) {
+                currentPage--
+                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+            }
+        }
+
+        binding.nextPage.setOnClickListener {
+            if (currentPage < totalPages - 1) {
+                currentPage++
+                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+            }
+        }
+    }
+
+    private fun fetchBestCommunityContent(theme: String, page: Int, size: Int, sortBy: String) {
+        isLoading = true
+        service.getCategoryStudy(theme, page, size, sortBy).enqueue(object : Callback<CategoryStudyResponse> {
+            override fun onResponse(call: Call<CategoryStudyResponse>, response: Response<CategoryStudyResponse>) {
+                if (response.isSuccessful) {
+                    response.body()?.let {
+                        val contentList = it.result?.content ?: emptyList()
+                        val mappedList = contentList?.map {
+                            StudyDataResponse.StudyContent(
+                                studyId = it.studyId,
+                                title = it.title,
+                                goal = it.goal,
+                                introduction = it.introduction,
+                                memberCount = it.memberCount,
+                                heartCount = it.heartCount,
+                                hitNum = it.hitNum,
+                                maxPeople = it.maxPeople,
+                                studyState = it.studyState,
+                                themeTypes = it.themeTypes,
+                                regions = it.regions,
+                                imageUrl = it.imageUrl,
+                                liked = it.liked,
+                                createdAt = it.createdAt
+                            )
+                        } ?: emptyList()
+                        totalPages = it.result?.totalPages ?: 0
+                        binding.contentCountTv.text = it.result?.totalElements?.toString() ?: "0"
+                        if (contentList.isNotEmpty()) {
+                            updateRecyclerView(mappedList)
+                            binding.emptyTv.visibility = View.GONE
+                        } else if (currentPage == 0) {
+                            binding.emptyTv.visibility = View.VISIBLE
+                        }
+                        updatePageUI()
+                    }
+                } else {
+                    showLog(response.code().toString())
+                }
+                isLoading = false
+            }
+
+            override fun onFailure(call: Call<CategoryStudyResponse>, t: Throwable) {
+                showLog(t.message)
+                isLoading = false
+            }
+        })
+    }
+
+    private fun updateRecyclerView(contentList: List<StudyDataResponse.StudyContent>) {
+        val adapter = binding.communityCategoryContentRv.adapter as? CategoryStudyContentRVAdapter
+        adapter?.updateList(contentList)
+    }
+
+    private fun updatePageUI() {
+        startPage = if (currentPage <= 2) 0 else minOf(totalPages - 5, maxOf(0, currentPage - 2))
+        val pageButtons = listOf(binding.page1, binding.page2, binding.page3, binding.page4, binding.page5)
+
+        pageButtons.forEachIndexed { index, textView ->
+            val pageNum = startPage + index
+            if (pageNum < totalPages) {
+                textView.text = (pageNum + 1).toString()
+                textView.setBackgroundResource(if (pageNum == currentPage) R.drawable.btn_page_bg else 0)
+                textView.isEnabled = true
+                textView.alpha = 1f
+                textView.visibility = View.VISIBLE
+            } else {
+                textView.text = ""
+                textView.setBackgroundResource(0)
+                textView.isEnabled = false
+                textView.alpha = 0.3f
+                textView.visibility = View.INVISIBLE
+            }
+        }
+
+        binding.previousPage.isEnabled = currentPage > 0
+        binding.nextPage.isEnabled = currentPage < totalPages - 1
+    }
+
+    private fun toggleLikeStatus(studyItem: StudyDataResponse.StudyContent, likeButton: ImageView) {
+        studyViewModel.toggleLikeStatus(studyItem.studyId) { result ->
+            requireActivity().runOnUiThread {
+                result.onSuccess { liked ->
+                    studyItem.liked = liked
+                    val icon = if (liked) R.drawable.ic_heart_filled else R.drawable.study_like
+                    likeButton.setImageResource(icon)
+                    studyItem.heartCount += if (liked) 1 else -1
+                    val adapter = binding.communityCategoryContentRv.adapter as? CategoryStudyContentRVAdapter
+                    adapter?.notifyItemChanged(adapter.dataList.indexOf(studyItem))
+                }.onFailure {
+                    Toast.makeText(requireContext(), "찜 실패: ${it.message}", Toast.LENGTH_SHORT).show()
+                }
+            }
+        }
+    }
+
+    private fun showLog(message: String?) {
+        Toast.makeText(requireContext(), "Error: $message", Toast.LENGTH_SHORT).show()
+    }
+
+    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+        selectedSortBy = when (parent?.getItemAtPosition(position).toString()) {
+            "전체" -> "ALL"
+            "모집중" -> "RECRUITING"
+            "모집완료" -> "COMPLETED"
+            "조회수순" -> "HIT"
+            "관심순" -> "LIKED"
+            else -> "ALL"
+        }
+        currentPage = 0
+        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+    }
+
+    override fun onNothingSelected(parent: AdapterView<*>?) {
+        selectedSortBy = "ALL"
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/LicenseFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/LicenseFragment.kt
new file mode 100644
index 00000000..b99d7a6f
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/LicenseFragment.kt
@@ -0,0 +1,250 @@
+package com.example.spoteam_android.presentation.category.category_tabs
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.spoteam_android.MainActivity
+import com.example.spoteam_android.R
+import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding
+import com.example.spoteam_android.RetrofitInstance
+import com.example.spoteam_android.domain.study.entity.StudyDataResponse
+import com.example.spoteam_android.presentation.community.CategoryStudyResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.study.StudyViewModel
+
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class LicenseFragment : Fragment(), AdapterView.OnItemSelectedListener {
+
+    private lateinit var binding: FragmentCategoryStudyContentBinding
+    private val studyViewModel: StudyViewModel by activityViewModels()
+
+    private var currentPage = 0
+    private val size = 5
+    private var totalPages = 0
+    private var startPage = 0
+    private var isLoading = false
+    private var selectedSortBy: String = "ALL"
+    private val theme :String = "자격증"
+    private val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentCategoryStudyContentBinding.inflate(inflater, container, false)
+
+        val categoryStudyAdapter = CategoryStudyContentRVAdapter(
+            ArrayList(),
+            onLikeClick = { selectedItem, likeButton ->
+                toggleLikeStatus(selectedItem, likeButton)
+            })
+
+        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
+
+        categoryStudyAdapter.setItemClickListener(object : CategoryStudyContentRVAdapter.OnItemClickListener {
+            override fun onItemClick(data: StudyDataResponse.StudyContent) {
+                studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
+                val detailStudyFragment = com.example.spoteam_android.presentation.study.DetailStudyFragment()
+                (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
+                    ?.replace(R.id.main_frm, detailStudyFragment)?.addToBackStack(null)?.commit()
+            }
+        })
+
+        binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
+        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        initBottomFilterView()
+        return binding.root
+    }
+
+    private fun initBottomFilterView() {
+        val dialogView = layoutInflater.inflate(R.layout.bottom_sheet_interest_spinner, null)
+        val bottomSheetDialog = BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
+        bottomSheetDialog.setContentView(dialogView)
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_recently).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "최신 순"
+            selectedSortBy = "ALL"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_view).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "조회 수 높은 순"
+            selectedSortBy = "HIT"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_hot).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "관심 많은 순"
+            selectedSortBy = "LIKED"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        binding.contentFilterToggleContainer.setOnClickListener {
+            bottomSheetDialog.show()
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val pageButtons = listOf(
+            binding.page1, binding.page2, binding.page3, binding.page4, binding.page5
+        )
+
+        pageButtons.forEachIndexed { index, textView ->
+            textView.setOnClickListener {
+                val selectedPage = startPage + index
+                if (currentPage != selectedPage) {
+                    currentPage = selectedPage
+                    fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+                }
+            }
+        }
+
+        binding.previousPage.setOnClickListener {
+            if (currentPage > 0) {
+                currentPage--
+                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+            }
+        }
+
+        binding.nextPage.setOnClickListener {
+            if (currentPage < totalPages - 1) {
+                currentPage++
+                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+            }
+        }
+    }
+
+    private fun fetchBestCommunityContent(theme: String, page: Int, size: Int, sortBy: String) {
+        isLoading = true
+        service.getCategoryStudy(theme, page, size, sortBy).enqueue(object : Callback<CategoryStudyResponse> {
+            override fun onResponse(call: Call<CategoryStudyResponse>, response: Response<CategoryStudyResponse>) {
+                if (response.isSuccessful) {
+                    response.body()?.let {
+                        val contentList = it.result?.content ?: emptyList()
+                        val mappedList = contentList?.map {
+                            StudyDataResponse.StudyContent(
+                                studyId = it.studyId,
+                                title = it.title,
+                                goal = it.goal,
+                                introduction = it.introduction,
+                                memberCount = it.memberCount,
+                                heartCount = it.heartCount,
+                                hitNum = it.hitNum,
+                                maxPeople = it.maxPeople,
+                                studyState = it.studyState,
+                                themeTypes = it.themeTypes,
+                                regions = it.regions,
+                                imageUrl = it.imageUrl,
+                                liked = it.liked,
+                                createdAt = it.createdAt
+                            )
+                        } ?: emptyList()
+                        totalPages = it.result?.totalPages ?: 0
+                        binding.contentCountTv.text = it.result?.totalElements?.toString() ?: "0"
+                        if (contentList.isNotEmpty()) {
+                            updateRecyclerView(mappedList)
+                            binding.emptyTv.visibility = View.GONE
+                        } else if (currentPage == 0) {
+                            binding.emptyTv.visibility = View.VISIBLE
+                        }
+                        updatePageUI()
+                    }
+                } else {
+                    showLog(response.code().toString())
+                }
+                isLoading = false
+            }
+
+            override fun onFailure(call: Call<CategoryStudyResponse>, t: Throwable) {
+                showLog(t.message)
+                isLoading = false
+            }
+        })
+    }
+
+    private fun updateRecyclerView(contentList: List<StudyDataResponse.StudyContent>) {
+        val adapter = binding.communityCategoryContentRv.adapter as? CategoryStudyContentRVAdapter
+        adapter?.updateList(contentList)
+    }
+
+    private fun updatePageUI() {
+        startPage = if (currentPage <= 2) 0 else minOf(totalPages - 5, maxOf(0, currentPage - 2))
+        val pageButtons = listOf(binding.page1, binding.page2, binding.page3, binding.page4, binding.page5)
+
+        pageButtons.forEachIndexed { index, textView ->
+            val pageNum = startPage + index
+            if (pageNum < totalPages) {
+                textView.text = (pageNum + 1).toString()
+                textView.setBackgroundResource(if (pageNum == currentPage) R.drawable.btn_page_bg else 0)
+                textView.isEnabled = true
+                textView.alpha = 1f
+                textView.visibility = View.VISIBLE
+            } else {
+                textView.text = ""
+                textView.setBackgroundResource(0)
+                textView.isEnabled = false
+                textView.alpha = 0.3f
+                textView.visibility = View.INVISIBLE
+            }
+        }
+
+        binding.previousPage.isEnabled = currentPage > 0
+        binding.nextPage.isEnabled = currentPage < totalPages - 1
+    }
+
+    private fun toggleLikeStatus(studyItem: StudyDataResponse.StudyContent, likeButton: ImageView) {
+        studyViewModel.toggleLikeStatus(studyItem.studyId) { result ->
+            requireActivity().runOnUiThread {
+                result.onSuccess { liked ->
+                    studyItem.liked = liked
+                    val icon = if (liked) R.drawable.ic_heart_filled else R.drawable.study_like
+                    likeButton.setImageResource(icon)
+                    studyItem.heartCount += if (liked) 1 else -1
+                    val adapter = binding.communityCategoryContentRv.adapter as? CategoryStudyContentRVAdapter
+                    adapter?.notifyItemChanged(adapter.dataList.indexOf(studyItem))
+                }.onFailure {
+                    Toast.makeText(requireContext(), "찜 실패: ${it.message}", Toast.LENGTH_SHORT).show()
+                }
+            }
+        }
+    }
+
+    private fun showLog(message: String?) {
+        Toast.makeText(requireContext(), "Error: $message", Toast.LENGTH_SHORT).show()
+    }
+
+    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+        selectedSortBy = when (parent?.getItemAtPosition(position).toString()) {
+            "전체" -> "ALL"
+            "모집중" -> "RECRUITING"
+            "모집완료" -> "COMPLETED"
+            "조회수순" -> "HIT"
+            "관심순" -> "LIKED"
+            else -> "ALL"
+        }
+        currentPage = 0
+        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+    }
+
+    override fun onNothingSelected(parent: AdapterView<*>?) {
+        selectedSortBy = "ALL"
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/MajorFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/MajorFragment.kt
new file mode 100644
index 00000000..b493d194
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/MajorFragment.kt
@@ -0,0 +1,250 @@
+package com.example.spoteam_android.presentation.category.category_tabs
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.spoteam_android.MainActivity
+import com.example.spoteam_android.R
+import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding
+import com.example.spoteam_android.RetrofitInstance
+import com.example.spoteam_android.domain.study.entity.StudyDataResponse
+import com.example.spoteam_android.presentation.community.CategoryStudyResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.study.StudyViewModel
+
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class MajorFragment : Fragment(), AdapterView.OnItemSelectedListener {
+
+    private lateinit var binding: FragmentCategoryStudyContentBinding
+    private val studyViewModel: StudyViewModel by activityViewModels()
+
+    private var currentPage = 0
+    private val size = 5
+    private var totalPages = 0
+    private var startPage = 0
+    private var isLoading = false
+    private var selectedSortBy: String = "ALL"
+    private val theme :String = "전공및진로학습"
+    private val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentCategoryStudyContentBinding.inflate(inflater, container, false)
+
+        val categoryStudyAdapter = CategoryStudyContentRVAdapter(
+            ArrayList(),
+            onLikeClick = { selectedItem, likeButton ->
+                toggleLikeStatus(selectedItem, likeButton)
+            })
+
+        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
+
+        categoryStudyAdapter.setItemClickListener(object : CategoryStudyContentRVAdapter.OnItemClickListener {
+            override fun onItemClick(data: StudyDataResponse.StudyContent) {
+                studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
+                val detailStudyFragment = com.example.spoteam_android.presentation.study.DetailStudyFragment()
+                (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
+                    ?.replace(R.id.main_frm, detailStudyFragment)?.addToBackStack(null)?.commit()
+            }
+        })
+
+        binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
+        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        initBottomFilterView()
+        return binding.root
+    }
+
+    private fun initBottomFilterView() {
+        val dialogView = layoutInflater.inflate(R.layout.bottom_sheet_interest_spinner, null)
+        val bottomSheetDialog = BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
+        bottomSheetDialog.setContentView(dialogView)
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_recently).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "최신 순"
+            selectedSortBy = "ALL"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_view).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "조회 수 높은 순"
+            selectedSortBy = "HIT"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_hot).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "관심 많은 순"
+            selectedSortBy = "LIKED"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        binding.contentFilterToggleContainer.setOnClickListener {
+            bottomSheetDialog.show()
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val pageButtons = listOf(
+            binding.page1, binding.page2, binding.page3, binding.page4, binding.page5
+        )
+
+        pageButtons.forEachIndexed { index, textView ->
+            textView.setOnClickListener {
+                val selectedPage = startPage + index
+                if (currentPage != selectedPage) {
+                    currentPage = selectedPage
+                    fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+                }
+            }
+        }
+
+        binding.previousPage.setOnClickListener {
+            if (currentPage > 0) {
+                currentPage--
+                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+            }
+        }
+
+        binding.nextPage.setOnClickListener {
+            if (currentPage < totalPages - 1) {
+                currentPage++
+                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+            }
+        }
+    }
+
+    private fun fetchBestCommunityContent(theme: String, page: Int, size: Int, sortBy: String) {
+        isLoading = true
+        service.getCategoryStudy(theme, page, size, sortBy).enqueue(object : Callback<CategoryStudyResponse> {
+            override fun onResponse(call: Call<CategoryStudyResponse>, response: Response<CategoryStudyResponse>) {
+                if (response.isSuccessful) {
+                    response.body()?.let {
+                        val contentList = it.result?.content ?: emptyList()
+                        val mappedList = contentList?.map {
+                            StudyDataResponse.StudyContent(
+                                studyId = it.studyId,
+                                title = it.title,
+                                goal = it.goal,
+                                introduction = it.introduction,
+                                memberCount = it.memberCount,
+                                heartCount = it.heartCount,
+                                hitNum = it.hitNum,
+                                maxPeople = it.maxPeople,
+                                studyState = it.studyState,
+                                themeTypes = it.themeTypes,
+                                regions = it.regions,
+                                imageUrl = it.imageUrl,
+                                liked = it.liked,
+                                createdAt = it.createdAt
+                            )
+                        } ?: emptyList()
+                        totalPages = it.result?.totalPages ?: 0
+                        binding.contentCountTv.text = it.result?.totalElements?.toString() ?: "0"
+                        if (contentList.isNotEmpty()) {
+                            updateRecyclerView(mappedList)
+                            binding.emptyTv.visibility = View.GONE
+                        } else if (currentPage == 0) {
+                            binding.emptyTv.visibility = View.VISIBLE
+                        }
+                        updatePageUI()
+                    }
+                } else {
+                    showLog(response.code().toString())
+                }
+                isLoading = false
+            }
+
+            override fun onFailure(call: Call<CategoryStudyResponse>, t: Throwable) {
+                showLog(t.message)
+                isLoading = false
+            }
+        })
+    }
+
+    private fun updateRecyclerView(contentList: List<StudyDataResponse.StudyContent>) {
+        val adapter = binding.communityCategoryContentRv.adapter as? CategoryStudyContentRVAdapter
+        adapter?.updateList(contentList)
+    }
+
+    private fun updatePageUI() {
+        startPage = if (currentPage <= 2) 0 else minOf(totalPages - 5, maxOf(0, currentPage - 2))
+        val pageButtons = listOf(binding.page1, binding.page2, binding.page3, binding.page4, binding.page5)
+
+        pageButtons.forEachIndexed { index, textView ->
+            val pageNum = startPage + index
+            if (pageNum < totalPages) {
+                textView.text = (pageNum + 1).toString()
+                textView.setBackgroundResource(if (pageNum == currentPage) R.drawable.btn_page_bg else 0)
+                textView.isEnabled = true
+                textView.alpha = 1f
+                textView.visibility = View.VISIBLE
+            } else {
+                textView.text = ""
+                textView.setBackgroundResource(0)
+                textView.isEnabled = false
+                textView.alpha = 0.3f
+                textView.visibility = View.INVISIBLE
+            }
+        }
+
+        binding.previousPage.isEnabled = currentPage > 0
+        binding.nextPage.isEnabled = currentPage < totalPages - 1
+    }
+
+    private fun toggleLikeStatus(studyItem: StudyDataResponse.StudyContent, likeButton: ImageView) {
+        studyViewModel.toggleLikeStatus(studyItem.studyId) { result ->
+            requireActivity().runOnUiThread {
+                result.onSuccess { liked ->
+                    studyItem.liked = liked
+                    val icon = if (liked) R.drawable.ic_heart_filled else R.drawable.study_like
+                    likeButton.setImageResource(icon)
+                    studyItem.heartCount += if (liked) 1 else -1
+                    val adapter = binding.communityCategoryContentRv.adapter as? CategoryStudyContentRVAdapter
+                    adapter?.notifyItemChanged(adapter.dataList.indexOf(studyItem))
+                }.onFailure {
+                    Toast.makeText(requireContext(), "찜 실패: ${it.message}", Toast.LENGTH_SHORT).show()
+                }
+            }
+        }
+    }
+
+    private fun showLog(message: String?) {
+        Toast.makeText(requireContext(), "Error: $message", Toast.LENGTH_SHORT).show()
+    }
+
+    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+        selectedSortBy = when (parent?.getItemAtPosition(position).toString()) {
+            "전체" -> "ALL"
+            "모집중" -> "RECRUITING"
+            "모집완료" -> "COMPLETED"
+            "조회수순" -> "HIT"
+            "관심순" -> "LIKED"
+            else -> "ALL"
+        }
+        currentPage = 0
+        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+    }
+
+    override fun onNothingSelected(parent: AdapterView<*>?) {
+        selectedSortBy = "ALL"
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/NewsFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/NewsFragment.kt
new file mode 100644
index 00000000..bde39c0f
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/NewsFragment.kt
@@ -0,0 +1,250 @@
+package com.example.spoteam_android.presentation.category.category_tabs
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.spoteam_android.MainActivity
+import com.example.spoteam_android.R
+import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding
+import com.example.spoteam_android.RetrofitInstance
+import com.example.spoteam_android.domain.study.entity.StudyDataResponse
+import com.example.spoteam_android.presentation.community.CategoryStudyResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.study.StudyViewModel
+
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class NewsFragment : Fragment(), AdapterView.OnItemSelectedListener {
+
+    private lateinit var binding: FragmentCategoryStudyContentBinding
+    private val studyViewModel: StudyViewModel by activityViewModels()
+
+    private var currentPage = 0
+    private val size = 5
+    private var totalPages = 0
+    private var startPage = 0
+    private var isLoading = false
+    private var selectedSortBy: String = "ALL"
+    private val theme :String = "시사뉴스"
+    private val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentCategoryStudyContentBinding.inflate(inflater, container, false)
+
+        val categoryStudyAdapter = CategoryStudyContentRVAdapter(
+            ArrayList(),
+            onLikeClick = { selectedItem, likeButton ->
+                toggleLikeStatus(selectedItem, likeButton)
+            })
+
+        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
+
+        categoryStudyAdapter.setItemClickListener(object : CategoryStudyContentRVAdapter.OnItemClickListener {
+            override fun onItemClick(data: StudyDataResponse.StudyContent) {
+                studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
+                val detailStudyFragment = com.example.spoteam_android.presentation.study.DetailStudyFragment()
+                (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
+                    ?.replace(R.id.main_frm, detailStudyFragment)?.addToBackStack(null)?.commit()
+            }
+        })
+
+        binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
+        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        initBottomFilterView()
+        return binding.root
+    }
+
+    private fun initBottomFilterView() {
+        val dialogView = layoutInflater.inflate(R.layout.bottom_sheet_interest_spinner, null)
+        val bottomSheetDialog = BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
+        bottomSheetDialog.setContentView(dialogView)
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_recently).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "최신 순"
+            selectedSortBy = "ALL"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_view).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "조회 수 높은 순"
+            selectedSortBy = "HIT"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_hot).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "관심 많은 순"
+            selectedSortBy = "LIKED"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        binding.contentFilterToggleContainer.setOnClickListener {
+            bottomSheetDialog.show()
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val pageButtons = listOf(
+            binding.page1, binding.page2, binding.page3, binding.page4, binding.page5
+        )
+
+        pageButtons.forEachIndexed { index, textView ->
+            textView.setOnClickListener {
+                val selectedPage = startPage + index
+                if (currentPage != selectedPage) {
+                    currentPage = selectedPage
+                    fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+                }
+            }
+        }
+
+        binding.previousPage.setOnClickListener {
+            if (currentPage > 0) {
+                currentPage--
+                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+            }
+        }
+
+        binding.nextPage.setOnClickListener {
+            if (currentPage < totalPages - 1) {
+                currentPage++
+                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+            }
+        }
+    }
+
+    private fun fetchBestCommunityContent(theme: String, page: Int, size: Int, sortBy: String) {
+        isLoading = true
+        service.getCategoryStudy(theme, page, size, sortBy).enqueue(object : Callback<CategoryStudyResponse> {
+            override fun onResponse(call: Call<CategoryStudyResponse>, response: Response<CategoryStudyResponse>) {
+                if (response.isSuccessful) {
+                    response.body()?.let {
+                        val contentList = it.result?.content ?: emptyList()
+                        val mappedList = contentList?.map {
+                            StudyDataResponse.StudyContent(
+                                studyId = it.studyId,
+                                title = it.title,
+                                goal = it.goal,
+                                introduction = it.introduction,
+                                memberCount = it.memberCount,
+                                heartCount = it.heartCount,
+                                hitNum = it.hitNum,
+                                maxPeople = it.maxPeople,
+                                studyState = it.studyState,
+                                themeTypes = it.themeTypes,
+                                regions = it.regions,
+                                imageUrl = it.imageUrl,
+                                liked = it.liked,
+                                createdAt = it.createdAt
+                            )
+                        } ?: emptyList()
+                        totalPages = it.result?.totalPages ?: 0
+                        binding.contentCountTv.text = it.result?.totalElements?.toString() ?: "0"
+                        if (contentList.isNotEmpty()) {
+                            updateRecyclerView(mappedList)
+                            binding.emptyTv.visibility = View.GONE
+                        } else if (currentPage == 0) {
+                            binding.emptyTv.visibility = View.VISIBLE
+                        }
+                        updatePageUI()
+                    }
+                } else {
+                    showLog(response.code().toString())
+                }
+                isLoading = false
+            }
+
+            override fun onFailure(call: Call<CategoryStudyResponse>, t: Throwable) {
+                showLog(t.message)
+                isLoading = false
+            }
+        })
+    }
+
+    private fun updateRecyclerView(contentList: List<StudyDataResponse.StudyContent>) {
+        val adapter = binding.communityCategoryContentRv.adapter as? CategoryStudyContentRVAdapter
+        adapter?.updateList(contentList)
+    }
+
+    private fun updatePageUI() {
+        startPage = if (currentPage <= 2) 0 else minOf(totalPages - 5, maxOf(0, currentPage - 2))
+        val pageButtons = listOf(binding.page1, binding.page2, binding.page3, binding.page4, binding.page5)
+
+        pageButtons.forEachIndexed { index, textView ->
+            val pageNum = startPage + index
+            if (pageNum < totalPages) {
+                textView.text = (pageNum + 1).toString()
+                textView.setBackgroundResource(if (pageNum == currentPage) R.drawable.btn_page_bg else 0)
+                textView.isEnabled = true
+                textView.alpha = 1f
+                textView.visibility = View.VISIBLE
+            } else {
+                textView.text = ""
+                textView.setBackgroundResource(0)
+                textView.isEnabled = false
+                textView.alpha = 0.3f
+                textView.visibility = View.INVISIBLE
+            }
+        }
+
+        binding.previousPage.isEnabled = currentPage > 0
+        binding.nextPage.isEnabled = currentPage < totalPages - 1
+    }
+
+    private fun toggleLikeStatus(studyItem: StudyDataResponse.StudyContent, likeButton: ImageView) {
+        studyViewModel.toggleLikeStatus(studyItem.studyId) { result ->
+            requireActivity().runOnUiThread {
+                result.onSuccess { liked ->
+                    studyItem.liked = liked
+                    val icon = if (liked) R.drawable.ic_heart_filled else R.drawable.study_like
+                    likeButton.setImageResource(icon)
+                    studyItem.heartCount += if (liked) 1 else -1
+                    val adapter = binding.communityCategoryContentRv.adapter as? CategoryStudyContentRVAdapter
+                    adapter?.notifyItemChanged(adapter.dataList.indexOf(studyItem))
+                }.onFailure {
+                    Toast.makeText(requireContext(), "찜 실패: ${it.message}", Toast.LENGTH_SHORT).show()
+                }
+            }
+        }
+    }
+
+    private fun showLog(message: String?) {
+        Toast.makeText(requireContext(), "Error: $message", Toast.LENGTH_SHORT).show()
+    }
+
+    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+        selectedSortBy = when (parent?.getItemAtPosition(position).toString()) {
+            "전체" -> "ALL"
+            "모집중" -> "RECRUITING"
+            "모집완료" -> "COMPLETED"
+            "조회수순" -> "HIT"
+            "관심순" -> "LIKED"
+            else -> "ALL"
+        }
+        currentPage = 0
+        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+    }
+
+    override fun onNothingSelected(parent: AdapterView<*>?) {
+        selectedSortBy = "ALL"
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/ProjectFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/ProjectFragment.kt
new file mode 100644
index 00000000..06f6f6bf
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/ProjectFragment.kt
@@ -0,0 +1,250 @@
+package com.example.spoteam_android.presentation.category.category_tabs
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.spoteam_android.MainActivity
+import com.example.spoteam_android.R
+import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding
+import com.example.spoteam_android.RetrofitInstance
+import com.example.spoteam_android.domain.study.entity.StudyDataResponse
+import com.example.spoteam_android.presentation.community.CategoryStudyResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.study.StudyViewModel
+
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class ProjectFragment : Fragment(), AdapterView.OnItemSelectedListener {
+
+    private lateinit var binding: FragmentCategoryStudyContentBinding
+    private val studyViewModel: StudyViewModel by activityViewModels()
+
+    private var currentPage = 0
+    private val size = 5
+    private var totalPages = 0
+    private var startPage = 0
+    private var isLoading = false
+    private var selectedSortBy: String = "ALL"
+    private val theme :String = "프로젝트"
+    private val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentCategoryStudyContentBinding.inflate(inflater, container, false)
+
+        val categoryStudyAdapter = CategoryStudyContentRVAdapter(
+            ArrayList(),
+            onLikeClick = { selectedItem, likeButton ->
+                toggleLikeStatus(selectedItem, likeButton)
+            })
+
+        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
+
+        categoryStudyAdapter.setItemClickListener(object : CategoryStudyContentRVAdapter.OnItemClickListener {
+            override fun onItemClick(data: StudyDataResponse.StudyContent) {
+                studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
+                val detailStudyFragment = com.example.spoteam_android.presentation.study.DetailStudyFragment()
+                (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
+                    ?.replace(R.id.main_frm, detailStudyFragment)?.addToBackStack(null)?.commit()
+            }
+        })
+
+        binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
+        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        initBottomFilterView()
+        return binding.root
+    }
+
+    private fun initBottomFilterView() {
+        val dialogView = layoutInflater.inflate(R.layout.bottom_sheet_interest_spinner, null)
+        val bottomSheetDialog = BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
+        bottomSheetDialog.setContentView(dialogView)
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_recently).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "최신 순"
+            selectedSortBy = "ALL"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_view).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "조회 수 높은 순"
+            selectedSortBy = "HIT"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_hot).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "관심 많은 순"
+            selectedSortBy = "LIKED"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        binding.contentFilterToggleContainer.setOnClickListener {
+            bottomSheetDialog.show()
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val pageButtons = listOf(
+            binding.page1, binding.page2, binding.page3, binding.page4, binding.page5
+        )
+
+        pageButtons.forEachIndexed { index, textView ->
+            textView.setOnClickListener {
+                val selectedPage = startPage + index
+                if (currentPage != selectedPage) {
+                    currentPage = selectedPage
+                    fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+                }
+            }
+        }
+
+        binding.previousPage.setOnClickListener {
+            if (currentPage > 0) {
+                currentPage--
+                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+            }
+        }
+
+        binding.nextPage.setOnClickListener {
+            if (currentPage < totalPages - 1) {
+                currentPage++
+                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+            }
+        }
+    }
+
+    private fun fetchBestCommunityContent(theme: String, page: Int, size: Int, sortBy: String) {
+        isLoading = true
+        service.getCategoryStudy(theme, page, size, sortBy).enqueue(object : Callback<CategoryStudyResponse> {
+            override fun onResponse(call: Call<CategoryStudyResponse>, response: Response<CategoryStudyResponse>) {
+                if (response.isSuccessful) {
+                    response.body()?.let {
+                        val contentList = it.result?.content ?: emptyList()
+                        val mappedList = contentList?.map {
+                            StudyDataResponse.StudyContent(
+                                studyId = it.studyId,
+                                title = it.title,
+                                goal = it.goal,
+                                introduction = it.introduction,
+                                memberCount = it.memberCount,
+                                heartCount = it.heartCount,
+                                hitNum = it.hitNum,
+                                maxPeople = it.maxPeople,
+                                studyState = it.studyState,
+                                themeTypes = it.themeTypes,
+                                regions = it.regions,
+                                imageUrl = it.imageUrl,
+                                liked = it.liked,
+                                createdAt = it.createdAt
+                            )
+                        } ?: emptyList()
+                        totalPages = it.result?.totalPages ?: 0
+                        binding.contentCountTv.text = it.result?.totalElements?.toString() ?: "0"
+                        if (contentList.isNotEmpty()) {
+                            updateRecyclerView(mappedList)
+                            binding.emptyTv.visibility = View.GONE
+                        } else if (currentPage == 0) {
+                            binding.emptyTv.visibility = View.VISIBLE
+                        }
+                        updatePageUI()
+                    }
+                } else {
+                    showLog(response.code().toString())
+                }
+                isLoading = false
+            }
+
+            override fun onFailure(call: Call<CategoryStudyResponse>, t: Throwable) {
+                showLog(t.message)
+                isLoading = false
+            }
+        })
+    }
+
+    private fun updateRecyclerView(contentList: List<StudyDataResponse.StudyContent>) {
+        val adapter = binding.communityCategoryContentRv.adapter as? CategoryStudyContentRVAdapter
+        adapter?.updateList(contentList)
+    }
+
+    private fun updatePageUI() {
+        startPage = if (currentPage <= 2) 0 else minOf(totalPages - 5, maxOf(0, currentPage - 2))
+        val pageButtons = listOf(binding.page1, binding.page2, binding.page3, binding.page4, binding.page5)
+
+        pageButtons.forEachIndexed { index, textView ->
+            val pageNum = startPage + index
+            if (pageNum < totalPages) {
+                textView.text = (pageNum + 1).toString()
+                textView.setBackgroundResource(if (pageNum == currentPage) R.drawable.btn_page_bg else 0)
+                textView.isEnabled = true
+                textView.alpha = 1f
+                textView.visibility = View.VISIBLE
+            } else {
+                textView.text = ""
+                textView.setBackgroundResource(0)
+                textView.isEnabled = false
+                textView.alpha = 0.3f
+                textView.visibility = View.INVISIBLE
+            }
+        }
+
+        binding.previousPage.isEnabled = currentPage > 0
+        binding.nextPage.isEnabled = currentPage < totalPages - 1
+    }
+
+    private fun toggleLikeStatus(studyItem: StudyDataResponse.StudyContent, likeButton: ImageView) {
+        studyViewModel.toggleLikeStatus(studyItem.studyId) { result ->
+            requireActivity().runOnUiThread {
+                result.onSuccess { liked ->
+                    studyItem.liked = liked
+                    val icon = if (liked) R.drawable.ic_heart_filled else R.drawable.study_like
+                    likeButton.setImageResource(icon)
+                    studyItem.heartCount += if (liked) 1 else -1
+                    val adapter = binding.communityCategoryContentRv.adapter as? CategoryStudyContentRVAdapter
+                    adapter?.notifyItemChanged(adapter.dataList.indexOf(studyItem))
+                }.onFailure {
+                    Toast.makeText(requireContext(), "찜 실패: ${it.message}", Toast.LENGTH_SHORT).show()
+                }
+            }
+        }
+    }
+
+    private fun showLog(message: String?) {
+        Toast.makeText(requireContext(), "Error: $message", Toast.LENGTH_SHORT).show()
+    }
+
+    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+        selectedSortBy = when (parent?.getItemAtPosition(position).toString()) {
+            "전체" -> "ALL"
+            "모집중" -> "RECRUITING"
+            "모집완료" -> "COMPLETED"
+            "조회수순" -> "HIT"
+            "관심순" -> "LIKED"
+            else -> "ALL"
+        }
+        currentPage = 0
+        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+    }
+
+    override fun onNothingSelected(parent: AdapterView<*>?) {
+        selectedSortBy = "ALL"
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/RestFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/RestFragment.kt
new file mode 100644
index 00000000..79facab9
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/category/category_tabs/RestFragment.kt
@@ -0,0 +1,250 @@
+package com.example.spoteam_android.presentation.category.category_tabs
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.spoteam_android.MainActivity
+import com.example.spoteam_android.R
+import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding
+import com.example.spoteam_android.RetrofitInstance
+import com.example.spoteam_android.domain.study.entity.StudyDataResponse
+import com.example.spoteam_android.presentation.community.CategoryStudyResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.study.StudyViewModel
+
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class RestFragment : Fragment(), AdapterView.OnItemSelectedListener {
+
+    private lateinit var binding: FragmentCategoryStudyContentBinding
+    private val studyViewModel: StudyViewModel by activityViewModels()
+
+    private var currentPage = 0
+    private val size = 5
+    private var totalPages = 0
+    private var startPage = 0
+    private var isLoading = false
+    private var selectedSortBy: String = "ALL"
+    private val theme :String = "기타"
+    private val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentCategoryStudyContentBinding.inflate(inflater, container, false)
+
+        val categoryStudyAdapter = CategoryStudyContentRVAdapter(
+            ArrayList(),
+            onLikeClick = { selectedItem, likeButton ->
+                toggleLikeStatus(selectedItem, likeButton)
+            })
+
+        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
+
+        categoryStudyAdapter.setItemClickListener(object : CategoryStudyContentRVAdapter.OnItemClickListener {
+            override fun onItemClick(data: StudyDataResponse.StudyContent) {
+                studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
+                val detailStudyFragment = com.example.spoteam_android.presentation.study.DetailStudyFragment()
+                (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
+                    ?.replace(R.id.main_frm, detailStudyFragment)?.addToBackStack(null)?.commit()
+            }
+        })
+
+        binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
+        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        initBottomFilterView()
+        return binding.root
+    }
+
+    private fun initBottomFilterView() {
+        val dialogView = layoutInflater.inflate(R.layout.bottom_sheet_interest_spinner, null)
+        val bottomSheetDialog = BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
+        bottomSheetDialog.setContentView(dialogView)
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_recently).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "최신 순"
+            selectedSortBy = "ALL"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_view).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "조회 수 높은 순"
+            selectedSortBy = "HIT"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        dialogView.findViewById<FrameLayout>(R.id.framelayout_hot).setOnClickListener {
+            bottomSheetDialog.dismiss()
+            binding.filterToggle.text = "관심 많은 순"
+            selectedSortBy = "LIKED"
+            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+        }
+
+        binding.contentFilterToggleContainer.setOnClickListener {
+            bottomSheetDialog.show()
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val pageButtons = listOf(
+            binding.page1, binding.page2, binding.page3, binding.page4, binding.page5
+        )
+
+        pageButtons.forEachIndexed { index, textView ->
+            textView.setOnClickListener {
+                val selectedPage = startPage + index
+                if (currentPage != selectedPage) {
+                    currentPage = selectedPage
+                    fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+                }
+            }
+        }
+
+        binding.previousPage.setOnClickListener {
+            if (currentPage > 0) {
+                currentPage--
+                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+            }
+        }
+
+        binding.nextPage.setOnClickListener {
+            if (currentPage < totalPages - 1) {
+                currentPage++
+                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+            }
+        }
+    }
+
+    private fun fetchBestCommunityContent(theme: String, page: Int, size: Int, sortBy: String) {
+        isLoading = true
+        service.getCategoryStudy(theme, page, size, sortBy).enqueue(object : Callback<CategoryStudyResponse> {
+            override fun onResponse(call: Call<CategoryStudyResponse>, response: Response<CategoryStudyResponse>) {
+                if (response.isSuccessful) {
+                    response.body()?.let {
+                        val contentList = it.result?.content ?: emptyList()
+                        val mappedList = contentList?.map {
+                            StudyDataResponse.StudyContent(
+                                studyId = it.studyId,
+                                title = it.title,
+                                goal = it.goal,
+                                introduction = it.introduction,
+                                memberCount = it.memberCount,
+                                heartCount = it.heartCount,
+                                hitNum = it.hitNum,
+                                maxPeople = it.maxPeople,
+                                studyState = it.studyState,
+                                themeTypes = it.themeTypes,
+                                regions = it.regions,
+                                imageUrl = it.imageUrl,
+                                liked = it.liked,
+                                createdAt = it.createdAt
+                            )
+                        } ?: emptyList()
+                        totalPages = it.result?.totalPages ?: 0
+                        binding.contentCountTv.text = it.result?.totalElements?.toString() ?: "0"
+                        if (contentList.isNotEmpty()) {
+                            updateRecyclerView(mappedList)
+                            binding.emptyTv.visibility = View.GONE
+                        } else if (currentPage == 0) {
+                            binding.emptyTv.visibility = View.VISIBLE
+                        }
+                        updatePageUI()
+                    }
+                } else {
+                    showLog(response.code().toString())
+                }
+                isLoading = false
+            }
+
+            override fun onFailure(call: Call<CategoryStudyResponse>, t: Throwable) {
+                showLog(t.message)
+                isLoading = false
+            }
+        })
+    }
+
+    private fun updateRecyclerView(contentList: List<StudyDataResponse.StudyContent>) {
+        val adapter = binding.communityCategoryContentRv.adapter as? CategoryStudyContentRVAdapter
+        adapter?.updateList(contentList)
+    }
+
+    private fun updatePageUI() {
+        startPage = if (currentPage <= 2) 0 else minOf(totalPages - 5, maxOf(0, currentPage - 2))
+        val pageButtons = listOf(binding.page1, binding.page2, binding.page3, binding.page4, binding.page5)
+
+        pageButtons.forEachIndexed { index, textView ->
+            val pageNum = startPage + index
+            if (pageNum < totalPages) {
+                textView.text = (pageNum + 1).toString()
+                textView.setBackgroundResource(if (pageNum == currentPage) R.drawable.btn_page_bg else 0)
+                textView.isEnabled = true
+                textView.alpha = 1f
+                textView.visibility = View.VISIBLE
+            } else {
+                textView.text = ""
+                textView.setBackgroundResource(0)
+                textView.isEnabled = false
+                textView.alpha = 0.3f
+                textView.visibility = View.INVISIBLE
+            }
+        }
+
+        binding.previousPage.isEnabled = currentPage > 0
+        binding.nextPage.isEnabled = currentPage < totalPages - 1
+    }
+
+    private fun toggleLikeStatus(studyItem: StudyDataResponse.StudyContent, likeButton: ImageView) {
+        studyViewModel.toggleLikeStatus(studyItem.studyId) { result ->
+            requireActivity().runOnUiThread {
+                result.onSuccess { liked ->
+                    studyItem.liked = liked
+                    val icon = if (liked) R.drawable.ic_heart_filled else R.drawable.study_like
+                    likeButton.setImageResource(icon)
+                    studyItem.heartCount += if (liked) 1 else -1
+                    val adapter = binding.communityCategoryContentRv.adapter as? CategoryStudyContentRVAdapter
+                    adapter?.notifyItemChanged(adapter.dataList.indexOf(studyItem))
+                }.onFailure {
+                    Toast.makeText(requireContext(), "찜 실패: ${it.message}", Toast.LENGTH_SHORT).show()
+                }
+            }
+        }
+    }
+
+    private fun showLog(message: String?) {
+        Toast.makeText(requireContext(), "Error: $message", Toast.LENGTH_SHORT).show()
+    }
+
+    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+        selectedSortBy = when (parent?.getItemAtPosition(position).toString()) {
+            "전체" -> "ALL"
+            "모집중" -> "RECRUITING"
+            "모집완료" -> "COMPLETED"
+            "조회수순" -> "HIT"
+            "관심순" -> "LIKED"
+            else -> "ALL"
+        }
+        currentPage = 0
+        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
+    }
+
+    override fun onNothingSelected(parent: AdapterView<*>?) {
+        selectedSortBy = "ALL"
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityAPIService.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityAPIService.kt
similarity index 99%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityAPIService.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityAPIService.kt
index e3ad753a..4d8be54a 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityAPIService.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityAPIService.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.community
+package com.example.spoteam_android.presentation.community
 
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityCategoryVPAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityCategoryVPAdapter.kt
similarity index 52%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityCategoryVPAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityCategoryVPAdapter.kt
index 3d21d23c..3749ca9c 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityCategoryVPAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityCategoryVPAdapter.kt
@@ -1,15 +1,14 @@
-package com.example.spoteam_android.ui.community
+package com.example.spoteam_android.presentation.community
 
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.example.spoteam_android.ui.community.communityContent.AllFragment
-//import com.example.spoteam_android.ui.community.communityContent.AllFragment
-import com.example.spoteam_android.ui.community.communityContent.CounselingFragment
-import com.example.spoteam_android.ui.community.communityContent.FreeTalkFragment
-import com.example.spoteam_android.ui.community.communityContent.JobSeekingTalkFragment
-import com.example.spoteam_android.ui.community.communityContent.PassingReviewFragment
-import com.example.spoteam_android.ui.community.communityContent.ShareInfoFragment
-import com.example.spoteam_android.ui.community.communityContent.NotificationFragment
+import com.example.spoteam_android.presentation.community.communityContent.AllFragment
+import com.example.spoteam_android.presentation.community.communityContent.CounselingFragment
+import com.example.spoteam_android.presentation.community.communityContent.FreeTalkFragment
+import com.example.spoteam_android.presentation.community.communityContent.JobSeekingTalkFragment
+import com.example.spoteam_android.presentation.community.communityContent.NotificationFragment
+import com.example.spoteam_android.presentation.community.communityContent.PassingReviewFragment
+import com.example.spoteam_android.presentation.community.communityContent.ShareInfoFragment
 
 class CommunityCategoryVPAdapter(fragment : Fragment) : FragmentStateAdapter(fragment) {
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityContentActivity.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityContentActivity.kt
similarity index 97%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityContentActivity.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityContentActivity.kt
index 5c1615c9..05c411ee 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityContentActivity.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityContentActivity.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.community
+package com.example.spoteam_android.presentation.community
 
 import android.content.Context
 import android.graphics.PorterDuff
@@ -24,7 +24,7 @@ import com.bumptech.glide.Glide
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.ActivityCommunityContentBinding
-import com.example.spoteam_android.ui.community.contentComment.ContentCommentMultiViewRVAdapter
+import com.example.spoteam_android.presentation.community.contentComment.ContentCommentMultiViewRVAdapter
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import retrofit2.Call
 import retrofit2.Callback
@@ -173,7 +173,7 @@ class CommunityContentActivity : AppCompatActivity()  {
                 ) {
                     if (response.isSuccessful) {
                         val likeResponse = response.body()
-                        if (likeResponse?.isSuccess == "true") {
+                        if (likeResponse?.isSuccess == true) {
                             fetchContentInfo()
                         } else {
                             showError(likeResponse?.message)
@@ -199,7 +199,7 @@ class CommunityContentActivity : AppCompatActivity()  {
                 ) {
                     if (response.isSuccessful) {
                         val likeResponse = response.body()
-                        if (likeResponse?.isSuccess == "true") {
+                        if (likeResponse?.isSuccess == true) {
                             fetchContentInfo()
                         } else {
                             showError(likeResponse?.message)
@@ -225,7 +225,7 @@ class CommunityContentActivity : AppCompatActivity()  {
                 ) {
                     if (response.isSuccessful) {
                         val unLikeResponse = response.body()
-                        if (unLikeResponse?.isSuccess == "true") {
+                        if (unLikeResponse?.isSuccess == true) {
                             fetchContentInfo()
                         } else {
                             showError(unLikeResponse?.message)
@@ -251,7 +251,7 @@ class CommunityContentActivity : AppCompatActivity()  {
                 ) {
                     if (response.isSuccessful) {
                         val unLikeResponse = response.body()
-                        if (unLikeResponse?.isSuccess == "true") {
+                        if (unLikeResponse?.isSuccess == true) {
                             fetchContentInfo()
                         } else {
                             showError(unLikeResponse?.message)
@@ -288,7 +288,7 @@ class CommunityContentActivity : AppCompatActivity()  {
                 override fun onResponse(
                     call: Call<WriteCommentResponse>,
                     response: Response<WriteCommentResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         Log.d("WriteComment", "${response.body()!!.result}")
                         parentCommentId = 0 // postCommentID 초기화
                         binding.writeCommentContentEt.text.clear()
@@ -320,7 +320,7 @@ class CommunityContentActivity : AppCompatActivity()  {
                 ) {
                     if (response.isSuccessful) {
                         val deletePostResponse = response.body()
-                        if (deletePostResponse?.isSuccess == "true") {
+                        if (deletePostResponse?.isSuccess == true) {
                             showSuccessDeleteDialog(view, fragmentManager)
 
                         } else {
@@ -429,7 +429,7 @@ class CommunityContentActivity : AppCompatActivity()  {
                 ) {
                     if (response.isSuccessful) {
                         val contentResponse = response.body()
-                        if (contentResponse?.isSuccess == "true") {
+                        if (contentResponse?.isSuccess == true) {
                             val reportContentDialog = ReportContentDialog(view.context, fragmentManager)
                             reportContentDialog.start()
                         } else {
@@ -456,7 +456,7 @@ class CommunityContentActivity : AppCompatActivity()  {
                 ) {
                     if (response.isSuccessful) {
                         val contentResponse = response.body()
-                        if (contentResponse?.isSuccess == "true") {
+                        if (contentResponse?.isSuccess == true) {
                             val contentInfo = contentResponse.result
                             val commentInfo = contentInfo.commentResponses.comments
 //                            Log.d("CommunityHomeTest", contentInfo.title)
@@ -493,7 +493,7 @@ class CommunityContentActivity : AppCompatActivity()  {
                     if (response.isSuccessful) {
                         val likeResponse = response.body()
 //                        Log.d("LikeComment", "responseBody: ${likeResponse?.isSuccess}")
-                        if (likeResponse?.isSuccess == "true") {
+                        if (likeResponse?.isSuccess == true) {
                             fetchContentInfo()
                         } else {
                             showError(likeResponse?.message)
@@ -521,7 +521,7 @@ class CommunityContentActivity : AppCompatActivity()  {
                     if (response.isSuccessful) {
                         val unLikeResponse = response.body()
 //                        Log.d("UnLikeComment", "responseBody: ${unLikeResponse?.isSuccess}")
-                        if (unLikeResponse?.isSuccess == "true") {
+                        if (unLikeResponse?.isSuccess == true) {
                             fetchContentInfo()
                         } else {
                             showError(unLikeResponse?.message)
@@ -549,7 +549,7 @@ class CommunityContentActivity : AppCompatActivity()  {
                     if (response.isSuccessful) {
                         val likeResponse = response.body()
 //                        Log.d("DisLikeComment", "responseBody: ${likeResponse?.isSuccess}")
-                        if (likeResponse?.isSuccess == "true") {
+                        if (likeResponse?.isSuccess == true) {
                             fetchContentInfo()
                         } else {
                             showError(likeResponse?.message)
@@ -577,7 +577,7 @@ class CommunityContentActivity : AppCompatActivity()  {
                     if (response.isSuccessful) {
                         val unLikeResponse = response.body()
 //                        Log.d("UnDisLikeComment", "responseBody: ${unLikeResponse?.isSuccess}")
-                        if (unLikeResponse?.isSuccess == "true") {
+                        if (unLikeResponse?.isSuccess == true) {
                             fetchContentInfo()
                         } else {
                             showError(unLikeResponse?.message)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityFragment.kt
similarity index 97%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityFragment.kt
index 13c50bbc..13a7c9e9 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.community
+package com.example.spoteam_android.presentation.community
 
 import android.graphics.Color
 import android.graphics.Typeface
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityHomeFragment.kt
similarity index 93%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityHomeFragment.kt
index 5b3fae8a..d616cf83 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityHomeFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.community
+package com.example.spoteam_android.presentation.community
 
 import android.os.Bundle
 import android.util.Log
@@ -8,14 +8,13 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.HouseFragment
+import com.example.spoteam_android.presentation.home.HomeFragment
 import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentCommunityHomeBinding
-import com.example.spoteam_android.search.SearchFragment
-import com.example.spoteam_android.ui.alert.AlertFragment
-import com.example.spoteam_android.ui.home.HomeFragment
+import com.example.spoteam_android.presentation.search.SearchFragment
+import com.example.spoteam_android.presentation.alert.AlertFragment
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -85,7 +84,7 @@ class CommunityHomeFragment : Fragment() {
 
         binding.icSpotLogo.setOnClickListener{
             (context as MainActivity).supportFragmentManager.beginTransaction()
-                .replace(R.id.main_frm, HouseFragment())
+                .replace(R.id.main_frm, HomeFragment())
                 .commitAllowingStateLoss()
             (context as MainActivity).isOnCommunityHome(HomeFragment())
         }
@@ -112,7 +111,7 @@ class CommunityHomeFragment : Fragment() {
                 ) {
                     if (response.isSuccessful) {
                         val communityResponse = response.body()
-                        if (communityResponse?.isSuccess == "true") {
+                        if (communityResponse?.isSuccess == true) {
                             val contentList = communityResponse.result?.postBest5Responses
 //                            Log.d("BestCommunity", "items: $contentList")
                             if (contentList != null) {
@@ -143,7 +142,7 @@ class CommunityHomeFragment : Fragment() {
                 ) {
                     if (response.isSuccessful) {
                         val announcementResponse = response.body()
-                        if (announcementResponse?.isSuccess == "true") {
+                        if (announcementResponse?.isSuccess == true) {
                             val announcementList = announcementResponse.result?.responses
 //                            Log.d("Announcement", "items: $announcementList")
                             if (announcementList != null) {
@@ -174,7 +173,7 @@ class CommunityHomeFragment : Fragment() {
                 ) {
                     if (response.isSuccessful) {
                         val representativeResponse = response.body()
-                        if (representativeResponse?.isSuccess == "true") {
+                        if (representativeResponse?.isSuccess == true) {
                             val representativeList = representativeResponse.result?.responses
 //                            Log.d("Representative", "items: $representativeList")
                             if (representativeList != null) {
@@ -218,7 +217,10 @@ class CommunityHomeFragment : Fragment() {
         binding.communityHomeNotificationContentRv.layoutManager =
             LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
 
-        val dataRVAdapter = CommunityHomeRVAdapterAnnouncement(announcementList)
+        val dataRVAdapter =
+            com.example.spoteam_android.presentation.community.CommunityHomeRVAdapterAnnouncement(
+                announcementList
+            )
         binding.communityHomeNotificationContentRv.adapter = dataRVAdapter
     }
 }
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeRVAdapterAnnouncement.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityHomeRVAdapterAnnouncement.kt
similarity index 64%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeRVAdapterAnnouncement.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityHomeRVAdapterAnnouncement.kt
index e03763a6..a4238eb9 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeRVAdapterAnnouncement.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityHomeRVAdapterAnnouncement.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.community
+package com.example.spoteam_android.presentation.community
 
 import android.content.Intent
 import android.view.LayoutInflater
@@ -8,21 +8,21 @@ import androidx.recyclerview.widget.RecyclerView
 import com.example.spoteam_android.databinding.ItemCommunityhomeContentWithIndexBinding
 import com.kakao.sdk.template.model.Content
 
-class CommunityHomeRVAdapterAnnouncement(private val dataList: List<AnnouncementDetailInfo>) : RecyclerView.Adapter<CommunityHomeRVAdapterAnnouncement.ViewHolder>() {
+class CommunityHomeRVAdapterAnnouncement(private val dataList: List<com.example.spoteam_android.presentation.community.AnnouncementDetailInfo>) : RecyclerView.Adapter<com.example.spoteam_android.presentation.community.CommunityHomeRVAdapterAnnouncement.ViewHolder>() {
 
     interface ItemClick {
         fun onItemClick(view: View, position: Int, parentCommentId : Int)
     }
 
-    var itemClick: ItemClick? = null
+    var itemClick: _root_ide_package_.com.example.spoteam_android.presentation.community.CommunityHomeRVAdapterAnnouncement.ItemClick? = null
 
-    override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder {
+    override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): _root_ide_package_.com.example.spoteam_android.presentation.community.CommunityHomeRVAdapterAnnouncement.ViewHolder {
         val binding: ItemCommunityhomeContentWithIndexBinding = ItemCommunityhomeContentWithIndexBinding.inflate(LayoutInflater.from(viewGroup.context), viewGroup, false)
 
         return ViewHolder(binding)
     }
 
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+    override fun onBindViewHolder(holder: _root_ide_package_.com.example.spoteam_android.presentation.community.CommunityHomeRVAdapterAnnouncement.ViewHolder, position: Int) {
         if (position < dataList.size) {
             holder.bind(dataList[position])
         }
@@ -33,7 +33,7 @@ class CommunityHomeRVAdapterAnnouncement(private val dataList: List<Announcement
     }
 
     inner class ViewHolder(val binding : ItemCommunityhomeContentWithIndexBinding) : RecyclerView.ViewHolder(binding.root) {
-        fun bind(data: AnnouncementDetailInfo){
+        fun bind(data: _root_ide_package_.com.example.spoteam_android.presentation.community.AnnouncementDetailInfo){
             binding.contentIndexTv.text = data.rank.toString()
             binding.contentTitleTv.text = data.postTitle
 
@@ -47,7 +47,7 @@ class CommunityHomeRVAdapterAnnouncement(private val dataList: List<Announcement
 
             binding.root.setOnClickListener{
                 val context = binding.root.context
-                val intent = Intent(context, CommunityContentActivity::class.java)
+                val intent = Intent(context, _root_ide_package_.com.example.spoteam_android.presentation.community.CommunityContentActivity::class.java)
                 intent.putExtra("postInfo", data.postId) // postId 등 필요한 데이터 전달
                 context.startActivity(intent)
             }
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeRVAdapterWithCategory.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityHomeRVAdapterWithCategory.kt
similarity index 97%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeRVAdapterWithCategory.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityHomeRVAdapterWithCategory.kt
index 13f65f25..60406d4f 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeRVAdapterWithCategory.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityHomeRVAdapterWithCategory.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.community
+package com.example.spoteam_android.presentation.community
 
 import android.content.Intent
 import android.view.LayoutInflater
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeRVAdapterWithIndex.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityHomeRVAdapterWithIndex.kt
similarity index 97%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeRVAdapterWithIndex.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityHomeRVAdapterWithIndex.kt
index 577c8ce9..e794652e 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeRVAdapterWithIndex.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityHomeRVAdapterWithIndex.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.community
+package com.example.spoteam_android.presentation.community
 
 import android.content.Intent
 import android.view.LayoutInflater
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityRequest.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityRequest.kt
similarity index 75%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityRequest.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityRequest.kt
index 118ae009..6b0d6cb6 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityRequest.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityRequest.kt
@@ -1,14 +1,15 @@
-package com.example.spoteam_android.ui.community
+package com.example.spoteam_android.presentation.community
 
+import kotlinx.serialization.Serializable
 import okhttp3.MultipartBody
-
+@Serializable
 /*********게시글 작성 Request********/
 data class WriteContentRequest(
     val title: String,
     val content : String,
     val type: String,
     val anonymous : Boolean
-)
+)@Serializable
 
 /*********게시글 댓글 작성 Request********/
 data class WriteCommentRequest(
@@ -17,20 +18,12 @@ data class WriteCommentRequest(
     val parentCommentId : Int?
 )
 
-/*********내 스터디 게시글 작성 Request********/
-data class StudyWriteContentRequest(
-    val isAnnouncement: Boolean,
-    val theme: String,
-    val title: String,
-    val content: String,
-    val images: List<MultipartBody.Part?>
-)
-
+@Serializable
 /*********스터디 게시글 댓글 작성 Request********/
 data class WriteStudyCommentRequest(
     val isAnonymous : Boolean,
     val content : String
-)
+)@Serializable
 
 /*********퀴즈 생성 Request********/
 data class QuizContentRequest(
@@ -38,13 +31,13 @@ data class QuizContentRequest(
     val question : String,
     val answer : String
 )
-
+@Serializable
 /*********퀴즈 정답 확인 Request********/
 data class CrewAnswerRequest(
     val dateTime : String,
     val answer : String
 )
-
+@Serializable
 /*********스터디원 신고 Request********/
 data class ReportCrewRequest(
     val content : String
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityResponse.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityResponse.kt
similarity index 85%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityResponse.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityResponse.kt
index 5822d554..cc5574c2 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityResponse.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/CommunityResponse.kt
@@ -1,21 +1,22 @@
-package com.example.spoteam_android.ui.community
+package com.example.spoteam_android.presentation.community
 
 import com.example.spoteam_android.ProfileItem
-import com.example.spoteam_android.ScheduleResult
+import kotlinx.serialization.Serializable
 
 /*********Best 인기글 조회********/
+@Serializable
 data class CommunityResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: CommunityContentInfo
 )
-
+@Serializable
 data class CommunityContentInfo(
     val sortType: String,
     val postBest5Responses: List<ContentDetailInfo>
 )
-
+@Serializable
 data class ContentDetailInfo(
     val postId : Int,
     val rank: Int,
@@ -23,17 +24,18 @@ data class ContentDetailInfo(
     val commentCount: Int
 )
 /**********게시판 홈 게시글 조회*************/
+@Serializable
 data class RepresentativeResponse(
-    val isSuccess : String,
+    val isSuccess: Boolean,
     val code : String,
     val message : String,
     val result : RepresentativeContentInfo
 )
-
+@Serializable
 data class RepresentativeContentInfo(
     val responses: List<RepresentativeDetailInfo>
 )
-
+@Serializable
 data class RepresentativeDetailInfo (
     val postId : Int,
     val postType : String,
@@ -41,17 +43,18 @@ data class RepresentativeDetailInfo (
     val commentCount : Int
 )
 /************게시판 공지 조회*************/
+@Serializable
 data class AnnouncementResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: AnnouncementContentInfo
 )
-
+@Serializable
 data class AnnouncementContentInfo(
     val responses: List<AnnouncementDetailInfo>
 )
-
+@Serializable
 data class AnnouncementDetailInfo(
     val postId : Int,
     val rank: Int,
@@ -59,13 +62,14 @@ data class AnnouncementDetailInfo(
     val commentCount: Int
 )
 /************게시글 페이지 조회***********/
+@Serializable
 data class CategoryPagesResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: CategoryPagesInfo
 )
-
+@Serializable
 data class CategoryPagesInfo(
     val postType : String,
     val postResponses: List<CategoryPagesDetail>,
@@ -74,7 +78,7 @@ data class CategoryPagesInfo(
     val isFirst : Boolean,
     val isLast : Boolean
 )
-
+@Serializable
 data class CategoryPagesDetail(
     val postId : Int,
     val writer : String,
@@ -88,14 +92,15 @@ data class CategoryPagesDetail(
     val likedByCurrentUser : Boolean,
     val scrapedByCurrentUser : Boolean
 )
+@Serializable
 /************게시글 단건 조회***********/
 data class ContentResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: ContentInfo
 )
-
+@Serializable
 data class ContentInfo(
     val type : String,
     val writer: String,
@@ -115,11 +120,11 @@ data class ContentInfo(
     val commentResponses : CommentResponse,
     val reported : Boolean
 )
-
+@Serializable
 data class CommentResponse(
     val comments : List<CommentsInfo>
 )
-
+@Serializable
 data class CommentsInfo(
     val commentId : Int,
     val commentContent : String,
@@ -134,68 +139,69 @@ data class CommentsInfo(
 )
 
 /************게시글 작성 완료***********/
+@Serializable
 data class WriteContentResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: WriteContentInfo
 )
-
+@Serializable
 data class WriteContentInfo (
     val id : Int,
     val type : String,
     val createAt : String
 )
-
+@Serializable
 /************게시글 좋아요 완료***********/
 data class ContentLikeResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: ContentLikeInfo
 )
-
+@Serializable
 data class ContentLikeInfo (
     val postId : Int,
     val likeCount : Int,
 )
-
+@Serializable
 /************게시글 좋아요 취소***********/
 data class ContentUnLikeResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: ContentUnLikeInfo
 )
-
+@Serializable
 data class ContentUnLikeInfo (
     val postId : Int,
     val likeCount : Int,
 )
-
+@Serializable
 /************댓글 작성 완료***********/
 data class WriteCommentResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: WriteCommentInfo
 )
-
+@Serializable
 data class WriteCommentInfo (
     val id : Int,
     val parentCommentId : Int,
     val content : String,
     val writer : String
 )
-
+@Serializable
 /************카테고리 별 스터디***********/
 data class CategoryStudyResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: CategoryStudyInfo
 )
-
+@Serializable
 data class CategoryStudyInfo (
     val totalPages : Int,
     val totalElements : Int,
@@ -205,7 +211,7 @@ data class CategoryStudyInfo (
     val content : List<CategoryStudyDetail>,
     val number : Int
 )
-
+@Serializable
 data class CategoryStudyDetail (
     val studyId : Int,
     val imageUrl : String,
@@ -222,90 +228,90 @@ data class CategoryStudyDetail (
     val createdAt : String,
     var liked : Boolean
 )
-
+@Serializable
 /************댓글 좋아요 완료***********/
 data class LikeCommentResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: LikeCommentInfo
 )
-
+@Serializable
 data class LikeCommentInfo (
     val commentId : Int,
     val likeCount : Int,
     val disLikeCount : Int
 )
-
+@Serializable
 /************댓글 좋아요 취소***********/
 data class UnLikeCommentResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: UnLikeCommentInfo
 )
-
+@Serializable
 data class UnLikeCommentInfo (
     val commentId : Int,
     val likeCount : Int,
     val disLikeCount : Int
 )
-
+@Serializable
 /************댓글 싫어요 완료***********/
 data class DisLikeCommentResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: DisLikeCommentInfo
 )
-
+@Serializable
 data class DisLikeCommentInfo (
     val commentId : Int,
     val likeCount : Int,
     val disLikeCount : Int
 )
-
+@Serializable
 /************댓글 싫어요 취소***********/
 data class UnDisLikeCommentResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: UnDisLikeCommentInfo
 )
-
+@Serializable
 data class UnDisLikeCommentInfo (
     val commentId : Int,
     val likeCount : Int,
     val disLikeCount : Int
 )
-
+@Serializable
 /************스터디 게시글 작성***********/
 data class StudyPostResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: StudyPostInfo
 )
-
+@Serializable
 data class StudyPostInfo (
     val postId : Int,
     val title : String
 )
-
+@Serializable
 /************스터디 게시글들***********/
 data class StudyPostListResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: StudyPostListInfo
 )
-
+@Serializable
 data class StudyPostListInfo (
     val studyId : Int,
     val posts : List<PostDetail>,
     val totalPages : Int
 )
-
+@Serializable
 data class PostDetail (
     val postId : Int,
     val title : String,
@@ -318,15 +324,15 @@ data class PostDetail (
     val commentNum : Int,
     val isLiked : Boolean,
 )
-
+@Serializable
 /************스터디 게시글 내용***********/
 data class StudyPostContentResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: StudyPostContentInfo
 )
-
+@Serializable
 data class StudyPostContentInfo (
     val member : MemberInfo,
     val postId : Int,
@@ -342,25 +348,25 @@ data class StudyPostContentInfo (
     val isWriter : Boolean,
     val studyPostImages : List<PostImages>
 )
-
+@Serializable
 data class PostImages (
     val imageId : Int,
     val imageUrl : String
 )
-
+@Serializable
 /************스터디 게시글 댓글***********/
 data class StudyPostContentCommentResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: StudyPostContentCommentInfo
 )
-
+@Serializable
 data class StudyPostContentCommentInfo (
     val postId : Int,
     val comments : List<StudyPostContentCommentDetail>
 )
-
+@Serializable
 data class StudyPostContentCommentDetail(
     val commentId : Int,
     val member : MemberInfo,
@@ -371,37 +377,37 @@ data class StudyPostContentCommentDetail(
     val isLiked : String,
     val applies : List<StudyPostContentCommentDetail>
 )
-
+@Serializable
 data class MemberInfo (
     val memberId : Int,
     val name : String,
     val profileImage : String
 )
 
-
+@Serializable
 /************마이 페이지 멤버 관련 스터디 갯수***********/
 data class MyPageStudyNumResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: MyPageStudyNumInfo
 )
-
+@Serializable
 data class MyPageStudyNumInfo (
     val name : String,
     val appliedStudies : Int,
     val ongoingStudies : Int,
     val myRecruitingStudies : Int
 )
-
+@Serializable
 /************내가 모집하고 있는 스터디***********/
 data class MyRecruitingStudiesResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: MyRecruitingStudyInfo
 )
-
+@Serializable
 data class MyRecruitingStudyInfo(
     val totalPages: Int,
     val totalElements: Int,
@@ -411,7 +417,7 @@ data class MyRecruitingStudyInfo(
     val content: List<MyRecruitingStudyDetail>,
     val number : Int
 )
-
+@Serializable
 data class MyRecruitingStudyDetail (
     val studyId : Int,
     val imageUrl : String,
@@ -427,35 +433,34 @@ data class MyRecruitingStudyDetail (
     val regions : List<String>,
     val createdAt : String,
     val liked : Boolean
-)
-
+)@Serializable
 /************모집 스터디 참여 신청 멤버들***********/
 data class MyStudyAttendanceMemberResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: MyStudyAttendanceMemberInfo
 )
-
+@Serializable
 data class MyStudyAttendanceMemberInfo(
     val totalElements: Int,
     val members : List<AttendanceMemberInfo>
 )
-
+@Serializable
 data class AttendanceMemberInfo(
     val memberId: Int,
     val nickname : String,
     val profileImage: String,
 )
-
+@Serializable
 /************신청자 소개 결과***********/
 data class MemberAttendanceIntroResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: MemberIntroInfo
 )
-
+@Serializable
 data class MemberIntroInfo(
     val memberId: Int,
     val studyId : Int,
@@ -463,35 +468,35 @@ data class MemberIntroInfo(
     val profileImage : String,
     val introduction : String
 )
-
+@Serializable
 /************참여 합불 결과***********/
 data class MemberAcceptResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: MemberAcceptInfo
 )
-
+@Serializable
 data class MemberAcceptInfo(
     val status: String,
     val updatedAt : String,
 )
 
-
+@Serializable
 /************알림 결과***********/
 data class AlertResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: AlertInfo
 )
-
+@Serializable
 data class AlertInfo(
     val notifications: List<AlertDetail>,
     val totalNotificationCount : Int,
     val uncheckedNotificationCount : Int
 )
-
+@Serializable
 data class AlertDetail(
     val notificationId: Int,
     val studyId: Int,
@@ -503,21 +508,21 @@ data class AlertDetail(
     val isChecked : Boolean,
     val createdAt : String
 )
-
+@Serializable
 /************내가 신청한 스터디 알림 결과***********/
 data class AlertStudyResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: AlertStudyInfo
-)
+)@Serializable
 
 data class AlertStudyInfo(
     val notifications: List<AlertStudyDetail>,
     val totalNotificationCount : Int,
     val uncheckedNotificationCount : Int
 )
-
+@Serializable
 data class AlertStudyDetail(
     val notificationId: Int,
     val studyId: Int,
@@ -527,41 +532,41 @@ data class AlertStudyDetail(
     val isChecked : Boolean,
     val createdAt : String
 )
-
+@Serializable
 /************내가 신청한 스터디 수락 알림 처리 결과***********/
 data class AcceptedAlertStudyResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: AcceptedAlertStudyInfo
 )
-
+@Serializable
 data class AcceptedAlertStudyInfo(
     val processedAt : String,
     val accept : Boolean
 )
-
+@Serializable
 /************내가 신청한 스터디 수락 알림 처리 결과***********/
 data class NotificationStateResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: NotificationStateInfo
-)
+)@Serializable
 
 data class NotificationStateInfo(
     val processedAt : String,
     val accept : Boolean
 )
-
+@Serializable
 /************내가 진행중인 스터디***********/
 data class MemberOnStudiesResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: MemberOnStudiesInfo
 )
-
+@Serializable
 data class MemberOnStudiesInfo(
     val totalPages : Int,
     val totalElements : Int,
@@ -571,14 +576,14 @@ data class MemberOnStudiesInfo(
     val content : List<MyRecruitingStudyDetail>,
     val number : Int
 )
-
+@Serializable
 /************내가 참여신청한 스터디***********/
 data class MemberAppliedStudiesResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: MemberAppliedStudiesInfo
-)
+)@Serializable
 
 data class MemberAppliedStudiesInfo(
     val totalPages : Int,
@@ -589,109 +594,109 @@ data class MemberAppliedStudiesInfo(
     val content : List<MyRecruitingStudyDetail>,
     val number : Int
 )
-
+@Serializable
 /************스터디 게시글 좋아요 완료***********/
 data class StudyContentLikeResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: StudyContentLikeInfo
 )
-
+@Serializable
 data class StudyContentLikeInfo (
     val postId : Int,
     val title : String,
     val likeNum : Int
 )
-
+@Serializable
 /************스터디 게시글 좋아요 취소***********/
 data class StudyContentUnLikeResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: StudyContentUnLikeInfo
 )
-
+@Serializable
 data class StudyContentUnLikeInfo (
     val postId : Int,
     val title : String,
     val likeNum : Int
 )
-
+@Serializable
 /************스터디 게시글 댓글 작성 완료***********/
 data class WriteStudyCommentResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: WriteStudyCommentInfo
-)
+)@Serializable
 
 data class WriteStudyCommentInfo (
     val isAnonymous : Boolean,
     val content : String
 )
-
+@Serializable
 /************스터디 멤버 정보***********/
 data class StudyMemberResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: StudyMemberInfo
 )
-
+@Serializable
 data class StudyMemberInfo (
     val totalElements: Int,
     val members : List<MembersDetail>
 )
-
+@Serializable
 data class MembersDetail (
     val memberId : Int,
     val nickname : String,
     val profileImage : String
 )
-
+@Serializable
 /************퀴즈 생성 완료***********/
 data class QuizContentResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: QuizContentInfo
 )
-
+@Serializable
 data class QuizContentInfo (
     val createdAt : String,
     val question: String,
     val answer : String
 )
-
+@Serializable
 /************퀴즈 가져오기 완료***********/
 data class GetQuizResponse(
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: QuizInfo
 )
-
+@Serializable
 data class QuizInfo (
     val quizId : Long,
     val question: String,
     val createdAt : String
 )
-
+@Serializable
 /************ schedule quiz 정보 가져오기 ***********/
 data class GetScheduleResponse (
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: ScheduleInfo
 )
-
+@Serializable
 data class ScheduleInfo (
     val scheduleId : Long,
     val quizId: Int,
     val studyMembers : List<ScheduleMemberInfo>,
 )
-
+@Serializable
 data class ScheduleMemberInfo (
     val memberId : Int,
     val name : String,
@@ -699,15 +704,15 @@ data class ScheduleMemberInfo (
     val isOwned : Boolean,
     val isAttending : Boolean
 )
-
+@Serializable
 /************crew quiz 확인 완료***********/
 data class GetCrewQuizResponse (
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: CrewQuizInfo
 )
-
+@Serializable
 data class CrewQuizInfo (
     val memberId : Long,
     val quizId: Int,
@@ -716,58 +721,58 @@ data class CrewQuizInfo (
     val tryNum : Int,
     val createdAt : String
 )
-
+@Serializable
 /************ 게시글 삭제 완료 ***********/
 data class DeletePostContentResponse (
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
-    val result: Any?
+    val result: String? = null
 )
-
+@Serializable
 /************ 스터디 게시글 삭제 완료 ***********/
 data class DeleteStudyPostContentResponse (
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
-    val result: Any?
+    val result: String? = null
 )
-
+@Serializable
 
 /************ 스터디원 신고 완료 ***********/
 data class ReportCrewResponse (
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: ReportCrewContent
 )
-
+@Serializable
 data class ReportCrewContent (
     val memberId : Int,
     val name : String
 )
-
+@Serializable
 /************ 스터디 게시글 신고 완료 ***********/
 data class ReportStudyPostResponse (
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: ReportStudyPostContent
 )
-
+@Serializable
 data class ReportStudyPostContent (
     val postId : Int,
     val title : String
 )
-
+@Serializable
 /************ 스크랩 게시글 가져오기 완료 ***********/
 data class GetScrapResponse (
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: ScrapContent
 )
-
+@Serializable
 data class ScrapContent (
     val postType : String,
     val postResponses : List<CategoryPagesDetail>,
@@ -776,35 +781,35 @@ data class ScrapContent (
     val isFirst: Boolean,
     val isLast: Boolean
 )
-
+@Serializable
 /************ 스크랩 게시글 가져오기 완료 ***********/
 data class ReportCommunityContentResponse (
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: ReportInfo
-)
+)@Serializable
 
 data class ReportInfo (
     val reportPostId : Int,
     val reporterId : Int,
     val reportedAt : String
 )
-
+@Serializable
 /************ 스크랩 게시글 가져오기 완료 ***********/
 data class EndStudyResponse (
-    val isSuccess: String,
+    val isSuccess: Boolean,
     val code: String,
     val message: String,
     val result: EndStudyInfo
 )
-
+@Serializable
 data class EndStudyInfo (
     val studyId : Int,
     val studyName : String,
     val status : String
 )
-
+@Serializable
 /************ 스터디 호스트 정보 가져오기 완료 ***********/
 data class GetHostResponse (
     val isSuccess: Boolean,
@@ -812,12 +817,12 @@ data class GetHostResponse (
     val message: String,
     val result: HostInfo
 )
-
+@Serializable
 data class HostInfo (
     val isOwned: Boolean,
     val host : HostDetail
 )
-
+@Serializable
 data class HostDetail (
     val memberId : Int,
     val nickname : String
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/DeleteContentDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/DeleteContentDialog.kt
similarity index 95%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/DeleteContentDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/DeleteContentDialog.kt
index 9b34cd2b..afff635a 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/DeleteContentDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/DeleteContentDialog.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.community
+package com.example.spoteam_android.presentation.community
 
 import android.content.Context
 import android.graphics.Color
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/EditContentFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/EditContentFragment.kt
similarity index 98%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/EditContentFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/EditContentFragment.kt
index 976f851b..cb44c107 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/EditContentFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/EditContentFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.community
+package com.example.spoteam_android.presentation.community
 
 import android.app.Activity
 import android.content.Intent
@@ -22,7 +22,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentMystudyWriteContentBinding
-import com.example.spoteam_android.ui.study.WriteContentImageRVadapter
+import com.example.spoteam_android.presentation.study.WriteContentImageRVadapter
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import kotlinx.coroutines.launch
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
@@ -149,7 +149,7 @@ class EditContentFragment : BottomSheetDialogFragment(), AdapterView.OnItemSelec
                 ) {
                     if (response.isSuccessful) {
                         val contentResponse = response.body()
-                        if (contentResponse?.isSuccess == "true") {
+                        if (contentResponse?.isSuccess == true) {
                             val contentInfo = contentResponse.result
                             isAnonymous = contentInfo.anonymous
                             selectedCategory = contentInfo.type
@@ -316,7 +316,7 @@ class EditContentFragment : BottomSheetDialogFragment(), AdapterView.OnItemSelec
         service.editContent(postId, titlePart, contentPart, themePart, imagePart, existingImage, isAnonymous)
             .enqueue(object : Callback<WriteContentResponse> {
                 override fun onResponse(call: Call<WriteContentResponse>, response: Response<WriteContentResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         val writeContentResponseBody = response.body()!!.result
                         Log.d("isExitEdit", "1234567890")
                         dismiss()
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/FailedDeleteContentDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/FailedDeleteContentDialog.kt
similarity index 95%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/FailedDeleteContentDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/FailedDeleteContentDialog.kt
index e62436a2..16ffb6a8 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/FailedDeleteContentDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/FailedDeleteContentDialog.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.community
+package com.example.spoteam_android.presentation.community
 
 import android.content.Context
 import android.graphics.Color
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/ReportContentDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/ReportContentDialog.kt
similarity index 94%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/ReportContentDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/ReportContentDialog.kt
index 2a23ca39..88c47b9d 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/ReportContentDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/ReportContentDialog.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.community
+package com.example.spoteam_android.presentation.community
 
 import android.content.Context
 import android.graphics.Color
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/WriteContentFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/WriteContentFragment.kt
similarity index 98%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/WriteContentFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/WriteContentFragment.kt
index 8c8ad89d..fae4b89c 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/WriteContentFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/WriteContentFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.community
+package com.example.spoteam_android.presentation.community
 
 import android.app.Activity
 import android.content.Context
@@ -24,7 +24,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentMystudyWriteContentBinding
-import com.example.spoteam_android.ui.study.WriteContentImageRVadapter
+import com.example.spoteam_android.presentation.study.WriteContentImageRVadapter
 import retrofit2.Callback
 import retrofit2.Response
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
@@ -226,7 +226,7 @@ class WriteContentFragment() : BottomSheetDialogFragment(), AdapterView.OnItemSe
         service.postContent(titlePart, contentPart, themePart, isAnonymous, imageParts)
             .enqueue(object : Callback<WriteContentResponse> {
                 override fun onResponse(call: Call<WriteContentResponse>, response: Response<WriteContentResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         val writeContentResponseBody = response.body()!!.result
                         Log.d("WriteContent", "created postId = ${writeContentResponseBody.id}")
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/AllFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/AllFragment.kt
similarity index 91%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/AllFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/AllFragment.kt
index ba010f56..4b707d61 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/AllFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/AllFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.community.communityContent
+package com.example.spoteam_android.presentation.community.communityContent
 
 import android.content.Context
 import android.content.Intent
@@ -13,6 +13,12 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentCommunityCategoryContentBinding
+import com.example.spoteam_android.presentation.community.CategoryPagesDetail
+import com.example.spoteam_android.presentation.community.CategoryPagesResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.CommunityContentActivity
+import com.example.spoteam_android.presentation.community.ContentLikeResponse
+import com.example.spoteam_android.presentation.community.ContentUnLikeResponse
 import com.example.spoteam_android.ui.community.*
 
 import retrofit2.Call
@@ -91,7 +97,7 @@ class AllFragment : Fragment() {
             override fun onResponse(call: Call<CategoryPagesResponse>, response: Response<CategoryPagesResponse>) {
                 if (response.isSuccessful) {
                     val body = response.body()
-                    if (body?.isSuccess == "true") {
+                    if (body?.isSuccess == true) {
                         val content = body.result.postResponses
                         totalPages = body.result.totalPage
 
@@ -129,7 +135,7 @@ class AllFragment : Fragment() {
             .postContentLike(postId)
             .enqueue(object : Callback<ContentLikeResponse> {
                 override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
@@ -147,7 +153,7 @@ class AllFragment : Fragment() {
             .deleteContentLike(postId)
             .enqueue(object : Callback<ContentUnLikeResponse> {
                 override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
@@ -165,7 +171,7 @@ class AllFragment : Fragment() {
             .postContentScrap(postId)
             .enqueue(object : Callback<ContentLikeResponse> {
                 override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
@@ -183,7 +189,7 @@ class AllFragment : Fragment() {
             .deleteContentScrap(postId)
             .enqueue(object : Callback<ContentUnLikeResponse> {
                 override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/CommunityCategoryContentRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/CommunityCategoryContentRVAdapter.kt
similarity index 98%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/CommunityCategoryContentRVAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/CommunityCategoryContentRVAdapter.kt
index 865b29b2..417ed7ef 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/CommunityCategoryContentRVAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/CommunityCategoryContentRVAdapter.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.community.communityContent
+package com.example.spoteam_android.presentation.community.communityContent
 
 import android.util.Log
 import android.view.LayoutInflater
@@ -10,7 +10,7 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.ItemCommunityContentBinding
-import com.example.spoteam_android.ui.community.CategoryPagesDetail
+import com.example.spoteam_android.presentation.community.CategoryPagesDetail
 import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.*
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/CounselingFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/CounselingFragment.kt
similarity index 91%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/CounselingFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/CounselingFragment.kt
index bdb94326..47c35cf3 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/CounselingFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/CounselingFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.community.communityContent
+package com.example.spoteam_android.presentation.community.communityContent
 
 import android.content.Context
 import android.content.Intent
@@ -10,11 +10,14 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentCommunityCategoryContentBinding
-import com.example.spoteam_android.ui.community.*
-
+import com.example.spoteam_android.presentation.community.CategoryPagesDetail
+import com.example.spoteam_android.presentation.community.CategoryPagesResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.CommunityContentActivity
+import com.example.spoteam_android.presentation.community.ContentLikeResponse
+import com.example.spoteam_android.presentation.community.ContentUnLikeResponse
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -91,7 +94,7 @@ class CounselingFragment : Fragment() {
             override fun onResponse(call: Call<CategoryPagesResponse>, response: Response<CategoryPagesResponse>) {
                 if (response.isSuccessful) {
                     val body = response.body()
-                    if (body?.isSuccess == "true") {
+                    if (body?.isSuccess == true) {
                         val content = body.result.postResponses
                         totalPages = body.result.totalPage
 
@@ -129,7 +132,7 @@ class CounselingFragment : Fragment() {
             .postContentLike(postId)
             .enqueue(object : Callback<ContentLikeResponse> {
                 override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
@@ -147,7 +150,7 @@ class CounselingFragment : Fragment() {
             .deleteContentLike(postId)
             .enqueue(object : Callback<ContentUnLikeResponse> {
                 override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
@@ -165,7 +168,7 @@ class CounselingFragment : Fragment() {
             .postContentScrap(postId)
             .enqueue(object : Callback<ContentLikeResponse> {
                 override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
@@ -183,7 +186,7 @@ class CounselingFragment : Fragment() {
             .deleteContentScrap(postId)
             .enqueue(object : Callback<ContentUnLikeResponse> {
                 override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/FreeTalkFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/FreeTalkFragment.kt
similarity index 91%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/FreeTalkFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/FreeTalkFragment.kt
index 0468490f..48c00081 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/FreeTalkFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/FreeTalkFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.community.communityContent
+package com.example.spoteam_android.presentation.community.communityContent
 
 import android.content.Context
 import android.content.Intent
@@ -13,8 +13,12 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentCommunityCategoryContentBinding
-import com.example.spoteam_android.ui.community.*
-
+import com.example.spoteam_android.presentation.community.CategoryPagesDetail
+import com.example.spoteam_android.presentation.community.CategoryPagesResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.CommunityContentActivity
+import com.example.spoteam_android.presentation.community.ContentLikeResponse
+import com.example.spoteam_android.presentation.community.ContentUnLikeResponse
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -91,7 +95,7 @@ class FreeTalkFragment : Fragment() {
             override fun onResponse(call: Call<CategoryPagesResponse>, response: Response<CategoryPagesResponse>) {
                 if (response.isSuccessful) {
                     val body = response.body()
-                    if (body?.isSuccess == "true") {
+                    if (body?.isSuccess == true) {
                         val content = body.result.postResponses
                         totalPages = body.result.totalPage
 
@@ -129,7 +133,7 @@ class FreeTalkFragment : Fragment() {
             .postContentLike(postId)
             .enqueue(object : Callback<ContentLikeResponse> {
                 override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
@@ -147,7 +151,7 @@ class FreeTalkFragment : Fragment() {
             .deleteContentLike(postId)
             .enqueue(object : Callback<ContentUnLikeResponse> {
                 override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
@@ -165,7 +169,7 @@ class FreeTalkFragment : Fragment() {
             .postContentScrap(postId)
             .enqueue(object : Callback<ContentLikeResponse> {
                 override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
@@ -183,7 +187,7 @@ class FreeTalkFragment : Fragment() {
             .deleteContentScrap(postId)
             .enqueue(object : Callback<ContentUnLikeResponse> {
                 override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/JobSeekingTalkFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/JobSeekingTalkFragment.kt
similarity index 91%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/JobSeekingTalkFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/JobSeekingTalkFragment.kt
index b31f3c0d..f21eae2d 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/JobSeekingTalkFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/JobSeekingTalkFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.community.communityContent
+package com.example.spoteam_android.presentation.community.communityContent
 
 import android.content.Context
 import android.content.Intent
@@ -14,7 +14,12 @@ import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentCommunityCategoryContentBinding
 import com.example.spoteam_android.ui.community.*
-
+import com.example.spoteam_android.presentation.community.CategoryPagesDetail
+import com.example.spoteam_android.presentation.community.CategoryPagesResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.CommunityContentActivity
+import com.example.spoteam_android.presentation.community.ContentLikeResponse
+import com.example.spoteam_android.presentation.community.ContentUnLikeResponse
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -91,7 +96,7 @@ class JobSeekingTalkFragment : Fragment() {
             override fun onResponse(call: Call<CategoryPagesResponse>, response: Response<CategoryPagesResponse>) {
                 if (response.isSuccessful) {
                     val body = response.body()
-                    if (body?.isSuccess == "true") {
+                    if (body?.isSuccess == true) {
                         val content = body.result.postResponses
                         totalPages = body.result.totalPage
 
@@ -129,7 +134,7 @@ class JobSeekingTalkFragment : Fragment() {
             .postContentLike(postId)
             .enqueue(object : Callback<ContentLikeResponse> {
                 override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
@@ -147,7 +152,7 @@ class JobSeekingTalkFragment : Fragment() {
             .deleteContentLike(postId)
             .enqueue(object : Callback<ContentUnLikeResponse> {
                 override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
@@ -165,7 +170,7 @@ class JobSeekingTalkFragment : Fragment() {
             .postContentScrap(postId)
             .enqueue(object : Callback<ContentLikeResponse> {
                 override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
@@ -183,7 +188,7 @@ class JobSeekingTalkFragment : Fragment() {
             .deleteContentScrap(postId)
             .enqueue(object : Callback<ContentUnLikeResponse> {
                 override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/NotificationFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/NotificationFragment.kt
similarity index 91%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/NotificationFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/NotificationFragment.kt
index 326c5425..fe7f189c 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/NotificationFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/NotificationFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.community.communityContent
+package com.example.spoteam_android.presentation.community.communityContent
 
 import android.content.Context
 import android.content.Intent
@@ -14,7 +14,12 @@ import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentCommunityCategoryContentBinding
 import com.example.spoteam_android.ui.community.*
-
+import com.example.spoteam_android.presentation.community.CategoryPagesDetail
+import com.example.spoteam_android.presentation.community.CategoryPagesResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.CommunityContentActivity
+import com.example.spoteam_android.presentation.community.ContentLikeResponse
+import com.example.spoteam_android.presentation.community.ContentUnLikeResponse
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -91,7 +96,7 @@ class NotificationFragment : Fragment() {
             override fun onResponse(call: Call<CategoryPagesResponse>, response: Response<CategoryPagesResponse>) {
                 if (response.isSuccessful) {
                     val body = response.body()
-                    if (body?.isSuccess == "true") {
+                    if (body?.isSuccess == true) {
                         val content = body.result.postResponses
                         totalPages = body.result.totalPage
 
@@ -129,7 +134,7 @@ class NotificationFragment : Fragment() {
             .postContentLike(postId)
             .enqueue(object : Callback<ContentLikeResponse> {
                 override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
@@ -147,7 +152,7 @@ class NotificationFragment : Fragment() {
             .deleteContentLike(postId)
             .enqueue(object : Callback<ContentUnLikeResponse> {
                 override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
@@ -165,7 +170,7 @@ class NotificationFragment : Fragment() {
             .postContentScrap(postId)
             .enqueue(object : Callback<ContentLikeResponse> {
                 override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
@@ -183,7 +188,7 @@ class NotificationFragment : Fragment() {
             .deleteContentScrap(postId)
             .enqueue(object : Callback<ContentUnLikeResponse> {
                 override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/PassingReviewFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/PassingReviewFragment.kt
similarity index 91%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/PassingReviewFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/PassingReviewFragment.kt
index 6c8db07a..0d4a601f 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/PassingReviewFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/PassingReviewFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.community.communityContent
+package com.example.spoteam_android.presentation.community.communityContent
 
 import android.content.Context
 import android.content.Intent
@@ -14,7 +14,12 @@ import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentCommunityCategoryContentBinding
 import com.example.spoteam_android.ui.community.*
-
+import com.example.spoteam_android.presentation.community.CategoryPagesDetail
+import com.example.spoteam_android.presentation.community.CategoryPagesResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.CommunityContentActivity
+import com.example.spoteam_android.presentation.community.ContentLikeResponse
+import com.example.spoteam_android.presentation.community.ContentUnLikeResponse
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -91,7 +96,7 @@ class PassingReviewFragment : Fragment() {
             override fun onResponse(call: Call<CategoryPagesResponse>, response: Response<CategoryPagesResponse>) {
                 if (response.isSuccessful) {
                     val body = response.body()
-                    if (body?.isSuccess == "true") {
+                    if (body?.isSuccess == true) {
                         val content = body.result.postResponses
                         totalPages = body.result.totalPage
 
@@ -129,7 +134,7 @@ class PassingReviewFragment : Fragment() {
             .postContentLike(postId)
             .enqueue(object : Callback<ContentLikeResponse> {
                 override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
@@ -147,7 +152,7 @@ class PassingReviewFragment : Fragment() {
             .deleteContentLike(postId)
             .enqueue(object : Callback<ContentUnLikeResponse> {
                 override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
@@ -165,7 +170,7 @@ class PassingReviewFragment : Fragment() {
             .postContentScrap(postId)
             .enqueue(object : Callback<ContentLikeResponse> {
                 override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
@@ -183,7 +188,7 @@ class PassingReviewFragment : Fragment() {
             .deleteContentScrap(postId)
             .enqueue(object : Callback<ContentUnLikeResponse> {
                 override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/ShareInfoFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/ShareInfoFragment.kt
similarity index 91%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/ShareInfoFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/ShareInfoFragment.kt
index 42175cc5..4947b0f8 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/ShareInfoFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/communityContent/ShareInfoFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.community.communityContent
+package com.example.spoteam_android.presentation.community.communityContent
 
 import android.content.Context
 import android.content.Intent
@@ -14,7 +14,12 @@ import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentCommunityCategoryContentBinding
 import com.example.spoteam_android.ui.community.*
-
+import com.example.spoteam_android.presentation.community.CategoryPagesDetail
+import com.example.spoteam_android.presentation.community.CategoryPagesResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.CommunityContentActivity
+import com.example.spoteam_android.presentation.community.ContentLikeResponse
+import com.example.spoteam_android.presentation.community.ContentUnLikeResponse
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -91,7 +96,7 @@ class ShareInfoFragment : Fragment() {
             override fun onResponse(call: Call<CategoryPagesResponse>, response: Response<CategoryPagesResponse>) {
                 if (response.isSuccessful) {
                     val body = response.body()
-                    if (body?.isSuccess == "true") {
+                    if (body?.isSuccess == true) {
                         val content = body.result.postResponses
                         totalPages = body.result.totalPage
 
@@ -129,7 +134,7 @@ class ShareInfoFragment : Fragment() {
             .postContentLike(postId)
             .enqueue(object : Callback<ContentLikeResponse> {
                 override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
@@ -147,7 +152,7 @@ class ShareInfoFragment : Fragment() {
             .deleteContentLike(postId)
             .enqueue(object : Callback<ContentUnLikeResponse> {
                 override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
@@ -165,7 +170,7 @@ class ShareInfoFragment : Fragment() {
             .postContentScrap(postId)
             .enqueue(object : Callback<ContentLikeResponse> {
                 override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
@@ -183,7 +188,7 @@ class ShareInfoFragment : Fragment() {
             .deleteContentScrap(postId)
             .enqueue(object : Callback<ContentUnLikeResponse> {
                 override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         fetchPages()
                     } else {
                         showError(response.body()?.message)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/contentComment/ContentCommentMultiViewRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/contentComment/ContentCommentMultiViewRVAdapter.kt
similarity index 98%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/contentComment/ContentCommentMultiViewRVAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/contentComment/ContentCommentMultiViewRVAdapter.kt
index 35837cef..6f892f82 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/contentComment/ContentCommentMultiViewRVAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/community/contentComment/ContentCommentMultiViewRVAdapter.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.community.contentComment
+package com.example.spoteam_android.presentation.community.contentComment
 
 import android.view.LayoutInflater
 import android.view.View
@@ -8,7 +8,7 @@ import com.bumptech.glide.Glide
 import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.ItemContentCommentBinding
 import com.example.spoteam_android.databinding.ItemContentCommentReplyBinding
-import com.example.spoteam_android.ui.community.CommentsInfo
+import com.example.spoteam_android.presentation.community.CommentsInfo
 
 class ContentCommentMultiViewRVAdapter(private val dataList: List<CommentsInfo>) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/home/HomeFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/home/HomeFragment.kt
new file mode 100644
index 00000000..a06a9916
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/home/HomeFragment.kt
@@ -0,0 +1,301 @@
+package com.example.spoteam_android.presentation.home
+import android.content.res.ColorStateList
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.viewModels
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.spoteam_android.MainActivity
+import com.example.spoteam_android.R
+import com.example.spoteam_android.databinding.FragmentHomeBinding
+import com.example.spoteam_android.domain.study.entity.BoardItem
+import com.example.spoteam_android.presentation.alert.AlertFragment
+import com.example.spoteam_android.presentation.category.CategoryFragment_1
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.CommunityHomeFragment
+import com.example.spoteam_android.presentation.community.CommunityResponse
+import com.example.spoteam_android.presentation.interestarea.ApiResponse
+import com.example.spoteam_android.presentation.interestarea.InterestAreaApiService
+import com.example.spoteam_android.presentation.interestarea.InterestFilterViewModel
+import com.example.spoteam_android.presentation.interestarea.InterestFragment
+import com.example.spoteam_android.presentation.interestarea.InterestVPAdapter
+import com.example.spoteam_android.presentation.interestarea.RecommendStudyApiService
+import com.example.spoteam_android.presentation.myinterest.MyInterestStudyFragment
+import com.example.spoteam_android.presentation.recruiting.RecruitingStudyFragment
+import com.example.spoteam_android.presentation.search.SearchFragment
+import com.example.spoteam_android.presentation.study.DetailStudyFragment
+import com.example.spoteam_android.presentation.study.StudyViewModel
+import com.example.spoteam_android.presentation.study.register.theme.ThemeStudyFragment
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import dagger.hilt.android.AndroidEntryPoint
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class HomeFragment : Fragment() {
+    @Inject lateinit var interestAreaApiService: InterestAreaApiService
+    @Inject lateinit var recommendStudyApiService: RecommendStudyApiService
+    @Inject lateinit var communityAPIService: CommunityAPIService
+
+    private lateinit var binding: FragmentHomeBinding
+    private val studyViewModel: StudyViewModel by activityViewModels()
+    private val categoryViewModel: com.example.spoteam_android.presentation.category.CategoryInterestViewModel by activityViewModels()
+    private val viewModel: InterestFilterViewModel by activityViewModels()
+    private val homeViewModel: HomeViewModel by viewModels()
+
+    private lateinit var interestBoardAdapter: InterestVPAdapter
+    private lateinit var recommendBoardAdapter: InterestVPAdapter
+
+    private var popularContentId: Int = -1
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        binding = FragmentHomeBinding.inflate(inflater, container, false)
+        val activity = requireActivity() as MainActivity
+
+        // 날씨 배경 설정
+        val backgroundRes = activity.getWeatherBackground()
+        if (backgroundRes == R.drawable.ic_weather_night_background) {
+            binding.icWeatherBackground.setImageResource(backgroundRes)
+        }
+
+        setupFab()
+        fetchLivePopularContent()
+        setupBoardAdapters()
+        setupObservers()
+
+        fetchDataMostPopular()
+        fetchRecommendStudy()
+
+        setupClickListeners(activity)
+
+        return binding.root
+    }
+
+    private fun setupFab() {
+        (activity as? MainActivity)?.let {
+            it.findViewById<FloatingActionButton>(R.id.add_study_btn)?.apply {
+                visibility = View.VISIBLE
+                setImageTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.white)))
+                setOnClickListener {
+                    parentFragmentManager.beginTransaction()
+                        .replace(R.id.main_frm, ThemeStudyFragment())
+                        .addToBackStack(null)
+                        .commit()
+                }
+            }
+        }
+    }
+
+    private fun setupBoardAdapters() {
+        interestBoardAdapter = InterestVPAdapter(ArrayList(), onLikeClick = { item, likeButton ->
+            homeViewModel.toggleLike(item.studyId)
+        }, studyViewModel)
+
+        recommendBoardAdapter = InterestVPAdapter(ArrayList(), onLikeClick = { item, likeButton ->
+            homeViewModel.toggleLike(item.studyId)
+        }, studyViewModel)
+
+        recommendBoardAdapter.setItemClickListener(object : InterestVPAdapter.OnItemClickListeners {
+            override fun onItemClick(data: BoardItem) {
+                studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
+                homeViewModel.fetchStudyMembers(data.studyId)
+
+                parentFragmentManager.beginTransaction()
+                    .replace(R.id.main_frm, DetailStudyFragment())
+                    .addToBackStack(null)
+                    .commit()
+            }
+        })
+
+        binding.rvBoard.layoutManager = LinearLayoutManager(context)
+        binding.rvBoard.adapter = interestBoardAdapter
+
+        binding.rvBoard2.layoutManager = LinearLayoutManager(context)
+        binding.rvBoard2.adapter = recommendBoardAdapter
+    }
+
+    private fun setupObservers() {
+        homeViewModel.likeToggleResult.observe(viewLifecycleOwner) { (studyId, isLiked) ->
+            val list =
+                interestBoardAdapter.getCurrentList() + recommendBoardAdapter.getCurrentList()
+            list.find { it.studyId == studyId }?.let {
+                it.liked = isLiked
+                it.heartCount += if (isLiked) 1 else -1
+                fetchDataMostPopular()
+                fetchRecommendStudy()
+            }
+        }
+
+        homeViewModel.studyMembers.observe(viewLifecycleOwner) { members ->
+            members.forEach {
+                Log.d("StudyMembers", "ID: ${it.memberId}, Nickname: ${it.nickname}")
+            }
+        }
+    }
+
+    private fun fetchDataMostPopular() {
+        interestAreaApiService.getInterestedBestStudies().enqueue(object : Callback<ApiResponse> {
+            override fun onResponse(call: Call<ApiResponse>, response: Response<ApiResponse>) {
+                if (response.isSuccessful) {
+                    val boardItems = response.body()?.result?.content?.map {
+                        BoardItem(
+                            studyId = it.studyId,
+                            title = it.title,
+                            goal = it.goal,
+                            introduction = it.introduction,
+                            memberCount = it.memberCount,
+                            heartCount = it.heartCount,
+                            hitNum = it.hitNum,
+                            maxPeople = it.maxPeople,
+                            studyState = it.studyState,
+                            themeTypes = it.themeTypes,
+                            regions = it.regions,
+                            imageUrl = it.imageUrl,
+                            liked = it.liked,
+                            isHost = false
+                        )
+                    } ?: emptyList()
+
+                    if (boardItems.isNotEmpty()) {
+                        interestBoardAdapter.updateList(boardItems)
+                        binding.rvBoard.visibility = View.VISIBLE
+                    } else {
+                        binding.rvBoard.visibility = View.GONE
+                        Toast.makeText(requireContext(), "조건에 맞는 항목이 없습니다.", Toast.LENGTH_SHORT).show()
+                    }
+                }
+            }
+
+            override fun onFailure(call: Call<ApiResponse>, t: Throwable) {}
+        })
+    }
+
+    private fun fetchRecommendStudy() {
+        recommendStudyApiService.GetRecommendStudy().enqueue(object : Callback<ApiResponse> {
+            override fun onResponse(call: Call<ApiResponse>, response: Response<ApiResponse>) {
+                if (response.isSuccessful) {
+                    val boardItems = response.body()?.result?.content?.map {
+                        BoardItem(
+                            studyId = it.studyId,
+                            title = it.title,
+                            goal = it.goal,
+                            introduction = it.introduction,
+                            memberCount = it.memberCount,
+                            heartCount = it.heartCount,
+                            hitNum = it.hitNum,
+                            maxPeople = it.maxPeople,
+                            studyState = it.studyState,
+                            themeTypes = it.themeTypes,
+                            regions = it.regions,
+                            imageUrl = it.imageUrl,
+                            liked = it.liked,
+                            isHost = false
+                        )
+                    } ?: emptyList()
+
+                    if (boardItems.isNotEmpty()) {
+                        recommendBoardAdapter.updateList(boardItems)
+                        binding.rvBoard2.visibility = View.VISIBLE
+                    } else {
+                        binding.rvBoard2.visibility = View.GONE
+                        Toast.makeText(requireContext(), "조건에 맞는 항목이 없습니다.", Toast.LENGTH_SHORT).show()
+                    }
+                }
+            }
+
+            override fun onFailure(call: Call<ApiResponse>, t: Throwable) {}
+        })
+    }
+
+    private fun fetchLivePopularContent() {
+        communityAPIService.getBestCommunityContent("REAL_TIME")
+            .enqueue(object : Callback<CommunityResponse> {
+                override fun onResponse(call: Call<CommunityResponse>, response: Response<CommunityResponse>) {
+                    if (response.isSuccessful) {
+                        response.body()?.result?.postBest5Responses?.firstOrNull()?.let {
+                            binding.popularContentTv.text = it.postTitle
+                            popularContentId = it.postId
+                        } ?: run {
+                            binding.popularContentTv.text = "인기 게시글이 없습니다"
+                            popularContentId = -1
+                        }
+                    }
+                }
+
+                override fun onFailure(call: Call<CommunityResponse>, t: Throwable) {}
+            })
+    }
+
+    private fun setupClickListeners(activity: MainActivity) {
+        binding.icFind.setOnClickListener {
+            activity.supportFragmentManager.beginTransaction()
+                .replace(R.id.main_frm, SearchFragment())
+                .addToBackStack(null)
+                .commitAllowingStateLoss()
+        }
+
+        binding.icAlarm.setOnClickListener {
+            activity.supportFragmentManager.beginTransaction()
+                .replace(R.id.main_frm, AlertFragment())
+                .addToBackStack(null)
+                .commitAllowingStateLoss()
+        }
+
+        binding.houseLocationCl.setOnClickListener {
+            val bundle = Bundle().apply { putString("source", "HouseFragment") }
+            val interestFragment = InterestFragment().apply { arguments = bundle }
+            activity.supportFragmentManager.beginTransaction()
+                .replace(R.id.main_frm, interestFragment)
+                .addToBackStack(null)
+                .commitAllowingStateLoss()
+        }
+
+        binding.houseRecruitCl.setOnClickListener {
+            val bundle = Bundle().apply { putString("source", "HouseFragment") }
+            val recruitingFragment = RecruitingStudyFragment().apply { arguments = bundle }
+            activity.supportFragmentManager.beginTransaction()
+                .replace(R.id.main_frm, recruitingFragment)
+                .addToBackStack(null)
+                .commitAllowingStateLoss()
+        }
+
+        binding.houseInterestCl.setOnClickListener {
+            val bundle = Bundle().apply { putString("source", "HouseFragment") }
+            val myInterestFragment = MyInterestStudyFragment().apply { arguments = bundle }
+            activity.supportFragmentManager.beginTransaction()
+                .replace(R.id.main_frm, myInterestFragment)
+                .addToBackStack(null)
+                .commitAllowingStateLoss()
+        }
+
+        binding.icGoInterest.setOnClickListener {
+            val categoryFragment = CategoryFragment_1().apply {
+                arguments = Bundle().apply { putInt("categoryType", 0) }
+            }
+            categoryViewModel.reset()
+            activity.supportFragmentManager.beginTransaction()
+                .replace(R.id.main_frm, categoryFragment)
+                .addToBackStack(null)
+                .commitAllowingStateLoss()
+        }
+
+        binding.houseCommunityCl.setOnClickListener {
+            activity.supportFragmentManager.beginTransaction()
+                .replace(R.id.main_frm, CommunityHomeFragment())
+                .addToBackStack(null)
+                .commitAllowingStateLoss()
+        }
+
+        binding.icRecommendationRefresh.setOnClickListener {
+            fetchRecommendStudy()
+        }
+    }
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/home/HomeViewModel.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/home/HomeViewModel.kt
new file mode 100644
index 00000000..11361d2b
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/home/HomeViewModel.kt
@@ -0,0 +1,43 @@
+package com.example.spoteam_android.presentation.home
+
+import android.util.Log
+import androidx.lifecycle.*
+import com.example.spoteam_android.domain.study.entity.StudyMemberResponse
+import com.example.spoteam_android.domain.study.repository.StudyRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class HomeViewModel @Inject constructor(
+    private val studyRepository: StudyRepository
+) : ViewModel() {
+
+    private val _likeToggleResult = MutableLiveData<Pair<Int, Boolean>>()
+    val likeToggleResult: LiveData<Pair<Int, Boolean>> = _likeToggleResult
+
+    private val _studyMembers = MutableLiveData<List<StudyMemberResponse.StudyMember>>()
+    val studyMembers: LiveData<List<StudyMemberResponse.StudyMember>> = _studyMembers
+
+    fun toggleLike(studyId: Int) {
+        viewModelScope.launch {
+            val result = studyRepository.toggleStudyLike(studyId)
+            result.onSuccess { response ->
+                val isLiked = response.status == "LIKE"
+                _likeToggleResult.value = studyId to isLiked
+            }.onFailure {
+                Log.e("HomeViewModel", "toggleLike 실패: ${it.message}")
+            }
+        }
+    }
+    fun fetchStudyMembers(studyId: Int) {
+        viewModelScope.launch {
+            val result = studyRepository.getStudyMembers(studyId)
+            result.onSuccess { response ->
+                _studyMembers.value = response.members
+            }.onFailure {
+                Log.e("HomeViewModel", "fetch study member 실패: ${it.message}")
+            }
+        }
+    }
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/home/WeatherViewModel.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/home/WeatherViewModel.kt
new file mode 100644
index 00000000..98315d83
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/home/WeatherViewModel.kt
@@ -0,0 +1,28 @@
+package com.example.spoteam_android.presentation.home
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.spoteam_android.domain.weather.entity.WeatherUiState
+import com.example.spoteam_android.domain.weather.repository.WeatherRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class WeatherViewModel @Inject constructor(
+    private val repository: WeatherRepository
+) : ViewModel() {
+
+    private val _weather = MutableStateFlow(WeatherUiState("", "", 0))
+    val weather: StateFlow<WeatherUiState> = _weather
+
+    fun fetchWeather() {
+        viewModelScope.launch {
+            repository.getTodayWeather()
+                .onSuccess { _weather.value = it }
+                .onFailure { /// TODO: 실패시? }
+                }
+        }
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/BottomNavVisibilityController.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/interestarea/BottomNavVisibilityController.kt
similarity index 59%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/BottomNavVisibilityController.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/interestarea/BottomNavVisibilityController.kt
index 6291d8c7..7673e37b 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/BottomNavVisibilityController.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/interestarea/BottomNavVisibilityController.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.interestarea
+package com.example.spoteam_android.presentation.interestarea
 
 interface BottomNavVisibilityController {
     fun hideBottomNav()
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestAreaApiService.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/interestarea/InterestAreaApiService.kt
similarity index 98%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestAreaApiService.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/interestarea/InterestAreaApiService.kt
index 877a6100..80b1d083 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestAreaApiService.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/interestarea/InterestAreaApiService.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.interestarea
+package com.example.spoteam_android.presentation.interestarea
 
 import com.example.spoteam_android.FinishedStudyResponse
 import com.example.spoteam_android.HostApiResponse
@@ -153,8 +153,3 @@ interface FinishedStudyApiService {
 
 
 
-
-
-
-
-
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestAreaData.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/interestarea/InterestAreaData.kt
similarity index 92%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestAreaData.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/interestarea/InterestAreaData.kt
index 03b86935..fd2420ea 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestAreaData.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/interestarea/InterestAreaData.kt
@@ -1,7 +1,9 @@
-package com.example.spoteam_android.ui.interestarea
+package com.example.spoteam_android.presentation.interestarea
 
 import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
 
+@Serializable
 data class ApiResponse(
     @SerializedName("isSuccess")
     val isSuccess: Boolean,
@@ -16,6 +18,7 @@ data class ApiResponse(
     val result: Result
 )
 
+@Serializable
 data class Result(
 
     @SerializedName("themes")
@@ -46,6 +49,7 @@ data class Result(
     val number: Int
 )
 
+@Serializable
 data class Content(
     @SerializedName("studyId")
     val studyId: Int,
@@ -90,6 +94,7 @@ data class Content(
     val liked: Boolean
 )
 
+@Serializable
 data class Region(
     @SerializedName("province")
     val province: String,
@@ -102,5 +107,4 @@ data class Region(
 
     @SerializedName("code")
     val code: String
-)
-
+)
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestFilterFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/interestarea/InterestFilterFragment.kt
similarity index 99%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestFilterFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/interestarea/InterestFilterFragment.kt
index 9e27f797..0a7d50a3 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestFilterFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/interestarea/InterestFilterFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.interestarea
+package com.example.spoteam_android.presentation.interestarea
 
 import android.content.Context
 import android.content.res.ColorStateList
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestFilterViewModel.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/interestarea/InterestFilterViewModel.kt
similarity index 92%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestFilterViewModel.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/interestarea/InterestFilterViewModel.kt
index 53f08409..073179a0 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestFilterViewModel.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/interestarea/InterestFilterViewModel.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.interestarea
+package com.example.spoteam_android.presentation.interestarea
 
 import androidx.lifecycle.ViewModel
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/interestarea/InterestFragment.kt
similarity index 85%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/interestarea/InterestFragment.kt
index cc3188a2..872aa089 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/interestarea/InterestFragment.kt
@@ -1,55 +1,39 @@
-package com.example.spoteam_android.ui.interestarea
+package com.example.spoteam_android.presentation.interestarea
+
 
-import StudyApiService
-import StudyViewModel
-import android.annotation.SuppressLint
 import android.content.Context
-import android.content.pm.PackageManager
-import android.graphics.Typeface
-import android.os.Build
 import android.os.Bundle
-import android.util.Base64
 import android.view.LayoutInflater
-import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
 import android.widget.FrameLayout
 import android.widget.ImageView
-import android.widget.Spinner
 import android.widget.TextView
 import android.widget.Toast
-import androidx.core.content.ContentProviderCompat
-import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.BoardItem
-import com.example.spoteam_android.HouseFragment
-import com.example.spoteam_android.LikeResponse
+import com.example.spoteam_android.presentation.home.HomeFragment
 import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
+import com.example.spoteam_android.data.study.service.StudyService
 import com.example.spoteam_android.databinding.FragmentInterestBinding
-import com.example.spoteam_android.search.SearchFragment
-import com.example.spoteam_android.ui.alert.AlertFragment
-import com.example.spoteam_android.ui.study.DetailStudyFragment
-import com.example.spoteam_android.ui.study.FixedRoundedSpinnerAdapter
+import com.example.spoteam_android.domain.study.entity.BoardItem
+import com.example.spoteam_android.presentation.search.SearchFragment
+import com.example.spoteam_android.presentation.alert.AlertFragment
+import com.example.spoteam_android.presentation.study.StudyViewModel
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.tabs.TabLayout
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
-import java.security.MessageDigest
-import java.security.NoSuchAlgorithmException
 
 class InterestFragment : Fragment() {
 
     lateinit var binding: FragmentInterestBinding
     private lateinit var tabLayout: TabLayout
     private val studyViewModel: StudyViewModel by activityViewModels()
-    private lateinit var studyApiService: StudyApiService
     private lateinit var interestBoardAdapter: InterestVPAdapter
     private var gender: String? = null
     private var minAge: Int = 18
@@ -74,7 +58,6 @@ class InterestFragment : Fragment() {
     ): View {
 
         binding = FragmentInterestBinding.inflate(inflater, container, false)
-        studyApiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
 
         selectedItem = when (viewModel.isRecruiting) {
             true -> "RECRUITING"
@@ -85,7 +68,7 @@ class InterestFragment : Fragment() {
         setupRecyclerView()
 
         binding.spotLogo.setOnClickListener {
-            replaceFragment(HouseFragment())
+            replaceFragment(HomeFragment())
         }
 
         binding.icFindInterest.setOnClickListener {
@@ -177,7 +160,8 @@ class InterestFragment : Fragment() {
                     data.introduction
                 )
 
-                val detailStudyFragment = DetailStudyFragment()
+                val detailStudyFragment =
+                    com.example.spoteam_android.presentation.study.DetailStudyFragment()
                 (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
                     ?.replace(R.id.main_frm, detailStudyFragment)
                     ?.addToBackStack(null)
@@ -611,43 +595,24 @@ class InterestFragment : Fragment() {
     }
 
     private fun toggleLikeStatus(studyItem: BoardItem, likeButton: ImageView) {
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val memberId = sharedPreferences.getInt("${sharedPreferences.getString("currentEmail", "")}_memberId", -1)
-
-        if (memberId != -1) {
-            studyApiService.toggleStudyLike(studyItem.studyId)
-                .enqueue(object : Callback<LikeResponse> {
-                    override fun onResponse(call: Call<LikeResponse>, response: Response<LikeResponse>) {
-                        if (response.isSuccessful) {
-                            response.body()?.let { likeResponse ->
-                                // 서버에서 반환된 상태에 따라 하트 아이콘 및 BoardItem의 liked 상태 업데이트
-                                val newStatus = likeResponse.result.status
-                                studyItem.liked = newStatus == "LIKE"
-                                val newIcon = if (studyItem.liked) R.drawable.ic_heart_filled else R.drawable.study_like
-                                likeButton.setImageResource(newIcon)
-
-                                // heartCount 즉시 증가 또는 감소
-                                studyItem.heartCount = if (studyItem.liked) studyItem.heartCount + 1 else studyItem.heartCount - 1
-
-                                // 변경된 항목을 어댑터에 알림
-                                val adapter = binding.interestAreaStudyReyclerview.adapter as InterestVPAdapter
-                                val position = adapter.dataList.indexOf(studyItem)
-                                if (position != -1) {
-                                    adapter.notifyItemChanged(position)
-                                }
-                            }
-                        } else {
-                            Toast.makeText(requireContext(), "찜 상태 업데이트 실패", Toast.LENGTH_SHORT).show()
-                        }
-                    }
-
-                    override fun onFailure(call: Call<LikeResponse>, t: Throwable) {
-                        Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
-                    }
-                })
-        } else {
-            Toast.makeText(requireContext(), "회원 정보를 불러올 수 없습니다.", Toast.LENGTH_SHORT).show()
+        studyViewModel.toggleLikeStatus(studyItem.studyId) { result ->
+            requireActivity().runOnUiThread {
+                result.onSuccess { liked ->
+                    studyItem.liked = liked
+                    studyItem.heartCount += if (liked) 1 else -1
+                    val icon = if (liked) R.drawable.ic_heart_filled else R.drawable.study_like
+                    likeButton.setImageResource(icon)
+
+                    // RecyclerView 갱신
+                    interestBoardAdapter.notifyItemChanged(
+                        interestBoardAdapter.dataList.indexOf(studyItem)
+                    )
+                }.onFailure {
+                    Toast.makeText(requireContext(), "찜 실패: ${it.message}", Toast.LENGTH_SHORT).show()
+                }
+            }
         }
     }
 
+
 }
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestVPAdater.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/interestarea/InterestVPAdater.kt
similarity index 93%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestVPAdater.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/interestarea/InterestVPAdater.kt
index 384ff3dd..943778bd 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestVPAdater.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/interestarea/InterestVPAdater.kt
@@ -1,6 +1,5 @@
-package com.example.spoteam_android.ui.interestarea
+package com.example.spoteam_android.presentation.interestarea
 
-import StudyViewModel
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
@@ -8,9 +7,10 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
-import com.example.spoteam_android.BoardItem
 import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.ItemRecyclerViewBinding
+import com.example.spoteam_android.domain.study.entity.BoardItem
+import com.example.spoteam_android.presentation.study.StudyViewModel
 
 class InterestVPAdapter(
     var dataList: ArrayList<BoardItem>,
@@ -32,6 +32,8 @@ class InterestVPAdapter(
         dataList.addAll(newData)
         notifyDataSetChanged()
     }
+    fun getCurrentList(): List<BoardItem> = dataList
+
 
     override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): BoardViewHolder {
         val binding: ItemRecyclerViewBinding = ItemRecyclerViewBinding.inflate(
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/LoginState.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/LoginState.kt
new file mode 100644
index 00000000..2fa07e03
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/LoginState.kt
@@ -0,0 +1,8 @@
+package com.example.spoteam_android.presentation.login
+
+enum class LoginState {
+    LOADING,
+    SUCCESS,
+    FAILURE,
+    IDLE
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/LoginViewModel.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/LoginViewModel.kt
new file mode 100644
index 00000000..863de285
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/LoginViewModel.kt
@@ -0,0 +1,51 @@
+package com.example.spoteam_android.presentation.login
+
+import android.app.Activity
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.spoteam_android.domain.login.entity.CheckSpotMemberResponse
+import com.example.spoteam_android.domain.login.entity.SocialLoginResponse
+import com.example.spoteam_android.domain.login.repository.LoginRepository
+import com.example.spoteam_android.domain.login.repository.SocialLoginRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class LoginViewModel @Inject constructor(
+    private val socialLoginRepository: SocialLoginRepository,
+    private val loginRepository: LoginRepository
+) : ViewModel() {
+
+    private val _loginResult = MutableLiveData<Result<SocialLoginResponse>?>()
+    val loginResult: LiveData<Result<SocialLoginResponse>?> = _loginResult
+
+    private val _loginState = MutableLiveData<LoginState>(LoginState.LOADING)
+    val loginState: LiveData<LoginState> = _loginState
+
+    fun loginWithKakao(activity: Activity) {
+        viewModelScope.launch {
+            val result = socialLoginRepository.loginWithKakao(activity)
+            _loginResult.value = result
+        }
+    }
+
+    fun loginWithNaver(activity: Activity) {
+        viewModelScope.launch {
+            val result = socialLoginRepository.loginWithNaver(activity)
+            _loginResult.value = result
+        }
+    }
+
+    suspend fun checkSpotMember(): Result<CheckSpotMemberResponse> {
+        return loginRepository.checkSpotMember()
+    }
+
+    suspend fun getNickname(): Result<String> = loginRepository.getNickname()
+
+    fun updateLoginState(state: LoginState) {
+        _loginState.value = state
+    }
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/StartLoginActivity.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/StartLoginActivity.kt
new file mode 100644
index 00000000..19512836
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/StartLoginActivity.kt
@@ -0,0 +1,124 @@
+package com.example.spoteam_android.presentation.login
+
+import android.content.Intent
+import android.os.Bundle
+import android.widget.Toast
+import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import androidx.lifecycle.lifecycleScope
+import com.example.spoteam_android.MainActivity
+import com.example.spoteam_android.databinding.ActivityStartLoginBinding
+import com.example.spoteam_android.domain.login.entity.SocialLoginResponse
+import com.example.spoteam_android.data.login.datasource.local.TokenDataSource
+import com.example.spoteam_android.presentation.login.nickname.NicknameActivity
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class StartLoginActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityStartLoginBinding
+    private val loginViewModel: LoginViewModel by viewModels()
+
+    @Inject
+    lateinit var tokenDataSource: TokenDataSource
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        val splash = installSplashScreen()
+        splash.setKeepOnScreenCondition {
+            loginViewModel.loginState.value == LoginState.LOADING
+        }
+
+        super.onCreate(savedInstanceState)
+        binding = ActivityStartLoginBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        lifecycleScope.launch {
+            val token = tokenDataSource.getAccessToken()
+            if (!token.isNullOrEmpty()) {
+                runCatching {
+                    loginViewModel.checkSpotMember()
+                }.onSuccess { result ->
+                    if (result.isSuccess) {
+                        loginViewModel.updateLoginState(LoginState.SUCCESS)
+                        lifecycleScope.launch {
+                            loginViewModel.getNickname()
+                                .onSuccess { tokenDataSource.saveNickname(it) }
+                                .onFailure { showErrorToast("닉네임 조회 실패: ${it.message}") }
+                        }
+                        goToMain()
+                    } else {
+                        loginViewModel.updateLoginState(LoginState.SUCCESS)
+                        goToNicknameActivity()
+                    }
+                }.onFailure {
+                    loginViewModel.updateLoginState(LoginState.FAILURE)
+                    showErrorToast("자동 로그인 실패: ${it.message}")
+                }
+            } else {
+                loginViewModel.updateLoginState(LoginState.IDLE)
+            }
+        }
+
+        setupObservers()
+
+        binding.itemLogoKakaoIb.setOnClickListener {
+            loginViewModel.loginWithKakao(this)
+        }
+
+        binding.itemLogoNaverIb.setOnClickListener {
+            loginViewModel.loginWithNaver(this)
+        }
+    }
+
+    private fun setupObservers() {
+        loginViewModel.loginResult.observe(this) { result ->
+            result?.onSuccess { model ->
+                saveUserInfo(model)
+
+                if (model.isSpotMember) {
+                    lifecycleScope.launch {
+                        loginViewModel.getNickname()
+                            .onSuccess { tokenDataSource.saveNickname(it) }
+                            .onFailure { showErrorToast("닉네임 조회 실패: ${it.message}") }
+                    }
+                    goToMain()
+                } else {
+                    goToNicknameActivity()
+                }
+            }?.onFailure {
+                showErrorToast("로그인 실패: ${it.message}")
+            }
+        }
+    }
+
+    private fun saveUserInfo(model: SocialLoginResponse) {
+        tokenDataSource.saveUserInfo(
+            platform = model.loginType,
+            email = model.email,
+            profileImageUrl = model.profileImage ?: "",
+            accessToken = model.tokens.accessToken,
+            refreshToken = model.tokens.refreshToken,
+            memberId = model.memberId
+        )
+    }
+
+    private fun goToNicknameActivity() {
+        val intent = Intent(this, NicknameActivity::class.java)
+        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        startActivity(intent)
+        finish()
+    }
+
+    private fun goToMain() {
+        val intent = Intent(this, MainActivity::class.java)
+        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        startActivity(intent)
+        finish()
+    }
+
+    private fun showErrorToast(message: String) {
+        Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
+    }
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/CheckListCategoryActivity.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/CheckListCategoryActivity.kt
new file mode 100644
index 00000000..fa654182
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/CheckListCategoryActivity.kt
@@ -0,0 +1,46 @@
+package com.example.spoteam_android.presentation.login.checklist
+
+import android.content.Intent
+import android.os.Bundle
+import android.widget.CompoundButton
+import androidx.appcompat.app.AppCompatActivity
+import com.example.spoteam_android.databinding.ActivityCheckListCategoryBinding
+import com.google.android.material.chip.Chip
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class CheckListCategoryActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityCheckListCategoryBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityCheckListCategoryBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        val selectedThemes = mutableListOf<String>()
+        val chipCheckedChangeListener = CompoundButton.OnCheckedChangeListener { buttonView, isChecked ->
+            val chip = buttonView as Chip
+            val chipText = chip.text.toString()
+            val processedText = if (chipText.contains("전공")) chipText.replace("/", "및") else chipText.replace("/", "").replace(" ", "")
+            if (isChecked) {
+                if (processedText !in selectedThemes) {
+                    selectedThemes.add(processedText)
+                }
+            } else {
+                selectedThemes.remove(processedText)
+            }
+            binding.checklistspotNextBt.isEnabled = selectedThemes.isNotEmpty()
+        }
+
+        repeat(binding.activityChecklistChipGroup.childCount) {
+            (binding.activityChecklistChipGroup.getChildAt(it) as? Chip)
+                ?.setOnCheckedChangeListener(chipCheckedChangeListener)
+        }
+
+        binding.checklistspotNextBt.setOnClickListener {
+            val intent = Intent(this, CheckListStudyPurposeActivity::class.java)
+            intent.putStringArrayListExtra("selectedThemes", ArrayList(selectedThemes))
+            startActivity(intent)
+        }
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/checklist/CheckListLocationActivity.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/CheckListLocationActivity.kt
similarity index 56%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/checklist/CheckListLocationActivity.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/CheckListLocationActivity.kt
index bcef9629..7653b682 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/checklist/CheckListLocationActivity.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/CheckListLocationActivity.kt
@@ -1,91 +1,81 @@
-package com.example.spoteam_android.checklist
+package com.example.spoteam_android.presentation.login.checklist
 
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
-import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.ActivityCheckListLocationBinding
-import com.example.spoteam_android.login.LocationSearchActivity
-import com.example.spoteam_android.login.RegisterInformation
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipDrawable
+import com.example.spoteam_android.R
+import dagger.hilt.android.AndroidEntryPoint
 
+@AndroidEntryPoint
 class CheckListLocationActivity : AppCompatActivity() {
     private lateinit var binding: ActivityCheckListLocationBinding
-    private val selectedLocations = mutableListOf<String>() // 코드로 저장
+    private val selectedLocations = mutableListOf<String>()
 
-    private val startForResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-        if (result.resultCode == RESULT_OK) {
-            result.data?.let { data ->
-                val address = data.getStringExtra("SELECTED_ADDRESS")
-                val code = data.getStringExtra("SELECTED_CODE")
-                addLocationChip(address, code)
-            }
+    private val resultLauncher =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            val code = result.data?.getStringExtra("SELECTED_CODE") ?: return@registerForActivityResult
+            val address = result.data?.getStringExtra("SELECTED_ADDRESS") ?: return@registerForActivityResult
+            addChip(code, address)
         }
-    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityCheckListLocationBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        val selectedThemes = intent.getStringArrayListExtra("selectedThemes")
-        val selectedPurpose = intent.getIntegerArrayListExtra("selectedPurpose")
-
-
         setSupportActionBar(binding.activityChecklistLocationTb)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         title = ""
         binding.activityChecklistLocationTb.setNavigationOnClickListener {
-            val intent = Intent(this, CheckListStudyPurposeActivity::class.java)
-            intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
-            startActivity(intent)
-
-
+            finish()
         }
 
+        val selectedThemes = intent.getStringArrayListExtra("selectedThemes")
+        val selectedPurposes = intent.getIntegerArrayListExtra("selectedPurposes")
 
         binding.checklistspotLocationPlusBt.setOnClickListener {
             if (selectedLocations.size < 5) {
-                val intent = Intent(this, LocationSearchActivity::class.java)
-                startForResult.launch(intent)
-            } else {
-                // 최대 선택 개수를 초과한 경우 처리 로직
+                resultLauncher.launch(Intent(this, LocationSearchActivity::class.java))
             }
         }
 
         binding.checklistspotLocationFinishBt.setOnClickListener {
             val intent = Intent(this, RegisterInformation::class.java).apply {
                 putExtra("mode", "FINAL")
-                putStringArrayListExtra("selectedThemes", ArrayList(selectedThemes))
-                putIntegerArrayListExtra("selectedPurpose", ArrayList(selectedPurpose))
-                putStringArrayListExtra("selectedLocations", ArrayList(selectedLocations)) // 코드 리스트 전달
-                Log.d("ChecklistLocation","$selectedLocations")
+                putStringArrayListExtra("selectedThemes", selectedThemes)
+                putIntegerArrayListExtra("selectedPurposes", selectedPurposes)
+                putStringArrayListExtra("selectedRegions", ArrayList(selectedLocations))
             }
             startActivity(intent)
         }
-
         updateButtonStates()
     }
 
-    private fun addLocationChip(address: String?, code: String?) {
-        if (!address.isNullOrEmpty() && !selectedLocations.contains(code)) {
-            code?.let {
-                selectedLocations.add(it) // 코드 저장
-            }
+    private fun addChip(code: String, address: String) {
+        if (!selectedLocations.contains(code)) {
+            selectedLocations.add(code)
 
             val chip = Chip(this).apply {
                 text = address
                 setTextColor(getColor(R.color.b500))
-                setChipDrawable(ChipDrawable.createFromAttributes(this@CheckListLocationActivity, null, 0, R.style.CustomChipCloseStyle))
+                setChipDrawable(
+                    ChipDrawable.createFromAttributes(
+                        this@CheckListLocationActivity,
+                        null,
+                        0,
+                        R.style.CustomChipCloseStyle
+                    )
+                )
                 isCloseIconVisible = true
                 setOnCloseIconClickListener {
                     binding.chipGroup.removeView(this)
-                    code?.let { code -> selectedLocations.remove(code) } // 코드 삭제
+                    selectedLocations.remove(code)
                     if (selectedLocations.isEmpty()) {
                         binding.activityChecklistLocationCl.visibility = View.VISIBLE
                     }
@@ -107,5 +97,4 @@ class CheckListLocationActivity : AppCompatActivity() {
         binding.checklistspotLocationPlusBt.isEnabled = selectedLocations.size < 5
         binding.checklistspotLocationFinishBt.isEnabled = selectedLocations.isNotEmpty()
     }
-}
-
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/CheckListStudyPurposeActivity.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/CheckListStudyPurposeActivity.kt
new file mode 100644
index 00000000..a465e76a
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/CheckListStudyPurposeActivity.kt
@@ -0,0 +1,52 @@
+package com.example.spoteam_android.presentation.login.checklist
+
+import android.content.Intent
+import android.os.Bundle
+import android.widget.CompoundButton
+import androidx.appcompat.app.AppCompatActivity
+import com.example.spoteam_android.R
+import com.example.spoteam_android.databinding.ActivityCheckListStudyPurposeBinding
+import com.google.android.material.chip.Chip
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class CheckListStudyPurposeActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityCheckListStudyPurposeBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityCheckListStudyPurposeBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        val selectedPurpose = mutableListOf<Int>()
+        val chipMap = mapOf(
+            R.id.activity_checklist_studypurpose_chip_habit to 1,
+            R.id.activity_checklist_studypurpose_chip_feedback to 2,
+            R.id.activity_checklist_studypurpose_chip_network to 3,
+            R.id.activity_checklist_studypurpose_chip_license to 4,
+            R.id.activity_checklist_studypurpose_chip_contest to 5,
+            R.id.activity_checklist_studypurpose_chip_opinion to 6
+        )
+
+        val listener = CompoundButton.OnCheckedChangeListener { btn, isChecked ->
+            chipMap[btn.id]?.let {
+                if (isChecked) selectedPurpose.add(it) else selectedPurpose.remove(it)
+                binding.activityChecklistStudypurposeChecklistspotNextBt.isEnabled = selectedPurpose.isNotEmpty()
+            }
+        }
+
+        repeat(binding.flexboxLayout.childCount) {
+            (binding.flexboxLayout.getChildAt(it) as? Chip)
+                ?.setOnCheckedChangeListener(listener)
+        }
+
+        val selectedThemes = intent.getStringArrayListExtra("selectedThemes")
+
+        binding.activityChecklistStudypurposeChecklistspotNextBt.setOnClickListener {
+            val intent = Intent(this, CheckListLocationActivity::class.java)
+            intent.putStringArrayListExtra("selectedThemes", selectedThemes)
+            intent.putIntegerArrayListExtra("selectedPurposes", ArrayList(selectedPurpose))
+            startActivity(intent)
+        }
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/CheckListViewModel.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/CheckListViewModel.kt
new file mode 100644
index 00000000..8bbdaa75
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/CheckListViewModel.kt
@@ -0,0 +1,35 @@
+package com.example.spoteam_android.presentation.login.checklist
+
+import com.example.spoteam_android.domain.login.repository.LoginRepository
+
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+
+@HiltViewModel
+class CheckListViewModel @Inject constructor(
+    private val loginRepository: LoginRepository
+) : ViewModel() {
+    fun submitPreferences(
+        themes: List<String>,
+        purposes: List<Int>,
+        regions: List<String>
+    ): LiveData<Result<Unit>> {
+        val result = MutableLiveData<Result<Unit>>()
+        viewModelScope.launch {
+            try {
+                loginRepository.updateThemes(themes)
+                loginRepository.updateStudyReasons(purposes)
+                loginRepository.updateRegions(regions)
+                result.value = Result.success(Unit)
+            } catch (e: Exception) {
+                result.value = Result.failure(e)
+            }
+        }
+        return result
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationItem.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/LocationItem.kt
similarity index 79%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationItem.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/LocationItem.kt
index 4911a97d..9b912fcb 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationItem.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/LocationItem.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.login
+package com.example.spoteam_android.presentation.login.checklist
 
 data class LocationItem(
     val code: String,
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/LocationSearchActivity.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/LocationSearchActivity.kt
new file mode 100644
index 00000000..febf38a6
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/LocationSearchActivity.kt
@@ -0,0 +1,113 @@
+package com.example.spoteam_android.presentation.login.checklist
+
+import android.content.Intent
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.MotionEvent
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.spoteam_android.databinding.ActivityLocationSearchBinding
+import java.io.BufferedReader
+import java.io.InputStreamReader
+
+class LocationSearchActivity : AppCompatActivity() {
+
+    private lateinit var binding: ActivityLocationSearchBinding
+    private lateinit var locationSearchAdapter: LocationSearchAdapter
+    private val locationItemList = mutableListOf<LocationItem>()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityLocationSearchBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        setSupportActionBar(binding.activityChecklistLocationSearchTb)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        title = ""
+        binding.activityChecklistLocationSearchTb.setNavigationOnClickListener {
+            onBackPressedDispatcher.onBackPressed()
+        }
+
+        setupRecyclerView()
+        setupSearchFunctionality()
+        loadLocalTsvFile()
+    }
+
+    private fun setupRecyclerView() {
+        locationSearchAdapter = LocationSearchAdapter(locationItemList) { item ->
+            val resultIntent = Intent().apply {
+                putExtra("SELECTED_ADDRESS", item.address)
+                putExtra("SELECTED_CODE", item.code)
+            }
+            setResult(RESULT_OK, resultIntent)
+            finish()
+        }
+        binding.activityLocationRv.apply {
+            layoutManager = LinearLayoutManager(this@LocationSearchActivity)
+            adapter = locationSearchAdapter
+            visibility = View.GONE
+        }
+    }
+
+    private fun setupSearchFunctionality() {
+        binding.activityLocationSearchEt.setOnTouchListener { v, event ->
+            if (event.action == MotionEvent.ACTION_UP) {
+                val drawableEnd = binding.activityLocationSearchEt.compoundDrawables[2]
+                if (drawableEnd != null && event.rawX >= (binding.activityLocationSearchEt.right - drawableEnd.bounds.width())) {
+                    performSearch()
+                    return@setOnTouchListener true
+                }
+            }
+            false
+        }
+
+        binding.activityLocationSearchEt.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+            override fun afterTextChanged(s: Editable?) {
+                performSearch()
+            }
+        })
+    }
+
+    private fun loadLocalTsvFile() {
+        val inputStream = assets.open("region_data_processed.tsv")
+        val reader = BufferedReader(InputStreamReader(inputStream))
+        val tsvData = reader.use { it.readText() }
+        parseTsvData(tsvData)
+    }
+
+    private fun parseTsvData(tsvData: String) {
+        val rows = tsvData.split("\n").drop(1)
+
+        locationItemList.clear()
+        for (row in rows) {
+            val columns = row.split("\t")
+            if (columns.size >= 5) {
+                val item = LocationItem(
+                    code = columns[0],
+                    city = columns[1],
+                    districtCity = columns[2],
+                    districtGu = columns[3],
+                    subdistrict = columns[4]
+                )
+                locationItemList.add(item)
+            }
+        }
+
+        locationSearchAdapter.notifyDataSetChanged()
+        binding.activityLocationRv.visibility = if (locationSearchAdapter.itemCount > 0) View.VISIBLE else View.GONE
+    }
+
+    private fun performSearch() {
+        val query = binding.activityLocationSearchEt.text.toString()
+        locationSearchAdapter.filter(query)
+        binding.activityLocationRv.visibility = if (locationSearchAdapter.itemCount > 0) {
+            View.VISIBLE
+        } else {
+            View.GONE
+        }
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationSearchAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/LocationSearchAdapter.kt
similarity index 86%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationSearchAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/LocationSearchAdapter.kt
index 6aeefa54..17d9fbfb 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationSearchAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/LocationSearchAdapter.kt
@@ -1,8 +1,9 @@
+package com.example.spoteam_android.presentation.login.checklist
+
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.example.spoteam_android.databinding.ItemLocationSearchBinding
-import com.example.spoteam_android.login.LocationItem
 
 class LocationSearchAdapter(
     private val dataList: List<LocationItem>,
@@ -10,13 +11,13 @@ class LocationSearchAdapter(
 ) : RecyclerView.Adapter<LocationSearchAdapter.ViewHolder>() {
 
     private var filteredList: MutableList<LocationItem> = dataList.toMutableList()
-    private var selectedItem: LocationItem? = null // 선택된 아이템을 저장하는 변수
+    private var selectedItem: LocationItem? = null
 
     inner class ViewHolder(val binding: ItemLocationSearchBinding) : RecyclerView.ViewHolder(binding.root) {
         fun bind(item: LocationItem) {
             binding.itemLocationConcreteTv.text = item.address
             binding.root.setOnClickListener {
-                selectedItem = item // 아이템 클릭 시 선택된 아이템 저장
+                selectedItem = item
                 onItemClick(item)
             }
         }
@@ -39,10 +40,10 @@ class LocationSearchAdapter(
         if (query.isEmpty()) {
             filteredList.addAll(dataList)
         } else {
-            val normalizedQueryWords = normalizeLocationName(query.lowercase()).split(" ")  // ✅ 검색어를 단어별로 분리
+            val normalizedQueryWords = normalizeLocationName(query.lowercase()).split(" ")
 
             for (item in dataList) {
-                val normalizedAddressWords = normalizeLocationName(item.address.lowercase()).split(" ")  // ✅ 주소도 단어별로 분리
+                val normalizedAddressWords = normalizeLocationName(item.address.lowercase()).split(" ")
 
 
                 if (normalizedQueryWords.all { queryWord ->
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/RegisterInformation.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/RegisterInformation.kt
new file mode 100644
index 00000000..faebb057
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/checklist/RegisterInformation.kt
@@ -0,0 +1,86 @@
+package com.example.spoteam_android.presentation.login.checklist
+
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import android.widget.Toast
+import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.lifecycleScope
+import com.example.spoteam_android.MainActivity
+import com.example.spoteam_android.databinding.ActivityRegisterInformationBinding
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+@AndroidEntryPoint
+class RegisterInformation : AppCompatActivity() {
+    private lateinit var binding: ActivityRegisterInformationBinding
+    private val viewModel: CheckListViewModel by viewModels()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityRegisterInformationBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        val mode = intent.getStringExtra("mode") ?: "START"
+
+        if (mode == "FINAL") {
+            val themes = intent.getStringArrayListExtra("selectedThemes") ?: listOf()
+            val purposes = intent.getIntegerArrayListExtra("selectedPurposes") ?: listOf()
+            val regions = intent.getStringArrayListExtra("selectedRegions") ?: listOf()
+
+            binding.registerMsgTv.text = "체크리스트 등록 중.."
+            observeSubmitResult(themes, purposes, regions)
+        }
+
+        setupProgressBar(mode)
+    }
+
+    private fun observeSubmitResult(
+        themes: List<String>,
+        purposes: List<Int>,
+        regions: List<String>
+    ) {
+        viewModel.submitPreferences(themes, purposes, regions).observe(this) { result ->
+            result.onSuccess {
+                Log.d("RegisterInformation", "모든 항목 등록 성공")
+            }.onFailure { e ->
+                Log.e("RegisterInformation", "등록 실패", e)
+                Toast.makeText(this, "등록 실패: ${e.message}", Toast.LENGTH_SHORT).show()
+            }
+        }
+    }
+
+    private fun setupProgressBar(mode: String) {
+        lifecycleScope.launch {
+            val totalSteps = 5
+            for (i in 1..totalSteps) {
+                delay(500)
+                updateProgressBar(i * 20)
+            }
+
+            if (mode == "FINAL") {
+                binding.registerMsgTv.text = "내 정보 등록 완료!"
+                delay(500)
+                navigateToMainScreen()
+            } else if (mode == "START") {
+                navigateToCheckList()
+            }
+        }
+    }
+
+    private fun updateProgressBar(progress: Int) {
+        binding.activityRegisterProgressbar.progress = progress
+    }
+
+    private fun navigateToMainScreen() {
+        startActivity(Intent(this, MainActivity::class.java))
+        finish()
+    }
+
+    private fun navigateToCheckList() {
+        startActivity(Intent(this, CheckListCategoryActivity::class.java))
+        finish()
+    }
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/nickname/NicknameActivity.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/nickname/NicknameActivity.kt
new file mode 100644
index 00000000..f15a8a02
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/nickname/NicknameActivity.kt
@@ -0,0 +1,178 @@
+package com.example.spoteam_android.presentation.login.nickname
+
+import android.app.Dialog
+import android.content.Intent
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.graphics.drawable.InsetDrawable
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.LayoutInflater
+import android.view.View
+import android.view.Window
+import android.widget.Toast
+import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import com.example.spoteam_android.R
+import com.example.spoteam_android.databinding.ActivityNickNameBinding
+import com.example.spoteam_android.databinding.DialogAgreementBinding
+import com.example.spoteam_android.databinding.DialogIdentificationAgreementBinding
+import com.example.spoteam_android.presentation.login.checklist.RegisterInformation
+import com.example.spoteam_android.presentation.login.StartLoginActivity
+import com.example.spoteam_android.presentation.nickname.NicknameViewModel
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class NicknameActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityNickNameBinding
+    private val viewModel: NicknameViewModel by viewModels()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityNickNameBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        binding.activityNicknameLoginTb.setOnClickListener {
+            startActivity(Intent(this, StartLoginActivity::class.java))
+        }
+
+        binding.activityNickNameNicknameEt.addTextChangedListener(object : TextWatcher {
+            override fun afterTextChanged(s: Editable?) {
+                val nickname = s.toString().trim()
+                if (nickname.isNotBlank()) viewModel.checkNickname(nickname)
+            }
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+        })
+
+        binding.activityStartloginCheckBox1.isClickable = false
+        binding.activityStartloginCheckBox1.isFocusable = false
+        binding.activityStartloginCheckBox2.isClickable = false
+        binding.activityStartloginCheckBox2.isFocusable = false
+
+        binding.activityStartloginCheckBox1Ll.setOnClickListener { showAgreementDialog() }
+        binding.activityStartloginCheckBox2Ll.setOnClickListener { showIdentifyAgreementDialog() }
+
+        binding.activityStartloginLoginwithspotNextBt.setOnClickListener {
+            val nickname = binding.activityNickNameNicknameEt.text.toString().trim()
+            val personalInfo = binding.activityStartloginCheckBox1.isChecked
+            val idInfo = binding.activityStartloginCheckBox2.isChecked
+
+            if (nickname.isEmpty()) {
+                Toast.makeText(this, "닉네임을 입력해주세요", Toast.LENGTH_SHORT).show()
+                return@setOnClickListener
+            }
+
+            viewModel.updateNickname(nickname, personalInfo, idInfo)
+        }
+
+        observeState()
+    }
+
+    private fun observeState() {
+        viewModel.nicknameState.observe(this) { state ->
+            when (state) {
+                NicknameState.Valid -> updateValidationUI(true, "사용 가능한 닉네임입니다.", "")
+                NicknameState.Error -> updateValidationUI(false, "", "사용 불가능한 닉네임입니다.")
+                else -> resetValidationUI()
+            }
+        }
+
+        viewModel.nicknameUpdateResult.observe(this) { result ->
+            result.onSuccess {
+                val nickname = binding.activityNickNameNicknameEt.text.toString().trim()
+                viewModel.saveNickname(nickname)
+
+                startActivity(Intent(this, RegisterInformation::class.java).apply {
+                    putExtra("mode", "START")
+                })
+                finish()
+            }.onFailure {
+                Toast.makeText(this, "오류 발생: ${it.message}", Toast.LENGTH_SHORT).show()
+                viewModel.clearAll()
+                val intent = Intent(this, StartLoginActivity::class.java).apply {
+                    flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+                }
+                startActivity(intent)
+                finish()
+            }
+        }
+    }
+
+
+    private fun showAgreementDialog() {
+        val dialog = Dialog(this)
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
+        dialog.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+        val dialogBinding = DialogAgreementBinding.inflate(LayoutInflater.from(this))
+        dialog.setContentView(dialogBinding.root)
+        dialog.window?.setLayout((325 * resources.displayMetrics.density).toInt(), (400 * resources.displayMetrics.density).toInt())
+
+        dialogBinding.dialogAgreementAcceptBtn.setOnClickListener {
+            binding.activityStartloginCheckBox1.isChecked = true
+            binding.activityStartloginCheckBox1Ll.setBackgroundResource(R.drawable.agreement_background)
+            updateNextButtonState()
+            dialog.dismiss()
+        }
+        dialogBinding.dialogCloseBtn.setOnClickListener { dialog.dismiss() }
+        dialog.show()
+    }
+
+    private fun showIdentifyAgreementDialog() {
+        val dialog = Dialog(this)
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
+        dialog.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+        val dialogBinding = DialogIdentificationAgreementBinding.inflate(LayoutInflater.from(this))
+        dialog.setContentView(dialogBinding.root)
+        dialog.window?.setLayout((325 * resources.displayMetrics.density).toInt(), (400 * resources.displayMetrics.density).toInt())
+
+        dialogBinding.dialogAgreementAcceptBtn.setOnClickListener {
+            binding.activityStartloginCheckBox2.isChecked = true
+            binding.activityStartloginCheckBox2Ll.setBackgroundResource(R.drawable.agreement_background)
+            updateNextButtonState()
+            dialog.dismiss()
+        }
+        dialogBinding.dialogCloseBtn.setOnClickListener { dialog.dismiss() }
+        dialog.show()
+    }
+
+    private fun updateValidationUI(isValid: Boolean, successMessage: String, errorMessage: String) {
+        val icon = if (isValid) R.drawable.aftercheck else R.drawable.after_alert
+        val background = if (isValid) R.drawable.normal_login_edittext_corner_rectangle else R.drawable.error_edittext_background
+
+        ContextCompat.getDrawable(this, icon)?.let { drawable ->
+            val inset = InsetDrawable(drawable, 0, 0, 30, 0)
+            val size = (binding.activityNickNameNicknameEt.textSize * 2).toInt()
+            inset.setBounds(0, 0, size, size)
+            binding.activityNickNameNicknameEt.setCompoundDrawables(null, null, inset, null)
+        }
+
+        binding.activityNickNameValidMessageTv.apply {
+            visibility = View.VISIBLE
+            text = if (isValid) successMessage else errorMessage
+            setTextColor(ContextCompat.getColor(context, if (isValid) R.color.b500 else R.color.r500))
+        }
+
+        binding.activityNickNameNicknameEt.background = ContextCompat.getDrawable(this, background)
+
+        updateNextButtonState()
+    }
+
+
+    private fun updateNextButtonState() {
+        val isNicknameValid = viewModel.isNicknameValid()
+        val allAgreed = binding.activityStartloginCheckBox1.isChecked && binding.activityStartloginCheckBox2.isChecked
+        binding.activityStartloginLoginwithspotNextBt.isEnabled = isNicknameValid && allAgreed
+    }
+
+    private fun resetValidationUI() {
+        binding.activityNickNameValidMessageTv.text = getString(R.string.nick_name)
+        binding.activityNickNameValidMessageTv.setTextColor(ContextCompat.getColor(this, R.color.g400))
+        binding.activityNickNameValidMessageTv.visibility = View.VISIBLE
+        binding.activityNickNameNicknameEt.setCompoundDrawables(null, null, null, null)
+        binding.activityNickNameNicknameEt.background = ContextCompat.getDrawable(this, R.drawable.normal_login_edittext_corner_rectangle)
+        binding.activityStartloginLoginwithspotNextBt.isEnabled = false
+    }
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/nickname/NicknameState.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/nickname/NicknameState.kt
new file mode 100644
index 00000000..53dc648c
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/nickname/NicknameState.kt
@@ -0,0 +1,11 @@
+package com.example.spoteam_android.presentation.login.nickname
+
+sealed class NicknameState {
+
+    object Default : NicknameState()
+
+    object Valid : NicknameState()
+
+    object Error : NicknameState()
+
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/nickname/NicknameViewModel.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/nickname/NicknameViewModel.kt
new file mode 100644
index 00000000..2c70f3be
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/login/nickname/NicknameViewModel.kt
@@ -0,0 +1,70 @@
+package com.example.spoteam_android.presentation.nickname
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.spoteam_android.data.login.datasource.local.TokenDataSource
+import com.example.spoteam_android.domain.login.entity.NickNameRequest
+import com.example.spoteam_android.domain.login.entity.NickNameResponse
+import com.example.spoteam_android.domain.login.repository.LoginRepository
+import com.example.spoteam_android.presentation.login.nickname.NicknameState
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class NicknameViewModel @Inject constructor(
+    private val loginRepository: LoginRepository,
+    private val tokenDataSource: TokenDataSource
+) : ViewModel() {
+
+    private val _nicknameState = MutableLiveData<NicknameState>(NicknameState.Default)
+    val nicknameState: LiveData<NicknameState> = _nicknameState
+
+    private val _nicknameUpdateResult = MutableLiveData<Result<NickNameResponse>>()
+    val nicknameUpdateResult: LiveData<Result<NickNameResponse>> = _nicknameUpdateResult
+
+    fun checkNickname(nickname: String) {
+        if (!isNicknameValidFormat(nickname)) {
+            _nicknameState.value = NicknameState.Error
+            return
+        }
+        viewModelScope.launch {
+            val result = loginRepository.checkNickName(nickname)
+            result.onSuccess {
+                _nicknameState.value = if (!it.duplicate) {
+                    NicknameState.Valid
+                } else {
+                    NicknameState.Error
+                }
+            }.onFailure {
+                _nicknameState.value = NicknameState.Default
+            }
+        }
+    }
+
+    fun updateNickname(nickname: String, personalInfo: Boolean, idInfo: Boolean) {
+        viewModelScope.launch {
+            val result = loginRepository.updateNickName(
+                NickNameRequest(nickname, personalInfo, idInfo)
+            )
+            _nicknameUpdateResult.value = result
+        }
+    }
+
+    fun saveNickname(nickname: String){
+        tokenDataSource.saveNickname(nickname)
+    }
+
+
+    fun isNicknameValid(): Boolean = _nicknameState.value == NicknameState.Valid
+
+    fun clearAll() = tokenDataSource.clearAll()
+
+
+    private fun isNicknameValidFormat(nickname: String): Boolean {
+        val nicknameRegex = Regex("^[가-힣a-zA-Z0-9_/]{1,8}$")
+        return nicknameRegex.matches(nickname)
+    }
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestChipViewModel.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/myinterest/MyInterestChipViewModel.kt
similarity index 93%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestChipViewModel.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/myinterest/MyInterestChipViewModel.kt
index 8c9ab804..d4d01538 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestChipViewModel.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/myinterest/MyInterestChipViewModel.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.myinterest
+package com.example.spoteam_android.presentation.myinterest
 
 import androidx.lifecycle.ViewModel
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestStudyFilterFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/myinterest/MyInterestStudyFilterFragment.kt
similarity index 98%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestStudyFilterFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/myinterest/MyInterestStudyFilterFragment.kt
index 37418969..6449603e 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestStudyFilterFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/myinterest/MyInterestStudyFilterFragment.kt
@@ -1,8 +1,8 @@
-package com.example.spoteam_android.ui.myinterest
+package com.example.spoteam_android.presentation.myinterest
 
-import com.example.spoteam_android.ui.interestarea.BottomNavVisibilityController
-import com.example.spoteam_android.ui.interestarea.InterestFilterViewModel
-import com.example.spoteam_android.ui.interestarea.InterestFragment
+import com.example.spoteam_android.presentation.interestarea.BottomNavVisibilityController
+import com.example.spoteam_android.presentation.interestarea.InterestFilterViewModel
+import com.example.spoteam_android.presentation.interestarea.InterestFragment
 import android.content.Context
 import android.content.res.ColorStateList
 import android.graphics.Color
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestStudyFilterLocationFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/myinterest/MyInterestStudyFilterLocationFragment.kt
similarity index 91%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestStudyFilterLocationFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/myinterest/MyInterestStudyFilterLocationFragment.kt
index 7267a59d..5059b1f7 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestStudyFilterLocationFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/myinterest/MyInterestStudyFilterLocationFragment.kt
@@ -1,6 +1,6 @@
-package com.example.spoteam_android.ui.myinterest
+package com.example.spoteam_android.presentation.myinterest
 
-import LocationSearchAdapter
+import com.example.spoteam_android.presentation.login.checklist.LocationSearchAdapter
 import com.example.spoteam_android.databinding.FragmentMyInerestStudyFilterLocationBinding
 import android.os.Bundle
 import android.text.Editable
@@ -9,18 +9,12 @@ import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toolbar
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
-import com.example.spoteam_android.databinding.FragmentLocationStudyBinding
-import com.example.spoteam_android.login.LocationItem
-import com.example.spoteam_android.ui.interestarea.InterestFragment
-import com.example.spoteam_android.ui.study.IntroduceStudyFragment
-import com.example.spoteam_android.ui.study.OnlineStudyFragment
-import com.example.spoteam_android.ui.study.RegisterStudyFragment
+import com.example.spoteam_android.presentation.login.checklist.LocationItem
 import java.io.BufferedReader
 import java.io.InputStreamReader
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/myinterest/MyInterestStudyFragment.kt
similarity index 85%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestStudyFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/myinterest/MyInterestStudyFragment.kt
index 71e6eeeb..7d45e7b4 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestStudyFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/myinterest/MyInterestStudyFragment.kt
@@ -1,55 +1,52 @@
-package com.example.spoteam_android.ui.myinterest
+package com.example.spoteam_android.presentation.myinterest
 
-import StudyApiService
-import StudyViewModel
 import android.content.Context
-import android.graphics.Typeface
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
-import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
 import android.widget.FrameLayout
 import android.widget.ImageView
-import android.widget.Spinner
 import android.widget.TextView
 import android.widget.Toast
-import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.BoardItem
-import com.example.spoteam_android.HouseFragment
-import com.example.spoteam_android.LikeResponse
 import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentMyInterestStudyBinding
-import com.example.spoteam_android.search.SearchFragment
-import com.example.spoteam_android.ui.alert.AlertFragment
-import com.example.spoteam_android.ui.home.HomeFragment
-import com.example.spoteam_android.ui.interestarea.ApiResponse
-import com.example.spoteam_android.ui.interestarea.GetInterestCategoryApiService
-import com.example.spoteam_android.ui.interestarea.InterestFilterViewModel
-import com.example.spoteam_android.ui.interestarea.InterestVPAdapter
-import com.example.spoteam_android.ui.interestarea.MyInterestStudyAllApiService
-import com.example.spoteam_android.ui.interestarea.MyInterestStudySpecificApiService
-import com.example.spoteam_android.ui.study.DetailStudyFragment
-import com.example.spoteam_android.ui.study.FixedRoundedSpinnerAdapter
+import com.example.spoteam_android.domain.study.entity.BoardItem
+import com.example.spoteam_android.presentation.alert.AlertFragment
+import com.example.spoteam_android.presentation.home.HomeFragment
+import com.example.spoteam_android.presentation.interestarea.ApiResponse
+import com.example.spoteam_android.presentation.interestarea.GetInterestCategoryApiService
+import com.example.spoteam_android.presentation.interestarea.InterestVPAdapter
+import com.example.spoteam_android.presentation.interestarea.MyInterestStudyAllApiService
+import com.example.spoteam_android.presentation.interestarea.MyInterestStudySpecificApiService
+import com.example.spoteam_android.presentation.search.SearchFragment
+import com.example.spoteam_android.presentation.study.StudyViewModel
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.tabs.TabLayout
+import dagger.hilt.android.AndroidEntryPoint
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
-import retrofit2.http.Query
+import javax.inject.Inject
+
+@AndroidEntryPoint
 class MyInterestStudyFragment : Fragment() {
 
     lateinit var binding: FragmentMyInterestStudyBinding
     private lateinit var tabLayout: TabLayout
-    private lateinit var studyApiService: StudyApiService
+
+    lateinit var myInterestAllApiService: MyInterestStudyAllApiService
+
+    lateinit var myInterestSpecificApiService: MyInterestStudySpecificApiService
+
+    lateinit var categoryApiService: GetInterestCategoryApiService
+
     private val studyViewModel: StudyViewModel by activityViewModels()
     private lateinit var interestBoardAdapter: InterestVPAdapter
     private var gender: String? = null
@@ -75,7 +72,6 @@ class MyInterestStudyFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         binding = FragmentMyInterestStudyBinding.inflate(inflater, container, false)
-        studyApiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
 
         selectedItem = when (viewModel.isRecruiting) {
             true -> "RECRUITING"
@@ -185,7 +181,7 @@ class MyInterestStudyFragment : Fragment() {
         interestBoardAdapter.setItemClickListener(object : InterestVPAdapter.OnItemClickListeners {
             override fun onItemClick(data: BoardItem) {
                 studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
-                replaceFragment(DetailStudyFragment())
+                replaceFragment(com.example.spoteam_android.presentation.study.DetailStudyFragment())
             }
         })
 
@@ -573,43 +569,26 @@ class MyInterestStudyFragment : Fragment() {
         })
     }
 
-        private fun toggleLikeStatus(studyItem: BoardItem, likeButton: ImageView) {
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val memberId = sharedPreferences.getInt("${sharedPreferences.getString("currentEmail", "")}_memberId", -1)
-
-        if (memberId != -1) {
-            studyApiService.toggleStudyLike(studyItem.studyId)
-                .enqueue(object : Callback<LikeResponse> {
-                    override fun onResponse(call: Call<LikeResponse>, response: Response<LikeResponse>) {
-                        if (response.isSuccessful) {
-                            response.body()?.let { likeResponse ->
-                                // 서버에서 반환된 상태에 따라 하트 아이콘 및 BoardItem의 liked 상태 업데이트
-                                val newStatus = likeResponse.result.status
-                                studyItem.liked = newStatus == "LIKE"
-                                val newIcon = if (studyItem.liked) R.drawable.ic_heart_filled else R.drawable.study_like
-                                likeButton.setImageResource(newIcon)
-
-                                // heartCount 즉시 증가 또는 감소
-                                studyItem.heartCount = if (studyItem.liked) studyItem.heartCount + 1 else studyItem.heartCount - 1
-
-                                // 변경된 항목을 어댑터에 알림
-                                val adapter = binding.myInterestStudyReyclerview.adapter as InterestVPAdapter
-                                val position = adapter.dataList.indexOf(studyItem)
-                                if (position != -1) {
-                                    adapter.notifyItemChanged(position)
-                                }
-                            }
-                        } else {
-                            Toast.makeText(requireContext(), "찜 상태 업데이트 실패", Toast.LENGTH_SHORT).show()
-                        }
-                    }
-
-                    override fun onFailure(call: Call<LikeResponse>, t: Throwable) {
-                        Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
+    private fun toggleLikeStatus(studyItem: BoardItem, likeButton: ImageView) {
+        studyViewModel.toggleLikeStatus(studyItem.studyId) { result ->
+            requireActivity().runOnUiThread {
+                result.onSuccess { liked ->
+                    studyItem.liked = liked
+                    val newIcon = if (liked) R.drawable.ic_heart_filled else R.drawable.study_like
+                    likeButton.setImageResource(newIcon)
+
+                    // heartCount 갱신
+                    studyItem.heartCount += if (liked) 1 else -1
+
+                    // RecyclerView 업데이트
+                    val position = interestBoardAdapter.dataList.indexOf(studyItem)
+                    if (position != -1) {
+                        interestBoardAdapter.notifyItemChanged(position)
                     }
-                })
-        } else {
-            Toast.makeText(requireContext(), "회원 정보를 불러올 수 없습니다.", Toast.LENGTH_SHORT).show()
+                }.onFailure {
+                    Toast.makeText(requireContext(), "찜 실패: ${it.message}", Toast.LENGTH_SHORT).show()
+                }
+            }
         }
     }
 
@@ -637,7 +616,7 @@ class MyInterestStudyFragment : Fragment() {
         }
 
         binding.spotLogo.setOnClickListener {
-            replaceFragment(HouseFragment())
+            replaceFragment(HomeFragment())
         }
 
         binding.icAlarmMyInterest.setOnClickListener {
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/AttendanceContentDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/AttendanceContentDialog.kt
similarity index 73%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/AttendanceContentDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/AttendanceContentDialog.kt
index 65c5978f..7b0b14e8 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/AttendanceContentDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/AttendanceContentDialog.kt
@@ -1,22 +1,12 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
-import android.media.Image
-import android.util.Log
 import android.view.Window
 import android.widget.ImageView
 import android.widget.TextView
-import android.widget.Toast
 import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.community.MemberAcceptResponse
-import com.example.spoteam_android.ui.community.MemberIntroInfo
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
 
 class AttendanceContentDialog(
     private val context: Context
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/AttendanceDenyDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/AttendanceDenyDialog.kt
similarity index 91%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/AttendanceDenyDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/AttendanceDenyDialog.kt
index 8c290d3b..12ac263a 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/AttendanceDenyDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/AttendanceDenyDialog.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.content.Context
 import android.graphics.Color
@@ -8,12 +8,10 @@ import android.view.Window
 import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.community.MemberAcceptResponse
-import com.example.spoteam_android.ui.community.MemberIntroInfo
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.MemberAcceptResponse
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -82,7 +80,7 @@ class AttendanceDenyDialog(
                     if (response.isSuccessful) {
                         val memberAttendanceResponse = response.body()
                         Log.d("MyStudyAttendance", "responseBody: ${memberAttendanceResponse?.isSuccess}")
-                        if (memberAttendanceResponse?.isSuccess == "true") {
+                        if (memberAttendanceResponse?.isSuccess == true) {
                             callback?.fetchAttendedData()
                             dlg.dismiss()
                         } else {
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/BoardAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/BoardAdapter.kt
similarity index 96%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/BoardAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/BoardAdapter.kt
index 8c3f3181..cad73867 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/BoardAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/BoardAdapter.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import StudyFormMode
 import android.content.Context
@@ -15,15 +15,15 @@ import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
-import com.example.spoteam_android.BoardItem
 import com.example.spoteam_android.HostApiResponse
 import com.example.spoteam_android.HostResult
 import com.example.spoteam_android.R
 import com.example.spoteam_android.ReportStudyMemberFragment
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.ItemRecyclerViewPlusToggleBinding
-import com.example.spoteam_android.ui.interestarea.GetHostInterface
-import com.example.spoteam_android.ui.study.RegisterStudyFragment
+import com.example.spoteam_android.domain.study.entity.BoardItem
+import com.example.spoteam_android.presentation.interestarea.GetHostInterface
+import com.example.spoteam_android.presentation.study.register.theme.ThemeStudyFragment
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -139,7 +139,7 @@ class BoardAdapter(
                    editInfo.setOnClickListener {
                 popupWindow.dismiss()
 
-                val fragment = RegisterStudyFragment().apply {
+                val fragment = ThemeStudyFragment().apply {
                     arguments = Bundle().apply {
                         putSerializable("mode", StudyFormMode.EDIT)
                         putInt("studyId", studyId)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceContentRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ConsiderAttendanceContentRVAdapter.kt
similarity index 97%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceContentRVAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ConsiderAttendanceContentRVAdapter.kt
index de086d44..ea4b3b19 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceContentRVAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ConsiderAttendanceContentRVAdapter.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.view.LayoutInflater
 import android.view.View
@@ -10,7 +10,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.ItemConsiderAttendanceBinding
-import com.example.spoteam_android.ui.community.MyRecruitingStudyDetail
+import com.example.spoteam_android.presentation.community.MyRecruitingStudyDetail
 
 class ConsiderAttendanceContentRVAdapter(
     private var dataList: List<MyRecruitingStudyDetail>,
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ConsiderAttendanceFragment.kt
similarity index 92%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ConsiderAttendanceFragment.kt
index dbd3a853..01266436 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ConsiderAttendanceFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.content.Context
 import android.os.Bundle
@@ -13,9 +13,9 @@ import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentConsiderAttendanceBinding
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.community.MyRecruitingStudiesResponse
-import com.example.spoteam_android.ui.study.RegisterStudyFragment
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.MyRecruitingStudiesResponse
+import com.example.spoteam_android.presentation.study.register.theme.ThemeStudyFragment
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -47,7 +47,7 @@ class ConsiderAttendanceFragment : Fragment() {
 
         binding.makeStudyTv.setOnClickListener {
             (context as MainActivity).supportFragmentManager.beginTransaction()
-                .replace(R.id.main_frm, RegisterStudyFragment())
+                .replace(R.id.main_frm, ThemeStudyFragment())
                 .addToBackStack(null)
                 .commitAllowingStateLoss()
         }
@@ -95,7 +95,7 @@ class ConsiderAttendanceFragment : Fragment() {
                 ) {
                     if (response.isSuccessful) {
                         val recruitingStudyResponse = response.body()
-                        if (recruitingStudyResponse?.isSuccess == "true") {
+                        if (recruitingStudyResponse?.isSuccess == true) {
                             val result = recruitingStudyResponse.result
                             totalPages = result.totalPages
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceMemberFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ConsiderAttendanceMemberFragment.kt
similarity index 94%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceMemberFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ConsiderAttendanceMemberFragment.kt
index 04e0e697..2eb0a73c 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceMemberFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ConsiderAttendanceMemberFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.os.Bundle
 import android.util.Log
@@ -11,10 +11,10 @@ import androidx.recyclerview.widget.GridLayoutManager
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.attendanceMemberData
 import com.example.spoteam_android.databinding.FragmentConsiderAttendanceMemberBinding
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.community.MemberAcceptResponse
-import com.example.spoteam_android.ui.community.MemberAttendanceIntroResponse
-import com.example.spoteam_android.ui.community.MyStudyAttendanceMemberResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.MemberAcceptResponse
+import com.example.spoteam_android.presentation.community.MemberAttendanceIntroResponse
+import com.example.spoteam_android.presentation.community.MyStudyAttendanceMemberResponse
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -60,7 +60,7 @@ class ConsiderAttendanceMemberFragment : Fragment(), fetchData {
                 ) {
                     if (response.isSuccessful) {
                         val memberAttendanceResponse = response.body()
-                        if (memberAttendanceResponse?.isSuccess == "true") {
+                        if (memberAttendanceResponse?.isSuccess == true) {
                             val membersInfo = memberAttendanceResponse.result.members
 
                             attendanceMemberList.clear() // ✅ 기존 데이터 초기화
@@ -114,7 +114,7 @@ class ConsiderAttendanceMemberFragment : Fragment(), fetchData {
                 ) {
                     if (response.isSuccessful) {
                         val introResponse = response.body()
-                        if (introResponse?.isSuccess == "true") {
+                        if (introResponse?.isSuccess == true) {
                             val memberIntro = introResponse.result
 
                             // ✅ 기존 리스트에서 해당 memberId를 찾아 nickname, introduction 추가
@@ -176,7 +176,7 @@ class ConsiderAttendanceMemberFragment : Fragment(), fetchData {
                     if (response.isSuccessful) {
                         val memberAttendanceResponse = response.body()
                         Log.d("MyStudyAttendance", "responseBody: ${memberAttendanceResponse?.isSuccess}")
-                        if (memberAttendanceResponse?.isSuccess == "true") {
+                        if (memberAttendanceResponse?.isSuccess == true) {
                             val dlg = AttendanceContentDialog(requireContext())
                             dlg.setCallback(this@ConsiderAttendanceMemberFragment)
                             dlg.start()
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceMemberVPAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ConsiderAttendanceMemberVPAdapter.kt
similarity index 95%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceMemberVPAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ConsiderAttendanceMemberVPAdapter.kt
index 617c4725..b3b759e4 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceMemberVPAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ConsiderAttendanceMemberVPAdapter.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.view.LayoutInflater
 import android.view.View
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceMembersRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ConsiderAttendanceMembersRVAdapter.kt
similarity index 97%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceMembersRVAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ConsiderAttendanceMembersRVAdapter.kt
index 3c01a262..2b5206c6 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceMembersRVAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ConsiderAttendanceMembersRVAdapter.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/EndStudyDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/EndStudyDialog.kt
similarity index 94%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/EndStudyDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/EndStudyDialog.kt
index 593803ed..2abed45a 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/EndStudyDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/EndStudyDialog.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.content.Context
 import android.graphics.Color
@@ -15,8 +15,8 @@ import android.widget.Toast
 import androidx.core.content.ContextCompat
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.community.EndStudyResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.EndStudyResponse
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -78,7 +78,7 @@ class EndStudyDialog(
                 ) {
                     if (response.isSuccessful) {
                         val contentResponse = response.body()
-                        if (contentResponse?.isSuccess == "true") {
+                        if (contentResponse?.isSuccess == true) {
                             val lastDlg =  EndStudyFinishDialog(context, onComplete)
 //                            lastDlg.setContext(result)
                             lastDlg.start()
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/EndStudyFinishDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/EndStudyFinishDialog.kt
similarity index 74%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/EndStudyFinishDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/EndStudyFinishDialog.kt
index ce469004..fb7811a6 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/EndStudyFinishDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/EndStudyFinishDialog.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.content.Context
 import android.graphics.Color
@@ -14,15 +14,6 @@ import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
 import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.community.ContentResponse
-import com.example.spoteam_android.ui.community.EndStudyResponse
-import com.example.spoteam_android.ui.community.MemberAcceptResponse
-import com.example.spoteam_android.ui.community.MemberIntroInfo
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
 
 class EndStudyFinishDialog(
     val context: Context,
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ExitStudyPopupFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ExitStudyPopupFragment.kt
similarity index 95%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ExitStudyPopupFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ExitStudyPopupFragment.kt
index 0f9f4876..1cc0a45d 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ExitStudyPopupFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ExitStudyPopupFragment.kt
@@ -1,5 +1,5 @@
 
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.app.Dialog
 import android.content.Context
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/FinishReportCrewDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/FinishReportCrewDialog.kt
similarity index 74%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/FinishReportCrewDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/FinishReportCrewDialog.kt
index c0a820ce..b84751ac 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/FinishReportCrewDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/FinishReportCrewDialog.kt
@@ -1,24 +1,15 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
-import android.media.Image
-import android.util.Log
+
 import android.util.TypedValue
 import android.view.Window
 import android.widget.Button
 import android.widget.ImageView
-import android.widget.TextView
-import android.widget.Toast
+
 import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.community.MemberAcceptResponse
-import com.example.spoteam_android.ui.community.MemberIntroInfo
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
 
 class FinishReportCrewDialog(private val context: Context) {
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/HostLeaveStudyDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/HostLeaveStudyDialog.kt
similarity index 97%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/HostLeaveStudyDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/HostLeaveStudyDialog.kt
index 6282c497..ff1efd33 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/HostLeaveStudyDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/HostLeaveStudyDialog.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.app.Dialog
 import android.content.Context
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/HostLeaveStudySuccessDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/HostLeaveStudySuccessDialog.kt
similarity index 96%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/HostLeaveStudySuccessDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/HostLeaveStudySuccessDialog.kt
index 54d2eb22..b06ab2d5 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/HostLeaveStudySuccessDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/HostLeaveStudySuccessDialog.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.app.Dialog
 import android.content.Context
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/LogOutCompleteDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/LogOutCompleteDialog.kt
similarity index 94%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/LogOutCompleteDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/LogOutCompleteDialog.kt
index 5188f9f1..f84f0ad7 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/LogOutCompleteDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/LogOutCompleteDialog.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.app.Dialog
 import android.content.Context
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/LogOutDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/LogOutDialog.kt
similarity index 94%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/LogOutDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/LogOutDialog.kt
index af4b3295..b0913c34 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/LogOutDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/LogOutDialog.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.app.Dialog
 import android.content.Context
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MandateStudyOwnerFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/MandateStudyOwnerFragment.kt
similarity index 93%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MandateStudyOwnerFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/MandateStudyOwnerFragment.kt
index db040a94..55ff4a18 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MandateStudyOwnerFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/MandateStudyOwnerFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.app.Dialog
 import android.content.Context
@@ -14,9 +14,9 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentMandateStudyOwnerBinding
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.community.MembersDetail
-import com.example.spoteam_android.ui.community.StudyMemberResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.MembersDetail
+import com.example.spoteam_android.presentation.community.StudyMemberResponse
 
 class MandateStudyOwnerFragment(
     private val context: Context,
@@ -71,7 +71,7 @@ class MandateStudyOwnerFragment(
                 ) {
                     if (response.isSuccessful) {
                         val body = response.body()
-                        if (body?.isSuccess == "true") {
+                        if (body?.isSuccess == true) {
                             initMembersRecycler(body.result.members)
                         } else {
                             showError("불러오기 실패")
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MandateStudyOwnerReasonFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/MandateStudyOwnerReasonFragment.kt
similarity index 92%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MandateStudyOwnerReasonFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/MandateStudyOwnerReasonFragment.kt
index c5aa4607..adc43142 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MandateStudyOwnerReasonFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/MandateStudyOwnerReasonFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.app.Dialog
 import android.content.Context
@@ -14,7 +14,7 @@ import com.example.spoteam_android.HostWithDrawl
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.WithdrawHostRequest
 import com.example.spoteam_android.databinding.FragmentMandateStudyOwnerReasonBinding
-import com.example.spoteam_android.ui.interestarea.GetHostInterface
+import com.example.spoteam_android.presentation.interestarea.GetHostInterface
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -100,7 +100,11 @@ class MandateStudyOwnerReasonFragment(
     }
 
     private fun showMemberLeaveSuccessDialog() {
-        val successDialog = HostLeaveStudySuccessDialog(context, onComplete)
+        val successDialog =
+            com.example.spoteam_android.presentation.mypage.HostLeaveStudySuccessDialog(
+                context,
+                onComplete
+            )
         successDialog.start()
     }
 }
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MemberLeaveStudyDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/MemberLeaveStudyDialog.kt
similarity index 96%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MemberLeaveStudyDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/MemberLeaveStudyDialog.kt
index 27fc7d11..613e4ed3 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MemberLeaveStudyDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/MemberLeaveStudyDialog.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.app.Dialog
 import android.content.Context
@@ -14,7 +14,7 @@ import androidx.fragment.app.FragmentManager
 import com.example.spoteam_android.HostWithDrawl
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.ui.interestarea.GetHostInterface
+import com.example.spoteam_android.presentation.interestarea.GetHostInterface
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MemberLeaveSuccessDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/MemberLeaveSuccessDialog.kt
similarity index 96%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MemberLeaveSuccessDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/MemberLeaveSuccessDialog.kt
index 4449b7a4..1e02b6a2 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MemberLeaveSuccessDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/MemberLeaveSuccessDialog.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.app.Dialog
 import android.content.Context
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MyPageFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/MyPageFragment.kt
similarity index 62%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MyPageFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/MyPageFragment.kt
index 18f745b4..3da77d02 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MyPageFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/MyPageFragment.kt
@@ -1,6 +1,5 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
-import StudyApiService
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Context.MODE_PRIVATE
@@ -12,7 +11,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.bumptech.glide.Glide
@@ -20,26 +18,20 @@ import com.example.spoteam_android.FinishedStudyItem
 import com.example.spoteam_android.FinishedStudyResponse
 import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
-import com.example.spoteam_android.ReasonApiResponse
-import com.example.spoteam_android.RegionApiResponse
 import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.StudyItem
-import com.example.spoteam_android.StudyResponse
-import com.example.spoteam_android.ThemeApiResponse
-import com.example.spoteam_android.WithdrawResponse
 import com.example.spoteam_android.databinding.FragmentMypageBinding
-import com.example.spoteam_android.login.LoginApiService
-import com.example.spoteam_android.login.StartLoginActivity
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.community.MyPageStudyNumInfo
-import com.example.spoteam_android.ui.community.MyPageStudyNumResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.MyPageStudyNumInfo
+import com.example.spoteam_android.presentation.community.MyPageStudyNumResponse
+import com.example.spoteam_android.presentation.interestarea.FinishedStudyApiService
+import com.example.spoteam_android.presentation.login.StartLoginActivity
+import com.example.spoteam_android.presentation.mypage.cancel.CancelDialog
+import com.example.spoteam_android.presentation.mypage.rule.CommunityRestrictionsFragment
+import com.example.spoteam_android.presentation.mypage.rule.CommunityRuleFragment
+import com.example.spoteam_android.presentation.mypage.rule.CommunityTermsOfUseFragment
 import com.example.spoteam_android.ui.community.ScrapFragment
-import com.example.spoteam_android.ui.interestarea.FinishedStudyApiService
-import com.example.spoteam_android.ui.mypage.cancel.CancelDialog
-import com.example.spoteam_android.ui.mypage.rule.CommunityPrivacyPolicyFragment
-import com.example.spoteam_android.ui.mypage.rule.CommunityRestrictionsFragment
-import com.example.spoteam_android.ui.mypage.rule.CommunityRuleFragment
-import com.example.spoteam_android.ui.mypage.rule.CommunityTermsOfUseFragment
+import com.example.spoteam_android.ui.mypage.CancelFinishDialog
+
 import com.kakao.sdk.user.UserApiClient
 import com.navercorp.nid.NaverIdLoginSDK
 import retrofit2.Call
@@ -65,9 +57,9 @@ class MyPageFragment : Fragment() {
         fetchMyPageInfo()
         setupRecyclerView()
         fetchFinishedStudyData()
-        fetchThemes()
-        fetchRegions()
-        fetchReasons()
+//        fetchThemes()
+//        fetchRegions()
+//        fetchReasons()
 
         return binding.root
     }
@@ -91,11 +83,11 @@ class MyPageFragment : Fragment() {
 
             framelayout6.setOnClickListener{navigateToFragment(CommunityRuleFragment())}
             framelayout5.setOnClickListener{navigateToFragment(CommunityRestrictionsFragment())}
-            framelayout9.setOnClickListener{navigateToFragment(CommunityPrivacyPolicyFragment())}
+            framelayout9.setOnClickListener{navigateToFragment(com.example.spoteam_android.presentation.mypage.rule.CommunityPrivacyPolicyFragment())}
             framelayout10.setOnClickListener{navigateToFragment(CommunityTermsOfUseFragment())}
 
             framelayoutDeleteAccount.setOnClickListener{ val dialog = CancelDialog(requireContext()) {
-                performWithdrawal()
+//                performWithdrawal()
             }
                 dialog.start()}
         }
@@ -129,7 +121,7 @@ class MyPageFragment : Fragment() {
             override fun onResponse(call: Call<MyPageStudyNumResponse>, response: Response<MyPageStudyNumResponse>) {
                 if (response.isSuccessful) {
                     response.body()?.let {
-                        if (it.isSuccess == "true") initMyStudyNum(it.result)
+                        if (it.isSuccess == true) initMyStudyNum(it.result)
                         else showError(it.message)
                     }
                 } else {
@@ -168,11 +160,12 @@ class MyPageFragment : Fragment() {
 
             // 로그인 플랫폼 확인
             val loginPlatform = sharedPreferences.getString("loginPlatform", null)
-            val profileImageUrl = when (loginPlatform) {
-                "kakao" -> sharedPreferences.getString("${email}_kakaoProfileImageUrl", null)
-                "naver" -> sharedPreferences.getString("${email}_naverProfileImageUrl", null)
-                else -> null
+            val profileImageUrl = if (!email.isNullOrEmpty() && !loginPlatform.isNullOrEmpty()) {
+                sharedPreferences.getString("${email}_${loginPlatform}ProfileImageUrl", null)
+            } else {
+                null
             }
+
             binding.tvPhone.text = loginPlatform?.replaceFirstChar { it.uppercaseChar() } ?: "플랫폼 없음"
 
             // Glide를 사용하여 이미지 로드
@@ -207,16 +200,28 @@ class MyPageFragment : Fragment() {
 
     private fun performLogout() {
         val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val loginPlatform = sharedPreferences.getString("loginPlatform", null)
+        val loginPlatform = sharedPreferences.getString("loginPlatform", null)?.lowercase()
 
         when (loginPlatform) {
             "kakao" -> logoutFromKakao()
             "naver" -> logoutFromNaver()
             else -> {
                 Toast.makeText(requireContext(), "로그인 플랫폼 정보 없음", Toast.LENGTH_SHORT).show()
+                forceLogout()
             }
         }
     }
+    private fun forceLogout() {
+        // 1. SharedPreferences 초기화
+        clearSharedPreferences()
+
+        // 2. Retrofit 토큰 초기화
+        RetrofitInstance.setAuthToken(null)
+
+        // 3. 로그인 화면으로 이동
+        navigateToLoginScreen()
+    }
+
 
     private fun logoutFromKakao() {
         UserApiClient.instance.logout { error ->
@@ -302,100 +307,100 @@ class MyPageFragment : Fragment() {
         }
     }
 
-    private fun fetchThemes() {
-        val service = RetrofitInstance.retrofit.create(LoginApiService::class.java)
-        service.getThemes().enqueue(object : Callback<ThemeApiResponse> {
-            override fun onResponse(call: Call<ThemeApiResponse>, response: Response<ThemeApiResponse>) {
-                if (response.isSuccessful) {
-                    val apiResponse = response.body()
-                    if (apiResponse != null && apiResponse.isSuccess) {
-                        val themes = apiResponse.result.themes
-                        if (themes.isNotEmpty()) {
-                            binding.tvField.text = themes.joinToString(" ") { "#$it" }
-                        }
-                    }
-                } else {
-                    Log.e("ThemePreferenceFragment", "테마 가져오기 실패: ${response.errorBody()?.string()}")
-                }
-            }
-
-            override fun onFailure(call: Call<ThemeApiResponse>, t: Throwable) {
-                Log.e("ThemePreferenceFragment", "테마 가져오기 오류", t)
-            }
-        })
-    }
-
-    private fun fetchRegions() {
-        val service = RetrofitInstance.retrofit.create(LoginApiService::class.java)
-
-        service.getRegion().enqueue(object : Callback<RegionApiResponse> {
-            override fun onResponse(
-                call: Call<RegionApiResponse>,
-                response: Response<RegionApiResponse>
-            ) {
-                if (response.isSuccessful) {
-                    val apiResponse = response.body()
-                    if (apiResponse != null && apiResponse.isSuccess) {
-                        val regions = apiResponse.result.regions // 서버에서 받아오는 지역 리스트
-                        if (regions.isNotEmpty()) {
-                            if (regions.isNotEmpty()) {
-                                val fullRegionNames = regions.joinToString(" ") {
-                                    "#${it.province} ${it.district} ${it.neighborhood}"
-                               }
-                                binding.tvRegion.text = fullRegionNames
-                            }
-                        }
-                    } else {
-                        val errorMessage = apiResponse?.message ?: "알 수 없는 오류 발생"
-                        Log.e("RegionPreferenceFragment", "지역 가져오기 실패: $errorMessage")
-                        Toast.makeText(
-                            requireContext(),
-                            "지역 가져오기 실패: $errorMessage",
-                            Toast.LENGTH_LONG
-                        ).show()
-                    }
-                } else {
-                    val errorMessage = response.errorBody()?.string() ?: "응답 실패"
-                    Log.e("RegionPreferenceFragment", "지역 가져오기 실패: $errorMessage")
-                    Toast.makeText(requireContext(), "지역 가져오기 실패: $errorMessage", Toast.LENGTH_LONG)
-                        .show()
-                }
-            }
-
-            override fun onFailure(call: Call<RegionApiResponse>, t: Throwable) {
-                Log.e("RegionPreferenceFragment", "네트워크 오류: ${t.message}")
-                Toast.makeText(requireContext(), "네트워크 오류 발생", Toast.LENGTH_LONG).show()
-            }
-        })
-    }
-
-    private fun fetchReasons() {
-        val service = RetrofitInstance.retrofit.create(LoginApiService::class.java)
-
-        service.getReasons().enqueue(object : Callback<ReasonApiResponse> {
-            override fun onResponse(call: Call<ReasonApiResponse>, response: Response<ReasonApiResponse>) {
-                if (response.isSuccessful) {
-                    val apiResponse = response.body()
-                    if (apiResponse != null && apiResponse.isSuccess) {
-                        val reasons = apiResponse.result.reasons // 🔥 API에서 받은 문자열 리스트
-                        binding.tvGoal.text = reasons
-                            .map { it.replace("_", " ") }
-                            .joinToString(" ")
-                    } else {
-                        Log.e("PurposePreferenceFragment", "이유 가져오기 실패: ${apiResponse?.message}")
-                    }
-                } else {
-                    Log.e("PurposePreferenceFragment", "이유 가져오기 실패: ${response.errorBody()?.string()}")
-                }
-            }
-
-            override fun onFailure(call: Call<ReasonApiResponse>, t: Throwable) {
-                Log.e("PurposePreferenceFragment", "이유 가져오기 오류", t)
-            }
-        })
-    }
-
-
+//    private fun fetchThemes() {
+//        val service = RetrofitInstance.retrofit.create(LoginService::class.java)
+//        service.getThemes().enqueue(object : Callback<ThemeApiResponse> {
+//            override fun onResponse(call: Call<ThemeApiResponse>, response: Response<ThemeApiResponse>) {
+//                if (response.isSuccessful) {
+//                    val apiResponse = response.body()
+//                    if (apiResponse != null && apiResponse.isSuccess) {
+//                        val themes = apiResponse.result.themes
+//                        if (themes.isNotEmpty()) {
+//                            binding.tvField.text = themes.joinToString(" ") { "#$it" }
+//                        }
+//                    }
+//                } else {
+//                    Log.e("ThemePreferenceFragment", "테마 가져오기 실패: ${response.errorBody()?.string()}")
+//                }
+//            }
+//
+//            override fun onFailure(call: Call<ThemeApiResponse>, t: Throwable) {
+//                Log.e("ThemePreferenceFragment", "테마 가져오기 오류", t)
+//            }
+//        })
+//    }
+//
+//    private fun fetchRegions() {
+//        val service = RetrofitInstance.retrofit.create(LoginApiService::class.java)
+//
+//        service.getRegion().enqueue(object : Callback<RegionApiResponse> {
+//            override fun onResponse(
+//                call: Call<RegionApiResponse>,
+//                response: Response<RegionApiResponse>
+//            ) {
+//                if (response.isSuccessful) {
+//                    val apiResponse = response.body()
+//                    if (apiResponse != null && apiResponse.isSuccess) {
+//                        val regions = apiResponse.result.regions // 서버에서 받아오는 지역 리스트
+//                        if (regions.isNotEmpty()) {
+//                            if (regions.isNotEmpty()) {
+//                                val fullRegionNames = regions.joinToString(" ") {
+//                                    "#${it.province} ${it.district} ${it.neighborhood}"
+//                               }
+//                                binding.tvRegion.text = fullRegionNames
+//                            }
+//                        }
+//                    } else {
+//                        val errorMessage = apiResponse?.message ?: "알 수 없는 오류 발생"
+//                        Log.e("RegionPreferenceFragment", "지역 가져오기 실패: $errorMessage")
+//                        Toast.makeText(
+//                            requireContext(),
+//                            "지역 가져오기 실패: $errorMessage",
+//                            Toast.LENGTH_LONG
+//                        ).show()
+//                    }
+//                } else {
+//                    val errorMessage = response.errorBody()?.string() ?: "응답 실패"
+//                    Log.e("RegionPreferenceFragment", "지역 가져오기 실패: $errorMessage")
+//                    Toast.makeText(requireContext(), "지역 가져오기 실패: $errorMessage", Toast.LENGTH_LONG)
+//                        .show()
+//                }
+//            }
+//
+//            override fun onFailure(call: Call<RegionApiResponse>, t: Throwable) {
+//                Log.e("RegionPreferenceFragment", "네트워크 오류: ${t.message}")
+//                Toast.makeText(requireContext(), "네트워크 오류 발생", Toast.LENGTH_LONG).show()
+//            }
+//        })
+//    }
+
+//    private fun fetchReasons() {
+//        val service = RetrofitInstance.retrofit.create(LoginApiService::class.java)
+//
+//        service.getReasons().enqueue(object : Callback<ReasonApiResponse> {
+//            override fun onResponse(call: Call<ReasonApiResponse>, response: Response<ReasonApiResponse>) {
+//                if (response.isSuccessful) {
+//                    val apiResponse = response.body()
+//                    if (apiResponse != null && apiResponse.isSuccess) {
+//                        val reasons = apiResponse.result.reasons // 🔥 API에서 받은 문자열 리스트
+//                        binding.tvGoal.text = reasons
+//                            .map { it.replace("_", " ") }
+//                            .joinToString(" ")
+//                    } else {
+//                        Log.e("PurposePreferenceFragment", "이유 가져오기 실패: ${apiResponse?.message}")
+//                    }
+//                } else {
+//                    Log.e("PurposePreferenceFragment", "이유 가져오기 실패: ${response.errorBody()?.string()}")
+//                }
+//            }
+//
+//            override fun onFailure(call: Call<ReasonApiResponse>, t: Throwable) {
+//                Log.e("PurposePreferenceFragment", "이유 가져오기 오류", t)
+//            }
+//        })
+//    }
+//
+//
     private fun clearSharedPreferences() {
         val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
         with(sharedPreferences.edit()) {
@@ -403,33 +408,33 @@ class MyPageFragment : Fragment() {
             apply()
         }
     }
-
+//
     private fun navigateToLoginScreen() {
         val intent = Intent(requireActivity(), StartLoginActivity::class.java)
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
         startActivity(intent)
     }
-
-    //스터디 탈퇴 로직은 도입전.
-    private fun performWithdrawal() {
-        val service = RetrofitInstance.retrofit.create(LoginApiService::class.java)
-
-        service.withdraw().enqueue(object : Callback<WithdrawResponse> {
-            override fun onResponse(call: Call<WithdrawResponse>, response: Response<WithdrawResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == true) {
-                    RetrofitInstance.setAuthToken(null)
-                    clearSharedPreferences()
-                    showWithdrawCompleteDialog()
-                } else {
-                    Log.e("탈퇴 실패", response.errorBody()?.string() ?: "알 수 없는 오류")
-                }
-            }
-
-            override fun onFailure(call: Call<WithdrawResponse>, t: Throwable) {
-                Log.e("탈퇴 실패", t.message ?: "네트워크 오류")
-            }
-        })
-    }
+//
+//    //스터디 탈퇴 로직은 도입전.
+//    private fun performWithdrawal() {
+//        val service = RetrofitInstance.retrofit.create(LoginService::class.java)
+//
+//        service.withdraw().enqueue(object : Callback<WithdrawResponse> {
+//            override fun onResponse(call: Call<WithdrawResponse>, response: Response<WithdrawResponse>) {
+//                if (response.isSuccessful && response.body()?.isSuccess == true) {
+//                    RetrofitInstance.setAuthToken(null)
+//                    clearSharedPreferences()
+//                    showWithdrawCompleteDialog()
+//                } else {
+//                    Log.e("탈퇴 실패", response.errorBody()?.string() ?: "알 수 없는 오류")
+//                }
+//            }
+//
+//            override fun onFailure(call: Call<WithdrawResponse>, t: Throwable) {
+//                Log.e("탈퇴 실패", t.message ?: "네트워크 오류")
+//            }
+//        })
+//    }
 
     private fun showLogoutCompleteDialog() {
         val dialog = LogOutCompleteDialog(requireContext()) {
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MyPageLocationFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/MyPageLocationFragment.kt
similarity index 94%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MyPageLocationFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/MyPageLocationFragment.kt
index 4deaa3b7..9b7ac535 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MyPageLocationFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/MyPageLocationFragment.kt
@@ -1,6 +1,6 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
-import LocationSearchAdapter
+import com.example.spoteam_android.presentation.login.checklist.LocationSearchAdapter
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
@@ -13,8 +13,7 @@ import android.widget.Toast
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.FragmentMyPageLocationBinding
-import com.example.spoteam_android.login.LocationItem
-import com.example.spoteam_android.ui.study.OnlineStudyFragment
+import com.example.spoteam_android.presentation.login.checklist.LocationItem
 import java.io.BufferedReader
 import java.io.InputStreamReader
 
@@ -75,7 +74,7 @@ class MyPageLocationFragment : Fragment() {
             selectedCodes.add(code)
 
             // TemporaryRegionFragment로 전달할 데이터 생성
-            val fragment = TemporaryRegionFragment()
+            val fragment = com.example.spoteam_android.presentation.mypage.TemporaryRegionFragment()
             val bundle = Bundle().apply {
                 putStringArrayList("SELECTED_REGIONS", ArrayList(selectedRegions))
                 putStringArrayList("SELECTED_CODES", ArrayList(selectedCodes))
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MyStudyAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/MyStudyAdapter.kt
similarity index 96%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MyStudyAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/MyStudyAdapter.kt
index a73f314b..30322e14 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MyStudyAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/MyStudyAdapter.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.content.res.Resources
 import android.view.LayoutInflater
@@ -6,7 +6,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.example.spoteam_android.FinishedStudyItem
-import com.example.spoteam_android.StudyItem
 import com.example.spoteam_android.databinding.ItemCardMyStudyBinding
 import com.example.spoteam_android.databinding.ItemMyStudyBinding
 import java.time.LocalDateTime
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ParticipatingStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ParticipatingStudyFragment.kt
similarity index 94%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ParticipatingStudyFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ParticipatingStudyFragment.kt
index 17515982..e96cb87d 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ParticipatingStudyFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ParticipatingStudyFragment.kt
@@ -1,6 +1,5 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
-import StudyViewModel
 import android.content.Context
 import android.os.Bundle
 import android.util.Log
@@ -13,13 +12,14 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.BoardItem
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentParticipatingStudyBinding
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.community.MemberOnStudiesResponse
-import com.example.spoteam_android.ui.community.MyRecruitingStudyDetail
+import com.example.spoteam_android.domain.study.entity.BoardItem
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.MemberOnStudiesResponse
+import com.example.spoteam_android.presentation.community.MyRecruitingStudyDetail
+import com.example.spoteam_android.presentation.study.StudyViewModel
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -109,7 +109,7 @@ class ParticipatingStudyFragment : Fragment(), fetchProgressStudy {
                 ) {
                     if (response.isSuccessful) {
                         val inProgressResponse = response.body()
-                        if (inProgressResponse?.isSuccess == "true") {
+                        if (inProgressResponse?.isSuccess == true) {
                             val studyInfo = inProgressResponse.result.content
                             totalPages = inProgressResponse.result.totalPages
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/PermissionWaitFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/PermissionWaitFragment.kt
similarity index 76%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/PermissionWaitFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/PermissionWaitFragment.kt
index b05777d3..e4eb350d 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/PermissionWaitFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/PermissionWaitFragment.kt
@@ -1,7 +1,5 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
-import StudyApiService
-import StudyViewModel
 import android.content.Context
 import android.os.Bundle
 import android.util.Log
@@ -14,20 +12,18 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.BoardItem
-import com.example.spoteam_android.LikeResponse
 import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.databinding.FragmentParticipatingStudyBinding
 import com.example.spoteam_android.databinding.FragmentPermissionWaitBinding
-import com.example.spoteam_android.ui.category.CategoryFragment
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.community.MemberOnStudiesResponse
-import com.example.spoteam_android.ui.community.MyRecruitingStudyDetail
-import com.example.spoteam_android.ui.interestarea.InterestVPAdapter
-import com.example.spoteam_android.ui.study.DetailStudyFragment
-import com.example.spoteam_android.ui.study.StudyFragment
+import com.example.spoteam_android.domain.study.entity.BoardItem
+import com.example.spoteam_android.presentation.category.CategoryFragment
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.MemberOnStudiesResponse
+import com.example.spoteam_android.presentation.community.MyRecruitingStudyDetail
+import com.example.spoteam_android.presentation.interestarea.InterestVPAdapter
+import com.example.spoteam_android.presentation.study.StudyViewModel
+
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -43,7 +39,6 @@ class PermissionWaitFragment : Fragment() {
     private var startPage : Int = 0
     private val studyViewModel: StudyViewModel by activityViewModels()
     private lateinit var interestBoardAdapter: InterestVPAdapter
-    private lateinit var studyApiService: StudyApiService
     private var itemList = ArrayList<MyRecruitingStudyDetail>()
 
 
@@ -59,7 +54,6 @@ class PermissionWaitFragment : Fragment() {
 
         // 현재 로그인된 사용자 정보를 로그
         memberId = if (currentEmail != null) sharedPreferences.getInt("${currentEmail}_memberId", -1) else -1
-        studyApiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
 
 
         fetchInProgressStudy()
@@ -101,7 +95,7 @@ class PermissionWaitFragment : Fragment() {
                     if (response.isSuccessful) {
                         val inProgressResponse = response.body()
                         Log.d("InProgress", "responseBody: ${inProgressResponse?.isSuccess}")
-                        if (inProgressResponse?.isSuccess == "true") {
+                        if (inProgressResponse?.isSuccess == true) {
                             val studyInfo = inProgressResponse.result.content
                             Log.d("StudyInfo","${inProgressResponse.result.content}")
                             totalPage = inProgressResponse.result.totalPages
@@ -187,7 +181,7 @@ class PermissionWaitFragment : Fragment() {
                     data.introduction
                 )
 
-                val fragment = DetailStudyFragment()
+                val fragment = com.example.spoteam_android.presentation.study.DetailStudyFragment()
                 parentFragmentManager.beginTransaction()
                     .replace(R.id.main_frm, fragment)
                     .addToBackStack(null)
@@ -199,51 +193,26 @@ class PermissionWaitFragment : Fragment() {
     }
 
     private fun toggleLikeStatus(studyItem: BoardItem, likeButton: ImageView) {
-        val memberId = getMemberId(requireContext())
-
-        if (memberId != -1) {
-            studyApiService.toggleStudyLike(studyItem.studyId).enqueue(object : Callback<LikeResponse> {
-                override fun onResponse(call: Call<LikeResponse>, response: Response<LikeResponse>) {
-                    if (response.isSuccessful) {
-                        val newStatus = response.body()?.result?.status
-                        studyItem.liked = newStatus == "LIKE"
-                        val newIcon = if (studyItem.liked) R.drawable.ic_heart_filled else R.drawable.study_like
-                        likeButton.setImageResource(newIcon)
-
-                        // heartCount 즉시 증가 또는 감소
-                        fetchInProgressStudy()
-
-                        // 최신 데이터 동기화를 위해 fetchDataAnyWhere와 fetchRecommendStudy를 다시 호출
-                    } else {
-                        Toast.makeText(requireContext(), "찜 상태 업데이트 실패", Toast.LENGTH_SHORT).show()
-                    }
-                }
-
-                override fun onFailure(call: Call<LikeResponse>, t: Throwable) {
-                    Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
+        studyViewModel.toggleLikeStatus(studyItem.studyId) { result ->
+            requireActivity().runOnUiThread {
+                result.onSuccess { liked ->
+                    studyItem.liked = liked
+                    studyItem.heartCount += if (liked) 1 else -1
+                    val icon = if (liked) R.drawable.ic_heart_filled else R.drawable.study_like
+                    likeButton.setImageResource(icon)
+
+                    // RecyclerView 갱신
+                    interestBoardAdapter.notifyItemChanged(
+                        interestBoardAdapter.dataList.indexOf(studyItem)
+                    )
+                }.onFailure {
+                    Toast.makeText(requireContext(), "찜 실패: ${it.message}", Toast.LENGTH_SHORT).show()
                 }
-            })
-        } else {
-            Toast.makeText(requireContext(), "회원 정보를 불러올 수 없습니다.", Toast.LENGTH_SHORT).show()
+            }
         }
     }
 
-    fun getMemberId(context: Context): Int {
 
-        var memberId: Int = -1
-
-        val sharedPreferences =
-            context.getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val currentEmail = sharedPreferences.getString("currentEmail", null)
-
-        // 현재 로그인된 사용자 정보를 로그
-        memberId = if (currentEmail != null) sharedPreferences.getInt(
-            "${currentEmail}_memberId",
-            -1
-        ) else -1
-
-        return memberId // 저장된 memberId 없을 시 기본값 -1 반환
-    }
 
     private fun updatePageUI() {
         val pageButtons = listOf(
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/PurposePreferenceFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/PurposePreferenceFragment.kt
similarity index 71%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/PurposePreferenceFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/PurposePreferenceFragment.kt
index 3ced5a49..3da660a4 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/PurposePreferenceFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/PurposePreferenceFragment.kt
@@ -1,8 +1,7 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.content.Context
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -10,15 +9,8 @@ import android.widget.CompoundButton
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import com.example.spoteam_android.R
-import com.example.spoteam_android.ReasonApiResponse
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.StudyReasons
 import com.example.spoteam_android.databinding.FragmentPurposePreferenceBinding
-import com.example.spoteam_android.login.LoginApiService
 import com.google.android.material.chip.Chip
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
 
 class PurposePreferenceFragment : Fragment() {
 
@@ -58,7 +50,7 @@ class PurposePreferenceFragment : Fragment() {
         if (email != null) {
             val memberId = sharedPreferences.getInt("${email}_memberId", -1)
             if (memberId != -1) {
-                fetchReasons() // ✅ 서버에서 선택된 이유 가져오기
+//                fetchReasons() // ✅ 서버에서 선택된 이유 가져오기
             } else {
                 Toast.makeText(requireContext(), "Member ID not found", Toast.LENGTH_SHORT).show()
             }
@@ -92,30 +84,30 @@ class PurposePreferenceFragment : Fragment() {
 
         updateFinishButtonState()
     }
-
-    private fun fetchReasons() {
-        val service = RetrofitInstance.retrofit.create(LoginApiService::class.java)
-
-        service.getReasons().enqueue(object : Callback<ReasonApiResponse> {
-            override fun onResponse(call: Call<ReasonApiResponse>, response: Response<ReasonApiResponse>) {
-                if (response.isSuccessful) {
-                    val apiResponse = response.body()
-                    if (apiResponse != null && apiResponse.isSuccess) {
-                        val reasons = apiResponse.result.reasons // 🔥 API에서 받은 문자열 리스트
-                        setChipCheckedState(reasons) // ✅ 가져온 데이터로 칩 체크
-                    } else {
-                        Log.e("PurposePreferenceFragment", "이유 가져오기 실패: ${apiResponse?.message}")
-                    }
-                } else {
-                    Log.e("PurposePreferenceFragment", "이유 가져오기 실패: ${response.errorBody()?.string()}")
-                }
-            }
-
-            override fun onFailure(call: Call<ReasonApiResponse>, t: Throwable) {
-                Log.e("PurposePreferenceFragment", "이유 가져오기 오류", t)
-            }
-        })
-    }
+//
+//    private fun fetchReasons() {
+//        val service = RetrofitInstance.retrofit.create(LoginService::class.java)
+//
+//        service.getReasons().enqueue(object : Callback<ReasonApiResponse> {
+//            override fun onResponse(call: Call<ReasonApiResponse>, response: Response<ReasonApiResponse>) {
+//                if (response.isSuccessful) {
+//                    val apiResponse = response.body()
+//                    if (apiResponse != null && apiResponse.isSuccess) {
+//                        val reasons = apiResponse.result.reasons // 🔥 API에서 받은 문자열 리스트
+//                        setChipCheckedState(reasons) // ✅ 가져온 데이터로 칩 체크
+//                    } else {
+//                        Log.e("PurposePreferenceFragment", "이유 가져오기 실패: ${apiResponse?.message}")
+//                    }
+//                } else {
+//                    Log.e("PurposePreferenceFragment", "이유 가져오기 실패: ${response.errorBody()?.string()}")
+//                }
+//            }
+//
+//            override fun onFailure(call: Call<ReasonApiResponse>, t: Throwable) {
+//                Log.e("PurposePreferenceFragment", "이유 가져오기 오류", t)
+//            }
+//        })
+//    }
 
     private fun setChipCheckedState(reasons: List<String>) {
         selectedPurpose.clear()
@@ -177,33 +169,33 @@ class PurposePreferenceFragment : Fragment() {
         if (email != null) {
             val memberId = sharedPreferences.getInt("${email}_memberId", -1)
             if (memberId != -1) {
-                postReasonsToServer(selectedPurpose)
+//                postReasonsToServer(selectedPurpose)
             } else {
                 Toast.makeText(requireContext(), "Member ID not found", Toast.LENGTH_SHORT).show()
             }
         }
     }
 
-    private fun postReasonsToServer(selectedPurpose: List<Int>) {
-
-        val service = RetrofitInstance.retrofit.create(LoginApiService::class.java)
-        val purposePreferences = StudyReasons(selectedPurpose)
-
-        service.postPurposes(purposePreferences).enqueue(object : Callback<Void> {
-            override fun onResponse(call: Call<Void>, response: Response<Void>) {
-                if (response.isSuccessful) {
-                    showCompletionDialog()
-                    exitEditMode()
-                } else {
-                    Log.e("PurposePreferenceFragment", "POST 실패: ${response.code()}")
-                }
-            }
-
-            override fun onFailure(call: Call<Void>, t: Throwable) {
-                Log.e("PurposePreferenceFragment", "POST 요청 실패", t)
-            }
-        })
-    }
+//    private fun postReasonsToServer(selectedPurpose: List<Int>) {
+//
+//        val service = RetrofitInstance.retrofit.create(LoginApiService::class.java)
+//        val purposePreferences = StudyReasons(selectedPurpose)
+//
+//        service.postPurposes(purposePreferences).enqueue(object : Callback<Void> {
+//            override fun onResponse(call: Call<Void>, response: Response<Void>) {
+//                if (response.isSuccessful) {
+//                    showCompletionDialog()
+//                    exitEditMode()
+//                } else {
+//                    Log.e("PurposePreferenceFragment", "POST 실패: ${response.code()}")
+//                }
+//            }
+//
+//            override fun onFailure(call: Call<Void>, t: Throwable) {
+//                Log.e("PurposePreferenceFragment", "POST 요청 실패", t)
+//            }
+//        })
+//    }
 
 
     private fun exitEditMode() {
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/PurposeUploadComplteDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/PurposeUploadComplteDialog.kt
similarity index 95%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/PurposeUploadComplteDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/PurposeUploadComplteDialog.kt
index 2481890b..854c797a 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/PurposeUploadComplteDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/PurposeUploadComplteDialog.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.content.Context
 import android.graphics.Color
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/RegionPreferenceFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/RegionPreferenceFragment.kt
similarity index 67%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/RegionPreferenceFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/RegionPreferenceFragment.kt
index 1a505819..103457bd 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/RegionPreferenceFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/RegionPreferenceFragment.kt
@@ -1,6 +1,5 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
-import LocationStudyFragment
 import android.content.Context
 import android.os.Bundle
 import android.util.Log
@@ -14,14 +13,7 @@ import android.widget.Toast
 import androidx.core.content.res.ResourcesCompat
 import com.example.spoteam_android.R
 import com.example.spoteam_android.Region
-import com.example.spoteam_android.RegionApiResponse
-import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentRegionPreferenceBinding
-import com.example.spoteam_android.login.LoginApiService
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
 
 class RegionPreferenceFragment : Fragment() {
     private lateinit var binding: FragmentRegionPreferenceBinding
@@ -41,7 +33,7 @@ class RegionPreferenceFragment : Fragment() {
         if (email != null) {
             val memberId = sharedPreferences.getInt("${email}_memberId", -1)
             if (memberId != -1) {
-                fetchRegions() // GET 요청으로 이유 리스트 가져오기
+//                fetchRegions() // GET 요청으로 이유 리스트 가져오기
             } else {
                 Toast.makeText(requireContext(), "Member ID not found", Toast.LENGTH_SHORT).show()
             }
@@ -75,44 +67,44 @@ class RegionPreferenceFragment : Fragment() {
         return binding.root
     }
 
-    private fun fetchRegions() {
-        val service = RetrofitInstance.retrofit.create(LoginApiService::class.java)
-
-        service.getRegion().enqueue(object : Callback<RegionApiResponse> {
-            override fun onResponse(
-                call: Call<RegionApiResponse>,
-                response: Response<RegionApiResponse>
-            ) {
-                if (response.isSuccessful) {
-                    val apiResponse = response.body()
-                    if (apiResponse != null && apiResponse.isSuccess) {
-                        val regions = apiResponse.result.regions // 서버에서 받아오는 지역 리스트
-                        if (regions.isNotEmpty()) {
-                            displayRegions(regions) // UI에 지역 리스트 표시
-                        }
-                    } else {
-                        val errorMessage = apiResponse?.message ?: "알 수 없는 오류 발생"
-                        Log.e("RegionPreferenceFragment", "지역 가져오기 실패: $errorMessage")
-                        Toast.makeText(
-                            requireContext(),
-                            "지역 가져오기 실패: $errorMessage",
-                            Toast.LENGTH_LONG
-                        ).show()
-                    }
-                } else {
-                    val errorMessage = response.errorBody()?.string() ?: "응답 실패"
-                    Log.e("RegionPreferenceFragment", "지역 가져오기 실패: $errorMessage")
-                    Toast.makeText(requireContext(), "지역 가져오기 실패: $errorMessage", Toast.LENGTH_LONG)
-                        .show()
-                }
-            }
-
-            override fun onFailure(call: Call<RegionApiResponse>, t: Throwable) {
-                Log.e("RegionPreferenceFragment", "네트워크 오류: ${t.message}")
-                Toast.makeText(requireContext(), "네트워크 오류 발생", Toast.LENGTH_LONG).show()
-            }
-        })
-    }
+//    private fun fetchRegions() {
+//        val service = RetrofitInstance.retrofit.create(LoginApiService::class.java)
+//
+//        service.getRegion().enqueue(object : Callback<RegionApiResponse> {
+//            override fun onResponse(
+//                call: Call<RegionApiResponse>,
+//                response: Response<RegionApiResponse>
+//            ) {
+//                if (response.isSuccessful) {
+//                    val apiResponse = response.body()
+//                    if (apiResponse != null && apiResponse.isSuccess) {
+//                        val regions = apiResponse.result.regions // 서버에서 받아오는 지역 리스트
+//                        if (regions.isNotEmpty()) {
+//                            displayRegions(regions) // UI에 지역 리스트 표시
+//                        }
+//                    } else {
+//                        val errorMessage = apiResponse?.message ?: "알 수 없는 오류 발생"
+//                        Log.e("RegionPreferenceFragment", "지역 가져오기 실패: $errorMessage")
+//                        Toast.makeText(
+//                            requireContext(),
+//                            "지역 가져오기 실패: $errorMessage",
+//                            Toast.LENGTH_LONG
+//                        ).show()
+//                    }
+//                } else {
+//                    val errorMessage = response.errorBody()?.string() ?: "응답 실패"
+//                    Log.e("RegionPreferenceFragment", "지역 가져오기 실패: $errorMessage")
+//                    Toast.makeText(requireContext(), "지역 가져오기 실패: $errorMessage", Toast.LENGTH_LONG)
+//                        .show()
+//                }
+//            }
+//
+//            override fun onFailure(call: Call<RegionApiResponse>, t: Throwable) {
+//                Log.e("RegionPreferenceFragment", "네트워크 오류: ${t.message}")
+//                Toast.makeText(requireContext(), "네트워크 오류 발생", Toast.LENGTH_LONG).show()
+//            }
+//        })
+//    }
 
     private fun displayRegions(regions: List<Region>) {
         val linearLayout = binding.fragmentRegionPreferenceLinearLayout
@@ -175,7 +167,9 @@ class RegionPreferenceFragment : Fragment() {
 
     private fun goToLocationFragment() {
         val transaction = parentFragmentManager.beginTransaction()
-        transaction.replace(R.id.main_frm, MyPageLocationFragment())
+        transaction.replace(R.id.main_frm,
+            com.example.spoteam_android.presentation.mypage.MyPageLocationFragment()
+        )
         transaction.commit()
     }
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/RegionUploadCompleteDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/RegionUploadCompleteDialog.kt
similarity index 95%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/RegionUploadCompleteDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/RegionUploadCompleteDialog.kt
index 75909a02..e4303c96 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/RegionUploadCompleteDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/RegionUploadCompleteDialog.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.content.Context
 import android.graphics.Color
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ReportStudyCrewMemberRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ReportStudyCrewMemberRVAdapter.kt
similarity index 95%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ReportStudyCrewMemberRVAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ReportStudyCrewMemberRVAdapter.kt
index 468ea908..4476f1d8 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ReportStudyCrewMemberRVAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ReportStudyCrewMemberRVAdapter.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.graphics.Color
 import android.view.LayoutInflater
@@ -8,7 +8,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.ItemDetailStudyHomeMemberBinding
-import com.example.spoteam_android.ui.community.MembersDetail
+import com.example.spoteam_android.presentation.community.MembersDetail
 import com.google.android.material.imageview.ShapeableImageView
 
 class ReportStudyCrewMemberRVAdapter(
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ReportStudyMemberContentFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ReportStudyMemberContentFragment.kt
similarity index 91%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ReportStudyMemberContentFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ReportStudyMemberContentFragment.kt
index 1377ca67..b9685c80 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ReportStudyMemberContentFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ReportStudyMemberContentFragment.kt
@@ -11,10 +11,10 @@ import android.view.Window
 import android.view.WindowManager
 import android.widget.Toast
 import com.example.spoteam_android.databinding.DialogReportMemberContentBinding
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.community.ReportCrewRequest
-import com.example.spoteam_android.ui.community.ReportCrewResponse
-import com.example.spoteam_android.ui.mypage.FinishReportCrewDialog
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.ReportCrewRequest
+import com.example.spoteam_android.presentation.community.ReportCrewResponse
+import com.example.spoteam_android.presentation.mypage.FinishReportCrewDialog
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -89,7 +89,7 @@ class ReportStudyMemberContentFragment(
                     call: Call<ReportCrewResponse>,
                     response: Response<ReportCrewResponse>
                 ) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         val finishDialog = FinishReportCrewDialog(context)
                         finishDialog.start()
                         dlg.dismiss()
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ReportStudyMemberFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ReportStudyMemberFragment.kt
similarity index 92%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ReportStudyMemberFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ReportStudyMemberFragment.kt
index 16a66586..e18ab39f 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ReportStudyMemberFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ReportStudyMemberFragment.kt
@@ -10,16 +10,16 @@ import android.view.Window
 import android.widget.Toast
 import androidx.recyclerview.widget.GridLayoutManager
 import com.example.spoteam_android.databinding.DialogReportStudymemberBinding
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.community.MembersDetail
-import com.example.spoteam_android.ui.community.StudyMemberResponse
-import com.example.spoteam_android.ui.mypage.ReportStudyCrewMemberRVAdapter
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import android.graphics.Rect
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.MembersDetail
+import com.example.spoteam_android.presentation.community.StudyMemberResponse
+import com.example.spoteam_android.presentation.mypage.ReportStudyCrewMemberRVAdapter
 
 class ReportStudyMemberFragment(
     private val context: Context,
@@ -80,7 +80,7 @@ class ReportStudyMemberFragment(
                 ) {
                     if (response.isSuccessful) {
                         val studyMemberResponse = response.body()
-                        if (studyMemberResponse?.isSuccess == "true") {
+                        if (studyMemberResponse?.isSuccess == true) {
                             val studyMembers = studyMemberResponse.result.members
                             initMembersRecycler(studyMembers)
                         }
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/RightSpaceItemDecoration.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/RightSpaceItemDecoration.kt
similarity index 91%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/RightSpaceItemDecoration.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/RightSpaceItemDecoration.kt
index a5a2ca71..549b475d 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/RightSpaceItemDecoration.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/RightSpaceItemDecoration.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.graphics.Rect
 import android.view.View
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/TemporaryRegionFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/TemporaryRegionFragment.kt
similarity index 67%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/TemporaryRegionFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/TemporaryRegionFragment.kt
index 9eabbf0d..e3b1c4a5 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/TemporaryRegionFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/TemporaryRegionFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.content.Context
 import android.os.Bundle
@@ -12,13 +12,7 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.content.res.ResourcesCompat
 import com.example.spoteam_android.R
-import com.example.spoteam_android.RegionsPreferences
-import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentTemporaryRegionBinding
-import com.example.spoteam_android.login.LoginApiService
-import com.google.android.material.chip.Chip
-import com.google.android.material.chip.ChipDrawable
-import com.google.android.material.chip.ChipGroup
 import retrofit2.Call
 import retrofit2.Response
 
@@ -58,7 +52,7 @@ class TemporaryRegionFragment : Fragment() {
         updateFinishButtonState() // 초기 버튼 상태 설정
 
         binding.editReasonCancelBt.setOnClickListener {
-            val fragment = MyPageLocationFragment()
+            val fragment = com.example.spoteam_android.presentation.mypage.MyPageLocationFragment()
             val bundle = Bundle().apply {
                 putStringArrayList("SELECTED_REGIONS", ArrayList(selectedRegions))
                 putStringArrayList("SELECTED_CODES", ArrayList(selectedRegionsCode))
@@ -70,39 +64,39 @@ class TemporaryRegionFragment : Fragment() {
                 .commit()
         }
 
-        binding.editReasonFinishBt.setOnClickListener {
-            val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-            val email = sharedPreferences.getString("currentEmail", null)
-            val memberId = if (email != null) sharedPreferences.getInt("${email}_memberId", -1) else -1
-
-            if (memberId == -1) {
-                Log.e("TemporaryRegionFragment", "Member ID not found in SharedPreferences")
-                return@setOnClickListener
-            }
-
-            // POST 요청을 위한 데이터 준비
-            val regionsPreferences = RegionsPreferences(selectedRegionsCode)
-
-            // Retrofit 인스턴스 생성 및 API 서비스 호출
-            val apiService = RetrofitInstance.retrofit.create(LoginApiService::class.java)
-
-            // Retrofit POST 요청 보내기
-            apiService.postRegions(regionsPreferences).enqueue(object : retrofit2.Callback<Void> {
-                override fun onResponse(call: Call<Void>, response: Response<Void>) {
-                    if (response.isSuccessful) {
-                        Log.d("TemporaryRegionFragment", "POST 성공")
-                        showCompletionDialog()
-                        // 성공 시 필요한 동작 수행
-                    } else {
-                        Log.e("TemporaryRegionFragment", "POST 실패: ${response.code()}")
-                    }
-                }
-
-                override fun onFailure(call: Call<Void>, t: Throwable) {
-                    Log.e("TemporaryRegionFragment", "POST 실패: ${t.message}")
-                }
-            })
-        }
+//        binding.editReasonFinishBt.setOnClickListener {
+//            val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
+//            val email = sharedPreferences.getString("currentEmail", null)
+//            val memberId = if (email != null) sharedPreferences.getInt("${email}_memberId", -1) else -1
+//
+//            if (memberId == -1) {
+//                Log.e("TemporaryRegionFragment", "Member ID not found in SharedPreferences")
+//                return@setOnClickListener
+//            }
+//
+//            // POST 요청을 위한 데이터 준비
+//            val regionsPreferences = RegionsPreferences(selectedRegionsCode)
+//
+//            // Retrofit 인스턴스 생성 및 API 서비스 호출
+//            val apiService = RetrofitInstance.retrofit.create(LoginApiService::class.java)
+//
+//            // Retrofit POST 요청 보내기
+//            apiService.postRegions(regionsPreferences).enqueue(object : retrofit2.Callback<Void> {
+//                override fun onResponse(call: Call<Void>, response: Response<Void>) {
+//                    if (response.isSuccessful) {
+//                        Log.d("TemporaryRegionFragment", "POST 성공")
+//                        showCompletionDialog()
+//                        // 성공 시 필요한 동작 수행
+//                    } else {
+//                        Log.e("TemporaryRegionFragment", "POST 실패: ${response.code()}")
+//                    }
+//                }
+//
+//                override fun onFailure(call: Call<Void>, t: Throwable) {
+//                    Log.e("TemporaryRegionFragment", "POST 실패: ${t.message}")
+//                }
+//            })
+//        }
 
         return binding.root
     }
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ThemePreferenceFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ThemePreferenceFragment.kt
similarity index 62%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ThemePreferenceFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ThemePreferenceFragment.kt
index 53cc600e..d2473318 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ThemePreferenceFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ThemePreferenceFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.content.Context
 import android.os.Bundle
@@ -9,12 +9,8 @@ import android.view.ViewGroup
 import android.widget.CompoundButton
 import android.widget.Toast
 import androidx.fragment.app.Fragment
-import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.ThemeApiResponse
-import com.example.spoteam_android.ThemePreferences
 import com.example.spoteam_android.databinding.FragmentThemePreferenceBinding
-import com.example.spoteam_android.login.LoginApiService
+//import com.example.spoteam_android.login.LoginApiService
 import com.google.android.material.chip.Chip
 import retrofit2.Call
 import retrofit2.Callback
@@ -38,7 +34,7 @@ class ThemePreferenceFragment : Fragment() {
         if (email != null) {
             val memberId = sharedPreferences.getInt("${email}_memberId", -1)
             if (memberId != -1) {
-                fetchThemes()
+//                fetchThemes()
             } else {
                 Toast.makeText(requireContext(), "멤버를 찾을 수 없습니다", Toast.LENGTH_SHORT).show()
             }
@@ -47,7 +43,7 @@ class ThemePreferenceFragment : Fragment() {
         }
 
         binding.fragmentThemePreferenceEditBt.setOnClickListener { enterEditMode() }
-        binding.editThemeFinishBt.setOnClickListener { saveSelectedThemes() }
+//        binding.editThemeFinishBt.setOnClickListener { saveSelectedThemes() }
         binding.editThemeCancelBt.setOnClickListener { cancelEditMode() }
         binding.fragmentThemePreferenceBackBt.setOnClickListener { parentFragmentManager.popBackStack() }
 
@@ -57,30 +53,30 @@ class ThemePreferenceFragment : Fragment() {
         return binding.root
     }
 
-    // 테마 가져오기
-    private fun fetchThemes() {
-        val service = RetrofitInstance.retrofit.create(LoginApiService::class.java)
-
-        service.getThemes().enqueue(object : Callback<ThemeApiResponse> {
-            override fun onResponse(call: Call<ThemeApiResponse>, response: RetrofitResponse<ThemeApiResponse>) {
-                if (response.isSuccessful) {
-                    val apiResponse = response.body()
-                    if (apiResponse != null && apiResponse.isSuccess) {
-                        val themes = apiResponse.result.themes
-                        if (themes.isNotEmpty()) {
-                            setChipCheckedState(themes) //테마와 UI 비교 매칭
-                        }
-                    }
-                } else {
-                    Log.e("ThemePreferenceFragment", "테마 가져오기 실패: ${response.errorBody()?.string()}")
-                }
-            }
-
-            override fun onFailure(call: Call<ThemeApiResponse>, t: Throwable) {
-                Log.e("ThemePreferenceFragment", "테마 가져오기 오류", t)
-            }
-        })
-    }
+//    // 테마 가져오기
+//    private fun fetchThemes() {
+//        val service = RetrofitInstance.retrofit.create(LoginApiService::class.java)
+//
+//        service.getThemes().enqueue(object : Callback<ThemeApiResponse> {
+//            override fun onResponse(call: Call<ThemeApiResponse>, response: RetrofitResponse<ThemeApiResponse>) {
+//                if (response.isSuccessful) {
+//                    val apiResponse = response.body()
+//                    if (apiResponse != null && apiResponse.isSuccess) {
+//                        val themes = apiResponse.result.themes
+//                        if (themes.isNotEmpty()) {
+//                            setChipCheckedState(themes) //테마와 UI 비교 매칭
+//                        }
+//                    }
+//                } else {
+//                    Log.e("ThemePreferenceFragment", "테마 가져오기 실패: ${response.errorBody()?.string()}")
+//                }
+//            }
+//
+//            override fun onFailure(call: Call<ThemeApiResponse>, t: Throwable) {
+//                Log.e("ThemePreferenceFragment", "테마 가져오기 오류", t)
+//            }
+//        })
+//    }
 
     private fun setChipCheckedState(themes: List<String>) {
         selectedThemes.clear()
@@ -151,50 +147,50 @@ class ThemePreferenceFragment : Fragment() {
         }
     }
 
-    // 완료 버튼을 클릭하면 서버로 테마 전송
-    private fun saveSelectedThemes() {
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val email = sharedPreferences.getString("currentEmail", null)
-
-        if (email != null) {
-            val memberId = sharedPreferences.getInt("${email}_memberId", -1)
-            if (memberId != -1) {
-                postThemesToServer(selectedThemes)
-            } else {
-                Toast.makeText(requireContext(), "Member ID not found", Toast.LENGTH_SHORT).show()
-            }
-        }
-    }
-
-    private fun postThemesToServer(themes: List<String>) {
-        val service = RetrofitInstance.retrofit.create(LoginApiService::class.java)
-
-        // 서버가 요구하는 대로 정규식 변경
-        val processedThemes = themes.map { theme ->
-            when {
-                theme.contains("전공") -> theme.replace("/", "및")  // ✅ "전공/진로학습" → "전공 및 진로학습"
-                else -> theme.replace("/", "").replace(" ", "") // ✅ "/" 제거, 공백 제거
-            }
-        }
-
-        val themePreferences = ThemePreferences(processedThemes)
-
-        service.postThemes(themePreferences).enqueue(object : Callback<Void> {
-            override fun onResponse(call: Call<Void>, response: RetrofitResponse<Void>) {
-                if (response.isSuccessful) {
-                    Log.d("ThemePreferenceFragment", "Themes POST request success")
-                    showCompletionDialog() // ✅ Dialog 표시
-                    exitEditMode()
-                } else {
-                    Log.e("ThemePreferenceFragment", "Themes POST request failed: ${response.code()}")
-                }
-            }
-
-            override fun onFailure(call: Call<Void>, t: Throwable) {
-                Log.e("ThemePreferenceFragment", "Themes POST request failure", t)
-            }
-        })
-    }
+//    // 완료 버튼을 클릭하면 서버로 테마 전송
+//    private fun saveSelectedThemes() {
+//        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
+//        val email = sharedPreferences.getString("currentEmail", null)
+//
+//        if (email != null) {
+//            val memberId = sharedPreferences.getInt("${email}_memberId", -1)
+//            if (memberId != -1) {
+//                postThemesToServer(selectedThemes)
+//            } else {
+//                Toast.makeText(requireContext(), "Member ID not found", Toast.LENGTH_SHORT).show()
+//            }
+//        }
+//    }
+
+//    private fun postThemesToServer(themes: List<String>) {
+//        val service = RetrofitInstance.retrofit.create(LoginApiService::class.java)
+//
+//        // 서버가 요구하는 대로 정규식 변경
+//        val processedThemes = themes.map { theme ->
+//            when {
+//                theme.contains("전공") -> theme.replace("/", "및")  // ✅ "전공/진로학습" → "전공 및 진로학습"
+//                else -> theme.replace("/", "").replace(" ", "") // ✅ "/" 제거, 공백 제거
+//            }
+//        }
+//
+//        val themePreferences = ThemePreferences(processedThemes)
+//
+//        service.postThemes(themePreferences).enqueue(object : Callback<Void> {
+//            override fun onResponse(call: Call<Void>, response: RetrofitResponse<Void>) {
+//                if (response.isSuccessful) {
+//                    Log.d("ThemePreferenceFragment", "Themes POST request success")
+//                    showCompletionDialog() // ✅ Dialog 표시
+//                    exitEditMode()
+//                } else {
+//                    Log.e("ThemePreferenceFragment", "Themes POST request failed: ${response.code()}")
+//                }
+//            }
+//
+//            override fun onFailure(call: Call<Void>, t: Throwable) {
+//                Log.e("ThemePreferenceFragment", "Themes POST request failure", t)
+//            }
+//        })
+//    }
 
 
     private fun exitEditMode() {
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ThemeUploadCompleteDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ThemeUploadCompleteDialog.kt
similarity index 90%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ThemeUploadCompleteDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ThemeUploadCompleteDialog.kt
index 6c0882d4..58c19868 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ThemeUploadCompleteDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/ThemeUploadCompleteDialog.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage
+package com.example.spoteam_android.presentation.mypage
 
 import android.content.Context
 import android.graphics.Color
@@ -8,7 +8,7 @@ import android.widget.Button
 import android.widget.ImageView
 import androidx.fragment.app.FragmentManager
 import com.example.spoteam_android.R
-import com.example.spoteam_android.ui.study.DetailStudyFragment
+import com.example.spoteam_android.presentation.study.DetailStudyFragment
 
 class ThemeUploadCompleteDialog (private val context: Context) {
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/cancel/CancelDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/cancel/CancelDialog.kt
similarity index 94%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/cancel/CancelDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/cancel/CancelDialog.kt
index 0b0e7089..85205012 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/cancel/CancelDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/cancel/CancelDialog.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage.cancel
+package com.example.spoteam_android.presentation.mypage.cancel
 
 import android.app.Dialog
 import android.content.Context
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/cancel/CancelFinishDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/cancel/CancelFinishDialog.kt
similarity index 100%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/cancel/CancelFinishDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/cancel/CancelFinishDialog.kt
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityPrivacyPolicyFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/rule/CommunityPrivacyPolicyFragment.kt
similarity index 93%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityPrivacyPolicyFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/rule/CommunityPrivacyPolicyFragment.kt
index 52552555..cfc33078 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityPrivacyPolicyFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/rule/CommunityPrivacyPolicyFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage.rule
+package com.example.spoteam_android.presentation.mypage.rule
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityRestrictionsFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/rule/CommunityRestrictionsFragment.kt
similarity index 93%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityRestrictionsFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/rule/CommunityRestrictionsFragment.kt
index 5e0db047..2c32ebd8 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityRestrictionsFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/rule/CommunityRestrictionsFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage.rule
+package com.example.spoteam_android.presentation.mypage.rule
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityRuleFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/rule/CommunityRuleFragment.kt
similarity index 92%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityRuleFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/rule/CommunityRuleFragment.kt
index 68f836b6..a2f02b86 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityRuleFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/rule/CommunityRuleFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage.rule
+package com.example.spoteam_android.presentation.mypage.rule
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityTermsOfUseFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/rule/CommunityTermsOfUseFragment.kt
similarity index 93%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityTermsOfUseFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/rule/CommunityTermsOfUseFragment.kt
index 89c67f95..fa919dd6 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityTermsOfUseFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/rule/CommunityTermsOfUseFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage.rule
+package com.example.spoteam_android.presentation.mypage.rule
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/ScrapFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/ScrapFragment.kt
similarity index 97%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/ScrapFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/ScrapFragment.kt
index 1de79239..03a53eda 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/ScrapFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/ScrapFragment.kt
@@ -11,7 +11,7 @@ import androidx.fragment.app.Fragment
 import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.FragmentCommunityBinding
-import com.example.spoteam_android.ui.mypage.scrap.ScrapVPAdapter
+import com.example.spoteam_android.presentation.mypage.scrap.ScrapVPAdapter
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import retrofit2.Call
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/ScrapVPAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/ScrapVPAdapter.kt
similarity index 96%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/ScrapVPAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/ScrapVPAdapter.kt
index 61951f34..355ba4a8 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/ScrapVPAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/ScrapVPAdapter.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.mypage.scrap
+package com.example.spoteam_android.presentation.mypage.scrap
 
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/AllScrapFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/AllScrapFragment.kt
similarity index 92%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/AllScrapFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/AllScrapFragment.kt
index 29f763e6..dcbfc3ad 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/AllScrapFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/AllScrapFragment.kt
@@ -14,6 +14,13 @@ import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentScrapContentBinding
+import com.example.spoteam_android.presentation.community.CategoryPagesDetail
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.CommunityContentActivity
+import com.example.spoteam_android.presentation.community.CommunityFragment
+import com.example.spoteam_android.presentation.community.ContentLikeResponse
+import com.example.spoteam_android.presentation.community.ContentUnLikeResponse
+import com.example.spoteam_android.presentation.community.GetScrapResponse
 import com.example.spoteam_android.ui.community.*
 
 import retrofit2.Call
@@ -128,7 +135,7 @@ class AllScrapFragment : Fragment() {
                 ) {
                     if (response.isSuccessful) {
                         val pagesResponse = response.body()
-                        if (pagesResponse?.isSuccess == "true") {
+                        if (pagesResponse?.isSuccess == true) {
                             val pagesResponseList = pagesResponse.result.postResponses ?: emptyList()
                             scrapItemList.clear()
                             scrapItemList.addAll(pagesResponseList)
@@ -162,7 +169,7 @@ class AllScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.postContentLike(postId).enqueue(object : Callback<ContentLikeResponse> {
             override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
@@ -179,7 +186,7 @@ class AllScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.deleteContentLike(postId).enqueue(object : Callback<ContentUnLikeResponse> {
             override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
@@ -196,7 +203,7 @@ class AllScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.postContentScrap(postId).enqueue(object : Callback<ContentLikeResponse> {
             override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
@@ -213,7 +220,7 @@ class AllScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.deleteContentScrap(postId).enqueue(object : Callback<ContentUnLikeResponse> {
             override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/CounselingScrapFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/CounselingScrapFragment.kt
similarity index 92%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/CounselingScrapFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/CounselingScrapFragment.kt
index 5f128378..cf95c8c6 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/CounselingScrapFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/CounselingScrapFragment.kt
@@ -14,6 +14,13 @@ import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentScrapContentBinding
+import com.example.spoteam_android.presentation.community.CategoryPagesDetail
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.CommunityContentActivity
+import com.example.spoteam_android.presentation.community.CommunityFragment
+import com.example.spoteam_android.presentation.community.ContentLikeResponse
+import com.example.spoteam_android.presentation.community.ContentUnLikeResponse
+import com.example.spoteam_android.presentation.community.GetScrapResponse
 import com.example.spoteam_android.ui.community.*
 
 import retrofit2.Call
@@ -128,7 +135,7 @@ class CounselingScrapFragment : Fragment() {
                 ) {
                     if (response.isSuccessful) {
                         val pagesResponse = response.body()
-                        if (pagesResponse?.isSuccess == "true") {
+                        if (pagesResponse?.isSuccess == true) {
                             val pagesResponseList = pagesResponse.result.postResponses ?: emptyList()
                             scrapItemList.clear()
                             scrapItemList.addAll(pagesResponseList)
@@ -162,7 +169,7 @@ class CounselingScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.postContentLike(postId).enqueue(object : Callback<ContentLikeResponse> {
             override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
@@ -179,7 +186,7 @@ class CounselingScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.deleteContentLike(postId).enqueue(object : Callback<ContentUnLikeResponse> {
             override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
@@ -196,7 +203,7 @@ class CounselingScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.postContentScrap(postId).enqueue(object : Callback<ContentLikeResponse> {
             override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
@@ -213,7 +220,7 @@ class CounselingScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.deleteContentScrap(postId).enqueue(object : Callback<ContentUnLikeResponse> {
             override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/FreeTalkScrapFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/FreeTalkScrapFragment.kt
similarity index 92%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/FreeTalkScrapFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/FreeTalkScrapFragment.kt
index a299d337..41dfb01e 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/FreeTalkScrapFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/FreeTalkScrapFragment.kt
@@ -14,6 +14,13 @@ import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentScrapContentBinding
+import com.example.spoteam_android.presentation.community.CategoryPagesDetail
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.CommunityContentActivity
+import com.example.spoteam_android.presentation.community.CommunityFragment
+import com.example.spoteam_android.presentation.community.ContentLikeResponse
+import com.example.spoteam_android.presentation.community.ContentUnLikeResponse
+import com.example.spoteam_android.presentation.community.GetScrapResponse
 import com.example.spoteam_android.ui.community.*
 
 import retrofit2.Call
@@ -128,7 +135,7 @@ class FreeTalkScrapFragment : Fragment() {
                 ) {
                     if (response.isSuccessful) {
                         val pagesResponse = response.body()
-                        if (pagesResponse?.isSuccess == "true") {
+                        if (pagesResponse?.isSuccess == true) {
                             val pagesResponseList = pagesResponse.result.postResponses ?: emptyList()
                             scrapItemList.clear()
                             scrapItemList.addAll(pagesResponseList)
@@ -162,7 +169,7 @@ class FreeTalkScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.postContentLike(postId).enqueue(object : Callback<ContentLikeResponse> {
             override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
@@ -179,7 +186,7 @@ class FreeTalkScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.deleteContentLike(postId).enqueue(object : Callback<ContentUnLikeResponse> {
             override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
@@ -196,7 +203,7 @@ class FreeTalkScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.postContentScrap(postId).enqueue(object : Callback<ContentLikeResponse> {
             override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
@@ -213,7 +220,7 @@ class FreeTalkScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.deleteContentScrap(postId).enqueue(object : Callback<ContentUnLikeResponse> {
             override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/JobSeekingTalkScrapFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/JobSeekingTalkScrapFragment.kt
similarity index 92%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/JobSeekingTalkScrapFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/JobSeekingTalkScrapFragment.kt
index 2edfe28f..7e6ddc2b 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/JobSeekingTalkScrapFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/JobSeekingTalkScrapFragment.kt
@@ -14,6 +14,13 @@ import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentScrapContentBinding
+import com.example.spoteam_android.presentation.community.CategoryPagesDetail
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.CommunityContentActivity
+import com.example.spoteam_android.presentation.community.CommunityFragment
+import com.example.spoteam_android.presentation.community.ContentLikeResponse
+import com.example.spoteam_android.presentation.community.ContentUnLikeResponse
+import com.example.spoteam_android.presentation.community.GetScrapResponse
 import com.example.spoteam_android.ui.community.*
 
 import retrofit2.Call
@@ -128,7 +135,7 @@ class JobSeekingTalkScrapFragment : Fragment() {
                 ) {
                     if (response.isSuccessful) {
                         val pagesResponse = response.body()
-                        if (pagesResponse?.isSuccess == "true") {
+                        if (pagesResponse?.isSuccess == true) {
                             val pagesResponseList = pagesResponse.result.postResponses ?: emptyList()
                             scrapItemList.clear()
                             scrapItemList.addAll(pagesResponseList)
@@ -162,7 +169,7 @@ class JobSeekingTalkScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.postContentLike(postId).enqueue(object : Callback<ContentLikeResponse> {
             override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
@@ -179,7 +186,7 @@ class JobSeekingTalkScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.deleteContentLike(postId).enqueue(object : Callback<ContentUnLikeResponse> {
             override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
@@ -196,7 +203,7 @@ class JobSeekingTalkScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.postContentScrap(postId).enqueue(object : Callback<ContentLikeResponse> {
             override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
@@ -213,7 +220,7 @@ class JobSeekingTalkScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.deleteContentScrap(postId).enqueue(object : Callback<ContentUnLikeResponse> {
             override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/NotificationScrapFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/NotificationScrapFragment.kt
similarity index 92%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/NotificationScrapFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/NotificationScrapFragment.kt
index 7504a5b4..135860a1 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/NotificationScrapFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/NotificationScrapFragment.kt
@@ -14,6 +14,13 @@ import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentScrapContentBinding
+import com.example.spoteam_android.presentation.community.CategoryPagesDetail
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.CommunityContentActivity
+import com.example.spoteam_android.presentation.community.CommunityFragment
+import com.example.spoteam_android.presentation.community.ContentLikeResponse
+import com.example.spoteam_android.presentation.community.ContentUnLikeResponse
+import com.example.spoteam_android.presentation.community.GetScrapResponse
 import com.example.spoteam_android.ui.community.*
 
 import retrofit2.Call
@@ -128,7 +135,7 @@ class NotificationScrapFragment : Fragment() {
                 ) {
                     if (response.isSuccessful) {
                         val pagesResponse = response.body()
-                        if (pagesResponse?.isSuccess == "true") {
+                        if (pagesResponse?.isSuccess == true) {
                             val pagesResponseList = pagesResponse.result.postResponses ?: emptyList()
                             scrapItemList.clear()
                             scrapItemList.addAll(pagesResponseList)
@@ -162,7 +169,7 @@ class NotificationScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.postContentLike(postId).enqueue(object : Callback<ContentLikeResponse> {
             override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
@@ -179,7 +186,7 @@ class NotificationScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.deleteContentLike(postId).enqueue(object : Callback<ContentUnLikeResponse> {
             override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
@@ -196,7 +203,7 @@ class NotificationScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.postContentScrap(postId).enqueue(object : Callback<ContentLikeResponse> {
             override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
@@ -213,7 +220,7 @@ class NotificationScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.deleteContentScrap(postId).enqueue(object : Callback<ContentUnLikeResponse> {
             override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/PassingReviewScrapFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/PassingReviewScrapFragment.kt
similarity index 92%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/PassingReviewScrapFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/PassingReviewScrapFragment.kt
index eecf36be..3049154e 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/PassingReviewScrapFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/PassingReviewScrapFragment.kt
@@ -14,6 +14,13 @@ import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentScrapContentBinding
+import com.example.spoteam_android.presentation.community.CategoryPagesDetail
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.CommunityContentActivity
+import com.example.spoteam_android.presentation.community.CommunityFragment
+import com.example.spoteam_android.presentation.community.ContentLikeResponse
+import com.example.spoteam_android.presentation.community.ContentUnLikeResponse
+import com.example.spoteam_android.presentation.community.GetScrapResponse
 import com.example.spoteam_android.ui.community.*
 
 import retrofit2.Call
@@ -128,7 +135,7 @@ class PassingReviewScrapFragment : Fragment() {
                 ) {
                     if (response.isSuccessful) {
                         val pagesResponse = response.body()
-                        if (pagesResponse?.isSuccess == "true") {
+                        if (pagesResponse?.isSuccess == true) {
                             val pagesResponseList = pagesResponse.result.postResponses ?: emptyList()
                             scrapItemList.clear()
                             scrapItemList.addAll(pagesResponseList)
@@ -162,7 +169,7 @@ class PassingReviewScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.postContentLike(postId).enqueue(object : Callback<ContentLikeResponse> {
             override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
@@ -179,7 +186,7 @@ class PassingReviewScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.deleteContentLike(postId).enqueue(object : Callback<ContentUnLikeResponse> {
             override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
@@ -196,7 +203,7 @@ class PassingReviewScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.postContentScrap(postId).enqueue(object : Callback<ContentLikeResponse> {
             override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
@@ -213,7 +220,7 @@ class PassingReviewScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.deleteContentScrap(postId).enqueue(object : Callback<ContentUnLikeResponse> {
             override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/ScrapContentRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/ScrapContentRVAdapter.kt
similarity index 98%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/ScrapContentRVAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/ScrapContentRVAdapter.kt
index bb9425e1..94df5581 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/ScrapContentRVAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/ScrapContentRVAdapter.kt
@@ -9,7 +9,7 @@ import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.ItemCommunityContentBinding
-import com.example.spoteam_android.ui.community.CategoryPagesDetail
+import com.example.spoteam_android.presentation.community.CategoryPagesDetail
 import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.Locale
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/ShareInfoScrapFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/ShareInfoScrapFragment.kt
similarity index 92%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/ShareInfoScrapFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/ShareInfoScrapFragment.kt
index db290c96..84bce70b 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/ShareInfoScrapFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/mypage/scrap/scrapContent/ShareInfoScrapFragment.kt
@@ -14,6 +14,13 @@ import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentScrapContentBinding
+import com.example.spoteam_android.presentation.community.CategoryPagesDetail
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.CommunityContentActivity
+import com.example.spoteam_android.presentation.community.CommunityFragment
+import com.example.spoteam_android.presentation.community.ContentLikeResponse
+import com.example.spoteam_android.presentation.community.ContentUnLikeResponse
+import com.example.spoteam_android.presentation.community.GetScrapResponse
 import com.example.spoteam_android.ui.community.*
 
 import retrofit2.Call
@@ -128,7 +135,7 @@ class ShareInfoScrapFragment : Fragment() {
                 ) {
                     if (response.isSuccessful) {
                         val pagesResponse = response.body()
-                        if (pagesResponse?.isSuccess == "true") {
+                        if (pagesResponse?.isSuccess == true) {
                             val pagesResponseList = pagesResponse.result.postResponses ?: emptyList()
                             scrapItemList.clear()
                             scrapItemList.addAll(pagesResponseList)
@@ -162,7 +169,7 @@ class ShareInfoScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.postContentLike(postId).enqueue(object : Callback<ContentLikeResponse> {
             override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
@@ -179,7 +186,7 @@ class ShareInfoScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.deleteContentLike(postId).enqueue(object : Callback<ContentUnLikeResponse> {
             override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
@@ -196,7 +203,7 @@ class ShareInfoScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.postContentScrap(postId).enqueue(object : Callback<ContentLikeResponse> {
             override fun onResponse(call: Call<ContentLikeResponse>, response: Response<ContentLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
@@ -213,7 +220,7 @@ class ShareInfoScrapFragment : Fragment() {
         val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
         service.deleteContentScrap(postId).enqueue(object : Callback<ContentUnLikeResponse> {
             override fun onResponse(call: Call<ContentUnLikeResponse>, response: Response<ContentUnLikeResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     fetchPages()
                 } else {
                     showError(response.body()?.message)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingChipViewModel.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/recruiting/RecruitingChipViewModel.kt
similarity index 93%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingChipViewModel.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/recruiting/RecruitingChipViewModel.kt
index 6111bf58..d30bd49e 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingChipViewModel.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/recruiting/RecruitingChipViewModel.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.recruiting
+package com.example.spoteam_android.presentation.recruiting
 
 import androidx.lifecycle.ViewModel
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingStudyFilterFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/recruiting/RecruitingStudyFilterFragment.kt
similarity index 98%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingStudyFilterFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/recruiting/RecruitingStudyFilterFragment.kt
index afac9c61..4547523b 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingStudyFilterFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/recruiting/RecruitingStudyFilterFragment.kt
@@ -1,8 +1,8 @@
-package com.example.spoteam_android.ui.recruiting
+package com.example.spoteam_android.presentation.recruiting
 
-import com.example.spoteam_android.ui.interestarea.BottomNavVisibilityController
-import com.example.spoteam_android.ui.interestarea.InterestFilterViewModel
-import com.example.spoteam_android.ui.interestarea.InterestFragment
+import com.example.spoteam_android.presentation.interestarea.BottomNavVisibilityController
+import com.example.spoteam_android.presentation.interestarea.InterestFilterViewModel
+import com.example.spoteam_android.presentation.interestarea.InterestFragment
 import android.content.Context
 import android.content.res.ColorStateList
 import android.graphics.Color
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingStudyFilterLocationFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/recruiting/RecruitingStudyFilterLocationFragment.kt
similarity index 90%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingStudyFilterLocationFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/recruiting/RecruitingStudyFilterLocationFragment.kt
index 166e422b..a92e9bc8 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingStudyFilterLocationFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/recruiting/RecruitingStudyFilterLocationFragment.kt
@@ -1,7 +1,7 @@
 
-package com.example.spoteam_android.ui.recruiting
+package com.example.spoteam_android.presentation.recruiting
 
-import LocationSearchAdapter
+import com.example.spoteam_android.presentation.login.checklist.LocationSearchAdapter
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
@@ -9,20 +9,14 @@ import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toolbar
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
-import com.example.spoteam_android.databinding.FragmentLocationStudyBinding
-import com.example.spoteam_android.databinding.FragmentRecruitingStudyFilterBinding
 import com.example.spoteam_android.databinding.FragmentRecruitingStudyFilterLocationBinding
-import com.example.spoteam_android.login.LocationItem
-import com.example.spoteam_android.ui.interestarea.InterestFragment
-import com.example.spoteam_android.ui.study.IntroduceStudyFragment
-import com.example.spoteam_android.ui.study.OnlineStudyFragment
-import com.example.spoteam_android.ui.study.RegisterStudyFragment
+import com.example.spoteam_android.presentation.login.checklist.LocationItem
+
 import java.io.BufferedReader
 import java.io.InputStreamReader
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/recruiting/RecruitingStudyFragment.kt
similarity index 78%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingStudyFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/recruiting/RecruitingStudyFragment.kt
index c8bd30f1..70f57388 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingStudyFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/recruiting/RecruitingStudyFragment.kt
@@ -1,35 +1,28 @@
-package com.example.spoteam_android.ui.recruiting
+package com.example.spoteam_android.presentation.recruiting
 
-import StudyApiService
-import StudyViewModel
 import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
 import android.widget.FrameLayout
 import android.widget.ImageView
-import android.widget.Spinner
-import android.widget.TextView
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.BoardItem
-import com.example.spoteam_android.HouseFragment
-import com.example.spoteam_android.LikeResponse
+import com.example.spoteam_android.presentation.home.HomeFragment
 import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentRecruitingStudyBinding
-import com.example.spoteam_android.search.SearchFragment
-import com.example.spoteam_android.ui.alert.AlertFragment
-import com.example.spoteam_android.ui.interestarea.ApiResponse
-import com.example.spoteam_android.ui.interestarea.InterestVPAdapter
-import com.example.spoteam_android.ui.interestarea.RecruitingStudyApiService
-import com.example.spoteam_android.ui.study.DetailStudyFragment
+import com.example.spoteam_android.domain.study.entity.BoardItem
+import com.example.spoteam_android.presentation.search.SearchFragment
+import com.example.spoteam_android.presentation.alert.AlertFragment
+import com.example.spoteam_android.presentation.interestarea.ApiResponse
+import com.example.spoteam_android.presentation.interestarea.InterestVPAdapter
+import com.example.spoteam_android.presentation.interestarea.RecruitingStudyApiService
+import com.example.spoteam_android.presentation.study.StudyViewModel
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import retrofit2.Call
 import retrofit2.Callback
@@ -38,7 +31,6 @@ import retrofit2.Response
 class RecruitingStudyFragment : Fragment() {
 
     lateinit var binding: FragmentRecruitingStudyBinding
-    private lateinit var studyApiService: StudyApiService
     private val studyViewModel: StudyViewModel by activityViewModels()
     private lateinit var recruitingStudyAdapter: InterestVPAdapter
     private var gender: String? = null
@@ -64,7 +56,6 @@ class RecruitingStudyFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         binding = FragmentRecruitingStudyBinding.inflate(inflater, container, false)
-        studyApiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
 
         initArguments()
         setupRecyclerView()
@@ -116,7 +107,7 @@ class RecruitingStudyFragment : Fragment() {
         recruitingStudyAdapter.setItemClickListener(object : InterestVPAdapter.OnItemClickListeners {
             override fun onItemClick(data: BoardItem) {
                 studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
-                replaceFragment(DetailStudyFragment())
+                replaceFragment(com.example.spoteam_android.presentation.study.DetailStudyFragment())
             }
         })
 
@@ -373,57 +364,27 @@ class RecruitingStudyFragment : Fragment() {
     private fun showError(error: String?) {
         Toast.makeText(requireContext(), "API 호출 실패: $error", Toast.LENGTH_SHORT).show()
     }
-
     private fun toggleLikeStatus(studyItem: BoardItem, likeButton: ImageView) {
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val memberId = sharedPreferences.getInt("${sharedPreferences.getString("currentEmail", "")}_memberId", -1)
-
-        if (memberId != -1) {
-            studyApiService.toggleStudyLike(studyItem.studyId)
-                .enqueue(object : Callback<LikeResponse> {
-                    override fun onResponse(call: Call<LikeResponse>, response: Response<LikeResponse>) {
-                        if (response.isSuccessful) {
-                            response.body()?.let { likeResponse ->
-                                // 서버에서 반환된 상태에 따라 하트 아이콘 및 BoardItem의 liked 상태 업데이트
-                                val newStatus = likeResponse.result.status
-                                studyItem.liked = newStatus == "LIKE"
-                                val newIcon = if (studyItem.liked) R.drawable.ic_heart_filled else R.drawable.study_like
-                                likeButton.setImageResource(newIcon)
-
-                                // heartCount 즉시 증가 또는 감소
-                                studyItem.heartCount = if (studyItem.liked) studyItem.heartCount + 1 else studyItem.heartCount - 1
-
-                                // 변경된 항목을 어댑터에 알림
-                                val adapter = binding.recruitingStudyReyclerview.adapter as InterestVPAdapter
-                                val position = adapter.dataList.indexOf(studyItem)
-                                if (position != -1) {
-                                    adapter.notifyItemChanged(position)
-                                }
-                            }
-                        } else {
-                            Toast.makeText(requireContext(), "찜 상태 업데이트 실패", Toast.LENGTH_SHORT).show()
-                        }
-                    }
-
-                    override fun onFailure(call: Call<LikeResponse>, t: Throwable) {
-                        Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
-                    }
-                })
-        } else {
-            Toast.makeText(requireContext(), "회원 정보를 불러올 수 없습니다.", Toast.LENGTH_SHORT).show()
+        val adapter = binding.recruitingStudyReyclerview.adapter as InterestVPAdapter
+        studyViewModel.toggleLikeStatus(studyItem.studyId) { result ->
+            requireActivity().runOnUiThread {
+                result.onSuccess { liked ->
+                    studyItem.liked = liked
+                    studyItem.heartCount += if (liked) 1 else -1
+                    val icon = if (liked) R.drawable.ic_heart_filled else R.drawable.study_like
+                    likeButton.setImageResource(icon)
+
+                    // RecyclerView 갱신
+                    adapter.notifyItemChanged(
+                        adapter.dataList.indexOf(studyItem)
+                    )
+                }.onFailure {
+                    Toast.makeText(requireContext(), "찜 실패: ${it.message}", Toast.LENGTH_SHORT).show()
+                }
+            }
         }
     }
 
-    private fun updateLikeButtonUI(likeButton: ImageView, isLiked: Boolean) {
-        val newIcon = if (isLiked) R.drawable.ic_heart_filled else R.drawable.study_like
-        likeButton.setImageResource(newIcon)
-    }
-
-    private fun getMemberId(context: Context): Int {
-        val sharedPreferences = context.getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val currentEmail = sharedPreferences.getString("currentEmail", null)
-        return if (currentEmail != null) sharedPreferences.getInt("${currentEmail}_memberId", -1) else -1
-    }
 
     private fun replaceFragment(fragment: Fragment) {
         (requireActivity() as MainActivity).supportFragmentManager.beginTransaction()
@@ -438,7 +399,7 @@ class RecruitingStudyFragment : Fragment() {
         }
 
         binding.spotLogo.setOnClickListener {
-            replaceFragment(HouseFragment())
+            replaceFragment(HomeFragment())
         }
 
         binding.icAlarmRecruiting.setOnClickListener {
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/AppDatabase.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/AppDatabase.kt
similarity index 96%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/AppDatabase.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/AppDatabase.kt
index 3dd6f94e..4bb3dac3 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/AppDatabase.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/AppDatabase.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.search
+package com.example.spoteam_android.presentation.search
 
 import android.content.Context
 import androidx.room.Database
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/SearchAdapter.kt
similarity index 96%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/SearchAdapter.kt
index c6ae2dae..1c955b60 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/SearchAdapter.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.search
+package com.example.spoteam_android.presentation.search
 
 import android.util.Log
 import android.view.LayoutInflater
@@ -6,9 +6,9 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
-import com.example.spoteam_android.BoardItem
 import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.ItemRecyclerViewPlusToggleBinding
+import com.example.spoteam_android.domain.study.entity.BoardItem
 
 class SearchAdapter(
     private val itemList: ArrayList<BoardItem>,
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchApiService.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/SearchApiService.kt
similarity index 85%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchApiService.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/SearchApiService.kt
index 76691340..c3f1a93f 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchApiService.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/SearchApiService.kt
@@ -1,6 +1,6 @@
-package com.example.spoteam_android.search
+package com.example.spoteam_android.presentation.search
 
-import com.example.spoteam_android.ui.interestarea.ApiResponse
+import com.example.spoteam_android.presentation.interestarea.ApiResponse
 import retrofit2.Call
 import retrofit2.Response
 import retrofit2.http.GET
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/SearchFragment.kt
similarity index 85%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/SearchFragment.kt
index 68c19db3..64cdea74 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/SearchFragment.kt
@@ -1,7 +1,5 @@
-package com.example.spoteam_android.search
+package com.example.spoteam_android.presentation.search
 
-import StudyApiService
-import StudyViewModel
 import android.content.Context
 import android.os.Bundle
 import android.util.Log
@@ -17,20 +15,17 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.BoardItem
-import com.example.spoteam_android.LikeResponse
 import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentSearchBinding
-import com.example.spoteam_android.ui.interestarea.ApiResponse
-import com.example.spoteam_android.ui.interestarea.InterestVPAdapter
-import com.example.spoteam_android.ui.interestarea.RecommendStudyApiService
-import com.example.spoteam_android.ui.interestarea.RecruitingStudyApiService
-import com.example.spoteam_android.ui.study.DetailStudyFragment
-import com.example.spoteam_android.ui.study.calendar.CalendarApiService
-import com.example.spoteam_android.ui.study.calendar.Event
-import com.example.spoteam_android.ui.study.calendar.ScheduleResponse
+import com.example.spoteam_android.domain.study.entity.BoardItem
+import com.example.spoteam_android.presentation.interestarea.ApiResponse
+import com.example.spoteam_android.presentation.interestarea.InterestVPAdapter
+import com.example.spoteam_android.presentation.interestarea.RecommendStudyApiService
+import com.example.spoteam_android.presentation.interestarea.RecruitingStudyApiService
+import com.example.spoteam_android.presentation.study.DetailStudyFragment
+import com.example.spoteam_android.presentation.study.StudyViewModel
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipDrawable
 import com.google.gson.Gson
@@ -52,7 +47,6 @@ class SearchFragment : Fragment() {
     private val maxRecentSearches = 10
     private val studyViewModel: StudyViewModel by activityViewModels()
     private lateinit var recommendBoardAdapter: InterestVPAdapter
-    private lateinit var studyApiService: StudyApiService
     private lateinit var recruitingStudyAdapter: InterestVPAdapter
     private lateinit var searchQueryDao: SearchQueryDao
     private val coroutineScope = MainScope()
@@ -66,7 +60,6 @@ class SearchFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         binding = FragmentSearchBinding.inflate(inflater, container,    false)
-        studyApiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
 
         binding.editTextSearch.requestFocus()
         binding.editTextSearch.post {
@@ -111,7 +104,8 @@ class SearchFragment : Fragment() {
                     data.introduction
                 )
 
-                val detailStudyFragment = DetailStudyFragment()
+                val detailStudyFragment =
+                    com.example.spoteam_android.presentation.study.DetailStudyFragment()
                 (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
                     ?.replace(R.id.main_frm, detailStudyFragment)
                     ?.addToBackStack(null)
@@ -136,7 +130,8 @@ class SearchFragment : Fragment() {
                     data.introduction
                 )
 
-                val detailStudyFragment = DetailStudyFragment()
+                val detailStudyFragment =
+                    com.example.spoteam_android.presentation.study.DetailStudyFragment()
                 (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
                     ?.replace(R.id.main_frm, detailStudyFragment)
                     ?.addToBackStack(null)
@@ -349,44 +344,24 @@ class SearchFragment : Fragment() {
             -1
         }
     }
-
     private fun toggleLikeStatus(studyItem: BoardItem, likeButton: ImageView) {
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val memberId = sharedPreferences.getInt("${sharedPreferences.getString("currentEmail", "")}_memberId", -1)
-
-        if (memberId != -1) {
-            studyApiService.toggleStudyLike(studyItem.studyId)
-                .enqueue(object : Callback<LikeResponse> {
-                    override fun onResponse(call: Call<LikeResponse>, response: Response<LikeResponse>) {
-                        if (response.isSuccessful) {
-                            response.body()?.let { likeResponse ->
-                                // 서버에서 반환된 상태에 따라 하트 아이콘 및 BoardItem의 liked 상태 업데이트
-                                val newStatus = likeResponse.result.status
-                                studyItem.liked = newStatus == "LIKE"
-                                val newIcon = if (studyItem.liked) R.drawable.ic_heart_filled else R.drawable.study_like
-                                likeButton.setImageResource(newIcon)
-
-                                // heartCount 즉시 증가 또는 감소
-                                studyItem.heartCount = if (studyItem.liked) studyItem.heartCount + 1 else studyItem.heartCount - 1
-
-                                // 변경된 항목을 어댑터에 알림
-                                val adapter = binding.recommendationBoard.adapter as InterestVPAdapter
-                                val position = adapter.dataList.indexOf(studyItem)
-                                if (position != -1) {
-                                    adapter.notifyItemChanged(position)
-                                }
-                            }
-                        } else {
-                            Toast.makeText(requireContext(), "찜 상태 업데이트 실패", Toast.LENGTH_SHORT).show()
-                        }
-                    }
-
-                    override fun onFailure(call: Call<LikeResponse>, t: Throwable) {
-                        Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
-                    }
-                })
-        } else {
-            Toast.makeText(requireContext(), "회원 정보를 불러올 수 없습니다.", Toast.LENGTH_SHORT).show()
+        val adapter = binding.recommendationBoard.adapter as InterestVPAdapter
+        studyViewModel.toggleLikeStatus(studyItem.studyId) { result ->
+            requireActivity().runOnUiThread {
+                result.onSuccess { liked ->
+                    studyItem.liked = liked
+                    studyItem.heartCount += if (liked) 1 else -1
+                    val icon = if (liked) R.drawable.ic_heart_filled else R.drawable.study_like
+                    likeButton.setImageResource(icon)
+
+                    // RecyclerView 갱신
+                    adapter.notifyItemChanged(
+                        adapter.dataList.indexOf(studyItem)
+                    )
+                }.onFailure {
+                    Toast.makeText(requireContext(), "찜 실패: ${it.message}", Toast.LENGTH_SHORT).show()
+                }
+            }
         }
     }
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchQuery.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/SearchQuery.kt
similarity index 83%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchQuery.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/SearchQuery.kt
index 35900193..4bb60335 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchQuery.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/SearchQuery.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.search
+package com.example.spoteam_android.presentation.search
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchQueryDao.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/SearchQueryDao.kt
similarity index 91%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchQueryDao.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/SearchQueryDao.kt
index 30c92c24..bdf4e9be 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchQueryDao.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/SearchQueryDao.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.search
+package com.example.spoteam_android.presentation.search
 
 import androidx.room.*
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchResultFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/SearchResultFragment.kt
similarity index 65%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchResultFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/SearchResultFragment.kt
index b0b138de..ef9bcacf 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchResultFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/SearchResultFragment.kt
@@ -1,10 +1,7 @@
-package com.example.spoteam_android.search
+package com.example.spoteam_android.presentation.search
 
-import StudyApiService
-import StudyViewModel
 import android.content.Context
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -13,23 +10,22 @@ import android.widget.ImageView
 import android.widget.Spinner
 import android.widget.TextView
 import android.widget.Toast
-import androidx.compose.runtime.key
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.BoardItem
-import com.example.spoteam_android.HouseFragment
-import com.example.spoteam_android.LikeResponse
+import com.example.spoteam_android.presentation.home.HomeFragment
 import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentSearchResultBinding
-import com.example.spoteam_android.ui.alert.AlertFragment
-import com.example.spoteam_android.ui.home.HomeFragment
-import com.example.spoteam_android.ui.interestarea.ApiResponse
-import com.example.spoteam_android.ui.interestarea.InterestFragment
-import com.example.spoteam_android.ui.interestarea.InterestVPAdapter
-import com.example.spoteam_android.ui.study.DetailStudyFragment
+import com.example.spoteam_android.domain.study.entity.BoardItem
+import com.example.spoteam_android.domain.study.entity.StudyDataResponse
+import com.example.spoteam_android.presentation.alert.AlertFragment
+import com.example.spoteam_android.presentation.interestarea.ApiResponse
+import com.example.spoteam_android.presentation.interestarea.InterestVPAdapter
+import com.example.spoteam_android.presentation.study.StudyViewModel
+import kotlinx.coroutines.launch
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -40,14 +36,12 @@ class SearchResultFragment : Fragment() {
     private lateinit var interestBoardAdapter: InterestVPAdapter
     private lateinit var binding: FragmentSearchResultBinding
     private val studyViewModel: StudyViewModel by activityViewModels()
-    private lateinit var studyApiService: StudyApiService
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
         binding = FragmentSearchResultBinding.inflate(inflater, container, false)
-        studyApiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
 
         interestBoardAdapter = InterestVPAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
             toggleLikeStatus(selectedItem, likeButton)
@@ -55,7 +49,7 @@ class SearchResultFragment : Fragment() {
 
         binding.spotLogo.setOnClickListener {
             (context as MainActivity).supportFragmentManager.beginTransaction()
-                .replace(R.id.main_frm, HouseFragment())
+                .replace(R.id.main_frm, HomeFragment())
                 .addToBackStack(null)
                 .commitAllowingStateLoss()
         }
@@ -69,7 +63,8 @@ class SearchResultFragment : Fragment() {
                     data.introduction
                 )
 
-                val detailStudyFragment = DetailStudyFragment()
+                val detailStudyFragment =
+                    com.example.spoteam_android.presentation.study.DetailStudyFragment()
                 (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
                     ?.replace(R.id.main_frm, detailStudyFragment)
                     ?.addToBackStack(null)
@@ -173,42 +168,22 @@ class SearchResultFragment : Fragment() {
     }
 
     private fun toggleLikeStatus(studyItem: BoardItem, likeButton: ImageView) {
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val memberId = sharedPreferences.getInt("${sharedPreferences.getString("currentEmail", "")}_memberId", -1)
-
-        if (memberId != -1) {
-            studyApiService.toggleStudyLike(studyItem.studyId)
-                .enqueue(object : Callback<LikeResponse> {
-                    override fun onResponse(call: Call<LikeResponse>, response: Response<LikeResponse>) {
-                        if (response.isSuccessful) {
-                            response.body()?.let { likeResponse ->
-                                // 서버에서 반환된 상태에 따라 하트 아이콘 및 BoardItem의 liked 상태 업데이트
-                                val newStatus = likeResponse.result.status
-                                studyItem.liked = newStatus == "LIKE"
-                                val newIcon = if (studyItem.liked) R.drawable.ic_heart_filled else R.drawable.study_like
-                                likeButton.setImageResource(newIcon)
-
-                                // heartCount 즉시 증가 또는 감소
-                                studyItem.heartCount = if (studyItem.liked) studyItem.heartCount + 1 else studyItem.heartCount - 1
-
-                                // 변경된 항목을 어댑터에 알림
-                                val adapter = binding.searchResultStudyReyclerview.adapter as InterestVPAdapter
-                                val position = adapter.dataList.indexOf(studyItem)
-                                if (position != -1) {
-                                    adapter.notifyItemChanged(position)
-                                }
-                            }
-                        } else {
-                            Toast.makeText(requireContext(), "찜 상태 업데이트 실패", Toast.LENGTH_SHORT).show()
-                        }
-                    }
-
-                    override fun onFailure(call: Call<LikeResponse>, t: Throwable) {
-                        Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
-                    }
-                })
-        } else {
-            Toast.makeText(requireContext(), "회원 정보를 불러올 수 없습니다.", Toast.LENGTH_SHORT).show()
+        studyViewModel.toggleLikeStatus(studyItem.studyId) { result ->
+            requireActivity().runOnUiThread {
+                result.onSuccess { liked ->
+                    studyItem.liked = liked
+                    studyItem.heartCount += if (liked) 1 else -1
+                    val icon = if (liked) R.drawable.ic_heart_filled else R.drawable.study_like
+                    likeButton.setImageResource(icon)
+
+                    // RecyclerView 갱신
+                    interestBoardAdapter.notifyItemChanged(
+                        interestBoardAdapter.dataList.indexOf(studyItem)
+                    )
+                }.onFailure {
+                    Toast.makeText(requireContext(), "찜 실패: ${it.message}", Toast.LENGTH_SHORT).show()
+                }
+            }
         }
     }
 }
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchStudyData.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/SearchStudyData.kt
similarity index 98%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchStudyData.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/SearchStudyData.kt
index 10a6a6b4..7c482808 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchStudyData.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/search/SearchStudyData.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.search
+package com.example.spoteam_android.presentation.search
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/ApplyStudyDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/ApplyStudyDialog.kt
new file mode 100644
index 00000000..aec37e12
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/ApplyStudyDialog.kt
@@ -0,0 +1,99 @@
+
+import android.app.Dialog
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.Window
+import android.widget.Button
+import android.widget.EditText
+import android.widget.ImageView
+import android.widget.Toast
+import com.example.spoteam_android.R
+import com.example.spoteam_android.presentation.study.DetailStudyFragment
+import dagger.hilt.android.qualifiers.ActivityContext
+import javax.inject.Inject
+
+class ApplyStudyDialog @Inject constructor(
+    @ActivityContext private val context: Context,
+    private val fragment: DetailStudyFragment
+) {
+
+    private val dlg = Dialog(context)
+
+    fun start(onMoveToHouseFragment: () -> Unit) {
+        dlg.requestWindowFeature(Window.FEATURE_NO_TITLE)
+        dlg.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+        dlg.setContentView(R.layout.dialog_apply_study)
+
+        val editText = dlg.findViewById<EditText>(R.id.fragment_introduce_studyname_et)
+        val btnMove = dlg.findViewById<Button>(R.id.dialog_complete_bt)
+        val closeIv: ImageView = dlg.findViewById(R.id.close_iv)
+
+        btnMove.isEnabled = false
+
+        editText.addTextChangedListener(object : TextWatcher {
+            override fun afterTextChanged(s: Editable?) {
+                btnMove.isEnabled = s?.isNotEmpty() == true
+            }
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+        })
+
+        btnMove.setOnClickListener {
+            val sharedPreferences = context.getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
+            val email = sharedPreferences.getString("currentEmail", null)
+            val memberId = sharedPreferences.getInt("${email}_memberId", -1)
+            val studyId = fragment.studyViewModel.studyId.value
+            val introduction = editText.text.toString()
+
+            if (memberId != -1 && studyId != null) {
+                val memberCount = fragment.studyViewModel.memberCount.value ?: 0
+                val maxPeople = fragment.studyViewModel.maxPeople.value ?: Int.MAX_VALUE
+
+                if (memberCount >= maxPeople) {
+                    Toast.makeText(context, "인원이 가득 찼습니다.", Toast.LENGTH_SHORT).show()
+                } else {
+                    fragment.studyViewModel.applyStudy(studyId, memberId, introduction) { success ->
+                        if (success) {
+                            dlg.dismiss()
+                            showCompleteDialog(onMoveToHouseFragment)
+                        } else {
+                            Toast.makeText(context, "스터디 신청에 실패했습니다.", Toast.LENGTH_SHORT).show()
+                        }
+                    }
+                }
+            } else {
+                Toast.makeText(context, "멤버 ID 또는 스터디 ID를 찾을 수 없습니다.", Toast.LENGTH_SHORT).show()
+            }
+        }
+
+        closeIv.setOnClickListener {
+            dlg.dismiss()
+        }
+
+        dlg.show()
+    }
+
+    private fun showCompleteDialog(onMoveToHouseFragment: () -> Unit) {
+        val secondDialog = Dialog(context)
+        secondDialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
+        secondDialog.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+        secondDialog.setContentView(R.layout.dialog_apply_complete_study)
+
+        val secondDialogButton = secondDialog.findViewById<Button>(R.id.dialog_complete_bt)
+        val secondCloseIV: ImageView = secondDialog.findViewById(R.id.close_iv)
+
+        secondDialogButton.setOnClickListener {
+            secondDialog.dismiss()
+            onMoveToHouseFragment()
+        }
+
+        secondCloseIV.setOnClickListener {
+            secondDialog.dismiss()
+        }
+
+        secondDialog.show()
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/CompleteScheduleDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/CompleteScheduleDialog.kt
similarity index 91%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/CompleteScheduleDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/CompleteScheduleDialog.kt
index 44ee21a5..185012bf 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/CompleteScheduleDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/CompleteScheduleDialog.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study
+package com.example.spoteam_android.presentation.study
 
 import android.content.Context
 import android.graphics.Color
@@ -25,7 +25,8 @@ class CompleteScheduleDialog (private val context: Context, private val startDat
         val btnMove = dlg.findViewById<Button>(R.id.dialog_complete_bt)
         btnMove.setOnClickListener {
             val transaction = fragmentManager.beginTransaction()
-            val detailStudyFragment = DetailStudyFragment()
+            val detailStudyFragment =
+                DetailStudyFragment()
 
             val args = Bundle()
             args.putInt("tab_position", 1)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DeleteStudyContentDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/DeleteStudyContentDialog.kt
similarity index 95%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DeleteStudyContentDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/DeleteStudyContentDialog.kt
index 87bf6ae6..6e66f184 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DeleteStudyContentDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/DeleteStudyContentDialog.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study
+package com.example.spoteam_android.presentation.study
 
 import android.content.Context
 import android.graphics.Color
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/DetailStudyFragment.kt
similarity index 51%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/DetailStudyFragment.kt
index 17d20baa..c63546ac 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/DetailStudyFragment.kt
@@ -1,49 +1,39 @@
-package com.example.spoteam_android.ui.study
+package com.example.spoteam_android.presentation.study
 
 import ApplyStudyDialog
-import StudyApiService
-import StudyViewModel
 import android.content.Context
-import android.content.SharedPreferences
 import android.graphics.drawable.GradientDrawable
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toast
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.viewpager2.widget.ViewPager2
 import com.bumptech.glide.Glide
-import com.example.spoteam_android.*
+import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.FragmentDetailStudyBinding
-import com.example.spoteam_android.ui.category.CategoryFragment_1
+import com.example.spoteam_android.presentation.category.CategoryFragment_1
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
+import dagger.hilt.android.AndroidEntryPoint
 
+@AndroidEntryPoint
 class DetailStudyFragment : Fragment() {
 
     private lateinit var binding: FragmentDetailStudyBinding
     private val tabList = arrayListOf("홈", "일정", "커뮤니티", "갤러리", "투두쉐어링")
     private var currentTabPosition: Int = 0
     private var startDateTime: String? = null
-    private var kakaoNickname: String? = null
 
-    val studyViewModel: StudyViewModel by activityViewModels()
+    // 접근 제한자 수정
+    internal val studyViewModel: StudyViewModel by activityViewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         currentTabPosition = arguments?.getInt("tab_position", 0) ?: 0
         startDateTime = arguments?.getString("startDateTime")
-
-        val sharedPreferences =
-            requireContext().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val currentEmail = sharedPreferences.getString("currentEmail", null)
-        kakaoNickname = sharedPreferences.getString("${currentEmail}_nickname", "Unknown")
     }
 
     override fun onCreateView(
@@ -58,14 +48,24 @@ class DetailStudyFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        studyViewModel.loadNickname()
         setupViews()
         setupViewPager()
         setupStudyObservers()
+        setProfileImageUri()
         tabMargin()
     }
 
     private fun setupViews() {
-        binding.fragmentDetailStudyUsernameTv.text = "$kakaoNickname" + "님"
+        studyViewModel.nickname.observe(viewLifecycleOwner) {
+            binding.fragmentDetailStudyUsernameTv.text = "${it}님"
+        }
+
+        studyViewModel.studyRequest.observe(viewLifecycleOwner) {
+            binding.fragmentDetailStudyTitleTv.text = it?.title ?: ""
+            binding.fragmentDetailStudyGoalTv.text = it?.goal ?: ""
+        }
+
 
         binding.fragmentDetailStudyPreviousBt.setOnClickListener {
             parentFragmentManager.popBackStack()
@@ -87,6 +87,27 @@ class DetailStudyFragment : Fragment() {
         })
     }
 
+    private fun setProfileImageUri() {
+        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
+        val email = sharedPreferences.getString("currentEmail", null)
+
+        if (email != null) {
+            val loginPlatform = sharedPreferences.getString("loginPlatform", null)
+            val profileImageUrl = if (!email.isNullOrEmpty() && !loginPlatform.isNullOrEmpty()) {
+                sharedPreferences.getString("${email}_${loginPlatform}ProfileImageUrl", null)
+            } else {
+                null
+            }
+            Glide.with(binding.root.context)
+                .load(profileImageUrl)
+                .error(R.drawable.fragment_calendar_spot_logo) // URL이 잘못되었거나 404일 경우 기본 이미지 사용
+                .fallback(R.drawable.fragment_calendar_spot_logo) // URL이 null일 경우 기본 이미지 사용
+                .into(binding.fragmentDetailStudyUserIv)
+
+        }
+    }
+
+
     private fun setupViewPager() {
         studyViewModel.studyId.value?.let { studyId ->
             val detailStudyAdapter = DetailStudyVPAdapter(this, studyId, startDateTime)
@@ -117,126 +138,11 @@ class DetailStudyFragment : Fragment() {
 
     private fun setupStudyObservers() {
         studyViewModel.studyId.observe(viewLifecycleOwner) { studyId ->
-            fetchStudyDetails(studyId)
-            fetchStudyMembers(studyId)
-            fetchIsApplied(studyId)
-        }
-    }
-
-    private fun fetchStudyDetails(studyId: Int) {
-        RetrofitInstance.retrofit.create(StudyApiService::class.java)
-            .getStudyDetails(studyId)
-            .enqueue(object : Callback<StudyDetailsResponse> {
-                override fun onResponse(
-                    call: Call<StudyDetailsResponse>,
-                    response: Response<StudyDetailsResponse>
-                ) {
-                    response.body()?.result?.let {
-                        studyViewModel.setMaxPeople(it.maxPeople)
-                        studyViewModel.setMemberCount(it.memberCount)
-                        updateUI(it)
-                    }
-                }
-
-                override fun onFailure(call: Call<StudyDetailsResponse>, t: Throwable) {
-                    Toast.makeText(requireContext(), "Error: ${t.message}", Toast.LENGTH_SHORT)
-                        .show()
-                }
+            studyViewModel.fetchStudyDetail(studyId)
+            studyViewModel.fetchStudyMembers(studyId, onResult = {})
+            studyViewModel.fetchIsApplied(studyId, onResult = { isApplied ->
+                updateRegisterButton(isApplied)
             })
-    }
-
-    private fun fetchStudyMembers(studyId: Int) {
-        val sharedPreferences =
-            requireContext().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val currentMemberId = sharedPreferences.getInt(
-            "${sharedPreferences.getString("currentEmail", "")}_memberId",
-            -1
-        )
-
-        RetrofitInstance.retrofit.create(StudyApiService::class.java)
-            .getStudyMembers(studyId)
-            .enqueue(object : Callback<MemberResponse> {
-                override fun onResponse(
-                    call: Call<MemberResponse>,
-                    response: Response<MemberResponse>
-                ) {
-                    val members = response.body()?.result?.members ?: emptyList()
-                    val isMember = members.any { it.memberId == currentMemberId }
-
-                    binding.fragmentDetailStudyFl.visibility =
-                        if (isMember) View.VISIBLE else View.GONE
-                    if (!isMember) binding.fragmentDetailStudyLl.setPadding(0, 50, 0, 50)
-
-                    val shouldHideButton = isMember || (studyViewModel.maxPeople.value != null &&
-                            studyViewModel.memberCount.value != null &&
-                            studyViewModel.memberCount.value!! >= studyViewModel.maxPeople.value!!)
-                    binding.fragmentDetailStudyHomeRegisterBt.visibility =
-                        if (shouldHideButton) View.GONE else View.VISIBLE
-                }
-
-                override fun onFailure(call: Call<MemberResponse>, t: Throwable) {
-                    Toast.makeText(requireContext(), "Error: ${t.message}", Toast.LENGTH_SHORT)
-                        .show()
-                }
-            })
-    }
-
-    private fun fetchIsApplied(studyId: Int) {
-        RetrofitInstance.retrofit.create(StudyApiService::class.java)
-            .getIsApplied(studyId)
-            .enqueue(object : Callback<IsAppliedResponse> {
-                override fun onResponse(
-                    call: Call<IsAppliedResponse>,
-                    response: Response<IsAppliedResponse>
-                ) {
-                    val isApplied = response.body()?.result?.applied ?: false
-                    updateRegisterButton(isApplied)
-                }
-
-                override fun onFailure(call: Call<IsAppliedResponse>, t: Throwable) {
-                    Toast.makeText(requireContext(), "Error: ${t.message}", Toast.LENGTH_SHORT)
-                        .show()
-                }
-            })
-    }
-
-    private fun updateUI(details: StudyDetailsResult) {
-        with(binding) {
-            fragmentDetailStudyTitleTv.text = details.studyName
-            fragmentDetailStudyGoalTv.text = details.goal
-            fragmentDetailStudyMemberTv.text =
-                getString(R.string.member_count_format, details.memberCount)
-            fragmentDetailStudyBookmarkTv.text =
-                getString(R.string.heart_count_format, details.heartCount)
-            fragmentDetailStudyViewTv.text = getString(
-                R.string.hit_num_format,
-                if (details.hitNum > 999) "999+" else details.hitNum.toString()
-            )
-            fragmentDetailStudyMemberMaxTv.text =
-                getString(R.string.max_people_format, details.maxPeople)
-            fragmentDetailStudyOnlineTv.text = if (details.isOnline) "온라인" else "오프라인"
-            fragmentDetailStudyFeeTv.text = if (details.fee > 0) "유료" else "무료"
-            fragmentDetailStudyAgeTv.text = "${details.maxAge}세 이하"
-            fragmentDetailStudyChipTv.text = details.themes.take(3).joinToString("/")
-
-            studyViewModel.setStudyOwner(details.studyOwner.ownerName)
-            val sharedPreferences =
-                requireContext().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-
-            val email = sharedPreferences.getString("currentEmail", null)
-            val loginPlatform = sharedPreferences.getString("loginPlatform", null)
-
-            val profileImageUrl = when (loginPlatform) {
-                "kakao" -> sharedPreferences.getString("${email}_kakaoProfileImageUrl", null)
-                "naver" -> sharedPreferences.getString("${email}_naverProfileImageUrl", null)
-                else -> R.drawable.fragment_calendar_spot_logo
-            }
-
-            Glide.with(this@DetailStudyFragment)
-                .load(profileImageUrl)
-                .error(R.drawable.fragment_calendar_spot_logo)
-                .fallback(R.drawable.fragment_calendar_spot_logo)
-                .into(binding.fragmentDetailStudyUserIv)
         }
     }
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyHomeAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/DetailStudyHomeAdapter.kt
similarity index 71%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyHomeAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/DetailStudyHomeAdapter.kt
index ffdbab78..d3ffb2c9 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyHomeAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/DetailStudyHomeAdapter.kt
@@ -5,11 +5,15 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.example.spoteam_android.databinding.ItemDetailFragmentSceduleRvBinding
 
-        class DetailStudyHomeAdapter(private val itemList: ArrayList<SceduleItem>) :
-            RecyclerView.Adapter<DetailStudyHomeAdapter.SceduleViewHolder>() {
-
-            override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SceduleViewHolder {
-                val binding = ItemDetailFragmentSceduleRvBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+class DetailStudyHomeAdapter(private val itemList: ArrayList<SceduleItem>) :
+    RecyclerView.Adapter<DetailStudyHomeAdapter.SceduleViewHolder>() {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SceduleViewHolder {
+        val binding = ItemDetailFragmentSceduleRvBinding.inflate(
+            LayoutInflater.from(parent.context),
+            parent,
+            false
+        )
         return SceduleViewHolder(binding)
     }
 
@@ -22,7 +26,8 @@ import com.example.spoteam_android.databinding.ItemDetailFragmentSceduleRvBindin
         return itemList.size
     }
 
-    inner class SceduleViewHolder(private val binding: ItemDetailFragmentSceduleRvBinding) : RecyclerView.ViewHolder(binding.root) {
+    inner class SceduleViewHolder(private val binding: ItemDetailFragmentSceduleRvBinding) :
+        RecyclerView.ViewHolder(binding.root) {
 
         fun bind(item: SceduleItem) {
             binding.itemDetailFragmentScheduleDdayTv.text = item.dday
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/DetailStudyHomeFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/DetailStudyHomeFragment.kt
new file mode 100644
index 00000000..f4ca408a
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/DetailStudyHomeFragment.kt
@@ -0,0 +1,171 @@
+package com.example.spoteam_android.presentation.study
+
+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.activityViewModels
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.spoteam_android.DetailStudyHomeAdapter
+import com.example.spoteam_android.ProfileItem
+import com.example.spoteam_android.SceduleItem
+import com.example.spoteam_android.databinding.FragmentDetailStudyHomeBinding
+import dagger.hilt.android.AndroidEntryPoint
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Locale
+
+@AndroidEntryPoint
+class DetailStudyHomeFragment : Fragment() {
+
+    private lateinit var binding: FragmentDetailStudyHomeBinding
+    private lateinit var profileAdapter: DetailStudyHomeProfileAdapter
+    private lateinit var scheduleAdapter: DetailStudyHomeAdapter
+    private val page = 0
+    private val size = 4
+
+    private var isMemberLoaded = false
+    private var isScheduleLoaded = false
+    private var isAnnounceLoaded = false
+
+    private val studyViewModel: StudyViewModel by activityViewModels()
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View {
+        binding = FragmentDetailStudyHomeBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupViews()
+
+        studyViewModel.studyId.observe(viewLifecycleOwner) { studyId ->
+            if (studyId != null) {
+                fetchStudySchedules(studyId)
+                fetchStudyMembers(studyId)
+                fetchRecentAnnounce(studyId)
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        binding.fragmentDetailStudyHomeProfileRv.viewTreeObserver.addOnGlobalLayoutListener {
+            binding.fragmentDetailStudyHomeProfileRv.requestLayout()
+            binding.fragmentDetailStudyHomeProfileRv.invalidate()
+        }
+        studyViewModel.studyId.value?.let { fetchStudyMembers(it) }
+    }
+
+    private fun setupViews() {
+        binding.fragmentDetailStudyHomeProfileRv.visibility = View.INVISIBLE
+        profileAdapter = DetailStudyHomeProfileAdapter(ArrayList(), null, false)
+        binding.fragmentDetailStudyHomeProfileRv.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
+        binding.fragmentDetailStudyHomeProfileRv.adapter = profileAdapter
+
+        scheduleAdapter = DetailStudyHomeAdapter(ArrayList())
+        binding.fragmentDetailStudyHomeScheduleRv.layoutManager = LinearLayoutManager(requireContext())
+        binding.fragmentDetailStudyHomeScheduleRv.adapter = scheduleAdapter
+
+        studyViewModel.studyIntroduction.observe(viewLifecycleOwner) {
+            binding.fragmentDetailStudyHomeIntroduceTv.text = it
+        }
+    }
+
+    private fun fetchStudyMembers(studyId: Int) {
+        studyViewModel.fetchStudyMembers(studyId) { response ->
+            val members = response?.members ?: emptyList()
+            profileAdapter.updateList(members.map {
+                ProfileItem(profileImage = it.profileImage, nickname = it.nickname)
+            })
+            isMemberLoaded = true
+            checkAndShowContent()
+        }
+    }
+
+    private fun fetchStudySchedules(studyId: Int) {
+        studyViewModel.fetchStudySchedules(studyId, page, size) { response ->
+            val schedules = response?.schedules ?: emptyList()
+            val now = Calendar.getInstance().time
+            val validSchedules = schedules.filter {
+                val startDate = parseDate(it.startedAt)
+                val endDate = parseDate(it.finishedAt)
+                (startDate != null && startDate.after(now)) || (endDate != null && endDate.after(now))
+            }
+            val nearestSchedules = validSchedules.sortedBy { it.startedAt }.take(2)
+            if (nearestSchedules.isEmpty()) {
+                binding.fragmentDetailStudyHomeScheduleRv.visibility = View.GONE
+            } else {
+                binding.fragmentDetailStudyHomeScheduleRv.visibility = View.VISIBLE
+                val scheduleItems = nearestSchedules.map {
+                    SceduleItem(
+                        dday = calculateDday(it.startedAt, it.finishedAt),
+                        day = formatDate(it.startedAt),
+                        scheduleContent = it.title,
+                        concreteTime = formatTime(it.startedAt),
+                        place = it.location
+                    )
+                }
+                scheduleAdapter.updateList(ArrayList(scheduleItems))
+            }
+            isScheduleLoaded = true
+            checkAndShowContent()
+        }
+    }
+
+    private fun fetchRecentAnnounce(studyId: Int) {
+        studyViewModel.fetchRecentAnnounce(studyId) { response ->
+            val title = response?.title
+            binding.fragmentDetailStudyHomeTitleTv.text = if (title.isNullOrEmpty()) "최근 공지가 없습니다" else title
+            isAnnounceLoaded = true
+            checkAndShowContent()
+        }
+    }
+
+    private fun parseDate(dateStr: String?): java.util.Date? {
+        return try {
+            SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.getDefault()).parse(dateStr ?: return null)
+        } catch (e: Exception) {
+            null
+        }
+    }
+
+    private fun formatDate(dateStr: String?): String {
+        val date = parseDate(dateStr) ?: return "N/A"
+        return SimpleDateFormat("M/d (EEE)", Locale.getDefault()).format(date)
+    }
+
+    private fun formatTime(dateStr: String?): String {
+        val date = parseDate(dateStr) ?: return "N/A"
+        return SimpleDateFormat("M/d h:mma", Locale.US).format(date)
+    }
+
+    private fun calculateDday(startedAt: String?, finishedAt: String?): String {
+        val startDate = parseDate(startedAt) ?: return "N/A"
+        val endDate = parseDate(finishedAt) ?: return "N/A"
+        val today = Calendar.getInstance().apply {
+            set(Calendar.HOUR_OF_DAY, 0)
+            set(Calendar.MINUTE, 0)
+            set(Calendar.SECOND, 0)
+            set(Calendar.MILLISECOND, 0)
+        }.time
+
+        return when {
+            today.before(startDate) -> "D-${((startDate.time - today.time) / (1000 * 60 * 60 * 24)).toInt()}"
+            today in startDate..endDate -> "D-day"
+            else -> "D+${((today.time - endDate.time) / (1000 * 60 * 60 * 24)).toInt()}"
+        }
+    }
+
+    private fun checkAndShowContent() {
+        if (isMemberLoaded && isScheduleLoaded && isAnnounceLoaded) {
+            binding.root.visibility = View.VISIBLE
+            binding.fragmentDetailStudyHomeProfileRv.visibility = View.VISIBLE
+            binding.fragmentDetailStudyHomeScheduleRv.visibility = View.VISIBLE
+        }
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyHomeProfileAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/DetailStudyHomeProfileAdapter.kt
similarity index 99%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyHomeProfileAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/DetailStudyHomeProfileAdapter.kt
index cd53ccd3..0e4bd751 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyHomeProfileAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/DetailStudyHomeProfileAdapter.kt
@@ -1,5 +1,5 @@
 
-package com.example.spoteam_android.ui.study
+package com.example.spoteam_android.presentation.study
 
 import android.content.res.ColorStateList
 import android.util.Log
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyVPAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/DetailStudyVPAdapter.kt
similarity index 80%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyVPAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/DetailStudyVPAdapter.kt
index ff491de8..589907f9 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyVPAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/DetailStudyVPAdapter.kt
@@ -1,12 +1,11 @@
-package com.example.spoteam_android.ui.study
+package com.example.spoteam_android.presentation.study
 
 import android.os.Bundle
 import android.provider.Settings.Global.putInt
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.example.spoteam_android.ui.study.todolist.TodoListFragment
-import com.example.spoteam_android.ui.study.calendar.CalendarFragment
-import com.example.spoteam_android.ui.home.HomeFragment
+import com.example.spoteam_android.presentation.study.calendar.CalendarFragment
+import com.example.spoteam_android.presentation.study.todolist.TodoListFragment
 
 class DetailStudyVPAdapter(fragment: Fragment, private val studyId: Int, private val startDateTime: String?) : FragmentStateAdapter(fragment) {
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/FailedDeleteStudyContentDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/FailedDeleteStudyContentDialog.kt
similarity index 94%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/FailedDeleteStudyContentDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/FailedDeleteStudyContentDialog.kt
index 70821e11..2bbea77c 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/FailedDeleteStudyContentDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/FailedDeleteStudyContentDialog.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study
+package com.example.spoteam_android.presentation.study
 
 import android.content.Context
 import android.graphics.Color
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyCommunityFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyCommunityFragment.kt
similarity index 93%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyCommunityFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyCommunityFragment.kt
index f721eef1..8b2e687a 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyCommunityFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyCommunityFragment.kt
@@ -1,6 +1,5 @@
-package com.example.spoteam_android.ui.study
+package com.example.spoteam_android.presentation.study
 
-import StudyViewModel
 import android.content.Intent
 import android.graphics.PorterDuff
 import android.os.Bundle
@@ -14,6 +13,11 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentMystudyCommunityBinding
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.PostDetail
+import com.example.spoteam_android.presentation.community.StudyContentLikeResponse
+import com.example.spoteam_android.presentation.community.StudyContentUnLikeResponse
+import com.example.spoteam_android.presentation.community.StudyPostListResponse
 import com.example.spoteam_android.ui.community.*
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import retrofit2.Call
@@ -108,7 +112,7 @@ class MyStudyCommunityFragment : Fragment() {
                 override fun onResponse(call: Call<StudyPostListResponse>, response: Response<StudyPostListResponse>) {
                     if (response.isSuccessful) {
                         val body = response.body()
-                        if (body?.isSuccess == "true") {
+                        if (body?.isSuccess == true) {
                             val posts = body.result.posts
                             itemList.clear()
                             itemList.addAll(posts)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyContentCommentMultiViewRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyContentCommentMultiViewRVAdapter.kt
similarity index 98%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyContentCommentMultiViewRVAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyContentCommentMultiViewRVAdapter.kt
index 46b49180..ed249b95 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyContentCommentMultiViewRVAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyContentCommentMultiViewRVAdapter.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study
+package com.example.spoteam_android.presentation.study
 
 import android.view.LayoutInflater
 import android.view.View
@@ -9,7 +9,7 @@ import com.bumptech.glide.Glide
 import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.ItemContentCommentBinding
 import com.example.spoteam_android.databinding.ItemContentCommentReplyBinding
-import com.example.spoteam_android.ui.community.StudyPostContentCommentDetail
+import com.example.spoteam_android.presentation.community.StudyPostContentCommentDetail
 
 data class CommentItem(
     val commentDetail: StudyPostContentCommentDetail,
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyEditContentFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyEditContentFragment.kt
similarity index 96%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyEditContentFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyEditContentFragment.kt
index 1e71875c..9393cdca 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyEditContentFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyEditContentFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study
+package com.example.spoteam_android.presentation.study
 
 import android.app.Activity
 import android.content.Intent
@@ -22,10 +22,10 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentMystudyWriteContentBinding
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.community.StudyPostContentInfo
-import com.example.spoteam_android.ui.community.StudyPostContentResponse
-import com.example.spoteam_android.ui.community.StudyPostResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.StudyPostContentInfo
+import com.example.spoteam_android.presentation.community.StudyPostContentResponse
+import com.example.spoteam_android.presentation.community.StudyPostResponse
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import kotlinx.coroutines.launch
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
@@ -160,7 +160,7 @@ class MyStudyEditContentFragment : BottomSheetDialogFragment(), AdapterView.OnIt
                 ) {
                     if (response.isSuccessful) {
                         val contentResponse = response.body()
-                        if (contentResponse?.isSuccess == "true") {
+                        if (contentResponse?.isSuccess == true) {
                             val contentInfo = contentResponse.result
                             currentAnnouncement = contentInfo.isAnnouncement
 
@@ -362,7 +362,7 @@ class MyStudyEditContentFragment : BottomSheetDialogFragment(), AdapterView.OnIt
             existingImage
         ).enqueue(object : Callback<StudyPostResponse> {
             override fun onResponse(call: Call<StudyPostResponse>, response: Response<StudyPostResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     val writeContentResponseBody = response.body()!!.result
 //                    showLog(writeContentResponseBody.toString())
                     dismiss()
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyGalleryFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyGalleryFragment.kt
similarity index 56%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyGalleryFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyGalleryFragment.kt
index 4fc6172e..ef7054b8 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyGalleryFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyGalleryFragment.kt
@@ -1,7 +1,5 @@
-package com.example.spoteam_android.ui.study
+package com.example.spoteam_android.presentation.study
 
-import StudyApiService
-import StudyViewModel
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
@@ -11,17 +9,15 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
-import com.example.spoteam_android.GalleryItems
-import com.example.spoteam_android.GalleryResponse
-import com.example.spoteam_android.MainActivity
 import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentMystudyGalleryBinding
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
+import com.example.spoteam_android.domain.study.entity.ImageResponse
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
 
+@AndroidEntryPoint
 class MyStudyGalleryFragment : Fragment() {
 
     private lateinit var binding: FragmentMystudyGalleryBinding
@@ -32,22 +28,15 @@ class MyStudyGalleryFragment : Fragment() {
     private var startPage = 0
     private val studyViewModel: StudyViewModel by activityViewModels()
 
-    // Retrofit API Service
-    private lateinit var studyApiService: StudyApiService
-
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
         binding = FragmentMystudyGalleryBinding.inflate(inflater, container, false)
 
-        // API 서비스 초기화
-        studyApiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-
         // RecyclerView 설정
         binding.communityCategoryContentRv.layoutManager = GridLayoutManager(context, 3)
 
-        // StudyViewModel을 통해 studyId 가져오기
         studyViewModel.studyId.observe(viewLifecycleOwner) { studyId ->
             if (studyId != null && studyId != 0) {
                 currentStudyId = studyId
@@ -57,6 +46,7 @@ class MyStudyGalleryFragment : Fragment() {
                 showNoImagesText()
             }
         }
+
         val pageButtons = listOf(
             binding.page1,
             binding.page2,
@@ -76,8 +66,6 @@ class MyStudyGalleryFragment : Fragment() {
             }
         }
 
-
-        // 페이지 버튼 설정
         binding.previousPage.setOnClickListener {
             if (currentPage > 0) {
                 currentPage--
@@ -96,77 +84,47 @@ class MyStudyGalleryFragment : Fragment() {
     }
 
     private fun fetchGalleryImages() {
-        val call = studyApiService.getStudyImages(currentStudyId, currentPage, limit)
-        call.enqueue(object : Callback<GalleryResponse> {
-            override fun onResponse(call: Call<GalleryResponse>, response: Response<GalleryResponse>) {
-                if (response.isSuccessful) {
-                    response.body()?.let { galleryResponse ->
-                        val result = galleryResponse.result
-                        val images = result?.images ?: emptyList()
-
-                        if (images.isNotEmpty()) {
-                            val adapter = MyStudyGalleryFragmentRVAdapter(images)
-                            binding.communityCategoryContentRv.adapter = adapter
-
-                            adapter.itemClick = object : MyStudyGalleryFragmentRVAdapter.ItemClick {
-                                override fun onItemClick(data: GalleryItems) {
-                                    val intent = Intent(requireContext(), MyStudyPostContentActivity::class.java)
-                                    intent.putExtra("myStudyId", currentStudyId.toString())
-                                    intent.putExtra("myStudyPostId", data.postId.toString())
-                                    startActivity(intent)
-                                }
-                            }
-
-                            showGallery()
-                            checkNextPageAvailable()
-                        } else {
-                            showNoImagesText()
-                            updatePageUI(false)
+        lifecycleScope.launch {
+            val result = studyViewModel.getStudyImages(currentStudyId, currentPage, limit)
+            result.onSuccess { imageResponse ->
+                val images = imageResponse.images
+                if (images.isNotEmpty()) {
+                    val adapter = MyStudyGalleryFragmentRVAdapter(images)
+                    binding.communityCategoryContentRv.adapter = adapter
+
+                    adapter.itemClick = object : MyStudyGalleryFragmentRVAdapter.ItemClick {
+                        override fun onItemClick(data: ImageResponse.ImagesInfo) {
+                            val intent = Intent(requireContext(), MyStudyPostContentActivity::class.java)
+                            intent.putExtra("myStudyId", currentStudyId.toString())
+                            intent.putExtra("myStudyPostId", data.postId.toString())
+                            startActivity(intent)
                         }
-                    } ?: run {
-                        Log.e("MyStudyGalleryFragment", "GalleryResponse is null")
-                        showNoImagesText()
-                        updatePageUI(false)
                     }
+
+                    showGallery()
+                    checkNextPageAvailable()
                 } else {
-                    Log.e("MyStudyGalleryFragment", "Failed to load images: ${response.code()}")
-                    Toast.makeText(context, "Failed to load images", Toast.LENGTH_SHORT).show()
                     showNoImagesText()
                     updatePageUI(false)
                 }
-            }
-
-            override fun onFailure(call: Call<GalleryResponse>, t: Throwable) {
-                Log.e("MyStudyGalleryFragment", "Failed to load images: ${t.message}")
-                Toast.makeText(context, "Failed to load images: ${t.message}", Toast.LENGTH_SHORT).show()
+            }.onFailure {
+                Log.e("MyStudyGalleryFragment", "Failed to load images: ${it.message}")
+                Toast.makeText(context, "Failed to load images", Toast.LENGTH_SHORT).show()
                 showNoImagesText()
                 updatePageUI(false)
             }
-        })
-    }
-
-    override fun onResume() {
-        super.onResume()
-        fetchGalleryImages()
+        }
     }
 
     private fun checkNextPageAvailable() {
-        val call = studyApiService.getStudyImages(currentStudyId, nextPage, limit)
-        call.enqueue(object : Callback<GalleryResponse> {
-            override fun onResponse(call: Call<GalleryResponse>, response: Response<GalleryResponse>) {
-                val hasNext = response.body()?.result?.images?.isNotEmpty() == true
-                binding.nextPage.isEnabled = hasNext
-                updatePageUI(hasNext)
-            }
-
-            override fun onFailure(call: Call<GalleryResponse>, t: Throwable) {
-                binding.nextPage.isEnabled = false
-                updatePageUI(false)
-            }
-        })
+        lifecycleScope.launch {
+            val result = studyViewModel.getStudyImages(currentStudyId, nextPage, limit)
+            val hasNext = result.getOrNull()?.images?.isNotEmpty() == true
+            binding.nextPage.isEnabled = hasNext
+            updatePageUI(hasNext)
+        }
     }
 
-
     private fun showGallery() {
         binding.communityCategoryContentRv.visibility = View.VISIBLE
         binding.noImagesText.visibility = View.GONE
@@ -210,4 +168,4 @@ class MyStudyGalleryFragment : Fragment() {
 
         binding.previousPage.isEnabled = currentPage > 0
     }
-}
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyGalleryFragmentRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyGalleryFragmentRVAdapter.kt
similarity index 82%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyGalleryFragmentRVAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyGalleryFragmentRVAdapter.kt
index 205ab4e8..0af12a70 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyGalleryFragmentRVAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyGalleryFragmentRVAdapter.kt
@@ -1,19 +1,18 @@
-package com.example.spoteam_android.ui.study
+package com.example.spoteam_android.presentation.study
 
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
-import com.example.spoteam_android.GalleryItems
 import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.ItemGalleryPictureBinding
-import com.example.spoteam_android.ui.community.contentComment.ContentCommentMultiViewRVAdapter.ItemClick
+import com.example.spoteam_android.domain.study.entity.ImageResponse
 
-class MyStudyGalleryFragmentRVAdapter(private val dataList: List<GalleryItems>) : RecyclerView.Adapter<MyStudyGalleryFragmentRVAdapter.ViewHolder>() {
+class MyStudyGalleryFragmentRVAdapter(private val dataList: List<ImageResponse.ImagesInfo>) : RecyclerView.Adapter<MyStudyGalleryFragmentRVAdapter.ViewHolder>() {
 
     interface ItemClick {
-        fun onItemClick(data : GalleryItems)
+        fun onItemClick(data : ImageResponse.ImagesInfo)
     }
 
     var itemClick: ItemClick? = null
@@ -44,7 +43,7 @@ class MyStudyGalleryFragmentRVAdapter(private val dataList: List<GalleryItems>)
     }
 
     inner class ViewHolder(private val binding: ItemGalleryPictureBinding) : RecyclerView.ViewHolder(binding.root) {
-        fun bind(data: GalleryItems) {
+        fun bind(data: ImageResponse.ImagesInfo) {
             // Glide를 사용해 이미지를 로드
             Glide.with(binding.root.context)
                 .load(data.imageUrl)  // 이미지 URL // 로딩 중에 표시할 플레이스홀더 이미지
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyPostContentActivity.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyPostContentActivity.kt
similarity index 93%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyPostContentActivity.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyPostContentActivity.kt
index cb7b2e32..9987103a 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyPostContentActivity.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyPostContentActivity.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study
+package com.example.spoteam_android.presentation.study
 
 import StudyContentImageRVAdapter
 import android.content.Context
@@ -25,24 +25,23 @@ import com.bumptech.glide.Glide
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.ActivityCommunityContentBinding
-import com.example.spoteam_android.databinding.ActivityMystudyCommunityContentBinding
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.community.DeleteStudyPostContentResponse
-import com.example.spoteam_android.ui.community.DisLikeCommentResponse
-import com.example.spoteam_android.ui.community.LikeCommentResponse
-import com.example.spoteam_android.ui.community.PostImages
-import com.example.spoteam_android.ui.community.ReportContentDialog
-import com.example.spoteam_android.ui.community.ReportStudyPostResponse
-import com.example.spoteam_android.ui.community.StudyContentLikeResponse
-import com.example.spoteam_android.ui.community.StudyContentUnLikeResponse
-import com.example.spoteam_android.ui.community.StudyPostContentCommentDetail
-import com.example.spoteam_android.ui.community.StudyPostContentCommentResponse
-import com.example.spoteam_android.ui.community.StudyPostContentInfo
-import com.example.spoteam_android.ui.community.StudyPostContentResponse
-import com.example.spoteam_android.ui.community.UnDisLikeCommentResponse
-import com.example.spoteam_android.ui.community.UnLikeCommentResponse
-import com.example.spoteam_android.ui.community.WriteStudyCommentRequest
-import com.example.spoteam_android.ui.community.WriteStudyCommentResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.DeleteStudyPostContentResponse
+import com.example.spoteam_android.presentation.community.DisLikeCommentResponse
+import com.example.spoteam_android.presentation.community.LikeCommentResponse
+import com.example.spoteam_android.presentation.community.PostImages
+import com.example.spoteam_android.presentation.community.ReportContentDialog
+import com.example.spoteam_android.presentation.community.ReportStudyPostResponse
+import com.example.spoteam_android.presentation.community.StudyContentLikeResponse
+import com.example.spoteam_android.presentation.community.StudyContentUnLikeResponse
+import com.example.spoteam_android.presentation.community.StudyPostContentCommentDetail
+import com.example.spoteam_android.presentation.community.StudyPostContentCommentResponse
+import com.example.spoteam_android.presentation.community.StudyPostContentInfo
+import com.example.spoteam_android.presentation.community.StudyPostContentResponse
+import com.example.spoteam_android.presentation.community.UnDisLikeCommentResponse
+import com.example.spoteam_android.presentation.community.UnLikeCommentResponse
+import com.example.spoteam_android.presentation.community.WriteStudyCommentRequest
+import com.example.spoteam_android.presentation.community.WriteStudyCommentResponse
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import retrofit2.Call
 import retrofit2.Callback
@@ -186,7 +185,7 @@ class MyStudyPostContentActivity : AppCompatActivity() {
                     if (response.isSuccessful) {
                         val likeResponse = response.body()
                         Log.d("StudyLikeContent", "responseBody: ${likeResponse?.isSuccess}")
-                        if (likeResponse?.isSuccess == "true") {
+                        if (likeResponse?.isSuccess == true) {
                             fetchContentInfo()
                         } else {
                             showError(likeResponse?.message)
@@ -214,7 +213,7 @@ class MyStudyPostContentActivity : AppCompatActivity() {
                     if (response.isSuccessful) {
                         val unLikeResponse = response.body()
                         Log.d("StudyUnLikeContent", "responseBody: ${unLikeResponse?.isSuccess}")
-                        if (unLikeResponse?.isSuccess == "true") {
+                        if (unLikeResponse?.isSuccess == true) {
                             fetchContentInfo()
                         } else {
                             showError(unLikeResponse?.message)
@@ -254,7 +253,7 @@ class MyStudyPostContentActivity : AppCompatActivity() {
                 override fun onResponse(
                     call: Call<WriteStudyCommentResponse>,
                     response: Response<WriteStudyCommentResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         Log.d("MyStudyWriteComment", "${response.body()!!.result}")
                         binding.writeCommentContentEt.text.clear()
                         binding.writeCommentContentEt.clearFocus()
@@ -299,7 +298,7 @@ class MyStudyPostContentActivity : AppCompatActivity() {
                 override fun onResponse(
                     call: Call<WriteStudyCommentResponse>,
                     response: Response<WriteStudyCommentResponse>) {
-                    if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                    if (response.isSuccessful && response.body()?.isSuccess == true) {
                         Log.d("MyStudyWriteComment", "${response.body()!!.result}")
                         parentCommentId = 0 // postCommentID 초기화
                         binding.writeCommentContentEt.text.clear()
@@ -402,7 +401,7 @@ class MyStudyPostContentActivity : AppCompatActivity() {
                 ) {
                     if (response.isSuccessful) {
                         val deletePostResponse = response.body()
-                        if (deletePostResponse?.isSuccess == "true") {
+                        if (deletePostResponse?.isSuccess == true) {
                             showSuccessDeleteDialog(view, fragmentManager)
 
                         } else {
@@ -420,7 +419,8 @@ class MyStudyPostContentActivity : AppCompatActivity() {
     }
 
     private fun showFailedDeleteDialog(view: View, fragmentManager: FragmentManager) {
-        val failedDeletePost = FailedDeleteStudyContentDialog(view.context)
+        val failedDeletePost =
+            com.example.spoteam_android.presentation.study.FailedDeleteStudyContentDialog(view.context)
         failedDeletePost.start(fragmentManager)
     }
 
@@ -440,7 +440,7 @@ class MyStudyPostContentActivity : AppCompatActivity() {
 
                     if (response.isSuccessful) {
                         val postContentResponse = response.body()
-                        if (postContentResponse?.isSuccess == "true") {
+                        if (postContentResponse?.isSuccess == true) {
                             val postContent = postContentResponse.result
                             Log.d("ReportedStudyPost", "response: ${postContent.title}")
                             val reportContentDialog = ReportContentDialog(view.context, fragmentManager)
@@ -470,7 +470,7 @@ class MyStudyPostContentActivity : AppCompatActivity() {
 
                     if (response.isSuccessful) {
                         val postContentResponse = response.body()
-                        if (postContentResponse?.isSuccess == "true") {
+                        if (postContentResponse?.isSuccess == true) {
                             val postContent = postContentResponse.result
                             Log.d("MyStudyContent", "response: ${postContent}")
                             if(postContent.studyPostImages.isEmpty()) {
@@ -505,7 +505,7 @@ class MyStudyPostContentActivity : AppCompatActivity() {
                     Log.d("MyStudyContentComment", "response: ${response.isSuccessful}")
                     if (response.isSuccessful) {
                         val postCommentResponse = response.body()
-                        if (postCommentResponse?.isSuccess == "true") {
+                        if (postCommentResponse?.isSuccess == true) {
                             val commentInfo = postCommentResponse.result.comments
                             initMultiViewRecyclerView(commentInfo)
                         } else {
@@ -534,7 +534,7 @@ class MyStudyPostContentActivity : AppCompatActivity() {
                     if (response.isSuccessful) {
                         val likeResponse = response.body()
                         Log.d("LikeComment", "responseBody: ${likeResponse?.isSuccess}")
-                        if (likeResponse?.isSuccess == "true") {
+                        if (likeResponse?.isSuccess == true) {
                             fetchContentInfo()
                             fetchContentCommentInfo()
                         } else {
@@ -563,7 +563,7 @@ class MyStudyPostContentActivity : AppCompatActivity() {
                     if (response.isSuccessful) {
                         val unLikeResponse = response.body()
                         Log.d("UnLikeComment", "responseBody: ${unLikeResponse?.isSuccess}")
-                        if (unLikeResponse?.isSuccess == "true") {
+                        if (unLikeResponse?.isSuccess == true) {
                             fetchContentInfo()
                             fetchContentCommentInfo()
                         } else {
@@ -592,7 +592,7 @@ class MyStudyPostContentActivity : AppCompatActivity() {
                     if (response.isSuccessful) {
                         val likeResponse = response.body()
                         Log.d("DisLikeComment", "responseBody: ${likeResponse?.isSuccess}")
-                        if (likeResponse?.isSuccess == "true") {
+                        if (likeResponse?.isSuccess == true) {
                             fetchContentInfo()
                             fetchContentCommentInfo()
                         } else {
@@ -621,7 +621,7 @@ class MyStudyPostContentActivity : AppCompatActivity() {
                     if (response.isSuccessful) {
                         val unLikeResponse = response.body()
                         Log.d("UnDisLikeComment", "responseBody: ${unLikeResponse?.isSuccess}")
-                        if (unLikeResponse?.isSuccess == "true") {
+                        if (unLikeResponse?.isSuccess == true) {
                             fetchContentInfo()
                             fetchContentCommentInfo()
                         } else {
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyPostRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyPostRVAdapter.kt
similarity index 98%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyPostRVAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyPostRVAdapter.kt
index be8779f9..86a9d1f8 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyPostRVAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyPostRVAdapter.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study
+package com.example.spoteam_android.presentation.study
 
 import android.view.LayoutInflater
 import android.view.View
@@ -9,7 +9,7 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.ItemMystudyCommunityContentBinding
-import com.example.spoteam_android.ui.community.PostDetail
+import com.example.spoteam_android.presentation.community.PostDetail
 import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.*
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyWriteContentFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyWriteContentFragment.kt
similarity index 97%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyWriteContentFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyWriteContentFragment.kt
index 67462137..d9d58d80 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyWriteContentFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/MyStudyWriteContentFragment.kt
@@ -1,6 +1,5 @@
-package com.example.spoteam_android.ui.study
+package com.example.spoteam_android.presentation.study
 
-import StudyViewModel
 import android.app.Activity
 import android.content.Intent
 import android.graphics.PorterDuff
@@ -18,14 +17,13 @@ import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.ContextCompat
-import androidx.databinding.adapters.AutoCompleteTextViewBindingAdapter
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentMystudyWriteContentBinding
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.community.StudyPostResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.StudyPostResponse
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.MultipartBody
@@ -258,7 +256,7 @@ class MyStudyWriteContentFragment : BottomSheetDialogFragment(), AdapterView.OnI
             existingImage
         ).enqueue(object : Callback<StudyPostResponse> {
             override fun onResponse(call: Call<StudyPostResponse>, response: Response<StudyPostResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == "true") {
+                if (response.isSuccessful && response.body()?.isSuccess == true) {
                     val writeContentResponseBody = response.body()!!.result
                     dismiss()
                     val intent = Intent(requireContext(), MyStudyPostContentActivity::class.java)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/OnItemClickListener.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/OnItemClickListener.kt
similarity index 100%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/OnItemClickListener.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/OnItemClickListener.kt
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/ReportStudyContentDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/ReportStudyContentDialog.kt
similarity index 94%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/ReportStudyContentDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/ReportStudyContentDialog.kt
index b6793764..935ddf1a 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/ReportStudyContentDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/ReportStudyContentDialog.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study
+package com.example.spoteam_android.presentation.study
 
 import android.content.Context
 import android.graphics.Color
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/StudyAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/StudyAdapter.kt
new file mode 100644
index 00000000..3351cb34
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/StudyAdapter.kt
@@ -0,0 +1,63 @@
+package com.example.spoteam_android.presentation.study.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.example.spoteam_android.R
+import com.example.spoteam_android.databinding.ItemRecyclerViewBinding
+import com.example.spoteam_android.domain.study.entity.StudyDataResponse
+
+class StudyAdapter(
+    initialItems: List<StudyDataResponse.StudyContent>,
+    private val onItemClick: (StudyDataResponse.StudyContent) -> Unit,
+    private val onLikeClick: (StudyDataResponse.StudyContent, ImageView) -> Unit,
+) : RecyclerView.Adapter<StudyAdapter.StudyViewHolder>() {
+
+    private val itemList = ArrayList<StudyDataResponse.StudyContent>().apply {
+        addAll(initialItems)
+    }
+
+    override fun getItemCount(): Int = itemList.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): StudyViewHolder {
+        val binding = ItemRecyclerViewBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return StudyViewHolder(binding)
+    }
+
+    override fun onBindViewHolder(holder: StudyViewHolder, position: Int) {
+        val item = itemList[position]
+        holder.bind(item)
+        holder.itemView.setOnClickListener { onItemClick(item) }
+        holder.likeButton.setOnClickListener { onLikeClick(item, holder.likeButton) }
+    }
+
+    inner class StudyViewHolder(private val binding: ItemRecyclerViewBinding) : RecyclerView.ViewHolder(binding.root) {
+        val likeButton: ImageView = binding.heartCountIv
+
+        fun bind(item: StudyDataResponse.StudyContent) {
+            binding.tvTime.text = item.title
+            binding.tvTitle.text = item.goal
+            binding.tvName.text = item.maxPeople.toString()
+            binding.tvName2.text = item.memberCount.toString()
+            binding.tvName3.text = item.heartCount.toString()
+            binding.tvName4.text = item.hitNum.toString()
+
+            Glide.with(binding.root.context)
+                .load(item.imageUrl)
+                .error(R.drawable.fragment_calendar_spot_logo)
+                .fallback(R.drawable.fragment_calendar_spot_logo)
+                .into(binding.ImageView4)
+
+            val heartIcon = if (item.liked) R.drawable.ic_heart_filled else R.drawable.study_like
+            binding.heartCountIv.setImageResource(heartIcon)
+        }
+    }
+
+    fun updateList(newList: List<StudyDataResponse.StudyContent>) {
+        itemList.clear()
+        itemList.addAll(newList)
+        notifyDataSetChanged()
+    }
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyContentImageRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/StudyContentImageRVAdapter.kt
similarity index 94%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyContentImageRVAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/StudyContentImageRVAdapter.kt
index dbe298d6..dd57bde0 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyContentImageRVAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/StudyContentImageRVAdapter.kt
@@ -5,7 +5,7 @@ import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.example.spoteam_android.R
-import com.example.spoteam_android.ui.community.PostImages
+import com.example.spoteam_android.presentation.community.PostImages
 
 class StudyContentImageRVAdapter(private val images: List<PostImages>) :
     RecyclerView.Adapter<StudyContentImageRVAdapter.ImageViewHolder>() {
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/StudyFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/StudyFragment.kt
new file mode 100644
index 00000000..fd064082
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/StudyFragment.kt
@@ -0,0 +1,169 @@
+package com.example.spoteam_android.presentation.study
+
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.spoteam_android.R
+import com.example.spoteam_android.databinding.FragmentStudyBinding
+import com.example.spoteam_android.domain.study.entity.StudyDataResponse
+import com.example.spoteam_android.presentation.study.adapter.StudyAdapter
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class StudyFragment : Fragment() {
+
+    private var _binding: FragmentStudyBinding? = null
+    private val binding get() = _binding!!
+
+    private lateinit var studyAdapter: StudyAdapter
+    private var itemList = ArrayList<StudyDataResponse.StudyContent>()
+
+    private var currentPage = 0
+    private val size = 5
+    private var totalPages = 0
+    private var startPage = 0
+
+    private lateinit var pageTextViews: List<TextView>
+
+    private val studyViewModel: StudyViewModel by activityViewModels()
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentStudyBinding.inflate(inflater, container, false)
+
+        binding.prevIv.setOnClickListener {
+            parentFragmentManager.popBackStack()
+        }
+
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        studyAdapter = StudyAdapter(
+            itemList,
+            onItemClick = { selectedItem ->
+                studyViewModel.setStudyData(
+                    selectedItem.studyId,
+                    selectedItem.imageUrl,
+                    selectedItem.introduction
+                )
+                parentFragmentManager.beginTransaction()
+                    .replace(R.id.main_frm, DetailStudyFragment())
+                    .addToBackStack(null)
+                    .commit()
+            },
+            onLikeClick = { selectedItem, likeButton ->
+                studyViewModel.toggleLikeStatus(selectedItem.studyId) { result ->
+                    result.onSuccess { liked ->
+                        selectedItem.liked = liked
+                        val newIcon = if (liked) R.drawable.ic_heart_filled else R.drawable.study_like
+                        likeButton.setImageResource(newIcon)
+                        selectedItem.heartCount += if (liked) 1 else -1
+                        studyAdapter.notifyItemChanged(itemList.indexOf(selectedItem))
+                    }.onFailure {
+                        Toast.makeText(requireContext(), "찜 실패: ${it.message}", Toast.LENGTH_SHORT).show()
+                    }
+                }
+            },
+        )
+
+        binding.fragmentStudyRv.apply {
+            adapter = studyAdapter
+            layoutManager = LinearLayoutManager(requireContext())
+        }
+
+        initPaginationControls()
+        fetchStudyData()
+    }
+
+    private fun initPaginationControls() {
+        pageTextViews = listOf(
+            binding.page1, binding.page2, binding.page3, binding.page4, binding.page5
+        )
+
+        pageTextViews.forEachIndexed { index, textView ->
+            textView.setOnClickListener {
+                val selectedPage = startPage + index
+                if (selectedPage < totalPages) {
+                    currentPage = selectedPage
+                    fetchStudyData()
+                }
+            }
+        }
+
+        binding.previousPage.setOnClickListener {
+            if (startPage >= 5) {
+                startPage -= 5
+                currentPage = startPage
+                fetchStudyData()
+            }
+        }
+
+        binding.nextPage.setOnClickListener {
+            if (startPage + 5 < totalPages) {
+                startPage += 5
+                currentPage = startPage
+                fetchStudyData()
+            }
+        }
+    }
+
+    private fun updatePaginationUI() {
+        pageTextViews.forEachIndexed { index, textView ->
+            val pageNum = startPage + index
+            if (pageNum < totalPages) {
+                textView.visibility = View.VISIBLE
+                textView.text = (pageNum + 1).toString()
+                textView.setTextColor(
+                    if (pageNum == currentPage) resources.getColor(R.color.b500)
+                    else resources.getColor(R.color.black)
+                )
+            } else {
+                textView.visibility = View.GONE
+            }
+        }
+    }
+
+    private fun fetchStudyData() {
+        Log.d("StudyFragment", "Fetching page $currentPage, size $size")
+
+        studyViewModel.fetchStudyData(currentPage, size) { result ->
+            result.onSuccess { data ->
+                val content = data.content
+                if (!content.isNullOrEmpty()) {
+                    itemList.clear()
+                    itemList.addAll(content)
+                    totalPages = data.totalPages
+                    studyAdapter.updateList(itemList)
+
+                    updatePaginationUI()
+
+                    binding.fragmentStudyRv.visibility = View.VISIBLE
+                    binding.emptyMessage.visibility = View.GONE
+                } else {
+                    binding.fragmentStudyRv.visibility = View.GONE
+                    binding.emptyMessage.visibility = View.VISIBLE
+                }
+            }.onFailure {
+                Toast.makeText(requireContext(), "불러오기 실패: ${it.message}", Toast.LENGTH_SHORT).show()
+            }
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
+
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/StudyViewModel.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/StudyViewModel.kt
new file mode 100644
index 00000000..3563d6fa
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/StudyViewModel.kt
@@ -0,0 +1,288 @@
+package com.example.spoteam_android.presentation.study
+
+import StudyFormMode
+import android.util.Log
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.spoteam_android.data.login.datasource.local.TokenDataSource
+import com.example.spoteam_android.domain.study.entity.ImageResponse
+import com.example.spoteam_android.domain.study.entity.MakeScheduleRequest
+import com.example.spoteam_android.domain.study.entity.RecentAnnounceResponse
+import com.example.spoteam_android.domain.study.entity.ScheduleListResponse
+import com.example.spoteam_android.domain.study.entity.StudyDataResponse
+import com.example.spoteam_android.domain.study.entity.StudyDetailResponse
+import com.example.spoteam_android.domain.study.entity.StudyMemberResponse
+import com.example.spoteam_android.domain.study.entity.StudyRegisterRequest
+import com.example.spoteam_android.domain.study.repository.StudyRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+
+@HiltViewModel
+class StudyViewModel @Inject constructor(
+    private val studyRepository: StudyRepository,
+    private val tokenDataSource: TokenDataSource
+) : ViewModel() {
+
+    private val _mode = MutableLiveData(StudyFormMode.CREATE)
+    val mode: LiveData<StudyFormMode> = _mode
+
+    private val _studyRequest = MutableLiveData<StudyRegisterRequest?>()
+    val studyRequest: LiveData<StudyRegisterRequest?> = _studyRequest
+
+    private val _profileImageUri = MutableLiveData<String?>()
+    val profileImageUri: LiveData<String?> = _profileImageUri
+
+    private val _themes = MutableLiveData<List<String>>()
+    val themes: LiveData<List<String>> = _themes
+
+    private val _maxPeople = MutableLiveData<Int>()
+    val maxPeople: LiveData<Int> = _maxPeople
+
+    private val _memberCount = MutableLiveData<Int>()
+    val memberCount: LiveData<Int> = _memberCount
+
+    private val _studyOwner = MutableLiveData<String>()
+    val studyOwner: LiveData<String> = _studyOwner
+
+
+    private val _studyId = MutableLiveData<Int>()
+    val studyId: LiveData<Int> = _studyId
+
+    private val _studyImageUrl = MutableLiveData<String>()
+    val studyImageUrl: LiveData<String> = _studyImageUrl
+
+    private val _studyIntroduction = MutableLiveData<String>()
+    val studyIntroduction: LiveData<String> = _studyIntroduction
+
+    private val _patchSuccess = MutableLiveData<Boolean>()
+    val patchSuccess: LiveData<Boolean> = _patchSuccess
+
+    private val _recentStudyId = MutableLiveData<Int?>()
+    val recentStudyId: LiveData<Int?> = _recentStudyId
+
+    private val _hasFee = MutableLiveData<Boolean?>()
+    val hasFee: LiveData<Boolean?> = _hasFee
+
+    private val _nickname = MutableLiveData<String>()
+    val nickname: LiveData<String> = _nickname
+
+    private val _email = MutableLiveData<String>()
+    val email: LiveData<String> = _email
+
+
+    private val _bookmarkListLiveData = MutableLiveData<List<StudyDataResponse.StudyContent>>()
+    val bookmarkListLiveData: LiveData<List<StudyDataResponse.StudyContent>> = _bookmarkListLiveData
+
+    private val _totalPages = MutableLiveData<Int>()
+    val totalPages: LiveData<Int> = _totalPages
+
+    private val _errorMessage = MutableLiveData<String?>()
+    val errorMessage: LiveData<String?> = _errorMessage
+
+    fun setStudyId(id: Int) {
+        _studyId.value = id
+    }
+
+    fun setStudyData(id: Int, imageUrl: String, studyIntroduction: String) {
+        _studyId.value = id
+        _studyImageUrl.value = imageUrl
+        _studyIntroduction.value = studyIntroduction
+    }
+
+    fun fetchStudyDetail(studyId: Int) {
+        viewModelScope.launch {
+            studyRepository.getStudyDetails(studyId)
+                .onSuccess { result ->
+                    _themes.value = result.themes
+                    _studyIntroduction.value = result.introduction
+                    _maxPeople.value = result.maxPeople
+                    _memberCount.value = result.memberCount
+                    _studyOwner.value = result.ownerName
+                    _profileImageUri.value = result.profileImage
+                    _hasFee.value = result.fee > 0
+                    _studyRequest.value = result.toStudyRegisterRequest()
+                }
+                .onFailure {
+                    Log.e("StudyViewModel", "Failed to fetch study details: ${it.message}")
+                }
+        }
+    }
+
+    fun getBookmarkList(page: Int, size: Int) {
+        viewModelScope.launch {
+            val result = studyRepository.getBookmarkStudies(page, size)
+            result.fold(
+                onSuccess = { response ->
+                    _bookmarkListLiveData.value = response.content
+                    _totalPages.value = response.totalPages
+                },
+                onFailure = { error ->
+                    Log.e("StudyViewModel", "북마크 불러오기 실패", error)
+                }
+            )
+        }
+    }
+    fun setStudyRequest(request: StudyRegisterRequest) {
+        _studyRequest.value = request
+    }
+
+
+
+    fun fetchStudyData(
+        page: Int,
+        size: Int,
+        onResult: (Result<StudyDataResponse>) -> Unit
+    ) {
+        viewModelScope.launch {
+            studyRepository.getStudies(page, size)
+                .onSuccess { data -> onResult(Result.success(data)) }
+                .onFailure { error -> onResult(Result.failure(error)) }
+        }
+    }
+
+    fun fetchIsApplied(studyId: Int, onResult: (Boolean) -> Unit) {
+        viewModelScope.launch {
+            studyRepository.getIsApplied(studyId)
+                .onSuccess { isAppliedResponse ->
+                    onResult(isAppliedResponse.applied)
+                }
+                .onFailure {
+                    onResult(false)
+                }
+        }
+    }
+
+    fun fetchRecentAnnounce(studyId: Int, onResult: (RecentAnnounceResponse?) -> Unit) {
+        viewModelScope.launch {
+            val result = studyRepository.getRecentAnnounce(studyId)
+            onResult(result.getOrNull())
+        }
+    }
+
+    fun fetchStudySchedules(
+        studyId: Int,
+        page: Int,
+        size: Int,
+        onResult: (ScheduleListResponse?) -> Unit
+    ) {
+        viewModelScope.launch {
+            val result = studyRepository.getStudySchedules(studyId, page, size)
+            onResult(result.getOrNull())
+        }
+    }
+
+    fun applyStudy(
+        studyId: Int,
+        memberId: Int,
+        introduction: String,
+        onResult: (Boolean) -> Unit
+    ) {
+        viewModelScope.launch {
+            studyRepository.applyStudy(studyId, memberId, introduction)
+                .onSuccess {
+                    onResult(true)
+                }
+                .onFailure { e ->
+                    Log.e("StudyViewModel", "스터디 신청 실패: ${e.message}")
+                    onResult(false)
+                }
+        }
+    }
+
+    fun makeSchedule(
+        studyId: Int,
+        request: MakeScheduleRequest,
+        onResult: (Boolean) -> Unit
+    ) {
+        viewModelScope.launch {
+            studyRepository.makeSchedules(studyId, request)
+                .onSuccess { onResult(true) }
+                .onFailure {
+                    Log.e("StudyViewModel", "일정 추가 실패: ${it.message}")
+                    onResult(false)
+                }
+        }
+    }
+
+
+    fun fetchStudyMembers(studyId: Int, onResult: (StudyMemberResponse?) -> Unit) {
+        viewModelScope.launch {
+            val result = studyRepository.getStudyMembers(studyId)
+            onResult(result.getOrNull())
+        }
+    }
+
+
+    fun patchStudyData() {
+        val studyId = _studyId.value ?: return
+        val studyData = _studyRequest.value ?: return
+        viewModelScope.launch {
+            runCatching {
+                studyRepository.patchStudy(studyId, studyData)
+            }.onSuccess {
+                Log.d("StudyViewModel", "스터디 수정 성공")
+                _patchSuccess.value = true
+            }.onFailure {
+                Log.e("StudyViewModel", "스터디 수정 실패: ${it.message}")
+                _patchSuccess.value = false
+            }
+        }
+    }
+
+    suspend fun getStudyImages(studyId: Int, page: Int, limit: Int): Result<ImageResponse> {
+        return withContext(Dispatchers.IO) {
+            studyRepository.getStudyImages(studyId, page, limit)
+        }
+    }
+
+    fun toggleLikeStatus(
+        studyId: Int,
+        onResult: (Result<Boolean>) -> Unit
+    ) {
+        viewModelScope.launch {
+            val result = studyRepository.toggleStudyLike(studyId)
+            result.fold(
+                onSuccess = { response ->
+                    val liked = response.status == "LIKE"
+                    onResult(Result.success(liked))
+                },
+                onFailure = { error ->
+                    onResult(Result.failure(error))
+                }
+            )
+        }
+    }
+
+    fun StudyDetailResponse.toStudyRegisterRequest(): StudyRegisterRequest {
+        return StudyRegisterRequest(
+            themes = this.themes,
+            title = this.studyName,
+            goal = this.goal,
+            introduction = this.introduction,
+            isOnline = this.isOnline,
+            profileImage = this.profileImage,
+            regions = this.regions,
+            maxPeople = this.maxPeople,
+            gender = this.gender,
+            minAge = this.minAge,
+            maxAge = this.maxAge,
+            fee = this.fee,
+            hasFee = this.fee > 0
+        )
+    }
+
+    fun setRecentStudyId(id: Int) {
+        _recentStudyId.value = id
+    }
+
+    fun loadNickname() {
+        _nickname.value = tokenDataSource.getNickname() ?: "Unknown"
+        _email.value = tokenDataSource.getEmail() ?: ""
+    }
+
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/WriteContentImageRVadapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/WriteContentImageRVadapter.kt
similarity index 90%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/WriteContentImageRVadapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/WriteContentImageRVadapter.kt
index 7185c3be..1e3db927 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/WriteContentImageRVadapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/WriteContentImageRVadapter.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study
+package com.example.spoteam_android.presentation.study
 
 import android.net.Uri
 import android.view.LayoutInflater
@@ -37,11 +37,11 @@ class WriteContentImageRVadapter(private val images: MutableList<Any>) :
 
         when (item) {
             is Uri -> {
-                holder.imageView.setImageURI(item) // ✅ 갤러리 이미지
+                holder.imageView.setImageURI(item)
             }
             is String -> {
                 Glide.with(holder.itemView.context)
-                    .load(item) // ✅ 서버에서 받은 URL
+                    .load(item)
                     .placeholder(R.drawable.spot_logo)
                     .error(R.drawable.spot_logo)
                     .into(holder.imageView)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/CalendarAddEventFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/CalendarAddEventFragment.kt
new file mode 100644
index 00000000..fc287ce6
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/CalendarAddEventFragment.kt
@@ -0,0 +1,296 @@
+package com.example.spoteam_android.presentation.study.calendar
+
+import android.app.DatePickerDialog
+import android.app.TimePickerDialog
+import android.graphics.Typeface
+import android.os.Bundle
+import android.text.Editable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.*
+import android.widget.Toast
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.activityViewModels
+import com.example.spoteam_android.R
+import com.example.spoteam_android.databinding.FragmentCalendarAddEventBinding
+import com.example.spoteam_android.domain.study.entity.MakeScheduleRequest
+import com.example.spoteam_android.presentation.study.CompleteScheduleDialog
+import com.example.spoteam_android.presentation.study.StudyViewModel
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import java.text.SimpleDateFormat
+import java.util.*
+
+class CalendarAddEventFragment : BottomSheetDialogFragment() {
+    private lateinit var binding: FragmentCalendarAddEventBinding
+    private lateinit var eventTitleEditText: EditText
+    private lateinit var eventPositionEditText: EditText
+    private lateinit var startDateTimeTextView: TextView
+    private lateinit var endDateTimeTextView: TextView
+    private lateinit var charTitleCountText: TextView
+    private lateinit var charPostionCountText: TextView
+    private lateinit var saveButton: Button
+    private lateinit var closeButton: ImageView
+    private lateinit var spinner: Spinner
+    private lateinit var checkBox: CheckBox
+    private lateinit var startYearTx: TextView
+    private lateinit var startTimeTx: TextView
+    private lateinit var endYearTx: TextView
+    private lateinit var endTimeTx: TextView
+    private lateinit var txEndGuide: TextView
+    private lateinit var txEveryDay: TextView
+
+    private val studyViewModel: StudyViewModel by activityViewModels()
+
+    private var studyId: Int = 0
+    private var period: String = "NONE"
+    private var startDateTime = ""
+    private var endDateTime = ""
+    private var isAllDay = false
+    private var isStartDateSet = false
+    private var isEndDateSet = false
+
+    override fun getTheme(): Int = R.style.InterestBottomSheetDialogTheme
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentCalendarAddEventBinding.inflate(inflater, container, false)
+
+        eventTitleEditText = binding.eventTitleEditText
+        eventPositionEditText = binding.eventPositionEditText
+        startDateTimeTextView = binding.startDateTimeTextView
+        endDateTimeTextView = binding.endDateTimeTextView
+        saveButton = binding.fragmentIntroduceStudyBt
+        closeButton = binding.icClose
+        spinner = binding.routineSpinner
+        checkBox = binding.checkBoxEveryDay
+        startYearTx = binding.txStartYear
+        startTimeTx = binding.txStartTime
+        endYearTx = binding.txEndYear
+        endTimeTx = binding.txEndTime
+        txEndGuide = binding.txEndGuide
+        txEveryDay = binding.txEveryDay
+        charTitleCountText = binding.charTitleCountText
+        charPostionCountText = binding.charPositionCountText
+
+        studyId = arguments?.getInt("studyId") ?: 0
+
+        txEveryDay.setOnClickListener {
+            checkBox.isChecked = !checkBox.isChecked
+        }
+
+        checkBox.setOnCheckedChangeListener { _, isChecked ->
+            isAllDay = isChecked
+            if (isAllDay) {
+                val calendar = Calendar.getInstance()
+                val year = calendar.get(Calendar.YEAR)
+                val month = calendar.get(Calendar.MONTH) + 1
+                val day = calendar.get(Calendar.DAY_OF_MONTH)
+
+                startDateTime = String.format("%04d-%02d-%02d 00:00", year, month, day)
+                startYearTx.text = String.format("%04d.%02d.%02d", year, month, day)
+                startTimeTx.text = "00:00 am"
+
+                endDateTimeTextView.visibility = View.GONE
+                txEndGuide.visibility = View.GONE
+                endYearTx.visibility = View.GONE
+                endTimeTx.visibility = View.GONE
+            } else {
+                resetDateTimeFields()
+                endDateTimeTextView.visibility = View.VISIBLE
+                txEndGuide.visibility = View.VISIBLE
+            }
+        }
+
+        eventTitleEditText.addTextChangedListener(createTextWatcher(charTitleCountText))
+        eventPositionEditText.addTextChangedListener(createTextWatcher(charPostionCountText))
+
+        startDateTimeTextView.setOnClickListener {
+            // 생략: showDateTimePickerDialog
+        }
+        endDateTimeTextView.setOnClickListener {
+            // 생략: showDateTimePickerDialog
+        }
+
+        saveButton.setOnClickListener {
+            uploadScheduleToServer(isAllDay)
+        }
+
+        closeButton.setOnClickListener { dismiss() }
+
+        return binding.root
+    }
+
+    private fun createTextWatcher(counterView: TextView) = object : android.text.TextWatcher {
+        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+            updateSaveButtonState()
+        }
+        override fun afterTextChanged(s: Editable?) {
+            counterView.text = "(${s?.length ?: 0}/20)"
+        }
+    }
+
+    private fun updateSaveButtonState() {
+        val isTitleValid = eventTitleEditText.text.isNotEmpty()
+        val isPositionValid = eventPositionEditText.text.isNotEmpty()
+        saveButton.isEnabled = isTitleValid && isPositionValid && (isStartDateSet && isEndDateSet || isAllDay)
+    }
+
+    private fun resetDateTimeFields() {
+        startDateTime = ""
+        endDateTime = ""
+        startYearTx.text = ""
+        startTimeTx.text = ""
+        endYearTx.text = ""
+        endTimeTx.text = ""
+        isStartDateSet = false
+        isEndDateSet = false
+        updateSaveButtonState()
+    }
+
+    private fun uploadScheduleToServer(isChecked: Boolean) {
+        val title = eventTitleEditText.text.toString()
+        val location = eventPositionEditText.text.toString()
+        val start = startDateTime
+        val end = if (isChecked) "${start.split(" ")[0]} 23:59" else endDateTime
+
+        val inputFormat = SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault())
+        val outputFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.getDefault())
+
+        val startDate: Date = inputFormat.parse(start)
+        val endDate: Date = inputFormat.parse(end)
+
+        val formattedStart = outputFormat.format(startDate)
+        val formattedEnd = outputFormat.format(endDate)
+
+        val request = MakeScheduleRequest(
+            title = title,
+            location = location,
+            startedAt = formattedStart,
+            finishedAt = formattedEnd,
+            isAllDay = isChecked,
+            period = period
+        )
+
+        studyViewModel.makeSchedule(
+            studyId = studyId,
+            request = request,
+            onResult = { success ->
+                if (success) showCompletionDialog()
+                else Toast.makeText(requireContext(), "일정 추가 실패", Toast.LENGTH_SHORT).show()
+            }
+        )
+    }
+
+    private fun showCompletionDialog() {
+        val dialog = CompleteScheduleDialog(requireContext(), startDateTime)
+        dialog.start(parentFragmentManager)
+    }
+    private fun showDateTimePickerDialog(txYear: TextView, txTime: TextView, isStart: Boolean) {
+        val calendar = Calendar.getInstance()
+        val year = calendar.get(Calendar.YEAR)
+        val month = calendar.get(Calendar.MONTH)
+        val day = calendar.get(Calendar.DAY_OF_MONTH)
+
+        val datePickerDialog = DatePickerDialog(
+            requireContext(),
+            R.style.MyDatePickerTheme,
+            { _, selectedYear, selectedMonth, selectedDay ->
+                val selectedDate = String.format("%04d-%02d-%02d", selectedYear, selectedMonth + 1, selectedDay)
+
+                txYear.text = String.format("%04d.%02d.%02d", selectedYear, selectedMonth + 1, selectedDay)
+
+                if (isAllDay) {
+                    if (isStart) {
+                        startDateTime = "$selectedDate 00:00"
+                        txTime.text = "00:00 am"
+                        isStartDateSet = true
+                    } else {
+                        endDateTime = "$selectedDate 23:59"
+                        txTime.text = "11:59 pm"
+                        isEndDateSet = true
+                    }
+                    updateSaveButtonState()
+                } else {
+                    showTimePickerDialog(selectedDate, txTime, isStart)
+                }
+
+                if (isStart) {
+                    startYearTx.visibility = View.VISIBLE
+                    startTimeTx.visibility = View.VISIBLE
+                } else {
+                    endYearTx.visibility = View.VISIBLE
+                    endTimeTx.visibility = View.VISIBLE
+                }
+            },
+            year, month, day
+        )
+
+        datePickerDialog.setCanceledOnTouchOutside(false)
+        datePickerDialog.show()
+
+        datePickerDialog.getButton(DatePickerDialog.BUTTON_POSITIVE)?.apply {
+            setTextColor(ContextCompat.getColor(requireContext(), R.color.black))
+            setTypeface(typeface, Typeface.BOLD)
+        }
+
+        datePickerDialog.getButton(DatePickerDialog.BUTTON_NEGATIVE)?.apply {
+            setTextColor(ContextCompat.getColor(requireContext(), R.color.black))
+            setTypeface(typeface, Typeface.BOLD)
+        }
+    }
+    private fun showTimePickerDialog(selectedDate: String, txTime: TextView, isStart: Boolean) {
+        val calendar = Calendar.getInstance()
+        val timePickerDialog = TimePickerDialog(
+            requireContext(),
+            R.style.MyTimePickerTheme,
+            { _, selectedHour, selectedMinute ->
+                val isAm = selectedHour < 12
+                val amPm = if (isAm) "am" else "pm"
+                val hourFormatted = if (selectedHour % 12 == 0) 12 else selectedHour % 12
+                val formattedTime = String.format("%02d:%02d %s", hourFormatted, selectedMinute, amPm)
+
+                txTime.text = formattedTime
+
+                if (isStart) {
+                    startDateTime = "$selectedDate %02d:%02d".format(selectedHour, selectedMinute)
+                    isStartDateSet = true
+                } else {
+                    endDateTime = "$selectedDate %02d:%02d".format(selectedHour, selectedMinute)
+                    isEndDateSet = true
+                }
+
+                updateSaveButtonState()
+            },
+            calendar.get(Calendar.HOUR_OF_DAY),
+            calendar.get(Calendar.MINUTE),
+            false
+        )
+        timePickerDialog.setCanceledOnTouchOutside(false)
+        timePickerDialog.show()
+
+        val negativeButton = timePickerDialog.findViewById<Button>(android.R.id.button2)
+        negativeButton?.visibility = View.GONE
+
+        timePickerDialog.getButton(TimePickerDialog.BUTTON_POSITIVE)?.apply {
+            setTextColor(ContextCompat.getColor(requireContext(), R.color.black))
+            setTypeface(typeface, Typeface.BOLD)
+        }
+    }
+
+
+
+    companion object {
+        fun newInstance(studyId: Int): CalendarAddEventFragment {
+            val fragment = CalendarAddEventFragment()
+            val args = Bundle()
+            args.putInt("studyId", studyId)
+            fragment.arguments = args
+            return fragment
+        }
+    }
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CalendarApiService.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/CalendarApiService.kt
similarity index 85%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CalendarApiService.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/CalendarApiService.kt
index 875bb92e..02c6a329 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CalendarApiService.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/CalendarApiService.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.calendar
+package com.example.spoteam_android.presentation.study.calendar
 
 import retrofit2.Call
 import retrofit2.http.GET
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CalendarFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/CalendarFragment.kt
similarity index 89%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CalendarFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/CalendarFragment.kt
index 80f46d03..6e751205 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CalendarFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/CalendarFragment.kt
@@ -1,7 +1,5 @@
-package com.example.spoteam_android.ui.study.calendar
+package com.example.spoteam_android.presentation.study.calendar
 
-import StudyApiService
-import StudyViewModel
 import android.content.Context
 import android.os.Bundle
 import android.util.Log
@@ -10,21 +8,17 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageButton
 import android.widget.Toast
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.content.ContextCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.example.spoteam_android.MainActivity
-import com.example.spoteam_android.MemberResponse
-import com.example.spoteam_android.ProfileItem
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentCalendarBinding
-import com.example.spoteam_android.ui.study.quiz.CheckAttendanceFragment
+import com.example.spoteam_android.presentation.study.StudyViewModel
+import com.example.spoteam_android.presentation.study.quiz.CheckAttendanceFragment
 import com.prolificinteractive.materialcalendarview.CalendarDay
 import com.prolificinteractive.materialcalendarview.MaterialCalendarView
 import retrofit2.Call
@@ -262,9 +256,6 @@ class CalendarFragment : Fragment() {
         studyId: Int,
         onResult: (Boolean) -> Unit
     ) {
-        val api = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-
-        // SharedPreferences에서 현재 로그인된 memberId 가져오기
         val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
         val email = sharedPreferences.getString("currentEmail", null)
         val currentMemberId = if (email != null) {
@@ -278,26 +269,16 @@ class CalendarFragment : Fragment() {
             return
         }
 
-        // API 호출
-        api.getStudyMembers(studyId).enqueue(object : Callback<MemberResponse> {
-            override fun onResponse(call: Call<MemberResponse>, response: Response<MemberResponse>) {
-                if (response.isSuccessful) {
-                    val members = response.body()?.result?.members ?: emptyList()
-                    val isMember = members.any { it.memberId == currentMemberId } // ✅ memberId 기준 비교
-                    onResult(isMember)
-                } else {
-                    onResult(false)
-                }
-            }
-
-            override fun onFailure(call: Call<MemberResponse>, t: Throwable) {
-                onResult(false)
-            }
-        })
+        studyViewModel.fetchStudyMembers(studyId) { response ->
+            val members = response?.members ?: emptyList()
+            val isMember = members.any { it.memberId == currentMemberId }
+            onResult(isMember)
+        }
     }
 
 
 
 
 
+
 }
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CheckBoxViewModel.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/CheckBoxViewModel.kt
similarity index 84%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CheckBoxViewModel.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/CheckBoxViewModel.kt
index 02d01249..0ced8a03 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CheckBoxViewModel.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/CheckBoxViewModel.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.calendar
+package com.example.spoteam_android.presentation.study.calendar
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CustomRectangleDecorator.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/CustomRectangleDecorator.kt
similarity index 92%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CustomRectangleDecorator.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/CustomRectangleDecorator.kt
index 5dee8bf1..7f6f4f59 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CustomRectangleDecorator.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/CustomRectangleDecorator.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.calendar
+package com.example.spoteam_android.presentation.study.calendar
 
 import android.content.Context
 import com.example.spoteam_android.R
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CustomWeekDayFormatter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/CustomWeekDayFormatter.kt
similarity index 95%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CustomWeekDayFormatter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/CustomWeekDayFormatter.kt
index 04a3fa9b..73ab1ced 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CustomWeekDayFormatter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/CustomWeekDayFormatter.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.calendar
+package com.example.spoteam_android.presentation.study.calendar
 
 import android.content.Context
 import android.text.Spannable
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/Event.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/Event.kt
similarity index 95%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/Event.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/Event.kt
index 06fca1b9..635ed494 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/Event.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/Event.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.calendar
+package com.example.spoteam_android.presentation.study.calendar
 
 import java.util.Calendar
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/EventAdapter.kt
similarity index 98%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/EventAdapter.kt
index c99d72b1..d97843a3 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/EventAdapter.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.calendar
+package com.example.spoteam_android.presentation.study.calendar
 
 import android.annotation.SuppressLint
 import android.util.Log
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventDecorator.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/EventDecorator.kt
similarity index 91%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventDecorator.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/EventDecorator.kt
index a07deb25..70d528d3 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventDecorator.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/EventDecorator.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.calendar
+package com.example.spoteam_android.presentation.study.calendar
 
 import android.graphics.Color
 import com.prolificinteractive.materialcalendarview.CalendarDay
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventRepository.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/EventRepository.kt
similarity index 77%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventRepository.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/EventRepository.kt
index 7a71c87b..fa4718d5 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventRepository.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/EventRepository.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.calendar
+package com.example.spoteam_android.presentation.study.calendar
 
 object EventRepository {
     private val events = mutableListOf<Event>()
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventViewModel.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/EventViewModel.kt
similarity index 98%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventViewModel.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/EventViewModel.kt
index a3c49579..fa127467 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventViewModel.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/EventViewModel.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.calendar
+package com.example.spoteam_android.presentation.study.calendar
 
 import android.util.Log
 import androidx.lifecycle.LiveData
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/ScheduleData.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/ScheduleData.kt
similarity index 92%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/ScheduleData.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/ScheduleData.kt
index 3a5935cd..3d06f85c 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/ScheduleData.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/calendar/ScheduleData.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.calendar
+package com.example.spoteam_android.presentation.study.calendar
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CheckAttendanceFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/CheckAttendanceFragment.kt
similarity index 93%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CheckAttendanceFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/CheckAttendanceFragment.kt
index 657a65c3..eb98d298 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CheckAttendanceFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/CheckAttendanceFragment.kt
@@ -1,6 +1,5 @@
-package com.example.spoteam_android.ui.study.quiz
+package com.example.spoteam_android.presentation.study.quiz
 
-import StudyViewModel
 import android.content.Context
 import android.os.Bundle
 import android.os.CountDownTimer
@@ -15,11 +14,12 @@ import androidx.recyclerview.widget.RecyclerView
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentAttendanceDefaultBinding
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.community.GetQuizResponse
-import com.example.spoteam_android.ui.community.GetScheduleResponse
-import com.example.spoteam_android.ui.community.MembersDetail
-import com.example.spoteam_android.ui.community.StudyMemberResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.GetQuizResponse
+import com.example.spoteam_android.presentation.community.GetScheduleResponse
+import com.example.spoteam_android.presentation.community.MembersDetail
+import com.example.spoteam_android.presentation.community.StudyMemberResponse
+import com.example.spoteam_android.presentation.study.StudyViewModel
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import retrofit2.Call
 import retrofit2.Callback
@@ -114,7 +114,7 @@ class CheckAttendanceFragment : BottomSheetDialogFragment() {
                 ) {
                     if (response.isSuccessful) {
                         val quizResponse = response.body()
-                        if(quizResponse?.isSuccess == "true") {
+                        if(quizResponse?.isSuccess == true) {
                             timerViewModel.quiz = quizResponse.result.question
                             timerViewModel.startTimer(quizResponse.result.createdAt)
 
@@ -179,7 +179,7 @@ class CheckAttendanceFragment : BottomSheetDialogFragment() {
                 ) {
                     if (response.isSuccessful) {
                         val memberResponse = response.body()
-                        if (memberResponse?.isSuccess == "true") {
+                        if (memberResponse?.isSuccess == true) {
                             initMemberRecyclerView(memberResponse.result.members)
                             fetchQuiz(memberResponse.result.members)
                         } else {
@@ -206,7 +206,7 @@ class CheckAttendanceFragment : BottomSheetDialogFragment() {
                 ) {
                     if (response.isSuccessful) {
                         val scheduleResponse = response.body()
-                        if (scheduleResponse?.isSuccess == "true") {
+                        if (scheduleResponse?.isSuccess == true) {
                             if(!scheduleResponse.result.studyMembers[0].isOwned) { // ! 붙이면 만들기, 풀기 왔다갔다 가능
 //                                Log.d("checkIng", "initHostAlreadyMakeQuiz")
                                 initHostAlreadyMakeQuiz()
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewCorrectQuizFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/CrewCorrectQuizFragment.kt
similarity index 93%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewCorrectQuizFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/CrewCorrectQuizFragment.kt
index add8e1be..854f09dc 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewCorrectQuizFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/CrewCorrectQuizFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.quiz
+package com.example.spoteam_android.presentation.study.quiz
 
 import android.os.Bundle
 import android.os.CountDownTimer
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewSolveQuizFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/CrewSolveQuizFragment.kt
similarity index 94%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewSolveQuizFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/CrewSolveQuizFragment.kt
index 69282304..d6b3c2bf 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewSolveQuizFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/CrewSolveQuizFragment.kt
@@ -1,6 +1,5 @@
-package com.example.spoteam_android.ui.study.quiz
+package com.example.spoteam_android.presentation.study.quiz
 
-import StudyViewModel
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
@@ -16,9 +15,10 @@ import androidx.fragment.app.activityViewModels
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentCrewSolveQuizBinding
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.community.CrewAnswerRequest
-import com.example.spoteam_android.ui.community.GetCrewQuizResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.CrewAnswerRequest
+import com.example.spoteam_android.presentation.community.GetCrewQuizResponse
+import com.example.spoteam_android.presentation.study.StudyViewModel
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewTakeAttendanceFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/CrewTakeAttendanceFragment.kt
similarity index 97%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewTakeAttendanceFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/CrewTakeAttendanceFragment.kt
index 87c20582..9a9afc28 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewTakeAttendanceFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/CrewTakeAttendanceFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.quiz
+package com.example.spoteam_android.presentation.study.quiz
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewTimeOutFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/CrewTimeOutFragment.kt
similarity index 93%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewTimeOutFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/CrewTimeOutFragment.kt
index 5958e89b..bf99b5f4 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewTimeOutFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/CrewTimeOutFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.quiz
+package com.example.spoteam_android.presentation.study.quiz
 
 import android.os.Bundle
 import android.os.CountDownTimer
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewWrongQuizFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/CrewWrongQuizFragment.kt
similarity index 96%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewWrongQuizFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/CrewWrongQuizFragment.kt
index 6221689a..3ecdb995 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewWrongQuizFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/CrewWrongQuizFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.quiz
+package com.example.spoteam_android.presentation.study.quiz
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostFinishMakeQuizFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/HostFinishMakeQuizFragment.kt
similarity index 96%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostFinishMakeQuizFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/HostFinishMakeQuizFragment.kt
index 368461a6..23fd5195 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostFinishMakeQuizFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/HostFinishMakeQuizFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.quiz
+package com.example.spoteam_android.presentation.study.quiz
 
 import android.os.Bundle
 import android.util.Log
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostMakeQuizFirstFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/HostMakeQuizFirstFragment.kt
similarity index 92%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostMakeQuizFirstFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/HostMakeQuizFirstFragment.kt
index 74586309..1afb92b8 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostMakeQuizFirstFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/HostMakeQuizFirstFragment.kt
@@ -1,6 +1,5 @@
-package com.example.spoteam_android.ui.study.quiz
+package com.example.spoteam_android.presentation.study.quiz
 
-import StudyViewModel
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
@@ -9,6 +8,7 @@ import android.view.ViewGroup
 import androidx.fragment.app.activityViewModels
 import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.FragmentToMakeQuizBinding
+import com.example.spoteam_android.presentation.study.StudyViewModel
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostMakeQuizFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/HostMakeQuizFragment.kt
similarity index 95%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostMakeQuizFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/HostMakeQuizFragment.kt
index f99170a0..e2e3ca0f 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostMakeQuizFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/HostMakeQuizFragment.kt
@@ -1,6 +1,5 @@
-package com.example.spoteam_android.ui.study.quiz
+package com.example.spoteam_android.presentation.study.quiz
 
-import StudyViewModel
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
@@ -16,9 +15,10 @@ import androidx.fragment.app.activityViewModels
 import com.example.spoteam_android.R
 import com.example.spoteam_android.RetrofitInstance
 import com.example.spoteam_android.databinding.FragmentHostMakeQuizBinding
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.community.QuizContentRequest
-import com.example.spoteam_android.ui.community.QuizContentResponse
+import com.example.spoteam_android.presentation.community.CommunityAPIService
+import com.example.spoteam_android.presentation.community.QuizContentRequest
+import com.example.spoteam_android.presentation.community.QuizContentResponse
+import com.example.spoteam_android.presentation.study.StudyViewModel
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import retrofit2.Call
 import retrofit2.Callback
@@ -91,7 +91,7 @@ class HostMakeQuizFragment : BottomSheetDialogFragment() {
                 ) {
                     if (response.isSuccessful) {
                         val likeResponse = response.body()
-                        if (likeResponse?.isSuccess == "true") {
+                        if (likeResponse?.isSuccess == true) {
                             val result = likeResponse.result
 
                             // ✅ 여기 추가: TimerViewModel 세팅
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostMakeQuizMemberRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/HostMakeQuizMemberRVAdapter.kt
similarity index 95%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostMakeQuizMemberRVAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/HostMakeQuizMemberRVAdapter.kt
index f5a3a89f..f3498add 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostMakeQuizMemberRVAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/HostMakeQuizMemberRVAdapter.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.quiz
+package com.example.spoteam_android.presentation.study.quiz
 
 import android.content.res.ColorStateList
 import android.graphics.BlurMaskFilter
@@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.ItemDetailStudyHomeMemberBinding
-import com.example.spoteam_android.ui.community.MembersDetail
+import com.example.spoteam_android.presentation.community.MembersDetail
 
 class HostMakeQuizMemberRVAdapter(
     private var dataList: List<MembersDetail>,
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/TimerViewModel.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/TimerViewModel.kt
similarity index 96%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/TimerViewModel.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/TimerViewModel.kt
index b79b3cd5..57aafe57 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/TimerViewModel.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/quiz/TimerViewModel.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.quiz
+package com.example.spoteam_android.presentation.study.quiz
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/StudyRegisterViewModel.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/StudyRegisterViewModel.kt
new file mode 100644
index 00000000..760cfb37
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/StudyRegisterViewModel.kt
@@ -0,0 +1,151 @@
+package com.example.spoteam_android.presentation.study.register
+
+import StudyFormMode
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.spoteam_android.domain.study.entity.StudyRegisterRequest
+import com.example.spoteam_android.domain.study.repository.StudyRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import okhttp3.MultipartBody
+import javax.inject.Inject
+
+@HiltViewModel
+class StudyRegisterViewModel @Inject constructor(
+    private val studyRepository: StudyRepository
+) : ViewModel() {
+
+    private val _mode = MutableStateFlow(StudyFormMode.CREATE)
+    val mode: StateFlow<StudyFormMode> = _mode
+
+    private val _studyId = MutableStateFlow<Int?>(null)
+    val studyId: StateFlow<Int?> = _studyId
+
+    private val _studyRequest = MutableStateFlow<StudyRegisterRequest?>(null)
+    val studyRequest: StateFlow<StudyRegisterRequest?> = _studyRequest
+
+    private val _localImageUri = MutableStateFlow<String?>(null)
+    val localImageUri: StateFlow<String?> = _localImageUri
+
+    private val _uploadedImageUrl = MutableStateFlow<String?>(null)
+    val uploadedImageUrl: StateFlow<String?> = _uploadedImageUrl
+
+    fun reset(mode: StudyFormMode = StudyFormMode.CREATE) {
+        _mode.value = mode
+        _studyId.value = null
+        _uploadedImageUrl.value = null
+        _localImageUri.value = null
+        _studyRequest.value = StudyRegisterRequest(
+            themes = emptyList(),
+            title = "",
+            goal = "",
+            introduction = "",
+            isOnline = true,
+            profileImage = null,
+            regions = emptyList(),
+            maxPeople = 1,
+            gender = "ALL",
+            minAge = 18,
+            maxAge = 60,
+            fee = 0,
+            hasFee = false
+        )
+    }
+
+    fun setStudyId(id: Int) {
+        _studyId.value = id
+    }
+
+    fun setStudyRequest(request: StudyRegisterRequest) {
+        _studyRequest.value = request
+        _uploadedImageUrl.value = request.profileImage
+    }
+    fun setMode(newMode: StudyFormMode) {
+        _mode.value = newMode
+    }
+
+    fun updateTitleGoalIntro(title: String, goal: String, intro: String) {
+        _studyRequest.update { it?.copy(title = title, goal = goal, introduction = intro) }
+    }
+
+    fun updateThemes(themes: List<String>) {
+        _studyRequest.update { it?.copy(themes = themes) }
+    }
+
+    fun updateRegions(regions: List<String>) {
+        _studyRequest.update { it?.copy(regions = regions) }
+    }
+
+    fun updateLocalImageUri(uri: String) {
+        _localImageUri.value = uri
+    }
+    fun updateUploadedImageUrl(url: String) {
+        _uploadedImageUrl.value = url
+    }
+    fun uploadImageAndSubmitStudy(
+        imagePart: MultipartBody.Part,
+        onSuccess: () -> Unit,
+        onFailure: () -> Unit
+    ) {
+        viewModelScope.launch {
+            studyRepository.uploadImages(listOf(imagePart))
+                .onSuccess { uploadResponse ->
+                    val imageUrl = uploadResponse.imageUrls.firstOrNull()?.imageUrl
+                    if (imageUrl != null) {
+                        updateUploadedImageUrl(imageUrl)
+                        submitStudyData(
+                            onSuccess = {
+                                onSuccess()
+                            },
+                            onFailure = {
+                                onFailure()
+                            }
+                        )
+                    } else {
+                        onFailure()
+                    }
+                }
+                .onFailure {
+                    onFailure()
+                }
+        }
+    }
+
+
+    fun submitStudyData(
+        onSuccess: () -> Unit,
+        onFailure: () -> Unit
+    ) {
+        val currentRequest = _studyRequest.value?.copy(
+            profileImage = _uploadedImageUrl.value,
+            regions = _studyRequest.value?.regions ?: emptyList()
+        )
+        if (currentRequest == null) {
+            onFailure()
+            return
+        }
+
+        viewModelScope.launch {
+            when (_mode.value) {
+                StudyFormMode.CREATE -> {
+                    studyRepository.registerStudy(currentRequest)
+                        .onSuccess { onSuccess() }
+                        .onFailure { onFailure() }
+                }
+                StudyFormMode.EDIT -> {
+                    val id = _studyId.value
+                    if (id != null) {
+                        studyRepository.patchStudy(id, currentRequest)
+                            .onSuccess { onSuccess() }
+                            .onFailure { onFailure() }
+                    } else {
+                        onFailure()
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/activityfee/ActivityFeeStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/activityfee/ActivityFeeStudyFragment.kt
new file mode 100644
index 00000000..062636c8
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/activityfee/ActivityFeeStudyFragment.kt
@@ -0,0 +1,216 @@
+package com.example.spoteam_android.presentation.study.register.activityfee
+
+import StudyFormMode
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.example.spoteam_android.R
+import com.example.spoteam_android.databinding.FragmentActivityFeeStudyBinding
+import com.example.spoteam_android.presentation.study.register.util.CorrectStudyCompleteDialog
+import com.example.spoteam_android.presentation.study.register.preview.MyStudyRegisterPreviewFragment
+import com.example.spoteam_android.presentation.study.register.StudyRegisterViewModel
+import kotlinx.coroutines.launch
+
+class ActivityFeeStudyFragment : Fragment() {
+
+    private lateinit var binding: FragmentActivityFeeStudyBinding
+    private val registerViewModel: StudyRegisterViewModel by activityViewModels()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        arguments?.getInt("studyId", -1)?.let {
+            if (it != -1) {
+                registerViewModel.setStudyId(it)
+            }
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentActivityFeeStudyBinding.inflate(inflater, container, false)
+
+        binding.fragmentActivityFeeStudyBackBt.setOnClickListener {
+            parentFragmentManager.popBackStack()
+        }
+
+        observeRegisterViewModel()
+        setupChipGroupListener()
+        setupFeeEditTextListener()
+        setupPreviewButtonListener()
+
+        return binding.root
+    }
+
+    private fun observeRegisterViewModel() {
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewLifecycleOwner.lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                registerViewModel.studyRequest.collect { request ->
+                    if (request == null) return@collect
+
+                    val hasFee = request.hasFee
+                    when (registerViewModel.mode.value) {
+                        StudyFormMode.EDIT -> {
+                            binding.fragmentActivityFeeStudyTv.text = "스터디 정보 수정"
+                            binding.fragmentActivityFeeStudyPreviewBt.text = "수정완료"
+                            setChipState(hasFee)
+
+                            if (hasFee == true) {
+                                binding.fragmentActivityFeeStudyNumFl.visibility = View.VISIBLE
+                                binding.fragmentActivityFeeStudyEt.setText(request.fee.toString())
+                            } else {
+                                binding.fragmentActivityFeeStudyNumFl.visibility = View.GONE
+                            }
+
+                            binding.fragmentActivityFeeStudyPreviewBt.isEnabled = true
+                        }
+
+                        StudyFormMode.CREATE -> {
+                            setChipState(hasFee)
+                            if (hasFee == true) {
+                                binding.fragmentActivityFeeStudyNumFl.visibility = View.VISIBLE
+                            } else {
+                                binding.fragmentActivityFeeStudyNumFl.visibility = View.GONE
+                            }
+                            binding.fragmentActivityFeeStudyPreviewBt.isEnabled = (hasFee == false)
+                        }
+
+                        else -> Unit
+                    }
+                }
+            }
+        }
+    }
+
+    private fun setupChipGroupListener() {
+        binding.fragmentActivityFeeStudyChipTrue.setOnClickListener {
+            selectChip(it.id)
+        }
+        binding.fragmentActivityFeeStudyChipFalse.setOnClickListener {
+            selectChip(it.id)
+        }
+    }
+
+    private fun selectChip(selectedChipId: Int) {
+        binding.fragmentActivityFeeStudyChipTrue.isChecked = false
+        binding.fragmentActivityFeeStudyChipFalse.isChecked = false
+
+        when (selectedChipId) {
+            R.id.fragment_activity_fee_study_chip_true -> {
+                binding.fragmentActivityFeeStudyChipTrue.isChecked = true
+                binding.fragmentActivityFeeStudyNumFl.visibility = View.VISIBLE
+                checkFeeInput()
+            }
+
+            R.id.fragment_activity_fee_study_chip_false -> {
+                binding.fragmentActivityFeeStudyChipFalse.isChecked = true
+                binding.fragmentActivityFeeStudyNumFl.visibility = View.GONE
+                binding.fragmentActivityFeeStudyPreviewBt.isEnabled = true
+
+                val current = registerViewModel.studyRequest.value ?: return
+                registerViewModel.setStudyRequest(
+                    current.copy(hasFee = false, fee = 0)
+                )
+            }
+        }
+    }
+
+    private fun setChipState(hasFee: Boolean?) {
+        binding.fragmentActivityFeeStudyChipTrue.isChecked = (hasFee == true)
+        binding.fragmentActivityFeeStudyChipFalse.isChecked = (hasFee == false)
+    }
+
+    private fun setupFeeEditTextListener() {
+        binding.fragmentActivityFeeStudyEt.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                updateFee()
+            }
+
+            override fun afterTextChanged(s: Editable?) {}
+        })
+    }
+
+    private fun checkFeeInput() {
+        val feeText = binding.fragmentActivityFeeStudyEt.text.toString()
+        // 숫자로 변환 후 > 0인지 확인
+        binding.fragmentActivityFeeStudyPreviewBt.isEnabled =
+            feeText.isNotEmpty() && (feeText.toIntOrNull() ?: 0) > 0
+    }
+
+    private fun updateFee() {
+        val feeText = binding.fragmentActivityFeeStudyEt.text.toString()
+        val fee = feeText.toIntOrNull() ?: 0
+
+        when {
+            feeText.isEmpty() -> {
+                binding.fragmentActivityFeeStudyPreviewBt.isEnabled = false
+                return
+            }
+
+            fee > 100_000 -> {
+                binding.fragmentActivityFeeStudyEt.error = "최대 100,000원까지 입력 가능합니다."
+                binding.fragmentActivityFeeStudyPreviewBt.isEnabled = false
+                return
+            }
+
+            fee < 1_000 -> {
+                binding.fragmentActivityFeeStudyEt.error = "최소 1,000원부터 입력 가능합니다."
+                binding.fragmentActivityFeeStudyPreviewBt.isEnabled = false
+                return
+            }
+
+            else -> binding.fragmentActivityFeeStudyEt.error = null
+        }
+
+        binding.fragmentActivityFeeStudyPreviewBt.isEnabled = true
+
+        val current = registerViewModel.studyRequest.value ?: return
+        if (current.fee != fee || current.hasFee != true) {
+            registerViewModel.setStudyRequest(
+                current.copy(hasFee = true, fee = fee)
+            )
+        }
+    }
+
+    private fun setupPreviewButtonListener() {
+        binding.fragmentActivityFeeStudyPreviewBt.setOnClickListener {
+            when (registerViewModel.mode.value) {
+                StudyFormMode.EDIT -> {
+                    registerViewModel.submitStudyData(
+                        onSuccess = {
+                            val dialog = CorrectStudyCompleteDialog(requireContext())
+                            dialog.start(parentFragmentManager)
+                        },
+                        onFailure = {
+                            Log.e("ActivityFeeStudyFragment", "스터디 수정 실패")
+                        }
+                    )
+                }
+
+                StudyFormMode.CREATE -> {
+                    parentFragmentManager.beginTransaction()
+                        .replace(R.id.main_frm, MyStudyRegisterPreviewFragment())
+                        .addToBackStack(null)
+                        .commit()
+                }
+
+                else -> Unit
+            }
+        }
+
+    }
+
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/IntroduceStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/introduce/IntroduceStudyFragment.kt
similarity index 67%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/IntroduceStudyFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/introduce/IntroduceStudyFragment.kt
index b6d09822..6311f2a0 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/IntroduceStudyFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/introduce/IntroduceStudyFragment.kt
@@ -1,6 +1,6 @@
-package com.example.spoteam_android.ui.study
+package com.example.spoteam_android.presentation.study.register.introduce
 
-import StudyViewModel
+import StudyFormMode
 import android.app.Activity
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -19,75 +19,95 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import com.bumptech.glide.Glide
 import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.FragmentIntroduceStudyBinding
+import com.example.spoteam_android.presentation.study.register.online.OnlineStudyFragment
+import com.example.spoteam_android.presentation.study.register.StudyRegisterViewModel
+import kotlinx.coroutines.launch
 
 class IntroduceStudyFragment : Fragment() {
 
     private lateinit var binding: FragmentIntroduceStudyBinding
+
+    private val registerViewModel: StudyRegisterViewModel by activityViewModels()
+
     private lateinit var getImageLauncher: ActivityResultLauncher<Intent>
     private lateinit var requestPermissionLauncher: ActivityResultLauncher<String>
-    private val viewModel: StudyViewModel by activityViewModels() // Activity 범위에서 ViewModel을 공유
-    private var profileImage: String? = null // 이미지 URI를 저장할 변수 추가
+    private var profileImage: String? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        arguments?.getInt("studyId", -1)?.let {
+            if (it != -1) {
+                registerViewModel.setStudyId(it)
+                Log.d("IntroduceStudyFragment", "Received studyId: $it")
+            }
+        }
+    }
+
 
     override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
+        inflater: LayoutInflater,
+        container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         binding = FragmentIntroduceStudyBinding.inflate(inflater, container, false)
-
         return binding.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
         initActivityResultLaunchers()
         initAddImageButton()
         setupTextWatchers()
+        observeRegisterViewModel()
         setupListeners()
-        observeViewModel()
         checkButtonState()
     }
 
-
-    private fun observeViewModel() {
-        viewModel.studyRequest.observe(viewLifecycleOwner) { request ->
-            if (request != null) {
-                if (viewModel.mode.value == StudyFormMode.EDIT) {
-                    binding.fragmentIntroduceStudyTv.text = "스터디 정보 수정"
-                    binding.fragmentIntroduceStudynameEt.setText(request.title)
-                    binding.fragmentIntroduceStudypurposeEt.setText(request.goal)
-                    binding.fragmentIntroduceStudyEt.setText(request.introduction)
-                }
-
-                val imageUrl = request.profileImage ?: viewModel.profileImageUri.value
-                if (!imageUrl.isNullOrBlank()) {
-                    Glide.with(this)
-                        .load(imageUrl)
-                        .into(binding.fragmentIntroduceStudyIv)
-                    profileImage = imageUrl
-                    checkButtonState()
+    private fun observeRegisterViewModel() {
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewLifecycleOwner.lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                registerViewModel.studyRequest.collect { request ->
+                    if (request != null && registerViewModel.mode.value == StudyFormMode.EDIT) {
+
+                        binding.fragmentIntroduceStudyTv.text = "스터디 정보 수정"
+                        binding.fragmentIntroduceStudynameEt.setText(request.title)
+                        binding.fragmentIntroduceStudypurposeEt.setText(request.goal)
+                        binding.fragmentIntroduceStudyEt.setText(request.introduction)
+
+
+                        val imageUrl = registerViewModel.uploadedImageUrl.value ?: request.profileImage
+                        if (!imageUrl.isNullOrBlank()) {
+                            Glide.with(this@IntroduceStudyFragment)
+                                .load(imageUrl)
+                                .into(binding.fragmentIntroduceStudyIv)
+                            profileImage = imageUrl
+                        }
+                        checkButtonState()
+                    }
                 }
-                checkButtonState()
             }
         }
     }
 
-
-
-
     private fun initActivityResultLaunchers() {
-        // 이미지 선택을 위한 ActivityResultLauncher 초기화
         getImageLauncher =
             registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
                 if (result.resultCode == Activity.RESULT_OK) {
                     val selectedImageURI: Uri? = result.data?.data
                     if (selectedImageURI != null) {
                         binding.fragmentIntroduceStudyIv.setImageURI(selectedImageURI)
-                        profileImage = selectedImageURI.toString() // 이미지 URI를 변수에 저장
-                        viewModel.setProfileImageUri(profileImage) // URI를 ViewModel에 저장
-                        checkButtonState() // 이미지 선택 후 버튼 상태 체크
+                        profileImage = selectedImageURI.toString()
+                        // 여기도 반드시 registerViewModel에 저장
+                        registerViewModel.updateLocalImageUri(profileImage!!)
+                        checkButtonState()
                     } else {
                         Toast.makeText(context, "이미지를 가져오지 못했습니다", Toast.LENGTH_SHORT).show()
                     }
@@ -96,7 +116,6 @@ class IntroduceStudyFragment : Fragment() {
                 }
             }
 
-        // 권한 요청을 위한 ActivityResultLauncher 초기화
         requestPermissionLauncher =
             registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
                 if (isGranted) {
@@ -109,36 +128,27 @@ class IntroduceStudyFragment : Fragment() {
 
     private fun initAddImageButton() {
         binding.fragmentIntroduceStudyIv.setOnClickListener {
-            Log.d("IntroduceStudyFragment", "addImageButton called!!")
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                // Android 13 이상에서는 새로운 권한을 요청
                 when {
                     ContextCompat.checkSelfPermission(
                         requireContext(),
                         android.Manifest.permission.READ_MEDIA_IMAGES
                     ) == PackageManager.PERMISSION_GRANTED -> {
-                        // 권한이 존재하는 경우
                         getImageFromAlbum()
                     }
-
                     else -> {
-                        // 권한 요청
                         requestPermissionLauncher.launch(android.Manifest.permission.READ_MEDIA_IMAGES)
                     }
                 }
             } else {
-                // Android 12 이하에서는 기존 권한 사용
                 when {
                     ContextCompat.checkSelfPermission(
                         requireContext(),
                         android.Manifest.permission.READ_EXTERNAL_STORAGE
                     ) == PackageManager.PERMISSION_GRANTED -> {
-                        // 권한이 존재하는 경우
                         getImageFromAlbum()
                     }
-
                     else -> {
-                        // 권한 요청
                         requestPermissionLauncher.launch(android.Manifest.permission.READ_EXTERNAL_STORAGE)
                     }
                 }
@@ -161,7 +171,6 @@ class IntroduceStudyFragment : Fragment() {
                 binding.hintRightStudyName.visibility = if (visible) View.VISIBLE else View.GONE
                 checkButtonState()
             }
-
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
         })
@@ -173,30 +182,24 @@ class IntroduceStudyFragment : Fragment() {
                 binding.hintRightStudyGoal.visibility = if (visible) View.VISIBLE else View.GONE
                 checkButtonState()
             }
-
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
         })
+
         binding.fragmentIntroduceStudyEt.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {
                 checkButtonState()
             }
-
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
         })
     }
 
-
     private fun checkButtonState() {
         val isEditTextFilled = binding.fragmentIntroduceStudynameEt.text.isNotEmpty() &&
                 binding.fragmentIntroduceStudypurposeEt.text.isNotEmpty() &&
                 binding.fragmentIntroduceStudyEt.text.isNotEmpty()
-
-        // profileImage가 null이 아닌지 확인
         val isImageSelected = profileImage != null
-
-        // 모든 조건이 만족해야 버튼을 활성화
         binding.fragmentIntroduceStudyBt.isEnabled = isEditTextFilled && isImageSelected
     }
 
@@ -204,62 +207,34 @@ class IntroduceStudyFragment : Fragment() {
         val title = binding.fragmentIntroduceStudynameEt.text.toString()
         val goal = binding.fragmentIntroduceStudypurposeEt.text.toString()
         val introduction = binding.fragmentIntroduceStudyEt.text.toString()
-        val isOnline = viewModel.studyRequest.value?.isOnline ?: true
-        val regions = viewModel.studyRequest.value?.regions
-        val maxPeople = viewModel.studyRequest.value?.maxPeople ?: 0
-        val gender = viewModel.studyRequest.value?.gender ?: Gender.UNKNOWN
-        val minAge = viewModel.studyRequest.value?.minAge ?: 0
-        val maxAge = viewModel.studyRequest.value?.maxAge ?: 0
-        val fee = viewModel.studyRequest.value?.fee ?: 0
-        val hasFee = viewModel.studyRequest.value?.hasFee
-
-        viewModel.setStudyData(
-            title = title,
-            goal = goal,
-            introduction = introduction,
-            isOnline = isOnline,
-            profileImage = profileImage,
-            regions = regions,
-            maxPeople = maxPeople,
-            gender = gender,
-            minAge = minAge,
-            maxAge = maxAge,
-            fee = fee,
-            hasFee = hasFee
 
-        )
+        registerViewModel.updateTitleGoalIntro(title, goal, introduction)
     }
 
     private fun setupListeners() {
         binding.fragmentIntroduceStudyBt.setOnClickListener {
-            goToNextFragment()
-        }
-        binding.fragmentIntroduceStudyBackBt.setOnClickListener {
-            parentFragmentManager.popBackStack()
-        }
-        binding.fragmentIntroduceStudyBt.setOnClickListener {
-            if (profileImage == null) { // profileImage가 null인지 확인
+            if (profileImage == null) {
                 Toast.makeText(context, "프로필 이미지를 선택해주세요.", Toast.LENGTH_SHORT).show()
-                return@setOnClickListener // 이미지가 선택되지 않으면 함수 종료
+                return@setOnClickListener
             }
             saveStudyData()
             goToNextFragment()
         }
+        binding.fragmentIntroduceStudyBackBt.setOnClickListener {
+            parentFragmentManager.popBackStack()
+        }
     }
 
-
     private fun goToNextFragment() {
         val nextFragment = OnlineStudyFragment().apply {
             arguments = Bundle().apply {
-                putSerializable("mode", viewModel.mode.value)
-                viewModel.studyId.value?.let { putInt("studyId", it) }
+                putSerializable("mode", registerViewModel.mode.value)
+                registerViewModel.studyId.value?.let { putInt("studyId", it) }
             }
         }
-
         parentFragmentManager.beginTransaction()
             .replace(R.id.main_frm, nextFragment)
             .addToBackStack(null)
             .commit()
     }
 }
-
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/introduce/IntroduceStudyShortFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/introduce/IntroduceStudyShortFragment.kt
new file mode 100644
index 00000000..b7452168
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/introduce/IntroduceStudyShortFragment.kt
@@ -0,0 +1,64 @@
+package com.example.spoteam_android.presentation.study.register.introduce
+
+import android.content.Context
+import android.graphics.Color
+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.activityViewModels
+import com.bumptech.glide.Glide
+import com.example.spoteam_android.R
+import com.example.spoteam_android.databinding.FragmentIntroduceStudyShortBinding
+import com.example.spoteam_android.presentation.study.register.StudyRegisterViewModel
+
+class IntroduceStudyShortFragment : Fragment() {
+
+    private lateinit var binding: FragmentIntroduceStudyShortBinding
+    private val viewModel: StudyRegisterViewModel by activityViewModels()
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentIntroduceStudyShortBinding.inflate(inflater, container, false)
+
+        updateUIWithData()
+
+        return binding.root
+    }
+
+    private fun updateUIWithData() {
+        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
+        val email = sharedPreferences.getString("currentEmail", null)
+
+        if (email != null) {
+            val nickname = sharedPreferences.getString("${email}_nickname", null)
+            binding.profileNickname.text="${nickname}"
+
+            val loginPlatform = sharedPreferences.getString("loginPlatform", null)
+            val profileImageUrl = if (!email.isNullOrEmpty() && !loginPlatform.isNullOrEmpty()) {
+                sharedPreferences.getString("${email}_${loginPlatform}ProfileImageUrl", null)
+            } else {
+                null
+            }
+
+            viewModel.studyRequest.value?.let { studyData ->
+                binding.fragmentIntroduceStudyShortTv.text = studyData.introduction
+                binding.fragmentIntroduceStudyShortTv.setTextColor(Color.parseColor("#2D2D2D"))
+            }
+
+            Glide.with(binding.root.context)
+                .load(profileImageUrl)
+                .error(R.drawable.fragment_calendar_spot_logo)
+                .fallback(R.drawable.fragment_calendar_spot_logo)
+                .into(binding.fragmentDetailStudyHomeHostuserIv)
+
+        }
+    }
+
+
+
+
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/FixedRoundedSpinnerAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/member/FixedRoundedSpinnerAdapter.kt
similarity index 91%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/FixedRoundedSpinnerAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/member/FixedRoundedSpinnerAdapter.kt
index 12c39e9f..e9299c91 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/FixedRoundedSpinnerAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/member/FixedRoundedSpinnerAdapter.kt
@@ -1,11 +1,9 @@
-package com.example.spoteam_android.ui.study
+package com.example.spoteam_android.presentation.study.register.member
 
 import android.content.Context
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
-import android.widget.TextView
 import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.SpinnerDropdownItemBinding
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MemberNumberRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/member/MemberNumberRVAdapter.kt
similarity index 93%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MemberNumberRVAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/member/MemberNumberRVAdapter.kt
index 85fd7e7b..0fdc1cab 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MemberNumberRVAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/member/MemberNumberRVAdapter.kt
@@ -1,11 +1,9 @@
-package com.example.spoteam_android.ui.study
+package com.example.spoteam_android.presentation.study.register.member
 
 import android.graphics.Color
-import android.graphics.Typeface
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.TextView
-import androidx.core.content.res.ResourcesCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.example.spoteam_android.R
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MemberStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/member/MemberStudyFragment.kt
similarity index 52%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MemberStudyFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/member/MemberStudyFragment.kt
index bc43d958..d5bfc416 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MemberStudyFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/member/MemberStudyFragment.kt
@@ -1,25 +1,41 @@
+package com.example.spoteam_android.presentation.study.register.member
+
+import StudyFormMode
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ArrayAdapter
-import android.widget.Spinner
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.LinearSnapHelper
 import androidx.recyclerview.widget.RecyclerView
 import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.FragmentMemberStudyBinding
-import com.example.spoteam_android.ui.study.FixedRoundedSpinnerAdapter
-import com.example.spoteam_android.ui.study.MemberNumberRVAdapter
-import com.example.spoteam_android.ui.study.OnlineStudyFragment
+import com.example.spoteam_android.presentation.study.register.activityfee.ActivityFeeStudyFragment
+import com.example.spoteam_android.presentation.study.register.StudyRegisterViewModel
+import kotlinx.coroutines.launch
+
 
 class MemberStudyFragment : Fragment() {
+
     private lateinit var binding: FragmentMemberStudyBinding
-    private val viewModel: StudyViewModel by activityViewModels()
+    private val registerViewModel: StudyRegisterViewModel by activityViewModels()
     private lateinit var memberAdapter: MemberNumberRVAdapter
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        arguments?.getInt("studyId", -1)?.let {
+            if (it != -1) {
+                registerViewModel.setStudyId(it)
+            }
+        }
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -28,24 +44,50 @@ class MemberStudyFragment : Fragment() {
 
         setupSpinners()
         setupRangeSlider()
-        binding.fragmentMemberStudyBt.setOnClickListener {
-            saveData()
-            goToNextFragment()
-        }
-        binding.fragmentMemberStudyBackBt.setOnClickListener {
-            goToPreviusFragment()
+        setupMemberRecycler()
+        setupListeners()
+        observeRegisterViewModel()
+
+        return binding.root
+    }
+
+    private fun setupSpinners() {
+        val genderList = listOf("누구나", "남성", "여성")
+        val genderAdapter = FixedRoundedSpinnerAdapter(requireContext(), genderList)
+        binding.fragmentMemberStudyGenderSpinner.adapter = genderAdapter
+    }
+
+    private fun setupRangeSlider() {
+        val ageRangeSlider = binding.fragmentMemberStudyAgeAgeRangeSlider
+        val minValueText = binding.fragmentMemberStudyAgeMinValueTv
+        val maxValueText = binding.fragmentMemberStudyAgeMaxValueTv
+
+        ageRangeSlider.valueFrom = 18f
+        ageRangeSlider.valueTo = 60f
+        ageRangeSlider.stepSize = 1f
+        ageRangeSlider.values = listOf(18f, 60f)
+
+        ageRangeSlider.addOnChangeListener { slider, _, _ ->
+            val values = slider.values
+            minValueText.text = values[0].toInt().toString()
+            maxValueText.text = values[1].toInt().toString()
         }
+    }
 
+    private fun setupMemberRecycler() {
         val numbers = (1..9).toList()
         memberAdapter = MemberNumberRVAdapter(numbers)
         val snapHelper = LinearSnapHelper()
         snapHelper.attachToRecyclerView(binding.rvMemberStudyNum)
 
+        binding.rvMemberStudyNum.adapter = memberAdapter
+        binding.rvMemberStudyNum.layoutManager =
+            LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
+
         binding.rvMemberStudyNum.addOnScrollListener(object : RecyclerView.OnScrollListener() {
             override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                 updateChildAlpha()
             }
-
             override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
                 if (newState == RecyclerView.SCROLL_STATE_IDLE) {
                     updateChildAlpha()
@@ -53,117 +95,96 @@ class MemberStudyFragment : Fragment() {
             }
         })
 
-
-
-
-
-
-                binding.rvMemberStudyNum.adapter = memberAdapter
-        binding.rvMemberStudyNum.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
-
-
         memberAdapter.onItemClick = { position ->
             smoothScrollToCenter(position)
             memberAdapter.setSelectedPosition(position)
             binding.selectedNumberText.text = "${String.format("%02d", numbers[position])}명"
             binding.fragmentMemberStudyBt.isEnabled = true
         }
+    }
 
-        viewModel.studyRequest.observe(viewLifecycleOwner) { request ->
-            if (viewModel.mode.value == StudyFormMode.EDIT && request != null) {
-                binding.fragmentMemberStudyTv.text = "스터디 정보 수정"
-                // 참여 인원 반영
-                val index = (1..9).indexOf(request.maxPeople)
-                if (index != -1) {
-                    memberAdapter.setSelectedPosition(index)
-                    smoothScrollToCenter(index)
-                    binding.selectedNumberText.text = "${String.format("%02d", request.maxPeople)}명"
-                    binding.fragmentMemberStudyBt.isEnabled = true
-                }
-
-                // 성별 반영
-                val genderIndex = when (request.gender) {
-                    Gender.MALE -> 1
-                    Gender.FEMALE -> 2
-                    else -> 0
+    private fun observeRegisterViewModel() {
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewLifecycleOwner.lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                registerViewModel.studyRequest.collect { request ->
+                    if (request == null) return@collect
+
+                    if (registerViewModel.mode.value == StudyFormMode.EDIT) {
+                        binding.fragmentMemberStudyTv.text = "스터디 정보 수정"
+
+                        // maxPeople 반영
+                        val index = (1..9).indexOf(request.maxPeople)
+                        if (index != -1) {
+                            memberAdapter.setSelectedPosition(index)
+                            smoothScrollToCenter(index)
+                            binding.selectedNumberText.text =
+                                "${String.format("%02d", request.maxPeople)}명"
+                            binding.fragmentMemberStudyBt.isEnabled = true
+                        }
+
+                        // gender 반영
+                        val genderIndex = when (request.gender) {
+                            "MALE" -> 1
+                            "FEMALE" -> 2
+                            else -> 0
+                        }
+                        binding.fragmentMemberStudyGenderSpinner.setSelection(genderIndex)
+
+                        // ageRange 반영
+                        val slider = binding.fragmentMemberStudyAgeAgeRangeSlider
+                        slider.setValues(
+                            request.minAge.toFloat(),
+                            request.maxAge.toFloat()
+                        )
+                        binding.fragmentMemberStudyAgeMinValueTv.text =
+                            request.minAge.toString()
+                        binding.fragmentMemberStudyAgeMaxValueTv.text =
+                            request.maxAge.toString()
+                    }
                 }
-                binding.fragmentMemberStudyGenderSpinner.setSelection(genderIndex)
-
-                // 연령대 반영
-                val slider = binding.fragmentMemberStudyAgeAgeRangeSlider
-                slider.setValues(request.minAge.toFloat(), request.maxAge.toFloat())
-                binding.fragmentMemberStudyAgeMinValueTv.text = request.minAge.toString()
-                binding.fragmentMemberStudyAgeMaxValueTv.text = request.maxAge.toString()
             }
         }
-        return binding.root
     }
 
-
-    private fun setupSpinners() {
-        val genderList = listOf("누구나", "남성", "여성")
-        val genderAdapter = FixedRoundedSpinnerAdapter(requireContext(), genderList)
-        binding.fragmentMemberStudyGenderSpinner.adapter = genderAdapter
-    }
-
-
-
-    private fun setupRangeSlider() {
-        val ageRangeSlider = binding.fragmentMemberStudyAgeAgeRangeSlider
-        val minValueText = binding.fragmentMemberStudyAgeMinValueTv
-        val maxValueText = binding.fragmentMemberStudyAgeMaxValueTv
-
-        ageRangeSlider.valueFrom = 18f
-        ageRangeSlider.valueTo = 60f
-        ageRangeSlider.stepSize = 1f
-        ageRangeSlider.values = listOf(18f, 60f)
-
-        ageRangeSlider.addOnChangeListener { slider, _, _ ->
-            val values = slider.values
-            minValueText.text = values[0].toInt().toString()
-            maxValueText.text = values[1].toInt().toString()
+    private fun setupListeners() {
+        binding.fragmentMemberStudyBt.setOnClickListener {
+            saveData()
+            goToNextFragment()
+        }
+        binding.fragmentMemberStudyBackBt.setOnClickListener {
+            parentFragmentManager.popBackStack()
         }
     }
 
     private fun saveData() {
         val maxPeople = memberAdapter.getSelectedNumber()
-
-        val selectedGender = binding.fragmentMemberStudyGenderSpinner.selectedItem.toString()
+        val selectedGender =
+            binding.fragmentMemberStudyGenderSpinner.selectedItem.toString()
         val gender = when (selectedGender) {
-            "남성" -> Gender.MALE
-            "여성" -> Gender.FEMALE
-            else -> Gender.UNKNOWN
+            "남성" -> "MALE"
+            "여성" -> "FEMALE"
+            else -> "UNKNOWN"
         }
 
-        val ageRangeSlider = binding.fragmentMemberStudyAgeAgeRangeSlider
-        val minAge = ageRangeSlider.values[0].toInt()
-        val maxAge = ageRangeSlider.values[1].toInt()
-
-        val profileImage = viewModel.studyRequest.value?.profileImage
-        val hasFee = viewModel.studyRequest.value?.hasFee
-
-        viewModel.setStudyData(
-            title = viewModel.studyRequest.value?.title.orEmpty(),
-            goal = viewModel.studyRequest.value?.goal.orEmpty(),
-            introduction = viewModel.studyRequest.value?.introduction.orEmpty(),
-            isOnline = viewModel.studyRequest.value?.isOnline ?: true,
-            regions = viewModel.studyRequest.value?.regions ?: emptyList(),
+        val slider = binding.fragmentMemberStudyAgeAgeRangeSlider
+        val minAge = slider.values[0].toInt()
+        val maxAge = slider.values[1].toInt()
+
+        val current = registerViewModel.studyRequest.value ?: return
+        val updated = current.copy(
             maxPeople = maxPeople,
             gender = gender,
             minAge = minAge,
-            maxAge = maxAge,
-            fee = viewModel.studyRequest.value?.fee ?: 0,
-            profileImage = profileImage,
-            hasFee = hasFee
+            maxAge = maxAge
         )
-
+        registerViewModel.setStudyRequest(updated)
     }
 
     private fun goToNextFragment() {
         val nextFragment = ActivityFeeStudyFragment().apply {
             arguments = Bundle().apply {
-                putSerializable("mode", viewModel.mode.value)
-                viewModel.studyId.value?.let { putInt("studyId", it) }
+                putSerializable("mode", registerViewModel.mode.value)
+                registerViewModel.studyId.value?.let { putInt("studyId", it) }
             }
         }
         parentFragmentManager.beginTransaction()
@@ -171,11 +192,14 @@ class MemberStudyFragment : Fragment() {
             .addToBackStack(null)
             .commit()
     }
-    private fun goToPreviusFragment() {
+
+    private fun goToPreviousFragment() {
         parentFragmentManager.popBackStack()
     }
+
     private fun smoothScrollToCenter(position: Int) {
-        val layoutManager = binding.rvMemberStudyNum.layoutManager as LinearLayoutManager
+        val layoutManager =
+            binding.rvMemberStudyNum.layoutManager as LinearLayoutManager
         val view = layoutManager.findViewByPosition(position)
         if (view != null) {
             val rvCenterX = binding.rvMemberStudyNum.width / 2
@@ -185,24 +209,21 @@ class MemberStudyFragment : Fragment() {
         } else {
             binding.rvMemberStudyNum.scrollToPosition(position)
         }
-
         binding.rvMemberStudyNum.postDelayed({
             updateChildAlpha()
         }, 200)
     }
 
     private fun updateChildAlpha() {
-        val layoutManager = binding.rvMemberStudyNum.layoutManager as LinearLayoutManager
+        val layoutManager =
+            binding.rvMemberStudyNum.layoutManager as LinearLayoutManager
         val firstVisible = layoutManager.findFirstVisibleItemPosition()
         val lastVisible = layoutManager.findLastVisibleItemPosition()
-
         for (i in firstVisible..lastVisible) {
-            val view = layoutManager.findViewByPosition(i) ?: continue
+            val view =
+                layoutManager.findViewByPosition(i) ?: continue
             val alpha = if (i == firstVisible || i == lastVisible) 0.4f else 1f
             view.alpha = alpha
         }
     }
-
-
-
-}
\ No newline at end of file
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/LocationStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/online/LocationStudyFragment.kt
similarity index 71%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/LocationStudyFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/online/LocationStudyFragment.kt
index 0aa691b2..4b77d4b8 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/LocationStudyFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/online/LocationStudyFragment.kt
@@ -1,3 +1,5 @@
+package com.example.spoteam_android.presentation.study.register.online
+
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
@@ -9,12 +11,8 @@ import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.FragmentLocationStudyBinding
-import com.example.spoteam_android.login.LocationItem
-import com.example.spoteam_android.ui.study.IntroduceStudyFragment
-import com.example.spoteam_android.ui.study.OnlineStudyFragment
-import com.example.spoteam_android.ui.study.RegisterStudyFragment
-import java.io.BufferedReader
-import java.io.InputStreamReader
+import com.example.spoteam_android.presentation.login.checklist.LocationItem
+import com.example.spoteam_android.presentation.login.checklist.LocationSearchAdapter
 
 class LocationStudyFragment : Fragment() {
 
@@ -25,21 +23,21 @@ class LocationStudyFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         binding = FragmentLocationStudyBinding.inflate(inflater, container, false)
         setupRecyclerView()
         setupSearchFunctionality()
         loadLocalTsvFile()
 
         binding.fragmentLocationStudyBackBt.setOnClickListener {
-            goToPreviusFragment()
+            parentFragmentManager.popBackStack()
         }
         return binding.root
     }
 
     private fun setupRecyclerView() {
         locationSearchAdapter = LocationSearchAdapter(locationItemList) { item ->
-            openOnlineStudyFragment(item.address)
+            openOnlineStudyFragment(item.address, item.code)
         }
         binding.activityLocationRv.apply {
             layoutManager = LinearLayoutManager(context)
@@ -49,10 +47,12 @@ class LocationStudyFragment : Fragment() {
     }
 
     private fun setupSearchFunctionality() {
-        binding.activityLocationSearchEt.setOnTouchListener { v, event ->
+        binding.activityLocationSearchEt.setOnTouchListener { _, event ->
             if (event.action == MotionEvent.ACTION_UP) {
                 val drawableEnd = binding.activityLocationSearchEt.compoundDrawables[2]
-                if (drawableEnd != null && event.rawX >= (binding.activityLocationSearchEt.right - drawableEnd.bounds.width())) {
+                if (drawableEnd != null &&
+                    event.rawX >= (binding.activityLocationSearchEt.right - drawableEnd.bounds.width())
+                ) {
                     performSearch()
                     return@setOnTouchListener true
                 }
@@ -71,14 +71,13 @@ class LocationStudyFragment : Fragment() {
 
     private fun loadLocalTsvFile() {
         val inputStream = requireContext().assets.open("region_data_processed.tsv")
-        val reader = BufferedReader(InputStreamReader(inputStream))
+        val reader = inputStream.bufferedReader()
         val tsvData = reader.use { it.readText() }
         parseTsvData(tsvData)
     }
 
     private fun parseTsvData(tsvData: String) {
         val rows = tsvData.split("\n").drop(1)
-
         locationItemList.clear()
         for (row in rows) {
             val columns = row.split("\t")
@@ -93,40 +92,28 @@ class LocationStudyFragment : Fragment() {
                 locationItemList.add(item)
             }
         }
-
         locationSearchAdapter.notifyDataSetChanged()
-
-        binding.activityLocationRv.visibility = if (locationSearchAdapter.itemCount > 0) View.VISIBLE else View.GONE
+        binding.activityLocationRv.visibility =
+            if (locationSearchAdapter.itemCount > 0) View.VISIBLE else View.GONE
     }
 
     private fun performSearch() {
         val query = binding.activityLocationSearchEt.text.toString()
         locationSearchAdapter.filter(query)
-        binding.activityLocationRv.visibility = if (locationSearchAdapter.itemCount > 0) {
-            View.VISIBLE
-        } else {
-            View.GONE
-        }
+        binding.activityLocationRv.visibility =
+            if (locationSearchAdapter.itemCount > 0) View.VISIBLE else View.GONE
     }
 
-    private fun openOnlineStudyFragment(address: String) {
+    private fun openOnlineStudyFragment(address: String, code: String) {
         val fragment = OnlineStudyFragment()
         val bundle = Bundle().apply {
             putString("ADDRESS", address)
             putBoolean("IS_OFFLINE", true)
-            val selectedItemCode = locationSearchAdapter.getSelectedItem()?.code
-            putString("CODE", selectedItemCode)
+            putString("CODE", code)
         }
         fragment.arguments = bundle
         parentFragmentManager.beginTransaction()
             .replace(R.id.main_frm, fragment)
             .commit()
     }
-
-    private fun goToPreviusFragment() {
-        val transaction = parentFragmentManager.beginTransaction()
-        transaction.replace(R.id.main_frm, OnlineStudyFragment())
-        transaction.addToBackStack(null)
-        transaction.commit()
-    }
 }
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/online/OnlineStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/online/OnlineStudyFragment.kt
new file mode 100644
index 00000000..afc1adf8
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/online/OnlineStudyFragment.kt
@@ -0,0 +1,312 @@
+package com.example.spoteam_android.presentation.study.register.online
+
+import android.content.res.Resources
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.constraintlayout.widget.ConstraintSet
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.example.spoteam_android.R
+import com.example.spoteam_android.core.util.parseLocationTsv
+import com.example.spoteam_android.databinding.FragmentOnlineStudyBinding
+import com.example.spoteam_android.domain.study.entity.StudyRegisterRequest
+import com.example.spoteam_android.presentation.study.register.StudyRegisterViewModel
+import com.example.spoteam_android.presentation.study.register.member.MemberStudyFragment
+import com.google.android.material.chip.Chip
+import kotlinx.coroutines.launch
+
+class OnlineStudyFragment : Fragment() {
+    private lateinit var binding: FragmentOnlineStudyBinding
+
+    private val registerViewModel: StudyRegisterViewModel by activityViewModels()
+
+    private var isLocationPlusVisible: Boolean = false
+    private var selectedLocationCode: String? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        arguments?.getInt("studyId", -1)?.let {
+            if (it != -1) {
+                registerViewModel.setStudyId(it)
+            }
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentOnlineStudyBinding.inflate(inflater, container, false)
+
+        parseLocationTsv(requireContext())
+
+        if (registerViewModel.mode.value == StudyFormMode.CREATE) {
+            registerViewModel.updateRegions(emptyList())
+            arguments?.let {
+                val address = it.getString("ADDRESS")
+                val isOffline = it.getBoolean("IS_OFFLINE", false)
+                selectedLocationCode = it.getString("CODE")
+
+                if (isOffline) {
+                    address?.let { addr -> updateChip(addr) }
+                    setChipState(false)
+                    isLocationPlusVisible = true
+                    updateLocationPlusLayoutVisibility(true)
+                } else {
+                    clearChipSelection()
+                    updateLocationPlusLayoutVisibility(false)
+                    binding.fragmentOnlineStudyBt.isEnabled = false
+                }
+            } ?: run {
+                clearChipSelection()
+                updateLocationPlusLayoutVisibility(false)
+                binding.fragmentOnlineStudyBt.isEnabled = false
+            }
+        }
+
+        observeRegisterViewModel()
+        setupChipGroupListener()
+        setupChipCloseListener()
+
+        binding.fragmentOnlineStudyBt.setOnClickListener {
+            saveData()
+            goToNextFragment()
+        }
+
+        binding.fragmentOnlineStudyLocationPlusBt.setOnClickListener {
+            goToLocationFragment()
+        }
+
+        binding.fragmentOnlineStudyBackBt.setOnClickListener {
+            goToPreviousFragment()
+        }
+
+        return binding.root
+    }
+
+    override fun onResume() {
+        super.onResume()
+        arguments?.let {
+            val address = it.getString("ADDRESS")
+            val code = it.getString("CODE")
+            if (!address.isNullOrBlank() && !code.isNullOrBlank()) {
+                updateChip(address)
+                selectedLocationCode = code
+
+                val current = registerViewModel.studyRequest.value
+                val isOnlineSelected = binding.fragmentOnlineStudyChipOffline.isChecked.not()
+                if (registerViewModel.mode.value == StudyFormMode.EDIT && current != null) {
+                    val updated = current.copy(
+                        isOnline = isOnlineSelected.not(),
+                        regions = listOf(code)
+                    )
+                    registerViewModel.setStudyRequest(updated)
+                }
+            }
+            it.clear()
+        }
+    }
+
+    private fun observeRegisterViewModel() {
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewLifecycleOwner.lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                registerViewModel.studyRequest.collect { request ->
+                    if (request == null) return@collect
+
+                    if (registerViewModel.mode.value == StudyFormMode.EDIT) {
+                        binding.fragmentOnlineStudyTv.text = "스터디 정보 수정"
+                    }
+
+                    setChipState(request.isOnline)
+                    isLocationPlusVisible = !request.isOnline
+                    updateLocationPlusLayoutVisibility(isLocationPlusVisible)
+
+                    val newCode = request.regions?.firstOrNull()
+                    if (!request.isOnline && newCode != null && newCode != selectedLocationCode) {
+                        updateChip(registerViewModel.uploadedImageUrl.value ?: "")
+                        selectedLocationCode = newCode
+                    } else if (!request.isOnline && newCode == null) {
+                        binding.locationChip.visibility = View.GONE
+                    }
+
+                    updateNextButtonState()
+                }
+            }
+        }
+    }
+
+    private fun updateChip(address: String) {
+        binding.fragmentOnlineStudyLocationPlusCl.visibility = View.VISIBLE
+        binding.locationChip.apply {
+            visibility = View.VISIBLE
+            text = address
+        }
+        binding.locationChip.post {
+            updateNextButtonState()
+        }
+    }
+
+    private fun setupChipGroupListener() {
+        binding.fragmentOnlineStudyChipOnline.setOnClickListener {
+            selectChip(binding.fragmentOnlineStudyChipOnline)
+        }
+        binding.fragmentOnlineStudyChipOffline.setOnClickListener {
+            selectChip(binding.fragmentOnlineStudyChipOffline)
+        }
+    }
+
+    private fun selectChip(selectedChip: Chip) {
+        binding.fragmentOnlineStudyChipOnline.isChecked = false
+        binding.fragmentOnlineStudyChipOffline.isChecked = false
+        selectedChip.isChecked = true
+
+        val isOnline = selectedChip.id == R.id.fragment_online_study_chip_online
+        isLocationPlusVisible = !isOnline
+
+        val current = registerViewModel.studyRequest.value
+            ?: StudyRegisterRequest(
+                themes = emptyList(),
+                title = "",
+                goal = "",
+                introduction = "",
+                isOnline = true,
+                profileImage = null,
+                regions = null,
+                maxPeople = 0,
+                gender = "ALL",
+                minAge = 0,
+                maxAge = 0,
+                fee = 0,
+                hasFee = false
+            )
+
+        val updated = current.copy(
+            isOnline = isOnline,
+            regions = if (isOnline) null else current.regions ?: emptyList()
+        )
+        registerViewModel.setStudyRequest(updated)
+
+        updateLocationPlusLayoutVisibility(isLocationPlusVisible)
+        updateNextButtonState()
+    }
+
+    private fun setupChipCloseListener() {
+        binding.locationChip.setOnCloseIconClickListener {
+            binding.locationChip.visibility = View.GONE
+            selectedLocationCode = null
+
+            if (registerViewModel.mode.value == StudyFormMode.EDIT) {
+                val current = registerViewModel.studyRequest.value
+                current?.let {
+                    val cleared = it.copy(regions = null)
+                    registerViewModel.setStudyRequest(cleared)
+                }
+            }
+
+            updateNextButtonState()
+        }
+    }
+
+    private fun setChipState(isOnline: Boolean) {
+        binding.fragmentOnlineStudyChipOnline.isChecked = isOnline
+        binding.fragmentOnlineStudyChipOffline.isChecked = !isOnline
+        binding.fragmentOnlineStudyBt.isEnabled = isOnline
+    }
+
+    private fun updateLocationPlusLayoutVisibility(visible: Boolean) {
+        val locationBtn = binding.fragmentOnlineStudyLocationPlusBt
+        val nextBtn = binding.fragmentOnlineStudyBt
+        val params = nextBtn.layoutParams as ViewGroup.MarginLayoutParams
+
+        if (visible) {
+            locationBtn.visibility = View.VISIBLE
+            params.marginStart = 6.dpToPx()
+            nextBtn.layoutParams = params
+
+            val constraintSet = ConstraintSet()
+            constraintSet.clone(binding.fragmentOnlineStudyButtonContainer)
+
+            constraintSet.connect(locationBtn.id, ConstraintSet.START, ConstraintSet.PARENT_ID, ConstraintSet.START)
+            constraintSet.connect(locationBtn.id, ConstraintSet.END, nextBtn.id, ConstraintSet.START)
+
+            constraintSet.connect(nextBtn.id, ConstraintSet.START, locationBtn.id, ConstraintSet.END)
+            constraintSet.connect(nextBtn.id, ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END)
+
+            constraintSet.applyTo(binding.fragmentOnlineStudyButtonContainer)
+        } else {
+            locationBtn.visibility = View.GONE
+            params.marginStart = 0
+            nextBtn.layoutParams = params
+
+            val constraintSet = ConstraintSet()
+            constraintSet.clone(binding.fragmentOnlineStudyButtonContainer)
+
+            constraintSet.connect(nextBtn.id, ConstraintSet.START, ConstraintSet.PARENT_ID, ConstraintSet.START)
+            constraintSet.connect(nextBtn.id, ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END)
+
+            constraintSet.clear(locationBtn.id)
+
+            constraintSet.applyTo(binding.fragmentOnlineStudyButtonContainer)
+        }
+    }
+
+    private fun updateNextButtonState() {
+        val isOnline = binding.fragmentOnlineStudyChipOnline.isChecked
+        val hasChip = binding.locationChip.visibility == View.VISIBLE
+
+        binding.fragmentOnlineStudyBt.visibility = View.VISIBLE
+        binding.fragmentOnlineStudyBt.isEnabled = isOnline || hasChip
+        binding.fragmentOnlineStudyLocationPlusBt.visibility = if (isOnline) View.GONE else View.VISIBLE
+    }
+
+    private fun saveData() {
+        val current = registerViewModel.studyRequest.value ?: return
+        val regions = selectedLocationCode?.let { listOf(it) } ?: emptyList()
+        val preservedProfileImage = current.profileImage ?: registerViewModel.localImageUri.value
+
+        val updated = current.copy(
+            isOnline = binding.fragmentOnlineStudyChipOnline.isChecked,
+            regions = if (binding.fragmentOnlineStudyChipOnline.isChecked) null else regions,
+            profileImage = preservedProfileImage
+        )
+        registerViewModel.setStudyRequest(updated)
+    }
+
+    private fun clearChipSelection() {
+        binding.fragmentOnlineStudyChipOnline.isChecked = false
+        binding.fragmentOnlineStudyChipOffline.isChecked = false
+    }
+
+    private fun goToNextFragment() {
+        val nextFragment = MemberStudyFragment().apply {
+            arguments = Bundle().apply {
+                putSerializable("mode", registerViewModel.mode.value)
+                registerViewModel.studyId.value?.let { putInt("studyId", it) }
+            }
+        }
+        parentFragmentManager.beginTransaction()
+            .replace(R.id.main_frm, nextFragment)
+            .addToBackStack(null)
+            .commit()
+    }
+
+    private fun goToPreviousFragment() {
+        parentFragmentManager.popBackStack()
+    }
+
+    private fun goToLocationFragment() {
+        parentFragmentManager.beginTransaction()
+            .replace(R.id.main_frm, LocationStudyFragment())
+            .addToBackStack(null)
+            .commit()
+    }
+
+    private fun Int.dpToPx(): Int =
+        (this * Resources.getSystem().displayMetrics.density).toInt()
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/preview/MyStudyRegisterPreviewFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/preview/MyStudyRegisterPreviewFragment.kt
new file mode 100644
index 00000000..3b41ea72
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/preview/MyStudyRegisterPreviewFragment.kt
@@ -0,0 +1,197 @@
+package com.example.spoteam_android.presentation.study.register.preview
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.net.Uri
+import android.os.Bundle
+import android.util.Log
+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.activityViewModels
+import androidx.lifecycle.lifecycleScope
+import com.bumptech.glide.Glide
+import com.example.spoteam_android.R
+import com.example.spoteam_android.databinding.FragmentMyStudyRegisterPreviewBinding
+import com.example.spoteam_android.presentation.study.register.util.StudyRegisterCompleteDialog
+import com.example.spoteam_android.presentation.study.StudyViewModel
+import com.example.spoteam_android.presentation.study.register.StudyRegisterViewModel
+import com.google.android.material.tabs.TabLayout
+import com.google.android.material.tabs.TabLayoutMediator
+import kotlinx.coroutines.launch
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.MultipartBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import java.io.File
+import java.io.FileOutputStream
+
+class MyStudyRegisterPreviewFragment : Fragment() {
+
+    private lateinit var binding: FragmentMyStudyRegisterPreviewBinding
+
+    private val registerViewModel: StudyRegisterViewModel by activityViewModels()
+
+    private val studyViewModel: StudyViewModel by activityViewModels()
+
+    private var imageUri: Uri? = null
+    private val tabList = arrayListOf("홈", "일정", "커뮤니티", "갤러리", "투두쉐어링")
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentMyStudyRegisterPreviewBinding.inflate(inflater, container, false)
+
+        studyViewModel.loadNickname()
+
+        setupViewPagerAndTabs()
+
+        setProfileImageUri()
+
+        updateUIWithData()
+
+        lifecycleScope.launch {
+            registerViewModel.localImageUri.collect { uriString ->
+                imageUri = uriString?.let { Uri.parse(it) }
+            }
+        }
+
+        binding.fragmentMyStudyRegisterPreviewRegisterBt.setOnClickListener {
+            onRegisterButtonClicked()
+        }
+
+        // 6) “뒤로가기” 버튼
+        binding.fragmentMyStudyRegisterPreviewBt.setOnClickListener {
+            parentFragmentManager.popBackStack()
+        }
+
+        return binding.root
+    }
+
+    private fun setupViewPagerAndTabs() {
+        val pagerAdapter = MyStudyRegisterPreviewVPAdapter(this)
+        binding.fragmentMyStudyRegisterPreviewVp.adapter = pagerAdapter
+
+        TabLayoutMediator(
+            binding.fragmentMyStudyRegisterPreviewTl,
+            binding.fragmentMyStudyRegisterPreviewVp
+        ) { tab, position ->
+            tab.text = tabList[position]
+        }.attach()
+
+        binding.fragmentMyStudyRegisterPreviewTl.getTabAt(0)?.select()
+        binding.fragmentMyStudyRegisterPreviewTl.addOnTabSelectedListener(object :
+            TabLayout.OnTabSelectedListener {
+            override fun onTabSelected(tab: TabLayout.Tab?) {
+                if (tab != null && tab.position != 0) {
+                    binding.fragmentMyStudyRegisterPreviewTl.selectTab(
+                        binding.fragmentMyStudyRegisterPreviewTl.getTabAt(0)
+                    )
+                }
+            }
+            override fun onTabUnselected(tab: TabLayout.Tab?) {}
+            override fun onTabReselected(tab: TabLayout.Tab?) {}
+        })
+        for (i in 1 until binding.fragmentMyStudyRegisterPreviewTl.tabCount) {
+            binding.fragmentMyStudyRegisterPreviewTl.getTabAt(i)?.view?.isEnabled = false
+        }
+    }
+    private fun setProfileImageUri() {
+        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
+        val email = sharedPreferences.getString("currentEmail", null)
+
+        if (email != null) {
+            val loginPlatform = sharedPreferences.getString("loginPlatform", null)
+            val profileImageUrl = if (!email.isNullOrEmpty() && !loginPlatform.isNullOrEmpty()) {
+                sharedPreferences.getString("${email}_${loginPlatform}ProfileImageUrl", null)
+            } else {
+                null
+            }
+            Glide.with(binding.root.context)
+                .load(profileImageUrl)
+                .error(R.drawable.fragment_calendar_spot_logo) // URL이 잘못되었거나 404일 경우 기본 이미지 사용
+                .fallback(R.drawable.fragment_calendar_spot_logo) // URL이 null일 경우 기본 이미지 사용
+                .into(binding.fragmentMyStudyRegisterPreviewUserIv)
+
+        }
+    }
+    private fun updateUIWithData() {
+        studyViewModel.nickname.observe(viewLifecycleOwner) { nick ->
+            binding.fragmentDetailStudyUsernameTv.text = "$nick 님"
+        }
+
+        binding.fragmentDetailStudyPreviewTitleTv.text =
+            registerViewModel.studyRequest.value?.title
+        binding.fragmentDetailStudyGoalTv.text =
+            registerViewModel.studyRequest.value?.goal
+
+        binding.fragmentDetailStudyOnlineTv.text =
+            if (registerViewModel.studyRequest.value?.isOnline == true) "온라인" else "오프라인"
+        binding.fragmentDetailStudyFeeTv.text =
+            if (registerViewModel.studyRequest.value?.hasFee == true) "유료" else "무료"
+        binding.fragmentDetailStudyAgeTv.text =
+            "${registerViewModel.studyRequest.value?.minAge}-${registerViewModel.studyRequest.value?.maxAge}세"
+        binding.fragmentDetailStudyMemberMaxTv.text =
+            registerViewModel.studyRequest.value?.maxPeople.toString()
+        binding.fragmentDetailStudyBookmarkTv.text = "0"
+        binding.fragmentDetailStudyChipTv.text =
+            registerViewModel.studyRequest.value?.themes?.take(3)?.joinToString("/") ?: "테마 없음"
+    }
+
+    private fun onRegisterButtonClicked() {
+
+        if (imageUri == null) {
+            Toast.makeText(requireContext(), "이미지를 확인할 수 없습니다.", Toast.LENGTH_SHORT).show()
+            return
+        }
+
+        // 로컬 이미지가 null이 아니면 Multipart로 변환 후 업로드
+        prepareImagePart(imageUri!!)?.let { imagePart ->
+            registerViewModel.uploadImageAndSubmitStudy(
+                imagePart = imagePart,
+                onSuccess = { showCompletionDialog() },
+                onFailure = {
+                    Toast.makeText(requireContext(), "스터디 등록 실패", Toast.LENGTH_SHORT).show()
+                }
+            )
+        } ?: run {
+            Toast.makeText(requireContext(), "이미지 파일 준비 실패", Toast.LENGTH_SHORT).show()
+        }
+    }
+
+    private fun prepareImagePart(uri: Uri): MultipartBody.Part? {
+        return saveUriAsFile(uri)?.let { file ->
+            val requestFile = file.asRequestBody("image/jpeg".toMediaTypeOrNull())
+            MultipartBody.Part.createFormData("images", file.name, requestFile)
+        }
+    }
+
+    private fun saveUriAsFile(uri: Uri): File? {
+        return try {
+            val inputStream = requireContext().contentResolver.openInputStream(uri) ?: return null
+            val bitmap = BitmapFactory.decodeStream(inputStream)
+            inputStream.close()
+
+            val tempFile = File.createTempFile("temp_image", ".jpg", requireContext().cacheDir)
+            val outputStream = FileOutputStream(tempFile)
+            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, outputStream)
+            outputStream.flush()
+            outputStream.close()
+
+            Log.d("PreviewFragment", "Saved temp file at: ${tempFile.absolutePath}")
+            tempFile
+        } catch (e: Exception) {
+            e.printStackTrace()
+            null
+        }
+    }
+
+    private fun showCompletionDialog() {
+        val dialog = StudyRegisterCompleteDialog(requireContext())
+        dialog.start(parentFragmentManager)
+    }
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyRegisterPreviewVPAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/preview/MyStudyRegisterPreviewVPAdapter.kt
similarity index 53%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyRegisterPreviewVPAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/preview/MyStudyRegisterPreviewVPAdapter.kt
index 0cca4918..79e3c4ad 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyRegisterPreviewVPAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/preview/MyStudyRegisterPreviewVPAdapter.kt
@@ -1,8 +1,9 @@
-package com.example.spoteam_android.ui.study
+package com.example.spoteam_android.presentation.study.register.preview
 
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.example.spoteam_android.ui.home.HomeFragment
+import com.example.spoteam_android.presentation.study.register.introduce.IntroduceStudyFragment
+import com.example.spoteam_android.presentation.study.register.introduce.IntroduceStudyShortFragment
 
 class MyStudyRegisterPreviewVPAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) {
 
@@ -13,10 +14,10 @@ class MyStudyRegisterPreviewVPAdapter(fragment: Fragment) : FragmentStateAdapter
     override fun createFragment(position: Int): Fragment {
         return when (position) {
             0 -> IntroduceStudyShortFragment()
-            1 -> HomeFragment()
-            2 -> HomeFragment()
-            3 -> HomeFragment()
-            4 -> HomeFragment()
+            1 -> IntroduceStudyFragment()
+            2 -> IntroduceStudyFragment()
+            3 -> IntroduceStudyFragment()
+            4 -> IntroduceStudyFragment()
             else -> throw IllegalArgumentException("Invalid position")
         }
     }
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/RegisterStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/theme/ThemeStudyFragment.kt
similarity index 59%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/RegisterStudyFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/theme/ThemeStudyFragment.kt
index 60b07467..71d2c407 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/RegisterStudyFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/theme/ThemeStudyFragment.kt
@@ -1,7 +1,6 @@
-package com.example.spoteam_android.ui.study
+package com.example.spoteam_android.presentation.study.register.theme
 
 import StudyFormMode
-import StudyViewModel
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -9,24 +8,34 @@ import android.view.ViewGroup
 import android.widget.CompoundButton
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.lifecycleScope
 import com.example.spoteam_android.R
 import com.example.spoteam_android.databinding.FragmentRegisterStudyBinding
+import com.example.spoteam_android.presentation.study.StudyViewModel
+import com.example.spoteam_android.presentation.study.register.StudyRegisterViewModel
+import com.example.spoteam_android.presentation.study.register.introduce.IntroduceStudyFragment
 import com.google.android.material.chip.Chip
+import kotlinx.coroutines.launch
 
-class RegisterStudyFragment : Fragment() {
+class ThemeStudyFragment : Fragment() {
 
     private lateinit var binding: FragmentRegisterStudyBinding
-    private var currentStep = 1 // 현재 단계
-    private val viewModel: StudyViewModel by activityViewModels()
+
+    private var currentStep = 1
+
+    private val studyViewModel: StudyViewModel by activityViewModels()
+
+    private val registerViewModel: StudyRegisterViewModel by activityViewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         initArguments()
     }
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         binding = FragmentRegisterStudyBinding.inflate(inflater, container, false)
         return binding.root
     }
@@ -36,30 +45,38 @@ class RegisterStudyFragment : Fragment() {
         initUI()
         setChipGroup()
         observeThemes()
+        observeStudyViewModel()
         setupListeners()
     }
+
     private fun initArguments() {
-        val mode = arguments?.getSerializable("mode", StudyFormMode::class.java) ?: StudyFormMode.CREATE
+        val mode = arguments?.getSerializable("mode", StudyFormMode::class.java)
+            ?: StudyFormMode.CREATE
         val studyId = arguments?.getInt("studyId", -1) ?: -1
-        viewModel.setMode(mode)
 
-        if (mode == StudyFormMode.CREATE) viewModel.reset()
-        else if (mode == StudyFormMode.EDIT && studyId != -1) viewModel.fetchStudyDetail(studyId)
+        registerViewModel.setMode(mode)
+
+        if (mode == StudyFormMode.CREATE) {
+            registerViewModel.reset()
+        } else if (mode == StudyFormMode.EDIT && studyId != -1) {
+            registerViewModel.setStudyId(studyId)
+            studyViewModel.setStudyId(studyId)
+            studyViewModel.fetchStudyDetail(studyId)
+        }
     }
+
+
     private fun initUI() {
-        if (viewModel.mode.value == StudyFormMode.EDIT) {
+        if (registerViewModel.mode.value == StudyFormMode.EDIT) {
             binding.fragmentRegisterStudyTv.text = "스터디 정보 수정"
         }
         binding.fragmentRegisterStudyBt.isEnabled = false
     }
 
     private fun setChipGroup() {
-        // Chip 선택 상태 리스너
         val chipCheckedChangeListener = CompoundButton.OnCheckedChangeListener { _, _ ->
             updateSelectedThemes()
         }
-
-        // ChipGroup 내 모든 Chip에 리스너 추가
         for (i in 0 until binding.fragmentRegisterStudyChipgroup.childCount) {
             val chip = binding.fragmentRegisterStudyChipgroup.getChildAt(i) as? CompoundButton
             chip?.setOnCheckedChangeListener(chipCheckedChangeListener)
@@ -76,61 +93,63 @@ class RegisterStudyFragment : Fragment() {
         }
     }
 
-
-
-
     private fun updateSelectedThemes() {
         val selectedThemes = mutableListOf<String>()
-
         for (i in 0 until binding.fragmentRegisterStudyChipgroup.childCount) {
             val chip = binding.fragmentRegisterStudyChipgroup.getChildAt(i) as? CompoundButton
             if (chip?.isChecked == true) {
                 val chipText = chip.text.toString()
                 val processedText = when {
-                    chipText.contains("전공") -> chipText.replace("/", "및") // "전공/진로학습" → "전공 및 진로학습"
-                    else -> chipText.replace("/", "").replace(" ", "") // 공백 및 슬래시 제거
+                    chipText.contains("전공") -> chipText.replace("/", "및")
+                    else -> chipText.replace("/", "").replace(" ", "")
                 }
                 selectedThemes.add(processedText)
             }
         }
-
-        // 버튼 활성화 여부 업데이트
         binding.fragmentRegisterStudyBt.isEnabled = selectedThemes.isNotEmpty()
-
-        // ViewModel에 선택된 테마 업데이트
-        viewModel.updateThemes(selectedThemes)
+        registerViewModel.updateThemes(selectedThemes)
     }
 
     private fun observeThemes() {
-        viewModel.themes.observe(viewLifecycleOwner) { themes ->
-            for (i in 0 until binding.fragmentRegisterStudyChipgroup.childCount) {
-                val chip = binding.fragmentRegisterStudyChipgroup.getChildAt(i) as? Chip
-                chip?.let {
-                    val normalizedChipText = normalizeText(it.text.toString())
-                    val normalizedServerTextList = themes.map { theme -> normalizeServerText(theme) }
-
-                    it.isChecked = normalizedServerTextList.contains(normalizedChipText)
+        lifecycleScope.launch {
+            registerViewModel.studyRequest.collect { request ->
+                val themes = request?.themes ?: return@collect
+                for (i in 0 until binding.fragmentRegisterStudyChipgroup.childCount) {
+                    val chip = binding.fragmentRegisterStudyChipgroup.getChildAt(i) as? Chip
+                    chip?.let {
+                        val normalizedChipText = normalizeText(it.text.toString())
+                        val normalizedServerTextList = themes.map { theme ->
+                            normalizeServerText(theme)
+                        }
+                        it.isChecked = normalizedServerTextList.contains(normalizedChipText)
+                    }
                 }
+                binding.fragmentRegisterStudyBt.isEnabled = themes.isNotEmpty()
             }
-
-            // 수정 모드에서 테마가 미리 선택되어 있는 경우, 버튼도 활성화
-            binding.fragmentRegisterStudyBt.isEnabled = themes.isNotEmpty()
         }
     }
 
-
+    private fun observeStudyViewModel() {
+        studyViewModel.studyRequest.observe(viewLifecycleOwner) { dto ->
+            dto?.let {
+                val loadedId = studyViewModel.studyId.value ?: -1
+                registerViewModel.setStudyId(loadedId)
+                registerViewModel.setStudyRequest(it)
+            }
+        }
+    }
 
     private fun updateProgressBar() {
         currentStep++
-        val progress = (currentStep / 5.0 * 100).toInt() // 총 5단계 가정
+        val progress = (currentStep / 5.0 * 100).toInt()
         binding.fragmentRegisterStudyPb.progress = progress
     }
 
     private fun goToNextFragment() {
         val nextFragment = IntroduceStudyFragment().apply {
             arguments = Bundle().apply {
-                putSerializable("mode", viewModel.mode.value)
-                viewModel.studyId.value?.let { putInt("studyId", it) }
+                putSerializable("mode", registerViewModel.mode.value)
+                registerViewModel.studyId.value?.let { putInt("studyId", it) }
             }
         }
         parentFragmentManager.beginTransaction()
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/CorrectStudyCompleteDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/util/CorrectStudyCompleteDialog.kt
similarity index 85%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/CorrectStudyCompleteDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/util/CorrectStudyCompleteDialog.kt
index 5801313b..25080530 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/CorrectStudyCompleteDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/util/CorrectStudyCompleteDialog.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study
+package com.example.spoteam_android.presentation.study.register.util
 
 
 import android.content.Context
@@ -7,11 +7,9 @@ import android.graphics.drawable.ColorDrawable
 import android.view.Window
 import android.widget.Button
 import android.widget.ImageView
-import android.widget.TextView
 import androidx.fragment.app.FragmentManager
 import com.example.spoteam_android.R
-import com.example.spoteam_android.ui.mypage.ParticipatingStudyFragment
-import com.example.spoteam_android.ui.mypage.PurposePreferenceFragment
+import com.example.spoteam_android.presentation.mypage.ParticipatingStudyFragment
 
 class CorrectStudyCompleteDialog(private val context: Context) {
     private val dlg = android.app.Dialog(context)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/util/StudyFormMode.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/util/StudyFormMode.kt
new file mode 100644
index 00000000..2e890878
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/util/StudyFormMode.kt
@@ -0,0 +1,8 @@
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class StudyFormMode {
+    CREATE,
+    EDIT
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyRegisterCompleteDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/util/StudyRegisterCompleteDialog.kt
similarity index 90%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyRegisterCompleteDialog.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/util/StudyRegisterCompleteDialog.kt
index 0366622f..5de332b4 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyRegisterCompleteDialog.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/util/StudyRegisterCompleteDialog.kt
@@ -1,15 +1,14 @@
-package com.example.spoteam_android.ui.study
+package com.example.spoteam_android.presentation.study.register.util
 
 import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
-import android.view.View
 import android.view.Window
 import android.widget.Button
 import android.widget.ImageView
 import androidx.fragment.app.FragmentManager
 import com.example.spoteam_android.R
-import com.example.spoteam_android.ui.mypage.ThemePreferenceFragment
+import com.example.spoteam_android.presentation.study.StudyFragment
 
 class StudyRegisterCompleteDialog(private val context: Context) {
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/StudyRegisterPopupFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/util/StudyRegisterPopupFragment.kt
similarity index 89%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/StudyRegisterPopupFragment.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/util/StudyRegisterPopupFragment.kt
index 5e445fd2..460c5516 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/StudyRegisterPopupFragment.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/register/util/StudyRegisterPopupFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android
+package com.example.spoteam_android.presentation.study.register.util
 
 import android.app.Dialog
 import android.content.Context
@@ -9,8 +9,8 @@ import android.view.Window
 import android.widget.Toast
 import android.widget.EditText
 import android.widget.ImageView
-import android.widget.TextView
-import com.example.spoteam_android.ui.mypage.ExitStudyPopupFragment
+import com.example.spoteam_android.CompleteSignupStudyFragment
+import com.example.spoteam_android.R
 
 class StudyRegisterPopupFragment(private val context: Context) {
 
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/OtherTodoAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/OtherTodoAdapter.kt
similarity index 97%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/OtherTodoAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/OtherTodoAdapter.kt
index b880719e..cf03669c 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/OtherTodoAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/OtherTodoAdapter.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.todolist
+package com.example.spoteam_android.presentation.study.todolist
 
 import android.content.Context
 import android.graphics.Paint
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/ToDoListData.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/ToDoListData.kt
similarity index 95%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/ToDoListData.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/ToDoListData.kt
index da134274..a6ec0d46 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/ToDoListData.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/ToDoListData.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.todolist
+package com.example.spoteam_android.presentation.study.todolist
 import com.google.gson.annotations.SerializedName
 
 data class TodolistResponse(
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoAdapter.kt
similarity index 99%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoAdapter.kt
index b0fdcbb5..0b46e2c2 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoAdapter.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.todolist
+package com.example.spoteam_android.presentation.study.todolist
 
 import android.content.Context
 import android.graphics.Paint
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoApiService.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoApiService.kt
similarity index 96%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoApiService.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoApiService.kt
index 3f1d92c9..97a5b026 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoApiService.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoApiService.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.todolist
+package com.example.spoteam_android.presentation.study.todolist
 
 import retrofit2.Call
 import retrofit2.http.Body
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoDateAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoDateAdapter.kt
similarity index 98%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoDateAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoDateAdapter.kt
index 0c8eb813..d407705e 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoDateAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoDateAdapter.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.todolist
+package com.example.spoteam_android.presentation.study.todolist
 
 import android.graphics.Color
 import android.util.Log
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoEventAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoEventAdapter.kt
similarity index 97%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoEventAdapter.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoEventAdapter.kt
index 02f37c7f..c7641b5d 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoEventAdapter.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoEventAdapter.kt
@@ -1,6 +1,5 @@
-package com.example.spoteam_android.ui.study.todolist
+package com.example.spoteam_android.presentation.study.todolist
 
-import com.example.spoteam_android.ui.study.calendar.Event
 
 import android.annotation.SuppressLint
 import android.util.Log
@@ -11,6 +10,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.example.spoteam_android.R
+import com.example.spoteam_android.presentation.study.calendar.Event
 import java.time.LocalDate
 
 class TodoEventAdapter(
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoListFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoListFragment.kt
new file mode 100644
index 00000000..b18c2970
--- /dev/null
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoListFragment.kt
@@ -0,0 +1,279 @@
+package com.example.spoteam_android.presentation.study.todolist
+
+import android.content.Context
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewTreeObserver
+import android.view.inputmethod.InputMethodManager
+import android.widget.Toast
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.ViewModelProvider
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.spoteam_android.ProfileItem
+import com.example.spoteam_android.RetrofitInstance
+import com.example.spoteam_android.databinding.FragmentTodoListBinding
+import com.example.spoteam_android.presentation.study.DetailStudyHomeProfileAdapter
+import com.example.spoteam_android.presentation.study.StudyViewModel
+import com.example.spoteam_android.presentation.study.calendar.CalendarApiService
+import com.example.spoteam_android.presentation.study.calendar.Event
+import com.example.spoteam_android.presentation.study.calendar.EventViewModel
+import com.example.spoteam_android.presentation.study.calendar.ScheduleResponse
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import java.time.LocalDate
+import java.time.YearMonth
+import java.util.*
+
+class TodoListFragment : Fragment() {
+
+    private lateinit var binding: FragmentTodoListBinding
+    private lateinit var todoViewModel: TodoViewModel
+    private val studyViewModel: StudyViewModel by activityViewModels()
+    private val eventViewModel: EventViewModel by activityViewModels()
+
+    private lateinit var myTodoAdapter: TodoAdapter
+    private lateinit var otherTodoAdapter: OtherTodoAdapter
+    private lateinit var todoEventAdapter: TodoEventAdapter
+    private lateinit var todoDateAdapter: TodoDateAdapter
+    private lateinit var profileAdapter: DetailStudyHomeProfileAdapter
+    private lateinit var repository: TodoRepository
+
+    private lateinit var memberIdMap: Map<ProfileItem, Int>
+    private var selectedMemberId: Int? = null
+    private lateinit var selectedDate: String
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentTodoListBinding.inflate(inflater, container, false)
+
+        studyViewModel.loadNickname()
+
+        val studyId = studyViewModel.studyId.value ?: 0
+        val apiService = RetrofitInstance.retrofit.create(TodoApiService::class.java)
+        repository = TodoRepository(apiService)
+        val factory = TodoViewModelFactory(repository, studyId)
+        todoViewModel = ViewModelProvider(this, factory)[TodoViewModel::class.java]
+
+        // 날짜 초기화
+        val calendar = Calendar.getInstance()
+        val year = calendar.get(Calendar.YEAR)
+        val month = calendar.get(Calendar.MONTH) + 1
+        val today = calendar.get(Calendar.DAY_OF_MONTH)
+        selectedDate = String.format("%04d-%02d-%02d", year, month, today)
+
+        // 달력 어댑터
+        val currentYear = LocalDate.now().year
+        val currentMonth = LocalDate.now().monthValue
+        val daysOfCurrentMonth = getDaysOfMonthWithPadding(currentYear, currentMonth)
+
+        todoDateAdapter = TodoDateAdapter(daysOfCurrentMonth, today) { newSelectedDate ->
+            selectedDate = formatToDate("$currentYear-$currentMonth-$newSelectedDate")
+            todoDateAdapter.updateDates(daysOfCurrentMonth, newSelectedDate)
+            todoViewModel.onDateChanged(selectedDate)
+            fetchTodoList(studyId, newSelectedDate.toString().padStart(2, '0'))
+            fetchGetSchedule(studyId, currentYear, currentMonth) {
+                eventViewModel.loadEvents(currentYear, currentMonth, newSelectedDate)
+                todoEventAdapter.updateSelectedDate(selectedDate)
+                todoEventAdapter.updateEvents(eventViewModel.events.value ?: emptyList())
+                todoDateAdapter.updateEventDays(getEventDaysForMonth(currentYear, currentMonth))
+                binding.txScheduledEvent.visibility =
+                    if (todoEventAdapter.hasEventOnDay(newSelectedDate)) View.VISIBLE else View.GONE
+            }
+            profileAdapter.resetBorder()
+            todoViewModel.clearOtherTodoList()
+            otherTodoAdapter.clearData()
+        }
+
+        binding.rvCalendar.apply {
+            layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
+            adapter = todoDateAdapter
+        }
+
+        scrollToTodayPosition()
+
+        // 내 투두 어댑터
+        myTodoAdapter = TodoAdapter(requireContext(), mutableListOf(),
+            onAddTodo = { content -> todoViewModel.addTodoItem(studyId, content, selectedDate) },
+            onCheckTodo = { id -> todoViewModel.checkTodo(studyId, id) },
+            repository = repository,
+            studyId = studyId
+        )
+        binding.rvMyTodoList.layoutManager = LinearLayoutManager(requireContext())
+        binding.rvMyTodoList.adapter = myTodoAdapter
+
+        // 스터디원 투두 어댑터
+        otherTodoAdapter = OtherTodoAdapter(requireContext(), mutableListOf())
+        binding.rvOtherTodo.layoutManager = LinearLayoutManager(requireContext())
+        binding.rvOtherTodo.adapter = otherTodoAdapter
+
+        // 이벤트 어댑터
+        todoEventAdapter = TodoEventAdapter(emptyList(), {}, true)
+        binding.eventrecyclerviewto.layoutManager = LinearLayoutManager(requireContext())
+        binding.eventrecyclerviewto.adapter = todoEventAdapter
+
+        // 스터디원 프로필 어댑터
+        profileAdapter = DetailStudyHomeProfileAdapter(ArrayList(), { profileItem ->
+            memberIdMap[profileItem]?.let {
+                selectedMemberId = it
+                fetchOtherTodoList(studyId, it, selectedDate)
+            }
+        }, isTodo = true)
+        binding.fragmentDetailStudyHomeProfileRv.layoutManager =
+            LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
+        binding.fragmentDetailStudyHomeProfileRv.adapter = profileAdapter
+
+        // 키보드 숨김 처리
+        binding.root.setOnTouchListener { view, _ ->
+            view.performClick()
+            val imm = requireContext().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+            activity?.currentFocus?.let {
+                imm.hideSoftInputFromWindow(it.windowToken, 0)
+                it.clearFocus()
+            }
+            myTodoAdapter.cancelIfEditing()
+            false
+        }
+
+        // 데이터 초기 조회
+        todoViewModel.onDateChanged(selectedDate)
+        fetchTodoList(studyId, today.toString().padStart(2, '0'))
+        fetchGetSchedule(studyId, year, month) {
+            eventViewModel.loadEvents(year, month, today)
+            todoEventAdapter.updateSelectedDate(selectedDate)
+            todoEventAdapter.updateEvents(eventViewModel.events.value ?: emptyList())
+            todoDateAdapter.updateEventDays(getEventDaysForMonth(currentYear, currentMonth))
+            binding.txScheduledEvent.visibility =
+                if (todoEventAdapter.hasEventOnDay(today)) View.VISIBLE else View.GONE
+        }
+
+        // 내 투두 관찰
+        todoViewModel.myTodoListResponse.observe(viewLifecycleOwner) {
+            val todos = it?.result?.content?.reversed() ?: emptyList()
+            myTodoAdapter.updateData(todos.toMutableList())
+        }
+
+        // 다른 스터디원 투두 관찰
+        todoViewModel.otherTodoListResponse.observe(viewLifecycleOwner) {
+            val todos = it?.result?.content?.reversed() ?: emptyList()
+            otherTodoAdapter.updateData(todos.toMutableList())
+        }
+
+        // + 버튼 클릭
+        binding.imgbtnPlusTodolist.setOnClickListener {
+            myTodoAdapter.addTodo(selectedDate)
+            binding.rvMyTodoList.scrollToPosition(myTodoAdapter.itemCount - 1)
+        }
+
+        // 스터디 멤버 조회
+        fetchStudyMembers(studyId)
+
+        return binding.root
+    }
+
+    private fun fetchTodoList(studyId: Int, day: String) {
+        val date = formatToDate("${Calendar.getInstance().get(Calendar.YEAR)}-" +
+                "${(Calendar.getInstance().get(Calendar.MONTH) + 1).toString().padStart(2, '0')}-$day")
+        todoViewModel.fetchTodoList(studyId, 0, 10, date)
+    }
+
+    private fun fetchOtherTodoList(studyId: Int, memberId: Int, date: String) {
+        todoViewModel.fetchOtherToDoList(studyId, memberId, 0, 10, date)
+    }
+
+    private fun fetchGetSchedule(studyId: Int, year: Int, month: Int, onComplete: () -> Unit) {
+        val api = RetrofitInstance.retrofit.create(CalendarApiService::class.java)
+        api.GetScheuled(studyId, year, month).enqueue(object : Callback<ScheduleResponse> {
+            override fun onResponse(call: Call<ScheduleResponse>, response: Response<ScheduleResponse>) {
+                if (response.isSuccessful) {
+                    val eventList = response.body()?.result?.scheduleList?.map {
+                        Event(
+                            id = it.scheduleId,
+                            title = it.title,
+                            startYear = it.startedAt.substring(0, 4).toInt(),
+                            startMonth = it.startedAt.substring(5, 7).toInt(),
+                            startDay = it.startedAt.substring(8, 10).toInt(),
+                            startHour = it.startedAt.substring(11, 13).toInt(),
+                            startMinute = it.startedAt.substring(14, 16).toInt(),
+                            endYear = it.finishedAt.substring(0, 4).toInt(),
+                            endMonth = it.finishedAt.substring(5, 7).toInt(),
+                            endDay = it.finishedAt.substring(8, 10).toInt(),
+                            endHour = it.finishedAt.substring(11, 13).toInt(),
+                            endMinute = it.finishedAt.substring(14, 16).toInt(),
+                            period = it.period,
+                            isAllDay = it.isAllDay
+                        )
+                    } ?: emptyList()
+                    eventViewModel.updateEvents(eventList)
+                    todoEventAdapter.updateEvents(eventList)
+                    onComplete()
+                }
+            }
+
+            override fun onFailure(call: Call<ScheduleResponse>, t: Throwable) {
+                Toast.makeText(requireContext(), "일정 조회 실패", Toast.LENGTH_SHORT).show()
+            }
+        })
+    }
+
+    private fun fetchStudyMembers(studyId: Int) {
+        studyViewModel.fetchStudyMembers(studyId) { response ->
+            response?.let {
+                val members = it.members
+                val nickname = studyViewModel.nickname.value
+                memberIdMap = members.associateBy(
+                    { member -> ProfileItem(member.profileImage, member.nickname) },
+                    { member -> member.memberId }
+                )
+                profileAdapter.updateList(memberIdMap.keys.toList())
+
+                val isMember = nickname != null && members.any { it.nickname == nickname }
+                binding.imgbtnPlusTodolist.visibility = if (isMember) View.VISIBLE else View.GONE
+            } ?: run {
+                Toast.makeText(requireContext(), "스터디 멤버 조회 실패", Toast.LENGTH_SHORT).show()
+            }
+        }
+    }
+
+
+    private fun formatToDate(date: String): String {
+        val parts = date.split("-")
+        return String.format("%04d-%02d-%02d", parts[0].toInt(), parts[1].toInt(), parts[2].toInt())
+    }
+
+    private fun getDaysOfMonthWithPadding(year: Int, month: Int): List<Triple<Int?, Boolean, Boolean>> {
+        val yearMonth = YearMonth.of(year, month)
+        return (1..yearMonth.lengthOfMonth()).map { Triple(it, true, true) }
+    }
+
+    private fun getEventDaysForMonth(year: Int, month: Int): Set<Int> {
+        return eventViewModel.getEventDates()
+            .filter { it.year == year && it.month == month }
+            .map { it.day }
+            .toSet()
+    }
+
+    private fun scrollToTodayPosition() {
+        val today = Calendar.getInstance().get(Calendar.DAY_OF_MONTH)
+        val position = todoDateAdapter.getPositionForDate(today)
+        if (position != -1) {
+            binding.rvCalendar.viewTreeObserver.addOnGlobalLayoutListener(object :
+                ViewTreeObserver.OnGlobalLayoutListener {
+                override fun onGlobalLayout() {
+                    binding.rvCalendar.viewTreeObserver.removeOnGlobalLayoutListener(this)
+                    val offset = binding.rvCalendar.width / 2 -
+                            (binding.rvCalendar.getChildAt(0)?.width ?: 0) / 2
+                    (binding.rvCalendar.layoutManager as LinearLayoutManager)
+                        .scrollToPositionWithOffset(position, offset)
+                }
+            })
+        }
+    }
+}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoRepository.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoRepository.kt
similarity index 98%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoRepository.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoRepository.kt
index da518f34..cebe2d75 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoRepository.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoRepository.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.todolist
+package com.example.spoteam_android.presentation.study.todolist
 
 import android.util.Log
 import retrofit2.Call
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoRequest.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoRequest.kt
similarity index 53%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoRequest.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoRequest.kt
index dbdccd8a..72f66132 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoRequest.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoRequest.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.todolist
+package com.example.spoteam_android.presentation.study.todolist
 
 data class TodoRequest(
     val content: String,
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoViewModel.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoViewModel.kt
similarity index 98%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoViewModel.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoViewModel.kt
index cbbfef01..5246ef59 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoViewModel.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoViewModel.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.todolist
+package com.example.spoteam_android.presentation.study.todolist
 
 import android.util.Log
 import androidx.lifecycle.LiveData
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoViewModelFactory.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoViewModelFactory.kt
similarity index 89%
rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoViewModelFactory.kt
rename to SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoViewModelFactory.kt
index 61c6c692..718ed586 100644
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoViewModelFactory.kt
+++ b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/presentation/study/todolist/TodoViewModelFactory.kt
@@ -1,4 +1,4 @@
-package com.example.spoteam_android.ui.study.todolist
+package com.example.spoteam_android.presentation.study.todolist
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/bookMark/BookmarkFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/bookMark/BookmarkFragment.kt
deleted file mode 100644
index fc756332..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/bookMark/BookmarkFragment.kt
+++ /dev/null
@@ -1,255 +0,0 @@
-package com.example.spoteam_android.ui.bookMark
-
-import StudyApiService
-import StudyViewModel
-import android.content.Context.MODE_PRIVATE
-import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.BookmarkItem
-import com.example.spoteam_android.BookmarkResponse
-import com.example.spoteam_android.LikeResponse
-import com.example.spoteam_android.databinding.FragmentBookmarkBinding
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.MainActivity
-import com.example.spoteam_android.ui.study.DetailStudyFragment
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class BookmarkFragment : Fragment() {
-
-    private lateinit var binding: FragmentBookmarkBinding
-    private lateinit var bookMarkRVAdapter: BookMarkRVAdapter
-    private var bookitemList = ArrayList<BookmarkItem>()
-    private val studyViewModel: StudyViewModel by activityViewModels()
-    private var startPage = 0
-    private var currentPage = 0
-    private val size = 5 // 페이지당 항목 수
-    private var totalPages = 0
-
-    // Retrofit API Service
-    private lateinit var studyApiService: StudyApiService
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = FragmentBookmarkBinding.inflate(inflater, container, false)
-
-        binding.prevIv.setOnClickListener{
-            parentFragmentManager.popBackStack()
-        }
-
-
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        studyApiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-        bookMarkRVAdapter = BookMarkRVAdapter(bookitemList, onItemClick = { selectedItem ->
-            // StudyViewModel에 studyId 설정
-            studyViewModel.setStudyData(selectedItem.studyId, selectedItem.imageUrl, selectedItem.introduction)
-
-            val detailStudyFragment = DetailStudyFragment()
-            parentFragmentManager.beginTransaction()
-                .replace(R.id.main_frm, detailStudyFragment)
-                .addToBackStack(null)
-                .commit()
-        }, onLikeClick = { selectedItem, likeButton ->
-            toggleLikeStatus(selectedItem, likeButton)
-        })
-
-        binding.fragmentBookmarkRv.apply {
-            adapter = bookMarkRVAdapter
-            layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
-        }
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            textView.setOnClickListener {
-                val selectedPage = startPage + index
-                if (currentPage != selectedPage) {
-                    currentPage = selectedPage
-                    fetchBookmarkedStudies()
-                }
-            }
-        }
-
-        setupPageNavigationButtons()
-
-        fetchBookmarkedStudies()
-    }
-
-    private fun setupPageNavigationButtons() {
-        binding.previousPage.setOnClickListener {
-            if (currentPage > 0) {
-                currentPage--
-                fetchBookmarkedStudies() // 이전 페이지 데이터를 가져옴
-            }
-        }
-
-        binding.nextPage.setOnClickListener {
-            if (currentPage < totalPages - 1) {
-                currentPage++
-                fetchBookmarkedStudies() // 다음 페이지 데이터를 가져옴
-            }
-        }
-    }
-
-    private fun fetchBookmarkedStudies() {
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", MODE_PRIVATE)
-        val memberId = sharedPreferences.getInt("${sharedPreferences.getString("currentEmail", "")}_memberId", -1)
-
-        if (memberId != -1) {
-            studyApiService.getBookmark(currentPage, size).enqueue(object : Callback<BookmarkResponse> {
-                override fun onResponse(call: Call<BookmarkResponse>, response: Response<BookmarkResponse>) {
-                    if (response.isSuccessful) {
-                        val bookmarkResponse = response.body()
-                        if (bookmarkResponse != null && bookmarkResponse.result != null) {
-                            val content = bookmarkResponse.result.content
-                            totalPages = bookmarkResponse.result.totalPages
-
-                            if (!content.isNullOrEmpty()) {
-                                bookitemList.clear()
-                                bookitemList.addAll(content.map { studyData ->
-                                    BookmarkItem(
-                                        studyId = studyData.studyId,
-                                        title = studyData.title,
-                                        goal = studyData.goal,
-                                        introduction = studyData.introduction,
-                                        memberCount = studyData.memberCount,
-                                        heartCount = studyData.heartCount,
-                                        hitNum = studyData.hitNum,
-                                        maxPeople = studyData.maxPeople,
-                                        studyState = studyData.studyState,
-                                        themeTypes = studyData.themeTypes,
-                                        regions = studyData.regions,
-                                        imageUrl = studyData.imageUrl,
-                                        liked = studyData.liked
-                                    )
-                                })
-
-                                totalPages = bookmarkResponse.result.totalPages
-//                                Log.d("Bookmark", "Fetched bookmarked studies: $bookitemList")
-                                bookMarkRVAdapter.updateList(bookitemList)
-                                binding.bookmarkEmpty.visibility = View.GONE
-                                binding.fragmentBookmarkRv.visibility = View.VISIBLE
-
-                                // 페이지 UI 업데이트
-//                                Log.d("Bookmark","${totalPages}")
-                                updatePageUI()
-                            } else {
-                                // 데이터가 없을 때 처리
-                                binding.bookmarkEmpty.visibility = View.VISIBLE
-                                binding.fragmentBookmarkRv.visibility = View.GONE
-                            }
-                        } else {
-                            Toast.makeText(requireContext(), "마지막페이지입니다", Toast.LENGTH_SHORT).show()
-                        }
-                    } else {
-                        Toast.makeText(requireContext(), "북마크 데이터를 가져오는데 실패했습니다.", Toast.LENGTH_SHORT).show()
-                    }
-                }
-
-                override fun onFailure(call: Call<BookmarkResponse>, t: Throwable) {
-                    Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
-                }
-            })
-        } else {
-            Toast.makeText(requireContext(), "회원 정보를 불러올 수 없습니다.", Toast.LENGTH_SHORT).show()
-        }
-    }
-
-    private fun toggleLikeStatus(studyItem: BookmarkItem, likeButton: ImageView) {
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", MODE_PRIVATE)
-        val memberId = sharedPreferences.getInt("${sharedPreferences.getString("currentEmail", "")}_memberId", -1)
-
-        if (memberId != -1) {
-            studyApiService.toggleStudyLike(studyItem.studyId).enqueue(object : Callback<LikeResponse> {
-                override fun onResponse(call: Call<LikeResponse>, response: Response<LikeResponse>) {
-                    if (response.isSuccessful) {
-                        response.body()?.let { likeResponse ->
-                            // 서버에서 반환된 상태에 따라 하트 아이콘 및 BookmarkItem의 liked 상태 업데이트
-                            val newStatus = likeResponse.result.status
-                            studyItem.liked = newStatus == "LIKE" // "LIKE"이면 true, "DISLIKE"이면 false로 저장
-                            val newIcon = if (studyItem.liked) R.drawable.ic_heart_filled else R.drawable.study_like
-                            likeButton.setImageResource(newIcon)
-
-                            // heartCount 즉시 증가 또는 감소
-                            studyItem.heartCount = if (studyItem.liked) studyItem.heartCount + 1 else studyItem.heartCount - 1
-                            bookMarkRVAdapter.notifyItemChanged(bookitemList.indexOf(studyItem))
-                        }
-                    } else {
-                        Toast.makeText(requireContext(), "찜 상태 업데이트 실패", Toast.LENGTH_SHORT).show()
-                    }
-                }
-
-                override fun onFailure(call: Call<LikeResponse>, t: Throwable) {
-                    Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
-                }
-            })
-        } else {
-            Toast.makeText(requireContext(), "회원 정보를 불러올 수 없습니다.", Toast.LENGTH_SHORT).show()
-        }
-    }
-
-    private fun updatePageUI() {
-        startPage = if (currentPage <= 2) {
-            0
-        } else {
-            minOf(totalPages - 5, maxOf(0, currentPage - 2))
-        }
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            val pageNum = startPage + index
-            if (pageNum < totalPages) {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(
-                    if (pageNum == currentPage) R.drawable.btn_page_bg else 0
-                )
-                textView.isEnabled = true
-                textView.alpha = 1.0f
-                textView.visibility = View.VISIBLE
-            } else {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(0)
-                textView.isEnabled = false // 클릭 안 되게
-                textView.alpha = 0.3f
-                textView.visibility = View.VISIBLE
-            }
-        }
-
-        binding.previousPage.isEnabled = currentPage > 0
-        binding.nextPage.isEnabled = currentPage < totalPages - 1
-    }
-
-
-
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/AllCategoryFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/AllCategoryFragment.kt
deleted file mode 100644
index 4ab12979..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/AllCategoryFragment.kt
+++ /dev/null
@@ -1,311 +0,0 @@
-package com.example.spoteam_android.ui.category.category_tabs
-
-import StudyApiService
-import StudyViewModel
-import android.content.Context
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.BoardItem
-import com.example.spoteam_android.LikeResponse
-import com.example.spoteam_android.MainActivity
-import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding
-import com.example.spoteam_android.ui.community.CategoryStudyDetail
-import com.example.spoteam_android.ui.community.CategoryStudyResponse
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.interestarea.InterestFilterFragment
-import com.example.spoteam_android.ui.study.DetailStudyFragment
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class AllCategoryFragment : Fragment() {
-
-    lateinit var binding: FragmentCategoryStudyContentBinding
-
-    private val studyViewModel: StudyViewModel by activityViewModels()
-    private lateinit var studyApiService: StudyApiService
-
-    private var currentPage = 0
-    private val size = 5
-    private var totalPages = 0
-    private var startPage = 0
-    private var isLoading = false
-    private var selectedSortBy: String = "ALL"
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = FragmentCategoryStudyContentBinding.inflate(inflater, container, false)
-        studyApiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-
-        val categoryStudyAdapter =
-            CategoryStudyContentRVAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-                toggleLikeStatus(selectedItem, likeButton)
-            })
-
-        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-
-
-
-        categoryStudyAdapter.setItemClickListener(object :
-            CategoryStudyContentRVAdapter.OnItemClickListener {
-            override fun onItemClick(data: CategoryStudyDetail) {
-                // DetailStudyFragment로 이동
-                studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
-
-                val detailStudyFragment = DetailStudyFragment()
-                (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
-                    ?.replace(R.id.main_frm, detailStudyFragment)
-                    ?.addToBackStack(null)
-                    ?.commit()
-            }
-        })
-        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-        binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
-
-
-        fetchBestCommunityContent(currentPage, size, selectedSortBy)
-        initBottomFilterView()
-        return binding.root
-    }
-
-    private fun initBottomFilterView() {
-        val dialogView = layoutInflater.inflate(R.layout.bottom_sheet_interest_spinner, null)
-        val bottomSheetDialog = BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
-        bottomSheetDialog.setContentView(dialogView)
-
-        val recentlyLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_recently)
-        val viewLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_view)
-        val hotLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_hot)
-
-        recentlyLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "최신 순"
-            selectedSortBy="ALL"  // 최신 순
-            fetchBestCommunityContent(currentPage, size, selectedSortBy)
-        }
-
-        viewLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "조회 수 높은 순"
-            selectedSortBy="HIT"
-            fetchBestCommunityContent(currentPage, size, selectedSortBy)
-        }
-
-        hotLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "관심 많은 순"
-            selectedSortBy="LIKED"  // 관심 많은 순
-            fetchBestCommunityContent(currentPage, size, selectedSortBy)
-        }
-
-        binding.contentFilterToggleContainer.setOnClickListener {
-            bottomSheetDialog.show()
-        }
-
-        initFilter()
-
-    }
-
-    private fun initFilter() {
-        binding.icFilter.setOnClickListener {
-            (activity as MainActivity).switchFragment(InterestFilterFragment())
-        }
-
-        binding.icFilterActive.setOnClickListener {
-            (activity as MainActivity).switchFragment(InterestFilterFragment())
-        }
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            textView.setOnClickListener {
-                val selectedPage = startPage + index
-                if (currentPage != selectedPage) {
-                    currentPage = selectedPage
-                    fetchBestCommunityContent(currentPage, size, selectedSortBy)
-                }
-            }
-        }
-
-        binding.previousPage.setOnClickListener {
-            if (currentPage > 0) {
-                currentPage--
-                fetchBestCommunityContent(currentPage, size, selectedSortBy)
-            }
-        }
-
-        binding.nextPage.setOnClickListener {
-            if (currentPage < totalPages - 1) {
-                currentPage++
-                fetchBestCommunityContent(currentPage, size, selectedSortBy)
-            }
-        }
-        fetchBestCommunityContent(currentPage, size, selectedSortBy)
-    }
-
-    private fun fetchBestCommunityContent(page: Int, size: Int, sortBy: String) {
-        isLoading = true
-        val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
-        service.getAllStudy(page, size, sortBy)
-            .enqueue(object : Callback<CategoryStudyResponse> {
-                override fun onResponse(
-                    call: Call<CategoryStudyResponse>,
-                    response: Response<CategoryStudyResponse>
-                ) {
-                    if (response.isSuccessful) {
-                        response.body()?.let { categoryStudyResponse ->
-                            if (categoryStudyResponse.isSuccess == "true") {
-                                val contentList = categoryStudyResponse.result?.content ?: emptyList()
-                                totalPages = categoryStudyResponse.result.totalPages
-
-                                val totalElements = categoryStudyResponse.result.totalElements
-                                binding.contentCountTv.text = totalElements.toString()
-
-                                if (contentList.isNotEmpty()) {
-                                    updateRecyclerView(contentList)
-                                    binding.emptyTv.visibility = View.GONE
-                                } else if (currentPage == 0) {
-                                    binding.emptyTv.visibility = View.VISIBLE
-                                }
-
-                                updatePageUI()
-                            }
-                        }
-                    } else {
-                        showLog(response.code().toString())
-                    }
-                    isLoading = false
-                }
-
-                override fun onFailure(call: Call<CategoryStudyResponse>, t: Throwable) {
-                    showLog(t.message)
-                    isLoading = false
-                }
-            })
-    }
-
-    private fun updateRecyclerView(contentList: List<CategoryStudyDetail>) {
-        // 어댑터가 초기화되지 않은 경우 초기화
-        if (binding.communityCategoryContentRv.adapter == null) {
-            val categoryStudyAdapter = CategoryStudyContentRVAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-                toggleLikeStatus(selectedItem, likeButton)
-            })
-            binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-            binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
-        }
-
-        // 어댑터가 이미 존재하는 경우 데이터를 추가
-        val adapter = binding.communityCategoryContentRv.adapter as CategoryStudyContentRVAdapter
-        adapter.updateList(contentList)
-    }
-
-
-    private fun updatePageUI() {
-        startPage = if (currentPage <= 2) {
-            0
-        } else {
-            minOf(totalPages - 5, maxOf(0, currentPage - 2))
-        }
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            val pageNum = startPage + index
-            if (pageNum < totalPages) {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(
-                    if (pageNum == currentPage) R.drawable.btn_page_bg else 0
-                )
-                textView.isEnabled = true
-                textView.alpha = 1.0f
-                textView.visibility = View.VISIBLE
-            } else {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(0)
-                textView.isEnabled = false // 클릭 안 되게
-                textView.alpha = 0.3f
-                textView.visibility = View.VISIBLE
-            }
-        }
-
-        binding.previousPage.isEnabled = currentPage > 0
-        binding.nextPage.isEnabled = currentPage < totalPages - 1
-    }
-
-    private fun showLog(message: String?) {
-        Toast.makeText(requireContext(), "DiscussionFragment: $message", Toast.LENGTH_SHORT).show()
-    }
-
-    private fun toggleLikeStatus(studyItem: CategoryStudyDetail, likeButton: ImageView) {
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val memberId = sharedPreferences.getInt("${sharedPreferences.getString("currentEmail", "")}_memberId", -1)
-
-        if (memberId != -1) {
-            studyApiService.toggleStudyLike(studyItem.studyId)
-                .enqueue(object : Callback<LikeResponse> {
-                    override fun onResponse(call: Call<LikeResponse>, response: Response<LikeResponse>) {
-                        if (response.isSuccessful) {
-                            response.body()?.let { likeResponse ->
-                                // 서버에서 반환된 상태에 따라 하트 아이콘 및 CategoryStudyDetail의 liked 상태 업데이트
-                                val newStatus = likeResponse.result.status
-                                studyItem.liked = newStatus == "LIKE"
-                                val newIcon = if (studyItem.liked) R.drawable.ic_heart_filled else R.drawable.study_like
-                                likeButton.setImageResource(newIcon)
-
-                                // heartCount 즉시 증가 또는 감소
-                                studyItem.heartCount = if (studyItem.liked) studyItem.heartCount + 1 else studyItem.heartCount - 1
-
-                                // 변경된 항목을 어댑터에 알림
-                                val adapter = binding.communityCategoryContentRv.adapter as CategoryStudyContentRVAdapter
-                                val position = adapter.dataList.indexOf(studyItem)
-                                if (position != -1) {
-                                    adapter.notifyItemChanged(position)
-                                }
-                            }
-                        } else {
-                            Toast.makeText(requireContext(), "찜 상태 업데이트 실패", Toast.LENGTH_SHORT).show()
-                        }
-                    }
-
-                    override fun onFailure(call: Call<LikeResponse>, t: Throwable) {
-                        Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
-                    }
-                })
-        } else {
-            Toast.makeText(requireContext(), "회원 정보를 불러올 수 없습니다.", Toast.LENGTH_SHORT).show()
-        }
-    }
-}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/ContestFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/ContestFragment.kt
deleted file mode 100644
index ce105a4c..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/ContestFragment.kt
+++ /dev/null
@@ -1,314 +0,0 @@
-package com.example.spoteam_android.ui.category.category_tabs
-
-import StudyApiService
-import StudyViewModel
-import android.content.Context
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.LikeResponse
-import com.example.spoteam_android.MainActivity
-import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding
-import com.example.spoteam_android.ui.community.CategoryStudyDetail
-import com.example.spoteam_android.ui.community.CategoryStudyResponse
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.study.DetailStudyFragment
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class ContestFragment : Fragment(), AdapterView.OnItemSelectedListener {
-
-    private lateinit var binding: FragmentCategoryStudyContentBinding
-    private val studyViewModel: StudyViewModel by activityViewModels()
-    private lateinit var studyApiService: StudyApiService
-
-    private var currentPage = 0
-    private val size = 5
-    private var totalPages = 0
-    private var startPage = 0
-    private var isLoading = false
-    private var selectedSortBy: String = "ALL"
-    private val theme :String = "공모전"
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = FragmentCategoryStudyContentBinding.inflate(inflater, container, false)
-        studyApiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-
-
-        val categoryStudyAdapter = CategoryStudyContentRVAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-            toggleLikeStatus(selectedItem, likeButton)
-        })
-
-        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-
-        categoryStudyAdapter.setItemClickListener(object : CategoryStudyContentRVAdapter.OnItemClickListener {
-            override fun onItemClick(data: CategoryStudyDetail) {
-                // DetailStudyFragment로 이동
-                studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
-
-                val detailStudyFragment = DetailStudyFragment()
-                (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
-                    ?.replace(R.id.main_frm, detailStudyFragment)
-                    ?.addToBackStack(null)
-                    ?.commit()
-            }
-        })
-        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-        binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
-
-
-
-
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        initBottomFilterView()
-        return binding.root
-    }
-
-    private fun initBottomFilterView() {
-        val dialogView = layoutInflater.inflate(R.layout.bottom_sheet_interest_spinner, null)
-        val bottomSheetDialog = BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
-        bottomSheetDialog.setContentView(dialogView)
-
-        val recentlyLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_recently)
-        val viewLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_view)
-        val hotLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_hot)
-
-        recentlyLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "최신 순"
-            selectedSortBy="ALL"  // 최신 순
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        viewLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "조회 수 높은 순"
-            selectedSortBy="HIT"
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        hotLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "관심 많은 순"
-            selectedSortBy="LIKED"  // 관심 많은 순
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        binding.contentFilterToggleContainer.setOnClickListener {
-            bottomSheetDialog.show()
-        }
-    }
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            textView.setOnClickListener {
-                val selectedPage = startPage + index
-                if (currentPage != selectedPage) {
-                    currentPage = selectedPage
-                    fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-                }
-            }
-        }
-
-        binding.previousPage.setOnClickListener {
-            if (currentPage > 0) {
-                currentPage--
-                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-            }
-        }
-
-        binding.nextPage.setOnClickListener {
-            if (currentPage < totalPages - 1) {
-                currentPage++
-                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-            }
-        }
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-    }
-
-
-
-    private fun fetchBestCommunityContent(theme: String, page: Int, size: Int, sortBy: String) {
-        isLoading = true
-        val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
-        service.getCategoryStudy(theme, page, size, sortBy)
-            .enqueue(object : Callback<CategoryStudyResponse> {
-                override fun onResponse(
-                    call: Call<CategoryStudyResponse>,
-                    response: Response<CategoryStudyResponse>
-                ) {
-                    if (response.isSuccessful) {
-                        response.body()?.let { categoryStudyResponse ->
-                            if (categoryStudyResponse.isSuccess == "true") {
-                                val contentList = categoryStudyResponse.result?.content ?: emptyList()
-                                totalPages = categoryStudyResponse.result.totalPages
-
-                                val totalElements = categoryStudyResponse.result.totalElements
-                                binding.contentCountTv.text = totalElements.toString()
-
-                                if (contentList.isNotEmpty()) {
-                                    updateRecyclerView(contentList)
-                                    binding.emptyTv.visibility = View.GONE
-                                } else if (currentPage == 0) {
-                                    binding.emptyTv.visibility = View.VISIBLE
-                                }
-
-                                updatePageUI()
-                            }
-                        }
-                    } else {
-                        showLog(response.code().toString())
-                    }
-                    isLoading = false
-                }
-
-                override fun onFailure(call: Call<CategoryStudyResponse>, t: Throwable) {
-                    showLog(t.message)
-                    isLoading = false
-                }
-            })
-    }
-
-    private fun updateRecyclerView(contentList: List<CategoryStudyDetail>) {
-        // 어댑터가 초기화되지 않은 경우 초기화
-        if (binding.communityCategoryContentRv.adapter == null) {
-            val categoryStudyAdapter = CategoryStudyContentRVAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-                toggleLikeStatus(selectedItem, likeButton)
-            })
-            binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-            binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
-        }
-
-        // 어댑터가 이미 존재하는 경우 데이터를 추가
-        val adapter = binding.communityCategoryContentRv.adapter as CategoryStudyContentRVAdapter
-        adapter.updateList(contentList)
-    }
-
-
-    private fun updatePageUI() {
-        startPage = if (currentPage <= 2) {
-            0
-        } else {
-            minOf(totalPages - 5, maxOf(0, currentPage - 2))
-        }
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            val pageNum = startPage + index
-            if (pageNum < totalPages) {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(
-                    if (pageNum == currentPage) R.drawable.btn_page_bg else 0
-                )
-                textView.isEnabled = true
-                textView.alpha = 1.0f
-                textView.visibility = View.VISIBLE
-            } else {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(0)
-                textView.isEnabled = false // 클릭 안 되게
-                textView.alpha = 0.3f
-                textView.visibility = View.VISIBLE
-            }
-        }
-
-        binding.previousPage.isEnabled = currentPage > 0
-        binding.nextPage.isEnabled = currentPage < totalPages - 1
-    }
-
-    private fun showLog(message: String?) {
-        Toast.makeText(requireContext(), "DiscussionFragment: $message", Toast.LENGTH_SHORT).show()
-    }
-
-    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-        val selectedItem = parent?.getItemAtPosition(position).toString()
-        selectedSortBy = when (selectedItem) {
-            "전체" -> "ALL"
-            "모집중" -> "RECRUITING"
-            "모집완료" -> "COMPLETED"
-            "조회수순" -> "HIT"
-            "관심순" -> "LIKED"
-            else -> "ALL"
-        }
-        currentPage = 0
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-    }
-
-    private fun toggleLikeStatus(studyItem: CategoryStudyDetail, likeButton: ImageView) {
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val memberId = sharedPreferences.getInt("${sharedPreferences.getString("currentEmail", "")}_memberId", -1)
-
-        if (memberId != -1) {
-            studyApiService.toggleStudyLike(studyItem.studyId)
-                .enqueue(object : Callback<LikeResponse> {
-                    override fun onResponse(call: Call<LikeResponse>, response: Response<LikeResponse>) {
-                        if (response.isSuccessful) {
-                            response.body()?.let { likeResponse ->
-                                // 서버에서 반환된 상태에 따라 하트 아이콘 및 CategoryStudyDetail의 liked 상태 업데이트
-                                val newStatus = likeResponse.result.status
-                                studyItem.liked = newStatus == "LIKE"
-                                val newIcon = if (studyItem.liked) R.drawable.ic_heart_filled else R.drawable.study_like
-                                likeButton.setImageResource(newIcon)
-
-                                // heartCount 즉시 증가 또는 감소
-                                studyItem.heartCount = if (studyItem.liked) studyItem.heartCount + 1 else studyItem.heartCount - 1
-
-                                // 변경된 항목을 어댑터에 알림
-                                val adapter = binding.communityCategoryContentRv.adapter as CategoryStudyContentRVAdapter
-                                val position = adapter.dataList.indexOf(studyItem)
-                                if (position != -1) {
-                                    adapter.notifyItemChanged(position)
-                                }
-                            }
-                        } else {
-                            Toast.makeText(requireContext(), "찜 상태 업데이트 실패", Toast.LENGTH_SHORT).show()
-                        }
-                    }
-
-                    override fun onFailure(call: Call<LikeResponse>, t: Throwable) {
-                        Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
-                    }
-                })
-        } else {
-            Toast.makeText(requireContext(), "회원 정보를 불러올 수 없습니다.", Toast.LENGTH_SHORT).show()
-        }
-    }
-
-
-    override fun onNothingSelected(parent: AdapterView<*>?) {
-        selectedSortBy = "ALL"
-    }
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/DiscussionFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/DiscussionFragment.kt
deleted file mode 100644
index db14ba6a..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/DiscussionFragment.kt
+++ /dev/null
@@ -1,314 +0,0 @@
-package com.example.spoteam_android.ui.category.category_tabs
-
-import StudyApiService
-import StudyViewModel
-import android.content.Context
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.LikeResponse
-import com.example.spoteam_android.MainActivity
-import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding
-import com.example.spoteam_android.ui.community.CategoryStudyDetail
-import com.example.spoteam_android.ui.community.CategoryStudyResponse
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.study.DetailStudyFragment
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class DiscussionFragment : Fragment(), AdapterView.OnItemSelectedListener {
-
-    private lateinit var binding: FragmentCategoryStudyContentBinding
-    private val studyViewModel: StudyViewModel by activityViewModels()
-    private lateinit var studyApiService: StudyApiService
-
-    private var currentPage = 0
-    private val size = 5
-    private var totalPages = 0
-    private var startPage = 0
-    private var isLoading = false
-    private var selectedSortBy: String = "ALL"
-    private val theme :String = "토론"
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = FragmentCategoryStudyContentBinding.inflate(inflater, container, false)
-        studyApiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-
-
-        val categoryStudyAdapter = CategoryStudyContentRVAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-            toggleLikeStatus(selectedItem, likeButton)
-        })
-
-        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-
-        categoryStudyAdapter.setItemClickListener(object : CategoryStudyContentRVAdapter.OnItemClickListener {
-            override fun onItemClick(data: CategoryStudyDetail) {
-                // DetailStudyFragment로 이동
-                studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
-
-                val detailStudyFragment = DetailStudyFragment()
-                (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
-                    ?.replace(R.id.main_frm, detailStudyFragment)
-                    ?.addToBackStack(null)
-                    ?.commit()
-            }
-        })
-        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-        binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
-
-
-
-
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        initBottomFilterView()
-        return binding.root
-    }
-
-    private fun initBottomFilterView() {
-        val dialogView = layoutInflater.inflate(R.layout.bottom_sheet_interest_spinner, null)
-        val bottomSheetDialog = BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
-        bottomSheetDialog.setContentView(dialogView)
-
-        val recentlyLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_recently)
-        val viewLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_view)
-        val hotLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_hot)
-
-        recentlyLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "최신 순"
-            selectedSortBy="ALL"  // 최신 순
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        viewLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "조회 수 높은 순"
-            selectedSortBy="HIT"
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        hotLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "관심 많은 순"
-            selectedSortBy="LIKED"  // 관심 많은 순
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        binding.contentFilterToggleContainer.setOnClickListener {
-            bottomSheetDialog.show()
-        }
-    }
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            textView.setOnClickListener {
-                val selectedPage = startPage + index
-                if (currentPage != selectedPage) {
-                    currentPage = selectedPage
-                    fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-                }
-            }
-        }
-
-        binding.previousPage.setOnClickListener {
-            if (currentPage > 0) {
-                currentPage--
-                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-            }
-        }
-
-        binding.nextPage.setOnClickListener {
-            if (currentPage < totalPages - 1) {
-                currentPage++
-                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-            }
-        }
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-    }
-
-
-
-    private fun fetchBestCommunityContent(theme: String, page: Int, size: Int, sortBy: String) {
-        isLoading = true
-        val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
-        service.getCategoryStudy(theme, page, size, sortBy)
-            .enqueue(object : Callback<CategoryStudyResponse> {
-                override fun onResponse(
-                    call: Call<CategoryStudyResponse>,
-                    response: Response<CategoryStudyResponse>
-                ) {
-                    if (response.isSuccessful) {
-                        response.body()?.let { categoryStudyResponse ->
-                            if (categoryStudyResponse.isSuccess == "true") {
-                                val contentList = categoryStudyResponse.result?.content ?: emptyList()
-                                totalPages = categoryStudyResponse.result.totalPages
-
-                                val totalElements = categoryStudyResponse.result.totalElements
-                                binding.contentCountTv.text = totalElements.toString()
-
-                                if (contentList.isNotEmpty()) {
-                                    updateRecyclerView(contentList)
-                                    binding.emptyTv.visibility = View.GONE
-                                } else if (currentPage == 0) {
-                                    binding.emptyTv.visibility = View.VISIBLE
-                                }
-
-                                updatePageUI()
-                            }
-                        }
-                    } else {
-                        showLog(response.code().toString())
-                    }
-                    isLoading = false
-                }
-
-                override fun onFailure(call: Call<CategoryStudyResponse>, t: Throwable) {
-                    showLog(t.message)
-                    isLoading = false
-                }
-            })
-    }
-
-    private fun updateRecyclerView(contentList: List<CategoryStudyDetail>) {
-        // 어댑터가 초기화되지 않은 경우 초기화
-        if (binding.communityCategoryContentRv.adapter == null) {
-            val categoryStudyAdapter = CategoryStudyContentRVAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-                toggleLikeStatus(selectedItem, likeButton)
-            })
-            binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-            binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
-        }
-
-        // 어댑터가 이미 존재하는 경우 데이터를 추가
-        val adapter = binding.communityCategoryContentRv.adapter as CategoryStudyContentRVAdapter
-        adapter.updateList(contentList)
-    }
-
-
-    private fun updatePageUI() {
-        startPage = if (currentPage <= 2) {
-            0
-        } else {
-            minOf(totalPages - 5, maxOf(0, currentPage - 2))
-        }
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            val pageNum = startPage + index
-            if (pageNum < totalPages) {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(
-                    if (pageNum == currentPage) R.drawable.btn_page_bg else 0
-                )
-                textView.isEnabled = true
-                textView.alpha = 1.0f
-                textView.visibility = View.VISIBLE
-            } else {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(0)
-                textView.isEnabled = false // 클릭 안 되게
-                textView.alpha = 0.3f
-                textView.visibility = View.VISIBLE
-            }
-        }
-
-        binding.previousPage.isEnabled = currentPage > 0
-        binding.nextPage.isEnabled = currentPage < totalPages - 1
-    }
-
-    private fun showLog(message: String?) {
-        Toast.makeText(requireContext(), "DiscussionFragment: $message", Toast.LENGTH_SHORT).show()
-    }
-
-    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-        val selectedItem = parent?.getItemAtPosition(position).toString()
-        selectedSortBy = when (selectedItem) {
-            "전체" -> "ALL"
-            "모집중" -> "RECRUITING"
-            "모집완료" -> "COMPLETED"
-            "조회수순" -> "HIT"
-            "관심순" -> "LIKED"
-            else -> "ALL"
-        }
-        currentPage = 0
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-    }
-
-    private fun toggleLikeStatus(studyItem: CategoryStudyDetail, likeButton: ImageView) {
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val memberId = sharedPreferences.getInt("${sharedPreferences.getString("currentEmail", "")}_memberId", -1)
-
-        if (memberId != -1) {
-            studyApiService.toggleStudyLike(studyItem.studyId)
-                .enqueue(object : Callback<LikeResponse> {
-                    override fun onResponse(call: Call<LikeResponse>, response: Response<LikeResponse>) {
-                        if (response.isSuccessful) {
-                            response.body()?.let { likeResponse ->
-                                // 서버에서 반환된 상태에 따라 하트 아이콘 및 CategoryStudyDetail의 liked 상태 업데이트
-                                val newStatus = likeResponse.result.status
-                                studyItem.liked = newStatus == "LIKE"
-                                val newIcon = if (studyItem.liked) R.drawable.ic_heart_filled else R.drawable.study_like
-                                likeButton.setImageResource(newIcon)
-
-                                // heartCount 즉시 증가 또는 감소
-                                studyItem.heartCount = if (studyItem.liked) studyItem.heartCount + 1 else studyItem.heartCount - 1
-
-                                // 변경된 항목을 어댑터에 알림
-                                val adapter = binding.communityCategoryContentRv.adapter as CategoryStudyContentRVAdapter
-                                val position = adapter.dataList.indexOf(studyItem)
-                                if (position != -1) {
-                                    adapter.notifyItemChanged(position)
-                                }
-                            }
-                        } else {
-                            Toast.makeText(requireContext(), "찜 상태 업데이트 실패", Toast.LENGTH_SHORT).show()
-                        }
-                    }
-
-                    override fun onFailure(call: Call<LikeResponse>, t: Throwable) {
-                        Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
-                    }
-                })
-        } else {
-            Toast.makeText(requireContext(), "회원 정보를 불러올 수 없습니다.", Toast.LENGTH_SHORT).show()
-        }
-    }
-
-
-    override fun onNothingSelected(parent: AdapterView<*>?) {
-        selectedSortBy = "ALL"
-    }
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/FreeStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/FreeStudyFragment.kt
deleted file mode 100644
index 976b4b3b..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/FreeStudyFragment.kt
+++ /dev/null
@@ -1,314 +0,0 @@
-package com.example.spoteam_android.ui.category.category_tabs
-
-import StudyApiService
-import StudyViewModel
-import android.content.Context
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.LikeResponse
-import com.example.spoteam_android.MainActivity
-import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding
-import com.example.spoteam_android.ui.community.CategoryStudyDetail
-import com.example.spoteam_android.ui.community.CategoryStudyResponse
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.study.DetailStudyFragment
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class FreeStudyFragment : Fragment(), AdapterView.OnItemSelectedListener {
-
-    private lateinit var binding: FragmentCategoryStudyContentBinding
-    private val studyViewModel: StudyViewModel by activityViewModels()
-    private lateinit var studyApiService: StudyApiService
-
-    private var currentPage = 0
-    private val size = 5
-    private var totalPages = 0
-    private var startPage = 0
-    private var isLoading = false
-    private var selectedSortBy: String = "ALL"
-    private val theme :String = "자율학습"
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = FragmentCategoryStudyContentBinding.inflate(inflater, container, false)
-        studyApiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-
-
-        val categoryStudyAdapter = CategoryStudyContentRVAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-            toggleLikeStatus(selectedItem, likeButton)
-        })
-
-        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-
-        categoryStudyAdapter.setItemClickListener(object : CategoryStudyContentRVAdapter.OnItemClickListener {
-            override fun onItemClick(data: CategoryStudyDetail) {
-                // DetailStudyFragment로 이동
-                studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
-
-                val detailStudyFragment = DetailStudyFragment()
-                (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
-                    ?.replace(R.id.main_frm, detailStudyFragment)
-                    ?.addToBackStack(null)
-                    ?.commit()
-            }
-        })
-        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-        binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
-
-
-
-
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        initBottomFilterView()
-        return binding.root
-    }
-
-    private fun initBottomFilterView() {
-        val dialogView = layoutInflater.inflate(R.layout.bottom_sheet_interest_spinner, null)
-        val bottomSheetDialog = BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
-        bottomSheetDialog.setContentView(dialogView)
-
-        val recentlyLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_recently)
-        val viewLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_view)
-        val hotLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_hot)
-
-        recentlyLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "최신 순"
-            selectedSortBy="ALL"  // 최신 순
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        viewLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "조회 수 높은 순"
-            selectedSortBy="HIT"
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        hotLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "관심 많은 순"
-            selectedSortBy="LIKED"  // 관심 많은 순
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        binding.contentFilterToggleContainer.setOnClickListener {
-            bottomSheetDialog.show()
-        }
-    }
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            textView.setOnClickListener {
-                val selectedPage = startPage + index
-                if (currentPage != selectedPage) {
-                    currentPage = selectedPage
-                    fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-                }
-            }
-        }
-
-        binding.previousPage.setOnClickListener {
-            if (currentPage > 0) {
-                currentPage--
-                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-            }
-        }
-
-        binding.nextPage.setOnClickListener {
-            if (currentPage < totalPages - 1) {
-                currentPage++
-                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-            }
-        }
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-    }
-
-
-
-    private fun fetchBestCommunityContent(theme: String, page: Int, size: Int, sortBy: String) {
-        isLoading = true
-        val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
-        service.getCategoryStudy(theme, page, size, sortBy)
-            .enqueue(object : Callback<CategoryStudyResponse> {
-                override fun onResponse(
-                    call: Call<CategoryStudyResponse>,
-                    response: Response<CategoryStudyResponse>
-                ) {
-                    if (response.isSuccessful) {
-                        response.body()?.let { categoryStudyResponse ->
-                            if (categoryStudyResponse.isSuccess == "true") {
-                                val contentList = categoryStudyResponse.result?.content ?: emptyList()
-                                totalPages = categoryStudyResponse.result.totalPages
-
-                                val totalElements = categoryStudyResponse.result.totalElements
-                                binding.contentCountTv.text = totalElements.toString()
-
-                                if (contentList.isNotEmpty()) {
-                                    updateRecyclerView(contentList)
-                                    binding.emptyTv.visibility = View.GONE
-                                } else if (currentPage == 0) {
-                                    binding.emptyTv.visibility = View.VISIBLE
-                                }
-
-                                updatePageUI()
-                            }
-                        }
-                    } else {
-                        showLog(response.code().toString())
-                    }
-                    isLoading = false
-                }
-
-                override fun onFailure(call: Call<CategoryStudyResponse>, t: Throwable) {
-                    showLog(t.message)
-                    isLoading = false
-                }
-            })
-    }
-
-    private fun updateRecyclerView(contentList: List<CategoryStudyDetail>) {
-        // 어댑터가 초기화되지 않은 경우 초기화
-        if (binding.communityCategoryContentRv.adapter == null) {
-            val categoryStudyAdapter = CategoryStudyContentRVAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-                toggleLikeStatus(selectedItem, likeButton)
-            })
-            binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-            binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
-        }
-
-        // 어댑터가 이미 존재하는 경우 데이터를 추가
-        val adapter = binding.communityCategoryContentRv.adapter as CategoryStudyContentRVAdapter
-        adapter.updateList(contentList)
-    }
-
-
-    private fun updatePageUI() {
-        startPage = if (currentPage <= 2) {
-            0
-        } else {
-            minOf(totalPages - 5, maxOf(0, currentPage - 2))
-        }
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            val pageNum = startPage + index
-            if (pageNum < totalPages) {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(
-                    if (pageNum == currentPage) R.drawable.btn_page_bg else 0
-                )
-                textView.isEnabled = true
-                textView.alpha = 1.0f
-                textView.visibility = View.VISIBLE
-            } else {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(0)
-                textView.isEnabled = false // 클릭 안 되게
-                textView.alpha = 0.3f
-                textView.visibility = View.VISIBLE
-            }
-        }
-
-        binding.previousPage.isEnabled = currentPage > 0
-        binding.nextPage.isEnabled = currentPage < totalPages - 1
-    }
-
-    private fun showLog(message: String?) {
-        Toast.makeText(requireContext(), "DiscussionFragment: $message", Toast.LENGTH_SHORT).show()
-    }
-
-    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-        val selectedItem = parent?.getItemAtPosition(position).toString()
-        selectedSortBy = when (selectedItem) {
-            "전체" -> "ALL"
-            "모집중" -> "RECRUITING"
-            "모집완료" -> "COMPLETED"
-            "조회수순" -> "HIT"
-            "관심순" -> "LIKED"
-            else -> "ALL"
-        }
-        currentPage = 0
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-    }
-
-    private fun toggleLikeStatus(studyItem: CategoryStudyDetail, likeButton: ImageView) {
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val memberId = sharedPreferences.getInt("${sharedPreferences.getString("currentEmail", "")}_memberId", -1)
-
-        if (memberId != -1) {
-            studyApiService.toggleStudyLike(studyItem.studyId)
-                .enqueue(object : Callback<LikeResponse> {
-                    override fun onResponse(call: Call<LikeResponse>, response: Response<LikeResponse>) {
-                        if (response.isSuccessful) {
-                            response.body()?.let { likeResponse ->
-                                // 서버에서 반환된 상태에 따라 하트 아이콘 및 CategoryStudyDetail의 liked 상태 업데이트
-                                val newStatus = likeResponse.result.status
-                                studyItem.liked = newStatus == "LIKE"
-                                val newIcon = if (studyItem.liked) R.drawable.ic_heart_filled else R.drawable.study_like
-                                likeButton.setImageResource(newIcon)
-
-                                // heartCount 즉시 증가 또는 감소
-                                studyItem.heartCount = if (studyItem.liked) studyItem.heartCount + 1 else studyItem.heartCount - 1
-
-                                // 변경된 항목을 어댑터에 알림
-                                val adapter = binding.communityCategoryContentRv.adapter as CategoryStudyContentRVAdapter
-                                val position = adapter.dataList.indexOf(studyItem)
-                                if (position != -1) {
-                                    adapter.notifyItemChanged(position)
-                                }
-                            }
-                        } else {
-                            Toast.makeText(requireContext(), "찜 상태 업데이트 실패", Toast.LENGTH_SHORT).show()
-                        }
-                    }
-
-                    override fun onFailure(call: Call<LikeResponse>, t: Throwable) {
-                        Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
-                    }
-                })
-        } else {
-            Toast.makeText(requireContext(), "회원 정보를 불러올 수 없습니다.", Toast.LENGTH_SHORT).show()
-        }
-    }
-
-
-    override fun onNothingSelected(parent: AdapterView<*>?) {
-        selectedSortBy = "ALL"
-    }
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/JobFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/JobFragment.kt
deleted file mode 100644
index 18f81e69..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/JobFragment.kt
+++ /dev/null
@@ -1,314 +0,0 @@
-package com.example.spoteam_android.ui.category.category_tabs
-
-import StudyApiService
-import StudyViewModel
-import android.content.Context
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.LikeResponse
-import com.example.spoteam_android.MainActivity
-import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding
-import com.example.spoteam_android.ui.community.CategoryStudyDetail
-import com.example.spoteam_android.ui.community.CategoryStudyResponse
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.study.DetailStudyFragment
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class JobFragment : Fragment(), AdapterView.OnItemSelectedListener {
-
-    private lateinit var binding: FragmentCategoryStudyContentBinding
-    private val studyViewModel: StudyViewModel by activityViewModels()
-    private lateinit var studyApiService: StudyApiService
-
-    private var currentPage = 0
-    private val size = 5
-    private var totalPages = 0
-    private var startPage = 0
-    private var isLoading = false
-    private var selectedSortBy: String = "ALL"
-    private val theme :String = "취업"
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = FragmentCategoryStudyContentBinding.inflate(inflater, container, false)
-        studyApiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-
-
-        val categoryStudyAdapter = CategoryStudyContentRVAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-            toggleLikeStatus(selectedItem, likeButton)
-        })
-
-        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-
-        categoryStudyAdapter.setItemClickListener(object : CategoryStudyContentRVAdapter.OnItemClickListener {
-            override fun onItemClick(data: CategoryStudyDetail) {
-                // DetailStudyFragment로 이동
-                studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
-
-                val detailStudyFragment = DetailStudyFragment()
-                (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
-                    ?.replace(R.id.main_frm, detailStudyFragment)
-                    ?.addToBackStack(null)
-                    ?.commit()
-            }
-        })
-        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-        binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
-
-
-
-
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        initBottomFilterView()
-        return binding.root
-    }
-
-    private fun initBottomFilterView() {
-        val dialogView = layoutInflater.inflate(R.layout.bottom_sheet_interest_spinner, null)
-        val bottomSheetDialog = BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
-        bottomSheetDialog.setContentView(dialogView)
-
-        val recentlyLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_recently)
-        val viewLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_view)
-        val hotLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_hot)
-
-        recentlyLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "최신 순"
-            selectedSortBy="ALL"  // 최신 순
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        viewLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "조회 수 높은 순"
-            selectedSortBy="HIT"
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        hotLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "관심 많은 순"
-            selectedSortBy="LIKED"  // 관심 많은 순
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        binding.contentFilterToggleContainer.setOnClickListener {
-            bottomSheetDialog.show()
-        }
-    }
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            textView.setOnClickListener {
-                val selectedPage = startPage + index
-                if (currentPage != selectedPage) {
-                    currentPage = selectedPage
-                    fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-                }
-            }
-        }
-
-        binding.previousPage.setOnClickListener {
-            if (currentPage > 0) {
-                currentPage--
-                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-            }
-        }
-
-        binding.nextPage.setOnClickListener {
-            if (currentPage < totalPages - 1) {
-                currentPage++
-                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-            }
-        }
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-    }
-
-
-
-    private fun fetchBestCommunityContent(theme: String, page: Int, size: Int, sortBy: String) {
-        isLoading = true
-        val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
-        service.getCategoryStudy(theme, page, size, sortBy)
-            .enqueue(object : Callback<CategoryStudyResponse> {
-                override fun onResponse(
-                    call: Call<CategoryStudyResponse>,
-                    response: Response<CategoryStudyResponse>
-                ) {
-                    if (response.isSuccessful) {
-                        response.body()?.let { categoryStudyResponse ->
-                            if (categoryStudyResponse.isSuccess == "true") {
-                                val contentList = categoryStudyResponse.result?.content ?: emptyList()
-                                totalPages = categoryStudyResponse.result.totalPages
-
-                                val totalElements = categoryStudyResponse.result.totalElements
-                                binding.contentCountTv.text = totalElements.toString()
-
-                                if (contentList.isNotEmpty()) {
-                                    updateRecyclerView(contentList)
-                                    binding.emptyTv.visibility = View.GONE
-                                } else if (currentPage == 0) {
-                                    binding.emptyTv.visibility = View.VISIBLE
-                                }
-
-                                updatePageUI()
-                            }
-                        }
-                    } else {
-                        showLog(response.code().toString())
-                    }
-                    isLoading = false
-                }
-
-                override fun onFailure(call: Call<CategoryStudyResponse>, t: Throwable) {
-                    showLog(t.message)
-                    isLoading = false
-                }
-            })
-    }
-
-    private fun updateRecyclerView(contentList: List<CategoryStudyDetail>) {
-        // 어댑터가 초기화되지 않은 경우 초기화
-        if (binding.communityCategoryContentRv.adapter == null) {
-            val categoryStudyAdapter = CategoryStudyContentRVAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-                toggleLikeStatus(selectedItem, likeButton)
-            })
-            binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-            binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
-        }
-
-        // 어댑터가 이미 존재하는 경우 데이터를 추가
-        val adapter = binding.communityCategoryContentRv.adapter as CategoryStudyContentRVAdapter
-        adapter.updateList(contentList)
-    }
-
-
-    private fun updatePageUI() {
-        startPage = if (currentPage <= 2) {
-            0
-        } else {
-            minOf(totalPages - 5, maxOf(0, currentPage - 2))
-        }
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            val pageNum = startPage + index
-            if (pageNum < totalPages) {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(
-                    if (pageNum == currentPage) R.drawable.btn_page_bg else 0
-                )
-                textView.isEnabled = true
-                textView.alpha = 1.0f
-                textView.visibility = View.VISIBLE
-            } else {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(0)
-                textView.isEnabled = false // 클릭 안 되게
-                textView.alpha = 0.3f
-                textView.visibility = View.VISIBLE
-            }
-        }
-
-        binding.previousPage.isEnabled = currentPage > 0
-        binding.nextPage.isEnabled = currentPage < totalPages - 1
-    }
-
-    private fun showLog(message: String?) {
-        Toast.makeText(requireContext(), "DiscussionFragment: $message", Toast.LENGTH_SHORT).show()
-    }
-
-    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-        val selectedItem = parent?.getItemAtPosition(position).toString()
-        selectedSortBy = when (selectedItem) {
-            "전체" -> "ALL"
-            "모집중" -> "RECRUITING"
-            "모집완료" -> "COMPLETED"
-            "조회수순" -> "HIT"
-            "관심순" -> "LIKED"
-            else -> "ALL"
-        }
-        currentPage = 0
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-    }
-
-    private fun toggleLikeStatus(studyItem: CategoryStudyDetail, likeButton: ImageView) {
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val memberId = sharedPreferences.getInt("${sharedPreferences.getString("currentEmail", "")}_memberId", -1)
-
-        if (memberId != -1) {
-            studyApiService.toggleStudyLike(studyItem.studyId)
-                .enqueue(object : Callback<LikeResponse> {
-                    override fun onResponse(call: Call<LikeResponse>, response: Response<LikeResponse>) {
-                        if (response.isSuccessful) {
-                            response.body()?.let { likeResponse ->
-                                // 서버에서 반환된 상태에 따라 하트 아이콘 및 CategoryStudyDetail의 liked 상태 업데이트
-                                val newStatus = likeResponse.result.status
-                                studyItem.liked = newStatus == "LIKE"
-                                val newIcon = if (studyItem.liked) R.drawable.ic_heart_filled else R.drawable.study_like
-                                likeButton.setImageResource(newIcon)
-
-                                // heartCount 즉시 증가 또는 감소
-                                studyItem.heartCount = if (studyItem.liked) studyItem.heartCount + 1 else studyItem.heartCount - 1
-
-                                // 변경된 항목을 어댑터에 알림
-                                val adapter = binding.communityCategoryContentRv.adapter as CategoryStudyContentRVAdapter
-                                val position = adapter.dataList.indexOf(studyItem)
-                                if (position != -1) {
-                                    adapter.notifyItemChanged(position)
-                                }
-                            }
-                        } else {
-                            Toast.makeText(requireContext(), "찜 상태 업데이트 실패", Toast.LENGTH_SHORT).show()
-                        }
-                    }
-
-                    override fun onFailure(call: Call<LikeResponse>, t: Throwable) {
-                        Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
-                    }
-                })
-        } else {
-            Toast.makeText(requireContext(), "회원 정보를 불러올 수 없습니다.", Toast.LENGTH_SHORT).show()
-        }
-    }
-
-
-    override fun onNothingSelected(parent: AdapterView<*>?) {
-        selectedSortBy = "ALL"
-    }
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/LanguageFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/LanguageFragment.kt
deleted file mode 100644
index b83dbede..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/LanguageFragment.kt
+++ /dev/null
@@ -1,314 +0,0 @@
-package com.example.spoteam_android.ui.category.category_tabs
-
-import StudyApiService
-import StudyViewModel
-import android.content.Context
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.LikeResponse
-import com.example.spoteam_android.MainActivity
-import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding
-import com.example.spoteam_android.ui.community.CategoryStudyDetail
-import com.example.spoteam_android.ui.community.CategoryStudyResponse
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.study.DetailStudyFragment
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class LanguageFragment : Fragment(), AdapterView.OnItemSelectedListener {
-
-    private lateinit var binding: FragmentCategoryStudyContentBinding
-    private val studyViewModel: StudyViewModel by activityViewModels()
-    private lateinit var studyApiService: StudyApiService
-
-    private var currentPage = 0
-    private val size = 5
-    private var totalPages = 0
-    private var startPage = 0
-    private var isLoading = false
-    private var selectedSortBy: String = "ALL"
-    private val theme :String = "어학"
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = FragmentCategoryStudyContentBinding.inflate(inflater, container, false)
-        studyApiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-
-
-        val categoryStudyAdapter = CategoryStudyContentRVAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-            toggleLikeStatus(selectedItem, likeButton)
-        })
-
-        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-
-        categoryStudyAdapter.setItemClickListener(object : CategoryStudyContentRVAdapter.OnItemClickListener {
-            override fun onItemClick(data: CategoryStudyDetail) {
-                // DetailStudyFragment로 이동
-                studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
-
-                val detailStudyFragment = DetailStudyFragment()
-                (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
-                    ?.replace(R.id.main_frm, detailStudyFragment)
-                    ?.addToBackStack(null)
-                    ?.commit()
-            }
-        })
-        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-        binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
-
-
-
-
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        initBottomFilterView()
-        return binding.root
-    }
-
-    private fun initBottomFilterView() {
-        val dialogView = layoutInflater.inflate(R.layout.bottom_sheet_interest_spinner, null)
-        val bottomSheetDialog = BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
-        bottomSheetDialog.setContentView(dialogView)
-
-        val recentlyLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_recently)
-        val viewLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_view)
-        val hotLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_hot)
-
-        recentlyLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "최신 순"
-            selectedSortBy="ALL"  // 최신 순
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        viewLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "조회 수 높은 순"
-            selectedSortBy="HIT"
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        hotLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "관심 많은 순"
-            selectedSortBy="LIKED"  // 관심 많은 순
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        binding.contentFilterToggleContainer.setOnClickListener {
-            bottomSheetDialog.show()
-        }
-    }
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            textView.setOnClickListener {
-                val selectedPage = startPage + index
-                if (currentPage != selectedPage) {
-                    currentPage = selectedPage
-                    fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-                }
-            }
-        }
-
-        binding.previousPage.setOnClickListener {
-            if (currentPage > 0) {
-                currentPage--
-                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-            }
-        }
-
-        binding.nextPage.setOnClickListener {
-            if (currentPage < totalPages - 1) {
-                currentPage++
-                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-            }
-        }
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-    }
-
-
-
-    private fun fetchBestCommunityContent(theme: String, page: Int, size: Int, sortBy: String) {
-        isLoading = true
-        val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
-        service.getCategoryStudy(theme, page, size, sortBy)
-            .enqueue(object : Callback<CategoryStudyResponse> {
-                override fun onResponse(
-                    call: Call<CategoryStudyResponse>,
-                    response: Response<CategoryStudyResponse>
-                ) {
-                    if (response.isSuccessful) {
-                        response.body()?.let { categoryStudyResponse ->
-                            if (categoryStudyResponse.isSuccess == "true") {
-                                val contentList = categoryStudyResponse.result?.content ?: emptyList()
-                                totalPages = categoryStudyResponse.result.totalPages
-
-                                val totalElements = categoryStudyResponse.result.totalElements
-                                binding.contentCountTv.text = totalElements.toString()
-
-                                if (contentList.isNotEmpty()) {
-                                    updateRecyclerView(contentList)
-                                    binding.emptyTv.visibility = View.GONE
-                                } else if (currentPage == 0) {
-                                    binding.emptyTv.visibility = View.VISIBLE
-                                }
-
-                                updatePageUI()
-                            }
-                        }
-                    } else {
-                        showLog(response.code().toString())
-                    }
-                    isLoading = false
-                }
-
-                override fun onFailure(call: Call<CategoryStudyResponse>, t: Throwable) {
-                    showLog(t.message)
-                    isLoading = false
-                }
-            })
-    }
-
-    private fun updateRecyclerView(contentList: List<CategoryStudyDetail>) {
-        // 어댑터가 초기화되지 않은 경우 초기화
-        if (binding.communityCategoryContentRv.adapter == null) {
-            val categoryStudyAdapter = CategoryStudyContentRVAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-                toggleLikeStatus(selectedItem, likeButton)
-            })
-            binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-            binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
-        }
-
-        // 어댑터가 이미 존재하는 경우 데이터를 추가
-        val adapter = binding.communityCategoryContentRv.adapter as CategoryStudyContentRVAdapter
-        adapter.updateList(contentList)
-    }
-
-
-    private fun updatePageUI() {
-        startPage = if (currentPage <= 2) {
-            0
-        } else {
-            minOf(totalPages - 5, maxOf(0, currentPage - 2))
-        }
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            val pageNum = startPage + index
-            if (pageNum < totalPages) {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(
-                    if (pageNum == currentPage) R.drawable.btn_page_bg else 0
-                )
-                textView.isEnabled = true
-                textView.alpha = 1.0f
-                textView.visibility = View.VISIBLE
-            } else {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(0)
-                textView.isEnabled = false // 클릭 안 되게
-                textView.alpha = 0.3f
-                textView.visibility = View.VISIBLE
-            }
-        }
-
-        binding.previousPage.isEnabled = currentPage > 0
-        binding.nextPage.isEnabled = currentPage < totalPages - 1
-    }
-
-    private fun showLog(message: String?) {
-        Toast.makeText(requireContext(), "DiscussionFragment: $message", Toast.LENGTH_SHORT).show()
-    }
-
-    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-        val selectedItem = parent?.getItemAtPosition(position).toString()
-        selectedSortBy = when (selectedItem) {
-            "전체" -> "ALL"
-            "모집중" -> "RECRUITING"
-            "모집완료" -> "COMPLETED"
-            "조회수순" -> "HIT"
-            "관심순" -> "LIKED"
-            else -> "ALL"
-        }
-        currentPage = 0
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-    }
-
-    private fun toggleLikeStatus(studyItem: CategoryStudyDetail, likeButton: ImageView) {
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val memberId = sharedPreferences.getInt("${sharedPreferences.getString("currentEmail", "")}_memberId", -1)
-
-        if (memberId != -1) {
-            studyApiService.toggleStudyLike(studyItem.studyId)
-                .enqueue(object : Callback<LikeResponse> {
-                    override fun onResponse(call: Call<LikeResponse>, response: Response<LikeResponse>) {
-                        if (response.isSuccessful) {
-                            response.body()?.let { likeResponse ->
-                                // 서버에서 반환된 상태에 따라 하트 아이콘 및 CategoryStudyDetail의 liked 상태 업데이트
-                                val newStatus = likeResponse.result.status
-                                studyItem.liked = newStatus == "LIKE"
-                                val newIcon = if (studyItem.liked) R.drawable.ic_heart_filled else R.drawable.study_like
-                                likeButton.setImageResource(newIcon)
-
-                                // heartCount 즉시 증가 또는 감소
-                                studyItem.heartCount = if (studyItem.liked) studyItem.heartCount + 1 else studyItem.heartCount - 1
-
-                                // 변경된 항목을 어댑터에 알림
-                                val adapter = binding.communityCategoryContentRv.adapter as CategoryStudyContentRVAdapter
-                                val position = adapter.dataList.indexOf(studyItem)
-                                if (position != -1) {
-                                    adapter.notifyItemChanged(position)
-                                }
-                            }
-                        } else {
-                            Toast.makeText(requireContext(), "찜 상태 업데이트 실패", Toast.LENGTH_SHORT).show()
-                        }
-                    }
-
-                    override fun onFailure(call: Call<LikeResponse>, t: Throwable) {
-                        Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
-                    }
-                })
-        } else {
-            Toast.makeText(requireContext(), "회원 정보를 불러올 수 없습니다.", Toast.LENGTH_SHORT).show()
-        }
-    }
-
-
-    override fun onNothingSelected(parent: AdapterView<*>?) {
-        selectedSortBy = "ALL"
-    }
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/LicenseFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/LicenseFragment.kt
deleted file mode 100644
index e3a35e86..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/LicenseFragment.kt
+++ /dev/null
@@ -1,314 +0,0 @@
-package com.example.spoteam_android.ui.category.category_tabs
-
-import StudyApiService
-import StudyViewModel
-import android.content.Context
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.LikeResponse
-import com.example.spoteam_android.MainActivity
-import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding
-import com.example.spoteam_android.ui.community.CategoryStudyDetail
-import com.example.spoteam_android.ui.community.CategoryStudyResponse
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.study.DetailStudyFragment
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class LicenseFragment : Fragment(), AdapterView.OnItemSelectedListener {
-
-    private lateinit var binding: FragmentCategoryStudyContentBinding
-    private val studyViewModel: StudyViewModel by activityViewModels()
-    private lateinit var studyApiService: StudyApiService
-
-    private var currentPage = 0
-    private val size = 5
-    private var totalPages = 0
-    private var startPage = 0
-    private var isLoading = false
-    private var selectedSortBy: String = "ALL"
-    private val theme :String = "자격증"
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = FragmentCategoryStudyContentBinding.inflate(inflater, container, false)
-        studyApiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-
-
-        val categoryStudyAdapter = CategoryStudyContentRVAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-            toggleLikeStatus(selectedItem, likeButton)
-        })
-
-        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-
-        categoryStudyAdapter.setItemClickListener(object : CategoryStudyContentRVAdapter.OnItemClickListener {
-            override fun onItemClick(data: CategoryStudyDetail) {
-                // DetailStudyFragment로 이동
-                studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
-
-                val detailStudyFragment = DetailStudyFragment()
-                (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
-                    ?.replace(R.id.main_frm, detailStudyFragment)
-                    ?.addToBackStack(null)
-                    ?.commit()
-            }
-        })
-        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-        binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
-
-
-
-
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        initBottomFilterView()
-        return binding.root
-    }
-
-    private fun initBottomFilterView() {
-        val dialogView = layoutInflater.inflate(R.layout.bottom_sheet_interest_spinner, null)
-        val bottomSheetDialog = BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
-        bottomSheetDialog.setContentView(dialogView)
-
-        val recentlyLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_recently)
-        val viewLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_view)
-        val hotLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_hot)
-
-        recentlyLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "최신 순"
-            selectedSortBy="ALL"  // 최신 순
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        viewLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "조회 수 높은 순"
-            selectedSortBy="HIT"
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        hotLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "관심 많은 순"
-            selectedSortBy="LIKED"  // 관심 많은 순
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        binding.contentFilterToggleContainer.setOnClickListener {
-            bottomSheetDialog.show()
-        }
-    }
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            textView.setOnClickListener {
-                val selectedPage = startPage + index
-                if (currentPage != selectedPage) {
-                    currentPage = selectedPage
-                    fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-                }
-            }
-        }
-
-        binding.previousPage.setOnClickListener {
-            if (currentPage > 0) {
-                currentPage--
-                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-            }
-        }
-
-        binding.nextPage.setOnClickListener {
-            if (currentPage < totalPages - 1) {
-                currentPage++
-                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-            }
-        }
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-    }
-
-
-
-    private fun fetchBestCommunityContent(theme: String, page: Int, size: Int, sortBy: String) {
-        isLoading = true
-        val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
-        service.getCategoryStudy(theme, page, size, sortBy)
-            .enqueue(object : Callback<CategoryStudyResponse> {
-                override fun onResponse(
-                    call: Call<CategoryStudyResponse>,
-                    response: Response<CategoryStudyResponse>
-                ) {
-                    if (response.isSuccessful) {
-                        response.body()?.let { categoryStudyResponse ->
-                            if (categoryStudyResponse.isSuccess == "true") {
-                                val contentList = categoryStudyResponse.result?.content ?: emptyList()
-                                totalPages = categoryStudyResponse.result.totalPages
-
-                                val totalElements = categoryStudyResponse.result.totalElements
-                                binding.contentCountTv.text = totalElements.toString()
-
-                                if (contentList.isNotEmpty()) {
-                                    updateRecyclerView(contentList)
-                                    binding.emptyTv.visibility = View.GONE
-                                } else if (currentPage == 0) {
-                                    binding.emptyTv.visibility = View.VISIBLE
-                                }
-
-                                updatePageUI()
-                            }
-                        }
-                    } else {
-                        showLog(response.code().toString())
-                    }
-                    isLoading = false
-                }
-
-                override fun onFailure(call: Call<CategoryStudyResponse>, t: Throwable) {
-                    showLog(t.message)
-                    isLoading = false
-                }
-            })
-    }
-
-    private fun updateRecyclerView(contentList: List<CategoryStudyDetail>) {
-        // 어댑터가 초기화되지 않은 경우 초기화
-        if (binding.communityCategoryContentRv.adapter == null) {
-            val categoryStudyAdapter = CategoryStudyContentRVAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-                toggleLikeStatus(selectedItem, likeButton)
-            })
-            binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-            binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
-        }
-
-        // 어댑터가 이미 존재하는 경우 데이터를 추가
-        val adapter = binding.communityCategoryContentRv.adapter as CategoryStudyContentRVAdapter
-        adapter.updateList(contentList)
-    }
-
-
-    private fun updatePageUI() {
-        startPage = if (currentPage <= 2) {
-            0
-        } else {
-            minOf(totalPages - 5, maxOf(0, currentPage - 2))
-        }
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            val pageNum = startPage + index
-            if (pageNum < totalPages) {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(
-                    if (pageNum == currentPage) R.drawable.btn_page_bg else 0
-                )
-                textView.isEnabled = true
-                textView.alpha = 1.0f
-                textView.visibility = View.VISIBLE
-            } else {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(0)
-                textView.isEnabled = false // 클릭 안 되게
-                textView.alpha = 0.3f
-                textView.visibility = View.VISIBLE
-            }
-        }
-
-        binding.previousPage.isEnabled = currentPage > 0
-        binding.nextPage.isEnabled = currentPage < totalPages - 1
-    }
-
-    private fun showLog(message: String?) {
-        Toast.makeText(requireContext(), "DiscussionFragment: $message", Toast.LENGTH_SHORT).show()
-    }
-
-    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-        val selectedItem = parent?.getItemAtPosition(position).toString()
-        selectedSortBy = when (selectedItem) {
-            "전체" -> "ALL"
-            "모집중" -> "RECRUITING"
-            "모집완료" -> "COMPLETED"
-            "조회수순" -> "HIT"
-            "관심순" -> "LIKED"
-            else -> "ALL"
-        }
-        currentPage = 0
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-    }
-
-    private fun toggleLikeStatus(studyItem: CategoryStudyDetail, likeButton: ImageView) {
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val memberId = sharedPreferences.getInt("${sharedPreferences.getString("currentEmail", "")}_memberId", -1)
-
-        if (memberId != -1) {
-            studyApiService.toggleStudyLike(studyItem.studyId)
-                .enqueue(object : Callback<LikeResponse> {
-                    override fun onResponse(call: Call<LikeResponse>, response: Response<LikeResponse>) {
-                        if (response.isSuccessful) {
-                            response.body()?.let { likeResponse ->
-                                // 서버에서 반환된 상태에 따라 하트 아이콘 및 CategoryStudyDetail의 liked 상태 업데이트
-                                val newStatus = likeResponse.result.status
-                                studyItem.liked = newStatus == "LIKE"
-                                val newIcon = if (studyItem.liked) R.drawable.ic_heart_filled else R.drawable.study_like
-                                likeButton.setImageResource(newIcon)
-
-                                // heartCount 즉시 증가 또는 감소
-                                studyItem.heartCount = if (studyItem.liked) studyItem.heartCount + 1 else studyItem.heartCount - 1
-
-                                // 변경된 항목을 어댑터에 알림
-                                val adapter = binding.communityCategoryContentRv.adapter as CategoryStudyContentRVAdapter
-                                val position = adapter.dataList.indexOf(studyItem)
-                                if (position != -1) {
-                                    adapter.notifyItemChanged(position)
-                                }
-                            }
-                        } else {
-                            Toast.makeText(requireContext(), "찜 상태 업데이트 실패", Toast.LENGTH_SHORT).show()
-                        }
-                    }
-
-                    override fun onFailure(call: Call<LikeResponse>, t: Throwable) {
-                        Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
-                    }
-                })
-        } else {
-            Toast.makeText(requireContext(), "회원 정보를 불러올 수 없습니다.", Toast.LENGTH_SHORT).show()
-        }
-    }
-
-
-    override fun onNothingSelected(parent: AdapterView<*>?) {
-        selectedSortBy = "ALL"
-    }
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/MajorFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/MajorFragment.kt
deleted file mode 100644
index e7bc7661..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/MajorFragment.kt
+++ /dev/null
@@ -1,314 +0,0 @@
-package com.example.spoteam_android.ui.category.category_tabs
-
-import StudyApiService
-import StudyViewModel
-import android.content.Context
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.LikeResponse
-import com.example.spoteam_android.MainActivity
-import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding
-import com.example.spoteam_android.ui.community.CategoryStudyDetail
-import com.example.spoteam_android.ui.community.CategoryStudyResponse
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.study.DetailStudyFragment
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class MajorFragment : Fragment(), AdapterView.OnItemSelectedListener {
-
-    private lateinit var binding: FragmentCategoryStudyContentBinding
-    private val studyViewModel: StudyViewModel by activityViewModels()
-    private lateinit var studyApiService: StudyApiService
-
-    private var currentPage = 0
-    private val size = 5
-    private var totalPages = 0
-    private var startPage = 0
-    private var isLoading = false
-    private var selectedSortBy: String = "ALL"
-    private val theme :String = "전공및진로학습"
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = FragmentCategoryStudyContentBinding.inflate(inflater, container, false)
-        studyApiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-
-
-        val categoryStudyAdapter = CategoryStudyContentRVAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-            toggleLikeStatus(selectedItem, likeButton)
-        })
-
-        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-
-        categoryStudyAdapter.setItemClickListener(object : CategoryStudyContentRVAdapter.OnItemClickListener {
-            override fun onItemClick(data: CategoryStudyDetail) {
-                // DetailStudyFragment로 이동
-                studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
-
-                val detailStudyFragment = DetailStudyFragment()
-                (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
-                    ?.replace(R.id.main_frm, detailStudyFragment)
-                    ?.addToBackStack(null)
-                    ?.commit()
-            }
-        })
-        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-        binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
-
-
-
-
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        initBottomFilterView()
-        return binding.root
-    }
-
-    private fun initBottomFilterView() {
-        val dialogView = layoutInflater.inflate(R.layout.bottom_sheet_interest_spinner, null)
-        val bottomSheetDialog = BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
-        bottomSheetDialog.setContentView(dialogView)
-
-        val recentlyLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_recently)
-        val viewLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_view)
-        val hotLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_hot)
-
-        recentlyLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "최신 순"
-            selectedSortBy="ALL"  // 최신 순
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        viewLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "조회 수 높은 순"
-            selectedSortBy="HIT"
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        hotLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "관심 많은 순"
-            selectedSortBy="LIKED"  // 관심 많은 순
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        binding.contentFilterToggleContainer.setOnClickListener {
-            bottomSheetDialog.show()
-        }
-    }
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            textView.setOnClickListener {
-                val selectedPage = startPage + index
-                if (currentPage != selectedPage) {
-                    currentPage = selectedPage
-                    fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-                }
-            }
-        }
-
-        binding.previousPage.setOnClickListener {
-            if (currentPage > 0) {
-                currentPage--
-                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-            }
-        }
-
-        binding.nextPage.setOnClickListener {
-            if (currentPage < totalPages - 1) {
-                currentPage++
-                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-            }
-        }
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-    }
-
-
-
-    private fun fetchBestCommunityContent(theme: String, page: Int, size: Int, sortBy: String) {
-        isLoading = true
-        val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
-        service.getCategoryStudy(theme, page, size, sortBy)
-            .enqueue(object : Callback<CategoryStudyResponse> {
-                override fun onResponse(
-                    call: Call<CategoryStudyResponse>,
-                    response: Response<CategoryStudyResponse>
-                ) {
-                    if (response.isSuccessful) {
-                        response.body()?.let { categoryStudyResponse ->
-                            if (categoryStudyResponse.isSuccess == "true") {
-                                val contentList = categoryStudyResponse.result?.content ?: emptyList()
-                                totalPages = categoryStudyResponse.result.totalPages
-
-                                val totalElements = categoryStudyResponse.result.totalElements
-                                binding.contentCountTv.text = totalElements.toString()
-
-                                if (contentList.isNotEmpty()) {
-                                    updateRecyclerView(contentList)
-                                    binding.emptyTv.visibility = View.GONE
-                                } else if (currentPage == 0) {
-                                    binding.emptyTv.visibility = View.VISIBLE
-                                }
-
-                                updatePageUI()
-                            }
-                        }
-                    } else {
-                        showLog(response.code().toString())
-                    }
-                    isLoading = false
-                }
-
-                override fun onFailure(call: Call<CategoryStudyResponse>, t: Throwable) {
-                    showLog(t.message)
-                    isLoading = false
-                }
-            })
-    }
-
-    private fun updateRecyclerView(contentList: List<CategoryStudyDetail>) {
-        // 어댑터가 초기화되지 않은 경우 초기화
-        if (binding.communityCategoryContentRv.adapter == null) {
-            val categoryStudyAdapter = CategoryStudyContentRVAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-                toggleLikeStatus(selectedItem, likeButton)
-            })
-            binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-            binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
-        }
-
-        // 어댑터가 이미 존재하는 경우 데이터를 추가
-        val adapter = binding.communityCategoryContentRv.adapter as CategoryStudyContentRVAdapter
-        adapter.updateList(contentList)
-    }
-
-
-    private fun updatePageUI() {
-        startPage = if (currentPage <= 2) {
-            0
-        } else {
-            minOf(totalPages - 5, maxOf(0, currentPage - 2))
-        }
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            val pageNum = startPage + index
-            if (pageNum < totalPages) {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(
-                    if (pageNum == currentPage) R.drawable.btn_page_bg else 0
-                )
-                textView.isEnabled = true
-                textView.alpha = 1.0f
-                textView.visibility = View.VISIBLE
-            } else {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(0)
-                textView.isEnabled = false // 클릭 안 되게
-                textView.alpha = 0.3f
-                textView.visibility = View.VISIBLE
-            }
-        }
-
-        binding.previousPage.isEnabled = currentPage > 0
-        binding.nextPage.isEnabled = currentPage < totalPages - 1
-    }
-
-    private fun showLog(message: String?) {
-        Toast.makeText(requireContext(), "DiscussionFragment: $message", Toast.LENGTH_SHORT).show()
-    }
-
-    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-        val selectedItem = parent?.getItemAtPosition(position).toString()
-        selectedSortBy = when (selectedItem) {
-            "전체" -> "ALL"
-            "모집중" -> "RECRUITING"
-            "모집완료" -> "COMPLETED"
-            "조회수순" -> "HIT"
-            "관심순" -> "LIKED"
-            else -> "ALL"
-        }
-        currentPage = 0
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-    }
-
-    private fun toggleLikeStatus(studyItem: CategoryStudyDetail, likeButton: ImageView) {
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val memberId = sharedPreferences.getInt("${sharedPreferences.getString("currentEmail", "")}_memberId", -1)
-
-        if (memberId != -1) {
-            studyApiService.toggleStudyLike(studyItem.studyId)
-                .enqueue(object : Callback<LikeResponse> {
-                    override fun onResponse(call: Call<LikeResponse>, response: Response<LikeResponse>) {
-                        if (response.isSuccessful) {
-                            response.body()?.let { likeResponse ->
-                                // 서버에서 반환된 상태에 따라 하트 아이콘 및 CategoryStudyDetail의 liked 상태 업데이트
-                                val newStatus = likeResponse.result.status
-                                studyItem.liked = newStatus == "LIKE"
-                                val newIcon = if (studyItem.liked) R.drawable.ic_heart_filled else R.drawable.study_like
-                                likeButton.setImageResource(newIcon)
-
-                                // heartCount 즉시 증가 또는 감소
-                                studyItem.heartCount = if (studyItem.liked) studyItem.heartCount + 1 else studyItem.heartCount - 1
-
-                                // 변경된 항목을 어댑터에 알림
-                                val adapter = binding.communityCategoryContentRv.adapter as CategoryStudyContentRVAdapter
-                                val position = adapter.dataList.indexOf(studyItem)
-                                if (position != -1) {
-                                    adapter.notifyItemChanged(position)
-                                }
-                            }
-                        } else {
-                            Toast.makeText(requireContext(), "찜 상태 업데이트 실패", Toast.LENGTH_SHORT).show()
-                        }
-                    }
-
-                    override fun onFailure(call: Call<LikeResponse>, t: Throwable) {
-                        Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
-                    }
-                })
-        } else {
-            Toast.makeText(requireContext(), "회원 정보를 불러올 수 없습니다.", Toast.LENGTH_SHORT).show()
-        }
-    }
-
-
-    override fun onNothingSelected(parent: AdapterView<*>?) {
-        selectedSortBy = "ALL"
-    }
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/NewsFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/NewsFragment.kt
deleted file mode 100644
index f9eff81f..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/NewsFragment.kt
+++ /dev/null
@@ -1,314 +0,0 @@
-package com.example.spoteam_android.ui.category.category_tabs
-
-import StudyApiService
-import StudyViewModel
-import android.content.Context
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.LikeResponse
-import com.example.spoteam_android.MainActivity
-import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding
-import com.example.spoteam_android.ui.community.CategoryStudyDetail
-import com.example.spoteam_android.ui.community.CategoryStudyResponse
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.study.DetailStudyFragment
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class NewsFragment : Fragment(), AdapterView.OnItemSelectedListener {
-
-    private lateinit var binding: FragmentCategoryStudyContentBinding
-    private val studyViewModel: StudyViewModel by activityViewModels()
-    private lateinit var studyApiService: StudyApiService
-
-    private var currentPage = 0
-    private val size = 5
-    private var totalPages = 0
-    private var startPage = 0
-    private var isLoading = false
-    private var selectedSortBy: String = "ALL"
-    private val theme :String = "시사뉴스"
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = FragmentCategoryStudyContentBinding.inflate(inflater, container, false)
-        studyApiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-
-
-        val categoryStudyAdapter = CategoryStudyContentRVAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-            toggleLikeStatus(selectedItem, likeButton)
-        })
-
-        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-
-        categoryStudyAdapter.setItemClickListener(object : CategoryStudyContentRVAdapter.OnItemClickListener {
-            override fun onItemClick(data: CategoryStudyDetail) {
-                // DetailStudyFragment로 이동
-                studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
-
-                val detailStudyFragment = DetailStudyFragment()
-                (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
-                    ?.replace(R.id.main_frm, detailStudyFragment)
-                    ?.addToBackStack(null)
-                    ?.commit()
-            }
-        })
-        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-        binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
-
-
-
-
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        initBottomFilterView()
-        return binding.root
-    }
-
-    private fun initBottomFilterView() {
-        val dialogView = layoutInflater.inflate(R.layout.bottom_sheet_interest_spinner, null)
-        val bottomSheetDialog = BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
-        bottomSheetDialog.setContentView(dialogView)
-
-        val recentlyLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_recently)
-        val viewLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_view)
-        val hotLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_hot)
-
-        recentlyLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "최신 순"
-            selectedSortBy="ALL"  // 최신 순
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        viewLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "조회 수 높은 순"
-            selectedSortBy="HIT"
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        hotLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "관심 많은 순"
-            selectedSortBy="LIKED"  // 관심 많은 순
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        binding.contentFilterToggleContainer.setOnClickListener {
-            bottomSheetDialog.show()
-        }
-    }
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            textView.setOnClickListener {
-                val selectedPage = startPage + index
-                if (currentPage != selectedPage) {
-                    currentPage = selectedPage
-                    fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-                }
-            }
-        }
-
-        binding.previousPage.setOnClickListener {
-            if (currentPage > 0) {
-                currentPage--
-                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-            }
-        }
-
-        binding.nextPage.setOnClickListener {
-            if (currentPage < totalPages - 1) {
-                currentPage++
-                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-            }
-        }
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-    }
-
-
-
-    private fun fetchBestCommunityContent(theme: String, page: Int, size: Int, sortBy: String) {
-        isLoading = true
-        val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
-        service.getCategoryStudy(theme, page, size, sortBy)
-            .enqueue(object : Callback<CategoryStudyResponse> {
-                override fun onResponse(
-                    call: Call<CategoryStudyResponse>,
-                    response: Response<CategoryStudyResponse>
-                ) {
-                    if (response.isSuccessful) {
-                        response.body()?.let { categoryStudyResponse ->
-                            if (categoryStudyResponse.isSuccess == "true") {
-                                val contentList = categoryStudyResponse.result?.content ?: emptyList()
-                                totalPages = categoryStudyResponse.result.totalPages
-
-                                val totalElements = categoryStudyResponse.result.totalElements
-                                binding.contentCountTv.text = totalElements.toString()
-
-                                if (contentList.isNotEmpty()) {
-                                    updateRecyclerView(contentList)
-                                    binding.emptyTv.visibility = View.GONE
-                                } else if (currentPage == 0) {
-                                    binding.emptyTv.visibility = View.VISIBLE
-                                }
-
-                                updatePageUI()
-                            }
-                        }
-                    } else {
-                        showLog(response.code().toString())
-                    }
-                    isLoading = false
-                }
-
-                override fun onFailure(call: Call<CategoryStudyResponse>, t: Throwable) {
-                    showLog(t.message)
-                    isLoading = false
-                }
-            })
-    }
-
-    private fun updateRecyclerView(contentList: List<CategoryStudyDetail>) {
-        // 어댑터가 초기화되지 않은 경우 초기화
-        if (binding.communityCategoryContentRv.adapter == null) {
-            val categoryStudyAdapter = CategoryStudyContentRVAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-                toggleLikeStatus(selectedItem, likeButton)
-            })
-            binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-            binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
-        }
-
-        // 어댑터가 이미 존재하는 경우 데이터를 추가
-        val adapter = binding.communityCategoryContentRv.adapter as CategoryStudyContentRVAdapter
-        adapter.updateList(contentList)
-    }
-
-
-    private fun updatePageUI() {
-        startPage = if (currentPage <= 2) {
-            0
-        } else {
-            minOf(totalPages - 5, maxOf(0, currentPage - 2))
-        }
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            val pageNum = startPage + index
-            if (pageNum < totalPages) {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(
-                    if (pageNum == currentPage) R.drawable.btn_page_bg else 0
-                )
-                textView.isEnabled = true
-                textView.alpha = 1.0f
-                textView.visibility = View.VISIBLE
-            } else {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(0)
-                textView.isEnabled = false // 클릭 안 되게
-                textView.alpha = 0.3f
-                textView.visibility = View.VISIBLE
-            }
-        }
-
-        binding.previousPage.isEnabled = currentPage > 0
-        binding.nextPage.isEnabled = currentPage < totalPages - 1
-    }
-
-    private fun showLog(message: String?) {
-        Toast.makeText(requireContext(), "DiscussionFragment: $message", Toast.LENGTH_SHORT).show()
-    }
-
-    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-        val selectedItem = parent?.getItemAtPosition(position).toString()
-        selectedSortBy = when (selectedItem) {
-            "전체" -> "ALL"
-            "모집중" -> "RECRUITING"
-            "모집완료" -> "COMPLETED"
-            "조회수순" -> "HIT"
-            "관심순" -> "LIKED"
-            else -> "ALL"
-        }
-        currentPage = 0
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-    }
-
-    private fun toggleLikeStatus(studyItem: CategoryStudyDetail, likeButton: ImageView) {
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val memberId = sharedPreferences.getInt("${sharedPreferences.getString("currentEmail", "")}_memberId", -1)
-
-        if (memberId != -1) {
-            studyApiService.toggleStudyLike(studyItem.studyId)
-                .enqueue(object : Callback<LikeResponse> {
-                    override fun onResponse(call: Call<LikeResponse>, response: Response<LikeResponse>) {
-                        if (response.isSuccessful) {
-                            response.body()?.let { likeResponse ->
-                                // 서버에서 반환된 상태에 따라 하트 아이콘 및 CategoryStudyDetail의 liked 상태 업데이트
-                                val newStatus = likeResponse.result.status
-                                studyItem.liked = newStatus == "LIKE"
-                                val newIcon = if (studyItem.liked) R.drawable.ic_heart_filled else R.drawable.study_like
-                                likeButton.setImageResource(newIcon)
-
-                                // heartCount 즉시 증가 또는 감소
-                                studyItem.heartCount = if (studyItem.liked) studyItem.heartCount + 1 else studyItem.heartCount - 1
-
-                                // 변경된 항목을 어댑터에 알림
-                                val adapter = binding.communityCategoryContentRv.adapter as CategoryStudyContentRVAdapter
-                                val position = adapter.dataList.indexOf(studyItem)
-                                if (position != -1) {
-                                    adapter.notifyItemChanged(position)
-                                }
-                            }
-                        } else {
-                            Toast.makeText(requireContext(), "찜 상태 업데이트 실패", Toast.LENGTH_SHORT).show()
-                        }
-                    }
-
-                    override fun onFailure(call: Call<LikeResponse>, t: Throwable) {
-                        Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
-                    }
-                })
-        } else {
-            Toast.makeText(requireContext(), "회원 정보를 불러올 수 없습니다.", Toast.LENGTH_SHORT).show()
-        }
-    }
-
-
-    override fun onNothingSelected(parent: AdapterView<*>?) {
-        selectedSortBy = "ALL"
-    }
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/ProjectFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/ProjectFragment.kt
deleted file mode 100644
index 6eb162cd..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/ProjectFragment.kt
+++ /dev/null
@@ -1,314 +0,0 @@
-package com.example.spoteam_android.ui.category.category_tabs
-
-import StudyApiService
-import StudyViewModel
-import android.content.Context
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.LikeResponse
-import com.example.spoteam_android.MainActivity
-import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding
-import com.example.spoteam_android.ui.community.CategoryStudyDetail
-import com.example.spoteam_android.ui.community.CategoryStudyResponse
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.study.DetailStudyFragment
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class ProjectFragment : Fragment(), AdapterView.OnItemSelectedListener {
-
-    private lateinit var binding: FragmentCategoryStudyContentBinding
-    private val studyViewModel: StudyViewModel by activityViewModels()
-    private lateinit var studyApiService: StudyApiService
-
-    private var currentPage = 0
-    private val size = 5
-    private var totalPages = 0
-    private var startPage = 0
-    private var isLoading = false
-    private var selectedSortBy: String = "ALL"
-    private val theme :String = "프로젝트"
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = FragmentCategoryStudyContentBinding.inflate(inflater, container, false)
-        studyApiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-
-
-        val categoryStudyAdapter = CategoryStudyContentRVAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-            toggleLikeStatus(selectedItem, likeButton)
-        })
-
-        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-
-        categoryStudyAdapter.setItemClickListener(object : CategoryStudyContentRVAdapter.OnItemClickListener {
-            override fun onItemClick(data: CategoryStudyDetail) {
-                // DetailStudyFragment로 이동
-                studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
-
-                val detailStudyFragment = DetailStudyFragment()
-                (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
-                    ?.replace(R.id.main_frm, detailStudyFragment)
-                    ?.addToBackStack(null)
-                    ?.commit()
-            }
-        })
-        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-        binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
-
-
-
-
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        initBottomFilterView()
-        return binding.root
-    }
-
-    private fun initBottomFilterView() {
-        val dialogView = layoutInflater.inflate(R.layout.bottom_sheet_interest_spinner, null)
-        val bottomSheetDialog = BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
-        bottomSheetDialog.setContentView(dialogView)
-
-        val recentlyLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_recently)
-        val viewLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_view)
-        val hotLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_hot)
-
-        recentlyLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "최신 순"
-            selectedSortBy="ALL"  // 최신 순
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        viewLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "조회 수 높은 순"
-            selectedSortBy="HIT"
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        hotLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "관심 많은 순"
-            selectedSortBy="LIKED"  // 관심 많은 순
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        binding.contentFilterToggleContainer.setOnClickListener {
-            bottomSheetDialog.show()
-        }
-    }
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            textView.setOnClickListener {
-                val selectedPage = startPage + index
-                if (currentPage != selectedPage) {
-                    currentPage = selectedPage
-                    fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-                }
-            }
-        }
-
-        binding.previousPage.setOnClickListener {
-            if (currentPage > 0) {
-                currentPage--
-                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-            }
-        }
-
-        binding.nextPage.setOnClickListener {
-            if (currentPage < totalPages - 1) {
-                currentPage++
-                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-            }
-        }
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-    }
-
-
-
-    private fun fetchBestCommunityContent(theme: String, page: Int, size: Int, sortBy: String) {
-        isLoading = true
-        val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
-        service.getCategoryStudy(theme, page, size, sortBy)
-            .enqueue(object : Callback<CategoryStudyResponse> {
-                override fun onResponse(
-                    call: Call<CategoryStudyResponse>,
-                    response: Response<CategoryStudyResponse>
-                ) {
-                    if (response.isSuccessful) {
-                        response.body()?.let { categoryStudyResponse ->
-                            if (categoryStudyResponse.isSuccess == "true") {
-                                val contentList = categoryStudyResponse.result?.content ?: emptyList()
-                                totalPages = categoryStudyResponse.result.totalPages
-
-                                val totalElements = categoryStudyResponse.result.totalElements
-                                binding.contentCountTv.text = totalElements.toString()
-
-                                if (contentList.isNotEmpty()) {
-                                    updateRecyclerView(contentList)
-                                    binding.emptyTv.visibility = View.GONE
-                                } else if (currentPage == 0) {
-                                    binding.emptyTv.visibility = View.VISIBLE
-                                }
-
-                                updatePageUI()
-                            }
-                        }
-                    } else {
-                        showLog(response.code().toString())
-                    }
-                    isLoading = false
-                }
-
-                override fun onFailure(call: Call<CategoryStudyResponse>, t: Throwable) {
-                    showLog(t.message)
-                    isLoading = false
-                }
-            })
-    }
-
-    private fun updateRecyclerView(contentList: List<CategoryStudyDetail>) {
-        // 어댑터가 초기화되지 않은 경우 초기화
-        if (binding.communityCategoryContentRv.adapter == null) {
-            val categoryStudyAdapter = CategoryStudyContentRVAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-                toggleLikeStatus(selectedItem, likeButton)
-            })
-            binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-            binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
-        }
-
-        // 어댑터가 이미 존재하는 경우 데이터를 추가
-        val adapter = binding.communityCategoryContentRv.adapter as CategoryStudyContentRVAdapter
-        adapter.updateList(contentList)
-    }
-
-
-    private fun updatePageUI() {
-        startPage = if (currentPage <= 2) {
-            0
-        } else {
-            minOf(totalPages - 5, maxOf(0, currentPage - 2))
-        }
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            val pageNum = startPage + index
-            if (pageNum < totalPages) {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(
-                    if (pageNum == currentPage) R.drawable.btn_page_bg else 0
-                )
-                textView.isEnabled = true
-                textView.alpha = 1.0f
-                textView.visibility = View.VISIBLE
-            } else {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(0)
-                textView.isEnabled = false // 클릭 안 되게
-                textView.alpha = 0.3f
-                textView.visibility = View.VISIBLE
-            }
-        }
-
-        binding.previousPage.isEnabled = currentPage > 0
-        binding.nextPage.isEnabled = currentPage < totalPages - 1
-    }
-
-    private fun showLog(message: String?) {
-        Toast.makeText(requireContext(), "DiscussionFragment: $message", Toast.LENGTH_SHORT).show()
-    }
-
-    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-        val selectedItem = parent?.getItemAtPosition(position).toString()
-        selectedSortBy = when (selectedItem) {
-            "전체" -> "ALL"
-            "모집중" -> "RECRUITING"
-            "모집완료" -> "COMPLETED"
-            "조회수순" -> "HIT"
-            "관심순" -> "LIKED"
-            else -> "ALL"
-        }
-        currentPage = 0
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-    }
-
-    private fun toggleLikeStatus(studyItem: CategoryStudyDetail, likeButton: ImageView) {
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val memberId = sharedPreferences.getInt("${sharedPreferences.getString("currentEmail", "")}_memberId", -1)
-
-        if (memberId != -1) {
-            studyApiService.toggleStudyLike(studyItem.studyId)
-                .enqueue(object : Callback<LikeResponse> {
-                    override fun onResponse(call: Call<LikeResponse>, response: Response<LikeResponse>) {
-                        if (response.isSuccessful) {
-                            response.body()?.let { likeResponse ->
-                                // 서버에서 반환된 상태에 따라 하트 아이콘 및 CategoryStudyDetail의 liked 상태 업데이트
-                                val newStatus = likeResponse.result.status
-                                studyItem.liked = newStatus == "LIKE"
-                                val newIcon = if (studyItem.liked) R.drawable.ic_heart_filled else R.drawable.study_like
-                                likeButton.setImageResource(newIcon)
-
-                                // heartCount 즉시 증가 또는 감소
-                                studyItem.heartCount = if (studyItem.liked) studyItem.heartCount + 1 else studyItem.heartCount - 1
-
-                                // 변경된 항목을 어댑터에 알림
-                                val adapter = binding.communityCategoryContentRv.adapter as CategoryStudyContentRVAdapter
-                                val position = adapter.dataList.indexOf(studyItem)
-                                if (position != -1) {
-                                    adapter.notifyItemChanged(position)
-                                }
-                            }
-                        } else {
-                            Toast.makeText(requireContext(), "찜 상태 업데이트 실패", Toast.LENGTH_SHORT).show()
-                        }
-                    }
-
-                    override fun onFailure(call: Call<LikeResponse>, t: Throwable) {
-                        Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
-                    }
-                })
-        } else {
-            Toast.makeText(requireContext(), "회원 정보를 불러올 수 없습니다.", Toast.LENGTH_SHORT).show()
-        }
-    }
-
-
-    override fun onNothingSelected(parent: AdapterView<*>?) {
-        selectedSortBy = "ALL"
-    }
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/RestFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/RestFragment.kt
deleted file mode 100644
index 25c4cf85..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/RestFragment.kt
+++ /dev/null
@@ -1,314 +0,0 @@
-package com.example.spoteam_android.ui.category.category_tabs
-
-import StudyApiService
-import StudyViewModel
-import android.content.Context
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.LikeResponse
-import com.example.spoteam_android.MainActivity
-import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding
-import com.example.spoteam_android.ui.community.CategoryStudyDetail
-import com.example.spoteam_android.ui.community.CategoryStudyResponse
-import com.example.spoteam_android.ui.community.CommunityAPIService
-import com.example.spoteam_android.ui.study.DetailStudyFragment
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class RestFragment : Fragment(), AdapterView.OnItemSelectedListener {
-
-    private lateinit var binding: FragmentCategoryStudyContentBinding
-    private val studyViewModel: StudyViewModel by activityViewModels()
-    private lateinit var studyApiService: StudyApiService
-
-    private var currentPage = 0
-    private val size = 5
-    private var totalPages = 0
-    private var startPage = 0
-    private var isLoading = false
-    private var selectedSortBy: String = "ALL"
-    private val theme :String = "기타"
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = FragmentCategoryStudyContentBinding.inflate(inflater, container, false)
-        studyApiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-
-
-        val categoryStudyAdapter = CategoryStudyContentRVAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-            toggleLikeStatus(selectedItem, likeButton)
-        })
-
-        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-
-        categoryStudyAdapter.setItemClickListener(object : CategoryStudyContentRVAdapter.OnItemClickListener {
-            override fun onItemClick(data: CategoryStudyDetail) {
-                // DetailStudyFragment로 이동
-                studyViewModel.setStudyData(data.studyId, data.imageUrl, data.introduction)
-
-                val detailStudyFragment = DetailStudyFragment()
-                (activity as? MainActivity)?.supportFragmentManager?.beginTransaction()
-                    ?.replace(R.id.main_frm, detailStudyFragment)
-                    ?.addToBackStack(null)
-                    ?.commit()
-            }
-        })
-        binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-        binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
-
-
-
-
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        initBottomFilterView()
-        return binding.root
-    }
-
-    private fun initBottomFilterView() {
-        val dialogView = layoutInflater.inflate(R.layout.bottom_sheet_interest_spinner, null)
-        val bottomSheetDialog = BottomSheetDialog(requireContext(), R.style.InterestBottomSheetDialogTheme)
-        bottomSheetDialog.setContentView(dialogView)
-
-        val recentlyLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_recently)
-        val viewLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_view)
-        val hotLayout = dialogView.findViewById<FrameLayout>(R.id.framelayout_hot)
-
-        recentlyLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "최신 순"
-            selectedSortBy="ALL"  // 최신 순
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        viewLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "조회 수 높은 순"
-            selectedSortBy="HIT"
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        hotLayout.setOnClickListener {
-            bottomSheetDialog.dismiss()
-            binding.filterToggle.text = "관심 많은 순"
-            selectedSortBy="LIKED"  // 관심 많은 순
-            fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-        }
-
-        binding.contentFilterToggleContainer.setOnClickListener {
-            bottomSheetDialog.show()
-        }
-    }
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            textView.setOnClickListener {
-                val selectedPage = startPage + index
-                if (currentPage != selectedPage) {
-                    currentPage = selectedPage
-                    fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-                }
-            }
-        }
-
-        binding.previousPage.setOnClickListener {
-            if (currentPage > 0) {
-                currentPage--
-                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-            }
-        }
-
-        binding.nextPage.setOnClickListener {
-            if (currentPage < totalPages - 1) {
-                currentPage++
-                fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-            }
-        }
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-    }
-
-
-
-    private fun fetchBestCommunityContent(theme: String, page: Int, size: Int, sortBy: String) {
-        isLoading = true
-        val service = RetrofitInstance.retrofit.create(CommunityAPIService::class.java)
-        service.getCategoryStudy(theme, page, size, sortBy)
-            .enqueue(object : Callback<CategoryStudyResponse> {
-                override fun onResponse(
-                    call: Call<CategoryStudyResponse>,
-                    response: Response<CategoryStudyResponse>
-                ) {
-                    if (response.isSuccessful) {
-                        response.body()?.let { categoryStudyResponse ->
-                            if (categoryStudyResponse.isSuccess == "true") {
-                                val contentList = categoryStudyResponse.result?.content ?: emptyList()
-                                totalPages = categoryStudyResponse.result.totalPages
-
-                                val totalElements = categoryStudyResponse.result.totalElements
-                                binding.contentCountTv.text = totalElements.toString()
-
-                                if (contentList.isNotEmpty()) {
-                                    updateRecyclerView(contentList)
-                                    binding.emptyTv.visibility = View.GONE
-                                } else if (currentPage == 0) {
-                                    binding.emptyTv.visibility = View.VISIBLE
-                                }
-
-                                updatePageUI()
-                            }
-                        }
-                    } else {
-                        showLog(response.code().toString())
-                    }
-                    isLoading = false
-                }
-
-                override fun onFailure(call: Call<CategoryStudyResponse>, t: Throwable) {
-                    showLog(t.message)
-                    isLoading = false
-                }
-            })
-    }
-
-    private fun updateRecyclerView(contentList: List<CategoryStudyDetail>) {
-        // 어댑터가 초기화되지 않은 경우 초기화
-        if (binding.communityCategoryContentRv.adapter == null) {
-            val categoryStudyAdapter = CategoryStudyContentRVAdapter(ArrayList(), onLikeClick = { selectedItem, likeButton ->
-                toggleLikeStatus(selectedItem, likeButton)
-            })
-            binding.communityCategoryContentRv.adapter = categoryStudyAdapter
-            binding.communityCategoryContentRv.layoutManager = LinearLayoutManager(requireContext())
-        }
-
-        // 어댑터가 이미 존재하는 경우 데이터를 추가
-        val adapter = binding.communityCategoryContentRv.adapter as CategoryStudyContentRVAdapter
-        adapter.updateList(contentList)
-    }
-
-
-    private fun updatePageUI() {
-        startPage = if (currentPage <= 2) {
-            0
-        } else {
-            minOf(totalPages - 5, maxOf(0, currentPage - 2))
-        }
-
-        val pageButtons = listOf(
-            binding.page1,
-            binding.page2,
-            binding.page3,
-            binding.page4,
-            binding.page5
-        )
-
-        pageButtons.forEachIndexed { index, textView ->
-            val pageNum = startPage + index
-            if (pageNum < totalPages) {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(
-                    if (pageNum == currentPage) R.drawable.btn_page_bg else 0
-                )
-                textView.isEnabled = true
-                textView.alpha = 1.0f
-                textView.visibility = View.VISIBLE
-            } else {
-                textView.text = (pageNum + 1).toString()
-                textView.setBackgroundResource(0)
-                textView.isEnabled = false // 클릭 안 되게
-                textView.alpha = 0.3f
-                textView.visibility = View.VISIBLE
-            }
-        }
-
-        binding.previousPage.isEnabled = currentPage > 0
-        binding.nextPage.isEnabled = currentPage < totalPages - 1
-    }
-
-    private fun showLog(message: String?) {
-        Toast.makeText(requireContext(), "DiscussionFragment: $message", Toast.LENGTH_SHORT).show()
-    }
-
-    override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-        val selectedItem = parent?.getItemAtPosition(position).toString()
-        selectedSortBy = when (selectedItem) {
-            "전체" -> "ALL"
-            "모집중" -> "RECRUITING"
-            "모집완료" -> "COMPLETED"
-            "조회수순" -> "HIT"
-            "관심순" -> "LIKED"
-            else -> "ALL"
-        }
-        currentPage = 0
-        fetchBestCommunityContent(theme, currentPage, size, selectedSortBy)
-    }
-
-    private fun toggleLikeStatus(studyItem: CategoryStudyDetail, likeButton: ImageView) {
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val memberId = sharedPreferences.getInt("${sharedPreferences.getString("currentEmail", "")}_memberId", -1)
-
-        if (memberId != -1) {
-            studyApiService.toggleStudyLike(studyItem.studyId)
-                .enqueue(object : Callback<LikeResponse> {
-                    override fun onResponse(call: Call<LikeResponse>, response: Response<LikeResponse>) {
-                        if (response.isSuccessful) {
-                            response.body()?.let { likeResponse ->
-                                // 서버에서 반환된 상태에 따라 하트 아이콘 및 CategoryStudyDetail의 liked 상태 업데이트
-                                val newStatus = likeResponse.result.status
-                                studyItem.liked = newStatus == "LIKE"
-                                val newIcon = if (studyItem.liked) R.drawable.ic_heart_filled else R.drawable.study_like
-                                likeButton.setImageResource(newIcon)
-
-                                // heartCount 즉시 증가 또는 감소
-                                studyItem.heartCount = if (studyItem.liked) studyItem.heartCount + 1 else studyItem.heartCount - 1
-
-                                // 변경된 항목을 어댑터에 알림
-                                val adapter = binding.communityCategoryContentRv.adapter as CategoryStudyContentRVAdapter
-                                val position = adapter.dataList.indexOf(studyItem)
-                                if (position != -1) {
-                                    adapter.notifyItemChanged(position)
-                                }
-                            }
-                        } else {
-                            Toast.makeText(requireContext(), "찜 상태 업데이트 실패", Toast.LENGTH_SHORT).show()
-                        }
-                    }
-
-                    override fun onFailure(call: Call<LikeResponse>, t: Throwable) {
-                        Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
-                    }
-                })
-        } else {
-            Toast.makeText(requireContext(), "회원 정보를 불러올 수 없습니다.", Toast.LENGTH_SHORT).show()
-        }
-    }
-
-
-    override fun onNothingSelected(parent: AdapterView<*>?) {
-        selectedSortBy = "ALL"
-    }
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/home/HomeFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/home/HomeFragment.kt
deleted file mode 100644
index 2072d0f2..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/home/HomeFragment.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.example.spoteam_android.ui.home
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import com.example.spoteam_android.databinding.FragmentHomeBinding
-
-class HomeFragment : Fragment() {
-
-    lateinit var binding: FragmentHomeBinding
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = FragmentHomeBinding.inflate(inflater, container, false)
-
-        return binding.root
-    }
-
-}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/ActivityFeeStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/ActivityFeeStudyFragment.kt
deleted file mode 100644
index b7a89401..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/ActivityFeeStudyFragment.kt
+++ /dev/null
@@ -1,229 +0,0 @@
-import android.content.Context
-import android.net.Uri
-import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.activity.ComponentActivity.MODE_PRIVATE
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.databinding.FragmentActivityFeeStudyBinding
-import com.example.spoteam_android.ui.mypage.PurposeUploadComplteDialog
-import com.example.spoteam_android.ui.study.CorrectStudyCompleteDialog
-import com.example.spoteam_android.ui.study.MyStudyRegisterPreviewFragment
-class ActivityFeeStudyFragment : Fragment() {
-    private lateinit var binding: FragmentActivityFeeStudyBinding
-    private val viewModel: StudyViewModel by activityViewModels()
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        binding = FragmentActivityFeeStudyBinding.inflate(inflater, container, false)
-
-        setupChipGroupListener()
-        setupFeeEditTextListener()
-        setupPreviewButtonListener()
-        binding.fragmentActivityFeeStudyBackBt.setOnClickListener {
-            goToPreviusFragment()
-        }
-        binding.fragmentActivityFeeStudyEt.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                checkFeeInput()
-            }
-
-            override fun afterTextChanged(s: Editable?) {}
-        })
-
-        viewModel.studyRequest.observe(viewLifecycleOwner) { request ->
-            if (request == null) return@observe
-
-            val hasFee = request.hasFee
-
-            when (viewModel.mode.value) {
-                StudyFormMode.EDIT -> {
-                    binding.fragmentActivityFeeStudyTv.text = "스터디 정보 수정"
-                    binding.fragmentActivityFeeStudyPreviewBt.text = "수정완료"
-
-                    setChipState(hasFee)
-
-                    if (hasFee == true) {
-                        binding.fragmentActivityFeeStudyNumFl.visibility = View.VISIBLE
-                        binding.fragmentActivityFeeStudyEt.setText(request.fee.toString())
-                    } else {
-                        binding.fragmentActivityFeeStudyNumFl.visibility = View.GONE
-                    }
-
-                    binding.fragmentActivityFeeStudyPreviewBt.isEnabled = true
-                }
-
-                StudyFormMode.CREATE -> {
-                    setChipState(hasFee)
-
-                    if (hasFee == true) {
-                        binding.fragmentActivityFeeStudyNumFl.visibility = View.VISIBLE
-                    } else {
-                        binding.fragmentActivityFeeStudyNumFl.visibility = View.GONE
-                    }
-                }
-
-                else -> Unit
-            }
-        }
-
-        viewModel.patchSuccess.observe(viewLifecycleOwner) { success ->
-            if (success) {
-                showCompletionDialog()
-            } else {
-                Toast.makeText(requireContext(), "수정에 실패했습니다. 다시 시도해주세요.", Toast.LENGTH_SHORT).show()
-            }
-        }
-
-
-
-        return binding.root
-    }
-
-
-    private fun setupChipGroupListener() {
-        binding.fragmentActivityFeeStudyChipTrue.setOnClickListener {
-            selectChip(it.id) // 선택된 Chip ID 전달
-        }
-
-        binding.fragmentActivityFeeStudyChipFalse.setOnClickListener {
-            selectChip(it.id) // 선택된 Chip ID 전달
-        }
-    }
-
-    private fun selectChip(selectedChipId: Int) {
-        // 모든 칩의 상태 초기화 (선택되지 않은 배경)
-        binding.fragmentActivityFeeStudyChipTrue.isChecked = false
-        binding.fragmentActivityFeeStudyChipFalse.isChecked = false
-
-        // 선택된 칩만 활성화
-        when (selectedChipId) {
-            R.id.fragment_activity_fee_study_chip_true -> {
-                binding.fragmentActivityFeeStudyChipTrue.isChecked = true
-                binding.fragmentActivityFeeStudyNumFl.visibility = View.VISIBLE
-                checkFeeInput() // 입력값 검사
-            }
-            R.id.fragment_activity_fee_study_chip_false -> {
-                binding.fragmentActivityFeeStudyChipFalse.isChecked = true
-                binding.fragmentActivityFeeStudyNumFl.visibility = View.GONE
-                binding.fragmentActivityFeeStudyPreviewBt.isEnabled = true
-            }
-        }
-    }
-
-    private fun setChipState(hasFee: Boolean?) {
-        binding.fragmentActivityFeeStudyChipTrue.isChecked = hasFee == true
-        binding.fragmentActivityFeeStudyChipFalse.isChecked = hasFee == false
-    }
-
-
-
-    private fun setupFeeEditTextListener() {
-        binding.fragmentActivityFeeStudyEt.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                updateFee()
-            }
-
-            override fun afterTextChanged(s: Editable?) {}
-        })
-    }
-    private fun checkFeeInput() {
-        val feeText = binding.fragmentActivityFeeStudyEt.text.toString()
-
-        binding.fragmentActivityFeeStudyPreviewBt.isEnabled = feeText.isNotEmpty() && feeText.toIntOrNull() ?: 0 > 0
-    }
-
-    private fun updateFee() {
-        val feeText = binding.fragmentActivityFeeStudyEt.text.toString()
-        val fee = feeText.toIntOrNull() ?: 0
-
-        if (fee > 100000) {
-            binding.fragmentActivityFeeStudyEt.error = "최대 100,000원까지 입력 가능합니다."
-            binding.fragmentActivityFeeStudyPreviewBt.isEnabled = false
-            return
-        }
-        if (fee < 1000) {
-            binding.fragmentActivityFeeStudyEt.error = "최소 1,000원부터 입력 가능합니다."
-            binding.fragmentActivityFeeStudyPreviewBt.isEnabled = false
-            return
-        }
-
-        binding.fragmentActivityFeeStudyEt.error = null
-        binding.fragmentActivityFeeStudyPreviewBt.isEnabled = true
-
-        val currentFee = viewModel.studyRequest.value?.fee ?: -1
-        if (fee != currentFee) {
-            saveStudyData(fee)
-        }
-    }
-
-
-    private fun setupPreviewButtonListener() {
-        binding.fragmentActivityFeeStudyPreviewBt.setOnClickListener {
-            if (viewModel.mode.value == StudyFormMode.EDIT) {
-                viewModel.patchStudyData()
-            } else {
-                goToNextFragment()
-            }
-        }
-    }
-
-
-    private fun saveStudyData(fee: Int) {
-        val hasFee = when {
-            binding.fragmentActivityFeeStudyChipTrue.isChecked -> true
-            binding.fragmentActivityFeeStudyChipFalse.isChecked -> false
-            else -> null // 사용자가 아무 칩도 선택하지 않은 경우
-        }
-
-        viewModel.setStudyData(
-            title = viewModel.studyRequest.value?.title.orEmpty(),
-            goal = viewModel.studyRequest.value?.goal.orEmpty(),
-            introduction = viewModel.studyRequest.value?.introduction.orEmpty(),
-            isOnline = viewModel.studyRequest.value?.isOnline ?: true,
-            profileImage = viewModel.studyRequest.value?.profileImage,
-            regions = viewModel.studyRequest.value?.regions ?: emptyList(),
-            maxPeople = viewModel.studyRequest.value?.maxPeople ?: 0,
-            gender = viewModel.studyRequest.value?.gender ?: Gender.UNKNOWN,
-            minAge = viewModel.studyRequest.value?.minAge ?: 0,
-            maxAge = viewModel.studyRequest.value?.maxAge ?: 0,
-            fee = fee,
-            hasFee = hasFee
-        )
-    }
-
-
-    private fun goToNextFragment() {
-        val transaction = parentFragmentManager.beginTransaction()
-        transaction.replace(R.id.main_frm, MyStudyRegisterPreviewFragment())
-        transaction.addToBackStack(null)
-        transaction.commit()
-    }
-
-
-    private fun goToPreviusFragment() {
-        parentFragmentManager.popBackStack()
-    }
-
-    private fun showCompletionDialog() {
-        val dialog = CorrectStudyCompleteDialog(requireContext())
-        dialog.start(parentFragmentManager)
-    }
-
-
-
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/ApplyStudyDialog.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/ApplyStudyDialog.kt
deleted file mode 100644
index dbe7e3ba..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/ApplyStudyDialog.kt
+++ /dev/null
@@ -1,156 +0,0 @@
-import android.app.Dialog
-import android.content.Context
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import android.media.Image
-import android.text.Editable
-import android.text.TextWatcher
-import android.util.Log
-import android.view.Window
-import android.widget.Button
-import android.widget.EditText
-import android.widget.ImageView
-import android.widget.Toast
-import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.StudyApplyResponse
-import com.example.spoteam_android.StudyDetailsResponse
-import com.example.spoteam_android.ui.study.DetailStudyFragment
-import com.example.spoteam_android.ui.study.DetailStudyHomeFragment
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class ApplyStudyDialog(private val context: Context, private val fragment: DetailStudyFragment) {
-
-    private val dlg = Dialog(context)
-
-    fun start(onMoveToHouseFragment: () -> Unit) {
-        // 타이틀바 제거 및 커스텀 다이얼로그 설정
-        dlg.requestWindowFeature(Window.FEATURE_NO_TITLE)
-
-        dlg.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-
-        dlg.setContentView(R.layout.dialog_apply_study)
-
-        val editText = dlg.findViewById<EditText>(R.id.fragment_introduce_studyname_et)
-        val btnMove = dlg.findViewById<Button>(R.id.dialog_complete_bt)
-        val closeIv: ImageView = dlg.findViewById(R.id.close_iv)
-
-        btnMove.isEnabled = false
-
-        editText.addTextChangedListener(object : TextWatcher {
-            override fun afterTextChanged(s: Editable?) {
-                btnMove.isEnabled = s?.isNotEmpty() == true
-            }
-
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-        })
-
-        btnMove.setOnClickListener {
-            val sharedPreferences = context.getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-            val email = sharedPreferences.getString("currentEmail", null)
-            val memberId = sharedPreferences.getInt("${email}_memberId", -1)
-
-            val studyId = fragment.studyViewModel.studyId.value
-            val introduction = editText.text.toString()
-
-            if (memberId != -1 && studyId != null) {
-                fetchStudyDetails(studyId) { success, memberCount, maxPeople ->
-                    if (success) {
-                        if (memberCount >= maxPeople) {
-                            Toast.makeText(context, "인원이 가득 찼습니다.", Toast.LENGTH_SHORT).show()
-                        } else {
-                            applyToStudy(studyId, memberId, introduction) { applySuccess ->
-                                if (applySuccess) {
-                                    dlg.dismiss()
-
-                                    val secondDialog = Dialog(context)
-                                    secondDialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
-                                    secondDialog.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-                                    secondDialog.setContentView(R.layout.dialog_apply_complete_study)
-
-                                    val secondDialogButton = secondDialog.findViewById<Button>(R.id.dialog_complete_bt)
-                                    val secondCloseIV : ImageView = secondDialog.findViewById(R.id.close_iv)
-                                    secondDialogButton.setOnClickListener {
-                                        secondDialog.dismiss()
-                                        onMoveToHouseFragment()
-                                    }
-                                    secondCloseIV.setOnClickListener {
-                                        dlg.dismiss()
-                                    }
-
-                                    secondDialog.show()
-                                } else {
-                                    Toast.makeText(context, "스터디 신청에 실패했습니다.", Toast.LENGTH_SHORT).show()
-                                }
-                            }
-                        }
-                    } else {
-                        Toast.makeText(context, "스터디 정보를 가져오지 못했습니다.", Toast.LENGTH_SHORT).show()
-                    }
-                }
-            } else {
-                Toast.makeText(context, "멤버 ID 또는 스터디 ID를 찾을 수 없습니다.", Toast.LENGTH_SHORT).show()
-            }
-        }
-        closeIv.setOnClickListener {
-            dlg.dismiss()
-        }
-
-        dlg.show()
-
-    }
-
-    private fun fetchStudyDetails(studyId: Int, callback: (Boolean, Int, Int) -> Unit) {
-        Log.d("DetailStudyFragment", "fetchStudyDetails() 호출")
-        val api = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-
-        api.getStudyDetails(studyId).enqueue(object : Callback<StudyDetailsResponse> {
-            override fun onResponse(call: Call<StudyDetailsResponse>, response: Response<StudyDetailsResponse>) {
-                if (response.isSuccessful) {
-                    val studyDetailsResponse = response.body()
-                    val studyDetails = studyDetailsResponse?.result
-                    if (studyDetails != null) {
-                        val memberCount = studyDetails.memberCount
-                        val maxPeople = studyDetails.maxPeople
-                        callback(true, memberCount, maxPeople)
-                    } else {
-                        callback(false, 0, 0)
-                        Toast.makeText(context, "스터디 정보를 가져오지 못했습니다.", Toast.LENGTH_SHORT).show()
-                    }
-                } else {
-                    callback(false, 0, 0)
-                    Toast.makeText(context, "스터디 정보를 가져오지 못했습니다.", Toast.LENGTH_SHORT).show()
-                }
-            }
-
-            override fun onFailure(call: Call<StudyDetailsResponse>, t: Throwable) {
-                callback(false, 0, 0)
-                Toast.makeText(context, "Error: ${t.message}", Toast.LENGTH_SHORT).show()
-            }
-        })
-    }
-
-    private fun applyToStudy(studyId: Int, memberId: Int, introduction: String, callback: (Boolean) -> Unit) {
-        val apiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-        val call = apiService.applyStudy(studyId, memberId, introduction)
-
-        call.enqueue(object : Callback<StudyApplyResponse> {
-            override fun onResponse(call: Call<StudyApplyResponse>, response: Response<StudyApplyResponse>) {
-                if (response.isSuccessful && response.body()?.isSuccess == true) {
-                    // 서버 전송 성공
-                    callback(true)
-                } else {
-                    // 서버 전송 실패
-                    callback(false)
-                }
-            }
-            override fun onFailure(call: Call<StudyApplyResponse>, t: Throwable) {
-                // 네트워크 오류 등으로 인한 실패
-                callback(false)
-            }
-        })
-    }
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyHomeFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyHomeFragment.kt
deleted file mode 100644
index d256bcbe..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyHomeFragment.kt
+++ /dev/null
@@ -1,310 +0,0 @@
-package com.example.spoteam_android.ui.study
-
-import ApplyStudyDialog
-import StudyApiService
-import StudyViewModel
-import android.content.Context
-import android.graphics.drawable.GradientDrawable
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.constraintlayout.widget.ConstraintSet
-import androidx.core.content.ContextCompat
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.DetailStudyHomeAdapter
-import com.example.spoteam_android.HouseFragment
-import com.example.spoteam_android.IsAppliedResponse
-import com.example.spoteam_android.MemberResponse
-import com.example.spoteam_android.ProfileItem
-import com.example.spoteam_android.R
-import com.example.spoteam_android.RecentAnnounceResponse
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.SceduleItem
-import com.example.spoteam_android.ScheduleListResponse
-import com.example.spoteam_android.databinding.FragmentDetailStudyHomeBinding
-import com.example.spoteam_android.ui.mypage.PurposeUploadComplteDialog
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Locale
-
-class DetailStudyHomeFragment : Fragment() {
-
-    private lateinit var binding: FragmentDetailStudyHomeBinding
-    private lateinit var profileAdapter: DetailStudyHomeProfileAdapter
-    private lateinit var scheduleAdapter: DetailStudyHomeAdapter
-    private val page = 0
-    private val size = 4
-
-
-    private var isMemberLoaded = false
-    private var isScheduleLoaded = false
-    private var isAnnounceLoaded = false
-
-    val studyViewModel: StudyViewModel by activityViewModels()
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View {
-        binding = FragmentDetailStudyHomeBinding.inflate(inflater, container, false)
-
-        return binding.root
-    }
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        setupViews() // 뷰 바인딩 초기화 및 Adapter 연결
-
-        studyViewModel.studyId.observe(viewLifecycleOwner) { studyId ->
-            if (studyId != null) {
-                fetchStudySchedules(studyId)
-                fetchStudyMembers(studyId)
-                fetchRecentAnnounce(studyId)
-            }
-        }
-    }
-    override fun onResume() {
-        super.onResume()
-
-        binding.fragmentDetailStudyHomeProfileRv.viewTreeObserver.addOnGlobalLayoutListener {
-            binding.fragmentDetailStudyHomeProfileRv.requestLayout()
-            binding.fragmentDetailStudyHomeProfileRv.invalidate()
-        }
-
-        studyViewModel.studyId.value?.let { studyId ->
-            fetchStudyMembers(studyId)
-        }
-    }
-
-
-
-    private fun setupViews() {
-        //프로필 업데이트
-        binding.fragmentDetailStudyHomeProfileRv.visibility = View.INVISIBLE
-        profileAdapter = DetailStudyHomeProfileAdapter(ArrayList(),null,false)
-        binding.fragmentDetailStudyHomeProfileRv.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
-        binding.fragmentDetailStudyHomeProfileRv.adapter = profileAdapter
-
-        //스케쥴 업데이트
-        scheduleAdapter = DetailStudyHomeAdapter(ArrayList())
-        binding.fragmentDetailStudyHomeScheduleRv.layoutManager = LinearLayoutManager(requireContext())
-        binding.fragmentDetailStudyHomeScheduleRv.adapter = scheduleAdapter
-
-        studyViewModel.studyIntroduction.observe(viewLifecycleOwner) { introduction ->
-            binding.fragmentDetailStudyHomeIntroduceTv.text = introduction
-        }
-
-    }
-
-    private fun fetchStudyMembers(studyId: Int) {
-        val api = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val currentMemberId = sharedPreferences.getInt("${sharedPreferences.getString("currentEmail", "")}_memberId", -1)
-
-        api.getStudyMembers(studyId).enqueue(object : Callback<MemberResponse> {
-            override fun onResponse(call: Call<MemberResponse>, response: Response<MemberResponse>) {
-                if (response.isSuccessful) {
-                    response.body()?.let { memberResponse ->
-                        val members = memberResponse.result?.members ?: emptyList()
-                        members.forEach { member ->
-                            Log.d("StudyMembers", "Member ID: ${member.memberId}, Nickname: ${member.nickname}, Profile Image: ${member.profileImage ?: "NULL"}")
-                        }
-
-
-                        // 프로필 어댑터 업데이트
-                        profileAdapter.updateList(members.map {
-                            ProfileItem(profileImage = it.profileImage, nickname = it.nickname)
-                        })
-                        isMemberLoaded = true
-                        checkAndShowContent()
-
-                    }
-                } else {
-                    isMemberLoaded = true
-                    checkAndShowContent()
-                }
-            }
-
-            override fun onFailure(call: Call<MemberResponse>, t: Throwable) {
-                isMemberLoaded = true
-                checkAndShowContent()
-
-            }
-        })
-    }
-
-
-
-
-
-
-    private fun fetchStudySchedules(studyId: Int) {
-        val api = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-
-        api.getStudySchedules(studyId, page, size).enqueue(object : Callback<ScheduleListResponse> {
-            override fun onResponse(call: Call<ScheduleListResponse>, response: Response<ScheduleListResponse>) {
-                if (response.isSuccessful) {
-                    val scheduleListResponse = response.body()
-                    val schedules = scheduleListResponse?.result?.schedules ?: emptyList()
-
-                    if (schedules.isEmpty()) {
-                        binding.fragmentDetailStudyHomeScheduleRv.visibility = View.GONE
-                    } else {
-                        // 현재 시간
-                        val now = Calendar.getInstance().time
-
-                        // 현재 시간 이후이거나, 일정이 진행 중인 것만 필터링
-                        val validSchedules = schedules.filter { schedule ->
-                            val startDate = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.getDefault()).parse(schedule.startedAt)
-                            val endDate = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.getDefault()).parse(schedule.finishedAt)
-
-                            // 시작 시간이 현재보다 미래이거나, 종료 시간이 현재보다 미래이면 표시
-                            (startDate != null && startDate.after(now)) || (endDate != null && endDate.after(now))
-                        }
-
-                        // 가장 가까운 일정 2개만 가져오기 (시작일 기준 정렬)
-                        val nearestSchedules = validSchedules.sortedBy { it.startedAt }.take(2)
-
-                        if (nearestSchedules.isEmpty()) {
-                            binding.fragmentDetailStudyHomeScheduleRv.visibility = View.GONE
-                        } else {
-                            binding.fragmentDetailStudyHomeScheduleRv.visibility = View.VISIBLE
-
-                            val scheduleItems = nearestSchedules.map { schedule ->
-                                SceduleItem(
-                                    dday = calculateDday(schedule.startedAt, schedule.finishedAt),
-                                    day = formatDate(schedule.startedAt),
-                                    scheduleContent = schedule.title,
-                                    concreteTime = formatTime(schedule.startedAt),
-                                    place = schedule.location
-                                )
-                            }
-                            scheduleAdapter.updateList(ArrayList(scheduleItems))
-                        }
-                    }
-                    isScheduleLoaded = true
-                    checkAndShowContent()
-                } else {
-                    isScheduleLoaded = true
-                    checkAndShowContent()
-                }
-            }
-
-            override fun onFailure(call: Call<ScheduleListResponse>, t: Throwable) {
-                isScheduleLoaded = true
-                checkAndShowContent()
-            }
-        })
-    }
-
-
-    private fun fetchRecentAnnounce(studyId: Int) {
-        val api = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-
-        api.getRecentAnnounce(studyId).enqueue(object : Callback<RecentAnnounceResponse> {
-            override fun onResponse(call: Call<RecentAnnounceResponse>, response: Response<RecentAnnounceResponse>) {
-                if (response.isSuccessful) {
-                    val announceResponse = response.body()
-                    val recentAnnounce = announceResponse?.result
-
-                    if (recentAnnounce?.title.isNullOrEmpty()) {
-                        binding.fragmentDetailStudyHomeTitleTv.text = "최근 공지가 없습니다"
-                    } else {
-                        binding.fragmentDetailStudyHomeTitleTv.text = recentAnnounce?.title ?: "최근 공지가 없습니다"
-                    }
-                    isAnnounceLoaded = true
-                    checkAndShowContent()
-                } else {
-                    isAnnounceLoaded = true
-                    checkAndShowContent()
-                }
-            }
-            override fun onFailure(call: Call<RecentAnnounceResponse>, t: Throwable) {
-                isAnnounceLoaded = true
-                checkAndShowContent()
-            }
-        })
-    }
-
-    private fun calculateDday(startedAt: String?, finishedAt: String?): String {
-        if (startedAt.isNullOrEmpty() || finishedAt.isNullOrEmpty()) {
-            return "N/A"
-        }
-
-        val formatter = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.getDefault())
-        val startDate = formatter.parse(startedAt)
-        val endDate = formatter.parse(finishedAt)
-
-        if (startDate == null || endDate == null) {
-            return "N/A"
-        }
-
-        val today = Calendar.getInstance()
-        today.set(Calendar.HOUR_OF_DAY, 0)
-        today.set(Calendar.MINUTE, 0)
-        today.set(Calendar.SECOND, 0)
-        today.set(Calendar.MILLISECOND, 0)
-
-        val todayDate = today.time
-
-        return when {
-            todayDate.before(startDate) -> { // 일정 시작 전
-                val daysLeft = ((startDate.time - todayDate.time) / (1000 * 60 * 60 * 24)).toInt()
-                "D-${daysLeft}"
-            }
-            todayDate in startDate..endDate -> { // 일정 진행 중
-                "D-day"
-            }
-            else -> { // 일정 종료 후
-                val daysPassed = ((todayDate.time - endDate.time) / (1000 * 60 * 60 * 24)).toInt()
-                "D+${daysPassed}"
-            }
-        }
-    }
-
-
-    // Null 체크를 추가한 날짜 변경 로직
-    private fun formatDate(startedAt: String?): String {
-        if (startedAt.isNullOrEmpty()) {
-            return "N/A"
-        }
-
-        val inputFormatter = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.getDefault())
-        val outputFormatter = SimpleDateFormat("M/d (EEE)", Locale.getDefault())
-
-        val date = inputFormatter.parse(startedAt)
-        return outputFormatter.format(date)
-    }
-
-    // Null 체크를 추가한 시간 변경 로직
-    private fun formatTime(staredAt: String?): String {
-        if (staredAt.isNullOrEmpty()) {
-            return "N/A"
-        }
-
-        val inputFormatter = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.getDefault())
-        val outputFormatter = SimpleDateFormat("M/d h:mma", Locale.US) // Locale.US를 사용하여 AM/PM을 영어로 유지
-
-        val date = inputFormatter.parse(staredAt)
-        return outputFormatter.format(date)
-    }
-
-    private fun checkAndShowContent() {
-        if (isMemberLoaded && isScheduleLoaded && isAnnounceLoaded) {
-            binding.root.visibility = View.VISIBLE
-            binding.fragmentDetailStudyHomeProfileRv.visibility = View.VISIBLE
-            binding.fragmentDetailStudyHomeScheduleRv.visibility = View.VISIBLE
-        }
-    }
-
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/IntroduceStudyShortFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/IntroduceStudyShortFragment.kt
deleted file mode 100644
index 0dd6f1b3..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/IntroduceStudyShortFragment.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.example.spoteam_android.ui.study
-
-import StudyViewModel
-import android.content.Context
-import android.graphics.Color
-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.activityViewModels
-import com.bumptech.glide.Glide
-import com.example.spoteam_android.R
-import com.example.spoteam_android.databinding.FragmentIntroduceStudyShortBinding
-
-class IntroduceStudyShortFragment : Fragment() {
-
-    private lateinit var binding: FragmentIntroduceStudyShortBinding
-    private val viewModel: StudyViewModel by activityViewModels()
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = FragmentIntroduceStudyShortBinding.inflate(inflater, container, false)
-
-        updateUIWithData()
-
-        return binding.root
-    }
-
-
-    private fun updateUIWithData() {
-        val sharedPreferences = requireContext().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val email = sharedPreferences.getString("currentEmail", null)
-        val loginPlatform = sharedPreferences.getString("loginPlatform", null)
-
-        val profileImageUrl = when (loginPlatform) {
-            "kakao" -> sharedPreferences.getString("${email}_kakaoProfileImageUrl", null)
-            "naver" -> sharedPreferences.getString("${email}_naverProfileImageUrl", null)
-            else -> null
-        }
-        val kakaoNickname = sharedPreferences.getString("${email}_nickname", "Unknown")
-        binding.profileNickname.text = "${kakaoNickname}"
-
-        viewModel.studyRequest.value?.let { studyData ->
-            binding.fragmentIntroduceStudyShortTv.text = studyData.introduction
-            binding.fragmentIntroduceStudyShortTv.setTextColor(Color.parseColor("#2D2D2D"))
-        }
-
-        Glide.with(this)
-            .load(profileImageUrl)
-            .error(R.drawable.ic_preview_profile)
-            .fallback(R.drawable.ic_preview_profile)
-            .into(binding.fragmentDetailStudyHomeHostuserIv)
-    }
-
-
-
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyRegisterPreviewFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyRegisterPreviewFragment.kt
deleted file mode 100644
index c9dbda5f..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyRegisterPreviewFragment.kt
+++ /dev/null
@@ -1,240 +0,0 @@
-package com.example.spoteam_android.ui.study
-
-import ActivityFeeStudyFragment
-import StudyApiService
-import StudyViewModel
-import UploadResponse
-import android.content.Context
-import android.content.Context.MODE_PRIVATE
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.graphics.Color
-import android.net.Uri
-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 android.widget.Toast
-import androidx.fragment.app.activityViewModels
-import com.bumptech.glide.Glide
-import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.databinding.FragmentMyStudyRegisterPreviewBinding
-import com.google.android.material.tabs.TabLayout
-import com.google.android.material.tabs.TabLayoutMediator
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.MultipartBody
-import okhttp3.OkHttpClient
-import okhttp3.RequestBody.Companion.asRequestBody
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-import java.io.File
-import java.io.FileOutputStream
-
-class MyStudyRegisterPreviewFragment : Fragment() {
-
-    private lateinit var binding: FragmentMyStudyRegisterPreviewBinding
-    private val tabList = arrayListOf("홈", "일정", "커뮤니티", "갤러리", "투두쉐어링")
-    private val viewModel: StudyViewModel by activityViewModels()
-    private var imageUri: Uri? = null
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        binding = FragmentMyStudyRegisterPreviewBinding.inflate(inflater, container, false)
-
-        val profileImageUriString = viewModel.profileImageUri.value
-        imageUri = profileImageUriString?.let { Uri.parse(it) }
-
-        setupViewPagerAndTabs()
-        updateUIWithData()
-
-        // 버튼 클릭 이벤트 설정
-        binding.fragmentMyStudyRegisterPreviewRegisterBt.setOnClickListener {
-            if (imageUri != null) {
-                val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", MODE_PRIVATE)
-                val email = sharedPreferences.getString("currentEmail", null)
-
-                if (email != null) {
-                    val memberId = sharedPreferences.getInt("${email}_memberId", -1)
-
-                    if (memberId != -1) {
-                        uploadImage(imageUri!!, memberId)  // memberId를 인자로 전달
-                    } else {
-                        Toast.makeText(requireContext(), "Member ID not found", Toast.LENGTH_SHORT).show()
-                    }
-                } else {
-                    Toast.makeText(requireContext(), "Email not provided", Toast.LENGTH_SHORT).show()
-                }
-            } else {
-                Toast.makeText(context, "이미지가 선택되지 않았습니다.", Toast.LENGTH_SHORT).show()
-            }
-        }
-
-        binding.fragmentMyStudyRegisterPreviewBt.setOnClickListener {
-            goToPreviusFragment()
-        }
-
-        return binding.root
-    }
-
-    private fun setupViewPagerAndTabs() {
-        val pagerAdapter = MyStudyRegisterPreviewVPAdapter(this)
-        binding.fragmentMyStudyRegisterPreviewVp.adapter = pagerAdapter
-
-        TabLayoutMediator(binding.fragmentMyStudyRegisterPreviewTl, binding.fragmentMyStudyRegisterPreviewVp) { tab, position ->
-            tab.text = tabList[position]
-        }.attach()
-
-        binding.fragmentMyStudyRegisterPreviewTl.getTabAt(0)?.select()
-
-        binding.fragmentMyStudyRegisterPreviewTl.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
-            override fun onTabSelected(tab: TabLayout.Tab?) {
-                if (tab != null && tab.position != 0) {
-                    binding.fragmentMyStudyRegisterPreviewTl.selectTab(binding.fragmentMyStudyRegisterPreviewTl.getTabAt(0))
-                }
-            }
-
-            override fun onTabUnselected(tab: TabLayout.Tab?) {}
-            override fun onTabReselected(tab: TabLayout.Tab?) {}
-        })
-
-        for (i in 1 until binding.fragmentMyStudyRegisterPreviewTl.tabCount) {
-            binding.fragmentMyStudyRegisterPreviewTl.getTabAt(i)?.view?.isEnabled = false
-        }
-    }
-
-    private fun updateUIWithData() {
-        val sharedPreferences = requireContext().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val email = sharedPreferences.getString("currentEmail", null)
-        val kakaoNickname = sharedPreferences.getString("${email}_nickname", "Unknown")
-
-        binding.fragmentDetailStudyUsernameTv.text = "${kakaoNickname}님"
-        // 스터디 제목 설정
-        binding.fragmentDetailStudyPreviewTitleTv.text = viewModel.studyRequest.value?.title
-
-        // 스터디 목표 설정
-        binding.fragmentDetailStudyGoalTv.text = viewModel.studyRequest.value?.goal
-
-        val loginPlatform = sharedPreferences.getString("loginPlatform", null)
-
-        val profileImageUrl = when (loginPlatform) {
-            "kakao" -> sharedPreferences.getString("${email}_kakaoProfileImageUrl", null)
-            "naver" -> sharedPreferences.getString("${email}_naverProfileImageUrl", null)
-            else -> viewModel.profileImageUri.value
-        }
-
-        Glide.with(this)
-            .load(profileImageUrl)
-            .error(R.drawable.fragment_calendar_spot_logo)
-            .fallback(R.drawable.fragment_calendar_spot_logo)
-            .into(binding.fragmentMyStudyRegisterPreviewUserIv)
-
-
-        // 온라인/오프라인 설정
-        binding.fragmentDetailStudyOnlineTv.text = if (viewModel.studyRequest.value?.isOnline == true) "온라인" else "오프라인"
-
-        // 유료/무료 설정
-        binding.fragmentDetailStudyFeeTv.text = if (viewModel.studyRequest.value?.hasFee == true) "유료" else "무료"
-
-        // 나이대 설정
-        binding.fragmentDetailStudyAgeTv.text = "${viewModel.studyRequest.value?.minAge}-${viewModel.studyRequest.value?.maxAge}세"
-
-        // 스터디 멤버 수 설정
-        binding.fragmentDetailStudyMemberMaxTv.text = "${viewModel.studyRequest.value?.maxPeople}"
-
-        binding.fragmentDetailStudyBookmarkTv.text = "0"
-
-
-        // 스터디 테마 설정 (chip으로 나열)
-        val themes = viewModel.studyRequest.value?.themes?.take(3)?.joinToString("/") ?:"테마 없음" // 예: "취업/프로젝트"
-        binding.fragmentDetailStudyChipTv.text = themes
-
-    }
-
-
-    private fun uploadImage(imageUri: Uri, memberId: Int) {
-        val apiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-
-        val imagePart = prepareImagePart(imageUri)
-
-        if (imagePart != null) {
-            apiService.uploadImages(listOf(imagePart)).enqueue(object : Callback<UploadResponse> {
-                override fun onResponse(call: Call<UploadResponse>, response: Response<UploadResponse>) {
-                    if (response.isSuccessful) {
-                        val uploadResponse = response.body()
-                        if (uploadResponse != null && uploadResponse.isSuccess) {
-                            val imageUrls = uploadResponse.result.imageUrls
-                            val imageUrl = imageUrls.firstOrNull()?.imageUrl
-
-                            // 이미지 URL을 ViewModel의 profileImageUri에 저장
-                            if (imageUrl != null) {
-                                viewModel.setProfileImageUri(imageUrl)
-                                Log.d("MyStudy", "imageUrl: $imageUrl")
-                            }
-                            viewModel.submitStudyData(memberId)
-
-                            showCompletionDialog()
-                        } else {
-                            println("Upload failed: ${uploadResponse?.message}")
-                        }
-                    } else {
-                        println("Upload failed with response code: ${response.code()}")
-                    }
-                }
-
-                override fun onFailure(call: Call<UploadResponse>, t: Throwable) {
-                    println("Upload error: ${t.message}")
-                }
-            })
-        } else {
-            Toast.makeText(context, "이미지 파일을 준비할 수 없습니다.", Toast.LENGTH_SHORT).show()
-        }
-    }
-
-    private fun saveUriAsFile(uri: Uri): File? {
-        return try {
-            val inputStream = requireContext().contentResolver.openInputStream(uri) ?: return null
-            val bitmap = BitmapFactory.decodeStream(inputStream)
-            inputStream.close()
-
-            // 강제로 JPEG으로 저장
-            val tempFile = File.createTempFile("temp_image", ".jpg", requireContext().cacheDir)
-            val outputStream = FileOutputStream(tempFile)
-            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, outputStream)
-            outputStream.flush()
-            outputStream.close()
-
-            Log.d("Upload", "Saved file at: ${tempFile.absolutePath}")
-            tempFile
-        } catch (e: Exception) {
-            e.printStackTrace()
-            null
-        }
-    }
-
-    private fun prepareImagePart(uri: Uri): MultipartBody.Part? {
-        val file = saveUriAsFile(uri) ?: return null
-        val requestFile = file.asRequestBody("image/jpeg".toMediaTypeOrNull())
-        return MultipartBody.Part.createFormData("images", file.name, requestFile)
-    }
-
-
-
-
-
-    private fun showCompletionDialog() {
-        val dialog = StudyRegisterCompleteDialog(requireContext())
-        dialog.start(parentFragmentManager)
-    }
-
-    private fun goToPreviusFragment() {
-        parentFragmentManager.popBackStack()
-    }
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/OnlineStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/OnlineStudyFragment.kt
deleted file mode 100644
index c6fcaa7a..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/OnlineStudyFragment.kt
+++ /dev/null
@@ -1,371 +0,0 @@
-    package com.example.spoteam_android.ui.study
-
-    import LocationStudyFragment
-    import MemberStudyFragment
-    import StudyRequest
-    import StudyViewModel
-    import android.content.res.Resources
-    import android.os.Bundle
-    import android.util.Log
-    import android.view.LayoutInflater
-    import android.view.View
-    import android.view.ViewGroup
-    import androidx.constraintlayout.widget.ConstraintSet
-    import androidx.fragment.app.Fragment
-    import androidx.fragment.app.activityViewModels
-    import com.bumptech.glide.Glide
-    import com.example.spoteam_android.R
-    import com.example.spoteam_android.databinding.FragmentOnlineStudyBinding
-    import com.example.spoteam_android.util.parseLocationTsv
-    import com.google.android.material.chip.Chip
-
-    class OnlineStudyFragment : Fragment() {
-        private lateinit var binding: FragmentOnlineStudyBinding
-        private val viewModel: StudyViewModel by activityViewModels()
-
-        private var isLocationPlusVisible: Boolean = false
-        private var selectedLocationCode: String? = null
-
-        override fun onCreateView(
-            inflater: LayoutInflater, container: ViewGroup?,
-            savedInstanceState: Bundle?
-        ): View {
-            binding = FragmentOnlineStudyBinding.inflate(inflater, container, false)
-
-            selectedLocationCode = null
-            val locationList = parseLocationTsv(requireContext())
-            viewModel.setLocationList(locationList)
-
-            if (viewModel.mode.value == StudyFormMode.CREATE) {
-                viewModel.clearRegions()
-                arguments?.let {
-                    val address = it.getString("ADDRESS")
-                    val isOffline = it.getBoolean("IS_OFFLINE", false)
-                    selectedLocationCode = it.getString("CODE")
-
-                    if (isOffline) {
-                        address?.let { addr -> updateChip(addr) }
-                        setChipState(false)
-                        isLocationPlusVisible = true
-                        updateLocationPlusLayoutVisibility(true)
-                    } else {
-                        clearChipSelection()
-                        updateLocationPlusLayoutVisibility(false)
-                        binding.fragmentOnlineStudyBt.isEnabled = false
-                    }
-                } ?: run {
-                    clearChipSelection()
-                    updateLocationPlusLayoutVisibility(false)
-                    binding.fragmentOnlineStudyBt.isEnabled = false
-                }
-            }
-
-            viewModel.studyRequest.observe(viewLifecycleOwner) { request ->
-                if (viewModel.mode.value == StudyFormMode.EDIT && request != null) {
-                    binding.fragmentOnlineStudyTv.text = "스터디 정보 수정"
-                    setChipState(request.isOnline)
-                    isLocationPlusVisible = !request.isOnline
-                    updateLocationPlusLayoutVisibility(isLocationPlusVisible)
-
-                    val newCode = request.regions?.firstOrNull()
-
-                    if (!request.isOnline && newCode != null && newCode != selectedLocationCode) {
-                        val address = viewModel.findAddressFromCode(newCode)
-                        address?.let {
-                            updateChip(it)
-                            selectedLocationCode = newCode
-                        }
-                    } else if (!request.isOnline && newCode == null) {
-                        binding.locationChip.visibility = View.GONE
-                    }
-                }
-            }
-
-            setupChipGroupListener()
-            setupChipCloseListener()
-
-            binding.fragmentOnlineStudyBt.setOnClickListener {
-                saveData()
-                goToNextFragment()
-            }
-
-            binding.fragmentOnlineStudyLocationPlusBt.setOnClickListener {
-                goToLocationFragment()
-            }
-
-            binding.fragmentOnlineStudyBackBt.setOnClickListener {
-                goToPreviusFragment()
-            }
-            observeViewModel()
-
-            return binding.root
-        }
-
-        override fun onResume() {
-            super.onResume()
-            arguments?.let {
-                val address = it.getString("ADDRESS")
-                val code = it.getString("CODE")
-                Log.d("OnlineStudyFragment", "onResume profileImage = ${viewModel.studyRequest.value?.profileImage}")
-
-                if (!address.isNullOrBlank() && !code.isNullOrBlank()) {
-                    updateChip(address)
-                    selectedLocationCode = code
-
-                    val current = viewModel.studyRequest.value
-                    val isOnlineSelected = binding.fragmentOnlineStudyChipOnline.isChecked.not() // 오프라인 칩이 선택되어야 true
-                    val hasFee = viewModel.studyRequest.value?.hasFee
-
-                    if (viewModel.mode.value == StudyFormMode.EDIT && current != null) {
-                        val updated = current.copy(
-                            isOnline = isOnlineSelected.not(), // 온라인이면 true, 오프라인이면 false
-                            regions = listOf(code)
-                        )
-
-                        viewModel.setStudyData(
-                            title = updated.title,
-                            goal = updated.goal,
-                            introduction = updated.introduction,
-                            isOnline = updated.isOnline,
-                            profileImage = updated.profileImage,
-                            regions = updated.regions,
-                            maxPeople = updated.maxPeople,
-                            gender = updated.gender,
-                            minAge = updated.minAge,
-                            maxAge = updated.maxAge,
-                            fee = updated.fee,
-                            hasFee = hasFee
-                        )
-                    }
-                }
-
-                it.clear()
-            }
-        }
-
-        private fun observeViewModel() {
-            viewModel.studyRequest.observe(viewLifecycleOwner) { request ->
-                if (viewModel.mode.value == StudyFormMode.EDIT && request != null) {
-                    binding.fragmentOnlineStudyTv.text = "스터디 정보 수정"
-                    setChipState(request.isOnline)
-                    isLocationPlusVisible = !request.isOnline
-                    updateLocationPlusLayoutVisibility(isLocationPlusVisible)
-
-                    val newCode = request.regions?.firstOrNull()
-                    if (!request.isOnline && newCode != null && newCode != selectedLocationCode) {
-                        viewModel.findAddressFromCode(newCode)?.let {
-                            updateChip(it)
-                            selectedLocationCode = newCode
-                        }
-                    } else if (!request.isOnline && newCode == null) {
-                        binding.locationChip.visibility = View.GONE
-                    }
-                }
-            }
-        }
-
-
-
-        private fun updateChip(address: String) {
-            binding.fragmentOnlineStudyLocationPlusCl.visibility = View.VISIBLE
-
-            binding.locationChip.apply {
-                visibility = View.VISIBLE
-                text = address
-            }
-
-            binding.locationChip.post {
-                updateNextButtonState()
-            }
-        }
-
-
-        private fun setupChipGroupListener() {
-            binding.fragmentOnlineStudyChipOnline.setOnClickListener {
-                selectChip(binding.fragmentOnlineStudyChipOnline)
-            }
-            binding.fragmentOnlineStudyChipOffline.setOnClickListener {
-                selectChip(binding.fragmentOnlineStudyChipOffline)
-            }
-        }
-
-        private fun selectChip(selectedChip: Chip) {
-            binding.fragmentOnlineStudyChipOnline.isChecked = false
-            binding.fragmentOnlineStudyChipOffline.isChecked = false
-            selectedChip.isChecked = true
-
-            val isOnline = selectedChip.id == R.id.fragment_online_study_chip_online
-            isLocationPlusVisible = !isOnline
-
-            val current = viewModel.studyRequest.value ?: StudyRequest(
-                themes = listOf("어학"),
-                title = "",
-                goal = "",
-                introduction = "",
-                isOnline = true,
-                profileImage = null,
-                regions = null,
-                maxPeople = 0,
-                gender = Gender.UNKNOWN,
-                minAge = 0,
-                maxAge = 0,
-                fee = 0,
-                hasFee = false
-            )
-
-            viewModel.setStudyData(
-                title = current.title,
-                goal = current.goal,
-                introduction = current.introduction,
-                isOnline = isOnline,
-                profileImage = current.profileImage,
-                regions = if (isOnline) null else current.regions ?: mutableListOf(),
-                maxPeople = current.maxPeople,
-                gender = current.gender,
-                minAge = current.minAge,
-                maxAge = current.maxAge,
-                fee = current.fee,
-                hasFee = current.hasFee
-            )
-
-            updateLocationPlusLayoutVisibility(isLocationPlusVisible)
-            updateNextButtonState()
-        }
-
-
-        private fun setupChipCloseListener() {
-            binding.locationChip.setOnCloseIconClickListener {
-                binding.locationChip.visibility = View.GONE
-                selectedLocationCode = null
-
-                if (viewModel.mode.value == StudyFormMode.EDIT) {
-                    val current = viewModel.studyRequest.value
-                    val cleared = current?.copy(regions = null)
-                    cleared?.let {
-                        viewModel.setStudyData(
-                            title = it.title,
-                            goal = it.goal,
-                            introduction = it.introduction,
-                            isOnline = it.isOnline,
-                            profileImage = it.profileImage,
-                            regions = it.regions,
-                            maxPeople = it.maxPeople,
-                            gender = it.gender,
-                            minAge = it.minAge,
-                            maxAge = it.maxAge,
-                            fee = it.fee,
-                            hasFee = it.hasFee
-                        )
-                    }
-                }
-
-                updateNextButtonState()
-            }
-        }
-
-        private fun setChipState(isOnline: Boolean) {
-            binding.fragmentOnlineStudyChipOnline.isChecked = isOnline
-            binding.fragmentOnlineStudyBt.isEnabled = isOnline
-            binding.fragmentOnlineStudyChipOffline.isChecked = !isOnline
-        }
-
-        private fun updateLocationPlusLayoutVisibility(visible: Boolean) {
-            val locationBtn = binding.fragmentOnlineStudyLocationPlusBt
-            val nextBtn = binding.fragmentOnlineStudyBt
-            val params = nextBtn.layoutParams as ViewGroup.MarginLayoutParams
-
-            if (visible) {
-                locationBtn.visibility = View.VISIBLE
-                params.marginStart = 6.dpToPx()
-                nextBtn.layoutParams = params
-
-
-                val constraintSet = ConstraintSet()
-                constraintSet.clone(binding.fragmentOnlineStudyButtonContainer)
-
-                constraintSet.connect(locationBtn.id, ConstraintSet.START, ConstraintSet.PARENT_ID, ConstraintSet.START)
-                constraintSet.connect(locationBtn.id, ConstraintSet.END, nextBtn.id, ConstraintSet.START)
-
-                constraintSet.connect(nextBtn.id, ConstraintSet.START, locationBtn.id, ConstraintSet.END)
-                constraintSet.connect(nextBtn.id, ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END)
-
-                constraintSet.applyTo(binding.fragmentOnlineStudyButtonContainer)
-            } else {
-                locationBtn.visibility = View.GONE
-                params.marginStart = 0
-                nextBtn.layoutParams = params
-
-                val constraintSet = ConstraintSet()
-                constraintSet.clone(binding.fragmentOnlineStudyButtonContainer)
-
-                constraintSet.connect(nextBtn.id, ConstraintSet.START, ConstraintSet.PARENT_ID, ConstraintSet.START)
-                constraintSet.connect(nextBtn.id, ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END)
-
-                constraintSet.clear(locationBtn.id)
-
-                constraintSet.applyTo(binding.fragmentOnlineStudyButtonContainer)
-            }
-        }
-
-
-        private fun updateNextButtonState() {
-            val isOnline = binding.fragmentOnlineStudyChipOnline.isChecked
-            val hasChip = binding.locationChip.visibility == View.VISIBLE
-
-            binding.fragmentOnlineStudyBt.visibility = View.VISIBLE
-            binding.fragmentOnlineStudyBt.isEnabled = isOnline || hasChip
-            binding.fragmentOnlineStudyLocationPlusBt.visibility = if (isOnline) View.GONE else View.VISIBLE
-        }
-
-
-        private fun saveData() {
-            val current = viewModel.studyRequest.value ?: return
-            val regions = selectedLocationCode?.let { listOf(it) } ?: listOf()
-            val preservedProfileImage = current.profileImage ?: viewModel.profileImageUri.value
-
-            viewModel.setStudyData(
-                title = current.title,
-                goal = current.goal,
-                introduction = current.introduction,
-                isOnline = current.isOnline,
-                profileImage = preservedProfileImage,
-                regions = if (current.isOnline) null else regions,
-                maxPeople = current.maxPeople,
-                gender = current.gender,
-                minAge = current.minAge,
-                maxAge = current.maxAge,
-                fee = current.fee,
-                hasFee = current.hasFee
-            )
-        }
-        private fun clearChipSelection() {
-            binding.fragmentOnlineStudyChipOnline.isChecked = false
-            binding.fragmentOnlineStudyChipOffline.isChecked = false
-        }
-
-        private fun goToNextFragment() {
-            val nextFragment = MemberStudyFragment().apply {
-                arguments = Bundle().apply {
-                    putSerializable("mode", viewModel.mode.value)
-                    viewModel.studyId.value?.let { putInt("studyId", it) }
-                }
-            }
-
-            parentFragmentManager.beginTransaction()
-                .replace(R.id.main_frm, nextFragment)
-                .addToBackStack(null)
-                .commit()
-        }
-
-        private fun goToPreviusFragment() {
-            parentFragmentManager.popBackStack()
-        }
-
-        private fun goToLocationFragment() {
-            parentFragmentManager.beginTransaction()
-                .replace(R.id.main_frm, LocationStudyFragment())
-                .commit()
-        }
-        fun Int.dpToPx(): Int =
-            (this * Resources.getSystem().displayMetrics.density).toInt()
-    }
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyAdapter.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyAdapter.kt
deleted file mode 100644
index 2bf1be63..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyAdapter.kt
+++ /dev/null
@@ -1,164 +0,0 @@
-package com.example.spoteam_android.ui.study
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import com.example.spoteam_android.R
-import com.example.spoteam_android.StudyItem
-import com.example.spoteam_android.databinding.ItemRecyclerViewBinding
-
-class StudyAdapter(
-    initialItems: List<StudyItem>,
-    private val onItemClick: (StudyItem) -> Unit,
-    private val onLikeClick: (StudyItem, ImageView) -> Unit,
-    private val onPageSelected: (Int) -> Unit,
-    private val onNextPrevClicked: (Boolean) -> Unit,
-    private val getCurrentPage: () -> Int,
-    private val getTotalPages: () -> Int
-) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    companion object {
-        private const val TYPE_ITEM = 0
-        private const val TYPE_FOOTER = 1
-    }
-
-    // 내부 리스트
-    private var itemList = ArrayList<StudyItem>().apply {
-        addAll(initialItems)
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        return if (position < itemList.size) TYPE_ITEM else TYPE_FOOTER
-    }
-
-    override fun getItemCount(): Int = if (itemList.isEmpty()) 0 else itemList.size + 1
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return if (viewType == TYPE_ITEM) {
-            val binding = ItemRecyclerViewBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-            StudyViewHolder(binding)
-        } else {
-            val view = LayoutInflater.from(parent.context).inflate(R.layout.item_footer_paging, parent, false)
-            FooterViewHolder(view)
-        }
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        if (holder is StudyViewHolder) {
-            val item = itemList[position]
-            holder.bind(item)
-            holder.itemView.setOnClickListener { onItemClick(item) }
-            holder.likeButton.setOnClickListener { onLikeClick(item, holder.likeButton) }
-        } else if (holder is FooterViewHolder) {
-            holder.bind()
-        }
-    }
-
-    inner class StudyViewHolder(val binding: ItemRecyclerViewBinding) : RecyclerView.ViewHolder(binding.root) {
-        val likeButton: ImageView = binding.heartCountIv
-
-        fun bind(item: StudyItem) {
-            binding.tvTime.text = item.title
-            binding.tvTitle.text = item.goal
-            binding.tvName.text = item.maxPeople.toString()
-            binding.tvName2.text = item.memberCount.toString()
-            binding.tvName3.text = item.heartCount.toString()
-            binding.tvName4.text = item.hitNum.toString()
-
-            Glide.with(binding.root.context)
-                .load(item.imageUrl)
-                .error(R.drawable.fragment_calendar_spot_logo)
-                .fallback(R.drawable.fragment_calendar_spot_logo)
-                .into(binding.ImageView4)
-
-            val heartIcon = if (item.liked) R.drawable.ic_heart_filled else R.drawable.study_like
-            binding.heartCountIv.setImageResource(heartIcon)
-        }
-    }
-
-    inner class FooterViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        fun bind() {
-            val context = itemView.context
-            val pageButtons = listOf(
-                itemView.findViewById<TextView>(R.id.page_1),
-                itemView.findViewById<TextView>(R.id.page_2),
-                itemView.findViewById<TextView>(R.id.page_3),
-                itemView.findViewById<TextView>(R.id.page_4),
-                itemView.findViewById<TextView>(R.id.page_5)
-            )
-            val prev = itemView.findViewById<ImageView>(R.id.previous_page)
-            val next = itemView.findViewById<ImageView>(R.id.next_page)
-
-            val currentPage = getCurrentPage()
-            val totalPages = getTotalPages()
-
-            val startPage = when {
-                totalPages <= 5 -> 0
-                currentPage >= totalPages - 3 -> totalPages - 5
-                currentPage >= 2 -> currentPage - 2
-                else -> 0
-            }
-
-            pageButtons.forEachIndexed { index, button ->
-                val pageNum = startPage + index
-                if (pageNum < totalPages) {
-                    button.visibility = View.VISIBLE
-                    button.text = (pageNum + 1).toString()
-                    button.setTextColor(
-                        if (pageNum == currentPage)
-                            context.getColor(R.color.b500)
-                        else
-                            context.getColor(R.color.g400)
-                    )
-                    button.setOnClickListener {
-                        if (pageNum != currentPage) onPageSelected(pageNum)
-                    }
-                } else {
-                    button.visibility = View.GONE
-                }
-            }
-
-            val gray = ContextCompat.getColor(context, R.color.g300)
-            val blue = ContextCompat.getColor(context, R.color.b500)
-
-            if (totalPages <= 1) {
-                prev.isEnabled = false
-                next.isEnabled = false
-                prev.setColorFilter(gray, android.graphics.PorterDuff.Mode.SRC_IN)
-                next.setColorFilter(gray, android.graphics.PorterDuff.Mode.SRC_IN)
-            } else {
-                prev.isEnabled = true
-                next.isEnabled = true
-                prev.setColorFilter(blue, android.graphics.PorterDuff.Mode.SRC_IN)
-                next.setColorFilter(blue, android.graphics.PorterDuff.Mode.SRC_IN)
-
-                prev.setOnClickListener {
-                    if (currentPage == 0) {
-                        onPageSelected(totalPages - 1)
-                    } else {
-                        onPageSelected(currentPage - 1)
-                    }
-                }
-
-                next.setOnClickListener {
-                    if (currentPage == totalPages - 1) {
-                        onPageSelected(0)
-                    } else {
-                        onPageSelected(currentPage + 1)
-                    }
-                }
-            }
-        }
-    }
-
-    fun updateList(newList: List<StudyItem>) {
-        itemList.clear()
-        itemList.addAll(newList)
-        notifyDataSetChanged()
-    }
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyFragment.kt
deleted file mode 100644
index f89fbff9..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyFragment.kt
+++ /dev/null
@@ -1,201 +0,0 @@
-package com.example.spoteam_android.ui.study
-
-import StudyApiService
-import StudyViewModel
-import android.content.Context.MODE_PRIVATE
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.spoteam_android.LikeResponse
-import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.StudyItem
-import com.example.spoteam_android.StudyResponse
-import com.example.spoteam_android.databinding.FragmentStudyBinding
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class StudyFragment : Fragment() {
-
-    private var _binding: FragmentStudyBinding? = null
-    private val binding get() = _binding!!
-    private lateinit var studyAdapter: StudyAdapter
-    private var itemList = ArrayList<StudyItem>()
-    private var currentPage = 0
-    private val size = 5 // 페이지당 항목 수
-    private var totalPages = 0
-
-    private val studyViewModel: StudyViewModel by activityViewModels()
-    private lateinit var studyApiService: StudyApiService
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = FragmentStudyBinding.inflate(inflater, container, false)
-
-        binding.prevIv.setOnClickListener {
-            parentFragmentManager.popBackStack()
-        }
-
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        studyApiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-
-        studyAdapter = StudyAdapter(
-            itemList,
-            onItemClick = { selectedItem ->
-                studyViewModel.setStudyData(
-                    selectedItem.studyId,
-                    selectedItem.imageUrl,
-                    selectedItem.introduction
-                )
-
-                parentFragmentManager.beginTransaction()
-                    .replace(R.id.main_frm, DetailStudyFragment())
-                    .addToBackStack(null)
-                    .commit()
-            },
-            onLikeClick = { selectedItem, likeButton ->
-                toggleLikeStatus(selectedItem, likeButton)
-            },
-            onPageSelected = { selectedPage ->
-                currentPage = selectedPage
-                fetchStudyData()
-            },
-            onNextPrevClicked = { isNext ->
-                currentPage = when {
-                    isNext && currentPage < totalPages - 1 -> currentPage + 1
-                    !isNext && currentPage > 0 -> currentPage - 1
-                    isNext -> 0
-                    else -> totalPages - 1
-                }
-                fetchStudyData()
-            },
-            getCurrentPage = { currentPage },
-            getTotalPages = { totalPages }
-        )
-
-        binding.fragmentStudyRv.apply {
-            adapter = studyAdapter
-            layoutManager = LinearLayoutManager(requireContext())
-        }
-        fetchStudyData()
-    }
-
-    private fun fetchStudyData() {
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", MODE_PRIVATE)
-        val email = sharedPreferences.getString("currentEmail", null)
-
-        if (email != null) {
-            val memberId = sharedPreferences.getInt("${email}_memberId", -1)
-
-            if (memberId != -1) {
-                Log.d("StudyFragment", "Fetching data for memberId: $memberId, page: $currentPage, size: $size")
-
-                studyApiService.getStudies(currentPage, size)
-                    .enqueue(object : Callback<StudyResponse> {
-                        override fun onResponse(
-                            call: Call<StudyResponse>,
-                            response: Response<StudyResponse>
-                        ) {
-                            if (response.isSuccessful) {
-                                response.body()?.result?.let { result ->
-                                    val content = result.content
-                                    if (!content.isNullOrEmpty()) {
-                                        itemList.clear()
-                                        itemList.addAll(content.map {
-                                            StudyItem(
-                                                studyId = it.studyId,
-                                                title = it.title,
-                                                goal = it.goal,
-                                                introduction = it.introduction,
-                                                memberCount = it.memberCount,
-                                                heartCount = it.heartCount,
-                                                hitNum = it.hitNum,
-                                                maxPeople = it.maxPeople,
-                                                studyState = it.studyState,
-                                                themeTypes = it.themeTypes,
-                                                regions = it.regions,
-                                                imageUrl = it.imageUrl,
-                                                liked = it.liked
-                                            )
-                                        })
-
-                                        totalPages = result.totalPages
-                                        studyAdapter.updateList(itemList)
-
-                                        binding.fragmentStudyRv.visibility = View.VISIBLE
-                                        binding.emptyMessage.visibility = View.GONE
-                                    } else {
-                                        binding.fragmentStudyRv.visibility = View.GONE
-                                        binding.emptyMessage.visibility = View.VISIBLE
-                                    }
-                                } ?: run {
-                                    Toast.makeText(requireContext(), "결과가 없습니다.", Toast.LENGTH_SHORT).show()
-                                }
-                            } else {
-                                Toast.makeText(requireContext(), "마지막 페이지입니다", Toast.LENGTH_SHORT).show()
-                            }
-                        }
-
-                        override fun onFailure(call: Call<StudyResponse>, t: Throwable) {
-                            Toast.makeText(requireContext(), "Error: ${t.message}", Toast.LENGTH_SHORT).show()
-                        }
-                    })
-            } else {
-                Toast.makeText(requireContext(), "Member ID not found", Toast.LENGTH_SHORT).show()
-            }
-        } else {
-            Toast.makeText(requireContext(), "Email not provided", Toast.LENGTH_SHORT).show()
-        }
-    }
-
-    private fun toggleLikeStatus(studyItem: StudyItem, likeButton: ImageView) {
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", MODE_PRIVATE)
-        val memberId = sharedPreferences.getInt("${sharedPreferences.getString("currentEmail", "")}_memberId", -1)
-
-        if (memberId != -1) {
-            studyApiService.toggleStudyLike(studyItem.studyId)
-                .enqueue(object : Callback<LikeResponse> {
-                    override fun onResponse(call: Call<LikeResponse>, response: Response<LikeResponse>) {
-                        if (response.isSuccessful) {
-                            response.body()?.let { likeResponse ->
-                                val newStatus = likeResponse.result.status
-                                studyItem.liked = newStatus == "LIKE"
-                                val newIcon = if (studyItem.liked) R.drawable.ic_heart_filled else R.drawable.study_like
-                                likeButton.setImageResource(newIcon)
-                                studyItem.heartCount = if (studyItem.liked) studyItem.heartCount + 1 else studyItem.heartCount - 1
-                                studyAdapter.notifyItemChanged(itemList.indexOf(studyItem))
-                            }
-                        } else {
-                            Toast.makeText(requireContext(), "찜 상태 업데이트 실패", Toast.LENGTH_SHORT).show()
-                        }
-                    }
-
-                    override fun onFailure(call: Call<LikeResponse>, t: Throwable) {
-                        Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
-                    }
-                })
-        } else {
-            Toast.makeText(requireContext(), "회원 정보를 불러올 수 없습니다.", Toast.LENGTH_SHORT).show()
-        }
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyRegisterApiService.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyRegisterApiService.kt
deleted file mode 100644
index 6944f429..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyRegisterApiService.kt
+++ /dev/null
@@ -1,119 +0,0 @@
-import com.example.spoteam_android.BookmarkResponse
-import com.example.spoteam_android.GalleryResponse
-import com.example.spoteam_android.IsAppliedResponse
-import com.example.spoteam_android.LikeResponse
-import com.example.spoteam_android.MemberResponse
-import com.example.spoteam_android.RecentAnnounceResponse
-import com.example.spoteam_android.ScheduleListResponse
-import com.example.spoteam_android.ScheduleRequest
-import com.example.spoteam_android.ScheduleResponse
-import com.example.spoteam_android.StudyApplyResponse
-import com.example.spoteam_android.StudyDetailsResponse
-import com.example.spoteam_android.StudyItem
-import com.example.spoteam_android.StudyResponse
-import okhttp3.MultipartBody
-import okhttp3.RequestBody
-import retrofit2.Call
-import retrofit2.http.Body
-import retrofit2.http.GET
-import retrofit2.http.Multipart
-import retrofit2.http.PATCH
-import retrofit2.http.POST
-import retrofit2.http.Part
-import retrofit2.http.Path
-import retrofit2.http.Query
-interface StudyApiService {
-    @POST("/spot/studies")
-    fun submitStudyData(
-        @Query("memberId") memberId: Int,
-        @Body studyRequest: RequestBody // @Body로 변경하여 JSON 데이터만 전송
-    ): Call<ApiResponsed> // ApiResponse의 타입도 확인 필요
-
-
-    //내가 참여하고 있는 스터디 불러오기
-    @GET("/spot/search/studies/on-studies")
-    fun getStudies(
-        @Query("page") page: Int,
-        @Query("size") size: Int
-    ): Call<StudyResponse>
-    //찜한 스터디 조회
-    @GET("/spot/search/studies/liked")
-    fun getBookmark(
-        @Query("page") page: Int,
-        @Query("size") size: Int
-    ): Call<BookmarkResponse>
-
-
-    @Multipart
-    @POST("/spot/util/images")
-    fun uploadImages(
-        @Part images: List<MultipartBody.Part>
-
-    ): Call<UploadResponse>
-
-    @GET("/spot/studies/{studyId}/members")
-    fun getStudyMembers(
-        @Path("studyId") studyId: Int
-    ): Call<MemberResponse>
-
-    @GET("/spot/studies/{studyId}")
-    fun getStudyDetails(
-        @Path("studyId") studyId: Int
-    ): Call<StudyDetailsResponse>
-
-    @POST("/spot/studies/{studyId}/schedules")
-    fun addSchedules(
-        @Path("studyId") studyId: Int,
-        @Body scheduleRequest: ScheduleRequest
-    ): Call<ScheduleResponse>
-    //다가오는 모임 불러오기
-    @GET("/spot/studies/{studyId}/upcoming-schedules")
-    fun getStudySchedules(
-        @Path("studyId") studyId: Int,
-        @Query("page") page: Int,
-        @Query("size") size: Int,
-    ): Call<ScheduleListResponse>
-
-    //최근 공지 1개 불러오기
-    @GET("/spot/studies/{studyId}/announce")
-    fun getRecentAnnounce(
-        @Path("studyId") studyId: Int,
-    ): Call<RecentAnnounceResponse>
-
-    //스터디 참여 신청하기
-    @POST("/spot/studies/{studyId}")
-    fun applyStudy(
-        @Path("studyId") studyId: Int,
-        @Query("memberId") memberId: Int,
-        @Body introduction: String
-    ): Call<StudyApplyResponse>
-    //스터디 찜하기
-    @POST("/spot/studies/{studyId}/like")
-    fun toggleStudyLike(
-        @Path("studyId") studyId: Int,
-    ): Call<LikeResponse>
-
-    @GET("/spot/studies/{studyId}/is-applied")
-    fun getIsApplied(
-        @Path("studyId") studyId: Int
-    ): Call<IsAppliedResponse>
-
-    //갤러리 이미지 불러오기
-    @GET("/spot/studies/{studyId}/images")
-    fun getStudyImages(
-        @Path("studyId") studyId: Int,
-        @Query("offset") offset: Int,
-        @Query("limit") limit: Int
-    ): Call<GalleryResponse>
-
-    //스터디 수정하기
-    @PATCH("/spot/studies/{studyId}")
-    fun patchStudyData(
-        @Path("studyId") studyId: Int,
-        @Body requestBody: RequestBody
-    ): Call<ApiResponsed>
-
-
-
-}
-
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyRequest.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyRequest.kt
deleted file mode 100644
index 163c05fe..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyRequest.kt
+++ /dev/null
@@ -1,98 +0,0 @@
-import com.google.gson.annotations.SerializedName
-
-data class StudyRequest(
-    @SerializedName("themes")
-    val themes: List<String>,
-
-    @SerializedName("title")
-    val title: String,
-
-    @SerializedName("goal")
-    val goal: String,
-
-    @SerializedName("introduction")
-    val introduction: String,
-
-    @SerializedName("isOnline")
-    val isOnline: Boolean,
-
-    @SerializedName("profileImage")
-    val profileImage: String? = null,
-
-    @SerializedName("regions")
-    val regions: List<String>? = null,
-
-    @SerializedName("maxPeople")
-    val maxPeople: Int,
-
-    @SerializedName("gender")
-    val gender: Gender,
-
-    @SerializedName("minAge")
-    val minAge: Int,
-
-    @SerializedName("maxAge")
-    val maxAge: Int,
-
-    @SerializedName("fee")
-    val fee: Int,
-
-    @SerializedName("hasFee")
-    val hasFee: Boolean? = null
-)
-
-enum class Gender {
-    @SerializedName("UNKNOWN")
-    UNKNOWN,
-
-    @SerializedName("MALE")
-    MALE,
-
-    @SerializedName("FEMALE")
-    FEMALE
-}
-enum class StudyFormMode {
-    CREATE,
-    EDIT
-}
-
-data class ApiResponsed(
-    @SerializedName("isSuccess") val isSuccess: Boolean,
-    @SerializedName("code") val code: String,
-    @SerializedName("message") val message: String,
-    @SerializedName("result") val result: StudyResult?
-)
-
-data class StudyResult(
-    @SerializedName("themes") val themes: List<String>,
-    @SerializedName("title") val title: String,
-    @SerializedName("goal") val goal: String,
-    @SerializedName("introduction") val introduction: String,
-    @SerializedName("isOnline") val isOnline: Boolean,
-    @SerializedName("profileImage") val profileImage: String,
-    @SerializedName("regions") val regions: List<String>,
-    @SerializedName("maxPeople") val maxPeople: Int,
-    @SerializedName("gender") val gender: String,
-    @SerializedName("minAge") val minAge: Int,
-    @SerializedName("maxAge") val maxAge: Int,
-    @SerializedName("fee") val fee: Int,
-    @SerializedName("hasFee") val hasFee: Boolean
-)
-
-// 데이터 클래스 정의
-data class UploadResponse(
-    val isSuccess: Boolean,
-    val code: String,
-    val message: String?,
-    val result: ResultData
-)
-
-data class ResultData(
-    val imageUrls: List<ImageUrlData>,
-    val imageCount: Int
-)
-
-data class ImageUrlData(
-    val imageUrl: String,
-    val uploadAt: String
-)
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyViewModel.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyViewModel.kt
deleted file mode 100644
index 6c10d9f9..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyViewModel.kt
+++ /dev/null
@@ -1,294 +0,0 @@
-import android.content.Context
-import android.util.Log
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.StudyDetailsResponse
-import com.example.spoteam_android.StudyDetailsResult
-import com.example.spoteam_android.login.LocationItem
-import com.google.gson.Gson
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
-import okhttp3.RequestBody
-import okhttp3.RequestBody.Companion.toRequestBody
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-
-class StudyViewModel : ViewModel() {
-    private val _mode = MutableLiveData<StudyFormMode>(StudyFormMode.CREATE)
-    val mode: LiveData<StudyFormMode> get() = _mode
-    fun setMode(newMode: StudyFormMode) {
-        _mode.value = newMode
-    }
-
-    private val _studyRequest = MutableLiveData<StudyRequest?>()
-    val studyRequest: LiveData<StudyRequest?> = _studyRequest
-
-    private val _profileImageUri = MutableLiveData<String?>()
-    val profileImageUri: LiveData<String?> = _profileImageUri
-
-    private val _themes = MutableLiveData<List<String>>()
-    val themes: LiveData<List<String>> = _themes
-
-    private val _maxPeople = MutableLiveData<Int>()
-    val maxPeople: LiveData<Int> = _maxPeople
-
-    private val _memberCount = MutableLiveData<Int>()
-    val memberCount: LiveData<Int> = _memberCount
-
-    private val _studyOwner = MutableLiveData<String>()
-
-    private val _locationList = mutableListOf<LocationItem>()
-
-    private val _studyId = MutableLiveData<Int>()
-    val studyId: LiveData<Int> get() = _studyId
-
-    private val _studyImageUrl = MutableLiveData<String>()
-    val studyImageUrl: LiveData<String> get() = _studyImageUrl
-
-    private val _studyIntroduction = MutableLiveData<String>()
-    val studyIntroduction: LiveData<String> get() = _studyIntroduction
-
-    private val _patchSuccess = MutableLiveData<Boolean>()
-    val patchSuccess: LiveData<Boolean> get() = _patchSuccess
-
-    // 외부 노출용 (읽기 전용)
-    val studyOwner: LiveData<String> get() = _studyOwner
-
-    private val _recentStudyId = MutableLiveData<Int?>()
-    val recentStudyId: LiveData<Int?> get() = _recentStudyId
-
-
-
-    fun setStudyOwner(name: String) {
-        _studyOwner.value = name
-    }
-
-    fun setMaxPeople(value: Int) {
-        _maxPeople.value = value
-    }
-
-    fun setMemberCount(value: Int) {
-        _memberCount.value = value
-    }
-
-    fun setProfileImageUri(uri: String?) {
-        _profileImageUri.value = uri
-        updateStudyRequest()
-    }
-
-
-    fun setStudyData(id: Int, imageUrl: String, studyIntroduction: String) {
-        _studyId.value = id
-        _studyImageUrl.value = imageUrl
-        _studyIntroduction.value = studyIntroduction
-    }
-
-    fun fetchStudyDetail(studyId: Int) {
-        val service = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-
-        service.getStudyDetails(studyId).enqueue(object : Callback<StudyDetailsResponse> {
-            override fun onResponse(
-                call: Call<StudyDetailsResponse>,
-                response: Response<StudyDetailsResponse>
-            ) {
-                if (response.isSuccessful) {
-                    val body = response.body()
-                    if (body != null && body.isSuccess) {
-                        val result = body.result
-                        Log.d("StudyViewModel", "서버 응답 isOnline: ${result?.isOnline}, regions: ${result?.regions}")
-
-                        _themes.value = result.themes
-                        _studyIntroduction.value = result.introduction
-                        _studyId.value = result.studyId
-                        _maxPeople.value = result.maxPeople
-                        _memberCount.value = result.memberCount
-                        _studyOwner.value = result.studyOwner.ownerName
-                        _profileImageUri.value = result.profileImage
-                        _studyRequest.value = result.toStudyRequest()
-
-                    } else {
-                        Log.e("StudyViewModel", "서버 응답 실패: ${body?.message}")
-                    }
-                } else {
-                    Log.e("StudyViewModel", "HTTP 실패: ${response.code()}")
-                }
-            }
-
-            override fun onFailure(call: Call<StudyDetailsResponse>, t: Throwable) {
-                Log.e("StudyViewModel", "통신 오류: ${t.message}")
-            }
-        })
-    }
-
-
-
-
-
-
-    fun setStudyData(
-        title: String, goal: String, introduction: String, isOnline: Boolean, profileImage: String?,
-        regions: List<String>?, maxPeople: Int, gender: Gender, minAge: Int, maxAge: Int, fee: Int,   hasFee: Boolean?
-    ) {
-
-        val newRequest = StudyRequest(
-            themes = _themes.value ?: listOf(),
-            title = title,
-            goal = goal,
-            introduction = introduction,
-            isOnline = isOnline,
-            profileImage = profileImage,
-            regions = regions,
-            maxPeople = maxPeople,
-            gender = gender,
-            minAge = minAge,
-            maxAge = maxAge,
-            fee = fee,
-            hasFee = hasFee
-        )
-
-        _studyRequest.value = newRequest
-    }
-
-
-
-
-    private fun updateStudyRequest() {
-        _studyRequest.value = _studyRequest.value?.copy(
-            profileImage = _profileImageUri.value,
-            themes = _themes.value ?: listOf()
-        )
-    }
-
-    fun updateThemes(newThemes: List<String>) {
-        _themes.value = newThemes
-        updateStudyRequest()
-    }
-    //스터디 수정하기
-    fun patchStudyData() {
-        val studyId = _studyId.value ?: return
-        val studyData = _studyRequest.value ?: return
-        val apiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-        val requestBody = createStudyRequestBody(studyData)
-
-        apiService.patchStudyData(studyId, requestBody)
-            .enqueue(object : Callback<ApiResponsed> {
-                override fun onResponse(call: Call<ApiResponsed>, response: Response<ApiResponsed>) {
-                    if (response.isSuccessful) {
-                        Log.d("StudyViewModel", "스터디 수정 성공")
-                        _patchSuccess.value = true
-                    } else {
-                        Log.e("StudyViewModel", "스터디 수정 실패: ${response.code()}")
-                        _patchSuccess.value = false
-                    }
-                }
-
-                override fun onFailure(call: Call<ApiResponsed>, t: Throwable) {
-                    Log.e("StudyViewModel", "스터디 수정 오류: ${t.message}")
-                    _patchSuccess.value = false
-                }
-            })
-    }
-
-
-
-
-    fun submitStudyData(memberId: Int) {
-        val apiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-        val studyData = _studyRequest.value
-
-        if (studyData != null) {
-            val studyRequestBody = createStudyRequestBody(studyData)
-
-            apiService.submitStudyData(memberId, studyRequestBody)
-                .enqueue(object : Callback<ApiResponsed> {
-                    override fun onResponse(call: Call<ApiResponsed>, response: Response<ApiResponsed>) {
-                        if (response.isSuccessful) {
-                            response.body()?.let { apiResponse ->
-                                Log.d("StudyViewModel", "Study data submitted successfully.")
-                                Log.d("StudyViewModel", "Response: ${Gson().toJson(apiResponse)}")
-                            } ?: run {
-                                Log.d("StudyViewModel", "No response body returned.")
-                            }
-                        } else {
-                            Log.e("StudyViewModel", "Failed to submit study data. Response code: ${response.code()}")
-                            response.errorBody()?.let { errorBody ->
-                                Log.e("StudyViewModel", "Error body: ${errorBody.string()}")
-                            }
-                        }
-                    }
-
-                    override fun onFailure(call: Call<ApiResponsed>, t: Throwable) {
-                        Log.e("StudyViewModel", "Error submitting study data: ${t.message}")
-                    }
-                })
-        } else {
-            Log.e("StudyViewModel", "No study data available to submit.")
-        }
-    }
-
-    fun StudyDetailsResult.toStudyRequest(): StudyRequest {
-        return StudyRequest(
-            themes = this.themes,
-            title = this.studyName,
-            goal = this.goal,
-            introduction = this.introduction,
-            isOnline = this.isOnline,
-            profileImage = this.profileImage,
-            regions = this.regions,
-            maxPeople = this.maxPeople,
-            gender = this.gender,
-            minAge = this.minAge,
-            maxAge = this.maxAge,
-            fee = this.fee,
-            hasFee = this.fee > 0
-        )
-    }
-
-
-
-
-    fun clearRegions() {
-        _studyRequest.value = _studyRequest.value?.copy(regions = null)
-    }
-
-    private fun createStudyRequestBody(studyRequest: StudyRequest): RequestBody {
-        val gson = Gson()
-        val json = gson.toJson(studyRequest)
-        return json.toRequestBody("application/json".toMediaType())
-    }
-
-    fun setRecentStudyId(id: Int) {
-        _recentStudyId.value = id
-        Log.d("StudyViewModel", "최근 조회한 스터디 ID 설정: $id")
-    }
-
-    fun setLocationList(list: List<LocationItem>) {
-        _locationList.clear()
-        _locationList.addAll(list)
-    }
-
-    fun findAddressFromCode(code: String): String? {
-        return _locationList.find { it.code == code }?.address
-    }
-
-    fun reset() {
-        _mode.value = StudyFormMode.CREATE
-        _studyRequest.value = null
-        _themes.value = listOf()
-        _profileImageUri.value = null
-        _maxPeople.value = 0
-        _memberCount.value = 0
-        _studyOwner.value = ""
-        _recentStudyId.value = null
-        _studyId.value = 0
-        _studyImageUrl.value = ""
-        _studyIntroduction.value = ""
-    }
-
-
-}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CalendarAddEventFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CalendarAddEventFragment.kt
deleted file mode 100644
index 9d13d470..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CalendarAddEventFragment.kt
+++ /dev/null
@@ -1,576 +0,0 @@
-package com.example.spoteam_android.ui.study.calendar
-
-import StudyApiService
-import android.annotation.SuppressLint
-import android.app.AlertDialog
-import android.app.DatePickerDialog
-import android.app.TimePickerDialog
-import android.content.res.ColorStateList
-import android.graphics.Typeface
-import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.Button
-import android.widget.CheckBox
-import android.widget.EditText
-import android.widget.ImageButton
-import android.widget.ImageView
-import android.widget.Spinner
-import android.widget.TextView
-import android.widget.Toast
-import androidx.core.content.ContextCompat
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.FragmentTransaction
-import androidx.fragment.app.activityViewModels
-import androidx.fragment.app.setFragmentResult
-import androidx.lifecycle.ViewModelProvider
-import com.example.spoteam_android.R
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.ScheduleRequest
-import com.example.spoteam_android.ScheduleResponse
-import com.example.spoteam_android.databinding.FragmentCalendarAddEventBinding
-import com.example.spoteam_android.databinding.FragmentMemberStudyBinding
-import com.example.spoteam_android.ui.study.CompleteScheduleDialog
-import com.example.spoteam_android.ui.study.FixedRoundedSpinnerAdapter
-import com.example.spoteam_android.ui.study.StudyFragment
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import com.google.gson.Gson
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import java.text.SimpleDateFormat
-import java.util.*
-
-class CalendarAddEventFragment  : BottomSheetDialogFragment() {
-    private lateinit var binding: FragmentCalendarAddEventBinding
-    private lateinit var eventTitleEditText: EditText
-    private lateinit var eventPositionEditText: EditText
-    private lateinit var startDateTimeTextView: TextView
-    private lateinit var endDateTimeTextView: TextView
-    private lateinit var charTitleCountText: TextView
-    private lateinit var charPostionCountText: TextView
-    private lateinit var saveButton: Button
-    private lateinit var closeButton: ImageView
-    private lateinit var spinner: Spinner
-    private lateinit var checkBox: CheckBox
-    private lateinit var checkBoxViewModel: CheckBoxViewModel
-    private lateinit var startYearTx: TextView
-    private lateinit var startTimeTx: TextView
-    private lateinit var endYearTx: TextView
-    private lateinit var endTimeTx: TextView
-    private lateinit var txEndGuide: TextView
-    private lateinit var txEveryDay: TextView
-    private var studyId: Int = 0
-    private var period: String = "NONE"
-    private var startDateTime = ""
-    private var endDateTime = ""
-    private var isAllDay = false
-    private var isStartDateSet = false
-    private var isEndDateSet = false
-
-    override fun getTheme(): Int = R.style.InterestBottomSheetDialogTheme
-
-    override fun onStart() {
-        super.onStart()
-        val bottomSheet = dialog?.findViewById<View>(com.google.android.material.R.id.design_bottom_sheet)
-
-        bottomSheet?.let {
-            val displayMetrics = resources.displayMetrics
-            val screenHeight = displayMetrics.heightPixels
-            val targetHeight = (screenHeight * 0.8).toInt() // 화면의 70%
-
-            it.layoutParams.height = targetHeight
-
-            val behavior = com.google.android.material.bottomsheet.BottomSheetBehavior.from(it)
-            behavior.state = com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED
-        }
-    }
-
-
-    private val eventViewModel: EventViewModel by activityViewModels()
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = FragmentCalendarAddEventBinding.inflate(inflater, container, false)
-
-        setupSpinners()
-
-        checkBoxViewModel = ViewModelProvider(this).get(CheckBoxViewModel::class.java)
-
-        eventTitleEditText = binding.eventTitleEditText
-        eventPositionEditText = binding.eventPositionEditText
-        startDateTimeTextView = binding.startDateTimeTextView
-        endDateTimeTextView = binding.endDateTimeTextView
-        saveButton = binding.fragmentIntroduceStudyBt
-        closeButton = binding.icClose
-        spinner = binding.routineSpinner
-        checkBox = binding.checkBoxEveryDay
-        startYearTx = binding.txStartYear
-        startTimeTx = binding.txStartTime
-        endYearTx = binding.txEndYear
-        endTimeTx = binding.txEndTime
-        txEndGuide = binding.txEndGuide
-        txEveryDay = binding.txEveryDay
-        charTitleCountText = binding.charTitleCountText
-        charPostionCountText = binding.charPositionCountText
-
-        studyId = arguments?.getInt("studyId") ?: 0
-
-
-        //'하루종일' 텍스트 클릭 시 체크박스 상태 변경 반영
-        txEveryDay.setOnClickListener {
-            checkBox.isChecked = !checkBox.isChecked
-        }
-
-
-        // CheckBox 상태가 변경될 때 ViewModel의 isSpinnerEnabled 값 변경
-        checkBox.setOnCheckedChangeListener { _, isChecked ->
-            isAllDay = isChecked
-            if (isAllDay) {
-                // 시간을 자동으로 설정
-                val calendar = Calendar.getInstance()
-                val year = calendar.get(Calendar.YEAR)
-                val month = calendar.get(Calendar.MONTH) + 1 // Calendar.MONTH는 0부터 시작
-                val day = calendar.get(Calendar.DAY_OF_MONTH)
-
-                // 시작 시간 설정
-                startDateTime = String.format("%04d-%02d-%02d 00:00", year, month, day)
-                startYearTx.text = String.format("%04d.%02d.%02d", year, month, day)
-                startTimeTx.text = "00:00 am"
-
-                // 종료 시간 TextView 및 가이드 숨기기
-                endDateTimeTextView.visibility = View.GONE
-                txEndGuide.visibility = View.GONE
-                endYearTx.visibility = View.GONE
-                endTimeTx.visibility = View.GONE
-            } else {
-                resetDateTimeFields()
-                // 종료 시간 TextView 및 가이드 표시
-                endDateTimeTextView.visibility = View.VISIBLE
-                txEndGuide.visibility = View.VISIBLE
-            }
-        }
-
-
-
-
-        eventTitleEditText.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                updateSaveButtonState()
-            }
-            override fun afterTextChanged(s: Editable?) {
-                val length = s?.length ?: 0
-                charTitleCountText.text = "($length/20)"
-            }
-        })
-
-        eventPositionEditText.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                updateSaveButtonState()
-            }
-            override fun afterTextChanged(s: Editable?) {
-                val length = s?.length ?: 0
-                charPostionCountText.text = "($length/20)"
-            }
-        })
-
-
-        startDateTimeTextView.setOnClickListener {
-            showDateTimePickerDialog(startYearTx,startTimeTx,true)
-            updateSaveButtonState()
-        }
-        endDateTimeTextView.setOnClickListener {
-            showDateTimePickerDialog(endYearTx,endTimeTx,false)
-            updateSaveButtonState()
-        }
-
-        saveButton.setOnClickListener {
-            addEventToViewModel(isAllDay)
-            uploadScheduleToServer(isAllDay)
-        }
-
-        closeButton.setOnClickListener{
-            dismiss()
-        }
-
-        view?.setOnTouchListener { _, _ ->
-            clearFocusFromEditTexts()
-            true
-        }
-
-
-
-        return return binding.root
-    }
-
-    private fun setupSpinners() {
-        val periodList = listOf("안함", "매일", "매주", "격주", "매월")
-        val periodAdapter = FixedRoundedSpinnerAdapter(requireContext(), periodList)
-        binding.routineSpinner.adapter = periodAdapter
-        binding.routineSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(
-                parent: AdapterView<*>,
-                view: View?,
-                position: Int,
-                id: Long
-            ) {
-
-                try {
-                    // null-safe 처리
-                    val isChecked = checkBoxViewModel.isCheckBoxChecked.value ?: false
-                    if (!isChecked) {
-                        period = "NONE"
-                        return
-                    }
-
-                    val newPeriod = when (position) {
-                        0 -> "NONE"
-                        1 -> "DAILY"
-                        2 -> "WEEKLY"
-                        3 -> "BIWEEKLY"
-                        4 -> "MONTHLY"
-                        else -> "NONE"
-                    }
-
-                    if (newPeriod != period) {
-                        period = newPeriod
-                        resetDateTimeFields()
-                    }
-
-                } catch (e: Exception) {
-                }
-            }
-
-            override fun onNothingSelected(parent: AdapterView<*>) {
-                // 안전하게 기본값 설정
-                period = "NONE"
-                resetDateTimeFields()
-            }
-        }
-    }
-
-
-
-
-
-    private fun showDateTimePickerDialog(txYear: TextView, txTime: TextView, isStart: Boolean) {
-        val calendar = Calendar.getInstance()
-        val year = calendar.get(Calendar.YEAR)
-        val month = calendar.get(Calendar.MONTH)
-        val day = calendar.get(Calendar.DAY_OF_MONTH)
-
-        val datePickerDialog = DatePickerDialog(
-            requireContext(),
-            R.style.MyDatePickerTheme,
-            { _, selectedYear, selectedMonth, selectedDay ->
-                val selectedDate = String.format(
-                    "%04d-%02d-%02d",
-                    selectedYear,
-                    selectedMonth + 1,
-                    selectedDay
-                )
-
-                if (isStart) {
-                    // 시작 날짜 및 시간 설정
-                    startDateTime = "$selectedDate 00:00"
-                    txYear.text = String.format("%04d.%02d.%02d", selectedYear, selectedMonth + 1, selectedDay)
-
-                    if (isAllDay) {
-                        // All Day가 체크된 경우 시간 기본값 설정 및 TimePickerDialog 생략
-                        txTime.text = "00:00 am" // 기본 시작 시간
-                        isStartDateSet = true // 시작 날짜 설정 완료
-                        updateSaveButtonState() // 버튼 상태 업데이트
-                    } else {
-                        // All Day가 체크되지 않은 경우 TimePickerDialog 표시
-                        showTimePickerDialog(selectedDate, txTime, isStart)
-                    }
-                } else {
-                    // 종료 날짜 설정
-                    val endTime = if (endDateTime.isNotEmpty() && endDateTime.contains(" ")) {
-                        endDateTime.split(" ")[1] // 기존 종료 시간 유지
-                    } else {
-                        "23:59" // 기본 종료 시간
-                    }
-                    endDateTime = "$selectedDate $endTime"
-                    txYear.text = String.format("%04d.%02d.%02d", selectedYear, selectedMonth + 1, selectedDay)
-
-                    if (isAllDay) {
-                        // All Day가 체크된 경우 시간 기본값 설정 및 TimePickerDialog 생략
-                        txTime.text = "11:59 pm" // 기본 종료 시간
-                        isEndDateSet = true // 종료 날짜 설정 완료
-                        updateSaveButtonState() // 버튼 상태 업데이트
-                    } else {
-                        // All Day가 체크되지 않은 경우 TimePickerDialog 표시
-                        showTimePickerDialog(selectedDate, txTime, isStart)
-                    }
-                }
-
-                // Visibility 업데이트
-                if (isStart) {
-                    startYearTx.visibility = View.VISIBLE
-                    startTimeTx.visibility = View.VISIBLE
-                } else {
-                    endYearTx.visibility = View.VISIBLE
-                    endTimeTx.visibility = View.VISIBLE
-                }
-            },
-            year, month, day
-        )
-
-        // 종료 날짜 제한 적용
-        if (!isStart) {
-            applyDateRestrictions(datePickerDialog)
-        }
-
-        datePickerDialog.show()
-        datePickerDialog.setCanceledOnTouchOutside(false) // 바깥 터치 방지
-
-        datePickerDialog.getButton(DatePickerDialog.BUTTON_POSITIVE)?.apply {
-            setTextColor(ContextCompat.getColor(requireContext(), R.color.black)) // 텍스트 색상
-            setTypeface(typeface, Typeface.BOLD) // Bold 적용
-        }
-
-        datePickerDialog.getButton(DatePickerDialog.BUTTON_NEGATIVE)?.apply {
-            setTextColor(ContextCompat.getColor(requireContext(), R.color.black)) // 텍스트 색상
-            setTypeface(typeface, Typeface.BOLD) // Bold 적용
-        }
-    }
-
-    // TimePickerDialog를 분리하여 가독성 개선
-    private fun showTimePickerDialog(selectedDate: String, txTime: TextView, isStart: Boolean) {
-        val calendar = Calendar.getInstance()
-        val timePickerDialog = TimePickerDialog(
-            requireContext(),
-            R.style.MyTimePickerTheme, // 스타일 적용
-            { _, selectedHourOfDay, selectedMinute ->
-                val isAm = selectedHourOfDay < 12
-                val amPm = if (isAm) "am" else "pm"
-                val hourFormatted =
-                    if (selectedHourOfDay % 12 == 0) 12 else selectedHourOfDay % 12
-                val formattedTime = String.format("%02d:%02d %s", hourFormatted, selectedMinute, amPm)
-
-                if (isStart) {
-                    startDateTime = String.format("%s %02d:%02d", selectedDate, selectedHourOfDay, selectedMinute)
-                    txTime.text = formattedTime
-                    isStartDateSet = true // 시작 날짜 설정 완료
-                } else {
-                    endDateTime = String.format("%s %02d:%02d", selectedDate, selectedHourOfDay, selectedMinute)
-                    txTime.text = formattedTime
-                    isEndDateSet = true // 종료 날짜 설정 완료
-                }
-
-                updateSaveButtonState() // 버튼 상태 업데이트
-            },
-            calendar.get(Calendar.HOUR_OF_DAY), calendar.get(Calendar.MINUTE), false
-        )
-        timePickerDialog.show()
-        timePickerDialog.setCanceledOnTouchOutside(false) // 바깥 터치 방지
-
-        val negativeButton = timePickerDialog.findViewById<Button>(android.R.id.button2)
-        negativeButton?.visibility = View.GONE
-
-        timePickerDialog.getButton(DatePickerDialog.BUTTON_POSITIVE)?.apply {
-            setTextColor(ContextCompat.getColor(requireContext(), R.color.black)) // 텍스트 색상
-            setTypeface(typeface, Typeface.BOLD) // Bold 적용
-        }
-    }
-
-    // 종료 날짜 제한 로직
-    private fun applyDateRestrictions(datePickerDialog: DatePickerDialog) {
-        val startParts = startDateTime.split(" ", "-", ":")
-        val startCalendar = Calendar.getInstance().apply {
-            set(startParts[0].toInt(), startParts[1].toInt() - 1, startParts[2].toInt())
-        }
-
-        when (period) {
-            "DAILY" -> {
-                datePickerDialog.datePicker.minDate = startCalendar.timeInMillis
-                datePickerDialog.datePicker.maxDate = startCalendar.timeInMillis
-            }
-            "WEEKLY" -> {
-                val maxEndCalendar = (startCalendar.clone() as Calendar).apply {
-                    add(Calendar.DAY_OF_MONTH, 6)
-                }
-                datePickerDialog.datePicker.minDate = startCalendar.timeInMillis
-                datePickerDialog.datePicker.maxDate = maxEndCalendar.timeInMillis
-            }
-            "BIWEEKLY" -> {
-                val maxEndCalendar = (startCalendar.clone() as Calendar).apply {
-                    add(Calendar.DAY_OF_MONTH, 6)
-                }
-                datePickerDialog.datePicker.minDate = startCalendar.timeInMillis
-                datePickerDialog.datePicker.maxDate = maxEndCalendar.timeInMillis
-            }
-            "MONTHLY" -> {
-                val maxEndCalendar = (startCalendar.clone() as Calendar).apply {
-                    add(Calendar.DAY_OF_MONTH, 29)
-                }
-                datePickerDialog.datePicker.minDate = startCalendar.timeInMillis
-                datePickerDialog.datePicker.maxDate = maxEndCalendar.timeInMillis
-            }
-        }
-    }
-
-
-
-
-
-    private fun uploadScheduleToServer(isChecked: Boolean) {
-        val title = eventTitleEditText.text.toString()
-        val location = eventPositionEditText.text.toString() // 위치 입력
-        val startDateTime = startDateTime
-        val endDateTime = if (isChecked) {
-            val dateParts = startDateTime.split(" ")
-            "${dateParts[0]} 23:59"
-        } else {
-            endDateTime
-        }
-
-        val isAllDay = isAllDay
-        val period = period
-
-        // ISO 8601 형식으로 변환
-        val isoDateTimeFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.getDefault())
-
-        // startDateTime과 endDateTime을 Date로 파싱
-        val startDate: Date = SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()).parse(startDateTime)
-        val endDate: Date = SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()).parse(endDateTime)
-
-        // ISO 8601 형식으로 포맷팅
-        val formattedStartDateTime = isoDateTimeFormat.format(startDate)
-        val formattedEndDateTime = isoDateTimeFormat.format(endDate)
-
-        val scheduleRequest = ScheduleRequest(
-            title = title,
-            location = location,
-            startedAt = formattedStartDateTime,
-            finishedAt = formattedEndDateTime,
-            isAllDay = isAllDay,
-            period = period
-        )
-        val jsonRequestBody = Gson().toJson(scheduleRequest)
-
-
-        val apiService = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-        val call = apiService.addSchedules(studyId, scheduleRequest)
-
-        call.enqueue(object : Callback<ScheduleResponse> {
-            override fun onResponse(call: Call<ScheduleResponse>, response: Response<ScheduleResponse>) {
-                if (response.isSuccessful) {
-                    val scheduleResponse = response.body()
-                    if (scheduleResponse != null && scheduleResponse.isSuccess) {
-                        showCompletionDialog()
-                    } else {
-                        Toast.makeText(requireContext(), "일정 추가에 실패했습니다: ${response.message()}", Toast.LENGTH_SHORT).show()
-                    }
-                } else {
-                    Toast.makeText(requireContext(), "서버 오류: ${response.code()}", Toast.LENGTH_SHORT).show()
-                }
-            }
-
-            override fun onFailure(call: Call<ScheduleResponse>, t: Throwable) {
-                Toast.makeText(requireContext(), "네트워크 오류: ${t.message}", Toast.LENGTH_SHORT).show()
-            }
-        })
-    }
-
-    private fun addEventToViewModel(isChecked: Boolean) {
-        val title = eventTitleEditText.text.toString()
-        val startDateTime = startDateTime
-        val endDateTime = if (isChecked) {
-            val dateParts = startDateTime.split(" ")
-            "${dateParts[0]} 23:59"
-        } else {
-            endDateTime
-        }
-
-
-        val startParts = startDateTime.split(" ", "-", ":")
-        val endParts = endDateTime.split(" ", "-", ":")
-
-        val event = Event(
-            id = EventRepository.getNextId(),
-            title = title,
-            startYear = startParts[0].toInt(),
-            startMonth = startParts[1].toInt(),
-            startDay = startParts[2].toInt(),
-            startHour = startParts[3].toInt(),
-            startMinute = startParts[4].toInt(),
-            endYear = endParts[0].toInt(),
-            endMonth = endParts[1].toInt(),
-            endDay = endParts[2].toInt(),
-            endHour = endParts[3].toInt(),
-            endMinute = endParts[4].toInt()
-        )
-        eventViewModel.addEvent(event)
-    }
-
-    companion object {
-        fun newInstance(studyId: Int): CalendarAddEventFragment {
-            val fragment = CalendarAddEventFragment()
-            val args = Bundle()
-            args.putInt("studyId", studyId)
-            fragment.arguments = args
-            return fragment
-        }
-    }
-    private fun showCompletionDialog() {
-        val dialog = CompleteScheduleDialog(requireContext(),startDateTime)
-        dialog.start(parentFragmentManager)
-    }
-
-    private fun updateSaveButtonState() {
-        val isTitleValid = eventTitleEditText.text.isNotEmpty()
-        val isPositionValid = eventPositionEditText.text.isNotEmpty()
-
-        // 모든 조건이 만족되는 경우에만 saveButton 활성화
-        saveButton.isEnabled = isTitleValid && isPositionValid && isStartDateSet  && isEndDateSet || isTitleValid && isPositionValid && checkBox.isChecked
-
-    }
-
-    private fun clearFocusFromEditTexts() {
-        // 현재 포커스를 가진 View의 포커스를 제거
-        view?.let {
-            val imm = requireContext().getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as android.view.inputmethod.InputMethodManager
-            imm.hideSoftInputFromWindow(it.windowToken, 0)
-            it.clearFocus()
-        }
-
-        // 모든 EditText의 포커스를 제거
-        eventTitleEditText.clearFocus()
-        eventPositionEditText.clearFocus()
-    }
-
-    private fun resetDateTimeFields() {
-        // 시작 날짜 및 시간 초기화
-        startDateTime = ""
-        startYearTx.text = ""
-        startTimeTx.text = ""
-
-        // 종료 날짜 및 시간 초기화
-        endDateTime = ""
-        endYearTx.text = ""
-        endTimeTx.text = ""
-
-        // 시작/종료 날짜 및 시간 관련 View 숨기기
-        startYearTx.visibility = View.GONE
-        startTimeTx.visibility = View.GONE
-        endYearTx.visibility = View.GONE
-        endTimeTx.visibility = View.GONE
-
-        isStartDateSet = false // 초기화
-        isEndDateSet = false   // 초기화
-        updateSaveButtonState()
-    }
-}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoListFragment.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoListFragment.kt
deleted file mode 100644
index 61992345..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoListFragment.kt
+++ /dev/null
@@ -1,526 +0,0 @@
-package com.example.spoteam_android.ui.study.todolist
-
-import StudyApiService
-import StudyViewModel
-import android.content.Context
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.ViewTreeObserver
-import android.view.inputmethod.InputMethodManager
-import android.widget.ImageButton
-import android.widget.Toast
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProvider
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.example.spoteam_android.MemberResponse
-import com.example.spoteam_android.ProfileItem
-import com.example.spoteam_android.RetrofitInstance
-import com.example.spoteam_android.databinding.FragmentTodoListBinding
-import com.example.spoteam_android.ui.study.calendar.CalendarApiService
-import com.example.spoteam_android.ui.study.calendar.Event
-import com.example.spoteam_android.ui.study.calendar.EventAdapter
-import com.example.spoteam_android.ui.study.calendar.EventViewModel
-import com.example.spoteam_android.ui.study.calendar.ScheduleResponse
-import com.example.spoteam_android.ui.study.DetailStudyHomeProfileAdapter
-import com.prolificinteractive.materialcalendarview.CalendarDay
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import java.time.DayOfWeek
-import java.time.LocalDate
-import java.util.Calendar
-import java.time.YearMonth
-
-class TodoListFragment : Fragment() {
-
-    private lateinit var binding: FragmentTodoListBinding
-    private lateinit var todoViewModel: TodoViewModel
-    private val studyViewModel: StudyViewModel by activityViewModels()
-    private lateinit var myTodoAdapter: TodoAdapter
-    private lateinit var otherTodoAdapter: OtherTodoAdapter
-    private lateinit var todoEventAdapter: TodoEventAdapter
-    private lateinit var todoDateAdapter: TodoDateAdapter
-    private lateinit var selectedDate: String // 멤버 변수로 선언
-    private val eventViewModel: EventViewModel by activityViewModels()
-    private lateinit var profileAdapter: DetailStudyHomeProfileAdapter
-    private lateinit var memberIdMap: Map<ProfileItem, Int>
-    private var selectedMemberId: Int? = null
-    private lateinit var repository: TodoRepository // repository 선언
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = FragmentTodoListBinding.inflate(inflater, container, false)
-
-
-        // 투두리스트 EdixText 다른 곳 클릭 시 포커싱 해제
-        binding.root.setOnTouchListener { view, _ ->
-            view.performClick()
-            val focusedView = activity?.currentFocus
-            if (focusedView != null) {
-                val imm = requireContext().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-                imm.hideSoftInputFromWindow(focusedView.windowToken, 0)
-                focusedView.clearFocus()
-            }
-
-            myTodoAdapter.cancelIfEditing()
-
-            false
-        }
-
-        val studyId = studyViewModel.studyId.value ?: 0
-
-        val apiService = RetrofitInstance.retrofit.create(TodoApiService::class.java)
-        repository = TodoRepository(apiService) // 기존 로직 유지
-        val factory = TodoViewModelFactory(repository, studyId)
-        todoViewModel = ViewModelProvider(this, factory).get(TodoViewModel::class.java)
-
-        // 오늘 날짜로 selectedDate 초기화
-        val calendar = Calendar.getInstance()
-        val year = calendar.get(Calendar.YEAR)
-        val month = calendar.get(Calendar.MONTH) + 1 // Calendar.MONTH는 0부터 시작
-        val today = calendar.get(Calendar.DAY_OF_MONTH)
-
-        val currentYear = LocalDate.now().year // 현재 연도
-        val currentMonth = LocalDate.now().monthValue // 현재 월
-
-        Log.d("Todo","1111")
-
-        Log.d("Todo","${getTotalWeeksInMonth(currentYear,currentMonth)}")
-
-        val daysOfCurrentMonth = getDaysOfMonthWithPadding(currentYear, currentMonth)
-
-
-        var selectedDate2 = 1
-
-
-        todoDateAdapter = TodoDateAdapter(daysOfCurrentMonth, selectedDate2) { newSelectedDate ->
-            selectedDate2 = newSelectedDate
-            todoDateAdapter.updateDates(daysOfCurrentMonth, selectedDate2)
-        }
-
-        binding.rvCalendar.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
-        binding.rvCalendar.adapter = todoDateAdapter
-
-
-
-        selectedDate  = "${calendar.get(Calendar.YEAR)}-" +
-                "${(calendar.get(Calendar.MONTH) + 1).toString().padStart(2, '0')}-" +
-                "${calendar.get(Calendar.DAY_OF_MONTH).toString().padStart(2, '0')}"
-
-        // 리사이클러뷰 초기화, 변수 선언등 UI 표시 이전에 선행되어야 할 작업 수행
-
-        todoEventAdapter = TodoEventAdapter(emptyList(), { /* 클릭 이벤트 처리 (필요시 추가) */ }, true)
-        binding.eventrecyclerviewto.layoutManager = LinearLayoutManager(requireContext())
-        binding.eventrecyclerviewto.adapter = todoEventAdapter
-
-        profileAdapter = DetailStudyHomeProfileAdapter(
-            ArrayList(),
-            { profileItem ->
-                val memberId = memberIdMap[profileItem]
-                if (memberId != null) {
-                    selectedMemberId = memberId
-                    fetchOtherTodoList(studyId, memberId, selectedDate)
-                }
-            },
-            isTodo = true // ← 여기 true로 넘김
-        )
-
-        binding.fragmentDetailStudyHomeProfileRv.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
-        binding.fragmentDetailStudyHomeProfileRv.adapter = profileAdapter
-
-        //내 투두리스트
-        myTodoAdapter = TodoAdapter(
-            context = requireContext(),
-            todoList = mutableListOf(),
-            onAddTodo = { content ->
-                todoViewModel.addTodoItem(studyId, content, selectedDate)
-            },
-            onCheckTodo = { toDoId ->
-                todoViewModel.checkTodo(studyId, toDoId)
-            },
-            repository = repository, // TodoRepository 전달
-            studyId = studyId // 스터디 ID 전달
-        )
-
-        binding.rvMyTodoList.apply {
-            layoutManager = LinearLayoutManager(requireContext())
-            adapter = myTodoAdapter
-        }
-
-        //다른 스터디원 투두리스트
-        otherTodoAdapter = OtherTodoAdapter(requireContext(), mutableListOf())
-
-        binding.rvOtherTodo.apply {
-            layoutManager = LinearLayoutManager(requireContext())
-            adapter = otherTodoAdapter
-        }
-
-
-        // 최초 투두리스트, 스케쥴 조회
-        todoViewModel.onDateChanged(selectedDate)
-        fetchTodoList(studyId, today.toString().padStart(2, '0'))
-
-        //캘린더 일정 조회 API 최초 호출
-        fetchGetSchedule(studyId, year, month) {
-            eventViewModel.loadEvents(year, month, today)
-
-            // 어댑터와 데코레이터 갱신 추가
-            todoEventAdapter.updateSelectedDate(selectedDate)
-
-            // 어댑터 데이터 갱신
-            todoEventAdapter.updateEvents(eventViewModel.events.value ?: emptyList())
-
-            todoEventAdapter.updateSelectedDate(selectedDate)
-            eventViewModel.events.value?.let { todoEventAdapter.updateEvents(it) }
-
-            val updatedEventDays = getEventDaysForMonth(currentYear, currentMonth)
-            todoDateAdapter.updateEventDays(updatedEventDays)
-
-
-            // ✅ 선택한 날짜에 이벤트가 있는지 확인
-            val hasEvent = todoEventAdapter.hasEventOnDay(today)
-            binding.txScheduledEvent.visibility = if (hasEvent) View.VISIBLE else View.GONE
-        }
-
-
-
-
-        // ✅ 기존 selectedDate 변수를 그대로 사용
-        todoDateAdapter = TodoDateAdapter(daysOfCurrentMonth, today) { newSelectedDate ->
-            selectedDate = formatToDate("$currentYear-${currentMonth.toString().padStart(2, '0')}-${newSelectedDate.toString().padStart(2, '0')}")
-
-            // ✅ 날짜 선택 시 UI 반영
-            todoDateAdapter.updateDates(daysOfCurrentMonth, newSelectedDate)
-
-            // ✅ 선택된 날짜에 대한 API 요청 실행
-            todoViewModel.onDateChanged(selectedDate)
-            fetchTodoList(studyId, newSelectedDate.toString().padStart(2, '0'))
-
-            fetchGetSchedule(studyId, currentYear, currentMonth) {
-                eventViewModel.loadEvents(currentYear, currentMonth, newSelectedDate)
-                todoEventAdapter.updateSelectedDate(selectedDate)
-                eventViewModel.events.value?.let { todoEventAdapter.updateEvents(it) }
-
-                Log.d("checkList", "📦 이벤트 리스트: ${eventViewModel.events.value}")
-
-                val updatedEventDays = getEventDaysForMonth(currentYear, currentMonth)
-                todoDateAdapter.updateEventDays(updatedEventDays)
-
-                val hasEvent = todoEventAdapter.hasEventOnDay(today)
-                binding.txScheduledEvent.visibility = if (hasEvent) View.VISIBLE else View.GONE
-            }
-
-            // ✅ 기존의 otherTodoList 초기화
-            profileAdapter.resetBorder()
-            todoViewModel.clearOtherTodoList()
-            otherTodoAdapter.clearData()
-        }
-
-
-        binding.rvCalendar.adapter = todoDateAdapter
-
-        scrollToTodayPosition()
-
-
-
-        // 내 투두리스트 조회 API
-        todoViewModel.myTodoListResponse.observe(viewLifecycleOwner) { response ->
-            response?.result?.content?.let { todos ->
-                // 받은 데이터가 이전과 동일한 경우 RecyclerView를 갱신하지 않음
-                if (todos != myTodoAdapter.getCurrentData()) {
-                    val reversedTodos = todos.reversed() // 역순으로 정렬
-                    myTodoAdapter.updateData(reversedTodos.toMutableList())
-                }
-            } ?: run {
-                myTodoAdapter.updateData(emptyList<TodoTask>().toMutableList())
-            }
-
-        }
-
-        // 스터디원 투두리스트 조회 API
-        todoViewModel.otherTodoListResponse.observe(viewLifecycleOwner) { response ->
-            response?.result?.content?.let { todos ->
-                Log.d("TodoFramgment_other","${todos}")
-
-                if (todos.isNotEmpty()) {
-                    otherTodoAdapter.updateData(todos.toMutableList())
-                } else {
-                    otherTodoAdapter.updateData(emptyList())
-                }
-            } ?: run {
-                otherTodoAdapter.updateData(emptyList())
-            }
-        }
-
-
-
-        // + 버튼을 통해 내 투두리스트를 추가할 수 있음
-        binding.imgbtnPlusTodolist.setOnClickListener {
-            myTodoAdapter.addTodo(selectedDate)
-            binding.rvMyTodoList.scrollToPosition(myTodoAdapter.itemCount - 1)
-        }
-
-        //스터디원 프로필 조회 API 호출
-        fetchStudyMembers(studyId)
-
-        val eventDays = getEventDaysForMonth(currentYear, currentMonth)
-        todoDateAdapter.updateEventDays(eventDays)
-
-
-
-        return binding.root
-    }
-
-
-    // 내 투두리스트 조회
-    private fun fetchTodoList(studyId: Int, date:String) {
-
-        val calendar = Calendar.getInstance()
-        val formattedDate = formatToDate("${calendar.get(Calendar.YEAR)}-" +
-                "${(calendar.get(Calendar.MONTH) + 1).toString().padStart(2, '0')}-" +
-                date)
-        todoViewModel.fetchTodoList(studyId, page = 0, size = 10, date = formattedDate)
-
-        todoViewModel.myTodoListResponse.observe(viewLifecycleOwner) { response ->
-            response?.result?.content?.let { todos ->
-                // 데이터를 역순으로 정렬
-                val reversedTodos = todos.reversed()
-                myTodoAdapter.updateData(reversedTodos.toMutableList())
-            } ?: run {
-                myTodoAdapter.updateData(emptyList<TodoTask>().toMutableList())
-            }
-        }
-    }
-
-
-    // 스터디원 투두 리스트 조회
-    private fun fetchOtherTodoList(studyId: Int, memberId: Int, date: String) {
-
-        todoViewModel.fetchOtherToDoList(studyId, memberId, page = 0, size = 10, date = date)
-        todoViewModel.otherTodoListResponse.observe(viewLifecycleOwner) { response ->
-            response?.result?.content?.let { todos ->
-                // 데이터를 역순으로 정렬
-                val reversedTodos = todos.reversed()
-                otherTodoAdapter.updateData(reversedTodos.toMutableList())
-            } ?: run {
-                otherTodoAdapter.updateData(emptyList())
-            }
-        }
-    }
-
-
-
-    //날짜 형식 조정
-    private fun formatToDate(date: String): String {
-        val parts = date.split("-")
-        return if (parts.size == 3) {
-            String.format("%04d-%02d-%02d", parts[0].toInt(), parts[1].toInt(), parts[2].toInt())
-        } else {
-            date // 이미 포맷이 맞는 경우 그대로 반환
-        }
-    }
-
-
-    // 캘린더 일정 조회
-    private fun fetchGetSchedule(studyId: Int, year: Int, month: Int, onComplete: () -> Unit) {
-
-        val EventItems = arrayListOf<Event>()
-        val service = RetrofitInstance.retrofit.create(CalendarApiService::class.java)
-
-        service.GetScheuled(
-            studyId = studyId,
-            year = year,
-            month = month,
-        ).enqueue(object : Callback<ScheduleResponse> {
-            override fun onResponse(
-                call: Call<ScheduleResponse>,
-                response: Response<ScheduleResponse>
-            ) {
-                if (response.isSuccessful) {
-                    val apiResponse = response.body()
-
-                    if (apiResponse?.isSuccess == true) {
-                        // EventItems 데이터 로드
-                        apiResponse.result.scheduleList.forEach { schedule ->
-                            val eventItem = Event(
-                                id = schedule.scheduleId,
-                                title = schedule.title,
-                                startYear = schedule.startedAt.substring(0, 4).toInt(),
-                                startMonth = schedule.startedAt.substring(5, 7).toInt(),
-                                startDay = schedule.startedAt.substring(8, 10).toInt(),
-                                startHour = schedule.startedAt.substring(11, 13).toInt(),
-                                startMinute = schedule.startedAt.substring(14, 16).toInt(),
-                                endYear = schedule.finishedAt.substring(0, 4).toInt(),
-                                endMonth = schedule.finishedAt.substring(5, 7).toInt(),
-                                endDay = schedule.finishedAt.substring(8, 10).toInt(),
-                                endHour = schedule.finishedAt.substring(11, 13).toInt(),
-                                endMinute = schedule.finishedAt.substring(14, 16).toInt(),
-                                period = schedule.period,
-                                isAllDay = schedule.isAllDay
-                            )
-                            EventItems.add(eventItem)
-                        }
-                        // ViewModel 및 Adapter에 데이터 업데이트
-                        eventViewModel.updateEvents(EventItems)
-
-                        todoEventAdapter.updateEvents(EventItems)
-
-                        // 콜백 호출
-                        onComplete()
-                    }
-                }
-            }
-
-
-
-            override fun onFailure(call: Call<ScheduleResponse>, t: Throwable) {
-                TODO("Not yet implemented")
-            }
-        })
-    }
-
-    // 스터디 멤버 조회
-    private fun fetchStudyMembers(studyId: Int) {
-        val api = RetrofitInstance.retrofit.create(StudyApiService::class.java)
-
-        val sharedPreferences = requireActivity().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE)
-        val email = sharedPreferences.getString("currentEmail", null)
-        val kakaoNickname = sharedPreferences.getString("${email}_nickname", null)
-
-        api.getStudyMembers(studyId).enqueue(object : Callback<MemberResponse> {
-            override fun onResponse(call: Call<MemberResponse>, response: Response<MemberResponse>) {
-                if (response.isSuccessful) {
-                    response.body()?.let { memberResponse ->
-
-                        val members = memberResponse.result.members
-
-                        // ProfileItem 생성
-                        val profileItems = members.map {
-                            ProfileItem(
-                                profileImage = it.profileImage,
-                                nickname = it.nickname
-                            )
-                        }
-
-                        // ProfileItem과 memberId 매핑
-                        memberIdMap = members.associateBy(
-                            keySelector = { ProfileItem(profileImage = it.profileImage, nickname = it.nickname) },
-                            valueTransform = { it.memberId }
-                        )
-
-                        // RecyclerView 업데이트
-                        profileAdapter.updateList(profileItems)
-
-                        // 닉네임 리스트에서 현재 사용자의 닉네임과 일치하는지 확인
-                        val nicknames = members.map { it.nickname }
-                        val isNicknameFound = kakaoNickname?.let { nicknames.contains(it) } ?: false
-
-                        // maxPeople과 memberCount 값을 가져오기 위해 ViewModel을 옵저빙
-                        val maxPeople = studyViewModel.maxPeople.value
-                        val memberCount = studyViewModel.memberCount.value
-
-                        // 닉네임이 리스트에 있거나, memberCount와 maxPeople이 일치하면 버튼을 숨김
-                        val isMember = isNicknameFound
-                        if (isMember){
-                            binding.imgbtnPlusTodolist.visibility = View.VISIBLE
-                        }else{
-                            binding.imgbtnPlusTodolist.visibility = View.GONE
-                        }
-
-
-
-                        // RecyclerView의 제약 조건 설정
-                        val layoutParams = binding.fragmentDetailStudyHomeProfileRv.layoutParams as ConstraintLayout.LayoutParams
-                        binding.fragmentDetailStudyHomeProfileRv.layoutParams = layoutParams
-                    }
-                } else {
-                    Toast.makeText(requireContext(), "Failed to fetch study members", Toast.LENGTH_SHORT).show()
-                }
-            }
-
-            override fun onFailure(call: Call<MemberResponse>, t: Throwable) {
-                Toast.makeText(requireContext(), "Error: ${t.message}", Toast.LENGTH_SHORT).show()
-            }
-        })
-    }
-
-
-    fun getDaysOfMonthWithPadding(year: Int, month: Int): List<Triple<Int?, Boolean, Boolean>> {
-        val yearMonth = YearMonth.of(year, month)
-        val daysInMonth = yearMonth.lengthOfMonth()
-
-        // 🔹 이번 달 1일의 요일 가져오기 (월요일=1, 일요일=7)
-        val firstDayOfMonth = LocalDate.of(year, month, 1).dayOfWeek.value
-
-        // 🔹 월요일을 기준으로 정렬하기 위해 필요한 빈 칸 개수 계산
-        val startPadding = if (firstDayOfMonth == 1) 0 else firstDayOfMonth - 1
-
-        // 🔹 이전 달 정보 가져오기
-        val previousMonth = if (month == 1) 12 else month - 1
-        val previousYear = if (month == 1) year - 1 else year
-        val previousMonthDays = YearMonth.of(previousYear, previousMonth).lengthOfMonth()
-
-        val daysList = mutableListOf<Triple<Int?, Boolean, Boolean>>() // (날짜, 현재 달 여부, 클릭 가능 여부)
-
-
-        // ✅ 현재 월의 날짜 추가 (정상 처리)
-        for (i in 1..daysInMonth) {
-            daysList.add(Triple(i, true, true)) // 현재 달, 클릭 가능
-        }
-
-        return daysList
-    }
-
-
-
-    fun getTotalWeeksInMonth(year: Int, month: Int): Int {
-        val daysList = getDaysOfMonthWithPadding(year, month)
-        return (daysList.size + 6) / 7 // 7일씩 나누고 올림 처리
-    }
-
-    // ✅ 오늘 날짜를 RecyclerView 중앙에 정렬하는 함수
-    private fun scrollToTodayPosition() {
-        val today = Calendar.getInstance().get(Calendar.DAY_OF_MONTH) // 오늘 날짜 가져오기
-        val todayPosition = todoDateAdapter.getPositionForDate(today) // 오늘 날짜의 위치 찾기
-
-        if (todayPosition != -1) {
-            binding.rvCalendar.viewTreeObserver.addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener {
-                override fun onGlobalLayout() {
-                    binding.rvCalendar.viewTreeObserver.removeOnGlobalLayoutListener(this)
-
-                    val childView = binding.rvCalendar.getChildAt(0)
-                    val offset = binding.rvCalendar.width / 2 - (childView?.width ?: 0) / 2
-                    (binding.rvCalendar.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(todayPosition, offset)
-                }
-            })
-        }
-    }
-
-    fun getEventDaysForMonth(year: Int, month: Int): Set<Int> {
-        val days = mutableSetOf<Int>()
-
-        // ✅ ViewModel의 이벤트 전체 날짜에서 현재 월에 해당하는 것만 필터링
-        val allEventDays = eventViewModel.getEventDates()
-
-        allEventDays.forEach { calendarDay ->
-            if (calendarDay.year == year && calendarDay.month == month) {
-                days.add(calendarDay.day)
-            }
-        }
-
-        Log.d("eventDaySet", "📅 ${year}년 ${month}월 기준 파란 점 찍힐 날짜들: $days")
-        return days
-    }
-
-
-
-}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/util/ApiKey.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/util/ApiKey.kt
deleted file mode 100644
index 51d11d94..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/util/ApiKey.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.example.spoteam_android.util
-
-class ApiKey {
-    companion object{
-        const val API_KEY = "FvYRzkfj%2B6KF9%2BCJT9ic2wJkmTwSS9xG9XVtwxMbqVEEu6z%2FR4gzSWKeIJgEXjLQhuIyc3v5bDbsz3wfDz%2FX7Q%3D%3D"
-    }
-}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/Constants.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/Constants.kt
deleted file mode 100644
index aa2fc829..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/Constants.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.example.spoteam_android.weather
-
-class Constants {
-
-    companion object{
-        const val BASE_URL = "http://apis.data.go.kr/1360000/VilageFcstInfoService_2.0/"
-        const val TAG = "tst5"
-    }
-}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/Weather.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/Weather.kt
deleted file mode 100644
index 4087bd51..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/Weather.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.example.spoteam_android.weather
-
-data class Weather(
-    val response: Response
-) {
-
-    data class Response(
-        val header: Header,
-        val body: Body
-    )
-
-    data class Header(
-        val resultCode: Int,
-        val resultMsg: String
-    )
-
-    data class Body(
-        val dataType: String,
-        val items: Items
-    )
-
-    data class Items(
-        val item: List<Item>
-    )
-
-    data class Item(
-        val baseData: Int,
-        val baseTime: Int,
-        val category: String,
-        val fcstDate : Int,
-        val fcstTime : Int,
-        val fcstValue : String,
-        val nx : Int,
-        val ny : Int
-    )
-}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/WeatherApi.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/WeatherApi.kt
deleted file mode 100644
index 1ba8a958..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/WeatherApi.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.example.spoteam_android.weather
-
-import com.example.spoteam_android.util.ApiKey.Companion.API_KEY
-import retrofit2.Response
-import retrofit2.http.GET
-import retrofit2.http.Query
-
-interface WeatherApi {
-
-    @GET("getVilageFcst?serviceKey=$API_KEY")
-    suspend fun getWeather(
-        @Query("dataType") dataType : String,
-        @Query("numOfRows") numOfRows : Int,
-        @Query("pageNo") pageNo : Int,
-        @Query("base_date") baseDate : Int,
-        @Query("base_time") baseTime : String,
-        @Query("nx") nx : String,
-        @Query("ny") ny : String
-    ) : Response<Weather>
-}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/WeatherRepository.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/WeatherRepository.kt
deleted file mode 100644
index b3629dc8..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/WeatherRepository.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.example.spoteam_android.weather
-
-import retrofit2.Response
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class WeatherRepository @Inject constructor(
-    private val weatherApi: WeatherApi
-) {
-
-    suspend fun getWeather(
-        dataType : String, numOfRows : Int, pageNo : Int,
-        baseDate : Int, baseTime : String, nx : String, ny : String) : Response<Weather> {
-        return weatherApi.getWeather(dataType,numOfRows,pageNo,baseDate,baseTime,nx,ny)
-    }
-}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/WeatherViewModel.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/WeatherViewModel.kt
deleted file mode 100644
index 2c984e75..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/WeatherViewModel.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.example.spoteam_android.weather
-
-import android.util.Log
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.launch
-import retrofit2.Response
-import javax.inject.Inject
-
-@HiltViewModel
-class WeatherViewModel @Inject constructor(
-    private val repository: WeatherRepository
-) : ViewModel() {
-
-    private val _weatherResponse : MutableLiveData<Response<Weather>> = MutableLiveData()
-    val weatherResponse get() = _weatherResponse
-
-    //인자 값을 기준으로 repository의 getWeather 메소드를 실행
-    fun getWeather(
-        dataType: String, numOfRows: Int, pageNo: Int,
-        baseDate: Int, baseTime: String, nx: String, ny: String
-    ) {
-        viewModelScope.launch {
-            try {
-                val response =
-                    repository.getWeather(dataType, numOfRows, pageNo, baseDate, baseTime, nx, ny)
-                _weatherResponse.value = response
-                Log.d("WeatherResponse", "Response received: $response")
-            } catch (e: Exception) {
-                Log.e("WeatherError", "Failed to fetch weather data", e)
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/parseCsv.kt b/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/parseCsv.kt
deleted file mode 100644
index 11467554..00000000
--- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/parseCsv.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.example.spoteam_android.weather
-
-import android.content.Context
-import com.example.spoteam_android.R
-import com.example.spoteam_android.RegionData
-import java.io.BufferedReader
-import java.io.InputStreamReader
-
-fun parseCsv(context: Context): List<RegionData> {
-    val regionDataList = mutableListOf<RegionData>()
-
-    val assetManager = context.assets
-    val inputStream = assetManager.open("weather_region_data.csv") // 파일 경로 지정
-    val reader = BufferedReader(InputStreamReader(inputStream))
-
-    reader.useLines { lines ->
-        lines.drop(1).forEach { line -> // 첫 줄(헤더) 생략
-            val tokens = line.split(",")
-            if (tokens.size >= 15) {
-                val data = RegionData(
-                    category = tokens[0],
-                    administrativeCode = tokens[1],
-                    level1 = tokens[2].takeIf { it.isNotEmpty() },
-                    level2 = tokens[3].takeIf { it.isNotEmpty() },
-                    level3 = tokens[4].takeIf { it.isNotEmpty() },
-                    gridX = tokens[5].toInt(),
-                    gridY = tokens[6].toInt(),
-                    longitudeHour = tokens[7].toInt(),
-                    longitudeMinute = tokens[8].toInt(),
-                    longitudeSecond = tokens[9].toDouble(),
-                    latitudeHour = tokens[10].toInt(),
-                    latitudeMinute = tokens[11].toInt(),
-                    latitudeSecond = tokens[12].toDouble(),
-                    longitudeSecond100 = tokens[13].toDouble(),
-                    latitudeSecond100 = tokens[14].toDouble(),
-                    locationUpdate = tokens.getOrNull(15)?.takeIf { it.isNotEmpty() }
-                )
-                regionDataList.add(data)
-            }
-        }
-    }
-
-    return regionDataList
-}
diff --git a/SPOTeam_android/app/src/main/res/layout/activity_cell_phone_login.xml b/SPOTeam_android/app/src/main/res/layout/activity_cell_phone_login.xml
deleted file mode 100644
index aee3f111..00000000
--- a/SPOTeam_android/app/src/main/res/layout/activity_cell_phone_login.xml
+++ /dev/null
@@ -1,360 +0,0 @@
-<?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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
-
-
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/activity_startlogin_tb"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="20dp"
-        app:navigationIcon="@drawable/ic_arrow">
-
-        <TextView
-            android:id="@+id/activity_startlogin_tbtitle_tv"
-            android:text="휴대폰 본인확인"
-            android:textSize="17sp"
-            android:textStyle="bold"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"/>
-    </androidx.appcompat.widget.Toolbar>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2dp"
-        android:background="#D8D8D8"
-        app:layout_constraintTop_toBottomOf="@id/activity_startlogin_tb"/>
-
-
-
-    <TextView
-        android:id="@+id/authentication_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="15dp"
-        android:layout_marginTop="20dp"
-        android:text="안전한 서비스를 위해 전화번호를 인증해주세요"
-        android:textColor="#2D2D2D"
-        android:textSize="16sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/activity_startlogin_tb" />
-
-    <LinearLayout
-        android:id="@+id/activity_startlogin_id_text_input_ll"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/authentication_tv"
-        android:orientation="horizontal">
-
-        <EditText
-            android:id="@+id/activity_startlogin_id_text_input_et"
-            android:hint="이름"
-            android:maxLines="1"
-            android:inputType="text"
-            android:padding="10dp"
-            android:textSize="15sp"
-            android:background="@drawable/edittext_rounded_corner_rectangle"
-            android:layout_width="260dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:layout_marginStart="15dp"
-            app:layout_constraintStart_toStartOf="parent">
-
-        </EditText>
-        <Spinner
-            android:id="@+id/activity_startlogin_nationality_sp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_marginTop="10dp"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:background="@drawable/bg_spinner_foreigner"/>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/birth_text_input_ll"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/activity_startlogin_id_text_input_ll"
-        android:orientation="horizontal">
-
-        <EditText
-            android:id="@+id/activity_birth_text_input_et"
-            android:hint="생년월일 (YYYYMMDD)"
-            android:maxLines="1"
-            android:inputType="number"
-            android:padding="10dp"
-            android:textSize="15sp"
-            android:background="@drawable/edittext_rounded_corner_rectangle"
-            android:layout_width="260dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:layout_marginStart="15dp"
-            app:layout_constraintStart_toStartOf="parent">
-
-        </EditText>
-        <Spinner
-            android:id="@+id/activity_startlogin_mf_sp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_marginTop="10dp"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:background="@drawable/bg_spinner_foreigner"/>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/activity_startlogin_agency_ll"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/birth_text_input_ll"
-        android:orientation="horizontal">
-
-        <Spinner
-            android:id="@+id/activity_startlogin_agency_sp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_marginTop="10dp"
-            android:layout_marginStart="15dp"
-            android:layout_marginEnd="10dp"
-            android:background="@drawable/bg_spinner_foreigner"/>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/activity_startlogin_phonenumber_num_input_ll"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/activity_startlogin_agency_ll"
-        android:orientation="horizontal">
-
-        <EditText
-            android:id="@+id/activity_startlogin_phonenumber_num_input_et"
-            android:hint="-없이 입력"
-            android:maxLines="1"
-            android:inputType="number"
-            android:padding="10dp"
-            android:textSize="15sp"
-            android:background="@drawable/edittext_rounded_corner_rectangle"
-            android:layout_width="260dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:layout_marginStart="15dp"
-            app:layout_constraintStart_toStartOf="parent">
-
-        </EditText>
-
-        <android.widget.Button
-            android:id="@+id/activity_startlogin_authentication_bt"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="인증번호 요청"
-            android:maxLines="1"
-            android:minHeight="0dp"
-            android:minWidth="0dp"
-            android:paddingTop="10dp"
-            android:paddingBottom="10dp"
-            android:textSize="13sp"
-            android:textColor="#186AFF"
-            android:background="@drawable/certification_number"
-            android:layout_marginTop="10dp"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginBottom="10dp"/>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/activity_startlogin_certificationnumber_num_input_ll"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/activity_startlogin_phonenumber_num_input_ll"
-        android:visibility="gone"
-        android:orientation="horizontal">
-
-        <EditText
-            android:id="@+id/activity_startlogin_certificationnumber_num_input_et"
-            android:hint="문자로 전송된 4자리 입력"
-            android:maxLines="1"
-            android:inputType="number"
-            android:padding="10dp"
-            android:textSize="15sp"
-            android:background="@drawable/edittext_rounded_corner_rectangle"
-            android:layout_width="260dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:layout_marginStart="15dp"
-            app:layout_constraintStart_toStartOf="parent">
-
-        </EditText>
-
-        <android.widget.Button
-            android:id="@+id/activity_startlogin_uthentication_result_bt"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="인증번호 확인"
-            android:maxLines="1"
-            android:minHeight="0dp"
-            android:minWidth="0dp"
-            android:paddingTop="10dp"
-            android:paddingBottom="10dp"
-            android:textSize="13sp"
-            android:textColor="#186AFF"
-            android:background="@drawable/certification_number"
-            android:layout_marginTop="10dp"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginBottom="10dp"/>
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/activity_startlogin_check_certification_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="인증번호를 다시 확인해주세요."
-        android:visibility="gone"
-        android:textSize="13sp"
-        android:textColor="#F46258"
-        android:layout_marginTop="10dp"
-        android:layout_marginStart="15dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/activity_startlogin_certificationnumber_num_input_ll"/>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="15dp"
-        android:background="#F8F8F8"
-        android:layout_marginBottom="20dp"
-        app:layout_constraintBottom_toTopOf="@id/activity_startlogin_circle_tv"/>
-
-    <TextView
-        android:id="@+id/activity_startlogin_circle_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="약관 동의"
-        android:textColor="@color/black"
-        android:textSize="17sp"
-        android:layout_marginStart="10dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/activity_startlogin_check_box1_ll"
-        android:layout_marginBottom="10dp"/>
-
-
-
-    <RelativeLayout
-        android:id="@+id/activity_startlogin_check_box1_ll"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        android:layout_marginBottom="10dp"
-        android:background="@drawable/edittext_rounded_corner_rectangle"
-        app:layout_constraintBottom_toTopOf="@id/activity_startlogin_check_box2_ll">
-
-        <CheckBox
-            android:id="@+id/activity_startlogin_check_box1"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:button="@null"
-            android:layout_margin="7dp"
-            android:background="@drawable/custom_checkbox"
-            android:layout_alignParentStart="true"
-            android:layout_centerVertical="true"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="개인정보 이용 및 활용 동의"
-            android:textColor="@color/black"
-            android:layout_toEndOf="@id/activity_startlogin_check_box1"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="7dp"
-            android:layout_marginEnd="7dp"/>
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_arrow_down"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:layout_marginEnd="7dp"/>
-
-    </RelativeLayout>
-
-
-    <RelativeLayout
-        android:id="@+id/activity_startlogin_check_box2_ll"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        android:background="@drawable/edittext_rounded_corner_rectangle"
-        android:layout_marginBottom="80dp"
-        app:layout_constraintBottom_toTopOf="@id/activity_startlogin_loginwithspot_next_bt">
-
-        <CheckBox
-            android:id="@+id/activity_startlogin_check_box2"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:button="@null"
-            android:layout_margin="7dp"
-            android:background="@drawable/custom_checkbox"
-            android:layout_alignParentStart="true"
-            android:layout_centerVertical="true"/>
-
-        <TextView
-            android:id="@+id/activity_startlogin_text_view_checkbox2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="고유식별정보 처리동의"
-            android:textColor="@color/black"
-            android:layout_toEndOf="@id/activity_startlogin_check_box2"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="7dp"
-            android:layout_marginEnd="7dp"/>
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_arrow_down"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:layout_marginEnd="7dp"/>
-
-    </RelativeLayout>
-
-
-
-
-    <android.widget.Button
-        android:id="@+id/activity_startlogin_loginwithspot_next_bt"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="15dp"
-        android:layout_marginEnd="15dp"
-        android:layout_marginBottom="10dp"
-        android:background="@drawable/button_background"
-        android:enabled="false"
-        android:text="다음"
-        android:textColor="@drawable/button_textcolor"
-        android:textSize="17sp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/SPOTeam_android/app/src/main/res/layout/activity_check_list_location.xml b/SPOTeam_android/app/src/main/res/layout/activity_check_list_location.xml
index 730aaec1..51f7223f 100644
--- a/SPOTeam_android/app/src/main/res/layout/activity_check_list_location.xml
+++ b/SPOTeam_android/app/src/main/res/layout/activity_check_list_location.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".checklist.CheckListLocationActivity">
+    tools:context=".presentation.login.checklist.CheckListLocationActivity">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/activity_checklist_location_tb"
diff --git a/SPOTeam_android/app/src/main/res/layout/activity_nic_name.xml b/SPOTeam_android/app/src/main/res/layout/activity_nick_name.xml
similarity index 100%
rename from SPOTeam_android/app/src/main/res/layout/activity_nic_name.xml
rename to SPOTeam_android/app/src/main/res/layout/activity_nick_name.xml
diff --git a/SPOTeam_android/app/src/main/res/layout/fragment_community_home.xml b/SPOTeam_android/app/src/main/res/layout/fragment_community_home.xml
index 1cc012e0..6a88a071 100644
--- a/SPOTeam_android/app/src/main/res/layout/fragment_community_home.xml
+++ b/SPOTeam_android/app/src/main/res/layout/fragment_community_home.xml
@@ -8,7 +8,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:context=".ui.home.HomeFragment">
+        tools:context=".presentation.home.HomeFragment">
 
         <LinearLayout
             android:id="@+id/fragment_community_logo_ll"
diff --git a/SPOTeam_android/app/src/main/res/layout/fragment_home.xml b/SPOTeam_android/app/src/main/res/layout/fragment_home.xml
index 5777eab0..05708237 100644
--- a/SPOTeam_android/app/src/main/res/layout/fragment_home.xml
+++ b/SPOTeam_android/app/src/main/res/layout/fragment_home.xml
@@ -1,18 +1,424 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView 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:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:fillViewport="true"
+    android:scrollbars="none">
 
-    <TextView
-        android:id="@+id/communityHome_title_tv"
-        android:layout_width="wrap_content"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/main"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
-        android:text="HOME"
-        android:textSize="40dp"
-        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
+        android:orientation="vertical"
+        android:nestedScrollingEnabled="true"
+        tools:context=".MainActivity">
+
+        <LinearLayout
+            android:id="@+id/fragment_house_logo_ll"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="30dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp">
+
+            <ImageView
+                android:id="@+id/ic_spot_logo"
+                android:layout_width="38dp"
+                android:layout_height="38dp"
+                android:src="@drawable/new_logo" />
+
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1"/>
+
+            <ImageView
+                android:id="@+id/ic_find"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:src="@drawable/activity_main_ic_find" />
+
+            <ImageView
+                android:id="@+id/ic_alarm"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:src="@drawable/activity_main_ic_alaram" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/fragment_house_weather_ll"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/fragment_house_logo_ll">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+
+                <ImageView
+                    android:id="@+id/ic_weather_background"
+                    android:layout_width="190dp"
+                    android:layout_height="100dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/ic_weather_background"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_bias="0.0" />
+
+                <ImageView
+                    android:id="@+id/ic_sun"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:layout_marginStart="24dp"
+                    android:layout_marginTop="20dp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/tx_temperature"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="15dp"
+                    android:fontFamily="@font/suit_semi_bold"
+                    android:textColor="@color/white"
+                    android:textSize="26dp"
+                    app:layout_constraintBottom_toBottomOf="@+id/ic_sun"
+                    app:layout_constraintStart_toEndOf="@+id/ic_sun"
+                    app:layout_constraintTop_toTopOf="@+id/ic_sun" />
+
+                <TextView
+                    android:id="@+id/tx_explain_weather"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginBottom="15dp"
+                    android:fontFamily="@font/suit_semi_bold"
+                    android:textColor="@color/white"
+                    android:textSize="14dp"
+                    app:layout_constraintBottom_toBottomOf="@+id/ic_weather_background"
+                    app:layout_constraintStart_toStartOf="@+id/ic_weather_background" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1"/>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/house_hotissue_cl"
+                android:layout_width="180dp"
+                android:layout_height="100dp"
+                android:background="@color/white"
+                android:paddingTop="10dp"
+                android:paddingBottom="16dp"
+                android:paddingStart="12dp">
+
+                <TextView
+                    android:id="@+id/live_popular_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
+                    android:fontFamily="@font/suit_bold"
+                    android:text="실시간 인기글"
+                    android:textColor="@color/black"
+                    android:textSize="16dp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <ImageView
+                    android:id="@+id/ic_fire"
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
+                    android:layout_marginStart="2dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/ic_fire"
+                    app:layout_constraintBottom_toBottomOf="@+id/live_popular_tv"
+                    app:layout_constraintStart_toEndOf="@+id/live_popular_tv"
+                    app:layout_constraintTop_toTopOf="@+id/live_popular_tv" />
+
+                <TextView
+                    android:id="@+id/popular_content_tv"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:textColor="@color/g400"
+                    android:fontFamily="@font/suit_variable"
+                    android:textFontWeight="600"
+                    android:textSize="14dp"
+                    app:layout_constraintEnd_toStartOf="@id/go_popular_content_iv"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/live_popular_tv" />
+
+                <ImageView
+                    android:id="@+id/go_popular_content_iv"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_marginStart="20dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/fragment_mypage_ic_arrow"
+                    app:layout_constraintBottom_toBottomOf="@+id/popular_content_tv"
+                    app:layout_constraintStart_toEndOf="@+id/ic_fire"
+                    app:layout_constraintTop_toTopOf="@id/popular_content_tv" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </LinearLayout>
+
+
+
+        <LinearLayout
+            android:id="@+id/house_fragment_ll"
+            android:layout_width="match_parent"
+            android:layout_height="80dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="20dp"
+            android:layout_marginStart="20dp"
+            android:orientation="horizontal"
+            android:weightSum="4"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/fragment_house_weather_ll">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/house_location_cl"
+                android:layout_width="80dp"
+                android:layout_height="80dp"
+                android:layout_weight="1"
+                android:layout_marginEnd="8dp">
+
+                <ImageView
+                    android:id="@+id/house_location_iv"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:src="@drawable/house_location"
+                    android:layout_marginTop="12dp"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:fontFamily="@font/suit_semi_bold"
+                    android:text="내 지역"
+                    android:textSize="12dp"
+                    android:textColor="@color/black"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/house_location_iv" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/house_interest_cl"
+                android:layout_width="80dp"
+                android:layout_height="match_parent"
+                android:layout_marginEnd="8dp"
+                android:layout_weight="1">
+
+                <ImageView
+                    android:id="@+id/house_interest_iv"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:layout_marginTop="12dp"
+                    android:src="@drawable/house_interest"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:fontFamily="@font/suit_semi_bold"
+                    android:text="내 관심사"
+                    android:textSize="12dp"
+                    android:textColor="@color/black"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/house_interest_iv" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/house_recruit_cl"
+                android:layout_width="80dp"
+                android:layout_height="80dp"
+                android:layout_weight="1"
+                android:layout_marginEnd="8dp">
+
+                <ImageView
+                    android:id="@+id/house_recruit_iv"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:src="@drawable/house_recruit"
+                    android:layout_marginTop="12dp"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:fontFamily="@font/suit_semi_bold"
+                    android:text="모집중"
+                    android:textSize="12dp"
+                    android:textColor="@color/black"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/house_recruit_iv" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/house_community_cl"
+                android:layout_width="80dp"
+                android:layout_height="80dp"
+                android:layout_weight="1"
+                android:layout_marginEnd="8dp">
+
+                <ImageView
+                    android:id="@+id/house_community_iv"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:src="@drawable/house_community"
+                    android:layout_marginTop="12dp"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:fontFamily="@font/suit_semi_bold"
+                    android:text="게시판"
+                    android:textSize="12dp"
+                    android:textColor="@color/black"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/house_community_iv" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:id="@+id/fragment_house_interest_ll"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:layout_marginTop="40dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/house_fragment_ll">
+
+
+            <TextView
+                android:id="@+id/tx_interest_study"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/suit_bold"
+                android:text="지금 가장 인기 있는 스터디"
+                android:textColor="@color/black"
+                android:textSize="18dp"
+                android:textStyle="bold" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1"/>
+
+
+            <ImageView
+                android:id="@+id/ic_go_interest"
+                android:layout_width="25dp"
+                android:layout_height="match_parent"
+                android:padding="3dp"
+                android:src="@drawable/fragment_mypage_ic_arrow" />
+
+
+        </LinearLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_board"
+            android:elevation="0dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="15dp"
+            android:overScrollMode="never"
+            android:nestedScrollingEnabled="false"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/fragment_house_interest_ll"
+            tools:listitem="@layout/item_recycler_view" />
+
+        <TextView
+            android:id="@+id/tx_recommendation_study"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="40dp"
+            android:fontFamily="@font/suit_bold"
+            android:text="당신을 기다리는 추천 스터디"
+            android:textColor="@color/black"
+            android:textSize="18dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/rv_board" />
+
+        <ImageView
+            android:id="@+id/ic_recommendation_refresh"
+            android:layout_width="22dp"
+            android:layout_height="22dp"
+            android:src="@drawable/ic_recommendation_refresh"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:layout_marginEnd="20dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tx_recommendation_study"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/tx_recommendation_study" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_board2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="15dp"
+            android:overScrollMode="never"
+            android:nestedScrollingEnabled="false"
+            android:paddingBottom="20dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tx_recommendation_study"
+            tools:listitem="@layout/item_recycler_view"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.core.widget.NestedScrollView>
diff --git a/SPOTeam_android/app/src/main/res/layout/fragment_house.xml b/SPOTeam_android/app/src/main/res/layout/fragment_house.xml
deleted file mode 100644
index 05708237..00000000
--- a/SPOTeam_android/app/src/main/res/layout/fragment_house.xml
+++ /dev/null
@@ -1,424 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView 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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:fillViewport="true"
-    android:scrollbars="none">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/main"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:nestedScrollingEnabled="true"
-        tools:context=".MainActivity">
-
-        <LinearLayout
-            android:id="@+id/fragment_house_logo_ll"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginTop="30dp"
-            android:layout_marginStart="20dp"
-            android:layout_marginEnd="20dp">
-
-            <ImageView
-                android:id="@+id/ic_spot_logo"
-                android:layout_width="38dp"
-                android:layout_height="38dp"
-                android:src="@drawable/new_logo" />
-
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_weight="1"/>
-
-            <ImageView
-                android:id="@+id/ic_find"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:src="@drawable/activity_main_ic_find" />
-
-            <ImageView
-                android:id="@+id/ic_alarm"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:src="@drawable/activity_main_ic_alaram" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/fragment_house_weather_ll"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_marginStart="20dp"
-            android:layout_marginEnd="20dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/fragment_house_logo_ll">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
-
-                <ImageView
-                    android:id="@+id/ic_weather_background"
-                    android:layout_width="190dp"
-                    android:layout_height="100dp"
-                    android:scaleType="fitCenter"
-                    android:src="@drawable/ic_weather_background"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_bias="0.0" />
-
-                <ImageView
-                    android:id="@+id/ic_sun"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_marginStart="24dp"
-                    android:layout_marginTop="20dp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/tx_temperature"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="15dp"
-                    android:fontFamily="@font/suit_semi_bold"
-                    android:textColor="@color/white"
-                    android:textSize="26dp"
-                    app:layout_constraintBottom_toBottomOf="@+id/ic_sun"
-                    app:layout_constraintStart_toEndOf="@+id/ic_sun"
-                    app:layout_constraintTop_toTopOf="@+id/ic_sun" />
-
-                <TextView
-                    android:id="@+id/tx_explain_weather"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:layout_marginBottom="15dp"
-                    android:fontFamily="@font/suit_semi_bold"
-                    android:textColor="@color/white"
-                    android:textSize="14dp"
-                    app:layout_constraintBottom_toBottomOf="@+id/ic_weather_background"
-                    app:layout_constraintStart_toStartOf="@+id/ic_weather_background" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_weight="1"/>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/house_hotissue_cl"
-                android:layout_width="180dp"
-                android:layout_height="100dp"
-                android:background="@color/white"
-                android:paddingTop="10dp"
-                android:paddingBottom="16dp"
-                android:paddingStart="12dp">
-
-                <TextView
-                    android:id="@+id/live_popular_tv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="20dp"
-                    android:fontFamily="@font/suit_bold"
-                    android:text="실시간 인기글"
-                    android:textColor="@color/black"
-                    android:textSize="16dp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <ImageView
-                    android:id="@+id/ic_fire"
-                    android:layout_width="25dp"
-                    android:layout_height="25dp"
-                    android:layout_marginStart="2dp"
-                    android:scaleType="fitCenter"
-                    android:src="@drawable/ic_fire"
-                    app:layout_constraintBottom_toBottomOf="@+id/live_popular_tv"
-                    app:layout_constraintStart_toEndOf="@+id/live_popular_tv"
-                    app:layout_constraintTop_toTopOf="@+id/live_popular_tv" />
-
-                <TextView
-                    android:id="@+id/popular_content_tv"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="2dp"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:textColor="@color/g400"
-                    android:fontFamily="@font/suit_variable"
-                    android:textFontWeight="600"
-                    android:textSize="14dp"
-                    app:layout_constraintEnd_toStartOf="@id/go_popular_content_iv"
-                    app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/live_popular_tv" />
-
-                <ImageView
-                    android:id="@+id/go_popular_content_iv"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_marginStart="20dp"
-                    android:scaleType="fitCenter"
-                    android:src="@drawable/fragment_mypage_ic_arrow"
-                    app:layout_constraintBottom_toBottomOf="@+id/popular_content_tv"
-                    app:layout_constraintStart_toEndOf="@+id/ic_fire"
-                    app:layout_constraintTop_toTopOf="@id/popular_content_tv" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-        </LinearLayout>
-
-
-
-        <LinearLayout
-            android:id="@+id/house_fragment_ll"
-            android:layout_width="match_parent"
-            android:layout_height="80dp"
-            android:layout_marginTop="20dp"
-            android:layout_marginEnd="20dp"
-            android:layout_marginStart="20dp"
-            android:orientation="horizontal"
-            android:weightSum="4"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/fragment_house_weather_ll">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/house_location_cl"
-                android:layout_width="80dp"
-                android:layout_height="80dp"
-                android:layout_weight="1"
-                android:layout_marginEnd="8dp">
-
-                <ImageView
-                    android:id="@+id/house_location_iv"
-                    android:layout_width="35dp"
-                    android:layout_height="35dp"
-                    android:src="@drawable/house_location"
-                    android:layout_marginTop="12dp"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"/>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:fontFamily="@font/suit_semi_bold"
-                    android:text="내 지역"
-                    android:textSize="12dp"
-                    android:textColor="@color/black"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/house_location_iv" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/house_interest_cl"
-                android:layout_width="80dp"
-                android:layout_height="match_parent"
-                android:layout_marginEnd="8dp"
-                android:layout_weight="1">
-
-                <ImageView
-                    android:id="@+id/house_interest_iv"
-                    android:layout_width="35dp"
-                    android:layout_height="35dp"
-                    android:layout_marginTop="12dp"
-                    android:src="@drawable/house_interest"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:fontFamily="@font/suit_semi_bold"
-                    android:text="내 관심사"
-                    android:textSize="12dp"
-                    android:textColor="@color/black"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/house_interest_iv" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/house_recruit_cl"
-                android:layout_width="80dp"
-                android:layout_height="80dp"
-                android:layout_weight="1"
-                android:layout_marginEnd="8dp">
-
-                <ImageView
-                    android:id="@+id/house_recruit_iv"
-                    android:layout_width="35dp"
-                    android:layout_height="35dp"
-                    android:src="@drawable/house_recruit"
-                    android:layout_marginTop="12dp"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"/>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:fontFamily="@font/suit_semi_bold"
-                    android:text="모집중"
-                    android:textSize="12dp"
-                    android:textColor="@color/black"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/house_recruit_iv" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/house_community_cl"
-                android:layout_width="80dp"
-                android:layout_height="80dp"
-                android:layout_weight="1"
-                android:layout_marginEnd="8dp">
-
-                <ImageView
-                    android:id="@+id/house_community_iv"
-                    android:layout_width="35dp"
-                    android:layout_height="35dp"
-                    android:src="@drawable/house_community"
-                    android:layout_marginTop="12dp"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"/>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:fontFamily="@font/suit_semi_bold"
-                    android:text="게시판"
-                    android:textSize="12dp"
-                    android:textColor="@color/black"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/house_community_iv" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:id="@+id/fragment_house_interest_ll"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:layout_marginEnd="20dp"
-            android:layout_marginTop="40dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/house_fragment_ll">
-
-
-            <TextView
-                android:id="@+id/tx_interest_study"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="@font/suit_bold"
-                android:text="지금 가장 인기 있는 스터디"
-                android:textColor="@color/black"
-                android:textSize="18dp"
-                android:textStyle="bold" />
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_weight="1"/>
-
-
-            <ImageView
-                android:id="@+id/ic_go_interest"
-                android:layout_width="25dp"
-                android:layout_height="match_parent"
-                android:padding="3dp"
-                android:src="@drawable/fragment_mypage_ic_arrow" />
-
-
-        </LinearLayout>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rv_board"
-            android:elevation="0dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="15dp"
-            android:overScrollMode="never"
-            android:nestedScrollingEnabled="false"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/fragment_house_interest_ll"
-            tools:listitem="@layout/item_recycler_view" />
-
-        <TextView
-            android:id="@+id/tx_recommendation_study"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="40dp"
-            android:fontFamily="@font/suit_bold"
-            android:text="당신을 기다리는 추천 스터디"
-            android:textColor="@color/black"
-            android:textSize="18dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/rv_board" />
-
-        <ImageView
-            android:id="@+id/ic_recommendation_refresh"
-            android:layout_width="22dp"
-            android:layout_height="22dp"
-            android:src="@drawable/ic_recommendation_refresh"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:layout_marginEnd="20dp"
-            app:layout_constraintBottom_toBottomOf="@+id/tx_recommendation_study"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/tx_recommendation_study" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rv_board2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="15dp"
-            android:overScrollMode="never"
-            android:nestedScrollingEnabled="false"
-            android:paddingBottom="20dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tx_recommendation_study"
-            tools:listitem="@layout/item_recycler_view"/>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.core.widget.NestedScrollView>
diff --git a/SPOTeam_android/app/src/main/res/layout/fragment_study.xml b/SPOTeam_android/app/src/main/res/layout/fragment_study.xml
index e5aa8448..40d69ed0 100644
--- a/SPOTeam_android/app/src/main/res/layout/fragment_study.xml
+++ b/SPOTeam_android/app/src/main/res/layout/fragment_study.xml
@@ -58,6 +58,102 @@
         tools:itemCount="5"
         app:layout_constraintTop_toBottomOf="@id/fragment_study_ll"
         tools:listitem="@layout/item_recycler_view"/>
+    <LinearLayout
+        android:id="@+id/page_number_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="20dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:gravity="center">
+
+        <TextView
+            android:id="@+id/previous_page"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="〈"
+            android:textSize="16dp"
+            android:fontFamily="@font/suit_bold"
+            android:textColor="@color/b500"
+            android:layout_marginEnd="10dp"
+            android:padding="10dp"
+            android:visibility="visible"/>
+
+        <TextView
+            android:id="@+id/page_1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="1"
+            android:textSize="14dp"
+            android:textColor="@color/black"
+            android:fontFamily="@font/suit_semi_bold"
+            android:padding="10dp"
+            android:layout_marginEnd="5dp"
+            android:visibility="visible"/>
+
+        <TextView
+            android:id="@+id/page_2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="2"
+            android:textSize="14dp"
+            android:textColor="@color/black"
+            android:fontFamily="@font/suit_semi_bold"
+            android:padding="10dp"
+            android:layout_marginEnd="5dp"
+            android:visibility="visible"/>
+
+        <TextView
+            android:id="@+id/page_3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="3"
+            android:textSize="14dp"
+            android:textColor="@color/black"
+            android:fontFamily="@font/suit_semi_bold"
+            android:padding="10dp"
+            android:layout_marginEnd="5dp"
+            android:visibility="visible"/>
+
+        <TextView
+            android:id="@+id/page_4"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="4"
+            android:textSize="14dp"
+            android:textColor="@color/black"
+            android:fontFamily="@font/suit_semi_bold"
+            android:padding="10dp"
+            android:layout_marginEnd="5dp"
+            android:visibility="visible"/>
+
+        <TextView
+            android:id="@+id/page_5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="5"
+            android:textSize="14dp"
+            android:textColor="@color/black"
+            android:fontFamily="@font/suit_semi_bold"
+            android:padding="10dp"
+            android:layout_marginEnd="10dp"
+            android:visibility="visible"/>
+
+        <TextView
+            android:id="@+id/next_page"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="〉"
+            android:textSize="16dp"
+            android:fontFamily="@font/suit_bold"
+            android:textColor="@color/b500"
+            android:padding="10dp"
+            android:visibility="visible"/>
+    </LinearLayout>
+
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/SPOTeam_android/app/src/main/res/navigation/main_navigation.xml b/SPOTeam_android/app/src/main/res/navigation/main_navigation.xml
index 158c1d25..e70f1ec2 100644
--- a/SPOTeam_android/app/src/main/res/navigation/main_navigation.xml
+++ b/SPOTeam_android/app/src/main/res/navigation/main_navigation.xml
@@ -6,9 +6,9 @@
 
     <fragment
         android:id="@+id/navigation_home"
-        android:name="com.example.spoteam_android.HouseFragment"
+        android:name="com.example.spoteam_android.presentation.home.HomeFragment"
         android:label="Home"
-        tools:layout="@layout/fragment_house" />
+        tools:layout="@layout/fragment_home" />
     <fragment
         android:id="@+id/navigation_category"
         android:name="com.example.spoteam_android.CategoryFragment"
diff --git a/SPOTeam_android/app/src/main/res/navigation/mobile_navigation.xml b/SPOTeam_android/app/src/main/res/navigation/mobile_navigation.xml
index 71a3c5db..30f7e085 100644
--- a/SPOTeam_android/app/src/main/res/navigation/mobile_navigation.xml
+++ b/SPOTeam_android/app/src/main/res/navigation/mobile_navigation.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/navigation_home"
-        android:name="com.example.spoteam_android.ui.home.HomeFragment"
+        android:name="com.example.spoteam_android.presentation.home.HomeFragment"
         android:label="@string/title_home"
         tools:layout="@layout/fragment_home" />
 
diff --git a/SPOTeam_android/build.gradle.kts b/SPOTeam_android/build.gradle.kts
index 9de39ae7..3db2df8f 100644
--- a/SPOTeam_android/build.gradle.kts
+++ b/SPOTeam_android/build.gradle.kts
@@ -1,7 +1,7 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.jetbrains.kotlin.android) apply false
-    id("com.google.dagger.hilt.android") version "2.51.1" apply false
-    id("com.google.devtools.ksp") version "1.9.0-1.0.13" apply false
+    alias(libs.plugins.kotlin.serialization) apply false
+    alias(libs.plugins.hilt ) apply false
+    alias(libs.plugins.ksp) apply false
 }
\ No newline at end of file
diff --git a/SPOTeam_android/gradle/libs.versions.toml b/SPOTeam_android/gradle/libs.versions.toml
index f7f715b3..08859de2 100644
--- a/SPOTeam_android/gradle/libs.versions.toml
+++ b/SPOTeam_android/gradle/libs.versions.toml
@@ -1,82 +1,129 @@
 [versions]
+# Android Gradle & Kotlin
 agp = "8.5.2"
-kotlin = "1.9.0"
+kotlin = "2.0.21"
+
+# AndroidX Core & UI
 coreKtx = "1.13.1"
-junit = "4.13.2"
-junitVersion = "1.2.1"
-espressoCore = "3.6.1"
 appcompat = "1.7.0"
 material = "1.12.0"
 constraintlayout = "2.1.4"
-lifecycleLivedataKtx = "2.8.3"
-lifecycleViewmodelKtx = "2.8.3"
-navigationFragmentKtx = "2.7.7"
-navigationUiKtx = "2.7.7"
 activity = "1.8.0"
 viewpager2 = "1.1.0"
-okhttp = "4.9.3"
-retrofit = "2.9.0"
-gson = "2.10.1"
-glide = "4.14.2"
-androidx_lifecycle_runtime_ktx = "2.6.1"
-kotlinx_coroutines_android = "1.7.0"
+recyclerview = "1.2.1"
 splashscreen = "1.0.1"
+material3 = "1.2.0"
+material3Android = "1.2.1"
+
+# Lifecycle & Navigation
+lifecycleViewmodelKtx = "2.8.3"
+lifecycleLivedataKtx = "2.8.3"
 lifecycle = "2.6.2"
+lifecycleRuntimeKtx = "2.6.1"
+navigation = "2.7.7"
+
+# Room
 room = "2.6.1"
 
-androidx-security = "1.1.0-alpha04"
+# Network
+retrofit = "2.9.0"
+okhttp = "4.11.0"
+gson = "2.10.1"
+retrofitKotlinSerializationConverter = "1.0.0"
+kotlinxSerializationJson = "1.7.3"
+
+# Hilt
+hilt = "2.51.1"
 
+# Coroutine
+kotlinxCoroutinesAndroid = "1.7.0"
 
+# UI & Image
+glide = "4.14.2"
+coil = "2.7.0"
 
+# Security & Analytics
+androidxSecurity = "1.1.0-alpha04"
+firebaseCrashlyticsBuildtools = "3.0.3"
 
-#0723추가
-androidx-recyclerview = "1.2.1"
-material3Android = "1.2.1"
+# Others
+junit = "4.13.2"
+junitVersion = "1.2.1"
+espressoCore = "3.6.1"
 media3Common = "1.4.0"
 filamentAndroid = "1.17.1"
 places = "4.1.0"
-firebaseCrashlyticsBuildtools = "3.0.3"
+ksp = "2.0.21-1.0.28"
 
 [libraries]
-androidx-security-crypto = { module = "androidx.security:security-crypto", version.ref = "androidx-security" }
-androidx-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "splashscreen" }
-circleimageview = { group = "de.hdodenhof", name = "circleimageview", version = "3.1.0" }
+# AndroidX Core & UI
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
-androidx-viewpager2 = { module = "androidx.viewpager2:viewpager2", version.ref = "viewpager2" }
-junit = { group = "junit", name = "junit", version.ref = "junit" }
-androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
-androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
-androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "lifecycleLivedataKtx" }
-androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycleViewmodelKtx" }
-androidx_lifecycle_runtime_ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx_lifecycle_runtime_ktx" }
-androidx-navigation-fragment-ktx = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "navigationFragmentKtx" }
-androidx-navigation-ui-ktx = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigationUiKtx" }
 androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }
-#0723추가
-androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "androidx-recyclerview" }
-flexbox = "com.google.android.flexbox:flexbox:3.0.0"
-kakaoSdkAll = "com.kakao.sdk:v2-all:2.20.3"
-kakaoSdkUser = "com.kakao.sdk:v2-user:2.20.3"
+androidx-viewpager2 = { module = "androidx.viewpager2:viewpager2", version.ref = "viewpager2" }
+androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerview" }
+androidx-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "splashscreen" }
+
+# Material3
+androidx-material3-android = { group = "androidx.compose.material3", name = "material3-android", version.ref = "material3Android" }
+
+# Lifecycle & Navigation
+androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycleViewmodelKtx" }
+androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "lifecycleLivedataKtx" }
+androidx_lifecycle_runtime_ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
+androidx-navigation-fragment-ktx = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "navigation" }
+androidx-navigation-ui-ktx = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigation" }
+
+# Room
+room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
+room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
+room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
+
+# Network
 retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
 retrofit-converter-scalars = { group = "com.squareup.retrofit2", name = "converter-scalars", version.ref = "retrofit" }
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
+okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
+
+# Serialization & Coroutine
+kotlinx_coroutines_android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesAndroid" }
+retrofit-kotlinx-serialization-json = { module = "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter", version.ref = "retrofitKotlinSerializationConverter" }
+
+# Hilt
+hilt = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" }
+hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "hilt" }
+
+
+# UI Image & Media
 glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
 glideCompiler = { module = "com.github.bumptech.glide:compiler", version.ref = "glide" }
-kotlinx_coroutines_android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx_coroutines_android" }
-androidx-material3-android = { group = "androidx.compose.material3", name = "material3-android", version.ref = "material3Android" }
+coil = { module = "io.coil-kt:coil", version.ref = "coil" }
 androidx-media3-common = { group = "androidx.media3", name = "media3-common", version.ref = "media3Common" }
 filament-android = { group = "com.google.ar.sceneform", name = "filament-android", version.ref = "filamentAndroid" }
 
-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
+# 기타
 places = { group = "com.google.android.libraries.places", name = "places", version.ref = "places" }
 firebase-crashlytics-buildtools = { group = "com.google.firebase", name = "firebase-crashlytics-buildtools", version.ref = "firebaseCrashlyticsBuildtools" }
+circleimageview = { group = "de.hdodenhof", name = "circleimageview", version = "3.1.0" }
+flexbox = "com.google.android.flexbox:flexbox:3.0.0"
+kakaoSdkAll = "com.kakao.sdk:v2-all:2.20.3"
+kakaoSdkUser = "com.kakao.sdk:v2-user:2.20.3"
+
+# 테스트
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
+androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
+
+# Kotlin
+kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
+kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
+ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
+