darkmode hotkey onboarding without animation

janhq · Mar 11, 2024 · 4bbb5bb · 4bbb5bb
1 parent addbfaf
commit 4bbb5bb
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 13 deletions.
diff --git a/core/src/api/index.ts b/core/src/api/index.ts
@@ -16,6 +16,8 @@ export enum NativeRoute {
   hideMainWindow = 'hideMainWindow',
   showMainWindow = 'showMainWindow',
 
+  getSelectedText = 'getSelectedText',
+
   quickAskSizeUpdated = 'quickAskSizeUpdated',
   setQuickAskHotKey = 'setQuickAskHotKey',
 }

diff --git a/electron/handlers/native.ts b/electron/handlers/native.ts
@@ -139,4 +139,8 @@ export function handleAppIPCs() {
       windowManager.setQuickAskHotKey(hotKey)
     }
   )
+
+  ipcMain.handle(NativeRoute.getSelectedText, async (_event) => {
+    windowManager.getSelectedText()
+  })
 }
diff --git a/electron/managers/window.ts b/electron/managers/window.ts
@@ -2,7 +2,7 @@ import { BrowserWindow, app, shell } from 'electron'
 import { quickAskWindowConfig } from './quickAskWindowConfig'
 import { AppEvent } from '@janhq/core'
 import { mainWindowConfig } from './mainWindowConfig'
-import { registerShortcut } from '../utils/selectedText'
+import { getSelectedText, registerShortcut } from '../utils/selectedText'
 
 /**
  * Manages the current window instance.
@@ -131,6 +131,10 @@ class WindowManager {
     }
   }
 
+  getSelectedText(): void {
+    getSelectedText()
+  }
+
   cleanUp(): void {
     this.mainWindow?.destroy()
     this._quickAskWindow?.destroy()

diff --git a/web/containers/OnBoarding/Hotkey/index.tsx b/web/containers/OnBoarding/Hotkey/index.tsx
@@ -50,13 +50,13 @@ const HotkeyOnBoarding = () => {
   const onContinueClick = async () => {
     if (checkboxState) {
       setOnBoardingStep(onBoardingStep + 1)
+      await window.core?.api?.getSelectedText()
     } else {
       setModalOnboardingAccesibility(true)
     }
 
     if (isValid && keys.size > 0) {
       const keyCombination = convertKeyToAccelerator(Array.from(keys)).join('+')
-
       await window.core?.api?.setQuickAskHotKey(keyCombination)
       await window.core?.api?.updateAppConfiguration({
         quick_ask_hotkey: keyCombination,
@@ -259,17 +259,17 @@ const HotkeyOnBoarding = () => {
           </div>
         </div>
         <div className="flex items-center justify-center">
-          <div className="relative -right-2 flex h-full w-full">
-            <object
-              type="image/svg+xml"
-              data={
-                resolvedTheme === 'dark'
-                  ? 'images/quick-ask-animation-dark.svg'
-                  : 'images/quick-ask-animation.svg'
-              }
-              className="mx-auto h-full w-full"
-            />
-          </div>
+          {resolvedTheme === 'light' ? (
+            <div className="relative -right-2 flex h-full w-full">
+              <object
+                type="image/svg+xml"
+                data="images/quick-ask-animation.svg"
+                className="mx-auto h-full w-full"
+              />
+            </div>
+          ) : (
+            <img src="images/quick-ask-dark.png" alt="Dark mode" />
+          )}
         </div>
       </div>
       <ModalAccesibility />

diff --git a/web/public/images/quick-ask-dark.png b/web/public/images/quick-ask-dark.png