Add theme plugin

Wox.UI.Flutter/wox/lib/components/wox_preview_view.dart

@@ -82,7 +82,15 @@ class WoxPreviewView extends StatelessWidget {
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          Expanded(child: contentWidget),
+          Expanded(
+            child: Theme(
+                data: ThemeData(
+                  textSelectionTheme: TextSelectionThemeData(
+                    selectionColor: fromCssColor(woxTheme.previewTextSelectionColor),
+                  ),
+                ),
+                child: contentWidget),
+          ),
           //show previewProperties
           if (woxPreview.previewProperties.isNotEmpty)
             Container(

Wox.UI.Flutter/wox/lib/entity/wox_theme.dart

@@ -29,6 +29,7 @@ class WoxTheme {
   late String queryBoxBackgroundColor;
   late int queryBoxBorderRadius;
   late String queryBoxCursorColor;
+  late String queryBoxTextSelectionColor;
   late String actionContainerBackgroundColor;
   late String actionContainerHeaderFontColor;
   late int actionContainerPaddingLeft;
@@ -45,6 +46,7 @@ class WoxTheme {
   late String previewSplitLineColor;
   late String previewPropertyTitleColor;
   late String previewPropertyContentColor;
+  late String previewTextSelectionColor;
 
   WoxTheme(
       {themeId,
@@ -77,6 +79,7 @@ class WoxTheme {
       queryBoxBackgroundColor,
       queryBoxBorderRadius,
       queryBoxCursorColor,
+      queryBoxTextSelectionColor,
       actionContainerBackgroundColor,
       actionContainerHeaderFontColor,
       actionContainerPaddingLeft,
@@ -92,7 +95,8 @@ class WoxTheme {
       previewFontColor,
       previewSplitLineColor,
       previewPropertyTitleColor,
-      previewPropertyContentColor});
+      previewPropertyContentColor,
+      previewTextSelectionColor});
 
   WoxTheme.fromJson(Map<String, dynamic> json) {
     themeId = json['ThemeId'];
@@ -125,6 +129,7 @@ class WoxTheme {
     queryBoxBackgroundColor = json['QueryBoxBackgroundColor'];
     queryBoxBorderRadius = json['QueryBoxBorderRadius'];
     queryBoxCursorColor = json['QueryBoxCursorColor'];
+    queryBoxTextSelectionColor = json['QueryBoxTextSelectionColor'];
     actionContainerBackgroundColor = json['ActionContainerBackgroundColor'];
     actionContainerHeaderFontColor = json['ActionContainerHeaderFontColor'];
     actionContainerPaddingLeft = json['ActionContainerPaddingLeft'];
@@ -141,6 +146,7 @@ class WoxTheme {
     previewSplitLineColor = json['PreviewSplitLineColor'];
     previewPropertyTitleColor = json['PreviewPropertyTitleColor'];
     previewPropertyContentColor = json['PreviewPropertyContentColor'];
+    previewTextSelectionColor = json['PreviewTextSelectionColor'];
   }
 
   Map<String, dynamic> toJson() {
@@ -175,6 +181,7 @@ class WoxTheme {
     data['QueryBoxBackgroundColor'] = queryBoxBackgroundColor;
     data['QueryBoxBorderRadius'] = queryBoxBorderRadius;
     data['QueryBoxCursorColor'] = queryBoxCursorColor;
+    data['QueryBoxTextSelectionColor'] = queryBoxTextSelectionColor;
     data['ActionContainerBackgroundColor'] = actionContainerBackgroundColor;
     data['ActionContainerHeaderFontColor'] = actionContainerHeaderFontColor;
     data['ActionContainerPaddingLeft'] = actionContainerPaddingLeft;
@@ -191,6 +198,7 @@ class WoxTheme {
     data['PreviewSplitLineColor'] = previewSplitLineColor;
     data['PreviewPropertyTitleColor'] = previewPropertyTitleColor;
     data['PreviewPropertyContentColor'] = previewPropertyContentColor;
+    data['PreviewTextSelectionColor'] = previewTextSelectionColor;
     return data;
   }
 }

Wox.UI.Flutter/wox/lib/main.dart

@@ -4,7 +4,6 @@ import 'dart:io';
 import 'package:chinese_font_library/chinese_font_library.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_acrylic/flutter_acrylic.dart';
-import 'package:from_css_color/from_css_color.dart';
 import 'package:get/get.dart';
 import 'package:window_manager/window_manager.dart';
 import 'package:wox/modules/launcher/views/wox_launcher_view.dart';
@@ -87,9 +86,6 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MaterialApp(
       theme: ThemeData(
-        textSelectionTheme: TextSelectionThemeData(
-          selectionColor: fromCssColor(WoxThemeUtil.instance.currentTheme.resultItemActiveBackgroundColor),
-        ),
         textTheme: SystemChineseFont.textTheme(Brightness.light),
       ),
       debugShowCheckedModeBanner: false,

Wox.UI.Flutter/wox/lib/modules/launcher/views/wox_query_box_view.dart

@@ -57,51 +57,58 @@ class WoxQueryBoxView extends GetView<WoxLauncherController> {
                 }),
                 child: SizedBox(
                   height: 55.0,
-                  child: TextField(
-                    style: TextStyle(
-                      fontSize: 28.0,
-                      color: fromCssColor(controller.woxTheme.value.queryBoxFontColor),
+                  child: Theme(
+                    data: ThemeData(
+                      textSelectionTheme: TextSelectionThemeData(
+                        selectionColor: fromCssColor(controller.woxTheme.value.queryBoxTextSelectionColor),
+                      ),
                     ),
-                    decoration: InputDecoration(
-                      isCollapsed: true,
-                      contentPadding: const EdgeInsets.only(
-                        left: 8,
-                        right: 8,
-                        top: 10,
-                        bottom: 18,
+                    child: TextField(
+                      style: TextStyle(
+                        fontSize: 28.0,
+                        color: fromCssColor(controller.woxTheme.value.queryBoxFontColor),
                       ),
-                      border: OutlineInputBorder(
-                        borderRadius: BorderRadius.circular(controller.woxTheme.value.queryBoxBorderRadius.toDouble()),
-                        borderSide: BorderSide.none,
+                      decoration: InputDecoration(
+                        isCollapsed: true,
+                        contentPadding: const EdgeInsets.only(
+                          left: 8,
+                          right: 8,
+                          top: 10,
+                          bottom: 18,
+                        ),
+                        border: OutlineInputBorder(
+                          borderRadius: BorderRadius.circular(controller.woxTheme.value.queryBoxBorderRadius.toDouble()),
+                          borderSide: BorderSide.none,
+                        ),
+                        filled: true,
+                        fillColor: fromCssColor(controller.woxTheme.value.queryBoxBackgroundColor),
                       ),
-                      filled: true,
-                      fillColor: fromCssColor(controller.woxTheme.value.queryBoxBackgroundColor),
-                    ),
-                    cursorColor: fromCssColor(controller.woxTheme.value.queryBoxCursorColor),
-                    autofocus: true,
-                    focusNode: controller.queryBoxFocusNode,
-                    controller: controller.queryBoxTextFieldController,
-                    scrollController: controller.queryBoxScrollController,
-                    onChanged: (value) {
-                      // isComposingRangeValid is not reliable on Windows, we need to use inside post frame callback to check the value
-                      // see https://github.com/flutter/flutter/issues/128565#issuecomment-1772016743
-                      WidgetsBinding.instance.addPostFrameCallback((_) {
-                        // if the composing range is valid, which means the text is changed by IME and the query is not finished yet,
-                        // we should not trigger the query until the composing is finished.
-                        if (controller.queryBoxTextFieldController.value.isComposingRangeValid) {
-                          return;
-                        }
+                      cursorColor: fromCssColor(controller.woxTheme.value.queryBoxCursorColor),
+                      autofocus: true,
+                      focusNode: controller.queryBoxFocusNode,
+                      controller: controller.queryBoxTextFieldController,
+                      scrollController: controller.queryBoxScrollController,
+                      onChanged: (value) {
+                        // isComposingRangeValid is not reliable on Windows, we need to use inside post frame callback to check the value
+                        // see https://github.com/flutter/flutter/issues/128565#issuecomment-1772016743
+                        WidgetsBinding.instance.addPostFrameCallback((_) {
+                          // if the composing range is valid, which means the text is changed by IME and the query is not finished yet,
+                          // we should not trigger the query until the composing is finished.
+                          if (controller.queryBoxTextFieldController.value.isComposingRangeValid) {
+                            return;
+                          }
 
-                        controller.canArrowUpHistory = false;
-                        WoxChangeQuery woxChangeQuery = WoxChangeQuery(
-                          queryId: const UuidV4().generate(),
-                          queryType: WoxQueryTypeEnum.WOX_QUERY_TYPE_INPUT.code,
-                          queryText: value,
-                          querySelection: Selection.empty(),
-                        );
-                        controller.onQueryChanged(woxChangeQuery);
-                      });
-                    },
+                          controller.canArrowUpHistory = false;
+                          WoxChangeQuery woxChangeQuery = WoxChangeQuery(
+                            queryId: const UuidV4().generate(),
+                            queryType: WoxQueryTypeEnum.WOX_QUERY_TYPE_INPUT.code,
+                            queryText: value,
+                            querySelection: Selection.empty(),
+                          );
+                          controller.onQueryChanged(woxChangeQuery);
+                        });
+                      },
+                    ),
                   ),
                 ))),
         Positioned(

Wox.UI.Flutter/wox/lib/modules/launcher/wox_launcher_controller.dart

@@ -191,17 +191,16 @@ class WoxLauncherController extends GetxController implements WoxLauncherInterfa
     isShowActionPanel.value = false;
 
     if (query.queryType == WoxQueryTypeEnum.WOX_QUERY_TYPE_INPUT.code) {
-      // save the cursor position
-      var cursorPosition = queryBoxTextFieldController.selection.baseOffset;
-      queryBoxTextFieldController.text = query.queryText;
-
-      if (moveCursorToEnd) {
-        moveQueryBoxCursorToEnd();
-      } else {
-        // try to restore the cursor position after set text, which will reset the cursor position
+      if (queryBoxTextFieldController.text != query.queryText) {
+        // save the cursor position and then restore it after set text
+        var cursorPosition = queryBoxTextFieldController.selection.baseOffset;
+        queryBoxTextFieldController.text = query.queryText;
         cursorPosition = cursorPosition > queryBoxTextFieldController.text.length ? queryBoxTextFieldController.text.length : cursorPosition;
         queryBoxTextFieldController.selection = TextSelection(baseOffset: cursorPosition, extentOffset: cursorPosition);
       }
+      if (moveCursorToEnd) {
+        moveQueryBoxCursorToEnd();
+      }
     } else {
       queryBoxTextFieldController.text = query.toString();
     }

Wox.UI.Flutter/wox/macos/Podfile.lock

@@ -38,4 +38,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 16208599a12443d53889ba2270a4985981cfb204
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.11.3

Wox/plugin/system/theme.go

@@ -0,0 +1,70 @@
+package system
+
+import (
+	"context"
+	"github.com/samber/lo"
+	"wox/plugin"
+	"wox/share"
+)
+
+var themeIcon = plugin.NewWoxImageBase64(`data:image/png;base64,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`)
+
+func init() {
+	plugin.AllSystemPlugin = append(plugin.AllSystemPlugin, &ThemePlugin{})
+}
+
+type ThemePlugin struct {
+	api plugin.API
+}
+
+func (c *ThemePlugin) GetMetadata() plugin.Metadata {
+	return plugin.Metadata{
+		Id:            "58a59382-8b3a-48c2-89ac-0a9a0e12e03f",
+		Name:          "Theme manager",
+		Author:        "Wox Launcher",
+		Website:       "https://github.com/Wox-launcher/Wox",
+		Version:       "1.0.0",
+		MinWoxVersion: "2.0.0",
+		Runtime:       "Nodejs",
+		Description:   "Theme manager",
+		Icon:          themeIcon.String(),
+		Entry:         "",
+		TriggerKeywords: []string{
+			"theme",
+		},
+		Commands: []plugin.MetadataCommand{},
+		SupportedOS: []string{
+			"Windows",
+			"Macos",
+			"Linux",
+		},
+	}
+}
+
+func (c *ThemePlugin) Init(ctx context.Context, initParams plugin.InitParams) {
+	c.api = initParams.API
+}
+
+func (c *ThemePlugin) Query(ctx context.Context, query plugin.Query) []plugin.QueryResult {
+	ui := plugin.GetPluginManager().GetUI()
+	return lo.FilterMap(ui.GetAllThemes(ctx), func(theme share.Theme, _ int) (plugin.QueryResult, bool) {
+		match, _ := IsStringMatchScore(ctx, theme.ThemeName, query.Search)
+		if match {
+			return plugin.QueryResult{
+				Title: theme.ThemeName,
+				Icon:  themeIcon,
+				Actions: []plugin.QueryResultAction{
+					{
+						Name:                   "Change theme",
+						PreventHideAfterAction: true,
+						Action: func(actionContext plugin.ActionContext) {
+							ui.ChangeTheme(ctx, theme)
+						},
+					},
+				},
+			}, true
+		} else {
+			return plugin.QueryResult{}, false
+		}
+	})
+}

Wox/resource/ui/themes/dark.json

@@ -29,6 +29,7 @@
   "QueryBoxBackgroundColor": "rgba(24, 25, 26, 0.4)",
   "QueryBoxBorderRadius": 8,
   "QueryBoxCursorColor": "#e4e7e7",
+  "QueryBoxTextSelectionColor": "rgba(31, 118, 124, 0.8)",
   "ActionContainerBackgroundColor": "#373839",
   "ActionContainerHeaderFontColor": "#e4e7e7",
   "ActionContainerPaddingLeft": 14,
@@ -44,5 +45,6 @@
   "PreviewFontColor": "#f0f0f0",
   "PreviewSplitLineColor": "#3a474e",
   "PreviewPropertyTitleColor": "#b0b3b5",
-  "PreviewPropertyContentColor": "#f0f0f0"
+  "PreviewPropertyContentColor": "#f0f0f0",
+  "PreviewTextSelectionColor": "rgba(31, 118, 124, 0.8)"
 }

Wox/resource/ui/themes/light.json

@@ -29,6 +29,7 @@
   "QueryBoxBackgroundColor": "rgba(255,255,255,0.5)",
   "QueryBoxBorderRadius": 8,
   "QueryBoxCursorColor": "#000000",
+  "QueryBoxTextSelectionColor": "#529df7",
   "ActionContainerBackgroundColor": "rgba(236, 240, 240, 1)",
   "ActionContainerHeaderFontColor": "#454545",
   "ActionContainerPaddingLeft": 14,
@@ -44,5 +45,6 @@
   "PreviewFontColor": "#454545",
   "PreviewSplitLineColor": "#caced0",
   "PreviewPropertyTitleColor": "#716b6b",
-  "PreviewPropertyContentColor": "#716b6b"
+  "PreviewPropertyContentColor": "#716b6b",
+  "PreviewTextSelectionColor": "#529df7"
 }

Wox/ui/theme.go → Wox/share/theme.go

@@ -1,4 +1,4 @@
-package ui
+package share
 
 type Theme struct {
 	ThemeId     string
@@ -32,6 +32,7 @@ type Theme struct {
 	QueryBoxBackgroundColor         string
 	QueryBoxBorderRadius            int
 	QueryBoxCursorColor             string
+	QueryBoxTextSelectionColor      string
 	ActionContainerBackgroundColor  string
 	ActionContainerHeaderFontColor  string
 	ActionContainerPaddingLeft      int
@@ -48,4 +49,5 @@ type Theme struct {
 	PreviewSplitLineColor           string
 	PreviewPropertyTitleColor       string
 	PreviewPropertyContentColor     string
+	PreviewTextSelectionColor       string
 }

Wox/share/ui.go

@@ -30,9 +30,10 @@ type UI interface {
 	ToggleApp(ctx context.Context)
 	ShowMsg(ctx context.Context, title string, description string, icon string)
 	GetServerPort(ctx context.Context) int
-	ChangeTheme(ctx context.Context, theme string)
+	ChangeTheme(ctx context.Context, theme Theme)
 	OpenSettingWindow(ctx context.Context)
 	OpenDevTools(ctx context.Context)
+	GetAllThemes(ctx context.Context) []Theme
 }
 
 type ShowContext struct {

Wox/ui/dto/theme_dto.go

@@ -35,6 +35,7 @@ type Theme struct {
 	QueryBoxBackgroundColor         string
 	QueryBoxBorderRadius            int
 	QueryBoxCursorColor             string
+	QueryBoxTextSelectionColor      string
 	ActionContainerBackgroundColor  string
 	ActionContainerHeaderFontColor  string
 	ActionContainerPaddingLeft      int
@@ -51,4 +52,5 @@ type Theme struct {
 	PreviewSplitLineColor           string
 	PreviewPropertyTitleColor       string
 	PreviewPropertyContentColor     string
+	PreviewTextSelectionColor       string
 }