增加了专辑图居左设置

修正了歌名、别名、歌手、专辑不能居左的问题修正了版本更新的比较方式
Steve-xmh · Feb 8, 2023 · 3009e06 · 3009e06
1 parent 5d9f32b
commit 3009e06
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 43 deletions.
diff --git a/dist/index.css b/dist/index.css
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/manifest.json b/dist/manifest.json
@@ -9,7 +9,7 @@
     ],
     "description": "一个基于 BetterNCM 的类 Apple Music 歌词显示插件",
     "preview": "preview.svg",
-    "version": "1.8.1",
+    "version": "1.8.2",
     "type": "extension",
     "noDevReload": true,
     "requirements": [

diff --git a/manifest.json b/manifest.json
@@ -9,7 +9,7 @@
     ],
     "description": "一个基于 BetterNCM 的类 Apple Music 歌词显示插件",
     "preview": "preview.svg",
-    "version": "1.8.1",
+    "version": "1.8.2",
     "type": "extension",
     "noDevReload": true,
     "requirements": [

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "applemusic-like-lyrics",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "main": "index.js",
   "private": true,
   "license": "GPL-3.0",
@@ -32,6 +32,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-simple-code-editor": "^0.13.1",
+    "semver": "^7.3.8",
     "semver-compare": "^1.0.0",
     "typescript": "^4.9.4"
   },

diff --git a/src/api/react.ts b/src/api/react.ts
@@ -11,6 +11,7 @@ import {
 	lyricErrorAtom,
 	musicIdAtom,
 } from "../core/states";
+import semverGt from "semver/functions/gt";
 
 export function useConfig(
 	key: string,
@@ -217,7 +218,7 @@ export function useGithubLatestVersion(): string {
 export function useHasUpdates(): boolean {
 	const githubVersion = useGithubLatestVersion();
 	return React.useMemo(
-		() => githubVersion !== "" && githubVersion !== version,
+		() => githubVersion !== "" && semverGt(githubVersion, version),
 		[githubVersion],
 	);
 }

diff --git a/src/config/index.tsx b/src/config/index.tsx
@@ -10,8 +10,7 @@ import { SongInfoStyleSettings } from "./song-info-style";
 import { OtherStyleSettings } from "./other-style";
 import { LyricSourceSettings } from "./lyric-source";
 import { CustomCSSSettings } from "./custom-css";
-import { version } from "../../manifest.json";
-import { useGithubLatestVersion } from "../api/react";
+import { useHasUpdates } from "../api/react";
 import { Provider } from "jotai";
 import { BackgroundSettings } from "./background";
 
@@ -26,7 +25,7 @@ const PanelWrapper: React.FC<React.PropsWithChildren> = (props) => {
 
 const ConfigComponent: React.FC = () => {
 	const hasWarnings = useHasWarnings();
-	const latestVersion = useGithubLatestVersion();
+	const hasUpdates = useHasUpdates();
 
 	return (
 		<Tabs
@@ -51,7 +50,7 @@ const ConfigComponent: React.FC = () => {
 				<Tabs.Tab value="lyric-source">EAPI 函数设置</Tabs.Tab>
 				<Tabs.Tab value="custom-css">自定义 CSS 设置</Tabs.Tab>
 				<Tabs.Tab value="about">
-					{latestVersion !== "" && latestVersion !== version ? (
+					{hasUpdates ? (
 						<Indicator offset={-3} size={6} color="yellow">
 							关于
 						</Indicator>

diff --git a/src/config/song-info-style.tsx b/src/config/song-info-style.tsx
@@ -13,6 +13,10 @@ export const SongInfoStyleSettings: React.FC = () => {
 			<SwitchConfigComponent settingKey="hideMusicAlias" label="隐藏歌曲别名" />
 			<SwitchConfigComponent settingKey="hideMusicArtists" label="隐藏歌手名" />
 			<SwitchConfigComponent settingKey="hideMusicAlbum" label="隐藏专辑名" />
+			<SwitchConfigComponent
+				settingKey="alignLeftAlbumImage"
+				label="专辑图居左"
+			/>
 			<SwitchConfigComponent settingKey="alignLeftMusicName" label="歌名居左" />
 			<SwitchConfigComponent
 				settingKey="alignLeftMusicAlias"

diff --git a/src/index.tsx b/src/index.tsx
@@ -515,7 +515,6 @@ export const useStyles = createStyles;
 export const ThemeProvider: React.FC<React.PropsWithChildren> = (props) => {
 	return (
 		<MantineProvider
-			withNormalizeCSS
 			theme={{
 				colorScheme: "dark",
 			}}

diff --git a/src/main-view.sass b/src/main-view.sass
@@ -251,21 +251,25 @@ $tween-animation-timing: cubic-bezier(0.65, 0, 0.35, 1)
     &.use-ping-fang-font *
         font-family: 'San Francisco', 'Helvetica', 'PingFang SC' !important
 
+    // 专辑图居左
+    &.align-left-album-image .am-album-image
+        align-self: flex-start !important
+
     // 歌名居左
     &.align-left-music-name .am-music-name
-        text-align: left
+        text-align: left !important
 
     // 歌曲别名居左
     &.align-left-music-alias .am-music-alias
-        text-align: left
+        text-align: left !important
 
     // 歌手名居左
     &.align-left-music-artists .am-music-artists
-        justify-content: left
+        justify-content: left !important
 
     // 专辑名居左
     &.align-left-music-album .am-music-album
-        justify-content: left
+        justify-content: left !important
 
     // 隐藏歌手名标签
     &.hide-music-artists-label .am-artists-label