[API] users api 연동

app/src/main/java/com/texthip/thip/data/model/users/request/FollowRequest.kt

@@ -0,0 +1,8 @@
+package com.texthip.thip.data.model.users.request
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class FollowRequest(
+    val type: Boolean
+)

app/src/main/java/com/texthip/thip/data/model/users/request/NicknameRequest.kt

@@ -0,0 +1,8 @@
+package com.texthip.thip.data.model.users.request
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class NicknameRequest(
+    val nickname: String
+)

app/src/main/java/com/texthip/thip/data/model/users/response/AliasChoiceResponse.kt

@@ -0,0 +1,17 @@
+package com.texthip.thip.data.model.users.response
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class AliasChoiceResponse(
+    @SerializedName("aliasChoices") val aliasChoices: List<AliasChoice>
+)
+
+@Serializable
+data class AliasChoice(
+    @SerializedName("aliasName") val aliasName: String,
+    @SerializedName("categoryName") val categoryName: String,
+    @SerializedName("imageUrl") val imageUrl: String,
+    @SerializedName("aliasColor") val aliasColor: String
+)

app/src/main/java/com/texthip/thip/data/model/users/response/FollowResponse.kt

@@ -0,0 +1,9 @@
+package com.texthip.thip.data.model.users.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class FollowResponse(
+    @SerialName("isFollowing") val isFollowing: Boolean
+)

app/src/main/java/com/texthip/thip/data/model/users/MyFollowingsResponse.kt → app/src/main/java/com/texthip/thip/data/model/users/response/MyFollowingsResponse.kt

@@ -1,4 +1,4 @@
-package com.texthip.thip.data.model.users
+package com.texthip.thip.data.model.users.response
 
 import com.google.gson.annotations.SerializedName
 import kotlinx.serialization.Serializable
