💄 Optimize mac permission request UI (#1286)

CrossPaste · Jun 24, 2024 · b619613 · b619613
1 parent 055a51f
commit b619613
Show file tree

Hide file tree

Showing 15 changed files with 255 additions and 348 deletions.
diff --git a/composeApp/src/commonMain/kotlin/com/clipevery/ClipeveryApp.kt b/composeApp/src/commonMain/kotlin/com/clipevery/ClipeveryApp.kt
@@ -27,7 +27,6 @@ import com.clipevery.ui.ClipeveryTheme
 import com.clipevery.ui.HomeView
 import com.clipevery.ui.PageViewType
 import com.clipevery.ui.base.DialogService
-import com.clipevery.ui.base.MessageView
 import com.clipevery.ui.base.ToastManager
 import com.clipevery.ui.base.ToastView
 import com.clipevery.ui.devices.DeviceDetailView
@@ -106,8 +105,6 @@ fun ClipeveryWindow(hideWindow: suspend () -> Unit) {
                     ClipeveryContent()
                 }
 
-                MessageView()
-
                 toast?.let {
                     ToastView(toast = it) {
                         toastManager.cancel()

diff --git a/composeApp/src/commonMain/kotlin/com/clipevery/listener/GlobalListener.kt b/composeApp/src/commonMain/kotlin/com/clipevery/listener/GlobalListener.kt
@@ -1,16 +1,10 @@
 package com.clipevery.listener
 
-import com.clipevery.ui.base.ComposeMessageViewFactory
-
 interface GlobalListener {
 
-    var errorCode: Int?
-
     fun isRegistered(): Boolean
 
     fun start()
 
     fun stop()
-
-    fun getComposeMessageViewFactory(): ComposeMessageViewFactory
 }
diff --git a/composeApp/src/commonMain/kotlin/com/clipevery/ui/base/ComposeMessageViewFactory.kt b/composeApp/src/commonMain/kotlin/com/clipevery/ui/base/ComposeMessageViewFactory.kt
diff --git a/composeApp/src/commonMain/kotlin/com/clipevery/ui/base/MessageManager.kt b/composeApp/src/commonMain/kotlin/com/clipevery/ui/base/MessageManager.kt
diff --git a/composeApp/src/commonMain/kotlin/com/clipevery/ui/base/MessageView.kt b/composeApp/src/commonMain/kotlin/com/clipevery/ui/base/MessageView.kt
diff --git a/composeApp/src/desktopMain/kotlin/com/clipevery/Clipevery.kt b/composeApp/src/desktopMain/kotlin/com/clipevery/Clipevery.kt
@@ -137,13 +137,11 @@ import com.clipevery.ui.ThemeDetector
 import com.clipevery.ui.WindowsTray
 import com.clipevery.ui.base.DesktopDialogService
 import com.clipevery.ui.base.DesktopIconStyle
-import com.clipevery.ui.base.DesktopMessageManager
 import com.clipevery.ui.base.DesktopNotificationManager
 import com.clipevery.ui.base.DesktopToastManager
 import com.clipevery.ui.base.DesktopUISupport
 import com.clipevery.ui.base.DialogService
 import com.clipevery.ui.base.IconStyle
-import com.clipevery.ui.base.MessageManager
 import com.clipevery.ui.base.NotificationManager
 import com.clipevery.ui.base.ToastManager
 import com.clipevery.ui.base.UISupport
@@ -303,12 +301,11 @@ class Clipevery {
                     single<DesktopMouseListener> { DesktopMouseListener }
                     single<NativeMouseListener> { get<DesktopMouseListener>() }
                     single<ActiveGraphicsDevice> { get<DesktopMouseListener>() }
-                    single<GlobalListener> { DesktopGlobalListener(get(), get()) }
+                    single<GlobalListener> { DesktopGlobalListener(get(), get(), get(), get(), get()) }
                     single<ThemeDetector> { DesktopThemeDetector(get()) }
                     single<ClipResourceLoader> { DesktopAbsoluteClipResourceLoader }
                     single<ToastManager> { DesktopToastManager() }
                     single<NotificationManager> { DesktopNotificationManager }
-                    single<MessageManager> { DesktopMessageManager(get()) }
                     single<IconStyle> { DesktopIconStyle }
                     single<UISupport> { DesktopUISupport(get(), get()) }
                     single<ShortcutKeys> { DesktopShortcutKeys(get(), get()) }