diff --git a/app/src/main/java/com/texthip/thip/data/model/users/response/MyFollowingsResponse.kt b/app/src/main/java/com/texthip/thip/data/model/users/response/MyFollowingsResponse.kt index eb9a3de8..aa96cb6e 100644 --- a/app/src/main/java/com/texthip/thip/data/model/users/response/MyFollowingsResponse.kt +++ b/app/src/main/java/com/texthip/thip/data/model/users/response/MyFollowingsResponse.kt @@ -19,16 +19,4 @@ data class FollowingList( @SerializedName("aliasName") val aliasName: String, @SerializedName("aliasColor") val aliasColor: String, @SerializedName("isFollowing") val isFollowing: Boolean -) - -@Serializable -data class MyRecentFollowingsResponse( - @SerializedName("myFollowingUsers") val myFollowingUsers: List -) - -@Serializable -data class RecentWriterList( - @SerializedName("userId") val userId: Long, - @SerializedName("nickname") val nickname: String, - @SerializedName("profileImageUrl") val profileImageUrl: String? ) \ No newline at end of file diff --git a/app/src/main/java/com/texthip/thip/ui/feed/viewmodel/FeedViewModel.kt b/app/src/main/java/com/texthip/thip/ui/feed/viewmodel/FeedViewModel.kt index 3994e22a..0e7d0d1d 100644 --- a/app/src/main/java/com/texthip/thip/ui/feed/viewmodel/FeedViewModel.kt +++ b/app/src/main/java/com/texthip/thip/ui/feed/viewmodel/FeedViewModel.kt @@ -48,24 +48,24 @@ class FeedViewModel @Inject constructor( private val feedRepository: FeedRepository, private val userRepository: UserRepository ) : ViewModel() { + private val _uiState = MutableStateFlow(FeedUiState()) val uiState = _uiState.asStateFlow() - fun fetchRecentWriters() { private var allFeedsNextCursor: String? = null private var myFeedsNextCursor: String? = null private var isLoadingAllFeeds = false private var isLoadingMyFeeds = false - private fun updateState(update: (FeedUiState) -> FeedUiState) { - _uiState.value = update(_uiState.value) - } - init { loadAllFeeds() fetchRecentWriters() } - + + private fun updateState(update: (FeedUiState) -> FeedUiState) { + _uiState.value = update(_uiState.value) + } + fun onTabSelected(index: Int) { updateState { it.copy(selectedTabIndex = index) } @@ -183,6 +183,7 @@ class FeedViewModel @Inject constructor( 0 -> refreshAllFeeds() 1 -> refreshMyFeeds() } + updateState { it.copy(isRefreshing = false) } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 933f5014..3c73e2d6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -421,9 +421,6 @@ 책 정보를 불러오는데 실패했습니다. 책 저장에 실패했습니다. - - 알 수 없는 오류가 발생했습니다. - 서버 feedId 반환 오류