@@ -13,10 +13,22 @@ data class MyFollowingsResponse(
 
 @Serializable
 data class FollowingList(
-    @SerializedName("userId") val userId: Int,
+    @SerializedName("userId") val userId: Long,
     @SerializedName("nickname") val nickname: String,
     @SerializedName("profileImageUrl") val profileImageUrl: String?,
     @SerializedName("aliasName") val aliasName: String,
     @SerializedName("aliasColor") val aliasColor: String,
     @SerializedName("isFollowing") val isFollowing: Boolean
 )
+
+@Serializable
+data class MyRecentFollowingsResponse(
+    @SerializedName("recentWriters") val recentWriters: List<RecentWriterList>
+)
+
+@Serializable
+data class RecentWriterList(
+    @SerializedName("userId") val userId: Long,
+    @SerializedName("nickname") val nickname: String,
+    @SerializedName("profileImageUrl") val profileImageUrl: String?
+)

app/src/main/java/com/texthip/thip/data/model/users/response/MyPageInfoResponse.kt

@@ -0,0 +1,12 @@
+package com.texthip.thip.data.model.users.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class MyPageInfoResponse(
+    @SerialName("profileImageUrl") val profileImageUrl: String?,
+    @SerialName("nickname") val nickname: String,
+    @SerialName("aliasName") val aliasName: String,
+    @SerialName("aliasColor") val aliasColor: String
+)

app/src/main/java/com/texthip/thip/data/model/users/response/NicknameResponse.kt

@@ -0,0 +1,9 @@
+package com.texthip.thip.data.model.users.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class NicknameResponse(
+    @SerialName("isVerified") val isVerified: Boolean
+)

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

@@ -1,15 +1,24 @@
 package com.texthip.thip.data.repository
 
 import com.texthip.thip.data.model.base.handleBaseResponse
-import com.texthip.thip.data.model.users.MyFollowingsResponse
+import com.texthip.thip.data.model.users.request.FollowRequest
+import com.texthip.thip.data.model.users.response.MyFollowingsResponse
+import com.texthip.thip.data.model.users.response.MyPageInfoResponse
+import com.texthip.thip.data.model.users.request.NicknameRequest
+import com.texthip.thip.data.model.users.response.AliasChoiceResponse
+import com.texthip.thip.data.model.users.response.FollowResponse
+import com.texthip.thip.data.model.users.response.MyRecentFollowingsResponse
+import com.texthip.thip.data.model.users.response.NicknameResponse
+import com.texthip.thip.data.model.users.response.OthersFollowersResponse
 import com.texthip.thip.data.service.UserService
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class UserRepository@Inject constructor(
+class UserRepository @Inject constructor(
     private val userService: UserService
 ) {
+    //내 팔로잉 목록 조회
     suspend fun getMyFollowings(
         cursor: String?,
         size: Int = 10
@@ -18,4 +27,50 @@ class UserRepository@Inject constructor(
             .handleBaseResponse()
             .getOrThrow()
     }
+
+    suspend fun getRecentWriters(): Result<MyRecentFollowingsResponse?> = runCatching {
+        userService.getRecentWriters()
+            .handleBaseResponse()
+            .getOrThrow()
+    }
+
+    //다른 유저 팔로워 목록 조회
+    suspend fun getOthersFollowers(
+        userId: Long,
+        cursor: String?,
+        size: Int = 10
+    ): Result<OthersFollowersResponse?> = runCatching {
+        userService.getUserFollowers(userId = userId, cursor = cursor, size = size)
+            .handleBaseResponse()
+            .getOrThrow()
+    }
+
+    //마이페이지 정보 조회
+    suspend fun getMyPageInfo(): Result<MyPageInfoResponse?> = runCatching {
+        userService.getMyPage()
+            .handleBaseResponse()
+            .getOrThrow()
+    }
+
+    suspend fun checkNickname(nickname: String): Result<NicknameResponse?> = runCatching {
+        userService.checkNickname(NicknameRequest(nickname))
+            .handleBaseResponse()
+            .getOrThrow()
+    }
+
+    suspend fun getAliasChoices(): Result<AliasChoiceResponse?> = runCatching {
+        userService.getAliasChoices()
+            .handleBaseResponse()
+            .getOrThrow()
+    }
+
+    suspend fun toggleFollow(
+        followingUserId: Long,
+        isFollowing: Boolean
+    ): Result<FollowResponse?> = runCatching {
+        val request = FollowRequest(type = isFollowing)
+        userService.toggleFollow(followingUserId, request)
+            .handleBaseResponse()
+            .getOrThrow()
+    }
 }

app/src/main/java/com/texthip/thip/data/service/UserService.kt

@@ -1,9 +1,18 @@
 package com.texthip.thip.data.service
 
 import com.texthip.thip.data.model.base.BaseResponse
-import com.texthip.thip.data.model.rooms.response.RoomsUsersResponse
-import com.texthip.thip.data.model.users.MyFollowingsResponse
+import com.texthip.thip.data.model.users.request.FollowRequest
+import com.texthip.thip.data.model.users.response.MyFollowingsResponse
+import com.texthip.thip.data.model.users.response.MyPageInfoResponse
+import com.texthip.thip.data.model.users.request.NicknameRequest
+import com.texthip.thip.data.model.users.response.AliasChoiceResponse
+import com.texthip.thip.data.model.users.response.FollowResponse
+import com.texthip.thip.data.model.users.response.MyRecentFollowingsResponse
+import com.texthip.thip.data.model.users.response.NicknameResponse
+import com.texthip.thip.data.model.users.response.OthersFollowersResponse
+import retrofit2.http.Body
 import retrofit2.http.GET
+import retrofit2.http.POST
 import retrofit2.http.Path
 import retrofit2.http.Query
 
@@ -14,4 +23,30 @@ interface UserService {
         @Query("cursor") cursor: String? = null
     ): BaseResponse<MyFollowingsResponse>
 
+    @GET("users/my-followings/recent-feeds")
+    suspend fun getRecentWriters(): BaseResponse<MyRecentFollowingsResponse>
+
+    @GET("users/{userId}/followers")
+    suspend fun getUserFollowers(
+        @Path("userId") userId: Long,
+        @Query("size") size: Int = 10,
+        @Query("cursor") cursor: String? = null
+    ): BaseResponse<OthersFollowersResponse>
+
+    @GET("users/my-page")
+    suspend fun getMyPage(): BaseResponse<MyPageInfoResponse>
+
+    @POST("users/nickname")
+    suspend fun checkNickname(
+        @Body request: NicknameRequest
+    ): BaseResponse<NicknameResponse>
+
+    @GET("users/alias")
+    suspend fun getAliasChoices(): BaseResponse<AliasChoiceResponse>
+
+    @POST("users/following/{followingUserId}")
+    suspend fun toggleFollow(
+        @Path("followingUserId") followingUserId: Long,
+        @Body request: FollowRequest
+    ): BaseResponse<FollowResponse>
 }

app/src/main/java/com/texthip/thip/ui/common/cards/CardBookList.kt

@@ -10,6 +10,8 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -18,7 +20,9 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -34,6 +38,7 @@ fun CardBookList(
     author: String,
     publisher: String,
     imageUrl: String? = null, // API에서 받은 이미지 URL
+    showBookmark: Boolean = false,
     isBookmarked: Boolean = false,
     onBookmarkClick: () -> Unit = {}
 ) {
@@ -74,17 +79,20 @@ fun CardBookList(
 
         Spacer(modifier = Modifier.width(12.dp))
 
-        // 북마크 아이콘 제거(쓰는 화면이 안보임)
-        /*IconButton(
-            onClick = onBookmarkClick,
-            modifier = Modifier.size(24.dp)
-        ) {
-            Icon(
-                imageVector = if (isBookmarked) ImageVector.vectorResource(R.drawable.ic_save_filled) else ImageVector.vectorResource(R.drawable.ic_save),
-                contentDescription = "북마크",
-                tint = if (isBookmarked) colors.Purple else colors.Grey01
-            )
-        }*/
+        if(showBookmark) {
+            IconButton(
+                onClick = onBookmarkClick,
+                modifier = Modifier.size(24.dp)
+            ) {
+                Icon(
+                    imageVector = if (isBookmarked) ImageVector.vectorResource(R.drawable.ic_save_filled) else ImageVector.vectorResource(
+                        R.drawable.ic_save
+                    ),
+                    contentDescription = "북마크",
+                    tint = if (isBookmarked) colors.Purple else colors.Grey01
+                )
+            }
+        }
     }
 }
 
@@ -93,6 +101,7 @@ fun CardBookList(
 @Composable
 fun PreviewBookTitleCard() {
     var isBookmarked by remember { mutableStateOf(false) }
+    var showBookmark by remember { mutableStateOf(true) }
 
     Column(
         modifier = Modifier.padding(16.dp),
@@ -102,9 +111,9 @@ fun PreviewBookTitleCard() {
             title = "책제목입니다.책제목입니다.책제목입니다.책제목입니다.책제목입니다.책제목입니다.",
             author = "리처드 도킨스",
             publisher = "을유문화사",
+            showBookmark = showBookmark,
             isBookmarked = isBookmarked,
             onBookmarkClick = { isBookmarked = !isBookmarked }
         )
     }
-
 }

app/src/main/java/com/texthip/thip/ui/feed/screen/FeedScreen.kt

@@ -47,7 +47,7 @@ import com.texthip.thip.ui.feed.component.FeedSubscribeBarlist
 import com.texthip.thip.ui.feed.component.MyFeedCard
 import com.texthip.thip.ui.feed.component.MySubscribeBarlist
 import com.texthip.thip.ui.feed.mock.MySubscriptionData
-import com.texthip.thip.ui.feed.viewmodel.MySubscriptionViewModel
+import com.texthip.thip.ui.feed.viewmodel.FeedViewModel
 import com.texthip.thip.ui.mypage.component.SavedFeedCard
 import com.texthip.thip.ui.mypage.mock.FeedItem
 import com.texthip.thip.ui.theme.ThipTheme
@@ -67,10 +67,12 @@ fun FeedScreen(
     totalFeedCount: Int = 0,
     selectedTabIndex: Int = 0,
     followerProfileImageUrls: List<String> = emptyList(),
+    feedViewModel: FeedViewModel = hiltViewModel()
     resultFeedId: Int? = null,
     onResultConsumed: () -> Unit = {},
-    viewModel: MySubscriptionViewModel = hiltViewModel()
+    mySubscriptionViewModel: MySubscriptionViewModel = hiltViewModel()
 ) {
+    val feedUiState by feedViewModel.uiState.collectAsState()
     val selectedIndex = rememberSaveable { mutableIntStateOf(selectedTabIndex) }
     val feedStateList = remember {
         mutableStateListOf<FeedItem>().apply {
@@ -288,14 +290,14 @@ fun FeedScreen(
                     //피드
                     item {
                         Spacer(modifier = Modifier.height(20.dp))
-                        val subscriptionsForBar = subscriptionUiState.followings.map { user ->
+                        val subscriptionsForBar = feedUiState.recentWriters.map { user ->
                             MySubscriptionData(
                                 profileImageUrl = user.profileImageUrl,
                                 nickname = user.nickname,
-                                role = user.aliasName,
+                                role = "",
                                 roleColor = colors.White,
                                 subscriberCount = 0,
-                                isSubscribed = user.isFollowing
+                                isSubscribed = true
                             )
                         }
                         MySubscribeBarlist(
@@ -309,7 +311,6 @@ fun FeedScreen(
 
                         SavedFeedCard(
                             feedItem = feed,
-                            profileImage = profileImage,
                             onBookmarkClick = {
                                 val updated = feed.copy(isSaved = !feed.isSaved)
                                 feedStateList[index] = updated