Merge pull request #83 from ipuppet/dev

Dev

config.json

@@ -1,7 +1,7 @@
 {
     "info": {
         "name": "CAIO",
-        "version": "1.6.7",
+        "version": "1.6.8",
         "author": "ipuppet",
         "module": false
     },

scripts/app.js

@@ -41,6 +41,16 @@ class AppKernel extends Kernel {
         settingMethods(this)
     }
 
+    addOpenInJsboxButton() {
+        this.useJsboxNav()
+        this.setNavButtons([
+            {
+                image: $image("assets/icon.png"),
+                handler: () => this.openInJsbox()
+            }
+        ])
+    }
+
     initComponents() {
         // Clipboard
         this.clipboard = new Clipboard(this)
@@ -71,18 +81,9 @@ class AppUI {
     static renderMainUI() {
         const kernel = new AppKernel()
         const buttons = {
-            clipboard: {
-                icon: "doc.on.clipboard",
-                title: $l10n("CLIPBOARD")
-            },
-            actions: {
-                icon: "command",
-                title: $l10n("ACTIONS")
-            },
-            setting: {
-                icon: "gear",
-                title: $l10n("SETTING")
-            }
+            clipboard: { icon: "doc.on.clipboard", title: $l10n("CLIPBOARD") },
+            actions: { icon: "command", title: $l10n("ACTIONS") },
+            setting: { icon: "gear", title: $l10n("SETTING") }
         }
         kernel.setting.setEvent("onSet", key => {
             if (key === "mainUIDisplayMode") {
@@ -123,8 +124,8 @@ class AppUI {
             kernel.tabBarController
                 .setPages({
                     clipboard: clipboardNavigationView.getPage(),
-                    actions: kernel.actionManager.getPageView(),
-                    setting: kernel.setting.getPageView()
+                    actions: kernel.actionManager.getPage(),
+                    setting: kernel.setting.getPage()
                 })
                 .setCells({
                     clipboard: buttons.clipboard,
@@ -138,16 +139,22 @@ class AppUI {
 
     static renderKeyboardUI() {
         const kernel = new AppKernel()
+        kernel.addOpenInJsboxButton()
+
         const Keyboard = require("./ui/keyboard")
         const keyboard = new Keyboard(kernel)
-        $ui.render({ views: [keyboard.getView()] })
+
+        kernel.UIRender(keyboard.getView())
     }
 
     static renderTodayUI() {
         const kernel = new AppKernel()
+        kernel.addOpenInJsboxButton()
+
         const Today = require("./ui/today")
         const today = new Today(kernel)
-        $ui.render({ views: [today.getView()] })
+
+        kernel.UIRender(today.getView())
     }
 
     static renderUnsupported() {

scripts/ui/clipboard.js

@@ -162,7 +162,7 @@ class Clipboard {
 
     /**
      * 警告！该方法可能消耗大量资源
-     * @param {String} uuid
+     * @param {string} uuid
      */
     getIndexPathByUUID(uuid) {
         const data = $(this.listId).data
@@ -366,8 +366,10 @@ class Clipboard {
 
     /**
      * 将from位置的元素移动到to位置
-     * @param {Number} from
-     * @param {Number} to
+     * @param {number} from
+     * @param {number} to
+     * @param {number} section
+     * @param {boolean} copiedIndex
      */
     move(from, to, section, copiedIndex = true) {
         if (from === to) return
@@ -560,7 +562,7 @@ class Clipboard {
      * 复制
      * @param {*} text
      * @param {*} uuid
-     * @param {Number} index 被复制的行的索引
+     * @param {number} index 被复制的行的索引
      */
     copy(text, uuid, indexPath) {
         const path = this.kernel.storage.keyToPath(text)
@@ -831,6 +833,7 @@ class Clipboard {
                 data: this.savedClipboard,
                 template: this.listTemplate(),
                 reorder: true,
+                crossSections: false,
                 actions: [
                     {
                         // 删除

scripts/ui/components/action-manager.js

@@ -769,7 +769,7 @@ class ActionManager {
         return this.matrix.definition
     }
 
-    getPageView() {
+    getPage() {
         const navigationView = new NavigationView()
         navigationView.navigationBarItems.setRightButtons(this.getNavButtons())
         navigationView.setView(this.getMatrixView()).navigationBarTitle($l10n("ACTIONS"))

scripts/ui/keyboard.js

@@ -95,13 +95,7 @@ class Keyboard extends Clipboard {
                                             data.info.info.type,
                                             data.info.info.dir
                                         )
-                                        setTimeout(
-                                            () =>
-                                                action({
-                                                    text: $clipboard.text
-                                                }),
-                                            500
-                                        )
+                                        $delay(0.5, () => action({ text: $clipboard.text }))
                                     }
                                 }
                             )
@@ -163,8 +157,12 @@ class Keyboard extends Clipboard {
                     pullDown: true,
                     items: [
                         {
-                            title: "Next Keyboard",
+                            title: $l10n("SWITCH_KEYBOARD"),
                             handler: this.keyboardTapped(() => $keyboard.next())
+                        },
+                        {
+                            title: $l10n("OPEN_IN_JSBOX"),
+                            handler: () => this.kernel.openInJsbox()
                         }
                     ]
                 }

scripts/ui/today.js

@@ -1,4 +1,4 @@
-const { UIKit, BarButtonItem, NavigationBarItems, NavigationBar } = require("../libs/easy-jsbox")
+const { View, UIKit, BarButtonItem, NavigationBarItems, NavigationBar } = require("../libs/easy-jsbox")
 const Clipboard = require("./clipboard")
 const TodayActions = require("./components/today-actions")
 
@@ -293,15 +293,17 @@ class Today extends Clipboard {
         }
     }
 
-    getMatrixView() {
+    getActionView() {
         let data = this.todayActions.getActions()
         if (data.length === 0) {
             data = this.todayActions.getAllActions()
         }
-        return {
+
+        const matrixView = {
             type: "matrix",
             props: {
                 id: this.matrixId,
+                bgcolor: $color("clear"),
                 columns: 2,
                 itemHeight: 50,
                 spacing: 8,
@@ -375,16 +377,14 @@ class Today extends Clipboard {
                 }
             }
         }
-    }
 
-    getActionView() {
         return {
             type: "view",
             props: {
                 id: this.actionsId,
                 hidden: this.tabIndex !== 2
             },
-            views: [this.getMatrixView()],
+            views: [matrixView],
             layout: (make, view) => {
                 make.top.equalTo(this.navHeight)
                 make.bottom.left.right.equalTo(view.super.safeArea)
@@ -393,11 +393,27 @@ class Today extends Clipboard {
     }
 
     getView() {
-        return {
-            type: "view",
-            views: [this.getNavBarView(), this.getListView(), this.getActionView()],
-            layout: $layout.fill
-        }
+        // 直接放最外层 ready 事件不生效
+        return View.createFromViews([
+            {
+                type: "view",
+                views: [this.getNavBarView(), this.getListView(), this.getActionView()],
+                layout: $layout.fill,
+                events: {
+                    ready: async () => {
+                        if ($app.env !== $env.today) return
+
+                        await $thread.main(0.5)
+                        $ui.animate({
+                            duration: 0.2,
+                            animation: () => {
+                                $ui.vc.runtimeValue().$view().$setBackgroundColor($color("clear"))
+                            }
+                        })
+                    }
+                }
+            }
+        ])
     }
 }
 

strings/en.strings

@@ -73,6 +73,8 @@
 "JSBOX_TOOLBAR" = "JSBox Toolbar";
 "QUICK_START_SCRIPTS" = "Quick Start Scripts";
 "SEND" = "Send";
+"OPEN_IN_JSBOX" = "Open in JSBox";
+"SWITCH_KEYBOARD" = "Switch Keyboard";
 
 "CHECK_UPDATE" = "Check Update";
 "UPDATE" = "Update";

strings/zh-Hans.strings

@@ -73,6 +73,8 @@
 "JSBOX_TOOLBAR" = "JSBox 工具栏";
 "QUICK_START_SCRIPTS" = "快速启动脚本";
 "SEND" = "发送";
+"OPEN_IN_JSBOX" = "在 JSBox 中打开";
+"SWITCH_KEYBOARD" = "切换键盘";
 
 "CHECK_UPDATE" = "检查更新";
 "UPDATE" = "更新";