Merge pull request #27 from ipuppet/dev

Dev
ipuppet · Jun 27, 2022 · d412067 · d412067
2 parents 8abc454 + 7e4c24b
commit d412067
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 11 deletions.
diff --git a/config.json b/config.json
@@ -1,7 +1,7 @@
 {
     "info": {
         "name": "WAIO",
-        "version": "1.6.6",
+        "version": "1.6.7",
         "author": "ipuppet",
         "module": false
     },

diff --git a/scripts/libs/easy-jsbox.js b/scripts/libs/easy-jsbox.js
@@ -174,6 +174,9 @@ class View {
     }
 
     setProp(key, prop) {
+        if (key === "id") {
+            this.id = prop
+        }
         this.props[key] = prop
         return this
     }
@@ -847,7 +850,8 @@ class BarButtonItem extends View {
                             imageEdgeInsets: $insets(0, 0, 0, 0)
                         },
                         this.menu ? { menu: this.menu } : {},
-                        this.title?.length > 0 ? { title: this.title } : {}
+                        this.title?.length > 0 ? { title: this.title } : {},
+                        this.props
                     ),
                     views: [
                         {

diff --git a/scripts/widget/Calendar/calendar.js b/scripts/widget/Calendar/calendar.js
@@ -409,15 +409,14 @@ class Calendar {
     /**
      * 周指示器模板
      */
-    weekIndexTemplate() {
+    weekIndexTemplate(props = {}) {
         const title = []
         for (let i = 0; i < 7; i++) {
             title.push(this.singleContentDayTemplate({
-                text: {
-                    font: $font(14),
+                text: Object.assign({
                     text: this.localizedWeek(i),
                     color: this.colorTone
-                }
+                }, props)
             }))
         }
         return title
@@ -441,6 +440,7 @@ class Calendar {
         views.push({
             type: "text",
             props: {
+                font: $font(this.setting.get("title.fontsize")),
                 text: leftText,
                 lineLimit: 1,
                 color: this.colorTone,
@@ -458,6 +458,7 @@ class Calendar {
             views.push({
                 type: "text",
                 props: {
+                    font: $font(this.setting.get("title.fontsize")),
                     text: rightText,
                     lineLimit: 1,
                     color: this.colorTone,
@@ -482,7 +483,7 @@ class Calendar {
         }
     }
 
-    calendarTemplate(calendarInfo, dayStyleModifier, dayTemplate, vSpacing = 5) {
+    calendarTemplate(calendarInfo, weekIndexTemplate, dayStyleModifier, dayTemplate, vSpacing = 5) {
         const days = []
         for (let line of calendarInfo.calendar) { // 设置不同日期显示不同样式
             for (let dayInfo of line) {
@@ -506,7 +507,7 @@ class Calendar {
                     maxHeight: Infinity
                 }
             },
-            views: this.weekIndexTemplate().concat(days)
+            views: weekIndexTemplate.concat(days)
         }
         const titleBar = this.titleBarTemplate(calendarInfo)
 
@@ -535,8 +536,14 @@ class Calendar {
         const calendarInfo = this.getCalendar(false)
         return this.calendarTemplate(
             calendarInfo,
+            this.weekIndexTemplate({ font: $font(this.setting.get("2x2.fontsize")) }),
             (dayInfo, calendarInfo) => this.singleContentDayStyleModifier(dayInfo, calendarInfo),
-            props => this.singleContentDayTemplate(props),
+            props => {
+                if (props.text) {
+                    Object.assign(props.text, { font: $font(this.setting.get("2x2.fontsize")) })
+                }
+                return this.singleContentDayTemplate(props)
+            },
             0
         )
     }
@@ -545,6 +552,7 @@ class Calendar {
         const calendarInfo = this.getCalendar(true, family === this.setting.family.medium)
         return this.calendarTemplate(
             calendarInfo,
+            this.weekIndexTemplate(),
             (dayInfo, calendarInfo) => this.multipleContentDayStyleModifier(dayInfo, calendarInfo),
             props => this.multipleContentDayTemplate(props)
         )

diff --git a/scripts/widget/Calendar/setting.json b/scripts/widget/Calendar/setting.json
@@ -182,6 +182,31 @@
                                 "type": "switch",
                                 "key": "title.lunarYear",
                                 "value": true
+                            },
+                            {
+                                "icon": [
+                                    "slider.horizontal.3",
+                                    "#FF9933"
+                                ],
+                                "title": "FONT_SIZE",
+                                "type": "number",
+                                "key": "title.fontsize",
+                                "value": 15
+                            }
+                        ]
+                    },
+                    {
+                        "title": "2x2",
+                        "items": [
+                            {
+                                "icon": [
+                                    "slider.horizontal.3",
+                                    "#FF9933"
+                                ],
+                                "title": "FONT_SIZE",
+                                "type": "number",
+                                "key": "2x2.fontsize",
+                                "value": 13
                             }
                         ]
                     }

diff --git a/strings/en.strings b/strings/en.strings
@@ -43,4 +43,6 @@
 "CLEAR_IMAGE" = "Clear Image";
 
 "CLASSIC" = "Classic";
-"MODERN" = "Modern";
+"MODERN" = "Modern";
+
+"FONT_SIZE" = "Font Size";
diff --git a/strings/zh-Hans.strings b/strings/zh-Hans.strings
@@ -43,4 +43,6 @@
 "CLEAR_IMAGE" = "清除图片";
 
 "CLASSIC" = "经典";
-"MODERN" = "现代";
+"MODERN" = "现代";
+
+"FONT_SIZE" = "字体大小";