Merge pull request #175 from ipuppet/dev

Dev
ipuppet · Jul 2, 2024 · 4336d7c · 4336d7c
2 parents 6722078 + b283dfa
commit 4336d7c
Show file tree

Hide file tree

Showing 9 changed files with 83 additions and 51 deletions.
diff --git a/config.json b/config.json
@@ -1,7 +1,7 @@
 {
     "info": {
         "name": "CAIO",
-        "version": "2.2.13",
+        "version": "2.2.14",
         "author": "ipuppet",
         "module": false
     },

diff --git a/dist/CAIO.json b/dist/CAIO.json
diff --git a/main.js b/main.js
@@ -31,7 +31,7 @@ switch ($app.env) {
         break
 }
 
-// AppInstance = require("./scripts/widget")
+//AppInstance = require("./scripts/widget")
 if (AppInstance) {
     AppInstance.run()
 }
diff --git a/scripts/app.js b/scripts/app.js
@@ -20,7 +20,7 @@ class AppKernelBase extends Kernel {
 
     constructor() {
         super()
-        $file.list($file.rootPath)
+        // $file.list($file.rootPath)
         $app.listen({ exit: () => $objc_clean() })
         // FileStorage
         this.fileStorage = AppKernelBase.fileStorage

diff --git a/scripts/setting/setting-methods.js b/scripts/setting/setting-methods.js
@@ -442,8 +442,7 @@ function settingMethods(appKernel) {
         animate.done()
     }
 
-    kernel.setting.method.previewWidget = animate => {
-        const { Widget } = require("../widget")
+    kernel.setting.method.previewWidget = () => {
         const widgets = {}
         try {
             JSON.parse($file.read("widget-options.json").string).forEach(item => {
@@ -456,6 +455,7 @@ function settingMethods(appKernel) {
         $ui.menu({
             items: Object.keys(widgets),
             handler: name => {
+                const { Widget } = require("../widget")
                 Widget.render(widgets[name])
             }
         })

diff --git a/scripts/ui/clips/clips.js b/scripts/ui/clips/clips.js
@@ -43,6 +43,8 @@ class Clips extends ClipsData {
         if (UIKit.isTaio) return
         $app.listen({
             resume: () => {
+                // 重载小组件
+                $widget.reloadTimeline()
                 // 在应用恢复响应后调用
                 if (!this.needReload && $(this.views.listId).ocValue().$isEditing()) {
                     return
@@ -79,6 +81,34 @@ class Clips extends ClipsData {
         this.delegates.setDelegate()
     }
 
+    async checkUrlScheme() {
+        // actions widget
+        if ($context.query["runAction"]) {
+            const data = JSON.parse($text.base64Decode($context.query["runAction"]))
+            const action = this.kernel.actions.getAction(
+                data.category,
+                data.dir,
+                new ActionData({ env: ActionEnv.widget })
+            )
+            action.do()
+            return
+        }
+        // clips widget
+        if ($context.query["copy"]) {
+            const uuid = $context.query["copy"]
+            this.setCopied(uuid)
+            $ui.success($l10n("COPIED"))
+        } else if ($context.query["add"]) {
+            this.getAddTextView()
+        } else if ($context.query["actions"]) {
+            if (this.kernel.isUseJsboxNav) {
+                this.kernel.actions.present()
+            } else {
+                this.kernel.tabBarController.switchPageTo("actions")
+            }
+        }
+    }
+
     /**
      * list view ready event
      */
@@ -95,31 +125,7 @@ class Clips extends ClipsData {
         if (UIKit.isTaio) return
 
         // check url scheme
-        $delay(0.5, () => {
-            if ($context.query["copy"]) {
-                const uuid = $context.query["copy"]
-                this.setCopied(uuid)
-                $ui.success($l10n("COPIED"))
-            } else if ($context.query["add"]) {
-                this.getAddTextView()
-            } else if ($context.query["actions"]) {
-                if (this.kernel.isUseJsboxNav) {
-                    this.kernel.actions.present()
-                } else {
-                    this.kernel.tabBarController.switchPageTo("actions")
-                }
-            } else if ($context.query["runAction"]) {
-                $delay(0, () => {
-                    const data = JSON.parse($text.base64Decode($context.query["runAction"]))
-                    const action = this.kernel.actions.getAction(
-                        data.category,
-                        data.dir,
-                        new ActionData({ env: ActionEnv.widget })
-                    )
-                    action.do()
-                })
-            }
-        })
+        $delay(0, () => this.checkUrlScheme())
 
         this.appListen()
     }

diff --git a/scripts/widget.js b/scripts/widget.js
@@ -1,16 +1,14 @@
-const { Logger } = require("./libs/easy-jsbox")
 const { AppKernelBase } = require("./app")
 
 /**
  * @typedef {AppKernel} AppKernel
  */
 class AppKernel extends AppKernelBase {
+    logFile = "widget.log"
+
     constructor() {
         super()
 
-        this.logger = new Logger()
-        this.logger.printToFile(this.fileStorage, "logs/widget.log")
-
         this.setting.setReadonly()
     }
 

diff --git a/scripts/widget/Actions.js b/scripts/widget/Actions.js
@@ -74,9 +74,10 @@ class ActionsWidget {
         return {
             type: "vstack",
             props: {
+                background: $color("primarySurface"),
                 alignment: $widget.horizontalAlignment.leading,
                 spacing: 0,
-                padding: 10,
+                padding: 20,
                 widgetURL: this.getUrlScheme(action)
             },
             views: [
@@ -100,7 +101,10 @@ class ActionsWidget {
                                     }
                                 },
                                 {
-                                    cornerRadius: 10
+                                    cornerRadius: {
+                                        value: 15,
+                                        style: 1
+                                    }
                                 }
                             ],
                             views: [
@@ -152,9 +156,12 @@ class ActionsWidget {
 
         const height = this.ctx.displaySize.height
         const width = this.ctx.displaySize.width
-        const padding = 28
-        const itemHeight = (height - padding * (this.maxLength / 2 + 1)) / (this.maxLength / 2)
-        const itemWidth = (width - padding * 3) / 2
+        const padding = 25
+        const innerPadding = 5
+        const itemHeight = (height - padding * (this.maxLength / 2 + 1)) / (this.maxLength / 2) - innerPadding * 2
+        const itemWidth = (width - padding * 3) / 2 - innerPadding * 2
+        const r_outer = 15
+        const r_inner = r_outer * ((itemHeight - 2 * innerPadding) / itemHeight)
         for (let i = 0; i < length; i += 2) {
             const row = []
             for (let j = 0; j < 2; j++) {
@@ -163,30 +170,48 @@ class ActionsWidget {
                     type: "hstack",
                     props: {
                         spacing: 0,
-                        padding: 0,
-                        link: this.getUrlScheme(action),
-                        frame: {
-                            maxWidth: itemWidth,
-                            maxHeight: itemHeight,
-                            alignment: $widget.alignment.leading
-                        }
+                        link: this.getUrlScheme(action)
                     },
+                    modifiers: [
+                        {
+                            background: $color({
+                                light: $rgb(245, 245, 245),
+                                dark: $rgba(80, 80, 80, 0.3),
+                                black: $rgba(70, 70, 70, 0.3)
+                            }),
+                            padding: innerPadding,
+                            frame: {
+                                maxWidth: itemWidth,
+                                maxHeight: itemHeight,
+                                alignment: $widget.alignment.leading
+                            }
+                        },
+                        {
+                            cornerRadius: {
+                                value: r_outer,
+                                style: 1
+                            }
+                        }
+                    ],
                     views: [
                         {
                             type: "hstack",
                             modifiers: [
                                 {
                                     background: $color(action.color),
                                     frame: {
-                                        width: itemHeight - 5,
-                                        height: itemHeight - 5
+                                        width: itemHeight,
+                                        height: itemHeight
                                     }
                                 },
                                 {
-                                    cornerRadius: 10
+                                    cornerRadius: {
+                                        value: r_inner,
+                                        style: 1
+                                    }
                                 }
                             ],
-                            views: [this.getIcon(action, (itemHeight - 5) * 0.6)]
+                            views: [this.getIcon(action, itemHeight * 0.6)]
                         },
                         {
                             type: "spacer",
@@ -216,6 +241,7 @@ class ActionsWidget {
         return {
             type: "vstack",
             props: {
+                background: $color("primarySurface"),
                 spacing: padding,
                 padding: padding
             },

diff --git a/scripts/widget/list-widget.js b/scripts/widget/list-widget.js
@@ -50,6 +50,7 @@ class ListWidget {
         return {
             type: "vstack",
             props: {
+                background: $color("primarySurface"),
                 alignment: $widget.horizontalAlignment.leading,
                 spacing: 0,
                 padding: this.padding,
@@ -141,6 +142,7 @@ class ListWidget {
         return {
             type: "hstack",
             props: {
+                background: $color("primarySurface"),
                 spacing: 0,
                 padding: this.padding,
                 widgetURL: this.urlScheme.clips