library: Add macos native support

YuKongA · YuKongA · commit af531538cf90 · 2024-09-29T15:17:03.000+08:00
* Temporarily remove blur support
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -37,6 +37,19 @@ kotlin {
         }
     }
 
+    listOf(
+        macosX64(),
+        macosArm64()
+    ).forEach { macosTarget ->
+        macosTarget.binaries.executable {
+            baseName = appName
+            entryPoint = "main"
+            freeCompilerArgs += listOf(
+                "-linker-option", "-framework", "-linker-option", "Metal"
+            )
+        }
+    }
+
     jvm("desktop")
 
     @OptIn(ExperimentalWasmDsl::class)
diff --git a/composeApp/src/androidMain/res/drawable/ic_launcher.xml b/composeApp/src/androidMain/res/drawable/ic_launcher.xml
diff --git a/composeApp/src/androidMain/res/drawable/ic_launcher_foreground.xml b/composeApp/src/androidMain/res/drawable/ic_launcher_foreground.xml
diff --git a/composeApp/src/androidMain/res/values-night-v29/themes.xml b/composeApp/src/androidMain/res/values-night-v29/themes.xml
diff --git a/composeApp/src/androidMain/res/values-night/themes.xml b/composeApp/src/androidMain/res/values-night/themes.xml
diff --git a/composeApp/src/androidMain/res/values/themes.xml b/composeApp/src/androidMain/res/values/themes.xml
diff --git a/composeApp/src/commonMain/kotlin/ThirdPage.kt b/composeApp/src/commonMain/kotlin/ThirdPage.kt
@@ -26,10 +26,6 @@ fun ThirdPage(
     onShowFloatingActionButtonChange: (Boolean) -> Unit,
     enablePageUserScroll: Boolean,
     onEnablePageUserScrollChange: (Boolean) -> Unit,
-    enableTopBarBlur: Boolean,
-    onEnableTopBarBlurChange: (Boolean) -> Unit,
-    enableBottomBarBlur: Boolean,
-    onEnableBottomBarBlurChange: (Boolean) -> Unit,
     colorMode: MutableState<Int>
 ) {
     LazyColumn(
@@ -64,16 +60,6 @@ fun ThirdPage(
                 onCheckedChange = onEnablePageUserScrollChange,
                 enabled = platform() != Platform.WasmJs,
             )
-            SuperSwitch(
-                title = "Enable Top Bar Blur",
-                checked = enableTopBarBlur,
-                onCheckedChange = onEnableTopBarBlurChange
-            )
-            SuperSwitch(
-                title = "Enable Bottom Bar Blur",
-                checked = enableBottomBarBlur,
-                onCheckedChange = onEnableBottomBarBlurChange
-            )
             SuperDropdown(
                 title = "Color Mode",
                 items = listOf("System", "Light", "Dark"),
diff --git a/composeApp/src/commonMain/kotlin/UITest.kt b/composeApp/src/commonMain/kotlin/UITest.kt
@@ -45,7 +45,6 @@ import top.yukonga.miuix.kmp.basic.TopAppBar
 import top.yukonga.miuix.kmp.basic.rememberTopAppBarState
 import top.yukonga.miuix.kmp.icon.MiuixIcons
 import top.yukonga.miuix.kmp.icon.icons.GitHub
-import top.yukonga.miuix.kmp.theme.MiuixTheme
 import utils.FPSMonitor
 
 @OptIn(FlowPreview::class)
@@ -88,23 +87,18 @@ fun UITest(
     val showBottomBar = remember { mutableStateOf(true) }
     val showFloatingActionButton = remember { mutableStateOf(true) }
     val enablePageUserScroll = remember { mutableStateOf(false) }
-    val enableTopBarBlur = remember { mutableStateOf(true) }
-    val enableBottomBarBlur = remember { mutableStateOf(true) }
 
     val uriHandler = LocalUriHandler.current
 
     Scaffold(
         modifier = Modifier.fillMaxSize(),
-        enableTopBarBlur = enableTopBarBlur.value,
-        enableBottomBarBlur = enableBottomBarBlur.value,
         topBar = {
             AnimatedVisibility(
                 visible = showTopAppBar.value,
                 enter = fadeIn() + expandVertically(),
                 exit = fadeOut() + shrinkVertically()
             ) {
                 TopAppBar(
-                    color = if (enableTopBarBlur.value) Color.Transparent else MiuixTheme.colorScheme.background,
                     title = "Miuix",
                     scrollBehavior = currentScrollBehavior
                 )
@@ -117,7 +111,6 @@ fun UITest(
                 exit = fadeOut() + shrinkVertically()
             ) {
                 NavigationBar(
-                    color = if (enableBottomBarBlur.value) Color.Transparent else MiuixTheme.colorScheme.background,
                     items = items,
                     selected = targetPage,
                     onClick = { index ->
@@ -164,10 +157,6 @@ fun UITest(
             onShowFloatingActionButtonChange = { showFloatingActionButton.value = it },
             enablePageUserScroll = enablePageUserScroll.value,
             onEnablePageUserScrollChange = { enablePageUserScroll.value = it },
-            enableTopBarBlur = enableTopBarBlur.value,
-            onEnableTopBarBlurChange = { enableTopBarBlur.value = it },
-            enableBottomBarBlur = enableBottomBarBlur.value,
-            onEnableBottomBarBlurChange = { enableBottomBarBlur.value = it },
             colorMode = colorMode,
         )
     }
@@ -201,10 +190,6 @@ fun AppHorizontalPager(
     onShowFloatingActionButtonChange: (Boolean) -> Unit,
     enablePageUserScroll: Boolean,
     onEnablePageUserScrollChange: (Boolean) -> Unit,
-    enableTopBarBlur: Boolean,
-    onEnableTopBarBlurChange: (Boolean) -> Unit,
-    enableBottomBarBlur: Boolean,
-    onEnableBottomBarBlurChange: (Boolean) -> Unit,
     colorMode: MutableState<Int>
 ) {
     HorizontalPager(
@@ -236,10 +221,6 @@ fun AppHorizontalPager(
                     onShowFloatingActionButtonChange = onShowFloatingActionButtonChange,
                     enablePageUserScroll = enablePageUserScroll,
                     onEnablePageUserScrollChange = onEnablePageUserScrollChange,
-                    enableTopBarBlur = enableTopBarBlur,
-                    onEnableTopBarBlurChange = onEnableTopBarBlurChange,
-                    enableBottomBarBlur = enableBottomBarBlur,
-                    onEnableBottomBarBlurChange = onEnableBottomBarBlurChange,
                     colorMode = colorMode
                 )
             }
diff --git a/composeApp/src/macosMain/kotlin/Main.kt b/composeApp/src/macosMain/kotlin/Main.kt
@@ -0,0 +1,24 @@
+import androidx.compose.ui.unit.DpSize
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Window
+import platform.AppKit.NSApplication
+import platform.AppKit.NSApplicationActivationPolicy
+import platform.AppKit.NSApplicationDelegateProtocol
+import platform.darwin.NSObject
+
+fun main() {
+    val nsApplication = NSApplication.sharedApplication()
+    nsApplication.setActivationPolicy(NSApplicationActivationPolicy.NSApplicationActivationPolicyRegular)
+    nsApplication.delegate = object : NSObject(), NSApplicationDelegateProtocol {
+        override fun applicationShouldTerminateAfterLastWindowClosed(sender: NSApplication): Boolean {
+            return true
+        }
+    }
+    Window(
+        title = "miuix",
+        size = DpSize(420.dp, 820.dp)
+    ) {
+        App()
+    }
+    nsApplication.run()
+}
diff --git a/gradle.properties b/gradle.properties
@@ -16,6 +16,8 @@ kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
 # Native
 kotlin.native.ignoreDisabledTargets=true
 kotlin.native.useEmbeddableCompilerJar=true
+# Experimental
+org.jetbrains.compose.experimental.macos.enabled=true
 # Xcode
 kotlin.apple.xcodeCompatibility.nowarn=true
 xcodeproj=./iosApp
diff --git a/miuix/build.gradle.kts b/miuix/build.gradle.kts
@@ -22,6 +22,8 @@ kotlin {
     iosX64()
     iosArm64()
     iosSimulatorArm64()
+    macosArm64()
+    macosX64()
 
     @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
@@ -42,7 +44,6 @@ kotlin {
             implementation(compose.ui)
             implementation(compose.components.resources)
             implementation(compose.components.uiToolingPreview)
-            implementation(libs.haze)
         }
         desktopMain.dependencies {
             implementation(compose.desktop.currentOs)
diff --git a/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/Scaffold.kt b/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/Scaffold.kt
@@ -21,19 +21,13 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.SubcomposeLayout
 import androidx.compose.ui.unit.Density
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.offset
 import androidx.compose.ui.util.fastForEach
 import androidx.compose.ui.util.fastMap
 import androidx.compose.ui.util.fastMapNotNull
 import androidx.compose.ui.util.fastMaxBy
-import dev.chrisbanes.haze.HazeState
-import dev.chrisbanes.haze.HazeStyle
-import dev.chrisbanes.haze.HazeTint
-import dev.chrisbanes.haze.haze
-import dev.chrisbanes.haze.hazeChild
 import top.yukonga.miuix.kmp.theme.MiuixTheme
 import top.yukonga.miuix.kmp.utils.MiuixPopupUtil
 import top.yukonga.miuix.kmp.utils.MiuixPopupUtil.Companion.MiuixPopupHost
@@ -58,9 +52,6 @@ import top.yukonga.miuix.kmp.utils.MiuixPopupUtil.Companion.MiuixPopupHost
  * @param snackbarHost component to host [Snackbar]s that are pushed to be shown via
  *   [SnackbarHostState.showSnackbar], typically a [SnackbarHost].
  * @param enableTopBarBlur whether to enable blur effect on the [TopAppBar].
- * @param alpha the alpha value of the blur effect. Default is 0.75f.
- * @param blurRadius the radius of the blur effect. Default is 25.dp.
- * @param noiseFactor the noise factor of the blur effect. Default is 0f.
  * @param containerColor the color used for the background of this scaffold. Use [Color.Transparent]
  *   to have no color.
  * @param contentWindowInsets window insets to be passed to [content] slot via [PaddingValues]
@@ -83,23 +74,11 @@ fun Scaffold(
     snackbarHost: @Composable () -> Unit = {},
     enableTopBarBlur: Boolean = true,
     enableBottomBarBlur: Boolean = true,
-    alpha: Float = 0.75f,
-    blurRadius: Dp = 25.dp,
-    noiseFactor: Float = 0f,
     containerColor: Color = MiuixTheme.colorScheme.background,
     contentWindowInsets: WindowInsets = WindowInsets.statusBars,
     content: @Composable (PaddingValues) -> Unit
 ) {
     val safeInsets = remember(contentWindowInsets) { MutableWindowInsets(contentWindowInsets) }
-    val hazeState = remember { HazeState() }
-    val hazeStyle = remember(containerColor, alpha, blurRadius, noiseFactor) {
-        HazeStyle(
-            backgroundColor = containerColor,
-            tint = HazeTint.Color(containerColor.copy(alpha)),
-            blurRadius = blurRadius,
-            noiseFactor = noiseFactor
-        )
-    }
 
     Surface(
         modifier = modifier.onConsumedWindowInsetsChanged { consumedWindowInsets ->
@@ -111,41 +90,16 @@ fun Scaffold(
         ScaffoldLayout(
             topBar = {
                 if (enableTopBarBlur) {
-                    Box(
-                        Modifier.hazeChild(
-                            state = hazeState,
-                            style = hazeStyle
-                        )
-                    ) {
-                        topBar()
-                    }
-                } else {
                     topBar()
                 }
             },
             bottomBar = {
                 if (enableBottomBarBlur) {
-                    Box(
-                        Modifier.hazeChild(
-                            state = hazeState,
-                            style = hazeStyle
-                        )
-                    ) {
-                        bottomBar()
-                    }
-                } else {
                     bottomBar()
                 }
             },
             content = {
-                Box(
-                    Modifier.haze(
-                        state = hazeState,
-                        style = hazeStyle
-                    )
-                ) {
-                    content(it)
-                }
+                content(it)
             },
             snackbar = snackbarHost,
             fab = floatingActionButton,
diff --git a/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/utils/Utils.kt b/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/utils/Utils.kt
@@ -10,7 +10,8 @@ enum class Platform {
     Android,
     IOS,
     Desktop,
-    WasmJs
+    WasmJs,
+    MacOS
 }
 
 /**
diff --git a/miuix/src/macosMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDropdown.macos.kt b/miuix/src/macosMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDropdown.macos.kt
@@ -0,0 +1,22 @@
+package top.yukonga.miuix.kmp.extra
+
+import androidx.compose.runtime.MutableState
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.pointer.PointerEventType
+import androidx.compose.ui.input.pointer.onPointerEvent
+
+/**
+ * Returns modifier to be used for the current platform.
+ */
+@OptIn(ExperimentalComposeUiApi::class)
+actual fun modifierPlatform(modifier: Modifier, isHovered: MutableState<Boolean>): Modifier = modifier
+    .onPointerEvent(PointerEventType.Move) {
+        isHovered.value = true
+    }
+    .onPointerEvent(PointerEventType.Enter) {
+        isHovered.value = false
+    }
+    .onPointerEvent(PointerEventType.Exit) {
+        isHovered.value = false
+    }
diff --git a/miuix/src/macosMain/kotlin/top/yukonga/miuix/kmp/utils/Overscroll.macos.kt b/miuix/src/macosMain/kotlin/top/yukonga/miuix/kmp/utils/Overscroll.macos.kt
@@ -0,0 +1,3 @@
+package top.yukonga.miuix.kmp.utils
+
+actual fun enableOverscroll(): Boolean = false
diff --git a/miuix/src/macosMain/kotlin/top/yukonga/miuix/kmp/utils/Utils.macos.kt b/miuix/src/macosMain/kotlin/top/yukonga/miuix/kmp/utils/Utils.macos.kt
@@ -0,0 +1,54 @@
+package top.yukonga.miuix.kmp.utils
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import kotlinx.cinterop.ExperimentalForeignApi
+import kotlinx.cinterop.useContents
+import platform.AppKit.NSApplication
+import platform.AppKit.NSEvent
+import platform.AppKit.NSEventMaskKeyDown
+import platform.AppKit.NSWindow
+import kotlin.math.roundToInt
+
+actual fun platform(): Platform = Platform.MacOS
+
+@OptIn(ExperimentalForeignApi::class)
+@Composable
+actual fun getWindowSize(): WindowSize {
+    val window: NSWindow? = NSApplication.sharedApplication.mainWindow
+    val contentLayoutRect = window?.contentLayoutRect ?: return WindowSize(0, 0)
+    val density = LocalDensity.current.density
+    val width = contentLayoutRect.useContents { size.width } * density
+    val height = contentLayoutRect.useContents { size.height } * density
+    return WindowSize(width.roundToInt(), height.roundToInt())
+}
+
+@Composable
+actual fun getRoundedCorner(): Dp = 0.dp
+
+@Composable
+actual fun BackHandler(
+    enabled: Boolean,
+    onBack: () -> Unit
+) {
+    if (!enabled) return
+    DisposableEffect(Unit) {
+        val monitor = NSEvent.addLocalMonitorForEventsMatchingMask(NSEventMaskKeyDown) { event ->
+            if (event?.keyCode == 53.toUShort()) {
+                onBack()
+                null
+            } else {
+                event
+            }
+        }
+
+        onDispose {
+            if (monitor != null) {
+                NSEvent.removeMonitor(monitor)
+            }
+        }
+    }
+}
