Merge pull request #147 from solaoi/main

v0.9.13
solaoi · May 8, 2024 · 0b42d32 · 0b42d32
2 parents 822880a + 63de899
commit 0b42d32
Show file tree

Hide file tree

Showing 15 changed files with 76 additions and 23 deletions.
diff --git a/index.html b/index.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="ja">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/svg+xml" href="/lycoris.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + TS</title>
+    <title>Lycoris</title>
   </head>
   <body>
     <div id="root"></div>

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "lycoris",
   "private": true,
-  "version": "0.9.12",
+  "version": "0.9.13",
   "type": "module",
   "license": "MIT",
   "engines": {

diff --git a/public/lycoris.png b/public/lycoris.png
diff --git a/public/vite.svg b/public/vite.svg
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "lycoris"
-version = "0.9.12"
+version = "0.9.13"
 description = "Lycoris is an offline voice memo"
 authors = ["solaoi"]
 license = "MIT"

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Lycoris",
-    "version": "0.9.12"
+    "version": "0.9.13"
   },
   "tauri": {
     "allowlist": {

diff --git a/src/components/atoms/MdiFastForward.tsx b/src/components/atoms/MdiFastForward.tsx
@@ -0,0 +1,7 @@
+import type { SVGProps } from 'react';
+
+const MdiFastForward = (props: SVGProps<SVGSVGElement>) => {
+    return (<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" {...props}><path fill="currentColor" d="M13 6v12l8.5-6M4 18l8.5-6L4 6z"></path></svg>);
+}
+
+export { MdiFastForward }
diff --git a/src/components/atoms/MdiPauseCircle.tsx b/src/components/atoms/MdiPauseCircle.tsx
@@ -0,0 +1,7 @@
+import type { SVGProps } from 'react';
+
+const MdiPauseCircle = (props: SVGProps<SVGSVGElement>) => {
+	return (<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" {...props}><path fill="currentColor" d="M15 16h-2V8h2m-4 8H9V8h2m1-6A10 10 0 0 0 2 12a10 10 0 0 0 10 10a10 10 0 0 0 10-10A10 10 0 0 0 12 2"></path></svg>);
+}
+
+export { MdiPauseCircle }
diff --git a/src/components/atoms/MdiPlayCircle.tsx b/src/components/atoms/MdiPlayCircle.tsx
@@ -0,0 +1,7 @@
+import type { SVGProps } from 'react';
+
+const MdiPlayCircle = (props: SVGProps<SVGSVGElement>) => {
+    return (<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" {...props}><path fill="currentColor" d="M10 16.5v-9l6 4.5M12 2A10 10 0 0 0 2 12a10 10 0 0 0 10 10a10 10 0 0 0 10-10A10 10 0 0 0 12 2"></path></svg>);
+}
+
+export { MdiPlayCircle }
diff --git a/src/components/atoms/MdiRewind.tsx b/src/components/atoms/MdiRewind.tsx
@@ -0,0 +1,7 @@
+import type { SVGProps } from 'react';
+
+const MdiRewind = (props: SVGProps<SVGSVGElement>) => {
+    return (<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" {...props}><path fill="currentColor" d="m11.5 12l8.5 6V6m-9 12V6l-8.5 6z"></path></svg>);
+}
+
+export { MdiRewind }
diff --git a/src/components/atoms/MdiVolumeHigh.tsx b/src/components/atoms/MdiVolumeHigh.tsx
@@ -0,0 +1,7 @@
+import type { SVGProps } from 'react';
+
+const MdiVolumeHigh = (props: SVGProps<SVGSVGElement>) => {
+    return (<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" {...props}><path fill="currentColor" d="M14 3.23v2.06c2.89.86 5 3.54 5 6.71s-2.11 5.84-5 6.7v2.07c4-.91 7-4.49 7-8.77s-3-7.86-7-8.77M16.5 12c0-1.77-1-3.29-2.5-4.03V16c1.5-.71 2.5-2.24 2.5-4M3 9v6h4l5 5V4L7 9z"></path></svg>);
+}
+
+export { MdiVolumeHigh }
diff --git a/src/components/atoms/MdiVolumeMute.tsx b/src/components/atoms/MdiVolumeMute.tsx
@@ -0,0 +1,7 @@
+import type { SVGProps } from 'react';
+
+const MdiVolumeMute = (props: SVGProps<SVGSVGElement>) => {
+	return (<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" {...props}><path fill="currentColor" d="M3 9h4l5-5v16l-5-5H3zm13.59 3L14 9.41L15.41 8L18 10.59L20.59 8L22 9.41L19.41 12L22 14.59L20.59 16L18 13.41L15.41 16L14 14.59z"></path></svg>);
+}
+
+export { MdiVolumeMute }
diff --git a/src/components/molecules/AudioPlayer.tsx b/src/components/molecules/AudioPlayer.tsx
@@ -1,5 +1,11 @@
 import Player from 'react-h5-audio-player';
 import 'react-h5-audio-player/lib/styles.css';
+import { MdiPlayCircle } from '../atoms/MdiPlayCircle';
+import { MdiPauseCircle } from '../atoms/MdiPauseCircle';
+import { MdiRewind } from '../atoms/MdiRewind';
+import { MdiFastForward } from '../atoms/MdiFastForward';
+import { MdiVolumeHigh } from '../atoms/MdiVolumeHigh';
+import { MdiVolumeMute } from '../atoms/MdiVolumeMute';
 
 type AudioPlayerProps = {
     filePath: string
@@ -14,10 +20,18 @@ const AudioPlayer = (props: AudioPlayerProps): JSX.Element => {
         <div style={style} className={className} >
             <Player
                 src={filePath}
-                onPlay={e => console.log("onPlay")}
+                onPlay={() => { }}
                 style={{ background: "rgba(255,255,255,0.9)", height: "100px" }}
                 customAdditionalControls={[<></>]}
-                showSkipControls={true}
+                // bundle for offline
+                customIcons={{
+                    play: MdiPlayCircle({}),
+                    pause: MdiPauseCircle({}),
+                    rewind: MdiRewind({}),
+                    forward: MdiFastForward({}),
+                    volume: MdiVolumeHigh({}),
+                    volumeMute: MdiVolumeMute({}),
+                }}
             // other props here
             />
         </div>

diff --git a/src/components/molecules/Screenshot.tsx b/src/components/molecules/Screenshot.tsx
@@ -10,19 +10,17 @@ const Screenshot = (props: ScreenshotProps): JSX.Element => {
     const { content, date } = props
 
     return (
-        <div >
-            <div className={"flex mb-1 "}>
-                <div className="w-16 pl-2 flex-none">{date}</div>
-                <div style={{ paddingTop: "0.5rem", paddingRight: "10px" }}>
-                    <svg width="8" height="8" viewBox="0 0 8 8" xmlns="http://www.w3.org/2000/svg">
-                        <polygon points="4,0.4 7.6,4 4,7.6 0.4,4" opacity="0.6" />
-                    </svg>
-                </div>
-                <div className="pr-2 pb-4">
-                    <Zoom>
-                        <img className=" w-1/2" src={convertFileSrc(content)} alt="screenshot" />
-                    </Zoom>
-                </div>
+        <div className={"flex mb-1 "}>
+            <div className="w-16 pl-2 flex-none">{date}</div>
+            <div style={{ paddingTop: "0.5rem", paddingRight: "10px" }}>
+                <svg width="8" height="8" viewBox="0 0 8 8" xmlns="http://www.w3.org/2000/svg">
+                    <polygon points="4,0.4 7.6,4 4,7.6 0.4,4" opacity="0.6" />
+                </svg>
+            </div>
+            <div className="pr-2 pb-4">
+                <Zoom>
+                    <img className="w-1/2" src={convertFileSrc(content)} alt="screenshot" />
+                </Zoom>
             </div>
         </div>
     )