Skip to content

feat: Integrate reactive Dark Mode detection for all desktop OS #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leandroBorgesFerreira merged 5 commits into from
May 7, 2025
Merged

feat: Integrate reactive Dark Mode detection for all desktop OS #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3cc1482
feat: Integrate reactive Dark Mode detection for all desktop OS and a…
kdroidFilter Mar 10, 2025
3cab0dd
Update dependencies for dark mode detector and AGP.
kdroidFilter Mar 17, 2025
451ceab
Merge branch 'Writeopia:main' into main
kdroidFilter Mar 17, 2025
d0bad79
Update dark mode detection to use platformtools library
kdroidFilter Mar 17, 2025
6caa188
Merge branch 'main' into main
kdroidFilter May 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions application/composeApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ kotlin {
implementation(libs.room.runtime)

implementation(libs.compose.navigation)
implementation(libs.platformtools.darkmodedetector)
}
}

Expand Down
16 changes: 9 additions & 7 deletions application/composeApp/src/jvmMain/kotlin/io/writeopia/desktop/MainDesktop.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,9 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.input.key.KeyEvent
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.ApplicationScope
import androidx.compose.ui.window.Window
import androidx.compose.ui.window.WindowPlacement
import androidx.compose.ui.window.WindowPosition
import androidx.compose.ui.window.application
import androidx.compose.ui.window.rememberWindowState
import androidx.compose.ui.window.*
import io.github.kdroidfilter.platformtools.darkmodedetector.isSystemInDarkMode
import io.github.kdroidfilter.platformtools.darkmodedetector.windows.setWindowsAdaptiveTitleBar
import io.writeopia.common.utils.keyboard.KeyboardCommands
import io.writeopia.common.utils.keyboard.isMultiSelectionTrigger
import io.writeopia.common.utils.ui.GlobalToastBox
Expand Down Expand Up @@ -167,7 +164,6 @@ private fun ApplicationScope.App(onCloseRequest: () -> Unit = ::exitApplication)
windowState.placement = WindowPlacement.Floating
}
}

Window(
onCloseRequest = onCloseRequest,
title = "",
Expand All @@ -177,6 +173,12 @@ private fun ApplicationScope.App(onCloseRequest: () -> Unit = ::exitApplication)
},
icon = CommonImages.logo()
) {
// Synchronize the topbar on Windows OS with the System Theme
window.setWindowsAdaptiveTitleBar(
dark = isSystemInDarkMode()
// TODO Syncrhonize with the selected Theme by the user
)

Box(Modifier.fillMaxSize()) {
LaunchedEffect(window.rootPane) {
with(window.rootPane) {
Expand Down
1 change: 1 addition & 0 deletions application/core/theme/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ kotlin {

implementation(compose.material3)
implementation(libs.lifecycle.viewmodel.compose)
implementation(libs.platformtools.darkmodedetector)
}
}

Expand Down
6 changes: 3 additions & 3 deletions application/core/theme/src/commonMain/kotlin/io/writeopia/model/ColorThemeOption.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.writeopia.model

import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.runtime.Composable
import io.github.kdroidfilter.platformtools.darkmodedetector.isSystemInDarkMode

enum class ColorThemeOption(val theme: String) {
LIGHT("light"),
Expand All @@ -20,6 +20,6 @@ fun ColorThemeOption?.isDarkTheme(): Boolean =
when (this) {
ColorThemeOption.LIGHT -> false
ColorThemeOption.DARK -> true
ColorThemeOption.SYSTEM -> isSystemInDarkTheme()
else -> isSystemInDarkTheme()
ColorThemeOption.SYSTEM -> isSystemInDarkMode()
else -> isSystemInDarkMode()
}
4 changes: 2 additions & 2 deletions application/core/theme/src/commonMain/kotlin/io/writeopia/theme/Theme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.writeopia.theme

import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.darkColorScheme
import androidx.compose.material3.lightColorScheme
Expand All @@ -9,6 +8,7 @@ import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.Immutable
import androidx.compose.runtime.staticCompositionLocalOf
import androidx.compose.ui.graphics.Color
import io.github.kdroidfilter.platformtools.darkmodedetector.isSystemInDarkMode

private val DarkColorPalette = darkColorScheme(
primary = LIGHT_PURPLE,
Expand Down Expand Up @@ -71,7 +71,7 @@ val LocalWriteopiaColors = staticCompositionLocalOf {

@Composable
fun WrieopiaTheme(
darkTheme: Boolean = isSystemInDarkTheme(),
darkTheme: Boolean = isSystemInDarkMode(),
content: @Composable () -> Unit
) {
val globalBackground = if (darkTheme) Color(0xFF252525) else Color(0xFFF8F0F9)
Expand Down
3 changes: 3 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ ktor = "3.0.3"
ktlint = "12.1.2"
ktx = "1.15.0"
material = "1.12.0"
platformtools = "0.2.9"
postgresSocketFactory = "1.15.1"
r2dbcDriver = "2.0.2"
room = "2.7.0-rc03"
Expand Down Expand Up @@ -78,6 +79,8 @@ ktor-server-core = { module = "io.ktor:ktor-server-core-jvm" }
ktor-server-websocket = { module = "io.ktor:ktor-server-websockets-jvm" }
ktor-server-netty = { module = "io.ktor:ktor-server-netty-jvm" }
ktor-server-tests = { module = "io.ktor:ktor-server-test-host", version.ref = "ktor" }
#material3-desktop = { module = "org.jetbrains.compose.material3:material3-desktop", version.ref = "material3" }
platformtools-darkmodedetector = { module = "io.github.kdroidfilter:platformtools.darkmodedetector", version.ref = "platformtools" }
r2dbc-driver = { module = "app.cash.sqldelight:r2dbc-driver", version.ref = "r2dbcDriver" }
sql-postgres-socket-factory = { module = "com.google.cloud.sql:postgres-socket-factory", version.ref = "postgresSocketFactory" }
room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
Expand Down