[REFACTOR] QA 반영

app/google-services.json

@@ -13,6 +13,14 @@
         }
       },
       "oauth_client": [
+        {
+          "client_id": "353417813537-gqd3v6turdn9l26rfeorapgj55pe4nd4.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.texthip.thip",
+            "certificate_hash": "1f2681ba8d7a53b61b3a10214109763221ed6150"
+          }
+        },
         {
           "client_id": "353417813537-lovs0p2tb9kjnjlp493a7098ov0cb2bu.apps.googleusercontent.com",
           "client_type": 1,

app/src/main/java/com/texthip/thip/MainActivity.kt

@@ -44,7 +44,16 @@ fun RootNavHost() {
 
         // --- 메인 관련 화면들 ---
         composable<CommonRoutes.Main> { // MainScreen으로 가는 경로 추가
-            MainScreen()
+            MainScreen(
+                onNavigateToLogin = {
+                    navController.navigate(CommonRoutes.Login) {
+                        // 메인 화면으로 돌아올 수 없도록 모든 화면 기록 삭제
+                        popUpTo(navController.graph.id) {
+                            inclusive = true
+                        }
+                    }
+                }
+            )
         }
     }
 }

app/src/main/java/com/texthip/thip/MainScreen.kt

@@ -14,7 +14,9 @@ import com.texthip.thip.ui.navigator.MainNavHost
 import com.texthip.thip.ui.navigator.extensions.isMainTabRoute
 
 @Composable
