[feat] 북마크 콘텐츠 목록 화면 Compose 마이그레이션

android/app/src/main/AndroidManifest.xml

@@ -17,6 +17,9 @@
         android:theme="@style/Theme.Turip"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
+        <activity
+            android:name=".ui.bookmarks.BookmarkContentActivity"
+            android:exported="false" />
         <activity
             android:name=".ui.mypage.MyPageActivity"
             android:exported="false" />

android/app/src/main/java/com/on/turip/data/bookmarks/BookmarkMapper.kt

@@ -5,14 +5,14 @@ import com.on.turip.data.bookmarks.dto.BookmarkContentResponse
 import com.on.turip.data.bookmarks.dto.BookmarkContentsResponse
 import com.on.turip.data.content.toDomain
 import com.on.turip.domain.bookmark.BookmarkContent
-import com.on.turip.domain.bookmark.PagedBookmarkContents
+import com.on.turip.domain.common.paging.Page
 
 fun Long.toRequestDto(): BookmarkAddRequest = BookmarkAddRequest(contentId = this)
 
-fun BookmarkContentsResponse.toDomain(): PagedBookmarkContents =
-    PagedBookmarkContents(
-        bookmarkContents = contents.map { it.toDomain() },
-        loadable = loadable,
+fun BookmarkContentsResponse.toDomain(): Page<BookmarkContent> =
+    Page(
+        items = contents.map { it.toDomain() },
+        hasNext = loadable,
     )
 
 fun BookmarkContentResponse.toDomain(): BookmarkContent =

android/app/src/main/java/com/on/turip/data/bookmarks/repository/DefaultBookmarkRepository.kt

@@ -5,8 +5,9 @@ import com.on.turip.core.result.mapCatching
 import com.on.turip.data.bookmarks.datasource.BookmarkRemoteDataSource
 import com.on.turip.data.bookmarks.toDomain
 import com.on.turip.data.bookmarks.toRequestDto
-import com.on.turip.domain.bookmark.PagedBookmarkContents
+import com.on.turip.domain.bookmark.BookmarkContent
 import com.on.turip.domain.bookmark.repository.BookmarkRepository
+import com.on.turip.domain.common.paging.Page
 import javax.inject.Inject
 
 class DefaultBookmarkRepository @Inject constructor(
@@ -20,5 +21,5 @@ class DefaultBookmarkRepository @Inject constructor(
     override suspend fun loadBookmarks(
         size: Int,
         lastId: Long,
-    ): TuripResult<PagedBookmarkContents> = bookmarkRemoteDataSource.getBookmarks(size, lastId).mapCatching { it.toDomain() }
+    ): TuripResult<Page<BookmarkContent>> = bookmarkRemoteDataSource.getBookmarks(size, lastId).mapCatching { it.toDomain() }
 }

android/app/src/main/java/com/on/turip/domain/bookmark/repository/BookmarkRepository.kt

@@ -1,7 +1,8 @@
 package com.on.turip.domain.bookmark.repository
 
 import com.on.turip.core.result.TuripResult
-import com.on.turip.domain.bookmark.PagedBookmarkContents
+import com.on.turip.domain.bookmark.BookmarkContent
+import com.on.turip.domain.common.paging.Page
 
 interface BookmarkRepository {
     suspend fun createBookmark(contentId: Long): TuripResult<Unit>
@@ -11,5 +12,5 @@ interface BookmarkRepository {
     suspend fun loadBookmarks(
         size: Int,
         lastId: Long,
-    ): TuripResult<PagedBookmarkContents>
+    ): TuripResult<Page<BookmarkContent>>
 }

android/app/src/main/java/com/on/turip/domain/common/paging/Page.kt

@@ -0,0 +1,6 @@
+package com.on.turip.domain.common.paging
+
+data class Page<T>(
+    val items: List<T>,
+    val hasNext: Boolean,
+)

android/app/src/main/java/com/on/turip/ui/bookmarks/BookmarkContentActivity.kt

@@ -0,0 +1,64 @@
+package com.on.turip.ui.bookmarks
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
+import com.on.turip.ui.compose.bookmarks.BookmarkContentScreen
+import com.on.turip.ui.compose.designsystem.theme.TuripTheme
+import com.on.turip.ui.login.LoginActivity
+import com.on.turip.ui.trip.TripDetailActivity
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class BookmarkContentActivity : AppCompatActivity() {
+    private var hasBookmarkChanges = false
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+
+        setContent {
+            TuripTheme {
+                BookmarkContentScreen(
+                    navigateToBack = {
+                        finish()
+                    },
+                    navigateToLogin = {
+                        val intent: Intent =
+                            LoginActivity.newIntent(this).apply {
+                                flags =
+                                    Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+                            }
+                        startActivity(intent)
+                        finish()
+                    },
+                    navigateToContent = { contentId: Long ->
+                        val intent: Intent =
+                            TripDetailActivity.newIntent(context = this, contentId = contentId)
+                        startActivity(intent)
+                    },
+                    onBookmarkChanged = {
+                        hasBookmarkChanges = true
+                    },
+                )
+            }
+        }
+    }
+
+    override fun finish() {
+        val data =
+            Intent().apply {
+                putExtra("BOOKMARK_CONTENT_HAS_BOOKMARK_CHANGES_FLAG", hasBookmarkChanges)
+            }
+        setResult(Activity.RESULT_OK, data)
+        super.finish()
+    }
+
+    companion object {
+        fun newIntent(context: Context): Intent = Intent(context, BookmarkContentActivity::class.java)
+    }
+}

android/app/src/main/java/com/on/turip/ui/common/paging/PagingLoadMode.kt

@@ -0,0 +1,9 @@
+package com.on.turip.ui.common.paging
+
+import androidx.compose.runtime.Immutable
+
+@Immutable
+enum class PagingLoadMode {
+    REFRESH,
+    APPEND,
+}

android/app/src/main/java/com/on/turip/ui/common/paging/PagingState.kt

@@ -0,0 +1,13 @@
+package com.on.turip.ui.common.paging
+
+import androidx.compose.runtime.Immutable
+import com.on.turip.ui.common.error.ErrorUiState
+import kotlinx.collections.immutable.ImmutableList
+
+@Immutable
+data class PagingState<T>(
+    val items: ImmutableList<T>,
+    val hasNext: Boolean,
+    val isAppending: Boolean,
+    val errorUiState: ErrorUiState,
+)