diegoberaldin · diegoberaldin · Jul 9, 2023 · Jul 8, 2023 · Jul 8, 2023 · Jul 8, 2023
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -30,6 +30,8 @@ kotlin {
             dependencies {
                 implementation(compose.desktop.currentOs)
                 implementation(compose.foundation)
+
+                implementation(libs.compose.material3)
                 implementation(libs.koin)
                 implementation(libs.decompose)
                 implementation(libs.decompose.extensions)

diff --git a/core-common/build.gradle.kts b/core-common/build.gradle.kts
@@ -21,7 +21,7 @@ kotlin {
         val jvmMain by getting {
             dependencies {
                 implementation(compose.desktop.currentOs)
-
+                implementation(libs.compose.material3)
                 implementation(libs.koin)
                 implementation(libs.androidx.datastore)
                 implementation(libs.kotlinx.coroutines)

diff --git a/core-common/src/jvmMain/kotlin/com/github/diegoberaldin/metaphrase/core/common/di/Module.kt b/core-common/src/jvmMain/kotlin/com/github/diegoberaldin/metaphrase/core/common/di/Module.kt
@@ -7,6 +7,8 @@ import com.github.diegoberaldin.metaphrase.core.common.log.DefaultLogManager
 import com.github.diegoberaldin.metaphrase.core.common.log.LogManager
 import com.github.diegoberaldin.metaphrase.core.common.notification.DefaultNotificationCenter
 import com.github.diegoberaldin.metaphrase.core.common.notification.NotificationCenter
+import com.github.diegoberaldin.metaphrase.core.common.ui.theme.DefaultThemeRepository
+import com.github.diegoberaldin.metaphrase.core.common.ui.theme.ThemeRepository
 import org.koin.dsl.module
 
 /**
@@ -28,4 +30,7 @@ val commonModule = module {
     single<LogManager> {
         DefaultLogManager(fileManager = get())
     }
+    single<ThemeRepository> {
+        DefaultThemeRepository()
+    }
 }
diff --git a/...tlin/com/github/diegoberaldin/metaphrase/core/common/keystore/DefaultTemporaryKeyStore.kt b/...tlin/com/github/diegoberaldin/metaphrase/core/common/keystore/DefaultTemporaryKeyStore.kt
@@ -28,16 +28,21 @@ internal class DefaultTemporaryKeyStore(
     private val scope = CoroutineScope(Dispatchers.Default)
     private val dataStore: DataStore<Preferences> = createDataStore()
 
-    private fun createDataStore(): DataStore<Preferences> =
-        PreferenceDataStoreFactory.create(
-            corruptionHandler = null,
-            migrations = emptyList(),
-            scope = scope,
-            produceFile = {
-                val path = fileManager.getFilePath(FILE_NAME)
-                File(path)
-            },
-        )
+    private fun createDataStore(): DataStore<Preferences> = PreferenceDataStoreFactory.create(
+        corruptionHandler = null,
+        migrations = emptyList(),
+        scope = scope,
+        produceFile = {
+            val path = fileManager.getFilePath(FILE_NAME)
+            File(path)
+        },
+    )
+
+    override suspend fun containsKey(key: String): Boolean = withTimeoutOrNull(500) {
+        dataStore.data.map {
+            it.asMap().keys.any { k -> k.name == key }
+        }.first()
+    } ?: false
 
     override suspend fun save(key: String, value: Boolean) {
         dataStore.edit {

diff --git a/...c/jvmMain/kotlin/com/github/diegoberaldin/metaphrase/core/common/keystore/KeyStoreKeys.kt b/...c/jvmMain/kotlin/com/github/diegoberaldin/metaphrase/core/common/keystore/KeyStoreKeys.kt
@@ -10,4 +10,5 @@ object KeyStoreKeys {
     const val LastOpenedProject = "lastOpenedProject"
     const val MachineTranslationProvider = "machineTranslationProvider"
     const val MachineTranslationKey = "machineTranslationKey"
+    const val DarkThemeEnabled = "darkThemeEnabled"
 }
diff --git a/...Main/kotlin/com/github/diegoberaldin/metaphrase/core/common/keystore/TemporaryKeyStore.kt b/...Main/kotlin/com/github/diegoberaldin/metaphrase/core/common/keystore/TemporaryKeyStore.kt
@@ -4,6 +4,14 @@ package com.github.diegoberaldin.metaphrase.core.common.keystore
  * Secondary storage in the form of a key store (persistence across application restarts).
  */
 interface TemporaryKeyStore {
+    /**
+     * Determines whether the key store contains a given key.
+     *
+     * @param key Key to check
+     * @return true if the key store contains the key, false otherwise
+     */
+    suspend fun containsKey(key: String): Boolean
+
     /**
      * Save a boolean value in the keystore under a given key.
      *

diff --git a/...Main/kotlin/com/github/diegoberaldin/metaphrase/core/common/ui/components/CustomDialog.kt b/...Main/kotlin/com/github/diegoberaldin/metaphrase/core/common/ui/components/CustomDialog.kt
@@ -10,9 +10,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Button
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.Button
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -48,15 +48,15 @@ fun CustomDialog(
         Column(
             modifier = Modifier
                 .fillMaxWidth()
-                .background(color = MaterialTheme.colors.background)
+                .background(color = MaterialTheme.colorScheme.background)
                 .padding(Spacing.s),
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
             Text(
                 text = message,
                 textAlign = TextAlign.Center,
-                style = MaterialTheme.typography.body2,
-                color = MaterialTheme.colors.onBackground,
+                style = MaterialTheme.typography.bodySmall,
+                color = MaterialTheme.colorScheme.onBackground,
             )
             Spacer(modifier = Modifier.height(Spacing.xs))
             Row(
@@ -73,7 +73,7 @@ fun CustomDialog(
                     ) {
                         Text(
                             text = text,
-                            style = MaterialTheme.typography.button,
+                            style = MaterialTheme.typography.labelLarge,
                         )
                     }
                 }

diff --git a/.../com/github/diegoberaldin/metaphrase/core/common/ui/components/CustomProgressIndicator.kt b/.../com/github/diegoberaldin/metaphrase/core/common/ui/components/CustomProgressIndicator.kt
@@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.MaterialTheme
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -44,7 +44,7 @@ import kotlin.math.sin
 @Composable
 fun CustomProgressIndicator(
     progress: Float,
-    progressColor: Color = MaterialTheme.colors.primary,
+    progressColor: Color = MaterialTheme.colorScheme.primary,
     modifier: Modifier = Modifier,
 ) {
     Box(
@@ -67,11 +67,14 @@ fun CustomProgressIndicator(
         val stripeWidth = 20.dp.toLocalPixel()
         val clipRectCornerRadius = 4.dp.toLocalPixel()
         val stripeRotateAngle = 45f
+        val progressLabelColorBg = MaterialTheme.colorScheme.primary
+        val progressLabelColor = MaterialTheme.colorScheme.onPrimary
+        val stripeColor = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.25f)
         Canvas(
             modifier = Modifier.fillMaxSize(),
         ) {
             val backgroundString = buildAnnotatedString {
-                withStyle(SpanStyle(color = progressColor)) {
+                withStyle(SpanStyle(color = progressLabelColorBg)) {
                     append(progressText)
                 }
             }
@@ -93,17 +96,8 @@ fun CustomProgressIndicator(
                     ),
                 )
             }
-            clipPath(path = pathToClip) {
-                drawText(
-                    textMeasurer = textMeasurer,
-                    text = buildAnnotatedString {
-                        withStyle(SpanStyle(color = Color.White)) {
-                            append(progressText)
-                        }
-                    },
-                    topLeft = Offset(x = textOffsetLeft, y = textOffsetTop),
-                )
 
+            clipPath(path = pathToClip) {
                 var stripeOffset = -stripeWidth
                 val stripeHeightDelta = stripeWidth * sin(stripeRotateAngle.toRadians())
                 while (stripeOffset < size.width * progress) {
@@ -116,13 +110,23 @@ fun CustomProgressIndicator(
                     )
                     rotate(degrees = stripeRotateAngle, pivot = rect.center) {
                         drawRect(
-                            color = Color.White.copy(alpha = 0.25f),
+                            color = stripeColor,
                             topLeft = rect.topLeft,
                             size = rect.size,
                         )
                     }
                     stripeOffset += stripeWidth
                 }
+
+                drawText(
+                    textMeasurer = textMeasurer,
+                    text = buildAnnotatedString {
+                        withStyle(SpanStyle(color = progressLabelColor)) {
+                            append(progressText)
+                        }
+                    },
+                    topLeft = Offset(x = textOffsetLeft, y = textOffsetTop),
+                )
             }
         }
     }

diff --git a/...ain/kotlin/com/github/diegoberaldin/metaphrase/core/common/ui/components/CustomSpinner.kt b/...ain/kotlin/com/github/diegoberaldin/metaphrase/core/common/ui/components/CustomSpinner.kt
@@ -13,13 +13,13 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.onClick
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.material.DropdownMenu
-import androidx.compose.material.DropdownMenuItem
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ArrowDropDown
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -55,7 +55,7 @@ fun CustomSpinner(
     modifier: Modifier = Modifier,
     size: DpSize = DpSize(width = 150.dp, height = 20.dp),
     onValueChanged: ((Int) -> Unit)? = null,
-    valueColor: Color = Color.Black,
+    valueColor: Color = MaterialTheme.colorScheme.onBackground,
 ) {
     var expanded by remember {
         mutableStateOf(false)
@@ -67,7 +67,7 @@ fun CustomSpinner(
         BasicTextField(
             modifier = Modifier.matchParentSize(),
             value = current ?: "",
-            textStyle = MaterialTheme.typography.caption.copy(color = valueColor),
+            textStyle = MaterialTheme.typography.labelSmall.copy(color = valueColor),
             readOnly = true,
             onValueChange = {},
             decorationBox = { innerTextField ->
@@ -86,10 +86,10 @@ fun CustomSpinner(
         )
         DropdownMenu(
             modifier = Modifier.width(size.width)
-                .background(Color.White)
+                .background(MaterialTheme.colorScheme.background)
                 .border(
                     width = Dp.Hairline,
-                    color = MaterialTheme.colors.background,
+                    color = MaterialTheme.colorScheme.background,
                     shape = RoundedCornerShape(4.dp),
                 ),
             expanded = expanded,
@@ -103,7 +103,7 @@ fun CustomSpinner(
             values.forEachIndexed { idx, value ->
                 DropdownMenuItem(
                     modifier = Modifier
-                        .background(color = if (value == hoveredValue) Color.Blue else Color.Transparent)
+                        .background(color = if (value == hoveredValue) MaterialTheme.colorScheme.secondary else Color.Transparent)
                         .fillMaxWidth().height(24.dp)
                         .onPointerEvent(PointerEventType.Enter) { hoveredValue = value }
                         .onPointerEvent(PointerEventType.Exit) { hoveredValue = null }
@@ -112,13 +112,14 @@ fun CustomSpinner(
                         onValueChanged?.invoke(idx)
                         expanded = false
                     },
-                ) {
-                    Text(
-                        text = value,
-                        style = MaterialTheme.typography.caption,
-                        color = if (value == hoveredValue) Color.White else Color.Black,
-                    )
-                }
+                    text = {
+                        Text(
+                            text = value,
+                            style = MaterialTheme.typography.labelSmall,
+                            color = if (value == hoveredValue) MaterialTheme.colorScheme.onSecondary else valueColor,
+                        )
+                    },
+                )
             }
         }
         Spacer(

diff --git a/...Main/kotlin/com/github/diegoberaldin/metaphrase/core/common/ui/components/CustomTabBar.kt b/...Main/kotlin/com/github/diegoberaldin/metaphrase/core/common/ui/components/CustomTabBar.kt
@@ -12,9 +12,9 @@ import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.onClick
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -23,7 +23,6 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.github.diegoberaldin.metaphrase.core.common.ui.theme.SelectedBackground
 import com.github.diegoberaldin.metaphrase.core.common.ui.theme.Spacing
 
 /**
@@ -78,15 +77,15 @@ private fun Tab(
 ) {
     Row(
         modifier = modifier.background(
-            color = if (selected) SelectedBackground else Color.Transparent,
+            color = if (selected) MaterialTheme.colorScheme.onBackground.copy(alpha = 0.1f) else Color.Transparent,
             shape = RoundedCornerShape(topStart = 8.dp, topEnd = 8.dp),
         ).padding(horizontal = Spacing.s, vertical = Spacing.s),
         verticalAlignment = Alignment.Bottom,
     ) {
         Text(
             text = label,
-            style = MaterialTheme.typography.body2.copy(fontSize = 13.sp),
-            color = Color.White,
+            style = MaterialTheme.typography.bodySmall.copy(fontSize = 13.sp),
+            color = MaterialTheme.colorScheme.onBackground,
         )
         if (rightIcon != null) {
             Spacer(Modifier.width(Spacing.m))
@@ -99,7 +98,7 @@ private fun Tab(
                     },
                 imageVector = rightIcon,
                 contentDescription = null,
-                tint = Color.White,
+                tint = MaterialTheme.colorScheme.onBackground,
             )
         }
     }

diff --git a/...n/kotlin/com/github/diegoberaldin/metaphrase/core/common/ui/components/CustomTextField.kt b/...n/kotlin/com/github/diegoberaldin/metaphrase/core/common/ui/components/CustomTextField.kt
@@ -9,8 +9,8 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -54,11 +54,11 @@ fun CustomTextField(
     hint: String = "",
     enabled: Boolean = true,
     secure: Boolean = false,
-    labelColor: Color = Color.White,
-    backgroundColor: Color = Color.White,
-    textColor: Color = Color.Black,
+    labelColor: Color = MaterialTheme.colorScheme.onBackground,
+    backgroundColor: Color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.1f),
+    textColor: Color = MaterialTheme.colorScheme.onBackground,
     labelExtraSpacing: Dp = 0.dp,
-    labelStyle: TextStyle = MaterialTheme.typography.caption,
+    labelStyle: TextStyle = MaterialTheme.typography.labelSmall,
     value: String,
     singleLine: Boolean = false,
     onValueChange: (String) -> Unit,
@@ -101,7 +101,7 @@ fun CustomTextField(
                 onValueChange(it.text)
             },
             cursorBrush = SolidColor(textColor),
-            textStyle = MaterialTheme.typography.caption.copy(color = textColor),
+            textStyle = MaterialTheme.typography.labelSmall.copy(color = textColor),
             singleLine = singleLine,
             enabled = enabled,
             visualTransformation = if (secure) PasswordVisualTransformation() else VisualTransformation.None,
@@ -113,7 +113,7 @@ fun CustomTextField(
                     if (hint.isNotEmpty() && textFieldValue.text.isEmpty()) {
                         Text(
                             text = hint,
-                            style = MaterialTheme.typography.caption,
+                            style = MaterialTheme.typography.labelSmall,
                             color = Color.Gray,
                         )
                     }