테마 마켓 추가

app/src/main/java/com/wafflestudio/snutt2/components/compose/ThemeIcon.kt

@@ -25,6 +25,7 @@ import com.wafflestudio.snutt2.model.BuiltInTheme
 import com.wafflestudio.snutt2.model.CustomTheme
 import com.wafflestudio.snutt2.model.TableTheme
 import com.wafflestudio.snutt2.ui.SNUTTColors
+import com.wafflestudio.snutt2.ui.isDarkMode
 import kotlin.random.Random
 
 @Composable
@@ -36,8 +37,8 @@ fun ThemeIcon(
         Row(
             modifier = modifier,
         ) {
-            val colors = theme.colors.map { Color(it.bgColor!!) }
-            when (theme.colors.size) {
+            val colors = theme.getColors(isDarkMode()).map { Color(it.bgColor!!) }
+            when (colors.size) {
                 1 -> {
                     Box(
                         modifier = Modifier
@@ -311,6 +312,7 @@ fun ThemeIconPreview() {
                             bgColor = Random.nextInt(0x0, 0xffffff),
                         )
                     },
+                    isFromMarket = false,
                 ),
                 modifier = Modifier.size(80.dp),
             )

app/src/main/java/com/wafflestudio/snutt2/components/view/TimetableView.kt

@@ -229,7 +229,6 @@ class TimetableView : View {
                     lecture.color.bgColor!!
                 } else {
                     BuiltInTheme.fromCode(theme).getColorByIndex(
-                        context,
                         lecture.colorIndex,
                     )
                 },

app/src/main/java/com/wafflestudio/snutt2/data/themes/ThemeRepository.kt

@@ -3,7 +3,6 @@ package com.wafflestudio.snutt2.data.themes
 import com.wafflestudio.snutt2.lib.network.dto.core.ColorDto
 import com.wafflestudio.snutt2.model.BuiltInTheme
 import com.wafflestudio.snutt2.model.CustomTheme
-import com.wafflestudio.snutt2.model.TableTheme
 import kotlinx.coroutines.flow.StateFlow
 
 interface ThemeRepository {
@@ -12,8 +11,6 @@ interface ThemeRepository {
 
     val builtInThemes: StateFlow<List<BuiltInTheme>>
 
-    val currentTableTheme: StateFlow<TableTheme> // FIXME: 이게 ThemeRepository에 있는 게 맞나... ThemeRepository와 CurrentTableRepository에 의존하는 UseCase를 만들어야 할까?
-
     suspend fun fetchThemes()
 
     fun getTheme(themeId: String): CustomTheme

app/src/main/java/com/wafflestudio/snutt2/data/themes/ThemeRepositoryImpl.kt

@@ -1,26 +1,19 @@
 package com.wafflestudio.snutt2.data.themes
 
-import com.wafflestudio.snutt2.data.SNUTTStorage
 import com.wafflestudio.snutt2.lib.network.SNUTTRestApi
 import com.wafflestudio.snutt2.lib.network.dto.PatchThemeParams
 import com.wafflestudio.snutt2.lib.network.dto.PostThemeParams
 import com.wafflestudio.snutt2.lib.network.dto.core.ColorDto
 import com.wafflestudio.snutt2.model.BuiltInTheme
 import com.wafflestudio.snutt2.model.CustomTheme
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.stateIn
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class ThemeRepositoryImpl @Inject constructor(
     private val api: SNUTTRestApi,
-    private val storage: SNUTTStorage,
-    externalScope: CoroutineScope,
 ) : ThemeRepository {
 
     private val _customThemes = MutableStateFlow<List<CustomTheme>>(emptyList())
@@ -29,17 +22,9 @@ class ThemeRepositoryImpl @Inject constructor(
     private val _builtInThemes = MutableStateFlow<List<BuiltInTheme>>(emptyList())
     override val builtInThemes: StateFlow<List<BuiltInTheme>> = _builtInThemes
 
-    override val currentTableTheme = combine(storage.lastViewedTable.asStateFlow(), _customThemes) { table, _ ->
-        table.value?.themeId?.let { themeId ->
-            getTheme(themeId)
-        } ?: table.value?.theme?.let {
-            BuiltInTheme.fromCode(it)
-        } ?: BuiltInTheme.SNUTT
-    }.stateIn(externalScope, SharingStarted.Eagerly, BuiltInTheme.SNUTT)
-
     override suspend fun fetchThemes() {
         api._getThemes().let { themes ->
-            _customThemes.value = themes.filter { it.isCustom }.map { it.toTableTheme() as CustomTheme }
+            _customThemes.value = themes.filter { it.isCustom == true }.map { it.toTableTheme() as CustomTheme }
             _builtInThemes.value = (0..5).map { code ->
                 BuiltInTheme.fromCode(code)
             }

app/src/main/java/com/wafflestudio/snutt2/domain/GetCurrentTableThemeUseCase.kt

@@ -0,0 +1,24 @@
+package com.wafflestudio.snutt2.domain
+
+import com.wafflestudio.snutt2.data.current_table.CurrentTableRepository
+import com.wafflestudio.snutt2.data.themes.ThemeRepository
+import com.wafflestudio.snutt2.model.BuiltInTheme
+import com.wafflestudio.snutt2.model.TableTheme
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
+import javax.inject.Inject
+
+class GetCurrentTableThemeUseCase @Inject constructor(
+    private val themeRepository: ThemeRepository,
+    private val currentTableRepository: CurrentTableRepository,
+) {
+    operator fun invoke(): Flow<TableTheme> {
+        return combine(currentTableRepository.currentTable, themeRepository.customThemes) { table, _ ->
+            table?.themeId?.let { themeId ->
+                themeRepository.getTheme(themeId)
+            } ?: table?.theme?.let {
+                BuiltInTheme.fromCode(it)
+            } ?: BuiltInTheme.SNUTT
+        }
+    }
+}

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

@@ -7,25 +7,24 @@ import com.wafflestudio.snutt2.model.TableTheme
 
 @JsonClass(generateAdapter = true)
 data class ThemeDto(
-    val id: String? = null,
-    val theme: Int = 0,
-    val name: String = "",
-    val colors: List<ColorDto> = emptyList(),
-    val isCustom: Boolean = false,
+    val id: String?,
+    val theme: Int?,
+    val name: String?,
+    val colors: List<ColorDto>?,
+    val isCustom: Boolean?,
+    val status: String?,
 ) {
 
     fun toTableTheme(): TableTheme {
-        return if (isCustom) {
+        return if (isCustom != false) {
             CustomTheme(
                 id = id!!,
-                name = name,
-                colors = colors,
+                name = name ?: "",
+                colors = colors ?: emptyList(),
+                isFromMarket = status == "DOWNLOADED",
             )
         } else {
-            BuiltInTheme(
-                code = theme,
-                name = name,
-            )
+            BuiltInTheme.fromCode(theme ?: 0)
         }
     }
 }