feat: 홈 컬렉션 섹션 및 전체 컬렉션뷰 구현

app/src/main/java/com/into/websoso/data/repository/UserRepository.kt

@@ -126,6 +126,14 @@ class UserRepository
 
         suspend fun fetchNovelDetailFirstLaunched() = userStorage.data.first()[NOVEL_DETAIL_FIRST_LAUNCHED_KEY] ?: true
 
+        suspend fun fetchMyPageTooltipConfirmed() = userStorage.data.first()[MY_PAGE_TOOLTIP_CONFIRMED_KEY] ?: false
+
+        suspend fun saveMyPageTooltipConfirmed() {
+            userStorage.edit { preferences ->
+                preferences[MY_PAGE_TOOLTIP_CONFIRMED_KEY] = true
+            }
+        }
+
         suspend fun fetchNicknameValidity(nickname: String): Boolean = userApi.getNicknameValidity(nickname).isValid
 
         suspend fun fetchUserFeeds(
@@ -187,6 +195,7 @@ class UserRepository
 
         companion object {
             val NOVEL_DETAIL_FIRST_LAUNCHED_KEY = booleanPreferencesKey("NOVEL_DETAIL_FIRST_LAUNCHED")
+            val MY_PAGE_TOOLTIP_CONFIRMED_KEY = booleanPreferencesKey("MY_PAGE_TOOLTIP_CONFIRMED")
             val TERMS_AGREEMENT_CHECKED_KEY = booleanPreferencesKey("terms_agreement_checked")
             val USER_ID_KEY = stringPreferencesKey("USER_ID")
             val USER_NICKNAME_KEY = stringPreferencesKey("USER_NICKNAME")

app/src/main/java/com/into/websoso/ui/collection/CollectionActivity.kt

@@ -37,6 +37,7 @@ class CollectionActivity : ComponentActivity() {
                     isSharing = isSharing,
                     initialCollectionId = intent.getLongExtra(COLLECTION_ID, 0L).takeIf { it > 0L },
                     userId = intent.getLongExtra(USER_ID, 0L).takeIf { it > 0L },
+                    startWithPublicList = intent.getBooleanExtra(START_WITH_PUBLIC_LIST, false),
                 )
             }
         }
@@ -95,15 +96,18 @@ class CollectionActivity : ComponentActivity() {
     companion object {
         private const val COLLECTION_ID = "COLLECTION_ID"
         private const val USER_ID = "USER_ID"
+        private const val START_WITH_PUBLIC_LIST = "START_WITH_PUBLIC_LIST"
 
         fun getIntent(
             context: Context,
             collectionId: Long? = null,
             userId: Long? = null,
+            startWithPublicList: Boolean = false,
         ): Intent =
             Intent(context, CollectionActivity::class.java).apply {
                 collectionId?.let { putExtra(COLLECTION_ID, it) }
                 userId?.let { putExtra(USER_ID, it) }
+                putExtra(START_WITH_PUBLIC_LIST, startWithPublicList)
             }
     }
 }

app/src/main/java/com/into/websoso/ui/main/MainActivity.kt

@@ -9,6 +9,8 @@ import androidx.activity.OnBackPressedCallback
 import androidx.activity.viewModels
 import androidx.annotation.IntegerRes
 import androidx.core.os.bundleOf
+import androidx.core.view.doOnLayout
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
 import com.google.firebase.messaging.FirebaseMessaging
