[API] 내 팔로잉 목록 조회 API 연동

app/src/main/java/com/texthip/thip/data/di/ServiceModule.kt

@@ -3,6 +3,7 @@ package com.texthip.thip.data.di
 import com.texthip.thip.data.service.BookService
 import com.texthip.thip.data.service.GroupService
 import com.texthip.thip.data.service.RoomsService
+import com.texthip.thip.data.service.UserService
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -29,4 +30,10 @@ object ServiceModule {
     @Singleton
     fun providesRoomsService(retrofit: Retrofit): RoomsService =
         retrofit.create(RoomsService::class.java)
+
+    @Provides
+    @Singleton
+    fun provideUserService(retrofit: Retrofit): UserService {
+        return retrofit.create(UserService::class.java)
+    }
 }

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

@@ -0,0 +1,22 @@
+package com.texthip.thip.data.model.users
+
+import com.google.gson.annotations.SerializedName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class MyFollowingsResponse(
+    @SerializedName("followings") val followings: List<FollowingList>,
+    @SerializedName("totalFollowingCount") val totalFollowingCount: Int,
+    @SerializedName("nextCursor") val nextCursor: String?,
+    @SerializedName("isLast") val isLast: Boolean
+)
+
+@Serializable
+data class FollowingList(
+    @SerializedName("userId") val userId: Int,
+    @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
+)

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

@@ -0,0 +1,21 @@
+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.service.UserService
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class UserRepository@Inject constructor(
+    private val userService: UserService
+) {
+    suspend fun getMyFollowings(
+        cursor: String?,
+        size: Int = 10
+    ): Result<MyFollowingsResponse?> = runCatching {
+        userService.getMyFollowings(cursor = cursor, size = size)
+            .handleBaseResponse()
+            .getOrThrow()
+    }
+}

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

@@ -0,0 +1,17 @@
+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 retrofit2.http.GET
+import retrofit2.http.Path
+import retrofit2.http.Query
+
+interface UserService {
+    @GET("users/my-followings")
+    suspend fun getMyFollowings(
+        @Query("size") size: Int = 10,
+        @Query("cursor") cursor: String? = null
+    ): BaseResponse<MyFollowingsResponse>
+
+}

app/src/main/java/com/texthip/thip/ui/common/header/AuthorHeader.kt

@@ -29,13 +29,15 @@ import com.texthip.thip.ui.common.buttons.OutlinedButton
 import com.texthip.thip.ui.theme.ThipTheme
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
+import androidx.compose.ui.graphics.Color
 
 @Composable
 fun AuthorHeader(
     modifier: Modifier = Modifier,
     profileImage: String?,
     nickname: String,
     badgeText: String,
+    badgeTextColor: Color  = colors.NeonGreen,
     buttonText: String = "",
     buttonWidth: Dp = 60.dp,
     showButton: Boolean = true,
@@ -80,7 +82,7 @@ fun AuthorHeader(
             Text(
                 text = badgeText,
                 style = typography.feedcopy_r400_s14_h20,
-                color = colors.NeonGreen,
+                color = badgeTextColor,
                 maxLines = 1
             )
         }
@@ -131,6 +133,7 @@ fun PreviewAuthorHeader() {
                 profileImage = null,
                 nickname = "열자자제한열열자제한",
                 badgeText = "칭호칭호칭호",
+                badgeTextColor = colors.Yellow,
                 showButton = false,
                 showThipNum = true,
                 thipNum = 10,

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

@@ -24,6 +24,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -105,7 +106,8 @@ fun MySubscribeBarlist(
                                 overflow = TextOverflow.Ellipsis,
                                 style = typography.view_r400_s11_h20,
                                 color = colors.White,
-                                modifier = Modifier.width(36.dp)
+                                modifier = Modifier.width(36.dp),
+                                textAlign = TextAlign.Center
                             )
                         }
                         Spacer(modifier = Modifier.width(12.dp))
@@ -160,7 +162,7 @@ private fun MySubscribeBarlistPrev() {
         val previewData = List(10) {
             MySubscriptionData(
                 profileImageUrl = "https://example.com/profile$it.jpg",
-                nickname = "닉네임$it",
+                nickname = "닉네임임$it",
                 role = "문학가",
                 roleColor = colors.Red,
                 subscriberCount = 100 + it

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

@@ -13,16 +13,19 @@ import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
 import com.texthip.thip.R
 import com.texthip.thip.ui.common.buttons.FloatingButton
@@ -33,21 +36,26 @@ 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.mypage.component.SavedFeedCard
 import com.texthip.thip.ui.mypage.mock.FeedItem
+import com.texthip.thip.ui.navigator.routes.FeedRoutes
 import com.texthip.thip.ui.theme.ThipTheme
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
 
+
 @Composable
 fun FeedScreen(
     navController: NavController? = null,
+    onNavigateToMySubscription: () -> Unit = {},
     nickname: String = "",
     userRole: String = "",
     feeds: List<FeedItem> = emptyList(),
     totalFeedCount: Int = 0,
     selectedTabIndex: Int = 0,
-    followerProfileImageUrls: List<String> = emptyList()
+    followerProfileImageUrls: List<String> = emptyList(),
+    viewModel: MySubscriptionViewModel = hiltViewModel()
 ) {
     val selectedIndex = rememberSaveable { mutableIntStateOf(selectedTabIndex) }
     val feedStateList = remember {
@@ -105,6 +113,7 @@ fun FeedScreen(
             roleColor = colors.SocialScience
         )
     )
+    val subscriptionUiState by viewModel.uiState.collectAsState()
     Box(modifier = Modifier.fillMaxSize()) {
         Column(
             modifier = Modifier.fillMaxSize()
@@ -121,7 +130,8 @@ fun FeedScreen(
                 selectedTabIndex = selectedIndex.value,
                 onTabSelected = { selectedIndex.value = it }
             )
-            // 스크롤 영역
+
+            // 스크롤 영역 전체
             LazyColumn(
                 modifier = Modifier.weight(1f),
                 verticalArrangement = Arrangement.spacedBy(12.dp)
@@ -203,11 +213,20 @@ fun FeedScreen(
                     //피드
                     item {
                         Spacer(modifier = Modifier.height(20.dp))
+                        val subscriptionsForBar = subscriptionUiState.followings.map { user ->
+                            MySubscriptionData(
+                                profileImageUrl = user.profileImageUrl,
+                                nickname = user.nickname,
+                                role = user.aliasName,
+                                roleColor = colors.White,
+                                subscriberCount = 0,
+                                isSubscribed = user.isFollowing
+                            )
+                        }
                         MySubscribeBarlist(
                             modifier = Modifier.padding(horizontal = 20.dp),
-                            subscriptions = mySubscriptions,
-                            onClick = {
-                            }
+                            subscriptions = subscriptionsForBar,
+                            onClick = onNavigateToMySubscription
                         )
                     }
                     itemsIndexed(feedStateList, key = { _, item -> item.id }) { index, feed ->
@@ -300,7 +319,7 @@ private fun FeedScreenWithoutDataPreview() {
             FeedScreen(
                 nickname = "ThipUser01",
                 userRole = "문학 칭호",
-                selectedTabIndex = 1,
+                selectedTabIndex = 0,
                 feeds = mockFeeds,
                 totalFeedCount = mockFeeds.size,
                 followerProfileImageUrls = mockFollowerImages