-fun MainScreen() {
+fun MainScreen(
+    onNavigateToLogin: () -> Unit
+) {
     val navController = rememberNavController()
     val navBackStackEntry by navController.currentBackStackEntryAsState()
     val currentDestination = navBackStackEntry?.destination
@@ -28,7 +30,10 @@ fun MainScreen() {
         containerColor = Color.Transparent
     ) { innerPadding ->
         Box(modifier = Modifier.padding(innerPadding)) {
-            MainNavHost(navController)
+            MainNavHost(
+                navController = navController,
+                onNavigateToLogin = onNavigateToLogin
+            )
         }
     }
 }

app/src/main/java/com/texthip/thip/data/repository/FeedRepository.kt

@@ -17,8 +17,12 @@ import com.texthip.thip.data.model.feed.response.FeedWriteInfoResponse
 import com.texthip.thip.data.model.feed.response.MyFeedResponse
 import com.texthip.thip.data.model.feed.response.RelatedBooksResponse
 import com.texthip.thip.data.service.FeedService
+import com.texthip.thip.ui.feed.mock.FeedStateUpdateResult
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
@@ -36,6 +40,8 @@ class FeedRepository @Inject constructor(
     @param:ApplicationContext private val context: Context,
     private val json: Json
 ) {
+    private val _feedStateUpdateResult = MutableSharedFlow<FeedStateUpdateResult>()
+    val feedStateUpdateResult: Flow<FeedStateUpdateResult> = _feedStateUpdateResult.asSharedFlow()
 
     /** 피드 작성에 필요한 카테고리 및 태그 목록 조회 */
     suspend fun getFeedWriteInfo(): Result<FeedWriteInfoResponse?> = runCatching {
@@ -198,6 +204,7 @@ class FeedRepository @Inject constructor(
             .handleBaseResponse()
             .getOrThrow()
     }
+
     /** 임시 파일들을 정리하는 함수 */
     private fun cleanupTempFiles(tempFiles: List<File>) {
         tempFiles.forEach { file ->
@@ -230,19 +237,60 @@ class FeedRepository @Inject constructor(
             .getOrThrow()
     }
 
-    suspend fun changeFeedLike(feedId: Long, newLikeStatus: Boolean): Result<FeedLikeResponse?> = runCatching {
+    /*suspend fun changeFeedLike(feedId: Long, newLikeStatus: Boolean): Result<FeedLikeResponse?> = runCatching {
         val request = FeedLikeRequest(type = newLikeStatus)
         feedService.changeFeedLike(feedId, request)
             .handleBaseResponse()
             .getOrThrow()
+    }*/
+    suspend fun changeFeedLike(
+        feedId: Long, newLikeStatus: Boolean,
+        currentLikeCount: Int,
+        currentIsSaved: Boolean
+    ): Result<FeedLikeResponse?> {
+        // 👈 3. 기존 로직을 수정하여 성공 시 방송(emit)하도록 변경
+        return runCatching {
+            val request = FeedLikeRequest(type = newLikeStatus)
+            feedService.changeFeedLike(feedId, request)
+                .handleBaseResponse()
+                .getOrThrow()
+        }.onSuccess { response ->
+            // API 호출 성공 및 응답 데이터가 있을 경우
+            response?.let {
+                // 변경된 상태를 객체로 만들어 방송(emit)
+                val newLikeCount = if (it.isLiked) currentLikeCount + 1 else currentLikeCount - 1
+                val update = FeedStateUpdateResult(
+                    feedId = feedId,
+                    isLiked = it.isLiked,
+                    likeCount = newLikeCount,
+                    isSaved = currentIsSaved // isSaved 상태는 그대로 유지
+                )
+                _feedStateUpdateResult.emit(update)
+            }
+        }
     }
 
     /** 피드 저장 */
-    suspend fun changeFeedSave(feedId: Long, newSaveStatus: Boolean): Result<FeedSaveResponse?> = runCatching {
-        val request = FeedSaveRequest(type = newSaveStatus)
-        feedService.changeFeedSave(feedId, request)
-            .handleBaseResponse()
-            .getOrThrow()
-    }
+    suspend fun changeFeedSave(
+        feedId: Long, newSaveStatus: Boolean, currentIsLiked: Boolean,
+        currentLikeCount: Int
+    ): Result<FeedSaveResponse?> =
+        runCatching {
+            val request = FeedSaveRequest(type = newSaveStatus)
+            feedService.changeFeedSave(feedId, request)
+                .handleBaseResponse()
+                .getOrThrow()
+        }.onSuccess { response ->
+            response?.let {
+                // API 응답(isSaved)과 파라미터로 받은 값들을 조합
+                val update = FeedStateUpdateResult(
+                    feedId = feedId,
+                    isLiked = currentIsLiked, // isLiked 상태는 그대로 유지
+                    likeCount = currentLikeCount,
+                    isSaved = it.isSaved
+                )
+                _feedStateUpdateResult.emit(update)
+            }
+        }
 
 }

app/src/main/java/com/texthip/thip/data/repository/UserRepository.kt

@@ -1,7 +1,10 @@
 package com.texthip.thip.data.repository
 
+import retrofit2.HttpException
 import android.util.Log
 import com.texthip.thip.data.manager.TokenManager
+import com.texthip.thip.data.model.base.BaseResponse
+import com.texthip.thip.data.model.base.ThipApiFailureException
 import com.texthip.thip.data.model.base.handleBaseResponse
 import com.texthip.thip.data.model.users.request.FollowRequest
 import com.texthip.thip.data.model.users.request.NicknameRequest
@@ -16,13 +19,15 @@ import com.texthip.thip.data.model.users.response.OthersFollowersResponse
 import com.texthip.thip.data.model.users.response.SignupResponse
 import com.texthip.thip.data.model.users.response.UserSearchResponse
 import com.texthip.thip.data.service.UserService
+import kotlinx.serialization.json.Json
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class UserRepository @Inject constructor(
     private val userService: UserService,
-    private val tokenManager: TokenManager
+    private val tokenManager: TokenManager,
+    private val json: Json
 ) {
     //내 팔로잉 목록 조회
     suspend fun getMyFollowings(
@@ -79,13 +84,35 @@ class UserRepository @Inject constructor(
             .handleBaseResponse()
             .getOrThrow()
     }
-
+/*
     suspend fun updateProfile(request: ProfileUpdateRequest): Result<Unit?> = runCatching {
         userService.updateProfile(request)
             .handleBaseResponse()
             .getOrThrow()
+    }*/
+    suspend fun updateProfile(request: ProfileUpdateRequest): Result<Unit?> {
+        return try {
+            val response = userService.updateProfile(request)
+            response.handleBaseResponse().getOrThrow()
+            Result.success(Unit)
+        } catch (e: HttpException) {
+            val errorBody = e.response()?.errorBody()?.string()
+            if (errorBody != null) {
+                try {
+                    val baseResponse = json.decodeFromString<BaseResponse<Unit>>(errorBody)
+                    Result.failure(ThipApiFailureException(baseResponse.code, baseResponse.message))
+                } catch (jsonException: Exception) {
+                    Result.failure(e) // JSON 파싱 실패 시 원래 HttpException 반환
+                }
+            } else {
+                Result.failure(e) // 에러 본문이 없으면 원래 HttpException 반환
+            }
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
     }
 
+
     suspend fun signup(request: SignupRequest): Result<SignupResponse?> {
         Log.d("SignupDebug", "UserRepository.signup() 호출됨. 요청 닉네임: ${request.nickname}")
 

app/src/main/java/com/texthip/thip/ui/feed/component/ImageViewerModal.kt

@@ -45,13 +45,13 @@ fun ImageViewerModal(
             .fillMaxSize()
             .clickable { onDismiss() }
     ) {
-        // 닫기 버튼
+        // 이전 버튼
         Icon(
-            painter = painterResource(R.drawable.ic_x),
+            painter = painterResource(R.drawable.ic_arrow_back),
             contentDescription = "닫기",
             tint = colors.White,
             modifier = Modifier
-                .align(Alignment.TopEnd)
+                .align(Alignment.TopStart)
                 .padding(20.dp)
                 .size(24.dp)
                 .clickable { onDismiss() }

app/src/main/java/com/texthip/thip/ui/feed/component/LiveSearchPeopleResult.kt

@@ -60,14 +60,17 @@ fun SearchPeopleResultPreview() {
             SearchPeopleResult(
                 peopleList = listOf(
                     MySubscriptionData(
+                        userId = 1L,
                         profileImageUrl = null,
                         nickname = "Thiper_Official",
                         role = "공식 인플루언서",
                         roleColor = colors.NeonGreen,
                         subscriberCount = 50,
-                        isSubscribed = false
+                        isSubscribed = false,
+
                     ),
                     MySubscriptionData(
+                        userId = 1L,
                         profileImageUrl = null,
                         nickname = "Thiper_Writer",
                         role = "작가",
@@ -76,6 +79,7 @@ fun SearchPeopleResultPreview() {
                         isSubscribed = true
                     ),
                     MySubscriptionData(
+                        userId = 1L,
                         profileImageUrl = null,
                         nickname = "Thiper_Newbie",
                         role = "칭호칭호",