@@ -67,6 +69,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(activity_main) {
         setupBackButtonListener()
         setupBottomNavigationView()
         setupObserver()
+        setupMyPageTooltip()
         onViewGuestClick()
         handleNavigation(intent.getAdaptedSerializableExtra<FragmentType>(DESTINATION_KEY))
         updateFcmToken()
@@ -140,6 +143,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(activity_main) {
     private fun setupBottomNavListener() {
         binding.bnvMain.setOnItemSelectedListener { item ->
             fragmentTags[item.itemId] ?: return@setOnItemSelectedListener true
+            if (item.itemId == menu_my_page && binding.tvMainMyPageTooltip.isVisible) {
+                mainViewModel.confirmMyPageTooltip()
+            }
             val currentFragment = supportFragmentManager.findFragmentById(fcv_main)
 
             if (item.itemId == menu_library && currentFragment is LibraryFragment) {
@@ -184,6 +190,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(activity_main) {
         }
 
         currentFragment = targetFragment
+        updateMyPageTooltipVisibility()
     }
 
     private fun findOrCreateFragment(tag: String): Fragment =
@@ -209,7 +216,30 @@ class MainActivity : BaseActivity<ActivityMainBinding>(activity_main) {
                     binding.viewMainGuest.visibility = View.VISIBLE
                 }
             }
+            updateMyPageTooltipVisibility()
+        }
+    }
+
+    private fun setupMyPageTooltip() {
+        binding.tvMainMyPageTooltip.setOnClickListener {
+            binding.bnvMain.selectedItemId = menu_my_page
         }
+        // 말풍선 꼬리(우측에서 35.5dp)가 마이페이지 탭 중앙을 가리키도록 맞춘다.
+        binding.tvMainMyPageTooltip.doOnLayout { tooltip ->
+            val myPageItem = binding.bnvMain.findViewById<View>(menu_my_page) ?: return@doOnLayout
+            val itemCenterX = binding.bnvMain.left + (myPageItem.parent as View).left + myPageItem.left + myPageItem.width / 2f
+            val tailX = tooltip.right - TOOLTIP_TAIL_END_OFFSET_DP * resources.displayMetrics.density
+            tooltip.translationX = itemCenterX - tailX
+        }
+        mainViewModel.isMyPageTooltipPending.observe(this) { updateMyPageTooltipVisibility() }
+    }
+
+    /** 툴팁은 로그인 사용자가 홈 탭에 있을 때만 보여준다. */
+    private fun updateMyPageTooltipVisibility() {
+        binding.tvMainMyPageTooltip.isVisible =
+            mainViewModel.isMyPageTooltipPending.value == true &&
+            mainViewModel.isLogin.value != false &&
+            currentFragment is HomeFragment
     }
 
     private fun onViewGuestClick() {
@@ -258,6 +288,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(activity_main) {
 
     companion object {
         private const val DESTINATION_KEY = "destination"
+        private const val TOOLTIP_TAIL_END_OFFSET_DP = 35.5f
         const val IS_LOGIN_KEY = "isLogin"
 
         fun getIntent(context: Context): Intent =

app/src/main/java/com/into/websoso/ui/main/MainViewModel.kt

@@ -30,6 +30,24 @@ class MainViewModel
 
         val isLogin: LiveData<Boolean> = savedStateHandle.getLiveData(MainActivity.IS_LOGIN_KEY)
 
+        private val _isMyPageTooltipPending: MutableLiveData<Boolean> = MutableLiveData(false)
+        val isMyPageTooltipPending: LiveData<Boolean> get() = _isMyPageTooltipPending
+
+        init {
+            viewModelScope.launch {
+                _isMyPageTooltipPending.value = !userRepository.fetchMyPageTooltipConfirmed()
+            }
+        }
+
+        /** 툴팁이 보이는 상태에서 마이페이지로 이동했을 때만 호출한다. 이후로는 툴팁을 띄우지 않는다. */
+        fun confirmMyPageTooltip() {
+            if (_isMyPageTooltipPending.value != true) return
+            _isMyPageTooltipPending.value = false
+            viewModelScope.launch {
+                runCatching { userRepository.saveMyPageTooltipConfirmed() }
+            }
+        }
+
         fun updateUserInfo() {
             viewModelScope.launch {
                 _mainUiState.value = mainUiState.value?.copy(

app/src/main/java/com/into/websoso/ui/main/home/HomeFragment.kt

@@ -8,6 +8,7 @@ import android.view.View
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts.RequestPermission
 import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
+import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
@@ -26,12 +27,15 @@ import com.into.websoso.core.common.util.SingleEventHandler
 import com.into.websoso.core.common.util.collectWithLifecycle
 import com.into.websoso.core.common.util.showWebsosoToast
 import com.into.websoso.core.common.util.tracker.Tracker
+import com.into.websoso.core.designsystem.theme.WebsosoTheme
 import com.into.websoso.core.resource.R.drawable.ic_novel_rating_alert
 import com.into.websoso.core.resource.R.string.home_rising_feed_for_user
 import com.into.websoso.core.resource.R.string.home_taste_load_failed
 import com.into.websoso.core.resource.R.string.home_taste_refresh_failed
 import com.into.websoso.core.resource.R.string.load_load_title
 import com.into.websoso.databinding.FragmentHomeBinding
+import com.into.websoso.feature.collection.HomeCollectionSection
+import com.into.websoso.ui.collection.CollectionActivity
 import com.into.websoso.ui.detailExplore.DetailExploreActivity
 import com.into.websoso.ui.feedDetail.FeedDetailActivity
 import com.into.websoso.ui.main.MainViewModel
@@ -121,6 +125,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(fragment_home) {
         binding.btnHomeTasteRetry.setOnClickListener { homeViewModel.retryTaste() }
         setupObserver()
         setupDotsIndicator()
+        setupCollectionSection()
         onSettingPreferenceGenreClick()
         onNotificationButtonClick()
         onNormalSearchButtonClick()
@@ -277,6 +282,24 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(fragment_home) {
         binding.dotsIndicatorHome.attachTo(binding.vpHomePopularFeed)
     }
 
+    private fun setupCollectionSection() {
+        binding.cvHomeCollection.apply {
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+            setContent {
+                WebsosoTheme {
+                    HomeCollectionSection(
+                        onListClick = {
+                            startActivity(CollectionActivity.getIntent(requireContext(), startWithPublicList = true))
+                        },
+                        onCollectionClick = {
+                            startActivity(CollectionActivity.getIntent(requireContext(), collectionId = it))
+                        },
+                    )
+                }
+            }
+        }
+    }
+
     private fun onPopularNovelClick(novelId: Long) {
         tracker.trackEvent("home_today_ranking")
         navigateToNovelDetail(novelId)

app/src/main/res/layout/activity_main.xml

@@ -47,6 +47,23 @@
             app:menu="@menu/menu_main_bnv"
             tools:menu="@menu/menu_main_bnv" />
 
+        <TextView
+            android:id="@+id/tv_main_my_page_tooltip"
+            android:layout_width="194dp"
+            android:layout_height="44dp"
+            android:layout_marginEnd="14dp"
+            android:layout_marginBottom="4dp"
+            android:background="@drawable/bg_main_my_page_tooltip"
+            android:gravity="center"
+            android:paddingBottom="6dp"
+            android:text="@string/main_my_page_tooltip"
+            android:textAppearance="@style/body3"
+            android:textColor="@color/white"
+            android:visibility="gone"
+            app:layout_constraintBottom_toTopOf="@id/view_main_divider"
+            app:layout_constraintEnd_toEndOf="parent"
+            tools:visibility="visible" />
+
         <View
             android:id="@+id/view_main_guest"
             android:layout_width="0dp"

app/src/main/res/layout/fragment_home.xml

@@ -144,6 +144,14 @@
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
+                <androidx.compose.ui.platform.ComposeView
+                    android:id="@+id/cv_home_collection"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/cl_home_detail_search" />
+
                 <TextView
                     android:id="@+id/tv_home_today_popular_novel"
                     android:layout_width="wrap_content"
@@ -153,7 +161,7 @@
                     android:text="@string/home_today_popular"
                     android:textAppearance="@style/headline1"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/cl_home_detail_search" />
+                    app:layout_constraintTop_toBottomOf="@id/cv_home_collection" />
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv_home_today_popular_novel"

core/resource/src/main/res/drawable/bg_main_my_page_tooltip.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="194dp"
+    android:height="44dp"
+    android:viewportWidth="194"
+    android:viewportHeight="44">
+    <!-- 꼬리가 오른쪽 아래(우측에서 35.5dp)에서 마이페이지 탭을 가리킨다. -->
+    <group
+        android:pivotX="97"
+        android:pivotY="22"
+        android:rotation="180">
+        <path
+            android:fillColor="#6A5DFD"
+            android:pathData="M34.0957,0.5C34.7108,-0.1666 36.2483,-0.1667 36.8633,0.5L41.9375,6H180C187.732,6 194,12.268 194,20V30C194,37.7319 187.732,44 180,44H14C6.268,44 0,37.7319 0,30V20C0,12.268 6.268,6 14,6H29.0215L34.0957,0.5Z" />
+    </group>
+</vector>

core/resource/src/main/res/values/strings.xml

@@ -11,6 +11,7 @@
     <string name="main_ic_feed">피드</string>
     <string name="main_ic_my_page">My</string>
     <string name="main_back_press">뒤로가기를 한번 더 누르면 종료됩니다</string>
+    <string name="main_my_page_tooltip">나만의 컬렉션을 만들어보세요</string>
 
     <!--일반 탐색 뷰-->
     <string name="normal_explore_novel_count_title">작품</string>
@@ -483,6 +484,8 @@
 
     <!-- 컬렉션 뷰 -->
     <string name="collection_title">컬렉션</string>
+    <string name="collection_public_title">컬렉션 모음.zip</string>
+    <string name="collection_owner_label">%1$s님의 컬렉션</string>
     <string name="collection_make">컬렉션 만들기</string>
     <string name="collection_empty">등록된 컬렉션이 없어요</string>
     <string name="collection_other_user_empty">컬렉션을 등록하지 않은 유저에요</string>

data/collection/build.gradle.kts

@@ -17,4 +17,7 @@ dependencies {
     implementation(libs.paging.runtime)
     implementation(libs.retrofit)
     implementation(libs.serialization.json)
+
+    testImplementation(libs.junit)
+    testImplementation(libs.coroutines.test)
 }

data/collection/src/main/java/com/into/websoso/data/collection/CollectionApi.kt

@@ -14,6 +14,12 @@ internal interface CollectionApi {
         @Body request: SaveCollectionRequestDto,
     ): CreateCollectionResponseDto
 
+    @GET("collections")
+    suspend fun getPublicCollections(
+        @Query("cursor") cursor: String?,
+        @Query("size") size: Int,
+    ): PublicCollectionPageResponseDto
+
     @GET("collections/{collectionId}")
     suspend fun getCollection(
         @Path("collectionId") collectionId: Long,

data/collection/src/main/java/com/into/websoso/data/collection/CollectionDto.kt

@@ -5,6 +5,7 @@ import com.into.websoso.domain.collection.model.CollectionDetail
 import com.into.websoso.domain.collection.model.CollectionNovel
 import com.into.websoso.domain.collection.model.CollectionOwner
 import com.into.websoso.domain.collection.model.CollectionPage
+import com.into.websoso.domain.collection.model.PublicCollection
 import com.into.websoso.domain.collection.model.SaveCollection
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -102,6 +103,40 @@ internal data class CollectionOwnerDto(
         )
 }
 
+@Serializable
+internal data class PublicCollectionResponseDto(
+    @SerialName("collectionId") val collectionId: Long,
+    @SerialName("collectionName") val collectionName: String,
+    @SerialName("collectionDescription") val collectionDescription: String? = null,
+    @SerialName("novelCount") val novelCount: Int,
+    @SerialName("owner") val owner: CollectionOwnerDto,
+    @SerialName("recentNovels") val recentNovels: List<CollectionNovelDto>,
+) {
+    fun toDomain() =
+        PublicCollection(
+            id = collectionId,
+            name = collectionName,
+            description = collectionDescription,
+            novelCount = novelCount,
+            owner = owner.toDomain(),
+            recentNovels = recentNovels.map(CollectionNovelDto::toDomain),
+        )
+}
+
+@Serializable
+internal data class PublicCollectionPageResponseDto(
+    @SerialName("hasNext") val hasNext: Boolean,
+    @SerialName("nextCursor") val nextCursor: String? = null,
+    @SerialName("collections") val collections: List<PublicCollectionResponseDto>,
+) {
+    fun toCursorPage() =
+        CursorPage(
+            items = collections.map(PublicCollectionResponseDto::toDomain),
+            hasNext = hasNext,
+            nextCursor = nextCursor,
+        )
+}
+
 @Serializable
 internal data class CollectionDetailResponseDto(
     @SerialName("collectionId") val collectionId: Long,

data/collection/src/main/java/com/into/websoso/data/collection/CollectionPagingSource.kt

@@ -2,20 +2,27 @@ package com.into.websoso.data.collection
 
 import androidx.paging.PagingSource
 import androidx.paging.PagingState
-import com.into.websoso.domain.collection.model.Collection
 import com.into.websoso.domain.collection.model.CollectionPage
 import kotlinx.coroutines.CancellationException
 
-internal class CollectionPagingSource(
-    private val getPage: suspend (cursor: String?, size: Int) -> CollectionPage,
-) : PagingSource<String, Collection>() {
-    override suspend fun load(params: LoadParams<String>): LoadResult<String, Collection> =
+internal data class CursorPage<T>(
+    val items: List<T>,
+    val hasNext: Boolean,
+    val nextCursor: String?,
+)
+
+internal fun CollectionPage.toCursorPage() = CursorPage(items = collections, hasNext = hasNext, nextCursor = nextCursor)
+
+internal class CollectionPagingSource<T : Any>(
+    private val getPage: suspend (cursor: String?, size: Int) -> CursorPage<T>,
+) : PagingSource<String, T>() {
+    override suspend fun load(params: LoadParams<String>): LoadResult<String, T> =
         runCatching {
             getPage(params.key, params.loadSize)
         }.fold(
             onSuccess = { page ->
                 LoadResult.Page(
-                    data = page.collections,
+                    data = page.items,
                     prevKey = null,
                     nextKey = page.nextCursor.takeIf { page.hasNext },
                 )
@@ -26,5 +33,5 @@ internal class CollectionPagingSource(
             },
         )
 
-    override fun getRefreshKey(state: PagingState<String, Collection>): String? = null
+    override fun getRefreshKey(state: PagingState<String, T>): String? = null
 }