From c56e4fe49e73470fa15a2148b25c1874eef4558e Mon Sep 17 00:00:00 2001
From: JJUYAAA <jjjjyy020704@naver.com>
Date: Tue, 12 Aug 2025 00:37:19 +0900
Subject: [PATCH 01/21] =?UTF-8?q?[fix]:=20BuildConfig=20=EC=98=A4=EB=A5=98?=
 =?UTF-8?q?=20=ED=95=B4=EA=B2=B0=EC=9D=84=20=EC=9C=84=ED=95=9C=20android.d?=
 =?UTF-8?q?efaults.buildfeatures.buildconfig=3Dtrue(#68)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml  | 2 +-
 gradle.properties | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 639c779c..d124cf2a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,7 @@
       <GradleProjectSettings>
         <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="gradleJvm" value="jbr-21" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/gradle.properties b/gradle.properties
index 20e2a015..3caa6cc3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,5 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
\ No newline at end of file

From 95ca8c8ce48cc48ff4a120bc39a049fea4d07a48 Mon Sep 17 00:00:00 2001
From: JJUYAAA <jjjjyy020704@naver.com>
Date: Tue, 12 Aug 2025 18:22:39 +0900
Subject: [PATCH 02/21] =?UTF-8?q?[feat]:=20=EC=B9=B4=EC=B9=B4=EC=98=A4=20-?=
 =?UTF-8?q?=20=EC=8B=A0=EA=B7=9C=EC=9C=A0=EC=A0=80=20=EC=97=AC=EB=B6=80=20?=
 =?UTF-8?q?=ED=99=95=EC=9D=B8=20api=20=EC=9A=94=EC=B2=AD,=20=EC=9D=91?=
 =?UTF-8?q?=EB=8B=B5=20dto(#68)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thip/data/model/auth/request/AuthRequest.kt        |  8 ++++++++
 .../thip/data/model/auth/response/AuthResponse.kt      | 10 ++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 app/src/main/java/com/texthip/thip/data/model/auth/request/AuthRequest.kt
 create mode 100644 app/src/main/java/com/texthip/thip/data/model/auth/response/AuthResponse.kt

diff --git a/app/src/main/java/com/texthip/thip/data/model/auth/request/AuthRequest.kt b/app/src/main/java/com/texthip/thip/data/model/auth/request/AuthRequest.kt
new file mode 100644
index 00000000..927af6ea
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/data/model/auth/request/AuthRequest.kt
@@ -0,0 +1,8 @@
+package com.texthip.thip.data.model.auth.request
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class AuthRequest(
+    @SerialName("oauth2Id") val oauth2Id: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/data/model/auth/response/AuthResponse.kt b/app/src/main/java/com/texthip/thip/data/model/auth/response/AuthResponse.kt
new file mode 100644
index 00000000..23d1f64d
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/data/model/auth/response/AuthResponse.kt
@@ -0,0 +1,10 @@
+package com.texthip.thip.data.model.auth.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class AuthResponse(
+    @SerialName("token") val token: String,
+    @SerialName("isNewUser") val isNewUser: Boolean
+)
\ No newline at end of file

From e80c3a56058be7df10d5b41e09c267c8512f635e Mon Sep 17 00:00:00 2001
From: JJUYAAA <jjjjyy020704@naver.com>
Date: Tue, 12 Aug 2025 18:23:00 +0900
Subject: [PATCH 03/21] =?UTF-8?q?[feat]:=20=EC=B9=B4=EC=B9=B4=EC=98=A4=20-?=
 =?UTF-8?q?=20AuthService=20=EC=83=9D=EC=84=B1(#68)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/texthip/thip/data/service/AuthService.kt  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 app/src/main/java/com/texthip/thip/data/service/AuthService.kt

diff --git a/app/src/main/java/com/texthip/thip/data/service/AuthService.kt b/app/src/main/java/com/texthip/thip/data/service/AuthService.kt
new file mode 100644
index 00000000..d78ae557
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/data/service/AuthService.kt
@@ -0,0 +1,15 @@
+package com.texthip.thip.data.service
+
+import com.texthip.thip.data.model.auth.request.AuthRequest
+import com.texthip.thip.data.model.auth.response.AuthResponse
+import com.texthip.thip.data.model.base.BaseResponse
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface AuthService {
+    //신규유저 여부 확인
+    @POST("oauth2/users")
+    suspend fun checkNewUser(
+        @Body request: AuthRequest
+    ): BaseResponse<AuthResponse>
+}
\ No newline at end of file

From a4c5c2819e4f6f3c51b2c09ede07725d955b4dde Mon Sep 17 00:00:00 2001
From: JJUYAAA <jjjjyy020704@naver.com>
Date: Tue, 12 Aug 2025 18:23:16 +0900
Subject: [PATCH 04/21] =?UTF-8?q?[feat]:=20=EC=B9=B4=EC=B9=B4=EC=98=A4=20-?=
 =?UTF-8?q?=20AuthRepository=20=EC=83=9D=EC=84=B1(#68)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thip/data/repository/AuthRepository.kt    | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 app/src/main/java/com/texthip/thip/data/repository/AuthRepository.kt

diff --git a/app/src/main/java/com/texthip/thip/data/repository/AuthRepository.kt b/app/src/main/java/com/texthip/thip/data/repository/AuthRepository.kt
new file mode 100644
index 00000000..2c7f905f
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/data/repository/AuthRepository.kt
@@ -0,0 +1,72 @@
+package com.texthip.thip.data.repository
+
+import android.content.Context
+import com.kakao.sdk.user.UserApiClient
+import com.texthip.thip.data.model.auth.request.AuthRequest
+import com.texthip.thip.data.model.auth.response.AuthResponse
+import com.texthip.thip.data.model.base.handleBaseResponse
+import com.texthip.thip.data.service.AuthService
+import kotlinx.coroutines.CancellableContinuation
+import kotlinx.coroutines.suspendCancellableCoroutine
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+
+@Singleton
+class AuthRepository @Inject constructor(
+    private val authService: AuthService
+) {
+
+    suspend fun loginWithKakao(context: Context): Result<AuthResponse?> {
+        return runCatching {
+            //카카오SDK를 통해 사용자 고유 ID 가져옴
+            val kakaoUserId = getKakaoUserId(context)
+
+            //신규/기존 유저인지 확인 요청
+             val request = AuthRequest(oauth2Id = "kakao_$kakaoUserId")
+            authService.checkNewUser(request)
+                .handleBaseResponse()
+                .getOrThrow()
+        }
+    }
+
+    //카카오 SDK 로그인 수행 -> 유저ID를 반환하는 suspend 메서드
+    private suspend fun getKakaoUserId(context: Context): Long = suspendCancellableCoroutine { continuation ->
+        // 카카오톡 설치 여부에 따라 로그인 방식 결정
+        if (UserApiClient.instance.isKakaoTalkLoginAvailable(context)) {
+            // 카카오톡으로 로그인
+            UserApiClient.instance.loginWithKakaoTalk(context) { token, error ->
+                if (error != null) {
+                    continuation.resumeWithException(error)
+                } else if (token != null) {
+                    // 로그인 성공 시 사용자 정보 요청
+                    fetchUserInfo(continuation)
+                }
+            }
+        } else {
+            // 카카오계정으로 로그인
+            UserApiClient.instance.loginWithKakaoAccount(context) { token, error ->
+                if (error != null) {
+                    continuation.resumeWithException(error)
+                } else if (token != null) {
+                    // 로그인 성공 시 사용자 정보 요청
+                    fetchUserInfo(continuation)
+                }
+            }
+        }
+    }
+
+    //사용자 정보를 가져오는 중복 코드를 별도의 함수로 분리함
+    private fun fetchUserInfo(continuation: CancellableContinuation<Long>) {
+        UserApiClient.instance.me { user, error ->
+            if (error != null) {
+                continuation.resumeWithException(error)
+            } else if (user?.id != null) {
+                continuation.resume(user.id!!)
+            } else {
+                continuation.resumeWithException(IllegalStateException("Kakao User ID is null"))
+            }
+        }
+    }
+}
\ No newline at end of file

From 48014b0db93ae7b361385276c8a35d2b5878bc34 Mon Sep 17 00:00:00 2001
From: JJUYAAA <jjjjyy020704@naver.com>
Date: Tue, 12 Aug 2025 18:23:43 +0900
Subject: [PATCH 05/21] =?UTF-8?q?[feat]:=20=EC=B9=B4=EC=B9=B4=EC=98=A4=20?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EA=B4=80=EB=A0=A8=20=EC=9D=98?=
 =?UTF-8?q?=EC=A1=B4=EC=84=B1=20=EC=B6=94=EA=B0=80(#68)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 78ad2798..f7b7731d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -68,6 +68,7 @@ dependencies {
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.coil.compose)
     implementation(libs.foundation)
+    implementation(libs.androidx.lifecycle.runtime.compose)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
@@ -90,6 +91,12 @@ dependencies {
 // OkHttp
     implementation(libs.okhttp)
     implementation(libs.logging.interceptor)
+
+// 카카오 로그인 SDK
+    implementation("com.kakao.sdk:v2-all:2.21.6")
+
+// 토큰 저장을 위한 DataStore
+    implementation ("androidx.datastore:datastore-preferences:1.1.1")
 }
 
 kapt {

From e00e585c61eaa8876fa680261bde2cc24ba9e0da Mon Sep 17 00:00:00 2001
From: JJUYAAA <jjjjyy020704@naver.com>
Date: Tue, 12 Aug 2025 18:24:39 +0900
Subject: [PATCH 06/21] =?UTF-8?q?[feat]:=20loginscreen=20-=20content?=
 =?UTF-8?q?=EC=99=80=20screen(=EB=B7=B0=EB=AA=A8=EB=8D=B8=20=EC=A3=BC?=
 =?UTF-8?q?=EC=9E=85=EB=B0=9B=EC=9D=8C)=20=EB=B6=84=EB=A6=AC=20(#68)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thip/ui/signin/screen/LoginScreen.kt      | 87 +++++++++++++++++--
 1 file changed, 81 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/signin/screen/LoginScreen.kt b/app/src/main/java/com/texthip/thip/ui/signin/screen/LoginScreen.kt
index 9a88c9e7..0febfb32 100644
--- a/app/src/main/java/com/texthip/thip/ui/signin/screen/LoginScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/signin/screen/LoginScreen.kt
@@ -1,20 +1,26 @@
 package com.texthip.thip.ui.signin.screen
 
+import android.widget.Toast
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Color.Companion.Unspecified
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.SpanStyle
@@ -22,15 +28,82 @@ import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation.NavController
 import com.texthip.thip.R
+import com.texthip.thip.data.manager.TokenManager
 import com.texthip.thip.ui.common.buttons.ActionMediumButton
+import com.texthip.thip.ui.signin.viewmodel.LoginUiState
+import com.texthip.thip.ui.signin.viewmodel.LoginViewModel
 import com.texthip.thip.ui.theme.Purple
+import com.texthip.thip.ui.theme.ThipTheme
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.launch
 
 
 @Composable
-fun LoginScreen() {
+fun LoginScreen(
+    navController: NavController,
+    viewModel: LoginViewModel = hiltViewModel()
+) {
+    val context = LocalContext.current
+    val uiState = viewModel.uiState.collectAsStateWithLifecycle().value //by 오류로 인해 변경함
+    val coroutineScope = rememberCoroutineScope()
+    val tokenManager = remember { TokenManager(context) }
+
+    // uiState가 바뀔 때마다 실행되어 화면 이동이나 토스트 메시지 등을 처리
+    LaunchedEffect(key1 = uiState) {
+        when (val state = uiState) {
+            is LoginUiState.Success -> {
+                // TODO: TokenManager를 사용해 토큰 저장하는 로직 추가
+                coroutineScope.launch {
+                    tokenManager.saveToken(state.response.token)
+                }
+
+                val destination = if (state.response.isNewUser) {
+                    // "회원가입 화면으로 이동"
+                } else {
+                    // "홈 화면으로 이동"
+                }
+                // navController.navigate(destination)
+                Toast.makeText(context, "로그인 성공!", Toast.LENGTH_SHORT).show()
+                viewModel.clearLoginState() // 상태 초기화
+            }
+
+            is LoginUiState.Error -> {
+                Toast.makeText(context, state.message, Toast.LENGTH_SHORT).show()
+                viewModel.clearLoginState() // 상태 초기화
+            }
+            else -> {}
+        }
+    }
+
+    Box(modifier = Modifier.fillMaxSize()) {
+        LoginContent(
+            onKakaoLoginClick = { viewModel.kakaoLogin(context) },
+            onGoogleLoginClick = { /* TODO: 구글 로그인 로직 연결 */ }
+        )
+
+        // 로딩 중일 때 화면 전체에 로딩 인디케이터 표시
+        if (uiState is LoginUiState.Loading) {
+            Box(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .align(Alignment.Center)
+            ) {
+                CircularProgressIndicator()
+            }
+        }
+    }
+}
+@Composable
+fun LoginContent(
+    onKakaoLoginClick: () -> Unit,
+    onGoogleLoginClick: () -> Unit
+) {
     Column(
         Modifier
             .background(colors.Black)
@@ -64,7 +137,7 @@ fun LoginScreen() {
             backgroundColor = colors.KakaoYellow,
             hasRightIcon = false,
             modifier = Modifier.fillMaxWidth(),
-            onClick = {},
+            onClick = onKakaoLoginClick,
         )
         Spacer(modifier = Modifier.height(20.dp))
         ActionMediumButton(
@@ -75,13 +148,15 @@ fun LoginScreen() {
             backgroundColor = colors.White,
             hasRightIcon = false,
             modifier = Modifier.fillMaxWidth(),
-            onClick = {},
+            onClick = onGoogleLoginClick,
         )
     }
 }
 
 @Preview
 @Composable
-private fun LoginScreenPrev() {
-    LoginScreen()
+private fun LoginContentPreview() {
+    ThipTheme {
+        LoginContent(onKakaoLoginClick = {}, onGoogleLoginClick = {})
+    }
 }
\ No newline at end of file

From cdff7a0c90c87e278adb05afcbd421b0765acb0b Mon Sep 17 00:00:00 2001
From: JJUYAAA <jjjjyy020704@naver.com>
Date: Tue, 12 Aug 2025 18:24:59 +0900
Subject: [PATCH 07/21] =?UTF-8?q?[feat]:=20=EC=B9=B4=EC=B9=B4=EC=98=A4=20?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=EC=97=90=20=ED=95=84=EC=9A=94?=
 =?UTF-8?q?=ED=95=9C=20maven=20=EC=84=A4=EC=A0=95=20(#68)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index fc4268bb..309d5459 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,6 +16,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven(url = "https://devrepo.kakao.com/nexus/content/groups/public/")
     }
 }
 

From 9a67f618cb8b4869a293b6a8658c51b0dd1bae97 Mon Sep 17 00:00:00 2001
From: JJUYAAA <jjjjyy020704@naver.com>
Date: Tue, 12 Aug 2025 18:25:42 +0900
Subject: [PATCH 08/21] =?UTF-8?q?[feat]:=20lifecycle=20=EB=9D=BC=EC=9D=B4?=
 =?UTF-8?q?=EB=B8=8C=EB=9F=AC=EB=A6=AC=20=EC=9E=AC=EC=84=A4=EC=B9=98=20(#6?=
 =?UTF-8?q?8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle/libs.versions.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 821d4cca..3d1b920c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -25,6 +25,7 @@ okhttp = "5.1.0"
 retrofit = "3.0.0"
 retrofitKotlinSerializationConverter = "1.0.0"
 androidxComposeNavigation = "2.8.2"
+lifecycleRuntimeCompose = "2.10.0-alpha01"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -58,6 +59,7 @@ logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", ver
 okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-kotlin-serialization-converter = { group = "com.jakewharton.retrofit", name = "retrofit2-kotlinx-serialization-converter", version.ref = "retrofitKotlinSerializationConverter" }
+androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycleRuntimeCompose" }
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

From 56144a0c9024c9beac1b37e87a42b8db05cd5bbf Mon Sep 17 00:00:00 2001
From: JJUYAAA <jjjjyy020704@naver.com>
Date: Tue, 12 Aug 2025 18:26:09 +0900
Subject: [PATCH 09/21] =?UTF-8?q?[feat]:=20=EC=B9=B4=EC=B9=B4=EC=98=A4?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EB=B7=B0=EB=AA=A8=EB=8D=B8=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1(#68)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../signin/viewmodel/KakaoLoginViewModel.kt   | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 app/src/main/java/com/texthip/thip/ui/signin/viewmodel/KakaoLoginViewModel.kt

diff --git a/app/src/main/java/com/texthip/thip/ui/signin/viewmodel/KakaoLoginViewModel.kt b/app/src/main/java/com/texthip/thip/ui/signin/viewmodel/KakaoLoginViewModel.kt
new file mode 100644
index 00000000..fb8a4cf9
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/ui/signin/viewmodel/KakaoLoginViewModel.kt
@@ -0,0 +1,57 @@
+package com.texthip.thip.ui.signin.viewmodel
+
+import android.content.Context
+import android.util.Log
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.texthip.thip.data.model.auth.response.AuthResponse
+import com.texthip.thip.data.repository.AuthRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import jakarta.inject.Inject
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+
+sealed interface LoginUiState {
+    data object Idle : LoginUiState // 초기 상태
+    data object Loading : LoginUiState
+    data class Success(val response: AuthResponse) : LoginUiState
+    data class Error(val message: String) : LoginUiState
+}
+
+@HiltViewModel
+class LoginViewModel @Inject constructor(
+    private val authRepository: AuthRepository // 실제로는 AuthRepository를 주입받아야 합니다.
+) : ViewModel() {
+
+    private val _uiState = MutableStateFlow<LoginUiState>(LoginUiState.Idle)
+    val uiState = _uiState.asStateFlow()
+
+    fun kakaoLogin(context: Context) {
+        viewModelScope.launch {
+            _uiState.update { LoginUiState.Loading }
+
+            //카카오 로그인부터 서버 통신까지
+            authRepository.loginWithKakao(context)
+                .onSuccess { response ->
+                    if (response != null) {
+                        _uiState.update { LoginUiState.Success(response) }
+                    } else {
+                        _uiState.update { LoginUiState.Error("서버로부터 응답을 받지 못했습니다.") }
+                    }
+                }
+                .onFailure { throwable ->
+                    Log.e("LoginViewModel", "Login failed: ${throwable.message}", throwable)
+                    _uiState.update {
+                        LoginUiState.Error(throwable.message ?: "알 수 없는 통신 오류가 발생했습니다.")
+                    }
+                }
+        }
+    }
+
+    // 화면 이동 또는 에러 메시지 표시 후, 상태를 다시 초기화하여 이벤트가 중복 실행되는 것을 방지
+    fun clearLoginState() {
+        _uiState.update { LoginUiState.Idle }
+    }
+}
\ No newline at end of file

From e78a1209837e5a63acab95524d71a00101a1a1e8 Mon Sep 17 00:00:00 2001
From: JJUYAAA <jjjjyy020704@naver.com>
Date: Tue, 12 Aug 2025 18:26:33 +0900
Subject: [PATCH 10/21] =?UTF-8?q?[feat]:common=20routes=EC=97=90=20?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=9A=8C=EC=9B=90=EA=B0=80?=
 =?UTF-8?q?=EC=9E=85=20=EA=B4=80=EB=A0=A8=20=EC=8A=A4=ED=81=AC=EB=A6=B0=20?=
 =?UTF-8?q?=EB=A3=A8=ED=8A=B8=20=EC=B6=94=EA=B0=80(#68)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../texthip/thip/ui/navigator/routes/CommonRoutes.kt  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/navigator/routes/CommonRoutes.kt b/app/src/main/java/com/texthip/thip/ui/navigator/routes/CommonRoutes.kt
index 623bb43f..20b52646 100644
--- a/app/src/main/java/com/texthip/thip/ui/navigator/routes/CommonRoutes.kt
+++ b/app/src/main/java/com/texthip/thip/ui/navigator/routes/CommonRoutes.kt
@@ -6,4 +6,13 @@ import kotlinx.serialization.Serializable
 sealed class CommonRoutes : Routes() {
     @Serializable
     data object Alarm : CommonRoutes()
-}
\ No newline at end of file
+
+    @Serializable
+    data object Splash : CommonRoutes()
+
+    @Serializable
+    data object Login : CommonRoutes()
+
+    @Serializable
+    data object Signup : CommonRoutes()
+}

From 9833a07ee5c5e9de0b927efeecb4acfbeb697546 Mon Sep 17 00:00:00 2001
From: JJUYAAA <jjjjyy020704@naver.com>
Date: Tue, 12 Aug 2025 18:26:46 +0900
Subject: [PATCH 11/21] =?UTF-8?q?[feat]:=20=ED=86=A0=ED=81=B0=EB=A7=A4?=
 =?UTF-8?q?=EB=8B=88=EC=A0=88=20=EC=83=9D=EC=84=B1(#68)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../texthip/thip/data/manager/TokenManager.kt | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 app/src/main/java/com/texthip/thip/data/manager/TokenManager.kt

diff --git a/app/src/main/java/com/texthip/thip/data/manager/TokenManager.kt b/app/src/main/java/com/texthip/thip/data/manager/TokenManager.kt
new file mode 100644
index 00000000..5cda44a5
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/data/manager/TokenManager.kt
@@ -0,0 +1,46 @@
+package com.texthip.thip.data.manager
+
+import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringPreferencesKey
+import androidx.datastore.preferences.preferencesDataStore
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class TokenManager @Inject constructor(
+    @ApplicationContext private val context: Context
+) {
+    private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "thip_auth_tokens")
+
+    companion object {
+        //토큰저장에 사용되는 키
+        private val APP_TOKEN_KEY = stringPreferencesKey("app_token")
+    }
+
+    //토큰 저장
+    suspend fun saveToken(token: String) {
+        context.dataStore.edit { prefs ->
+            prefs[APP_TOKEN_KEY] = token
+        }
+    }
+
+    //저장된 토큰을 Flow 형태로 불러옴
+    fun getToken(): Flow<String?> {
+        return context.dataStore.data.map { prefs ->
+            prefs[APP_TOKEN_KEY]
+        }
+    }
+
+    //저장된 토큰 삭제 (로그아웃 시?)
+    suspend fun deleteToken() {
+        context.dataStore.edit { prefs ->
+            prefs.remove(APP_TOKEN_KEY)
+        }
+    }
+}
\ No newline at end of file

From 5b5b7e3ed221e806610b3a2e59ae56865f9d91be Mon Sep 17 00:00:00 2001
From: JJUYAAA <jjjjyy020704@naver.com>
Date: Tue, 12 Aug 2025 19:43:40 +0900
Subject: [PATCH 12/21] =?UTF-8?q?[feat]:=20=EC=8B=A0=EA=B7=9C=EC=9C=A0?=
 =?UTF-8?q?=EC=A0=80=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=20=ED=94=BC=EB=93=9C?=
 =?UTF-8?q?=ED=99=94=EB=A9=B4=EC=9C=BC=EB=A1=9C=20=EC=9D=B4=EB=8F=99?=
 =?UTF-8?q?=ED=95=98=EB=8A=94=20=EB=A1=9C=EC=A7=81=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=ED=9B=84=20=EC=A3=BC=EC=84=9D=EC=B2=98=EB=A6=AC(#6?=
 =?UTF-8?q?8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thip/ui/signin/viewmodel/KakaoLoginViewModel.kt   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/signin/viewmodel/KakaoLoginViewModel.kt b/app/src/main/java/com/texthip/thip/ui/signin/viewmodel/KakaoLoginViewModel.kt
index fb8a4cf9..c451e8f2 100644
--- a/app/src/main/java/com/texthip/thip/ui/signin/viewmodel/KakaoLoginViewModel.kt
+++ b/app/src/main/java/com/texthip/thip/ui/signin/viewmodel/KakaoLoginViewModel.kt
@@ -14,7 +14,7 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 
 sealed interface LoginUiState {
-    data object Idle : LoginUiState // 초기 상태
+    data object Idle : LoginUiState
     data object Loading : LoginUiState
     data class Success(val response: AuthResponse) : LoginUiState
     data class Error(val message: String) : LoginUiState
@@ -22,7 +22,7 @@ sealed interface LoginUiState {
 
 @HiltViewModel
 class LoginViewModel @Inject constructor(
-    private val authRepository: AuthRepository // 실제로는 AuthRepository를 주입받아야 합니다.
+    private val authRepository: AuthRepository
 ) : ViewModel() {
 
     private val _uiState = MutableStateFlow<LoginUiState>(LoginUiState.Idle)
@@ -47,10 +47,15 @@ class LoginViewModel @Inject constructor(
                         LoginUiState.Error(throwable.message ?: "알 수 없는 통신 오류가 발생했습니다.")
                     }
                 }
+           /* //신규유저 아닌 경우 피드화면으로 테스트
+            val fakeToken = "eyJhbGciOiJIUzI1NiJ9.eyJ1c2VySWQiOjcsImlhdCI6MTc1NDM4MjY1MiwiZXhwIjoxNzU2OTc0NjUyfQ.5CrcGkff5rcwF25qSsw8BY_GZ4W9w7QMJ6kXlwW4Ub0"
+            val fakeResponse = AuthResponse(token = fakeToken, isNewUser = false)
+            _uiState.update { LoginUiState.Success(fakeResponse) }
+*/
         }
     }
 
-    // 화면 이동 또는 에러 메시지 표시 후, 상태를 다시 초기화하여 이벤트가 중복 실행되는 것을 방지
+    //상태를 다시 초기화-> 이벤트 중복 실행 방지
     fun clearLoginState() {
         _uiState.update { LoginUiState.Idle }
     }

From 9b4c045714c52a74663cd6d4a217d9cecb3d14d3 Mon Sep 17 00:00:00 2001
From: JJUYAAA <jjjjyy020704@naver.com>
Date: Tue, 12 Aug 2025 19:44:20 +0900
Subject: [PATCH 13/21] =?UTF-8?q?[feat]:=20=EC=8B=A0=EA=B7=9C=EC=9C=A0?=
 =?UTF-8?q?=EC=A0=80=20=EC=97=AC=EB=B6=80=EC=97=90=20=EB=94=B0=EB=9D=BC=20?=
 =?UTF-8?q?=EC=B9=B4=EC=B9=B4=EC=98=A4=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?=
 =?UTF-8?q?=ED=9B=84=20=ED=99=94=EB=A9=B4=EC=9D=B4=EB=8F=99=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95(#68)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/texthip/thip/MainActivity.kt     | 95 ++++++++-----------
 .../thip/ui/signin/screen/LoginScreen.kt      | 20 ++--
 .../ui/signin/screen/SignupNicknameScreen.kt  | 11 ++-
 .../thip/ui/signin/screen/SplashScreen.kt     | 23 ++++-
 4 files changed, 78 insertions(+), 71 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/MainActivity.kt b/app/src/main/java/com/texthip/thip/MainActivity.kt
index d527d5dd..8afb807e 100644
--- a/app/src/main/java/com/texthip/thip/MainActivity.kt
+++ b/app/src/main/java/com/texthip/thip/MainActivity.kt
@@ -4,14 +4,20 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.compose.foundation.layout.Column
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import com.texthip.thip.ui.navigator.navigations.commonNavigation
+import com.texthip.thip.ui.navigator.navigations.feedNavigation
+import com.texthip.thip.ui.navigator.navigations.groupNavigation
+import com.texthip.thip.ui.navigator.navigations.myPageNavigation
+import com.texthip.thip.ui.navigator.navigations.searchNavigation
+import com.texthip.thip.ui.navigator.routes.CommonRoutes
+import com.texthip.thip.ui.signin.screen.LoginScreen
+import com.texthip.thip.ui.signin.screen.SigninNicknameScreen
+import com.texthip.thip.ui.signin.screen.SplashScreen
 import com.texthip.thip.ui.theme.ThipTheme
-import com.texthip.thip.ui.theme.ThipTheme.colors
-import com.texthip.thip.ui.theme.ThipTheme.typography
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -21,63 +27,40 @@ class MainActivity : ComponentActivity() {
         enableEdgeToEdge()
         setContent {
             ThipTheme {
-                /*Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
-                    Greeting(
-                        name = "Android",
-                        modifier = Modifier.padding(innerPadding)
-                    )
-                }*/
-                MainScreen()
+                RootNavHost()
             }
         }
     }
 }
-
 @Composable
-fun Greeting(name: String, modifier: Modifier = Modifier) {
-    Column {
-        Text(
-            text = "Hello $name!",
-            modifier = modifier,
-            style = typography.bigtitle_b700_s22_h24,
-            color = colors.Purple,
-        )
-
-        Text(
-            text = "Hello $name!",
-            modifier = modifier,
-            style = typography.smalltitle_sb600_s16_h20,
-            color = colors.NeonGreen,
-        )
-
-        Text(
-            text = "Hello $name!",
-            modifier = modifier,
-            style = typography.menu_sb600_s12,
-            color = colors.Red,
-        )
+fun RootNavHost() {
+    val navController = rememberNavController()
+    NavHost(
+        navController = navController,
+        startDestination = CommonRoutes.Splash
+    ) {
+        // --- 인증 관련 화면들 ---
+        composable<CommonRoutes.Splash> {
+            SplashScreen(navController = navController)
+        }
+        composable<CommonRoutes.Login> {
+            LoginScreen(navController = navController)
+        }
+        composable<CommonRoutes.Signup> {
+            SigninNicknameScreen(navController = navController)
+        }
 
-        Text(
-            text = "Hello $name!",
-            modifier = modifier,
-            style = typography.navi_m500_s10,
-            color = colors.DarkGrey,
+        // --- 메인 관련 화면들 ---
+        feedNavigation(navController)
+        groupNavigation(
+            navController = navController,
+            navigateBack = navController::popBackStack
         )
-
-        Text(
-            text = "Hello $name!",
-            modifier = modifier,
-            style = typography.view_r400_s11_h20,
-            color = colors.Black,
+        searchNavigation(navController)
+        myPageNavigation(navController)
+        commonNavigation(
+            navController = navController,
+            navigateBack = navController::popBackStack
         )
     }
-
-}
-
-@Preview(showBackground = true)
-@Composable
-fun GreetingPreview() {
-    ThipTheme {
-        Greeting("Android")
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/signin/screen/LoginScreen.kt b/app/src/main/java/com/texthip/thip/ui/signin/screen/LoginScreen.kt
index 0febfb32..225c4eb2 100644
--- a/app/src/main/java/com/texthip/thip/ui/signin/screen/LoginScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/signin/screen/LoginScreen.kt
@@ -34,13 +34,14 @@ import androidx.navigation.NavController
 import com.texthip.thip.R
 import com.texthip.thip.data.manager.TokenManager
 import com.texthip.thip.ui.common.buttons.ActionMediumButton
+import com.texthip.thip.ui.navigator.routes.CommonRoutes
+import com.texthip.thip.ui.navigator.routes.MainTabRoutes
 import com.texthip.thip.ui.signin.viewmodel.LoginUiState
 import com.texthip.thip.ui.signin.viewmodel.LoginViewModel
 import com.texthip.thip.ui.theme.Purple
 import com.texthip.thip.ui.theme.ThipTheme
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
-import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 
 
@@ -58,18 +59,18 @@ fun LoginScreen(
     LaunchedEffect(key1 = uiState) {
         when (val state = uiState) {
             is LoginUiState.Success -> {
-                // TODO: TokenManager를 사용해 토큰 저장하는 로직 추가
-                coroutineScope.launch {
+                coroutineScope.launch { //토큰 저장
                     tokenManager.saveToken(state.response.token)
                 }
 
                 val destination = if (state.response.isNewUser) {
-                    // "회원가입 화면으로 이동"
+                    CommonRoutes.Signup
                 } else {
-                    // "홈 화면으로 이동"
+                    MainTabRoutes.Feed
+                }
+                navController.navigate(destination) {
+                    popUpTo(CommonRoutes.Login) { inclusive = true }
                 }
-                // navController.navigate(destination)
-                Toast.makeText(context, "로그인 성공!", Toast.LENGTH_SHORT).show()
                 viewModel.clearLoginState() // 상태 초기화
             }
 
@@ -90,9 +91,8 @@ fun LoginScreen(
         // 로딩 중일 때 화면 전체에 로딩 인디케이터 표시
         if (uiState is LoginUiState.Loading) {
             Box(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .align(Alignment.Center)
+                contentAlignment = Alignment.Center,
+                modifier = Modifier.fillMaxSize()
             ) {
                 CircularProgressIndicator()
             }
diff --git a/app/src/main/java/com/texthip/thip/ui/signin/screen/SignupNicknameScreen.kt b/app/src/main/java/com/texthip/thip/ui/signin/screen/SignupNicknameScreen.kt
index 7c41dfd3..4b80d211 100644
--- a/app/src/main/java/com/texthip/thip/ui/signin/screen/SignupNicknameScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/signin/screen/SignupNicknameScreen.kt
@@ -20,6 +20,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
+import androidx.navigation.compose.rememberNavController
 import com.texthip.thip.R
 import com.texthip.thip.ui.common.forms.WarningTextField
 import com.texthip.thip.ui.common.topappbar.InputTopAppBar
@@ -29,11 +31,13 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
 @Composable
-fun SigninNicknameScreen() {
+fun SigninNicknameScreen(
+    navController: NavController,
+) {
     var nickname by rememberSaveable { mutableStateOf("") }
     var showWarning by remember { mutableStateOf(false) }
     var warningMessageResId by remember { mutableStateOf<Int?>(null) }
-    val isRightButtonEnabled by remember {derivedStateOf {nickname.isNotBlank()}} // 닉네임 공백 아닐때 버튼 활성화
+    val isRightButtonEnabled by remember { derivedStateOf { nickname.isNotBlank() } } // 닉네임 공백 아닐때 버튼 활성화
     val coroutineScope = rememberCoroutineScope()
 
     Column(
@@ -97,5 +101,6 @@ fun SigninNicknameScreen() {
 @Preview
 @Composable
 private fun SigninNicknameScreenPrev() {
-    SigninNicknameScreen()
+    val navController = rememberNavController()
+    SigninNicknameScreen(navController)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/signin/screen/SplashScreen.kt b/app/src/main/java/com/texthip/thip/ui/signin/screen/SplashScreen.kt
index cc62e0e8..a0d10736 100644
--- a/app/src/main/java/com/texthip/thip/ui/signin/screen/SplashScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/signin/screen/SplashScreen.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color.Companion.Unspecified
@@ -19,13 +20,30 @@ import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
+import androidx.navigation.compose.rememberNavController
 import com.texthip.thip.R
+import com.texthip.thip.ui.navigator.routes.CommonRoutes
 import com.texthip.thip.ui.theme.Purple
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
+import kotlinx.coroutines.delay
 
 @Composable
-fun SplashScreen() {
+fun SplashScreen(
+    navController: NavController,
+) {
+    LaunchedEffect(key1 = Unit) {
+        //3초 delay
+        delay(3000L)
+
+        // 로그인 화면으로 이동
+        navController.navigate(CommonRoutes.Login) {
+            popUpTo(CommonRoutes.Splash) {
+                inclusive = true
+            }
+        }
+    }
     Column(
         Modifier
             .background(colors.Black)
@@ -55,5 +73,6 @@ fun SplashScreen() {
 @Preview
 @Composable
 private fun SplashScreenPrev() {
-    SplashScreen()
+    val navController = rememberNavController()
+    SplashScreen(navController)
 }
\ No newline at end of file

From d8467452dd5b07da15c4aa13cd860258e4348902 Mon Sep 17 00:00:00 2001
From: JJUYAAA <jjjjyy020704@naver.com>
Date: Tue, 12 Aug 2025 19:45:36 +0900
Subject: [PATCH 14/21] =?UTF-8?q?[feat]:=20=EB=84=A4=ED=81=AC=EC=9B=8C?=
 =?UTF-8?q?=ED=81=AC=EB=AA=A8=EB=93=88=20-=20auth=20=EC=84=9C=EB=B9=84?=
 =?UTF-8?q?=EC=8A=A4=20=EC=B6=94=EA=B0=80(#68)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/texthip/thip/data/di/NetworkModule.kt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/java/com/texthip/thip/data/di/NetworkModule.kt b/app/src/main/java/com/texthip/thip/data/di/NetworkModule.kt
index 079058f3..74354f99 100644
--- a/app/src/main/java/com/texthip/thip/data/di/NetworkModule.kt
+++ b/app/src/main/java/com/texthip/thip/data/di/NetworkModule.kt
@@ -67,4 +67,10 @@ object NetworkModule {
             )
             .client(okHttpClient)
             .build()
+
+    @Provides
+    @Singleton
+    fun provideAuthService(retrofit: Retrofit): AuthService {
+        return retrofit.create(AuthService::class.java)
+    }
 }
\ No newline at end of file

From fe5f3bb449893433d2516478443c1b65bad7e15d Mon Sep 17 00:00:00 2001
From: JJUYAAA <jjjjyy020704@naver.com>
Date: Tue, 12 Aug 2025 19:46:21 +0900
Subject: [PATCH 15/21] =?UTF-8?q?[feat]:=20=EC=9D=B8=ED=84=B0=EB=84=B7=20?=
 =?UTF-8?q?=EA=B6=8C=ED=95=9C=20=EC=B6=94=EA=B0=80(#68)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6d9336ac..20310031 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:name=".ThipApplication"
         android:allowBackup="true"

From 7befae5e98ecc78dc7ae8218466699b40824e38e Mon Sep 17 00:00:00 2001
From: JJUYAAA <jjjjyy020704@naver.com>
Date: Tue, 12 Aug 2025 20:39:04 +0900
Subject: [PATCH 16/21] =?UTF-8?q?[feat]:=20=EB=84=A4=EC=9D=B4=ED=8B=B0?=
 =?UTF-8?q?=EB=B8=8C=EC=95=B1=20=EC=A3=BC=EC=9E=85=ED=95=98=EB=8A=94=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=EB=93=A4=20(#68)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                          |  1 +
 app/src/main/AndroidManifest.xml              | 20 ++++++++++++++++++-
 .../java/com/texthip/thip/ThipApplication.kt  | 12 ++++++++++-
 .../com/texthip/thip/data/di/NetworkModule.kt |  1 +
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f7b7731d..320e7342 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -27,6 +27,7 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
         buildConfigField("String", "BASE_URL", "\"${properties["BASE_URL"]}\"")
+        buildConfigField("String", "NATIVE_APP_KEY", "\"${properties["NATIVE_APP_KEY"]}\"")
     }
 
     buildTypes {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 20310031..207f1932 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,6 +15,25 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Thip"
         tools:targetApi="31">
+
+        <meta-data
+            android:name="com.kakao.sdk.AppKey"
+            android:value="${NATIVE_APP_KEY}" />
+
+        <activity
+            android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="oauth"
+                    android:scheme="kakao${"NATIVE_APP_KEY"}" />
+            </intent-filter>
+        </activity>
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -27,5 +46,4 @@
             </intent-filter>
         </activity>
     </application>
-
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ThipApplication.kt b/app/src/main/java/com/texthip/thip/ThipApplication.kt
index 75004ce5..68f28fa0 100644
--- a/app/src/main/java/com/texthip/thip/ThipApplication.kt
+++ b/app/src/main/java/com/texthip/thip/ThipApplication.kt
@@ -1,7 +1,17 @@
 package com.texthip.thip
 
+import com.kakao.sdk.common.KakaoSdk
 import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
+import com.texthip.thip.BuildConfig
+
 
 @HiltAndroidApp
-class ThipApplication : Application()
\ No newline at end of file
+class ThipApplication : Application(){
+    override fun onCreate() {
+        super.onCreate()
+
+        // 카카오 SDK 초기화
+        KakaoSdk.init(this, BuildConfig.NATIVE_APP_KEY)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/data/di/NetworkModule.kt b/app/src/main/java/com/texthip/thip/data/di/NetworkModule.kt
index 74354f99..e5587189 100644
--- a/app/src/main/java/com/texthip/thip/data/di/NetworkModule.kt
+++ b/app/src/main/java/com/texthip/thip/data/di/NetworkModule.kt
@@ -2,6 +2,7 @@ package com.texthip.thip.data.di
 
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import com.texthip.thip.BuildConfig
+import com.texthip.thip.data.service.AuthService
 import com.texthip.thip.utils.auth.AuthInterceptor
 import dagger.Module
 import dagger.Provides

From f39127aaccfae9d22ae5a8107789d47ece02293d Mon Sep 17 00:00:00 2001
From: JJUYAAA <jjjjyy020704@naver.com>
Date: Tue, 12 Aug 2025 20:46:11 +0900
Subject: [PATCH 17/21] =?UTF-8?q?[refactor]:=20provideAuthService=20?=
 =?UTF-8?q?=EB=84=A4=ED=8A=B8=EC=9B=8C=ED=81=AC=20=EB=AA=A8=EB=93=88->=20?=
 =?UTF-8?q?=EC=84=9C=EB=B9=84=EC=8A=A4=20=EB=AA=A8=EB=93=88=20=EC=9D=B4?=
 =?UTF-8?q?=EB=8F=99(#68)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/texthip/thip/data/di/NetworkModule.kt   | 6 ------
 .../main/java/com/texthip/thip/data/di/ServiceModule.kt   | 8 ++++++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/data/di/NetworkModule.kt b/app/src/main/java/com/texthip/thip/data/di/NetworkModule.kt
index e5587189..bb5aef2e 100644
--- a/app/src/main/java/com/texthip/thip/data/di/NetworkModule.kt
+++ b/app/src/main/java/com/texthip/thip/data/di/NetworkModule.kt
@@ -68,10 +68,4 @@ object NetworkModule {
             )
             .client(okHttpClient)
             .build()
-
-    @Provides
-    @Singleton
-    fun provideAuthService(retrofit: Retrofit): AuthService {
-        return retrofit.create(AuthService::class.java)
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/data/di/ServiceModule.kt b/app/src/main/java/com/texthip/thip/data/di/ServiceModule.kt
index bf7eafad..4448ce43 100644
--- a/app/src/main/java/com/texthip/thip/data/di/ServiceModule.kt
+++ b/app/src/main/java/com/texthip/thip/data/di/ServiceModule.kt
@@ -1,5 +1,6 @@
 package com.texthip.thip.data.di
 
+import com.texthip.thip.data.service.AuthService
 import com.texthip.thip.data.service.BookService
 import com.texthip.thip.data.service.GroupService
 import com.texthip.thip.data.service.RoomsService
@@ -25,8 +26,15 @@ object ServiceModule {
     fun provideBookService(retrofit: Retrofit): BookService {
         return retrofit.create(BookService::class.java)
     }
+
     @Provides
     @Singleton
     fun providesRoomsService(retrofit: Retrofit): RoomsService =
         retrofit.create(RoomsService::class.java)
+
+    @Provides
+    @Singleton
+    fun provideAuthService(retrofit: Retrofit): AuthService {
+        return retrofit.create(AuthService::class.java)
+    }
 }
\ No newline at end of file

From 5a5c765410167ea4264607bf84ab2763a7915e8d Mon Sep 17 00:00:00 2001
From: JJUYAAA <jjjjyy020704@naver.com>
Date: Tue, 12 Aug 2025 21:38:04 +0900
Subject: [PATCH 18/21] =?UTF-8?q?[refactor]:=20NATIVE=5FAPP=5FKEY=20?=
 =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EC=88=98=EC=A0=95=EC=82=AC=ED=95=AD=20?=
 =?UTF-8?q?=EB=B0=98=EC=98=81(#68)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts             | 3 +++
 app/src/main/AndroidManifest.xml | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 320e7342..b019006e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -28,6 +28,9 @@ android {
 
         buildConfigField("String", "BASE_URL", "\"${properties["BASE_URL"]}\"")
         buildConfigField("String", "NATIVE_APP_KEY", "\"${properties["NATIVE_APP_KEY"]}\"")
+        manifestPlaceholders += mapOf(
+            "NATIVE_APP_KEY" to properties["NATIVE_APP_KEY"] as String
+        )
     }
 
     buildTypes {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 207f1932..147c69fe 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -28,7 +28,11 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data
+                <!-- 리다이렉트 URI: "kakao${NATIVE_APP_KEY}://oauth" -->
+                <data android:host="oauth"
+                    android:scheme="kakao${NATIVE_APP_KEY}" />
+
+                <!--<data
                     android:host="oauth"
                     android:scheme="kakao${"NATIVE_APP_KEY"}" />
             </intent-filter>

From d8310aa06577673509fedfe867b6153099468c64 Mon Sep 17 00:00:00 2001
From: JJUYAAA <jjjjyy020704@naver.com>
Date: Tue, 12 Aug 2025 21:41:12 +0900
Subject: [PATCH 19/21] =?UTF-8?q?[refactor]:=20NATIVE=5FAPP=5FKEY=20?=
 =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EC=88=98=EC=A0=95=EC=82=AC=ED=95=AD=20?=
 =?UTF-8?q?=EB=B0=98=EC=98=81(#68)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 147c69fe..c6fbe459 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -28,13 +28,9 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <!-- 리다이렉트 URI: "kakao${NATIVE_APP_KEY}://oauth" -->
                 <data android:host="oauth"
                     android:scheme="kakao${NATIVE_APP_KEY}" />
 
-                <!--<data
-                    android:host="oauth"
-                    android:scheme="kakao${"NATIVE_APP_KEY"}" />
             </intent-filter>
         </activity>
 

From fafe4d210f24f757496aeeedbcb135735ed76622 Mon Sep 17 00:00:00 2001
From: JJUYAAA <jjjjyy020704@naver.com>
Date: Tue, 12 Aug 2025 21:46:04 +0900
Subject: [PATCH 20/21] =?UTF-8?q?[refactor]:=20inject=20import=EB=AC=B8=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD(#68)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/texthip/thip/ui/signin/viewmodel/KakaoLoginViewModel.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/signin/viewmodel/KakaoLoginViewModel.kt b/app/src/main/java/com/texthip/thip/ui/signin/viewmodel/KakaoLoginViewModel.kt
index c451e8f2..4cdd29aa 100644
--- a/app/src/main/java/com/texthip/thip/ui/signin/viewmodel/KakaoLoginViewModel.kt
+++ b/app/src/main/java/com/texthip/thip/ui/signin/viewmodel/KakaoLoginViewModel.kt
@@ -7,7 +7,7 @@ import androidx.lifecycle.viewModelScope
 import com.texthip.thip.data.model.auth.response.AuthResponse
 import com.texthip.thip.data.repository.AuthRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
-import jakarta.inject.Inject
+import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update

From 863819704d87beaae809d860ce2ce1e14ea3034d Mon Sep 17 00:00:00 2001
From: JJUYAAA <jjjjyy020704@naver.com>
Date: Tue, 12 Aug 2025 21:46:51 +0900
Subject: [PATCH 21/21] =?UTF-8?q?[refactor]:=20=EC=B9=B4=EC=B9=B4=EC=98=A4?=
 =?UTF-8?q?=20sdk=20=EC=B4=88=EA=B8=B0=ED=99=94=20->=20=EC=98=88=EC=99=B8?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=B6=94=EA=B0=80(#68)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/texthip/thip/ThipApplication.kt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/texthip/thip/ThipApplication.kt b/app/src/main/java/com/texthip/thip/ThipApplication.kt
index 68f28fa0..27619c91 100644
--- a/app/src/main/java/com/texthip/thip/ThipApplication.kt
+++ b/app/src/main/java/com/texthip/thip/ThipApplication.kt
@@ -12,6 +12,10 @@ class ThipApplication : Application(){
         super.onCreate()
 
         // 카카오 SDK 초기화
-        KakaoSdk.init(this, BuildConfig.NATIVE_APP_KEY)
+        try {
+            KakaoSdk.init(this, BuildConfig.NATIVE_APP_KEY)
+        }catch (e: Exception){
+            e.printStackTrace()
+        }
     }
 }
\ No newline at end of file