From c3cbd2ea010b8233f91cb68cc2787b6fe409b4bc Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Fri, 20 Nov 2026 16:49:30 +0800 Subject: [PATCH 1/7] Add a black dark theme option on mobile --- .../com/logseq/logseq/AndroidAppearance.kt | 3 +- .../logseq/logseq/AndroidPlatformServices.kt | 4 + .../kotlin/com/logseq/logseq/MainActivity.kt | 7 +- .../logseq/runtime/AndroidPlatformEffects.kt | 4 + .../logseq/logseq/runtime/LogseqRuntime.kt | 4 + .../kotlin/com/logseq/logseq/ui/LogseqApp.kt | 6 +- .../com/logseq/logseq/ui/LogseqTheme.kt | 53 +++++-- apple/Sources/Logseq/LGEffects.swift | 1 + apple/Sources/Logseq/LGMediaPanel.swift | 7 +- .../Logseq/LGNavigationExtension.swift | 12 +- .../Logseq/LGPlatformPresentation.swift | 3 +- apple/Sources/Logseq/LGRenderer.swift | 5 +- apple/Sources/Logseq/LogseqApp.swift | 10 +- .../Sources/Logseq/LogseqThemeSettings.swift | 44 +++++- .../Sources/Logseq/OutlinerLatexMarkup.swift | 4 +- .../LogseqThemeSettingsTests.swift | 13 +- shared/src/logseq/core/host_update.ml | 2 + shared/src/logseq/core/host_update.mli | 1 + shared/src/logseq/localization.ml | 4 + shared/src/logseq/model.ml | 25 +++ shared/src/logseq/model.mli | 6 + shared/src/logseq/native_bridge.ml | 2 + shared/src/logseq/view.ml | 11 +- shared/src/logseq/view_authentication.ml | 2 +- shared/src/logseq/view_base.ml | 35 +++-- shared/src/logseq/view_base.mli | 5 +- shared/src/logseq/view_flashcards.ml | 2 +- shared/src/logseq/view_graphs.ml | 8 +- shared/src/logseq/view_outliner.ml | 2 +- shared/src/logseq/view_property.ml | 4 +- shared/src/logseq/view_query.ml | 6 +- shared/src/logseq/view_settings.ml | 144 ++++++++---------- shared/test/logseq/app_test.ml | 23 +++ 33 files changed, 309 insertions(+), 153 deletions(-) diff --git a/android/app/src/main/kotlin/com/logseq/logseq/AndroidAppearance.kt b/android/app/src/main/kotlin/com/logseq/logseq/AndroidAppearance.kt index 48e58dab..9b6cc42c 100644 --- a/android/app/src/main/kotlin/com/logseq/logseq/AndroidAppearance.kt +++ b/android/app/src/main/kotlin/com/logseq/logseq/AndroidAppearance.kt @@ -29,12 +29,11 @@ internal fun applyAndroidApplicationAppearance(context: Context, appearance: Str } } -internal fun applyAndroidSystemBarAppearance(window: Window, dark: Boolean) { +internal fun applyAndroidSystemBarAppearance(window: Window, dark: Boolean, background: Int) { // These colors are honored on pre-edge-to-edge releases. Newer Android // versions draw the app's Scaffold behind the transparent system bars. @Suppress("DEPRECATION") if (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) { - val background = if (dark) 0xff101318.toInt() else 0xfffcfcfc.toInt() window.statusBarColor = background window.navigationBarColor = background } diff --git a/android/app/src/main/kotlin/com/logseq/logseq/AndroidPlatformServices.kt b/android/app/src/main/kotlin/com/logseq/logseq/AndroidPlatformServices.kt index 447ec308..cb6e99f6 100644 --- a/android/app/src/main/kotlin/com/logseq/logseq/AndroidPlatformServices.kt +++ b/android/app/src/main/kotlin/com/logseq/logseq/AndroidPlatformServices.kt @@ -46,6 +46,7 @@ class AndroidPlatformServices(private val context: Context) { "composerDraft" to preferences.getString("logseq.composerDraft", "").orEmpty(), "settings" to mapOf( "appearance" to preferences.getString("logseq.appearance", "system").orEmpty(), + "darkTheme" to preferences.getString("logseq.darkTheme", "solarized").orEmpty(), "language" to preferences.getString("logseq.language", "system").orEmpty(), "spellCheck" to preferences.getBoolean("logseq.editor.spellCheck", true), "autoCorrection" to preferences.getBoolean( @@ -71,6 +72,9 @@ class AndroidPlatformServices(private val context: Context) { val settings = JSONObject(encoded) preferences.edit() .putString("logseq.appearance", settings.optString("appearance", "system")) + .putString("logseq.darkTheme", settings.optString( + "darkTheme", preferences.getString("logseq.darkTheme", "solarized").orEmpty(), + )) .putString("logseq.language", settings.optString("language", "system")) .putBoolean("logseq.editor.spellCheck", settings.optBoolean("spellCheck", true)) .putBoolean( diff --git a/android/app/src/main/kotlin/com/logseq/logseq/MainActivity.kt b/android/app/src/main/kotlin/com/logseq/logseq/MainActivity.kt index e7caf86d..166b73d8 100644 --- a/android/app/src/main/kotlin/com/logseq/logseq/MainActivity.kt +++ b/android/app/src/main/kotlin/com/logseq/logseq/MainActivity.kt @@ -7,6 +7,7 @@ import android.os.Build import android.util.Log import androidx.activity.ComponentActivity import androidx.activity.compose.setContent +import androidx.compose.ui.graphics.toArgb import androidx.core.view.doOnPreDraw import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope @@ -14,6 +15,7 @@ import androidx.lifecycle.repeatOnLifecycle import com.logseq.logseq.runtime.AndroidLaunchMetrics import com.logseq.logseq.runtime.LogseqRuntime import com.logseq.logseq.ui.LogseqApp +import com.logseq.logseq.ui.LogseqTheme import kotlinx.coroutines.launch import com.logseq.logseq.AndroidE2EECrypto import com.logseq.logseq.AndroidHttpTransport @@ -31,8 +33,9 @@ class MainActivity : ComponentActivity() { if (hasFocus && ::runtime.isInitialized) { // Window/decor focus can restore flags from the platform theme // after Compose's first SideEffect, including after a dialog closes. - applyAndroidSystemBarAppearance(window, - androidAppearanceIsDark(runtime.effectiveAppearance, resources.configuration)) + val dark = androidAppearanceIsDark(runtime.effectiveAppearance, resources.configuration) + val background = LogseqTheme.colorScheme(dark, runtime.effectiveDarkTheme).background + applyAndroidSystemBarAppearance(window, dark, background.toArgb()) } } diff --git a/android/app/src/main/kotlin/com/logseq/logseq/runtime/AndroidPlatformEffects.kt b/android/app/src/main/kotlin/com/logseq/logseq/runtime/AndroidPlatformEffects.kt index 1c6a4149..35996b0b 100644 --- a/android/app/src/main/kotlin/com/logseq/logseq/runtime/AndroidPlatformEffects.kt +++ b/android/app/src/main/kotlin/com/logseq/logseq/runtime/AndroidPlatformEffects.kt @@ -92,6 +92,7 @@ internal data class AndroidHostUpdate(val kind: String, val payload: String) internal data class AndroidHostSettings( val appearance: String, + val darkTheme: String, val language: String, val spellCheck: Boolean, val autoCorrection: Boolean, @@ -103,6 +104,7 @@ internal data class AndroidHostSettings( val hostPayload: Map get() = mapOf( "appearance" to appearance, + "darkTheme" to darkTheme, "language" to language, "systemLanguage" to java.util.Locale.getDefault().toLanguageTag(), "spellCheck" to spellCheck, @@ -116,6 +118,7 @@ internal data class AndroidHostSettings( companion object { val defaults = AndroidHostSettings( appearance = "system", + darkTheme = "solarized", language = "system", spellCheck = true, autoCorrection = true, @@ -132,6 +135,7 @@ internal data class AndroidHostSettings( ?.mapNotNull { it as? String } ?: defaults.sidebarTabs return AndroidHostSettings( appearance = value["appearance"] as? String ?: defaults.appearance, + darkTheme = if (value["darkTheme"] == "black") "black" else defaults.darkTheme, language = value["language"] as? String ?: defaults.language, spellCheck = value["spellCheck"] as? Boolean ?: defaults.spellCheck, autoCorrection = value["autoCorrection"] as? Boolean ?: defaults.autoCorrection, diff --git a/android/app/src/main/kotlin/com/logseq/logseq/runtime/LogseqRuntime.kt b/android/app/src/main/kotlin/com/logseq/logseq/runtime/LogseqRuntime.kt index 5aaa752a..158bfdd5 100644 --- a/android/app/src/main/kotlin/com/logseq/logseq/runtime/LogseqRuntime.kt +++ b/android/app/src/main/kotlin/com/logseq/logseq/runtime/LogseqRuntime.kt @@ -136,6 +136,7 @@ internal class LogseqRuntime( private var activeBootstrap: kotlinx.coroutines.Job? = null private var activeBootstrapHadSession = false private var appearance by mutableStateOf("system") + private var darkTheme by mutableStateOf("solarized") init { bridge.onCoreIdle = { scope.launch { effectDrain?.drain(scope) } } @@ -155,6 +156,7 @@ internal class LogseqRuntime( val authenticationCode = platformEffects.initialAuthenticationCode() val storage = platformEffects.loadStorageState() appearance = storage.settings.appearance + darkTheme = storage.settings.darkTheme storageBaseUrl = storage.baseUrl val lifecycle = AndroidGraphLifecycle( @@ -547,6 +549,7 @@ internal class LogseqRuntime( if (effect.kind == "save-settings" && resolution.succeeded) { val storage = platformEffects.loadStorageState() appearance = storage.settings.appearance + darkTheme = storage.settings.darkTheme if (storage.baseUrl != storageBaseUrl) { graphCatalogAutoRefresh?.stopPeriodic() hasOpenGraph = false @@ -934,6 +937,7 @@ internal class LogseqRuntime( } val effectiveAppearance: String get() = appearance + val effectiveDarkTheme: String get() = darkTheme } // Recorded audio asset produced by the recording sheet — payload shape diff --git a/android/app/src/main/kotlin/com/logseq/logseq/ui/LogseqApp.kt b/android/app/src/main/kotlin/com/logseq/logseq/ui/LogseqApp.kt index aabcc353..47eae399 100644 --- a/android/app/src/main/kotlin/com/logseq/logseq/ui/LogseqApp.kt +++ b/android/app/src/main/kotlin/com/logseq/logseq/ui/LogseqApp.kt @@ -51,6 +51,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.platform.testTag import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTagsAsResourceId @@ -82,13 +83,14 @@ internal fun LogseqApp(runtime: LogseqRuntime) { else -> systemDark } val window = LocalActivity.current?.window + val colorScheme = LogseqTheme.colorScheme(dark, runtime.effectiveDarkTheme) SideEffect { if (window != null) { - applyAndroidSystemBarAppearance(window, dark) + applyAndroidSystemBarAppearance(window, dark, colorScheme.background.toArgb()) } } MaterialExpressiveTheme( - colorScheme = if (dark) LogseqTheme.darkScheme else LogseqTheme.lightScheme, + colorScheme = colorScheme, typography = LogseqTheme.typography, ) { androidx.compose.runtime.CompositionLocalProvider( diff --git a/android/app/src/main/kotlin/com/logseq/logseq/ui/LogseqTheme.kt b/android/app/src/main/kotlin/com/logseq/logseq/ui/LogseqTheme.kt index e05abc86..fa1f3e79 100644 --- a/android/app/src/main/kotlin/com/logseq/logseq/ui/LogseqTheme.kt +++ b/android/app/src/main/kotlin/com/logseq/logseq/ui/LogseqTheme.kt @@ -1,12 +1,9 @@ package com.logseq.logseq.ui -import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.ColorScheme -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Typography import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme -import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.compositeOver import androidx.compose.ui.text.TextStyle @@ -57,7 +54,7 @@ internal object LogseqTheme { val accent = Color(0xff1b6898) val lightSurface = Color(0xfff8f9ff) - val darkSurface = Color(0xff101318) + private val solarizedBackground = Color(0xff002d38) // Material Expressive menus read the tertiary container roles for selection. private fun ColorScheme.withMenuSelectionColors() = copy( @@ -92,20 +89,48 @@ internal object LogseqTheme { secondary = Color(0xffb8cad6), secondaryContainer = Color(0xff3a4a55), onSecondaryContainer = Color(0xffd4e6f2), - surface = darkSurface, - background = darkSurface, - surfaceContainerLowest = Color(0xff0b0e12), - surfaceContainerLow = Color(0xff14171d), - surfaceContainer = Color(0xff181c22), - surfaceContainerHigh = Color(0xff1d2229), - surfaceContainerHighest = Color(0xff22272f), + surface = solarizedBackground, + background = solarizedBackground, + onBackground = Color(0xffedfdfd), + onSurface = Color(0xffedfdfd), + onSurfaceVariant = Color(0xff9ab1b5), + surfaceVariant = Color(0xff19394d), + surfaceDim = solarizedBackground, + surfaceBright = Color(0xff315860), + surfaceContainerLowest = Color(0xff00242e), + surfaceContainerLow = Color(0xff0b3540), + surfaceContainer = Color(0xff143d48), + surfaceContainerHigh = Color(0xff1e4651), + surfaceContainerHighest = Color(0xff274f5a), ).withMenuSelectionColors() + val blackScheme = darkScheme.copy( + surface = Color.Black, + background = Color.Black, + onBackground = Color(0xfff4f4f5), + onSurface = Color(0xfff4f4f5), + onSurfaceVariant = Color(0xffa1a1aa), + surfaceVariant = Color(0xff242424), + surfaceDim = Color.Black, + surfaceBright = Color(0xff333333), + surfaceContainerLowest = Color.Black, + surfaceContainerLow = Color(0xff0e0e0e), + surfaceContainer = Color(0xff141414), + surfaceContainerHigh = Color(0xff1c1c1c), + surfaceContainerHighest = Color(0xff242424), + ) + + fun colorScheme(dark: Boolean, darkTheme: String): ColorScheme = when { + !dark -> lightScheme + darkTheme == "black" -> blackScheme + else -> darkScheme + } + fun semanticColors(scheme: ColorScheme): Map { - val groupedRowBackground = if (scheme.background == darkSurface) { - Color.White.copy(alpha = 0.08f).compositeOver(scheme.background) - } else { + val groupedRowBackground = if (scheme.background == lightScheme.background) { Color.White + } else { + Color.White.copy(alpha = 0.08f).compositeOver(scheme.background) } return mapOf( "background" to scheme.background, diff --git a/apple/Sources/Logseq/LGEffects.swift b/apple/Sources/Logseq/LGEffects.swift index afc58057..3a1dab51 100644 --- a/apple/Sources/Logseq/LGEffects.swift +++ b/apple/Sources/Logseq/LGEffects.swift @@ -61,6 +61,7 @@ public struct LGEffectResolution: Equatable, Sendable { public struct LGSettingsPayload: Decodable, Equatable, Sendable { public let appearance: String + public let darkTheme: String? public let language: String public let spellCheck: Bool public let autoCorrection: Bool diff --git a/apple/Sources/Logseq/LGMediaPanel.swift b/apple/Sources/Logseq/LGMediaPanel.swift index feca5ca3..8f394b00 100644 --- a/apple/Sources/Logseq/LGMediaPanel.swift +++ b/apple/Sources/Logseq/LGMediaPanel.swift @@ -13,6 +13,7 @@ struct LGMediaPanel: View { let onPhotoData: (Data, String) -> Void @Environment(\.dismiss) private var dismiss @Environment(\.colorScheme) private var colorScheme + @Environment(\.logseqDarkTheme) private var darkTheme @State private var mode: LGAttachmentService @State private var selection: [PhotosPickerItem] = [] @State private var allPhotos = false @@ -22,7 +23,9 @@ struct LGMediaPanel: View { @State private var isImporting = false private var isDark: Bool { colorScheme == .dark } - private var sheetBackground: Color { LogseqThemePolicy.sheetBackground(isDark: isDark) } + private var sheetBackground: Color { + LogseqThemePolicy.sheetBackground(isDark: isDark, darkTheme: darkTheme) + } init(initialService: LGAttachmentService, onPhotos: @escaping ([PhotosPickerItem]) -> Void, @@ -170,7 +173,7 @@ struct LGMediaPanel: View { .background { Circle().fill(mode == .camera ? Color.black.opacity(0.35) - : (isDark ? LogseqThemePolicy.dark : LogseqThemePolicy.light).surface) + : (isDark ? LogseqThemePolicy.darkPalette(darkTheme) : LogseqThemePolicy.light).surface) } } diff --git a/apple/Sources/Logseq/LGNavigationExtension.swift b/apple/Sources/Logseq/LGNavigationExtension.swift index 74650d4e..b53cc080 100644 --- a/apple/Sources/Logseq/LGNavigationExtension.swift +++ b/apple/Sources/Logseq/LGNavigationExtension.swift @@ -359,10 +359,14 @@ private struct LGSidebarNavigation: View { let context: LUIAppleExtensionViewContext @AppStorage("logseq.appearance") private var appearance = "system" @Environment(\.colorScheme) private var colorScheme + @Environment(\.logseqDarkTheme) private var darkTheme private var background: Color { - LogseqThemePolicy.palette(mode: LogseqThemeMode(rawValue: appearance) ?? .system, - systemIsDark: colorScheme == .dark).background + LogseqThemePolicy.palette( + mode: LogseqThemeMode(rawValue: appearance) ?? .system, + systemIsDark: colorScheme == .dark, + darkTheme: darkTheme + ).background } var body: some View { @@ -700,6 +704,7 @@ private struct LGNavigationContent: View { @State private var visibleScrollTitle: String? @AppStorage("logseq.appearance") private var appearance = "system" @Environment(\.colorScheme) private var colorScheme + @Environment(\.logseqDarkTheme) private var darkTheme @Environment(\.logseqNativeSearch) private var inheritedSearch @Environment(\.lgVerticalToolbar) private var verticalToolbar @Environment(\.lgPDFWorkspaceOpen) private var pdfWorkspaceOpen @@ -1037,7 +1042,8 @@ private struct LGNavigationContent: View { private var themePalette: LogseqThemePalette { LogseqThemePolicy.palette( mode: LogseqThemeMode(rawValue: appearance) ?? .system, - systemIsDark: colorScheme == .dark + systemIsDark: colorScheme == .dark, + darkTheme: darkTheme ) } diff --git a/apple/Sources/Logseq/LGPlatformPresentation.swift b/apple/Sources/Logseq/LGPlatformPresentation.swift index 75480661..d86c6979 100644 --- a/apple/Sources/Logseq/LGPlatformPresentation.swift +++ b/apple/Sources/Logseq/LGPlatformPresentation.swift @@ -138,10 +138,11 @@ public final class LGPlatformPresentationCoordinator { #if os(iOS) private struct LGSheetSurface: ViewModifier { @Environment(\.colorScheme) private var colorScheme + @Environment(\.logseqDarkTheme) private var darkTheme func body(content: Content) -> some View { let dark = colorScheme == .dark - let background = LogseqThemePolicy.sheetBackground(isDark: dark) + let background = LogseqThemePolicy.sheetBackground(isDark: dark, darkTheme: darkTheme) content .background(background.ignoresSafeArea()) .presentationBackground(background) diff --git a/apple/Sources/Logseq/LGRenderer.swift b/apple/Sources/Logseq/LGRenderer.swift index bd464dac..577f6a4b 100644 --- a/apple/Sources/Logseq/LGRenderer.swift +++ b/apple/Sources/Logseq/LGRenderer.swift @@ -278,6 +278,7 @@ public final class LGRenderer { public struct LGRendererRoot: View { private let renderer: LGRenderer @Environment(\.colorScheme) private var colorScheme + @Environment(\.logseqDarkTheme) private var darkTheme public init(renderer: LGRenderer) { self.renderer = renderer @@ -293,7 +294,9 @@ public struct LGRendererRoot: View { #if os(iOS) .transformEnvironment(\.luiSemanticColors) { colors in // The sheet can still animate out after the core drops its theme scope. - let background = LogseqThemePolicy.sheetBackground(isDark: colorScheme == .dark) + let background = LogseqThemePolicy.sheetBackground( + isDark: colorScheme == .dark, darkTheme: darkTheme + ) colors["background"] = colors["background"] ?? background colors["surface"] = colors["surface"] ?? background } diff --git a/apple/Sources/Logseq/LogseqApp.swift b/apple/Sources/Logseq/LogseqApp.swift index f454a26e..62ad7999 100644 --- a/apple/Sources/Logseq/LogseqApp.swift +++ b/apple/Sources/Logseq/LogseqApp.swift @@ -41,6 +41,7 @@ private final class LGCoreResponseRelay { /// The shared top-level view for the app, loaded from the platform-specific App delegates below. public struct LogseqRootView : View { @AppStorage("logseq.appearance") private var appearance = "system" + @AppStorage(LogseqDarkTheme.storageKey) private var darkTheme = LogseqDarkTheme.solarized @AppStorage("logseq.language") private var language = "system" @Environment(\.colorScheme) private var colorScheme @Environment(\.scenePhase) private var scenePhase @@ -53,6 +54,7 @@ public struct LogseqRootView : View { public var body: some View { appContent + .environment(\.logseqDarkTheme, darkTheme) .preferredColorScheme( appearance == "light" ? .light : (appearance == "dark" ? .dark : nil) ) @@ -137,7 +139,8 @@ public struct LogseqRootView : View { private var themePalette: LogseqThemePalette { LogseqThemePolicy.palette( mode: LogseqThemeMode(rawValue: appearance) ?? .system, - systemIsDark: colorScheme == .dark + systemIsDark: colorScheme == .dark, + darkTheme: darkTheme ) } @@ -171,6 +174,7 @@ public struct LogseqRootView : View { private struct SettingsHostPayload: Encodable { let appearance: String + let darkTheme: String let language: String let systemLanguage: String let spellCheck: Bool @@ -229,6 +233,9 @@ public struct LogseqRootView : View { let defaults = UserDefaults.standard let previousBaseURL = LogseqSettingsPolicy.storedBaseURL(in: defaults) defaults.set(settings.appearance, forKey: "logseq.appearance") + if let darkTheme = settings.darkTheme { + defaults.set(LogseqDarkTheme(storedValue: darkTheme).rawValue, forKey: LogseqDarkTheme.storageKey) + } defaults.set( LogseqSettingsPolicy.normalizedLanguageID(settings.language), forKey: "logseq.language" @@ -548,6 +555,7 @@ public struct LogseqRootView : View { let rawTabs = defaults.string(forKey: "logseq.mobile.sidebarTabs") ?? "" let payload = SettingsHostPayload( appearance: defaults.string(forKey: "logseq.appearance") ?? "system", + darkTheme: LogseqDarkTheme(storedValue: defaults.string(forKey: LogseqDarkTheme.storageKey)).rawValue, language: LogseqSettingsPolicy.normalizedLanguageID( defaults.string(forKey: "logseq.language") ?? "system" ), diff --git a/apple/Sources/Logseq/LogseqThemeSettings.swift b/apple/Sources/Logseq/LogseqThemeSettings.swift index ba7e0c20..45123bb7 100644 --- a/apple/Sources/Logseq/LogseqThemeSettings.swift +++ b/apple/Sources/Logseq/LogseqThemeSettings.swift @@ -7,6 +7,21 @@ enum LogseqThemeMode: String, CaseIterable { case dark } +enum LogseqDarkTheme: String { + case solarized + case black + + static let storageKey = "logseq.darkTheme" + + init(storedValue: String?) { + self = storedValue.flatMap(Self.init(rawValue:)) ?? .solarized + } +} + +extension EnvironmentValues { + @Entry var logseqDarkTheme = LogseqDarkTheme.solarized +} + struct LogseqThemePalette { let backgroundHex: String let surfaceHex: String @@ -62,8 +77,8 @@ enum LogseqThemePolicy { : Color(red: 27.0 / 255, green: 104.0 / 255, blue: 152.0 / 255) } - static func sheetBackground(isDark: Bool) -> Color { - isDark ? dark.background : Color(red: 242.0 / 255, green: 242.0 / 255, blue: 247.0 / 255) + static func sheetBackground(isDark: Bool, darkTheme: LogseqDarkTheme) -> Color { + isDark ? darkPalette(darkTheme).background : Color(red: 242.0 / 255, green: 242.0 / 255, blue: 247.0 / 255) } static let light = LogseqThemePalette( @@ -88,14 +103,33 @@ enum LogseqThemePolicy { secondaryTextRGB: (155, 211, 212) ) - static func palette(mode: LogseqThemeMode, systemIsDark: Bool) -> LogseqThemePalette { + static let black = LogseqThemePalette( + backgroundHex: "#000000", + backgroundRGB: (0, 0, 0), + surfaceHex: "#141414", + surfaceRGB: (20, 20, 20), + primaryTextHex: "#F4F4F5", + primaryTextRGB: (244, 244, 245), + secondaryTextHex: "#A1A1AA", + secondaryTextRGB: (161, 161, 170) + ) + + static func darkPalette(_ theme: LogseqDarkTheme) -> LogseqThemePalette { + theme == .black ? black : dark + } + + static func palette( + mode: LogseqThemeMode, + systemIsDark: Bool, + darkTheme: LogseqDarkTheme = .solarized + ) -> LogseqThemePalette { switch mode { case .system: - return systemIsDark ? dark : light + return systemIsDark ? darkPalette(darkTheme) : light case .light: return light case .dark: - return dark + return darkPalette(darkTheme) } } } diff --git a/apple/Sources/Logseq/OutlinerLatexMarkup.swift b/apple/Sources/Logseq/OutlinerLatexMarkup.swift index 3d6a69e7..9eed49aa 100644 --- a/apple/Sources/Logseq/OutlinerLatexMarkup.swift +++ b/apple/Sources/Logseq/OutlinerLatexMarkup.swift @@ -97,6 +97,7 @@ enum LatexMarkupDocument { struct NativeLatexMarkupContent: View { @Environment(\.colorScheme) private var colorScheme + @Environment(\.logseqDarkTheme) private var darkTheme @ScaledMetric(relativeTo: .body) private var fontSize: CGFloat = 17 @State private var height: CGFloat = 30 let nodes: [LogseqMarkupNode] @@ -107,7 +108,8 @@ struct NativeLatexMarkupContent: View { var body: some View { #if os(iOS) LatexWebContent(html: LatexMarkupDocument.html(nodes: nodes, fontSize: fontSize, - foreground: colorScheme == .dark ? LogseqThemePolicy.dark.primaryTextHex : LogseqThemePolicy.light.primaryTextHex), + foreground: LogseqThemePolicy.palette(mode: .system, + systemIsDark: colorScheme == .dark, darkTheme: darkTheme).primaryTextHex), height: $height, allowsLinkInteraction: allowsLinkInteraction, onOpenMarkupLink: onOpenMarkupLink, onEdit: onEdit) .frame(height: height).frame(maxWidth: .infinity, alignment: .leading) diff --git a/apple/Tests/LogseqTests/LogseqThemeSettingsTests.swift b/apple/Tests/LogseqTests/LogseqThemeSettingsTests.swift index 99b0c20d..5a4158d7 100644 --- a/apple/Tests/LogseqTests/LogseqThemeSettingsTests.swift +++ b/apple/Tests/LogseqTests/LogseqThemeSettingsTests.swift @@ -4,10 +4,10 @@ import Testing @Suite struct LogseqThemeSettingsTests { @Test func classicPaletteMatchesTheOfficialLogseqThemeTokens() { #expect(LogseqThemePolicy.light.backgroundHex == "#FCFCFC") - #expect(LogseqThemePolicy.light.surfaceHex == "#F8F8F8") + #expect(LogseqThemePolicy.light.surfaceHex == "#FFFFFF") #expect(LogseqThemePolicy.light.primaryTextHex == "#171717") #expect(LogseqThemePolicy.dark.backgroundHex == "#002D38") - #expect(LogseqThemePolicy.dark.surfaceHex == "#19394D") + #expect(LogseqThemePolicy.dark.surfaceHex == "#143D48") #expect(LogseqThemePolicy.dark.primaryTextHex == "#EDFDFD") #expect(LogseqThemePolicy.accentHex == "#037DBA") } @@ -19,6 +19,15 @@ import Testing #expect(LogseqThemeMode(rawValue: "unknown") == nil) } + @Test func darkPaletteFollowsAppearanceAndDefaultsToSolarized() { + #expect(LogseqDarkTheme(storedValue: nil) == .solarized) + #expect(LogseqDarkTheme(storedValue: "unknown") == .solarized) + #expect(LogseqThemePolicy.palette(mode: .system, systemIsDark: true).backgroundHex == "#002D38") + #expect(LogseqThemePolicy.palette(mode: .system, systemIsDark: true, darkTheme: .black).backgroundHex == "#000000") + #expect(LogseqThemePolicy.palette(mode: .dark, systemIsDark: false, darkTheme: .black).backgroundHex == "#000000") + #expect(LogseqThemePolicy.palette(mode: .light, systemIsDark: true, darkTheme: .black).backgroundHex == "#FCFCFC") + } + @Test func languageChoicesCoverEveryShippedLocalization() { #expect(LogseqSettingsPolicy.languages.map(\.id) == [ "system", "en", "fr", "de", "nl", "zh-CN", "zh-Hant", "af", "ca", diff --git a/shared/src/logseq/core/host_update.ml b/shared/src/logseq/core/host_update.ml index 99d2ed88..89cb1d8d 100644 --- a/shared/src/logseq/core/host_update.ml +++ b/shared/src/logseq/core/host_update.ml @@ -24,6 +24,7 @@ type host_ui_session = type host_settings = { appearance : string + ; dark_theme : string ; language : string ; system_language : string option ; spell_check : bool @@ -72,6 +73,7 @@ let settings value = Settings { appearance = string_field "appearance" value; + dark_theme = (match Util.member "darkTheme" value with `String theme -> theme | _ -> "solarized"); language = string_field "language" value; system_language = (match Util.member "systemLanguage" value with `String value -> Some value | _ -> None); spell_check = bool_field "spellCheck" value; diff --git a/shared/src/logseq/core/host_update.mli b/shared/src/logseq/core/host_update.mli index e91cb832..3db6d581 100644 --- a/shared/src/logseq/core/host_update.mli +++ b/shared/src/logseq/core/host_update.mli @@ -24,6 +24,7 @@ type host_ui_session = type host_settings = { appearance : string + ; dark_theme : string ; language : string ; system_language : string option ; spell_check : bool diff --git a/shared/src/logseq/localization.ml b/shared/src/logseq/localization.ml index 37ff9bb0..8c119f21 100644 --- a/shared/src/logseq/localization.ml +++ b/shared/src/logseq/localization.ml @@ -5564,6 +5564,8 @@ let dictionaries = [ ("Tags", "标签"); ("Text", "文本"); ("Theme", "主题"); + ("Dark theme", "深色配色"); + ("Black", "黑色"); ("Today", "今天"); ("Tomorrow", "明天"); ("True", "是"); @@ -5801,6 +5803,8 @@ let dictionaries = [ ("Tags", "標籤"); ("Text", "文字"); ("Theme", "主題"); + ("Dark theme", "深色配色"); + ("Black", "黑色"); ("Today", "今天"); ("Tomorrow", "明天"); ("True", "是"); diff --git a/shared/src/logseq/model.ml b/shared/src/logseq/model.ml index 15dff549..45cfe7d4 100644 --- a/shared/src/logseq/model.ml +++ b/shared/src/logseq/model.ml @@ -68,6 +68,7 @@ type task_status = type settings_projection = { appearance : string + ; dark_theme : string ; language : string ; system_language : string option ; spell_check : bool @@ -412,7 +413,9 @@ type logseq_model = ; settings_tabs_open : bool ; runtime_log_open : bool ; appearance : string + ; dark_theme : string ; settings_appearance_menu_open : bool + ; settings_dark_theme_menu_open : bool ; language : string ; system_language : string ; language_choices : settings_language_choice list @@ -604,6 +607,9 @@ type logseq_action = | OpenSettingsAppearanceMenu | CloseSettingsAppearanceMenu | ChangeAppearance of string + | OpenSettingsDarkThemeMenu + | CloseSettingsDarkThemeMenu + | ChangeDarkTheme of string | OpenSettingsLanguageMenu | CloseSettingsLanguageMenu | ChooseSettingsLanguage of string @@ -778,7 +784,9 @@ let initial () = settings_tabs_open = false; runtime_log_open = false; appearance = "system"; + dark_theme = "solarized"; settings_appearance_menu_open = false; + settings_dark_theme_menu_open = false; language = "system"; system_language = "en"; language_choices = settings_language_choices (); @@ -1420,9 +1428,12 @@ let valid_authentication_state_ state = state = "restoring" || state = "signedOut" || state = "signingIn" || state = "signedIn" || state = "signingOut" +let normalize_dark_theme = function "black" -> "black" | _ -> "solarized" + let current_settings (current : logseq_model) = { appearance = current.appearance; + dark_theme = current.dark_theme; language = current.language; system_language = Some current.system_language; spell_check = current.spell_check; @@ -2837,6 +2848,7 @@ let rec update (current : logseq_model) action = { current with appearance = settings.appearance; + dark_theme = normalize_dark_theme settings.dark_theme; language = settings.language; system_language = Option.value ~default:current.system_language settings.system_language; spell_check = settings.spell_check; @@ -2936,6 +2948,7 @@ let rec update (current : logseq_model) action = settings_open = true; settings_tabs_open = false; settings_appearance_menu_open = false; + settings_dark_theme_menu_open = false; settings_language_menu_open = false; runtime_log_open = false; base_url_draft = current.base_url; @@ -2946,6 +2959,7 @@ let rec update (current : logseq_model) action = settings_open = false; settings_tabs_open = false; settings_appearance_menu_open = false; + settings_dark_theme_menu_open = false; settings_language_menu_open = false; runtime_log_open = false; base_url_draft = current.base_url; @@ -2964,6 +2978,17 @@ let rec update (current : logseq_model) action = appearance; settings_appearance_menu_open = false; } + | OpenSettingsDarkThemeMenu -> + { current with settings_dark_theme_menu_open = true } + | CloseSettingsDarkThemeMenu -> + { current with settings_dark_theme_menu_open = false } + | ChangeDarkTheme dark_theme -> + persist_settings_change current + { + current with + dark_theme = normalize_dark_theme dark_theme; + settings_dark_theme_menu_open = false; + } | OpenSettingsLanguageMenu -> { current with settings_language_menu_open = true } | CloseSettingsLanguageMenu -> diff --git a/shared/src/logseq/model.mli b/shared/src/logseq/model.mli index c156b4d5..2e91e019 100644 --- a/shared/src/logseq/model.mli +++ b/shared/src/logseq/model.mli @@ -65,6 +65,7 @@ type task_status = type settings_projection = { appearance : string + ; dark_theme : string ; language : string ; system_language : string option ; spell_check : bool @@ -409,7 +410,9 @@ type logseq_model = ; settings_tabs_open : bool ; runtime_log_open : bool ; appearance : string + ; dark_theme : string ; settings_appearance_menu_open : bool + ; settings_dark_theme_menu_open : bool ; language : string ; system_language : string ; language_choices : settings_language_choice list @@ -601,6 +604,9 @@ type logseq_action = | OpenSettingsAppearanceMenu | CloseSettingsAppearanceMenu | ChangeAppearance of string + | OpenSettingsDarkThemeMenu + | CloseSettingsDarkThemeMenu + | ChangeDarkTheme of string | OpenSettingsLanguageMenu | CloseSettingsLanguageMenu | ChooseSettingsLanguage of string diff --git a/shared/src/logseq/native_bridge.ml b/shared/src/logseq/native_bridge.ml index a760959c..5c3c7a8a 100644 --- a/shared/src/logseq/native_bridge.ml +++ b/shared/src/logseq/native_bridge.ml @@ -115,6 +115,7 @@ let host_action (update : Host_update.host_update) = | Settings settings -> Model.ApplySettingsSnapshot { Model.appearance = settings.appearance; + dark_theme = settings.dark_theme; language = settings.language; system_language = settings.system_language; spell_check = settings.spell_check; @@ -228,6 +229,7 @@ let encode_asset_presentation title asset_type local_path = let encode_settings (settings : Model.settings_projection) = "{\"appearance\":" ^ Lui_wire.quoted settings.appearance + ^ ",\"darkTheme\":" ^ Lui_wire.quoted settings.dark_theme ^ ",\"language\":" ^ Lui_wire.quoted settings.language ^ ",\"spellCheck\":" ^ string_of_bool settings.spell_check ^ ",\"autoCorrection\":" ^ string_of_bool settings.auto_correction diff --git a/shared/src/logseq/view.ml b/shared/src/logseq/view.ml index 42dce121..556bd3d7 100644 --- a/shared/src/logseq/view.ml +++ b/shared/src/logseq/view.ml @@ -4,16 +4,17 @@ type retained_outline_row = View_rows.retained_row colors ride the wire as adaptive {light,dark} pairs picked by each backend's effective color scheme, and `theme-mode` follows the appearance setting so every platform hot-switches with one patch. *) -let logseq_theme_tokens ui_context : (string * Lui_ui.theme_token_value) list = +let logseq_theme_tokens ui_context dark_theme : (string * Lui_ui.theme_token_value) list = let open Lui_ui in let surfaces = match Lui_ui.platform ui_context, Lui_ui.host ui_context with | Lui_protocol.AndroidOS, Lui_protocol.KotlinHost -> [] | _ -> [ - ("background", View_base.main_background); + ("background", View_base.main_background dark_theme); ("surface", View_base.grouped_row_background); - ("code-container", Adaptive { light = "#EFEFF0"; dark = "#19394D" }); + ("code-container", Adaptive { light = "#EFEFF0"; + dark = if dark_theme = "black" then "#242424" else "#19394D" }); ("card", View_base.grouped_row_background); ] in @@ -48,7 +49,9 @@ let logseq_view (context : Lui_ui.ui_context) model_source send = let language (model : Model.logseq_model) = Localization.resolve model.language model.system_language in - Lui_elements.themed ~tokens:(logseq_theme_tokens context) + let dark_theme (model : Model.logseq_model) = model.dark_theme in + Lui_elements.themed + ~tokens_signal:(Signal.map (logseq_theme_tokens context) (Signal.map dark_theme model_source)) ~mode:(reactive logseq_theme_mode model_source) (reactive ~equal:(fun left right -> language left = language right) (fun _ -> View_screens.logseq_view context model_source send) model_source) diff --git a/shared/src/logseq/view_authentication.ml b/shared/src/logseq/view_authentication.ml index 7668341f..bccaa16a 100644 --- a/shared/src/logseq/view_authentication.ml +++ b/shared/src/logseq/view_authentication.ml @@ -139,7 +139,7 @@ let sheet source send : t = ~on_press:(action send Auth_flow.Cancel) []; ] in let sheet_title = if android then Signal.constant context.ui_scheduler "" else title in - View_base.sheet ~title:(reactive sheet_title) + View_base.sheet ~model_source:source ~title:(reactive sheet_title) ~height:680 ~style_class:"navigation-content navigation-inline-title" ~detents_signal:(Signal.map (fun current -> match (form current).stage with | Auth_flow.Register | NewPassword -> "0.82,large" diff --git a/shared/src/logseq/view_base.ml b/shared/src/logseq/view_base.ml index 65819d77..44d9db1c 100644 --- a/shared/src/logseq/view_base.ml +++ b/shared/src/logseq/view_base.ml @@ -10,12 +10,13 @@ let property_title current ~attr ~title = open Lui_protocol -let main_background = Lui_ui.Adaptive { light = "#FCFCFC"; dark = "#002D38" } -let sheet_background = Lui_ui.Adaptive { light = "#F2F2F7"; dark = "#002D38" } +let dark_background = function "black" -> "#000000" | _ -> "#002D38" +let main_background theme = Lui_ui.Adaptive { light = "#FCFCFC"; dark = dark_background theme } +let sheet_background theme = Lui_ui.Adaptive { light = "#F2F2F7"; dark = dark_background theme } let grouped_row_background = Lui_ui.Adaptive { light = "#FFFFFF"; dark = "#FFFFFF14" } let dark_accent = "#9BD3D4" -let sheet ?height ?style_class ?detents ?detents_signal ?accessibility_identifier +let sheet ~model_source ?height ?style_class ?detents ?detents_signal ?accessibility_identifier ?on_dismiss ~title ?title_signal children : Lui_elements.t = let content = Lui_elements.sheet ?height ?style_class ?detents ?detents_signal ?accessibility_identifier ?on_dismiss ~title ?title_signal children in @@ -26,15 +27,19 @@ let sheet ?height ?style_class ?detents ?detents_signal ?accessibility_identifie let accent = Lui_ui.Fixed "#037DBA" in let list_sheet = Option.fold ~none:false ~some:(fun style -> List.mem "navigation-list" (String.split_on_char ' ' style)) style_class in - Lui_elements.themed ~tokens:[ - (* The list presentation uses the background token for the modal itself. *) - "background", sheet_background; - "surface", (if list_sheet then grouped_row_background else sheet_background); - "card", grouped_row_background; - "input", grouped_row_background; - "primary", accent; - "input-focus", accent; - ] (Lui_elements.stack [content]) context parent + let theme = Signal.map (fun (model : Model.logseq_model) -> model.dark_theme) model_source in + let tokens = Signal.map (fun theme -> + let background = sheet_background theme in + [ + "background", background; + "surface", (if list_sheet then grouped_row_background else background); + "card", grouped_row_background; + "input", grouped_row_background; + "primary", accent; + "input-focus", accent; + ]) theme in + Lui_elements.themed ~tokens_signal:tokens + (Lui_elements.stack [content]) context parent | _ -> content context parent let node_icon (current : Model.logseq_model) uuid = @@ -1275,12 +1280,6 @@ let settings_language_title (current : Model.logseq_model) = | Some choice -> tr current choice.title | None -> tr current "System" -let settings_appearance_title (current : Model.logseq_model) = - match current.appearance with - | "light" -> tr current "Light" - | "dark" -> tr current "Dark" - | _ -> tr current "System" - let settings_language_choice_title (choice : Model.settings_language_choice) = choice.title diff --git a/shared/src/logseq/view_base.mli b/shared/src/logseq/view_base.mli index 1bc2f729..4cb1ea16 100644 --- a/shared/src/logseq/view_base.mli +++ b/shared/src/logseq/view_base.mli @@ -1,11 +1,11 @@ val tr : Model.logseq_model -> string -> string val tr_named : Model.logseq_model -> string -> string -> string val property_title : Model.logseq_model -> attr:string -> title:string -> string -val main_background : Lui_ui.theme_token_value +val main_background : string -> Lui_ui.theme_token_value val grouped_row_background : Lui_ui.theme_token_value val dark_accent : string val sheet : - ?height:int -> ?style_class:string -> ?detents:string -> + model_source:Model.logseq_model Signal.signal -> ?height:int -> ?style_class:string -> ?detents:string -> ?detents_signal:string Signal.signal -> ?accessibility_identifier:string -> ?on_dismiss:(unit -> unit) -> title:string -> ?title_signal:string Signal.signal -> Lui_elements.t list -> Lui_elements.t @@ -320,7 +320,6 @@ val settings_apply_disabled_ : Model.logseq_model -> bool val settings_version : Model.logseq_model -> string val settings_revision : Model.logseq_model -> string val settings_language_title : Model.logseq_model -> string -val settings_appearance_title : Model.logseq_model -> string val settings_language_choice_title : Model.settings_language_choice -> string val settings_language_choice_identifier : Model.settings_language_choice -> string diff --git a/shared/src/logseq/view_flashcards.ml b/shared/src/logseq/view_flashcards.ml index 38ec44e3..a6b47c52 100644 --- a/shared/src/logseq/view_flashcards.ml +++ b/shared/src/logseq/view_flashcards.ml @@ -235,7 +235,7 @@ let flashcard_group_controls model_source send : t = fun context parent -> emit ["action", `String "create"; "kind", `String (Signal.sample (Signal.value kind)); "targetUuid", `String uuid; "title", `String (Signal.sample (Signal.value name))]) [] in request_search "page" ""; - (View_base.sheet ~title:(View_base.tr (Signal.sample model_source) "New card group") ~detents:"medium,large" ~style_class:"navigation-list navigation-inline-title" + (View_base.sheet ~model_source ~title:(View_base.tr (Signal.sample model_source) "New card group") ~detents:"medium,large" ~style_class:"navigation-list navigation-inline-title" ~accessibility_identifier:"sheet.flashcards.deck.create" ~on_dismiss:(fun _ -> Signal.set adding false) [ list ~grow:1.0 ~style:`inset_grouped [ list_section [ diff --git a/shared/src/logseq/view_graphs.ml b/shared/src/logseq/view_graphs.ml index 3e1c59a8..3411f35f 100644 --- a/shared/src/logseq/view_graphs.ml +++ b/shared/src/logseq/view_graphs.ml @@ -154,7 +154,7 @@ let graph_create_sheet (context : Lui_ui.ui_context) model_source send : t = View_base.with_int_prop_signal HeightValue (Signal.map (fun (current : Model.logseq_model) -> if current.new_graph_encrypted && current.new_graph_password_required then 640 else 480) model_source) - (View_base.sheet ~title:(View_base.tr (Signal.sample model_source) "Add sync graph") ~height:480 + (View_base.sheet ~model_source ~title:(View_base.tr (Signal.sample model_source) "Add sync graph") ~height:480 ~accessibility_identifier:"sheet.graph-create" ~on_dismiss:(press send Model.DismissCreateGraph) [ @@ -218,7 +218,7 @@ let graph_create_sheet (context : Lui_ui.ui_context) model_source send : t = ]; ]) else - View_base.sheet ~title:(View_base.tr (Signal.sample model_source) "Add sync graph") ~style_class:"navigation-form" + View_base.sheet ~model_source ~title:(View_base.tr (Signal.sample model_source) "Add sync graph") ~style_class:"navigation-form" ~accessibility_identifier:"sheet.graph-create" ~on_dismiss:(press send Model.DismissCreateGraph) [ @@ -380,7 +380,7 @@ let graph_picker_overflow_menu model_source send : t = let graph_password_sheet (context : Lui_ui.ui_context) model_source send : t = if Lui_ui.host context = KotlinHost then - View_base.sheet ~title:(View_base.tr (Signal.sample model_source) "Unlock encrypted graphs") ~height:360 + View_base.sheet ~model_source ~title:(View_base.tr (Signal.sample model_source) "Unlock encrypted graphs") ~height:360 ~accessibility_identifier:"sheet.graph-unlock" ~on_dismiss:(press send Model.CancelGraphUnlock) [ @@ -424,7 +424,7 @@ let graph_password_sheet (context : Lui_ui.ui_context) model_source send ]; ] else - View_base.sheet ~title:(View_base.tr (Signal.sample model_source) "Unlock encrypted graphs") ~style_class:"navigation-form" + View_base.sheet ~model_source ~title:(View_base.tr (Signal.sample model_source) "Unlock encrypted graphs") ~style_class:"navigation-form" ~accessibility_identifier:"sheet.graph-unlock" ~on_dismiss:(press send Model.CancelGraphUnlock) [ diff --git a/shared/src/logseq/view_outliner.ml b/shared/src/logseq/view_outliner.ml index 1a53a6bc..86d00208 100644 --- a/shared/src/logseq/view_outliner.ml +++ b/shared/src/logseq/view_outliner.ml @@ -1177,7 +1177,7 @@ let outliner_autocomplete_bar (context : Lui_ui.ui_context) model_source send : ~accessibility_identifier:"button.outliner.autocomplete.submit" ~on_press:confirm [] in let toolbar_done_ = Lui_elements.toolbar_button ~text:(View_base.tr (Signal.sample model_source) "Insert") ~variant:`ghost ~style_class:"confirmation-action" ~foreground:"foreground" ~accessibility_identifier:"button.outliner.autocomplete.submit" ~on_press:confirm [] in - (View_base.sheet ~title:(title kind) ~detents:(if temporal then "large" else "medium,large") ~style_class:"navigation-list navigation-inline-title" + (View_base.sheet ~model_source ~title:(title kind) ~detents:(if temporal then "large" else "medium,large") ~style_class:"navigation-list navigation-inline-title" ~accessibility_identifier:"sheet.outliner.autocomplete" ~on_dismiss:(fun _ -> dismiss ()) [ list ~grow:1.0 ~style:`inset_grouped [list_section ( if temporal then [list_section_item ~padding_horizontal:0 ~padding_vertical:0 [ diff --git a/shared/src/logseq/view_property.ml b/shared/src/logseq/view_property.ml index af9289e4..8baf446a 100644 --- a/shared/src/logseq/view_property.ml +++ b/shared/src/logseq/view_property.ml @@ -84,7 +84,7 @@ let with_add_property_picker ?(in_tag_properties = false) model_source raw_sourc (dropdown_menu_item ~text:(View_base.tr (Signal.sample model_source) "Add property") ~accessibility_identifier:add_id ~on_press:show_picker []) in let picker = if_ ~test:(Signal.value adding) - (View_base.sheet ~title:(View_base.tr (Signal.sample model_source) "Add property") ~style_class:"navigation-list navigation-inline-title" ~detents:"medium,large" + (View_base.sheet ~model_source ~title:(View_base.tr (Signal.sample model_source) "Add property") ~style_class:"navigation-list navigation-inline-title" ~detents:"medium,large" ~accessibility_identifier:(add_id ^ ".sheet") ~on_dismiss:(fun _ -> Signal.set adding false) [ Lui_elements.list ~grow:1.0 ~style:`inset_grouped [ search_field ~text_signal:(Signal.value search) ~placeholder:(View_base.tr (Signal.sample model_source) "Select a property") ~label:(View_base.tr (Signal.sample model_source) "Search") @@ -112,7 +112,7 @@ let tag_properties model_source raw_source send close : t = let owner = text (field "ownerUuid" (Signal.sample source)) in let graph = Option.value ~default:"" (Signal.sample model_source).Model.selected_graph_id in (with_add_property_picker ~in_tag_properties:true model_source raw_source send (fun add _ picker -> - View_base.sheet ~title:(View_base.tr (Signal.sample model_source) "Tag properties") + View_base.sheet ~model_source ~title:(View_base.tr (Signal.sample model_source) "Tag properties") ~style_class:"navigation-list navigation-inline-title" ~detents:"large" ~accessibility_identifier:("sheet.tag-properties." ^ owner) ~on_dismiss:(fun _ -> close ()) [ Lui_elements.list ~grow:1.0 ~style:`inset_grouped [ diff --git a/shared/src/logseq/view_query.ml b/shared/src/logseq/view_query.ml index f8205cac..f589d8cc 100644 --- a/shared/src/logseq/view_query.ml +++ b/shared/src/logseq/view_query.ml @@ -375,7 +375,7 @@ let settings_sheet mode owner feature view_source model_source send close : t = ~accessibility_identifier:(id "values.done") ~on_press:(fun _ -> set_value (Signal.sample (Signal.value selection)); Signal.set selecting false) [] in let toolbar_done_ = Lui_elements.toolbar_button ~text:(View_base.tr (Signal.sample model_source) "Done") ~variant:`ghost ~style_class:"confirmation-action" ~foreground:"foreground" ~accessibility_identifier:(id "values.done") ~on_press:(fun _ -> set_value (Signal.sample (Signal.value selection)); Signal.set selecting false) [] in - View_base.sheet ~title:(reactive (own (Signal.map2 property_title model_source col))) + View_base.sheet ~model_source ~title:(reactive (own (Signal.map2 property_title model_source col))) ~style_class:"navigation-list navigation-inline-title" ~detents:"medium,large" ~accessibility_identifier:(id "values.sheet") ~on_dismiss:(fun _ -> Signal.set selecting false) [ list ~grow:1.0 ~style:`inset_grouped [ @@ -502,7 +502,7 @@ let settings_sheet mode owner feature view_source model_source send close : t = ~disabled_signal:(own (Signal.map2 (fun waiting filters -> waiting || (mode = "filter" && List.exists (fun draft -> filter_error draft <> None) filters)) (waiting model_source initial.id) (Signal.value filters))) ~accessibility_identifier:("view.settings.save." ^ initial.id) ~on_press:save_action [] in - (View_base.sheet ~title:(if mode = "filter" then "Filters" else "Sort") ~style_class:"navigation-list navigation-inline-title" ~detents:"medium,large" + (View_base.sheet ~model_source ~title:(if mode = "filter" then "Filters" else "Sort") ~style_class:"navigation-list navigation-inline-title" ~detents:"medium,large" ~accessibility_identifier:("view.settings.sheet." ^ initial.id) ~on_dismiss:(fun _ -> close ()) [ list ~grow:1.0 ~style:`inset_grouped ~accessibility_identifier:("view." ^ mode ^ ".list." ^ initial.id) @@ -629,7 +629,7 @@ let property_editor ?(owner = "") ?(send = fun _ -> false) ?open_node ?(open_nod ~accessibility_identifier:("view.edit.save." ^ view.id) ~disabled_signal:(waiting model_source view.id) ~on_press:confirm_input [] in let toolbar_controls = if plain || temporal || many then [toolbar_cancel; toolbar_confirm] else [toolbar_cancel] in - (View_base.sheet ~title:(property_title (Signal.sample model_source) col) + (View_base.sheet ~model_source ~title:(property_title (Signal.sample model_source) col) ~style_class:"navigation-list navigation-inline-title" ~detents:"medium,large" ~accessibility_identifier:("view.edit.sheet." ^ view.id) ~on_dismiss:(fun _ -> close ()) [ list ~grow:1.0 ~style:`inset_grouped ~track_visible_range:true diff --git a/shared/src/logseq/view_settings.ml b/shared/src/logseq/view_settings.ml index 2e3c6c1e..bc8e5a59 100644 --- a/shared/src/logseq/view_settings.ml +++ b/shared/src/logseq/view_settings.ml @@ -101,86 +101,61 @@ let settings_language_control (context : Lui_ui.ui_context) model_source ] |> with_native_control_tint "picker" -let settings_appearance_control (context : Lui_ui.ui_context) model_source - send : t = +let settings_theme_picker ~id ~label ~choices ~selected ~menu_open + ~open_menu ~close_menu ~choose context model_source send : t = + let current = Signal.sample model_source in + let label = View_base.tr current label in + let picker_id = "picker.settings." ^ id in + let option_id choice = picker_id ^ ".option." ^ choice in + let selected_signal choice = + Signal.map (fun model -> selected model = choice) model_source in if Lui_ui.host context = KotlinHost then - let appearance_item id title : dropdown_menu_item_el = - dropdown_menu_item ~text:title - ~selected_signal: - (Signal.map - (fun (model : Model.logseq_model) -> model.appearance = id) - model_source) - ~accessibility_identifier: - ("picker.settings.appearance.option." ^ id) - ~on_press:(fun _ -> - ignore (send (Model.ChangeAppearance id))) - [] - in - stack - ~accessibility_identifier:"layout.settings.appearance-control" + stack ~accessibility_identifier:("layout.settings." ^ id ^ "-control") [ select - ~text_signal: - (Signal.map View_base.settings_appearance_title model_source) - ~label:(View_base.tr (Signal.sample model_source) "Theme") - ~accessibility_identifier:"picker.settings.appearance" - ~on_press:(press send Model.OpenSettingsAppearanceMenu) - []; - if_ - ~test: - (Signal.map View_base.model_settings_appearance_menu_open_ - model_source) + ~text_signal:(Signal.map (fun current -> + match List.assoc_opt (selected current) choices with + | Some title -> View_base.tr current title + | None -> "") model_source) + ~label ~accessibility_identifier:picker_id + ~on_press:(press send open_menu) []; + if_ ~test:(Signal.map menu_open model_source) (dropdown_menu_view (dropdown_menu ~anchor:`below ~anchor_alignment:`end_ - ~min_width:160 - ~on_dismiss:(press send Model.CloseSettingsAppearanceMenu) - [ - appearance_item "system" "System"; - appearance_item "light" "Light"; - appearance_item "dark" "Dark"; - ])); + ~min_width:160 ~on_dismiss:(press send close_menu) + (List.map (fun (choice, title) -> + dropdown_menu_item ~text:(View_base.tr current title) + ~selected_signal:(selected_signal choice) + ~accessibility_identifier:(option_id choice) + ~on_press:(press send (choose choice)) []) choices))); ] else - (* Menu-style radio group renders as the native inline picker: - label on the left, current value + dropdown on the right. *) - radio_group ~label:(View_base.tr (Signal.sample model_source) "Theme") ~style_class:"menu" - ~accessibility_identifier:"picker.settings.appearance" - [ - radio ~text:(View_base.tr (Signal.sample model_source) "System") - ~checked_signal: - (Signal.map - (fun (model : Model.logseq_model) -> - model.appearance = "system") - model_source) - ~accessibility_identifier: - "picker.settings.appearance.option.system" - ~on_change:(fun _ -> - ignore (send (Model.ChangeAppearance "system"))) - []; - radio ~text:(View_base.tr (Signal.sample model_source) "Light") - ~checked_signal: - (Signal.map - (fun (model : Model.logseq_model) -> - model.appearance = "light") - model_source) - ~accessibility_identifier: - "picker.settings.appearance.option.light" - ~on_change:(fun _ -> - ignore (send (Model.ChangeAppearance "light"))) - []; - radio ~text:(View_base.tr (Signal.sample model_source) "Dark") - ~checked_signal: - (Signal.map - (fun (model : Model.logseq_model) -> - model.appearance = "dark") - model_source) - ~accessibility_identifier: - "picker.settings.appearance.option.dark" - ~on_change:(fun _ -> - ignore (send (Model.ChangeAppearance "dark"))) - []; - ] + radio_group ~label ~style_class:"menu" ~accessibility_identifier:picker_id + (List.map (fun (choice, title) -> + radio ~text:(View_base.tr current title) + ~checked_signal:(selected_signal choice) + ~accessibility_identifier:(option_id choice) + ~on_change:(fun _ -> ignore (send (choose choice))) []) choices) |> with_native_control_tint "picker" +let settings_appearance_control context model_source send = + settings_theme_picker ~id:"appearance" ~label:"Theme" + ~choices:[ "system", "System"; "light", "Light"; "dark", "Dark" ] + ~selected:(fun (model : Model.logseq_model) -> + match model.appearance with "light" | "dark" -> model.appearance | _ -> "system") + ~menu_open:View_base.model_settings_appearance_menu_open_ + ~open_menu:Model.OpenSettingsAppearanceMenu + ~close_menu:Model.CloseSettingsAppearanceMenu ~choose:(fun mode -> Model.ChangeAppearance mode) + context model_source send + +let settings_dark_theme_control context model_source send = + settings_theme_picker ~id:"dark-theme" ~label:"Dark theme" + ~choices:[ "solarized", "Solarized"; "black", "Black" ] + ~selected:(fun (model : Model.logseq_model) -> model.dark_theme) + ~menu_open:(fun model -> model.Model.settings_dark_theme_menu_open) + ~open_menu:Model.OpenSettingsDarkThemeMenu + ~close_menu:Model.CloseSettingsDarkThemeMenu ~choose:(fun theme -> Model.ChangeDarkTheme theme) + context model_source send + let settings_community_link_row (context : Lui_ui.ui_context) model_source link_source send : t = let link = Signal.sample link_source in @@ -568,6 +543,7 @@ let settings_general_card (context : Lui_ui.ui_context) model_source send : ~accessibility_identifier:"layout.settings.general-card" [ settings_appearance_control context model_source send; + settings_dark_theme_control context model_source send; settings_language_control context model_source send; list_item ~accessibility_identifier:"link.settings.tabs" @@ -605,6 +581,13 @@ let settings_general_card (context : Lui_ui.ui_context) model_source send : settings_appearance_control context model_source send; ]; separator []; + row ~cross:`center + [ + text ~value:(View_base.tr (Signal.sample model_source) "Dark theme") []; + spacer []; + settings_dark_theme_control context model_source send; + ]; + separator []; row ~cross:`center [ text ~value:(View_base.tr (Signal.sample model_source) "Language") []; @@ -900,6 +883,7 @@ let settings_form_screen (context : Lui_ui.ui_context) model_source send heading ~value:(View_base.tr (Signal.sample model_source) "General") ~foreground:"muted-foreground" ~accessibility_identifier:"label.settings.general" []; settings_appearance_control context model_source send; + settings_dark_theme_control context model_source send; settings_language_control context model_source send; list_item ~accessibility_identifier:"link.settings.tabs" ~on_press:(press send Model.OpenSettingsTabs) @@ -1000,7 +984,7 @@ let settings_screen (context : Lui_ui.ui_context) model_source send : t = let settings_tabs_sheet (context : Lui_ui.ui_context) model_source send : t = if Lui_ui.host context = KotlinHost then - View_base.sheet ~title:(View_base.tr (Signal.sample model_source) "Tabs") ~style_class:"navigation-content" + View_base.sheet ~model_source ~title:(View_base.tr (Signal.sample model_source) "Tabs") ~style_class:"navigation-content" ~accessibility_identifier:"sheet.settings" ~on_dismiss:(press send Model.BackSettings) [ @@ -1020,7 +1004,7 @@ let settings_tabs_sheet (context : Lui_ui.ui_context) model_source send : ]; ] else - View_base.sheet ~title:(View_base.tr (Signal.sample model_source) "Tabs") ~style_class:"navigation-list" + View_base.sheet ~model_source ~title:(View_base.tr (Signal.sample model_source) "Tabs") ~style_class:"navigation-list" ~accessibility_identifier:"sheet.settings.tabs" ~on_dismiss:(press send Model.BackSettings) [ @@ -1068,7 +1052,7 @@ let runtime_log_actions model_source (context : Lui_ui.ui_context) send : t = let runtime_log_sheet (context : Lui_ui.ui_context) model_source send : t = if Lui_ui.host context = KotlinHost then - View_base.sheet ~title:(View_base.tr (Signal.sample model_source) "Log") ~style_class:"navigation-content" + View_base.sheet ~model_source ~title:(View_base.tr (Signal.sample model_source) "Log") ~style_class:"navigation-content" ~accessibility_identifier:"sheet.settings" ~on_dismiss:(press send Model.DismissRuntimeLog) [ @@ -1080,7 +1064,7 @@ let runtime_log_sheet (context : Lui_ui.ui_context) model_source send : t = ]; ] else - View_base.sheet ~title:(View_base.tr (Signal.sample model_source) "Log") ~style_class:"navigation-content" + View_base.sheet ~model_source ~title:(View_base.tr (Signal.sample model_source) "Log") ~style_class:"navigation-content" ~accessibility_identifier:"sheet.settings.log" ~on_dismiss:(press send Model.DismissRuntimeLog) [ @@ -1091,7 +1075,7 @@ let runtime_log_sheet (context : Lui_ui.ui_context) model_source send : t = let settings_main_sheet (context : Lui_ui.ui_context) model_source send : t = if Lui_ui.host context = KotlinHost then - View_base.sheet ~title:(View_base.tr (Signal.sample model_source) "Settings") ~height:640 + View_base.sheet ~model_source ~title:(View_base.tr (Signal.sample model_source) "Settings") ~height:640 ~accessibility_identifier:"sheet.settings" ~on_dismiss:(press send Model.DismissSettings) [ @@ -1119,7 +1103,7 @@ let settings_main_sheet (context : Lui_ui.ui_context) model_source send : ]; ] else - View_base.sheet ~title:(View_base.tr (Signal.sample model_source) "Settings") ~style_class:"navigation-form navigation-inline-title" + View_base.sheet ~model_source ~title:(View_base.tr (Signal.sample model_source) "Settings") ~style_class:"navigation-form navigation-inline-title" ~accessibility_identifier:"sheet.settings" ~on_dismiss:(press send Model.DismissSettings) [ @@ -1230,7 +1214,7 @@ let sync_status_sheet (context : Lui_ui.ui_context) model_source send : t = ] in if Lui_ui.host context = KotlinHost then - View_base.sheet ~title:(View_base.tr (Signal.sample model_source) "Sync status") ~height:480 + View_base.sheet ~model_source ~title:(View_base.tr (Signal.sample model_source) "Sync status") ~height:480 ~accessibility_identifier:"sheet.sync-status" ~on_dismiss:(press send Model.CloseSyncDetails) [ @@ -1293,7 +1277,7 @@ let sync_status_sheet (context : Lui_ui.ui_context) model_source send : t = ]; ] else - View_base.sheet ~title:(View_base.tr (Signal.sample model_source) "Sync status") ~style_class:"navigation-form navigation-inline-title" ~detents:"medium" + View_base.sheet ~model_source ~title:(View_base.tr (Signal.sample model_source) "Sync status") ~style_class:"navigation-form navigation-inline-title" ~detents:"medium" ~accessibility_identifier:"sheet.sync-status" ~on_dismiss:(press send Model.CloseSyncDetails) [ diff --git a/shared/test/logseq/app_test.ml b/shared/test/logseq/app_test.ml index abda30ba..d6105238 100644 --- a/shared/test/logseq/app_test.ml +++ b/shared/test/logseq/app_test.ml @@ -483,6 +483,7 @@ let task_status uuid ident title icon_type icon_id icon_color = let settings tabs = { Model.appearance = "system"; + dark_theme = "solarized"; language = "system"; system_language = None; spell_check = true; @@ -914,6 +915,26 @@ let settings_preferences_persist_without_dismissing_the_sheet () = (4, Model.current_settings auto_correction_disabled); ] +let settings_dark_theme_persists_independently_of_appearance () = + let initial = Model.initial () in + check_eq initial.dark_theme "solarized"; + let opened = Model.update initial Model.OpenSettings in + let choosing = Model.update opened Model.OpenSettingsDarkThemeMenu in + let black = Model.update choosing (Model.ChangeDarkTheme "black") in + check black.settings_open; + check (not black.settings_dark_theme_menu_open); + check_eq black.appearance "system"; + check_eq black.dark_theme "black"; + let saved = Model.current_settings black in + check_eq black.pending_effects [ Model.SaveSettingsEffect (1, saved) ]; + let restored = Model.update initial (Model.ApplySettingsSnapshot saved) in + let light = Model.update restored (Model.ChangeAppearance "light") in + let dark = Model.update light (Model.ChangeAppearance "dark") in + check_eq dark.dark_theme "black"; + let fallback = Model.update initial + (Model.ApplySettingsSnapshot { saved with dark_theme = "unknown" }) in + check_eq fallback.dark_theme "solarized" + let settings_reject_invalid_connections_and_preserve_required_tabs () = let opened = { @@ -11171,6 +11192,8 @@ let cases = case "sync-indicator-is-neutral-without-authentication" sync_indicator_is_neutral_without_authentication; case "settings-navigation-tabs-and-diagnostics-are-lg-owned" settings_navigation_tabs_and_diagnostics_are_lg_owned; case "settings-preferences-persist-without-dismissing-the-sheet" settings_preferences_persist_without_dismissing_the_sheet; + case "settings dark theme persists independently of appearance" + settings_dark_theme_persists_independently_of_appearance; case "settings-reject-invalid-connections-and-preserve-required-tabs" settings_reject_invalid_connections_and_preserve_required_tabs; case "settings-snapshot-normalizes-sidebar-tabs-at-the-lg-boundary" settings_snapshot_normalizes_sidebar_tabs_at_the_lg_boundary; case "runtime-log-filters-refresh-and-successful-results-enter-lg-state" runtime_log_filters_refresh_and_successful_results_enter_lg_state; From 2eae9fb20236e4a5dea2dc859f31ed2711242457 Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Fri, 20 Nov 2026 16:59:48 +0800 Subject: [PATCH 2/7] Distinguish black theme sheets and sidebar surfaces --- .../com/logseq/logseq/ui/LogseqTheme.kt | 8 ++-- .../Sources/Logseq/LogseqThemeSettings.swift | 7 ++- shared/src/logseq/view_base.ml | 12 +++++- shared/src/logseq/view_screens.ml | 43 +++++++++++++------ 4 files changed, 50 insertions(+), 20 deletions(-) diff --git a/android/app/src/main/kotlin/com/logseq/logseq/ui/LogseqTheme.kt b/android/app/src/main/kotlin/com/logseq/logseq/ui/LogseqTheme.kt index fa1f3e79..cfb36709 100644 --- a/android/app/src/main/kotlin/com/logseq/logseq/ui/LogseqTheme.kt +++ b/android/app/src/main/kotlin/com/logseq/logseq/ui/LogseqTheme.kt @@ -114,10 +114,10 @@ internal object LogseqTheme { surfaceDim = Color.Black, surfaceBright = Color(0xff333333), surfaceContainerLowest = Color.Black, - surfaceContainerLow = Color(0xff0e0e0e), - surfaceContainer = Color(0xff141414), - surfaceContainerHigh = Color(0xff1c1c1c), - surfaceContainerHighest = Color(0xff242424), + surfaceContainerLow = Color(0xff1c1c1e), + surfaceContainer = Color(0xff222224), + surfaceContainerHigh = Color(0xff28282a), + surfaceContainerHighest = Color(0xff303032), ) fun colorScheme(dark: Boolean, darkTheme: String): ColorScheme = when { diff --git a/apple/Sources/Logseq/LogseqThemeSettings.swift b/apple/Sources/Logseq/LogseqThemeSettings.swift index 45123bb7..964e2338 100644 --- a/apple/Sources/Logseq/LogseqThemeSettings.swift +++ b/apple/Sources/Logseq/LogseqThemeSettings.swift @@ -78,7 +78,12 @@ enum LogseqThemePolicy { } static func sheetBackground(isDark: Bool, darkTheme: LogseqDarkTheme) -> Color { - isDark ? darkPalette(darkTheme).background : Color(red: 242.0 / 255, green: 242.0 / 255, blue: 247.0 / 255) + guard isDark else { + return Color(red: 242.0 / 255.0, green: 242.0 / 255.0, blue: 247.0 / 255.0) + } + return darkTheme == .black + ? Color(red: 28.0 / 255.0, green: 28.0 / 255.0, blue: 30.0 / 255.0) + : dark.background } static let light = LogseqThemePalette( diff --git a/shared/src/logseq/view_base.ml b/shared/src/logseq/view_base.ml index 44d9db1c..e7dab65d 100644 --- a/shared/src/logseq/view_base.ml +++ b/shared/src/logseq/view_base.ml @@ -12,7 +12,6 @@ open Lui_protocol let dark_background = function "black" -> "#000000" | _ -> "#002D38" let main_background theme = Lui_ui.Adaptive { light = "#FCFCFC"; dark = dark_background theme } -let sheet_background theme = Lui_ui.Adaptive { light = "#F2F2F7"; dark = dark_background theme } let grouped_row_background = Lui_ui.Adaptive { light = "#FFFFFF"; dark = "#FFFFFF14" } let dark_accent = "#9BD3D4" @@ -29,7 +28,8 @@ let sheet ~model_source ?height ?style_class ?detents ?detents_signal ?accessibi ~some:(fun style -> List.mem "navigation-list" (String.split_on_char ' ' style)) style_class in let theme = Signal.map (fun (model : Model.logseq_model) -> model.dark_theme) model_source in let tokens = Signal.map (fun theme -> - let background = sheet_background theme in + let background = Lui_ui.Adaptive + { light = "#F2F2F7"; dark = if theme = "black" then "#1C1C1E" else dark_background theme } in [ "background", background; "surface", (if list_sheet then grouped_row_background else background); @@ -40,6 +40,14 @@ let sheet ~model_source ?height ?style_class ?detents ?detents_signal ?accessibi ]) theme in Lui_elements.themed ~tokens_signal:tokens (Lui_elements.stack [content]) context parent + | { profile_os = AndroidOS; profile_host = KotlinHost } -> + let tokens = Signal.map (fun (model : Model.logseq_model) -> + if model.dark_theme = "black" then [ + "background", Lui_ui.Adaptive { light = "#FCFCFC"; dark = "#1C1C1E" }; + "surface", Lui_ui.Adaptive { light = "#FFFFFF"; dark = "#2E2E30" }; + "card", Lui_ui.Adaptive { light = "#FFFFFF"; dark = "#2E2E30" }; + ] else []) model_source in + Lui_elements.themed ~tokens_signal:tokens (Lui_elements.stack [content]) context parent | _ -> content context parent let node_icon (current : Model.logseq_model) uuid = diff --git a/shared/src/logseq/view_screens.ml b/shared/src/logseq/view_screens.ml index 0d84c42a..fd1b1a65 100644 --- a/shared/src/logseq/view_screens.ml +++ b/shared/src/logseq/view_screens.ml @@ -1143,19 +1143,36 @@ let application_drawer_view (context : Lui_ui.ui_context) model_source send : t drawer_main drawer_panel); ] else - drawer - ~selected_signal: - (Signal.map View_base.drawer_selected_ model_source) - ~disabled_signal: - (Signal.map View_base.drawer_disabled_ model_source) - ~width:360 ~label:(View_base.tr (Signal.sample model_source) "Navigation") - ~accessibility_identifier:"application.shell" - ~on_toggle:(fun open_ -> - ignore - (send - (if open_ then Model.OpenSidebar else Model.CloseSidebar)) - ) - drawer_main drawer_panel + let ios_drawer = Lui_ui.platform context = IOS && Lui_ui.host context = SwiftUIHost in + let dark_theme = Signal.map (fun (current : Model.logseq_model) -> current.dark_theme) model_source in + let drawer_main = + if ios_drawer then + let tokens = Signal.map (function + | "black" -> [ "background", View_base.main_background "black" ] + | _ -> []) dark_theme in + themed ~tokens_signal:tokens drawer_main + else drawer_main in + let shell = + drawer + ~selected_signal: + (Signal.map View_base.drawer_selected_ model_source) + ~disabled_signal: + (Signal.map View_base.drawer_disabled_ model_source) + ~width:360 ~label:(View_base.tr (Signal.sample model_source) "Navigation") + ~accessibility_identifier:"application.shell" + ~on_toggle:(fun open_ -> + ignore + (send + (if open_ then Model.OpenSidebar else Model.CloseSidebar)) + ) + drawer_main drawer_panel in + if ios_drawer then + (* The drawer fades the moving page toward its own background token. *) + let tokens = Signal.map (function + | "black" -> [ "background", Lui_ui.Adaptive { light = "#FCFCFC"; dark = "#2C2C2C" } ] + | _ -> []) dark_theme in + themed ~tokens_signal:tokens shell + else shell let application_view (context : Lui_ui.ui_context) model_source send : t = if Lui_ui.host context <> SwiftUIHost && Lui_ui.host context <> KotlinHost then From 5fd0ea2a191ec33650e5802b4e9cd2219774bf79 Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Fri, 20 Nov 2026 17:06:54 +0800 Subject: [PATCH 3/7] Match the iOS launch transition to the selected dark theme --- .../LaunchBackground.colorset/Contents.json | 2 +- .../LaunchLogo.imageset/LaunchLogo-dark.pdf | Bin 1338 -> 1338 bytes .../LaunchLogo.imageset/README.md | 2 +- apple/Sources/Logseq/LaunchTransition.swift | 27 +++++++++-- apple/Sources/Logseq/LogseqApp.swift | 6 ++- apple/Tests/UI/launch-transition.swift | 45 ++++++++++-------- 6 files changed, 55 insertions(+), 27 deletions(-) diff --git a/apple/App/Assets.xcassets/LaunchBackground.colorset/Contents.json b/apple/App/Assets.xcassets/LaunchBackground.colorset/Contents.json index 14553f17..92e8649f 100644 --- a/apple/App/Assets.xcassets/LaunchBackground.colorset/Contents.json +++ b/apple/App/Assets.xcassets/LaunchBackground.colorset/Contents.json @@ -6,7 +6,7 @@ }, { "appearances": [{ "appearance": "luminosity", "value": "dark" }], - "color": { "color-space": "srgb", "components": { "red": "0.000", "green": "0.1764705882", "blue": "0.2196078431", "alpha": "1.000" } }, + "color": { "color-space": "srgb", "components": { "red": "0.000", "green": "0.000", "blue": "0.000", "alpha": "1.000" } }, "idiom": "universal" } ], diff --git a/apple/App/Assets.xcassets/LaunchLogo.imageset/LaunchLogo-dark.pdf b/apple/App/Assets.xcassets/LaunchLogo.imageset/LaunchLogo-dark.pdf index 47279d1c16514473d666faf5a0d21d283007c6c9..c672fa9f6af83c58d0c5f740793ae86ec4e15402 100644 GIT binary patch delta 366 zcmV-!0g?W?3c3oAOMd}nl1pybFbqWZI>lU|j3|CY9-~Jn3?$unk@o&TM=pw>2@F`G zOpe}=R!lzMlrLR{>mKi8$}Tr`eBJzd!^@9}x8I|dgeJ@+*2axe@ws3nGZfp!d%>yT ziQF=G!CJx%7osJTaf$grxI{im*?|b*r`4idn3}TNuw2puX@9aOBbD~XR#DwpCK?Ol z!mbB~$rgb!$<>s?|Ew2&exZLIrUyisegC`7n~k8r5+#`HU-6KzfIXNOR!QwRyv6nz zX^$nI=4`mhY=!z3%a$g%@W#khtmiv zcgi9J8M!G%F3IjQ9Oc3;&gm$Qe$ix}O9qp>Xyh4vpUc@>{u!HSO#Z}tOno{!&c2U7 Mgk*(Dv#SA*1G4wD{{R30 delta 366 zcmV-!0g?W?3c3oAOMjeYl1+{jF${(GIfXBPiGO1sgCn4pdf4;=xWB}65E@`qQYEQ+ zw!ddbXyf@Lc!?H0UhDhX94e7bn@_okzi)oL(dVz5-hQr94oNbD_|S_=*te1u?+`l9 z-b#)@Ps+pl6j^h)(SxEnvqo#aD4Zj2rtF{y#xHFaERZIjHh)s*^q@388zF%`3JJB5ivDGN(6`cWIfjpHYJpb$@L6JumELmr^4vfW_~ELAnt;ZJNlmDeQ(CGEB=ppOntENTwm5N MhSh~iv#SA*1Ft- Date: Fri, 20 Nov 2026 17:12:01 +0800 Subject: [PATCH 4/7] Refresh iOS launch snapshots on upgrade --- .../Contents.json | 0 .../Contents.json | 4 ++-- .../LaunchMark-dark.pdf} | Bin .../LaunchMark.pdf} | Bin .../README.md | 0 apple/App/Info.plist | 5 +++-- apple/Sources/Logseq/LaunchTransition.swift | 2 +- scripts/test-ios-launch-screen.py | 2 +- 8 files changed, 7 insertions(+), 6 deletions(-) rename apple/App/Assets.xcassets/{LaunchBackground.colorset => LaunchBackdrop.colorset}/Contents.json (100%) rename apple/App/Assets.xcassets/{LaunchLogo.imageset => LaunchMark.imageset}/Contents.json (81%) rename apple/App/Assets.xcassets/{LaunchLogo.imageset/LaunchLogo-dark.pdf => LaunchMark.imageset/LaunchMark-dark.pdf} (100%) rename apple/App/Assets.xcassets/{LaunchLogo.imageset/LaunchLogo.pdf => LaunchMark.imageset/LaunchMark.pdf} (100%) rename apple/App/Assets.xcassets/{LaunchLogo.imageset => LaunchMark.imageset}/README.md (100%) diff --git a/apple/App/Assets.xcassets/LaunchBackground.colorset/Contents.json b/apple/App/Assets.xcassets/LaunchBackdrop.colorset/Contents.json similarity index 100% rename from apple/App/Assets.xcassets/LaunchBackground.colorset/Contents.json rename to apple/App/Assets.xcassets/LaunchBackdrop.colorset/Contents.json diff --git a/apple/App/Assets.xcassets/LaunchLogo.imageset/Contents.json b/apple/App/Assets.xcassets/LaunchMark.imageset/Contents.json similarity index 81% rename from apple/App/Assets.xcassets/LaunchLogo.imageset/Contents.json rename to apple/App/Assets.xcassets/LaunchMark.imageset/Contents.json index e5fafacb..c9cb4477 100644 --- a/apple/App/Assets.xcassets/LaunchLogo.imageset/Contents.json +++ b/apple/App/Assets.xcassets/LaunchMark.imageset/Contents.json @@ -1,7 +1,7 @@ { "images": [ { - "filename": "LaunchLogo.pdf", + "filename": "LaunchMark.pdf", "idiom": "universal" }, { @@ -11,7 +11,7 @@ "value": "dark" } ], - "filename": "LaunchLogo-dark.pdf", + "filename": "LaunchMark-dark.pdf", "idiom": "universal" } ], diff --git a/apple/App/Assets.xcassets/LaunchLogo.imageset/LaunchLogo-dark.pdf b/apple/App/Assets.xcassets/LaunchMark.imageset/LaunchMark-dark.pdf similarity index 100% rename from apple/App/Assets.xcassets/LaunchLogo.imageset/LaunchLogo-dark.pdf rename to apple/App/Assets.xcassets/LaunchMark.imageset/LaunchMark-dark.pdf diff --git a/apple/App/Assets.xcassets/LaunchLogo.imageset/LaunchLogo.pdf b/apple/App/Assets.xcassets/LaunchMark.imageset/LaunchMark.pdf similarity index 100% rename from apple/App/Assets.xcassets/LaunchLogo.imageset/LaunchLogo.pdf rename to apple/App/Assets.xcassets/LaunchMark.imageset/LaunchMark.pdf diff --git a/apple/App/Assets.xcassets/LaunchLogo.imageset/README.md b/apple/App/Assets.xcassets/LaunchMark.imageset/README.md similarity index 100% rename from apple/App/Assets.xcassets/LaunchLogo.imageset/README.md rename to apple/App/Assets.xcassets/LaunchMark.imageset/README.md diff --git a/apple/App/Info.plist b/apple/App/Info.plist index 37aaa803..48cce525 100644 --- a/apple/App/Info.plist +++ b/apple/App/Info.plist @@ -4,10 +4,11 @@ UILaunchScreen + UIColorName - LaunchBackground + LaunchBackdrop UIImageName - LaunchLogo + LaunchMark UIImageRespectsSafeAreaInsets diff --git a/apple/Sources/Logseq/LaunchTransition.swift b/apple/Sources/Logseq/LaunchTransition.swift index 7bb60c92..c797742a 100644 --- a/apple/Sources/Logseq/LaunchTransition.swift +++ b/apple/Sources/Logseq/LaunchTransition.swift @@ -14,7 +14,7 @@ import UIKit case .dark: .dark } let traits = UITraitCollection(userInterfaceStyle: style) - guard let image = UIImage(named: "LaunchLogo", in: nil, compatibleWith: traits) else { return } + guard let image = UIImage(named: "LaunchMark", in: nil, compatibleWith: traits) else { return } let palette = LogseqThemePolicy.palette( mode: mode, systemIsDark: systemStyle == .dark, darkTheme: darkTheme ) diff --git a/scripts/test-ios-launch-screen.py b/scripts/test-ios-launch-screen.py index 64f39375..665a0af1 100644 --- a/scripts/test-ios-launch-screen.py +++ b/scripts/test-ios-launch-screen.py @@ -9,7 +9,7 @@ ROOT = Path(__file__).resolve().parents[1] source = ROOT / "apple/App/Info.plist" -expected = {"UIColorName": "LaunchBackground", "UIImageName": "LaunchLogo", +expected = {"UIColorName": "LaunchBackdrop", "UIImageName": "LaunchMark", "UIImageRespectsSafeAreaInsets": False} assert plistlib.loads(source.read_bytes()).get("UILaunchScreen") == expected, \ "The Xcode app must show the adaptive Logseq logo during system launch" From e132d595c2b1e1d1f98397da81a79a2b3fbc490f Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Fri, 20 Nov 2026 17:19:43 +0800 Subject: [PATCH 5/7] Unify themed launch and neutral sidebar selection --- .../main/kotlin/com/logseq/logseq/ui/LogseqTheme.kt | 2 ++ .../Contents.json | 0 .../App/Assets.xcassets/LaunchMark.imageset/README.md | 2 +- apple/App/Info.plist | 8 ++------ apple/Sources/Logseq/LGNavigationExtension.swift | 10 ++++++++-- apple/Sources/Logseq/LogseqApp.swift | 1 + apple/Tests/UI/launch-transition.swift | 6 +++--- scripts/test-ios-launch-screen.py | 7 +++---- 8 files changed, 20 insertions(+), 16 deletions(-) rename apple/App/Assets.xcassets/{LaunchBackdrop.colorset => LaunchCanvas.colorset}/Contents.json (100%) diff --git a/android/app/src/main/kotlin/com/logseq/logseq/ui/LogseqTheme.kt b/android/app/src/main/kotlin/com/logseq/logseq/ui/LogseqTheme.kt index cfb36709..72f77d99 100644 --- a/android/app/src/main/kotlin/com/logseq/logseq/ui/LogseqTheme.kt +++ b/android/app/src/main/kotlin/com/logseq/logseq/ui/LogseqTheme.kt @@ -107,6 +107,8 @@ internal object LogseqTheme { val blackScheme = darkScheme.copy( surface = Color.Black, background = Color.Black, + secondaryContainer = Color(0xff38383a), + onSecondaryContainer = Color(0xfff4f4f5), onBackground = Color(0xfff4f4f5), onSurface = Color(0xfff4f4f5), onSurfaceVariant = Color(0xffa1a1aa), diff --git a/apple/App/Assets.xcassets/LaunchBackdrop.colorset/Contents.json b/apple/App/Assets.xcassets/LaunchCanvas.colorset/Contents.json similarity index 100% rename from apple/App/Assets.xcassets/LaunchBackdrop.colorset/Contents.json rename to apple/App/Assets.xcassets/LaunchCanvas.colorset/Contents.json diff --git a/apple/App/Assets.xcassets/LaunchMark.imageset/README.md b/apple/App/Assets.xcassets/LaunchMark.imageset/README.md index 2cddb7b2..cdf063cf 100644 --- a/apple/App/Assets.xcassets/LaunchMark.imageset/README.md +++ b/apple/App/Assets.xcassets/LaunchMark.imageset/README.md @@ -1,3 +1,3 @@ Vector geometry from `logseq/logseq`, `src/main/frontend/components/svg.cljs`, `logo`. 128 pt canvas, with padding around the original 21 × 21 view box. Light uses `#6F6F6F` and dark uses `#C8C8C8`. -Both appearances use 20% opacity, shared by the system launch screen and the in-app transition. +Both appearances use 20% opacity. The app retints the dark mark for Solarized after reading the saved palette. diff --git a/apple/App/Info.plist b/apple/App/Info.plist index 48cce525..125f6ee6 100644 --- a/apple/App/Info.plist +++ b/apple/App/Info.plist @@ -4,13 +4,9 @@ UILaunchScreen - + UIColorName - LaunchBackdrop - UIImageName - LaunchMark - UIImageRespectsSafeAreaInsets - + LaunchCanvas LogseqRevision $(LOGSEQ_BUILD_REVISION) diff --git a/apple/Sources/Logseq/LGNavigationExtension.swift b/apple/Sources/Logseq/LGNavigationExtension.swift index b53cc080..88745749 100644 --- a/apple/Sources/Logseq/LGNavigationExtension.swift +++ b/apple/Sources/Logseq/LGNavigationExtension.swift @@ -361,18 +361,24 @@ private struct LGSidebarNavigation: View { @Environment(\.colorScheme) private var colorScheme @Environment(\.logseqDarkTheme) private var darkTheme - private var background: Color { + private var palette: LogseqThemePalette { LogseqThemePolicy.palette( mode: LogseqThemeMode(rawValue: appearance) ?? .system, systemIsDark: colorScheme == .dark, darkTheme: darkTheme - ).background + ) } var body: some View { let _ = context.revision + let palette = palette + let background = palette.background + let selectionTint = palette.backgroundHex == LogseqThemePolicy.black.backgroundHex + ? Color.white + : LogseqThemePolicy.accent NavigationStack { child(at: 0) + .accentColor(selectionTint) .frame(maxWidth: .infinity, maxHeight: .infinity) .background(background.ignoresSafeArea()) #if os(iOS) diff --git a/apple/Sources/Logseq/LogseqApp.swift b/apple/Sources/Logseq/LogseqApp.swift index d0160d70..6da1d4fc 100644 --- a/apple/Sources/Logseq/LogseqApp.swift +++ b/apple/Sources/Logseq/LogseqApp.swift @@ -64,6 +64,7 @@ public struct LogseqRootView : View { // Semantic colors inside the LUI tree come from the `theme` prop the // OCaml view emits (adaptive light/dark tokens), not a host-side // dictionary — the shell keeps its palette for chrome below. + .frame(maxWidth: .infinity, maxHeight: .infinity) .background(themePalette.background.ignoresSafeArea()) .alert("Error", isPresented: Binding( get: { errorFeedback.message != nil }, diff --git a/apple/Tests/UI/launch-transition.swift b/apple/Tests/UI/launch-transition.swift index 755832ba..cdb6d6ce 100644 --- a/apple/Tests/UI/launch-transition.swift +++ b/apple/Tests/UI/launch-transition.swift @@ -33,7 +33,7 @@ import UIKit let transition = LogseqLaunchTransition() transition.show(in: window, mode: mode, darkTheme: darkTheme) guard let cover = window.subviews.first(where: { $0.accessibilityIdentifier == "launch.transition" }) else { - throw failure("The first frame must continue the system launch logo") + throw failure("The app's first frame must show the themed launch cover") } guard cover.frame == window.bounds, !cover.isUserInteractionEnabled, cover.accessibilityElementsHidden else { @@ -41,7 +41,7 @@ import UIKit } guard let logo = cover.subviews.compactMap({ $0 as? UIImageView }).first, let image = logo.image, image.size == CGSize(width: 128, height: 128) else { - throw failure("The launch logo must use the same 128 pt asset as the system screen; actual: \(String(describing: cover.subviews.compactMap { ($0 as? UIImageView)?.image?.size }.first))") + throw failure("The launch mark must use the 128 pt asset; actual: \(String(describing: cover.subviews.compactMap { ($0 as? UIImageView)?.image?.size }.first))") } let rendered = UIGraphicsImageRenderer(size: image.size).image { _ in image.draw(at: .zero) @@ -137,7 +137,7 @@ import UIKit guard !window.subviews.contains(where: { $0.accessibilityIdentifier == "launch.transition" }) else { throw failure("A late window attachment must never cover content that is already ready") } - print("PASS: adaptive system-logo continuity, immediate readiness, interactive content, reduced motion, and no warm-start replay") + print("PASS: themed launch mark, immediate readiness, interactive content, reduced motion, and no warm-start replay") } static func failure(_ message: String) -> NSError { NSError(domain: "LaunchTransition", code: 1, userInfo: [NSLocalizedDescriptionKey: message]) diff --git a/scripts/test-ios-launch-screen.py b/scripts/test-ios-launch-screen.py index 665a0af1..8792b33f 100644 --- a/scripts/test-ios-launch-screen.py +++ b/scripts/test-ios-launch-screen.py @@ -9,10 +9,9 @@ ROOT = Path(__file__).resolve().parents[1] source = ROOT / "apple/App/Info.plist" -expected = {"UIColorName": "LaunchBackdrop", "UIImageName": "LaunchMark", - "UIImageRespectsSafeAreaInsets": False} +expected = {"UIColorName": "LaunchCanvas"} assert plistlib.loads(source.read_bytes()).get("UILaunchScreen") == expected, \ - "The Xcode app must show the adaptive Logseq logo during system launch" + "The system launch screen must show only the adaptive canvas" with tempfile.TemporaryDirectory(prefix="logseq-launch-screen-") as directory: for platform in ("iPhoneOS", "iPhoneSimulator"): target = Path(directory) / (platform + ".plist") @@ -34,4 +33,4 @@ check=True, capture_output=True, env=environment) version = plistlib.loads(target.read_bytes())["CFBundleVersion"] assert version.isdecimal() and int(version) > 1, "Default builds must not reuse the constant build number 1" -print("PASS: Xcode and repeated device/simulator configuration share the adaptive launch logo") +print("PASS: Xcode and repeated device/simulator configuration share the adaptive launch canvas") From e69519e716d9ee4cf3b3e7a653ba9cc9389e8b2d Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Fri, 20 Nov 2026 17:23:05 +0800 Subject: [PATCH 6/7] Remove the iOS splash overlay --- .../LaunchMark.imageset/Contents.json | 25 --- .../LaunchMark.imageset/LaunchMark-dark.pdf | Bin 1338 -> 0 bytes .../LaunchMark.imageset/LaunchMark.pdf | Bin 1336 -> 0 bytes .../LaunchMark.imageset/README.md | 3 - apple/App/Info.plist | 2 +- apple/Sources/Logseq/LaunchTransition.swift | 64 -------- apple/Sources/Logseq/LogseqApp.swift | 14 -- apple/Tests/UI/launch-transition.swift | 145 ------------------ 8 files changed, 1 insertion(+), 252 deletions(-) delete mode 100644 apple/App/Assets.xcassets/LaunchMark.imageset/Contents.json delete mode 100644 apple/App/Assets.xcassets/LaunchMark.imageset/LaunchMark-dark.pdf delete mode 100644 apple/App/Assets.xcassets/LaunchMark.imageset/LaunchMark.pdf delete mode 100644 apple/App/Assets.xcassets/LaunchMark.imageset/README.md delete mode 100644 apple/Sources/Logseq/LaunchTransition.swift delete mode 100644 apple/Tests/UI/launch-transition.swift diff --git a/apple/App/Assets.xcassets/LaunchMark.imageset/Contents.json b/apple/App/Assets.xcassets/LaunchMark.imageset/Contents.json deleted file mode 100644 index c9cb4477..00000000 --- a/apple/App/Assets.xcassets/LaunchMark.imageset/Contents.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "images": [ - { - "filename": "LaunchMark.pdf", - "idiom": "universal" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "filename": "LaunchMark-dark.pdf", - "idiom": "universal" - } - ], - "info": { - "author": "xcode", - "version": 1 - }, - "properties": { - "preserves-vector-representation": true - } -} diff --git a/apple/App/Assets.xcassets/LaunchMark.imageset/LaunchMark-dark.pdf b/apple/App/Assets.xcassets/LaunchMark.imageset/LaunchMark-dark.pdf deleted file mode 100644 index c672fa9f6af83c58d0c5f740793ae86ec4e15402..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1338 zcmY!laB*^NP%PwPgnOXaP_u1LK3l0dW z&UhXFal(cM+Zp0vo^LJo9Q`Jl*{?e9Swa-L?k`|y(m$LefcJM#~-zcKtQc(+2<>hnyOr7W}SoYf5%?eq)O|Iob4NX6=~ ziuUdkn=a?ocKCO?^`)nr6}na2ewjnN{FD-lXJa4wi zyEC3h*3LhDGy0$8>$h)7Y4zkv%}arXHIN00B~a9WXkg?Rn;L`U zK|Eu49D-xbwW7p5xC9tu3N|(%0U*#%GyrlG^qn0Q4D^f?^pg|8G%zlKl0XuOpk|rF z%~H@0sVqoU(DzTu3NFb7n+#1L7Vre(r(g({aLX(zE>SRnvhgOGImW>T54xUpJ!N8G zvtW$H^drc0s2>f@V9v56!dZq!NbZ8U1>`OxW1<`uI?*xvumMl&`+uUldQ^FYZu;&D zaN_q}&||3aGB26^@r)}5j}okt|9;;*cUiK8?3a&EzPD&7EaXrXV%xH$CFq8Y_>y&s z_51yVJ_*Y&QDvC0f7QK1>;?`m9vCljJHMFO>)UUOLZe;tTTLc#tm|Q$bx})OVW)-p z&DeSFRuXoxQ#Q;rbDpJlU*hE4OUb9_wk)}8m=fL9^H5CiwE7x3!OK^l=!@A@yf&zR zzG@2}{;wbu)d@BdP8`&|5k zZF9u`GVyih9l?wpa3DjY$H?3q7C(lFGzd#K5kaYG$f?HE5@#%cQfP2yRjPs^B-+9i zq74;{6pUiQI)d`^OB4(Z;gRc^mzJ+!XaMFTl}2-t6B2&>pWoRyxslPuz|bfzEg>Q0 z0lQF7wPVs72eHXE9T6N#+Z?YLHgTl6iB&I<@Rnd^W?;L_`UlgO#U+VFB^5lRC*a@2&w)%XceQeSxq)lTRc+;b?7~p0~%N zx?aJV)$x{{#0HgYk2>e5j7OD%dt4^3tKQRpGH>D2FMEFeb+fPYtNLvmWSKHivORB? zW^1ihVen;sP`?p{=}HfQb61qFSjMr*mc5@IqpCN!3O)Ke~v zliSks{fOs|JsI5HIYG&sOA9ZaV`kpy8lbdLEa>9?HR6A(7S;1iW)ocTetlNl9%0TY ztO15^tZm|Ds>9c&_J@M-G?sCvo;@teJdtv;GlQ_XUr4 z9O%+JwX*Az?;S;<>^T!fof6K^m2nf;DgN57ZiDB-r88o_7O-#!JS*|)iCg=;U5WXT zmxSfw^?Gs7&)+CJ^51a#N_FY}k5+aJEn=;nT&Z~}(2xeQKyd_$7!VDN8e>yKkUWTI z439x@oViw%xCfU2<4eKD1|$Fk`iTZWj)K0kqk@5+k%E45BA5ooBv2Aa0uj_KbGTUw z`XQACsS5i3Nm;=qxnPr_$-@GkJp2?4!4htnMa3lwCQvs1Bx4+G@Sy8i*Hb12HVejB zOh1B5hx*ab4CX9LBAjJtgyb%mTR`qIGA7Dlp%Wdm4;%2bzW*n>t4Ebb=%(+k04ILm z1wDouFY}VwAJ4dA@F>AL`S175bC)Gc$bR|w*T!a@#JA+{|`T7quah%Z^ESij#- z=##Mg5> UILaunchScreen - + UIColorName LaunchCanvas diff --git a/apple/Sources/Logseq/LaunchTransition.swift b/apple/Sources/Logseq/LaunchTransition.swift deleted file mode 100644 index c797742a..00000000 --- a/apple/Sources/Logseq/LaunchTransition.swift +++ /dev/null @@ -1,64 +0,0 @@ -import UIKit - -@MainActor final class LogseqLaunchTransition { - static let shared = LogseqLaunchTransition() - private var cover: UIView? - private var finished = false - - func show(in window: UIWindow, mode: LogseqThemeMode, darkTheme: LogseqDarkTheme) { - guard !finished, cover == nil else { return } - let systemStyle = window.traitCollection.userInterfaceStyle - let style: UIUserInterfaceStyle = switch mode { - case .system: systemStyle - case .light: .light - case .dark: .dark - } - let traits = UITraitCollection(userInterfaceStyle: style) - guard let image = UIImage(named: "LaunchMark", in: nil, compatibleWith: traits) else { return } - let palette = LogseqThemePolicy.palette( - mode: mode, systemIsDark: systemStyle == .dark, darkTheme: darkTheme - ) - let cover = UIView(frame: window.bounds) - cover.accessibilityIdentifier = "launch.transition" - cover.isUserInteractionEnabled = false - cover.accessibilityElementsHidden = true - cover.autoresizingMask = [.flexibleWidth, .flexibleHeight] - cover.overrideUserInterfaceStyle = style - cover.backgroundColor = UIColor(palette.background) - let logoImage = style == .dark && darkTheme == .solarized - ? image.withTintColor( - UIColor(red: 133.0 / 255, green: 200.0 / 255, blue: 200.0 / 255, alpha: 1), - renderingMode: .alwaysOriginal - ) - : image - let logo = UIImageView(image: logoImage) - logo.frame = cover.bounds - logo.contentMode = .center - logo.autoresizingMask = [.flexibleWidth, .flexibleHeight] - cover.addSubview(logo) - window.addSubview(cover) - self.cover = cover - } - - func finish(reduceMotion: Bool = UIAccessibility.isReduceMotionEnabled) { - guard !finished else { return } - finished = true - guard let cover else { return } - self.cover = nil - if reduceMotion { - cover.removeFromSuperview() - } else { - // Readiness reveals content promptly; the faint logo can finish independently. - let options: UIView.AnimationOptions = [.curveEaseOut, .allowUserInteraction, .beginFromCurrentState] - UIView.animate(withDuration: 0.12, delay: 0, options: options) { - cover.backgroundColor = .clear - } - UIView.animate(withDuration: 0.45, delay: 0, - options: [.curveEaseInOut, .allowUserInteraction, .beginFromCurrentState]) { - for logo in cover.subviews { logo.alpha = 0 } - } completion: { _ in - cover.removeFromSuperview() - } - } - } -} diff --git a/apple/Sources/Logseq/LogseqApp.swift b/apple/Sources/Logseq/LogseqApp.swift index 6da1d4fc..0278c8c1 100644 --- a/apple/Sources/Logseq/LogseqApp.swift +++ b/apple/Sources/Logseq/LogseqApp.swift @@ -76,20 +76,6 @@ public struct LogseqRootView : View { private var appContent: some View { LGRendererRoot(renderer: runtime.lgRuntime.renderer) - .onAppear { - if let window = UIApplication.shared.connectedScenes - .compactMap({ $0 as? UIWindowScene }).flatMap(\.windows) - .first(where: { $0.isKeyWindow }) { - LogseqLaunchTransition.shared.show( - in: window, - mode: LogseqThemeMode(rawValue: appearance) ?? .system, - darkTheme: darkTheme - ) - } - DispatchQueue.main.async { - LogseqLaunchTransition.shared.finish() - } - } .task { await runtime.runLGApplication() logger.info("App logs are viewable in the Xcode console on Apple platforms") diff --git a/apple/Tests/UI/launch-transition.swift b/apple/Tests/UI/launch-transition.swift deleted file mode 100644 index cdb6d6ce..00000000 --- a/apple/Tests/UI/launch-transition.swift +++ /dev/null @@ -1,145 +0,0 @@ -import SwiftUI -import UIKit -@testable import Logseq - -@main struct LaunchTransitionCheck { - @MainActor static func main() async throws { - let scene = UIApplication.shared.connectedScenes.compactMap { $0 as? UIWindowScene }.first! - let window = UIWindow(windowScene: scene) - let controller = UIViewController() - let button = UIButton(type: .system) - button.setTitle("Ready to edit", for: .normal) - button.frame = CGRect(x: 20, y: 150, width: 220, height: 50) - var presses = 0 - button.addAction(UIAction { _ in presses += 1 }, for: .touchUpInside) - controller.view.addSubview(button) - window.rootViewController = controller - window.makeKeyAndVisible() - defer { window.isHidden = true; window.rootViewController = nil } - - let cases: [(UIUserInterfaceStyle, LogseqThemeMode, LogseqDarkTheme, String)] = [ - (.light, .system, .black, "light"), - (.dark, .system, .black, "black"), - (.light, .dark, .solarized, "solarized"), - (.dark, .light, .solarized, "forced-light"), - ] - for (systemStyle, mode, darkTheme, suffix) in cases { - window.overrideUserInterfaceStyle = systemStyle - try await Task.sleep(for: .milliseconds(100)) - let isDark = mode == .dark || (mode == .system && systemStyle == .dark) - let canvas = UIColor(LogseqThemePolicy.palette( - mode: mode, systemIsDark: systemStyle == .dark, darkTheme: darkTheme).background) - controller.view.backgroundColor = canvas - let transition = LogseqLaunchTransition() - transition.show(in: window, mode: mode, darkTheme: darkTheme) - guard let cover = window.subviews.first(where: { $0.accessibilityIdentifier == "launch.transition" }) else { - throw failure("The app's first frame must show the themed launch cover") - } - guard cover.frame == window.bounds, !cover.isUserInteractionEnabled, - cover.accessibilityElementsHidden else { - throw failure("The launch cover must fill the window without intercepting input or VoiceOver") - } - guard let logo = cover.subviews.compactMap({ $0 as? UIImageView }).first, - let image = logo.image, image.size == CGSize(width: 128, height: 128) else { - throw failure("The launch mark must use the 128 pt asset; actual: \(String(describing: cover.subviews.compactMap { ($0 as? UIImageView)?.image?.size }.first))") - } - let rendered = UIGraphicsImageRenderer(size: image.size).image { _ in - image.draw(at: .zero) - } - let pixel = rendered.cgImage!.cropping(to: CGRect( - x: rendered.scale * 64, y: rendered.scale * 80, width: 1, height: 1))! - var rgba = [UInt8](repeating: 0, count: 4) - rgba.withUnsafeMutableBytes { bytes in - let context = CGContext(data: bytes.baseAddress, width: 1, height: 1, - bitsPerComponent: 8, bytesPerRow: 4, space: CGColorSpaceCreateDeviceRGB(), - bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue)! - context.draw(pixel, in: CGRect(x: 0, y: 0, width: 1, height: 1)) - } - let expectedAlpha = 0.2 - guard abs(Int(rgba[3]) - Int((expectedAlpha * 255).rounded())) <= 2 else { - throw failure("Both launch appearances must use the same subdued logo opacity: \(rgba)") - } - let tint: UIColor = switch (isDark, darkTheme) { - case (false, _): UIColor(LogseqThemePolicy.light.secondaryText) - case (true, .black): UIColor(white: 200.0 / 255, alpha: 1) - case (true, .solarized): UIColor(red: 133.0 / 255, green: 200.0 / 255, blue: 200.0 / 255, alpha: 1) - } - var red: CGFloat = 0, green: CGFloat = 0, blue: CGFloat = 0, alpha: CGFloat = 0 - tint.getRed(&red, green: &green, blue: &blue, alpha: &alpha) - for (actual, expected) in zip(rgba.prefix(3), [red, green, blue]) { - guard abs(Int(actual) - Int((expected * expectedAlpha * 255).rounded())) <= 2 else { - throw failure("The translucent logo must retain its theme tint: \(rgba)") - } - } - guard let background = cover.backgroundColor else { throw failure("Missing launch background") } - var r: CGFloat = 0, g: CGFloat = 0, b: CGFloat = 0, a: CGFloat = 0 - var er: CGFloat = 0, eg: CGFloat = 0, eb: CGFloat = 0, ea: CGFloat = 0 - background.resolvedColor(with: cover.traitCollection).getRed(&r, green: &g, blue: &b, alpha: &a) - canvas.getRed(&er, green: &eg, blue: &eb, alpha: &ea) - guard abs(r-er) < 0.001, abs(g-eg) < 0.001, abs(b-eb) < 0.001 else { - throw failure("Launch background mismatch for \(suffix): actual=\(r),\(g),\(b), expected=\(er),\(eg),\(eb)") - } - window.layoutIfNeeded() - let snapshot = UIGraphicsImageRenderer(bounds: window.bounds).image { context in - window.layer.render(in: context.cgContext) - } - try snapshot.pngData()!.write(to: URL.documentsDirectory.appendingPathComponent("launch-logo-\(suffix).png")) - let readinessDelay: Duration = isDark ? .milliseconds(350) : .milliseconds(10) - try await Task.sleep(for: readinessDelay) - guard cover.backgroundColor?.cgColor.alpha == 1, logo.alpha == 1 else { - throw failure("The launch cover must wait for actual readiness rather than a fixed launch timer") - } - transition.finish(reduceMotion: false) - guard cover.backgroundColor?.cgColor.alpha == 0, logo.alpha == 0 else { - throw failure("Readiness must begin fading both the background and logo immediately") - } - let point = button.convert(CGPoint(x: 100, y: 20), to: window) - guard window.hitTest(point, with: nil) === button else { throw failure("Content must remain interactive during the fade") } - button.sendActions(for: .touchUpInside) - guard presses > 0 else { throw failure("The fade must not gate editing") } - transition.finish(reduceMotion: false) - try await Task.sleep(for: .milliseconds(80)) - guard let backdrop = cover.layer.presentation()?.backgroundColor, - let mark = logo.layer.presentation(), backdrop.alpha < CGFloat(mark.opacity), - mark.opacity > 0 else { - throw failure("Content must emerge before the stationary logo finishes fading") - } - guard logo.transform == .identity else { throw failure("The launch logo must stay in place during the transition") } - try await Task.sleep(for: .milliseconds(60)) - let backgroundAlpha = cover.layer.presentation()?.backgroundColor?.alpha ?? cover.backgroundColor!.cgColor.alpha - guard backgroundAlpha < 0.005, let visibleLogo = logo.layer.presentation(), visibleLogo.opacity > 0 else { - throw failure("Ready content must be fully visible while the faint logo continues its independent fade") - } - try await Task.sleep(for: .milliseconds(160)) - guard cover.superview != nil, let tail = logo.layer.presentation(), tail.opacity > 0.04 else { - throw failure("The logo must retain a gentle fade tail after content has appeared") - } - let visibleContent = UIGraphicsImageRenderer(bounds: window.bounds).image { context in - (window.layer.presentation() ?? window.layer).render(in: context.cgContext) - } - try visibleContent.pngData()!.write(to: URL.documentsDirectory.appendingPathComponent("launch-content-visible-\(suffix).png")) - try await Task.sleep(for: .milliseconds(220)) - guard cover.superview == nil else { throw failure("The cover must be removed when the short fade finishes") } - transition.show(in: window, mode: mode, darkTheme: darkTheme) - guard !window.subviews.contains(where: { $0.accessibilityIdentifier == "launch.transition" }) else { - throw failure("Returning to an already launched app must not replay the logo") - } - } - let reduced = LogseqLaunchTransition() - reduced.show(in: window, mode: .system, darkTheme: .black) - reduced.finish(reduceMotion: true) - guard !window.subviews.contains(where: { $0.accessibilityIdentifier == "launch.transition" }) else { - throw failure("Reduce Motion must remove the launch cover synchronously") - } - let alreadyReady = LogseqLaunchTransition() - alreadyReady.finish(reduceMotion: false) - alreadyReady.show(in: window, mode: .system, darkTheme: .black) - guard !window.subviews.contains(where: { $0.accessibilityIdentifier == "launch.transition" }) else { - throw failure("A late window attachment must never cover content that is already ready") - } - print("PASS: themed launch mark, immediate readiness, interactive content, reduced motion, and no warm-start replay") - } - static func failure(_ message: String) -> NSError { - NSError(domain: "LaunchTransition", code: 1, userInfo: [NSLocalizedDescriptionKey: message]) - } -} From 2e3c44f69e0812a8aea83d23a37a27024c15698d Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Fri, 20 Nov 2026 18:12:20 +0800 Subject: [PATCH 7/7] Default to the black dark theme --- .../com/logseq/logseq/AndroidAppearance.kt | 5 +++++ .../logseq/logseq/AndroidPlatformServices.kt | 8 +++---- .../logseq/runtime/AndroidPlatformEffects.kt | 6 +++-- .../logseq/logseq/runtime/LogseqRuntime.kt | 3 ++- .../com/logseq/logseq/ui/LogseqTheme.kt | 4 ++-- .../app/src/main/res/values-night/colors.xml | 2 +- .../app/src/main/res/values-night/styles.xml | 4 ++-- apple/Sources/Logseq/LogseqApp.swift | 2 +- .../Sources/Logseq/LogseqThemeSettings.swift | 7 +++--- .../LogseqThemeSettingsTests.swift | 11 +++++----- apple/Tests/UI/dark-sidebar-background.swift | 1 + shared/src/logseq/core/host_update.ml | 2 +- shared/src/logseq/model.ml | 4 ++-- shared/src/logseq/view_settings.ml | 2 +- shared/test/logseq/app_test.ml | 22 +++++++++---------- shared/test/logseq/lui_host_update_test.ml | 1 + 16 files changed, 48 insertions(+), 36 deletions(-) diff --git a/android/app/src/main/kotlin/com/logseq/logseq/AndroidAppearance.kt b/android/app/src/main/kotlin/com/logseq/logseq/AndroidAppearance.kt index 9b6cc42c..7b8c772e 100644 --- a/android/app/src/main/kotlin/com/logseq/logseq/AndroidAppearance.kt +++ b/android/app/src/main/kotlin/com/logseq/logseq/AndroidAppearance.kt @@ -7,6 +7,11 @@ import android.os.Build import android.view.Window import androidx.core.view.WindowCompat +internal const val DEFAULT_DARK_THEME = "black" + +internal fun normalizedDarkTheme(value: String?): String = + if (value == "solarized") value else DEFAULT_DARK_THEME + internal fun androidAppearanceIsDark(appearance: String, configuration: Configuration): Boolean = when (appearance) { "dark" -> true diff --git a/android/app/src/main/kotlin/com/logseq/logseq/AndroidPlatformServices.kt b/android/app/src/main/kotlin/com/logseq/logseq/AndroidPlatformServices.kt index cb6e99f6..a14ca977 100644 --- a/android/app/src/main/kotlin/com/logseq/logseq/AndroidPlatformServices.kt +++ b/android/app/src/main/kotlin/com/logseq/logseq/AndroidPlatformServices.kt @@ -46,7 +46,7 @@ class AndroidPlatformServices(private val context: Context) { "composerDraft" to preferences.getString("logseq.composerDraft", "").orEmpty(), "settings" to mapOf( "appearance" to preferences.getString("logseq.appearance", "system").orEmpty(), - "darkTheme" to preferences.getString("logseq.darkTheme", "solarized").orEmpty(), + "darkTheme" to normalizedDarkTheme(preferences.getString("logseq.darkTheme", null)), "language" to preferences.getString("logseq.language", "system").orEmpty(), "spellCheck" to preferences.getBoolean("logseq.editor.spellCheck", true), "autoCorrection" to preferences.getBoolean( @@ -72,9 +72,9 @@ class AndroidPlatformServices(private val context: Context) { val settings = JSONObject(encoded) preferences.edit() .putString("logseq.appearance", settings.optString("appearance", "system")) - .putString("logseq.darkTheme", settings.optString( - "darkTheme", preferences.getString("logseq.darkTheme", "solarized").orEmpty(), - )) + .putString("logseq.darkTheme", normalizedDarkTheme(settings.optString( + "darkTheme", preferences.getString("logseq.darkTheme", DEFAULT_DARK_THEME), + ))) .putString("logseq.language", settings.optString("language", "system")) .putBoolean("logseq.editor.spellCheck", settings.optBoolean("spellCheck", true)) .putBoolean( diff --git a/android/app/src/main/kotlin/com/logseq/logseq/runtime/AndroidPlatformEffects.kt b/android/app/src/main/kotlin/com/logseq/logseq/runtime/AndroidPlatformEffects.kt index 35996b0b..de64b864 100644 --- a/android/app/src/main/kotlin/com/logseq/logseq/runtime/AndroidPlatformEffects.kt +++ b/android/app/src/main/kotlin/com/logseq/logseq/runtime/AndroidPlatformEffects.kt @@ -4,6 +4,8 @@ import com.logseq.logseq.AndroidPlatformServices import com.logseq.logseq.CognitoAuthProvider import com.logseq.logseq.CognitoSessionUnavailableException import com.logseq.logseq.DEFAULT_BASE_URL +import com.logseq.logseq.DEFAULT_DARK_THEME +import com.logseq.logseq.normalizedDarkTheme import org.json.JSONArray import org.json.JSONObject @@ -118,7 +120,7 @@ internal data class AndroidHostSettings( companion object { val defaults = AndroidHostSettings( appearance = "system", - darkTheme = "solarized", + darkTheme = DEFAULT_DARK_THEME, language = "system", spellCheck = true, autoCorrection = true, @@ -135,7 +137,7 @@ internal data class AndroidHostSettings( ?.mapNotNull { it as? String } ?: defaults.sidebarTabs return AndroidHostSettings( appearance = value["appearance"] as? String ?: defaults.appearance, - darkTheme = if (value["darkTheme"] == "black") "black" else defaults.darkTheme, + darkTheme = normalizedDarkTheme(value["darkTheme"] as? String), language = value["language"] as? String ?: defaults.language, spellCheck = value["spellCheck"] as? Boolean ?: defaults.spellCheck, autoCorrection = value["autoCorrection"] as? Boolean ?: defaults.autoCorrection, diff --git a/android/app/src/main/kotlin/com/logseq/logseq/runtime/LogseqRuntime.kt b/android/app/src/main/kotlin/com/logseq/logseq/runtime/LogseqRuntime.kt index 158bfdd5..844f9baf 100644 --- a/android/app/src/main/kotlin/com/logseq/logseq/runtime/LogseqRuntime.kt +++ b/android/app/src/main/kotlin/com/logseq/logseq/runtime/LogseqRuntime.kt @@ -14,6 +14,7 @@ import com.logseq.logseq.AndroidAudioRecorder import com.logseq.logseq.AndroidAudioTranscriber import com.logseq.logseq.AndroidPlatformServices import com.logseq.logseq.CognitoAuthProvider +import com.logseq.logseq.DEFAULT_DARK_THEME import com.logseq.logseq.isNetworkUnavailable import com.logseq.logseq.ui.extensions.LogseqDialogs import dev.lui.LuiBackend @@ -136,7 +137,7 @@ internal class LogseqRuntime( private var activeBootstrap: kotlinx.coroutines.Job? = null private var activeBootstrapHadSession = false private var appearance by mutableStateOf("system") - private var darkTheme by mutableStateOf("solarized") + private var darkTheme by mutableStateOf(DEFAULT_DARK_THEME) init { bridge.onCoreIdle = { scope.launch { effectDrain?.drain(scope) } } diff --git a/android/app/src/main/kotlin/com/logseq/logseq/ui/LogseqTheme.kt b/android/app/src/main/kotlin/com/logseq/logseq/ui/LogseqTheme.kt index 72f77d99..c93c3cdd 100644 --- a/android/app/src/main/kotlin/com/logseq/logseq/ui/LogseqTheme.kt +++ b/android/app/src/main/kotlin/com/logseq/logseq/ui/LogseqTheme.kt @@ -124,8 +124,8 @@ internal object LogseqTheme { fun colorScheme(dark: Boolean, darkTheme: String): ColorScheme = when { !dark -> lightScheme - darkTheme == "black" -> blackScheme - else -> darkScheme + darkTheme == "solarized" -> darkScheme + else -> blackScheme } fun semanticColors(scheme: ColorScheme): Map { diff --git a/android/app/src/main/res/values-night/colors.xml b/android/app/src/main/res/values-night/colors.xml index 3e1bc0df..78887b55 100644 --- a/android/app/src/main/res/values-night/colors.xml +++ b/android/app/src/main/res/values-night/colors.xml @@ -1,6 +1,6 @@ - #101318 + #000000 #1B1B1F #E5E1E9 #C8C5CE diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml index 47770eac..7063ea11 100644 --- a/android/app/src/main/res/values-night/styles.xml +++ b/android/app/src/main/res/values-night/styles.xml @@ -2,8 +2,8 @@ diff --git a/apple/Sources/Logseq/LogseqApp.swift b/apple/Sources/Logseq/LogseqApp.swift index 0278c8c1..bbe82352 100644 --- a/apple/Sources/Logseq/LogseqApp.swift +++ b/apple/Sources/Logseq/LogseqApp.swift @@ -41,7 +41,7 @@ private final class LGCoreResponseRelay { /// The shared top-level view for the app, loaded from the platform-specific App delegates below. public struct LogseqRootView : View { @AppStorage("logseq.appearance") private var appearance = "system" - @AppStorage(LogseqDarkTheme.storageKey) private var darkTheme = LogseqDarkTheme.solarized + @AppStorage(LogseqDarkTheme.storageKey) private var darkTheme = LogseqDarkTheme.defaultTheme @AppStorage("logseq.language") private var language = "system" @Environment(\.colorScheme) private var colorScheme @Environment(\.scenePhase) private var scenePhase diff --git a/apple/Sources/Logseq/LogseqThemeSettings.swift b/apple/Sources/Logseq/LogseqThemeSettings.swift index 964e2338..42993416 100644 --- a/apple/Sources/Logseq/LogseqThemeSettings.swift +++ b/apple/Sources/Logseq/LogseqThemeSettings.swift @@ -12,14 +12,15 @@ enum LogseqDarkTheme: String { case black static let storageKey = "logseq.darkTheme" + static let defaultTheme: Self = .black init(storedValue: String?) { - self = storedValue.flatMap(Self.init(rawValue:)) ?? .solarized + self = storedValue.flatMap(Self.init(rawValue:)) ?? Self.defaultTheme } } extension EnvironmentValues { - @Entry var logseqDarkTheme = LogseqDarkTheme.solarized + @Entry var logseqDarkTheme = LogseqDarkTheme.defaultTheme } struct LogseqThemePalette { @@ -126,7 +127,7 @@ enum LogseqThemePolicy { static func palette( mode: LogseqThemeMode, systemIsDark: Bool, - darkTheme: LogseqDarkTheme = .solarized + darkTheme: LogseqDarkTheme = .defaultTheme ) -> LogseqThemePalette { switch mode { case .system: diff --git a/apple/Tests/LogseqTests/LogseqThemeSettingsTests.swift b/apple/Tests/LogseqTests/LogseqThemeSettingsTests.swift index 5a4158d7..0d5c1cb6 100644 --- a/apple/Tests/LogseqTests/LogseqThemeSettingsTests.swift +++ b/apple/Tests/LogseqTests/LogseqThemeSettingsTests.swift @@ -19,11 +19,12 @@ import Testing #expect(LogseqThemeMode(rawValue: "unknown") == nil) } - @Test func darkPaletteFollowsAppearanceAndDefaultsToSolarized() { - #expect(LogseqDarkTheme(storedValue: nil) == .solarized) - #expect(LogseqDarkTheme(storedValue: "unknown") == .solarized) - #expect(LogseqThemePolicy.palette(mode: .system, systemIsDark: true).backgroundHex == "#002D38") - #expect(LogseqThemePolicy.palette(mode: .system, systemIsDark: true, darkTheme: .black).backgroundHex == "#000000") + @Test func darkPaletteFollowsAppearanceAndDefaultsToBlack() { + #expect(LogseqDarkTheme(storedValue: nil) == .black) + #expect(LogseqDarkTheme(storedValue: "unknown") == .black) + #expect(LogseqDarkTheme(storedValue: "solarized") == .solarized) + #expect(LogseqThemePolicy.palette(mode: .system, systemIsDark: true).backgroundHex == "#000000") + #expect(LogseqThemePolicy.palette(mode: .system, systemIsDark: true, darkTheme: .solarized).backgroundHex == "#002D38") #expect(LogseqThemePolicy.palette(mode: .dark, systemIsDark: false, darkTheme: .black).backgroundHex == "#000000") #expect(LogseqThemePolicy.palette(mode: .light, systemIsDark: true, darkTheme: .black).backgroundHex == "#FCFCFC") } diff --git a/apple/Tests/UI/dark-sidebar-background.swift b/apple/Tests/UI/dark-sidebar-background.swift index e543b2b6..18c64a6d 100644 --- a/apple/Tests/UI/dark-sidebar-background.swift +++ b/apple/Tests/UI/dark-sidebar-background.swift @@ -24,6 +24,7 @@ import SwiftUI let window = UIWindow(windowScene: scene) defer { window.isHidden = true; runtime.stop() } window.rootViewController = UIHostingController(rootView: LGRendererRoot(renderer: runtime.renderer) + .environment(\.logseqDarkTheme, .solarized) .preferredColorScheme(.dark) .transaction { $0.disablesAnimations = true; $0.animation = nil }) window.makeKeyAndVisible() diff --git a/shared/src/logseq/core/host_update.ml b/shared/src/logseq/core/host_update.ml index 89cb1d8d..99c039f9 100644 --- a/shared/src/logseq/core/host_update.ml +++ b/shared/src/logseq/core/host_update.ml @@ -73,7 +73,7 @@ let settings value = Settings { appearance = string_field "appearance" value; - dark_theme = (match Util.member "darkTheme" value with `String theme -> theme | _ -> "solarized"); + dark_theme = (match Util.member "darkTheme" value with `String theme -> theme | _ -> "black"); language = string_field "language" value; system_language = (match Util.member "systemLanguage" value with `String value -> Some value | _ -> None); spell_check = bool_field "spellCheck" value; diff --git a/shared/src/logseq/model.ml b/shared/src/logseq/model.ml index 45cfe7d4..d6f815a3 100644 --- a/shared/src/logseq/model.ml +++ b/shared/src/logseq/model.ml @@ -784,7 +784,7 @@ let initial () = settings_tabs_open = false; runtime_log_open = false; appearance = "system"; - dark_theme = "solarized"; + dark_theme = "black"; settings_appearance_menu_open = false; settings_dark_theme_menu_open = false; language = "system"; @@ -1428,7 +1428,7 @@ let valid_authentication_state_ state = state = "restoring" || state = "signedOut" || state = "signingIn" || state = "signedIn" || state = "signingOut" -let normalize_dark_theme = function "black" -> "black" | _ -> "solarized" +let normalize_dark_theme = function "solarized" -> "solarized" | _ -> "black" let current_settings (current : logseq_model) = { diff --git a/shared/src/logseq/view_settings.ml b/shared/src/logseq/view_settings.ml index bc8e5a59..d874e123 100644 --- a/shared/src/logseq/view_settings.ml +++ b/shared/src/logseq/view_settings.ml @@ -149,7 +149,7 @@ let settings_appearance_control context model_source send = let settings_dark_theme_control context model_source send = settings_theme_picker ~id:"dark-theme" ~label:"Dark theme" - ~choices:[ "solarized", "Solarized"; "black", "Black" ] + ~choices:[ "black", "Black"; "solarized", "Solarized" ] ~selected:(fun (model : Model.logseq_model) -> model.dark_theme) ~menu_open:(fun model -> model.Model.settings_dark_theme_menu_open) ~open_menu:Model.OpenSettingsDarkThemeMenu diff --git a/shared/test/logseq/app_test.ml b/shared/test/logseq/app_test.ml index d6105238..84c19f14 100644 --- a/shared/test/logseq/app_test.ml +++ b/shared/test/logseq/app_test.ml @@ -483,7 +483,7 @@ let task_status uuid ident title icon_type icon_id icon_color = let settings tabs = { Model.appearance = "system"; - dark_theme = "solarized"; + dark_theme = "black"; language = "system"; system_language = None; spell_check = true; @@ -917,23 +917,23 @@ let settings_preferences_persist_without_dismissing_the_sheet () = let settings_dark_theme_persists_independently_of_appearance () = let initial = Model.initial () in - check_eq initial.dark_theme "solarized"; + check_eq initial.dark_theme "black"; let opened = Model.update initial Model.OpenSettings in let choosing = Model.update opened Model.OpenSettingsDarkThemeMenu in - let black = Model.update choosing (Model.ChangeDarkTheme "black") in - check black.settings_open; - check (not black.settings_dark_theme_menu_open); - check_eq black.appearance "system"; - check_eq black.dark_theme "black"; - let saved = Model.current_settings black in - check_eq black.pending_effects [ Model.SaveSettingsEffect (1, saved) ]; + let solarized = Model.update choosing (Model.ChangeDarkTheme "solarized") in + check solarized.settings_open; + check (not solarized.settings_dark_theme_menu_open); + check_eq solarized.appearance "system"; + check_eq solarized.dark_theme "solarized"; + let saved = Model.current_settings solarized in + check_eq solarized.pending_effects [ Model.SaveSettingsEffect (1, saved) ]; let restored = Model.update initial (Model.ApplySettingsSnapshot saved) in let light = Model.update restored (Model.ChangeAppearance "light") in let dark = Model.update light (Model.ChangeAppearance "dark") in - check_eq dark.dark_theme "black"; + check_eq dark.dark_theme "solarized"; let fallback = Model.update initial (Model.ApplySettingsSnapshot { saved with dark_theme = "unknown" }) in - check_eq fallback.dark_theme "solarized" + check_eq fallback.dark_theme "black" let settings_reject_invalid_connections_and_preserve_required_tabs () = let opened = diff --git a/shared/test/logseq/lui_host_update_test.ml b/shared/test/logseq/lui_host_update_test.ml index cc7081b3..fa6ac17a 100644 --- a/shared/test/logseq/lui_host_update_test.ml +++ b/shared/test/logseq/lui_host_update_test.ml @@ -8,6 +8,7 @@ let settings_fields () = with | Ok (Settings settings) -> check_eq "dark" settings.appearance; + check_eq "black" settings.dark_theme; check_eq "zh-CN" settings.language; check (not settings.spell_check); check settings.auto_correction;