테마 마켓 추가

app/src/main/java/com/wafflestudio/snutt2/lib/android/webview/LoadState.kt

@@ -1,8 +1,7 @@
 package com.wafflestudio.snutt2.lib.android.webview
 
 sealed class LoadState {
-    object Success : LoadState()
-    object Error : LoadState()
+    data object Success : LoadState()
+    data object Error : LoadState()
     data class Loading(val progress: Int) : LoadState()
-    data class InitialLoading(val progress: Int) : LoadState()
 }

app/src/main/java/com/wafflestudio/snutt2/lib/android/webview/ReviewWebViewContainer.kt

@@ -18,7 +18,7 @@ class ReviewWebViewContainer(
     private val accessToken: StateFlow<String?>,
     private val isDarkMode: Boolean,
 ) : WebViewContainer {
-    val loadState: MutableState<LoadState> = mutableStateOf(LoadState.InitialLoading(0))
+    val loadState: MutableState<LoadState> = mutableStateOf(LoadState.Loading(0))
 
     override val webView: WebView = WebView(context).apply {
         if (BuildConfig.DEBUG) {
@@ -32,10 +32,7 @@ class ReviewWebViewContainer(
             }
 
             override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
-                loadState.value = when (loadState.value) {
-                    is LoadState.InitialLoading -> LoadState.InitialLoading(0)
-                    else -> LoadState.Loading(0)
-                }
+                loadState.value = LoadState.Loading(0)
             }
 
             override fun onReceivedError(
@@ -49,7 +46,6 @@ class ReviewWebViewContainer(
         this.webChromeClient = object : WebChromeClient() {
             override fun onProgressChanged(view: WebView?, newProgress: Int) {
                 when (loadState.value) {
-                    is LoadState.InitialLoading -> LoadState.InitialLoading(newProgress)
                     is LoadState.Loading -> LoadState.Loading(newProgress)
                     else -> null
                 }?.let {

app/src/main/java/com/wafflestudio/snutt2/lib/android/webview/ThemeMarketWebViewContainer.kt

@@ -0,0 +1,115 @@
+package com.wafflestudio.snutt2.lib.android.webview
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.os.Build
+import android.webkit.CookieManager
+import android.webkit.WebChromeClient
+import android.webkit.WebResourceError
+import android.webkit.WebResourceRequest
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import com.wafflestudio.snutt2.BuildConfig
+import com.wafflestudio.snutt2.R
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.first
+import java.net.URL
+
+class ThemeMarketWebViewContainer(
+    private val context: Context,
+    private val accessToken: StateFlow<String?>,
+    private val isDarkMode: Boolean,
+) : WebViewContainer {
+    val loadState: MutableState<LoadState> = mutableStateOf(LoadState.Loading(0))
+
+    override val webView: WebView = WebView(context).apply {
+        if (BuildConfig.DEBUG) {
+            WebView.setWebContentsDebuggingEnabled(true)
+        }
+        this.webViewClient = object : WebViewClient() {
+            override fun onPageFinished(view: WebView?, url: String?) {
+                if (loadState.value != LoadState.Error) {
+                    loadState.value = LoadState.Success
+                }
+            }
+
+            override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
+                loadState.value = LoadState.Loading(0)
+            }
+
+            override fun onReceivedError(
+                view: WebView?,
+                request: WebResourceRequest?,
+                error: WebResourceError?,
+            ) {
+                loadState.value = LoadState.Error
+            }
+        }
+        this.webChromeClient = object : WebChromeClient() {
+            override fun onProgressChanged(view: WebView?, newProgress: Int) {
+                when (loadState.value) {
+                    is LoadState.Loading -> LoadState.Loading(newProgress)
+                    else -> null
+                }?.let {
+                    loadState.value = it
+                }
+            }
+        }
+        this.settings.javaScriptEnabled = true
+    }
+
+    override suspend fun openPage(url: String?) {
+        val accessToken = accessToken.filterNotNull().first()
+        val themeMarketUrl = url ?: THEME_MARKET_URL
+        val urlHost = URL(themeMarketUrl).host
+
+        setCookies(urlHost, accessToken)
+        webView.loadUrl(themeMarketUrl)
+    }
+
+    private fun setCookies(host: String, accessToken: String) {
+        CookieManager.getInstance().apply {
+            setCookie(
+                host,
+                "x-access-apikey=${context.getString(R.string.api_key)}",
+            )
+            setCookie(
+                host,
+                "x-access-token=$accessToken",
+            )
+            setCookie(
+                host,
+                "x-os-type=android",
+            )
+            setCookie(
+                host,
+                "x-os-version=${Build.VERSION.SDK_INT}",
+            )
+            setCookie(
+                host,
+                "x-app-version=${BuildConfig.VERSION_NAME}",
+            )
+            setCookie(
+                host,
+                "x-app-type=${if (BuildConfig.DEBUG) "debug" else "release"}",
+            )
+            setCookie(
+                host,
+                "theme=${
+                if (isDarkMode) {
+                    "dark"
+                } else {
+                    "light"
+                }
+                }",
+            )
+        }.flush()
+    }
+
+    companion object {
+        private val THEME_MARKET_URL = "https://snutt-theme-market-dev.wafflestudio.com/download"
+    }
+}

app/src/main/java/com/wafflestudio/snutt2/lib/android/webview/WebViewContainer.kt

@@ -5,5 +5,5 @@ import android.webkit.WebView
 interface WebViewContainer {
     val webView: WebView
 
-    suspend fun openPage(url: String?)
+    suspend fun openPage(url: String? = null)
 }

app/src/main/java/com/wafflestudio/snutt2/lib/network/dto/core/ThemeDto.kt

@@ -12,6 +12,7 @@ data class ThemeDto(
     val name: String?,
     val colors: List<ColorDto>?,
     val isCustom: Boolean?,
+    val status: String?,
 ) {
 
     fun toTableTheme(): TableTheme {
@@ -20,7 +21,7 @@ data class ThemeDto(
                 id = id!!,
                 name = name ?: "",
                 colors = colors ?: emptyList(),
-                isFromMarket = false, // FIXME: 서버 응답에 맞게 수정
+                isFromMarket = status == "DOWNLOADED",
             )
         } else {
             BuiltInTheme.fromCode(theme ?: 0)

app/src/main/java/com/wafflestudio/snutt2/views/NavigationDestination.kt

@@ -27,6 +27,7 @@ object NavigationDestination {
     const val Bookmark = "bookmarks"
     const val NetworkLog = "network_log"
     const val VacancyNotification = "vacancy"
+    const val ThemeMarket = "theme_market"
     const val Friends = "friends"
     const val ThemeConfig = "theme_config"
     const val ThemeDetail = "theme_detail"

app/src/main/java/com/wafflestudio/snutt2/views/RootActivity.kt

@@ -74,6 +74,7 @@ import com.wafflestudio.snutt2.views.logged_in.lecture_detail.LectureDetailViewM
 import com.wafflestudio.snutt2.views.logged_in.lecture_detail.deeplink.TimetableLectureDetailPage
 import com.wafflestudio.snutt2.views.logged_in.notifications.NotificationRoute
 import com.wafflestudio.snutt2.views.logged_in.table_lectures.LecturesOfTablePage
+import com.wafflestudio.snutt2.views.logged_in.thememarket.ThemeMarketRoute
 import com.wafflestudio.snutt2.views.logged_in.vacancy_noti.VacancyPage
 import com.wafflestudio.snutt2.views.logged_in.vacancy_noti.VacancyViewModel
 import com.wafflestudio.snutt2.views.logged_out.*
@@ -431,6 +432,11 @@ class RootActivity : AppCompatActivity() {
             val vacancyViewModel = hiltViewModel<VacancyViewModel>(parentEntry)
             VacancyPage(vacancyViewModel)
         }
+        composable2(NavigationDestination.ThemeMarket) {
+            ThemeMarketRoute(
+                onBackClick = { navController.popBackStack() },
+            )
+        }
         composable2(NavigationDestination.ThemeConfig) {
             ThemeConfigRoute(
                 onNavigateBack = { navController.popBackStack() },

app/src/main/java/com/wafflestudio/snutt2/views/logged_in/home/reviews/ReviewPage.kt

@@ -76,11 +76,6 @@ fun ReviewWebView(height: Float = 1.0f) {
                 onRetry = { scope.launch { webViewContainer.reload() } },
             )
 
-            is LoadState.InitialLoading -> WebViewLoading(
-                modifier = Modifier.fillMaxSize(),
-                progress = loadState.progress / 100.0f,
-            )
-
             is LoadState.Loading -> WebViewLoading(
                 modifier = Modifier.fillMaxSize(),
                 progress = loadState.progress / 100.0f,

app/src/main/java/com/wafflestudio/snutt2/views/logged_in/home/settings/SettingsPage.kt

@@ -135,6 +135,15 @@ fun SettingsPage(
                         )
                     },
                 )
+                SettingItem(
+                    title = stringResource(R.string.settings_item_theme_market),
+                    hasNextPage = true,
+                    onClick = {
+                        navController.navigate(
+                            NavigationDestination.ThemeMarket,
+                        )
+                    },
+                )
             }
             Margin(height = 10.dp)
             SettingColumn {

app/src/main/java/com/wafflestudio/snutt2/views/logged_in/home/settings/theme/CustomThemeMoreActionBottomSheet.kt

@@ -18,7 +18,7 @@ import com.wafflestudio.snutt2.components.compose.PaletteIcon
 import com.wafflestudio.snutt2.components.compose.TrashIcon
 
 @Composable
-fun CustomThemeMoreActionBottomSheet(
+fun MyCustomThemeMoreActionBottomSheet(
     onClickDetail: () -> Unit,
     onClickDuplicate: () -> Unit,
     onClickDelete: () -> Unit,
@@ -62,3 +62,38 @@ fun CustomThemeMoreActionBottomSheet(
         )
     }
 }
+
+@Composable
+fun MarketCustomThemeMoreActionBottomSheet(
+    onClickDetail: () -> Unit,
+    onClickDelete: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier
+            .background(MaterialTheme.colors.surface)
+            .padding(vertical = 12.dp)
+            .fillMaxWidth(),
+    ) {
+        MoreActionItem(
+            icon = {
+                PaletteIcon(
+                    modifier = Modifier.size(30.dp),
+                    colorFilter = ColorFilter.tint(MaterialTheme.colors.onSurface),
+                )
+            },
+            text = stringResource(R.string.custom_theme_action_detail_view),
+            onClick = { onClickDetail() },
+        )
+        MoreActionItem(
+            icon = {
+                TrashIcon(
+                    modifier = Modifier.size(30.dp),
+                    colorFilter = ColorFilter.tint(MaterialTheme.colors.onSurface),
+                )
+            },
+            text = stringResource(R.string.custom_theme_action_delete),
+            onClick = { onClickDelete() },
+        )
+    }
+}

app/src/main/java/com/wafflestudio/snutt2/views/logged_in/home/settings/theme/ThemeConfigScreen.kt

@@ -78,12 +78,13 @@ fun ThemeConfigRoute(
 ) {
     val apiOnError = LocalApiOnError.current
     val apiOnProgress = LocalApiOnProgress.current
-
-    val customThemes by themeConfigViewModel.customThemes.collectAsState()
+    val myCustomThemes by themeConfigViewModel.myCustomThemes.collectAsState()
+    val marketCustomThemes by themeConfigViewModel.marketCustomThemes.collectAsState()
     val builtInThemes by themeConfigViewModel.builtInThemes.collectAsState()
 
     ThemeConfigScreen(
-        customThemes = customThemes,
+        myCustomThemes = myCustomThemes,
+        marketCustomThemes = marketCustomThemes,
         builtInThemes = builtInThemes,
         onNavigateBack = onNavigateBack,
         onFetchThemes = {
@@ -109,7 +110,8 @@ fun ThemeConfigRoute(
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
 fun ThemeConfigScreen(
-    customThemes: List<CustomTheme>,
+    myCustomThemes: List<CustomTheme>,
+    marketCustomThemes: List<CustomTheme>,
     builtInThemes: List<BuiltInTheme>,
     onNavigateBack: () -> Unit,
     onFetchThemes: suspend () -> Unit,
@@ -162,12 +164,12 @@ fun ThemeConfigScreen(
             ) {
                 ThemesRow(
                     title = stringResource(R.string.theme_config_custom_theme),
-                    themes = customThemes,
+                    themes = myCustomThemes,
                     onClickItem = onNavigateToDetail,
                     onClickMore = { theme ->
                         scope.launch {
                             bottomSheet.setSheetContent {
-                                CustomThemeMoreActionBottomSheet(
+                                MyCustomThemeMoreActionBottomSheet(
                                     onClickDetail = {
                                         scope.launch {
                                             onNavigateToDetail(theme)
@@ -201,6 +203,39 @@ fun ThemeConfigScreen(
                         )
                     },
                 )
+                if (marketCustomThemes.isNotEmpty()) {
+                    Spacer(modifier = Modifier.height(4.dp))
+                    ThemesRow(
+                        title = stringResource(R.string.theme_config_market_custom_theme),
+                        themes = marketCustomThemes,
+                        onClickItem = onNavigateToDetail,
+                        onClickMore = { theme ->
+                            scope.launch {
+                                bottomSheet.setSheetContent {
+                                    MarketCustomThemeMoreActionBottomSheet(
+                                        onClickDetail = {
+                                            scope.launch {
+                                                onNavigateToDetail(theme)
+                                                bottomSheet.hide()
+                                            }
+                                        },
+                                        onClickDelete = {
+                                            showDeleteThemeDialog(
+                                                composableStates = composableStates,
+                                                onConfirm = {
+                                                    onDeleteTheme(theme)
+                                                    modalState.hide()
+                                                    bottomSheet.hide()
+                                                },
+                                            )
+                                        },
+                                    )
+                                }
+                                bottomSheet.show()
+                            }
+                        },
+                    )
+                }
                 Spacer(modifier = Modifier.height(4.dp))
                 ThemesRow(
                     title = stringResource(R.string.theme_config_builtin_theme),

app/src/main/java/com/wafflestudio/snutt2/views/logged_in/home/settings/theme/ThemeConfigViewModel.kt

@@ -1,9 +1,11 @@
 package com.wafflestudio.snutt2.views.logged_in.home.settings.theme
 
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.wafflestudio.snutt2.data.current_table.CurrentTableRepository
 import com.wafflestudio.snutt2.data.tables.TableRepository
 import com.wafflestudio.snutt2.data.themes.ThemeRepository
+import com.wafflestudio.snutt2.lib.map
 import com.wafflestudio.snutt2.model.BuiltInTheme
 import com.wafflestudio.snutt2.model.CustomTheme
 import com.wafflestudio.snutt2.model.TableTheme
@@ -18,7 +20,13 @@ class ThemeConfigViewModel @Inject constructor(
     currentTableRepository: CurrentTableRepository,
 ) : ViewModel() {
 
-    val customThemes: StateFlow<List<CustomTheme>> = themeRepository.customThemes
+    val customThemes = themeRepository.customThemes
+    val myCustomThemes = themeRepository.customThemes.map(viewModelScope) { customThemes ->
+        customThemes.filter { it.isFromMarket.not() }
+    }
+    val marketCustomThemes = themeRepository.customThemes.map(viewModelScope) { customThemes ->
+        customThemes.filter { it.isFromMarket }
+    }
     val builtInThemes: StateFlow<List<BuiltInTheme>> = themeRepository.builtInThemes
 
     val currentTable = currentTableRepository.currentTable