🎨 #10479

siyuan-note · Mar 2, 2024 · ce5a6c4 · ce5a6c4
1 parent 8d71b64
commit ce5a6c4
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 4 deletions.
diff --git a/app/appearance/icons/ant/icon.js b/app/appearance/icons/ant/icon.js
diff --git a/app/appearance/icons/ant/icon.json b/app/appearance/icons/ant/icon.json
@@ -2,5 +2,5 @@
   "name": "ant",
   "author": "Vanessa",
   "url": "https://github.com/Vanessa219",
-  "version": "1.30.0"
+  "version": "1.31.0"
 }
diff --git a/app/appearance/icons/index.html b/app/appearance/icons/index.html
@@ -28,6 +28,12 @@
 <body>
 <h2>SiYuan</h2>
 <div class="fn__clear">
+    <div>
+        <svg>
+            <use xlink:href="#iconCamera"></use>
+        </svg>
+        iconCamera
+    </div>
     <div>
         <svg>
             <use xlink:href="#iconSoftWrap"></use>

diff --git a/app/appearance/icons/material/icon.js b/app/appearance/icons/material/icon.js
diff --git a/app/appearance/icons/material/icon.json b/app/appearance/icons/material/icon.json
@@ -2,5 +2,5 @@
   "name": "material",
   "author": "Vanessa",
   "url": "https://github.com/Vanessa219",
-  "version": "1.30.0"
+  "version": "1.31.0"
 }
diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
@@ -1,4 +1,5 @@
 {
+  "insertPhoto": "Take a photo and insert it",
   "relativeToToday": "Relative to today",
   "current": "This",
   "week": "week",

diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
@@ -1,4 +1,5 @@
 {
+  "insertPhoto": "Toma una foto e insértala",
   "relativeToToday": "Relativa a hoy",
   "current": "Esto",
   "week": "semana",

diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
@@ -1,4 +1,5 @@
 {
+  "insertPhoto": "Prendre une photo et l'insérer",
   "relativeToToday": "Par rapport à aujourd'hui",
   "current": "Ceci",
   "week": "semaine",

diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
@@ -1,4 +1,5 @@
 {
+  "insertPhoto": "拍照並插入",
   "relativeToToday": "相對於今天",
   "current": "當前",
   "week": "週",

diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
@@ -1,4 +1,5 @@
 {
+  "insertPhoto": "拍照并插入",
   "relativeToToday": "相对于今天",
   "current": "当前",
   "week": "周",

diff --git a/app/src/mobile/util/keyboardToolbar.ts b/app/src/mobile/util/keyboardToolbar.ts
@@ -12,6 +12,7 @@ import {getCurrentEditor} from "../editor";
 import {fontEvent, getFontNodeElements} from "../../protyle/toolbar/Font";
 import {hideElements} from "../../protyle/ui/hideElements";
 import {softEnter} from "../../protyle/wysiwyg/enter";
+import {isInAndroid} from "../../protyle/util/compatibility";
 
 let renderKeyboardToolbarTimeout: number;
 let showUtil = false;
@@ -209,6 +210,7 @@ const renderSlashMenu = (protyle: IProtyle, toolbarElement: Element) => {
 <div class="keyboard__slash-title"></div>
 <div class="keyboard__slash-block">
     ${getSlashItem(Constants.ZWSP + 3, "iconDownload", window.siyuan.languages.insertAsset + '<input class="b3-form__upload" type="file"' + (protyle.options.upload.accept ? (' multiple="' + protyle.options.upload.accept + '"') : "") + "/>", "true")}
+    ${isInAndroid() ? getSlashItem(Constants.ZWSP + 3, "iconCamera", window.siyuan.languages.insertPhoto + '<input class="b3-form__upload" capture="user" type="file"' + (protyle.options.upload.accept ? (' multiple="' + protyle.options.upload.accept + '"') : "") + "/>", "true") : ""}
     ${getSlashItem('<iframe sandbox="allow-forms allow-presentation allow-same-origin allow-scripts allow-modals" src="" border="0" frameborder="no" framespacing="0" allowfullscreen="true"></iframe>', "iconLanguage", window.siyuan.languages.insertIframeURL, "true")}
     ${getSlashItem("![]()", "iconImage", window.siyuan.languages.insertImgURL, "true")}
     ${getSlashItem('<video controls="controls" src=""></video>', "iconVideo", window.siyuan.languages.insertVideoURL, "true")}