diff --git a/src/components/settings/SettingsSearch.vue b/src/components/settings/SettingsSearch.vue
index c74ee00..d98a3e9 100644
--- a/src/components/settings/SettingsSearch.vue
+++ b/src/components/settings/SettingsSearch.vue
@@ -29,6 +29,7 @@ const results = computed
(() => {
for (const cat of settingsSchema) {
for (const sec of cat.sections ?? []) {
for (const item of sec.items) {
+ if (item.visible && !item.visible()) continue;
const label = t(`settings.${item.key}.label`);
const desc = item.hideDescription ? "" : t(`settings.${item.key}.description`);
const kw = item.keywords?.map((k) => t(k)).join(" ") ?? "";
diff --git a/src/components/settings/SettingsSection.vue b/src/components/settings/SettingsSection.vue
index 916ff4c..0b10711 100644
--- a/src/components/settings/SettingsSection.vue
+++ b/src/components/settings/SettingsSection.vue
@@ -13,7 +13,9 @@ const props = withDefaults(
const { t } = useI18n();
-const visibleItems = computed(() => props.section.items);
+const visibleItems = computed(() =>
+ props.section.items.filter((item) => !item.visible || item.visible()),
+);
const itemStyle = (i: number) => {
const d = props.highlightKey ? "0s" : `${Math.min(props.startIndex + i, 15) * 0.03}s`;
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index fd5ecb2..757d96a 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -619,6 +619,7 @@
"general": "General",
"player": "Player",
"lyric": "Lyrics",
+ "fullScreenLyric": "Full-screen Lyrics",
"externalLyric": "External Lyrics",
"appearance": "Appearance",
"hotkeys": "Hotkey Settings",
@@ -639,6 +640,7 @@
"language": "Language",
"playback": "Player",
"playControl": "Playback Control",
+ "lyricEngine": "Lyric Engine",
"lyricContent": "Lyric Content",
"lyricTTML": "TTML Lyrics",
"lyricExclude": "Metadata Stripping",
@@ -646,6 +648,7 @@
"lyricDisplay": "Display Effects",
"lyricSpring": "Spring Animation",
"lyricLayout": "Layout & Opacity",
+ "amllLyricSpring": "Physics Spring & Scale",
"desktopLyric": "Desktop Lyric",
"dynamicIsland": "Dynamic Island Lyric",
"taskbarLyric": "Taskbar Lyric",
@@ -837,6 +840,56 @@
"openSearch": "Open search"
}
},
+ "engine": {
+ "label": "Lyric Engine",
+ "description": "Choose the engine type used for lyric rendering and scrolling"
+ },
+ "lyricEngine": {
+ "physics": "Default",
+ "amll": "AMLL"
+ },
+ "useAMSpring": {
+ "label": "Spring Animation Debug Switch",
+ "description": "Enable spring bounce and active line scaling effects for applemusic-like-lyrics"
+ },
+ "amllVerticalSpringHeader": {
+ "label": "Vertical Translation Spring Parameters"
+ },
+ "amllScaleSpringHeader": {
+ "label": "Scale Spring Parameters"
+ },
+ "amllVerticalSpringMass": {
+ "label": "Vertical Spring Mass",
+ "description": "Mass of the vertical scrolling physics spring. Larger mass increases spring inertia."
+ },
+ "amllVerticalSpringDamping": {
+ "label": "Vertical Spring Damping",
+ "description": "Damping of the vertical scrolling physics spring. Larger damping reduces oscillation and settles faster."
+ },
+ "amllVerticalSpringStiffness": {
+ "label": "Vertical Spring Stiffness",
+ "description": "Stiffness of the vertical scrolling physics spring. Larger stiffness pulls harder and bounces quicker."
+ },
+ "amllVerticalSpringSoft": {
+ "label": "Vertical Soft Spring",
+ "description": "Forces the vertical scrolling to use a softer spring profile."
+ },
+ "amllScaleSpringMass": {
+ "label": "Scale Spring Mass",
+ "description": "Mass of the active line scale animation. Larger mass increases scale bounce inertia."
+ },
+ "amllScaleSpringDamping": {
+ "label": "Scale Spring Damping",
+ "description": "Damping of the active line scale animation. Larger damping reduces scale jitter and settles faster."
+ },
+ "amllScaleSpringStiffness": {
+ "label": "Scale Spring Stiffness",
+ "description": "Stiffness of the active line scale animation. Larger stiffness responds and scales quicker."
+ },
+ "amllScaleSpringSoft": {
+ "label": "Scale Soft Spring",
+ "description": "Forces the active line scale animation to use a softer spring profile."
+ },
"autoCenterCover": {
"label": "Auto Center Cover",
"description": "Center cover and hide lyric area when no lyrics available"
@@ -869,6 +922,14 @@
"label": "Show Romanization",
"description": "Display romanized lyrics"
},
+ "amllShowLineRomanization": {
+ "label": "Show Line Romanization",
+ "description": "Display romanized lyrics for each line"
+ },
+ "amllShowWordRomanization": {
+ "label": "Show Word Romanization",
+ "description": "Display romanized lyrics for each word in word-by-word lyrics"
+ },
"enableWordHighlight": {
"label": "Word Highlight",
"description": "Show word-by-word lyric highlight progress"
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index 507addd..0780b7b 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -607,6 +607,7 @@
"general": "常规设置",
"player": "播放设置",
"lyric": "歌词设置",
+ "fullScreenLyric": "全屏歌词",
"externalLyric": "外部歌词",
"appearance": "外观设置",
"hotkeys": "快捷键配置",
@@ -627,6 +628,7 @@
"language": "语言",
"playback": "播放器",
"playControl": "播放控制",
+ "lyricEngine": "歌词引擎",
"lyricContent": "歌词内容",
"lyricTTML": "TTML 歌词",
"lyricExclude": "歌词排除",
@@ -634,6 +636,7 @@
"lyricDisplay": "显示效果",
"lyricSpring": "弹簧动画",
"lyricLayout": "布局与透明度",
+ "amllLyricSpring": "物理回弹与缩放",
"desktopLyric": "桌面歌词",
"dynamicIsland": "灵动岛歌词",
"taskbarLyric": "任务栏歌词",
@@ -825,6 +828,56 @@
"openSearch": "打开搜索"
}
},
+ "engine": {
+ "label": "歌词渲染引擎",
+ "description": "选择用于歌词渲染与滚动的动效引擎"
+ },
+ "lyricEngine": {
+ "physics": "默认",
+ "amll": "AMLL"
+ },
+ "useAMSpring": {
+ "label": "弹簧动画调试开关",
+ "description": "为 applemusic-like-lyrics 启用物理弹性回弹与焦点行缩放效果"
+ },
+ "amllVerticalSpringHeader": {
+ "label": "垂直位移弹簧参数"
+ },
+ "amllScaleSpringHeader": {
+ "label": "缩放弹簧参数"
+ },
+ "amllVerticalSpringMass": {
+ "label": "垂直回弹质量",
+ "description": "垂直弹性滚动的惯性质量。质量越大，回弹惯性越大"
+ },
+ "amllVerticalSpringDamping": {
+ "label": "垂直回弹阻尼",
+ "description": "垂直弹性滚动的阻尼阻力。阻力越大，回弹振幅越小且越快静止"
+ },
+ "amllVerticalSpringStiffness": {
+ "label": "垂直回弹刚度",
+ "description": "垂直弹性滚动的弹簧刚度。刚度越大，拉力越强，回弹速度越快"
+ },
+ "amllVerticalSpringSoft": {
+ "label": "垂直强制软弹簧",
+ "description": "启用后将强制使用较软的垂直滚动弹簧动效"
+ },
+ "amllScaleSpringMass": {
+ "label": "缩放回弹质量",
+ "description": "焦点行缩放动画的质量。值越大，缩放回弹的惯性越大"
+ },
+ "amllScaleSpringDamping": {
+ "label": "缩放回弹阻尼",
+ "description": "焦点行缩放动画的阻尼阻力。值越大，缩放震荡越少且越快静止"
+ },
+ "amllScaleSpringStiffness": {
+ "label": "缩放回弹刚度",
+ "description": "焦点行缩放动画的弹簧刚度。值越大，缩放回弹越迅速"
+ },
+ "amllScaleSpringSoft": {
+ "label": "缩放强制软弹簧",
+ "description": "启用后将强制使用较软的焦点行缩放弹簧动效"
+ },
"autoCenterCover": {
"label": "自动居中封面",
"description": "无歌词时自动居中封面并隐藏歌词区域"
@@ -857,6 +910,14 @@
"label": "显示音译",
"description": "显示歌词的音译文本"
},
+ "amllShowLineRomanization": {
+ "label": "显示逐行音译",
+ "description": "显示歌词行的音译文本"
+ },
+ "amllShowWordRomanization": {
+ "label": "显示逐词音译",
+ "description": "在逐字歌词中，显示每个字词的音译文本"
+ },
"enableWordHighlight": {
"label": "逐字高亮",
"description": "逐字显示歌词高亮进度"
diff --git a/src/settings/categories/fullScreenLyric.ts b/src/settings/categories/fullScreenLyric.ts
new file mode 100644
index 0000000..6eb1e09
--- /dev/null
+++ b/src/settings/categories/fullScreenLyric.ts
@@ -0,0 +1,316 @@
+import type { SettingCategory } from "@/types/settings-schema";
+import { useSettingsStore } from "@/stores/settings";
+import IconLucideTv from "~icons/lucide/tv";
+
+const fullScreenLyricCategory: SettingCategory = {
+ id: "fullScreenLyric",
+ icon: IconLucideTv,
+ sections: [
+ {
+ id: "lyricEngine",
+ items: [
+ {
+ key: "engine",
+ type: "select",
+ binding: { store: "settings", path: "lyric.engine" },
+ options: [
+ { value: "physics", labelKey: "settings.lyricEngine.physics" },
+ { value: "amll", labelKey: "settings.lyricEngine.amll" },
+ ],
+ defaultValue: "physics",
+ },
+ ],
+ },
+ {
+ id: "lyricGeneral",
+ items: [
+ {
+ key: "adaptiveFontSize",
+ type: "switch",
+ binding: { store: "settings", path: "lyric.adaptiveFontSize" },
+ defaultValue: true,
+ },
+ {
+ key: "fontSize",
+ type: "slider",
+ binding: { store: "settings", path: "lyric.fontSize" },
+ min: 30,
+ max: 64,
+ step: 1,
+ defaultValue: 48,
+ marks: { 30: "30", 48: "48", 64: "64" },
+ },
+ {
+ key: "fontWeight",
+ type: "slider",
+ binding: { store: "settings", path: "lyric.fontWeight" },
+ min: 100,
+ max: 900,
+ step: 100,
+ defaultValue: 700,
+ marks: { 100: "100", 400: "400", 700: "700", 900: "900" },
+ },
+ {
+ key: "showTranslation",
+ type: "switch",
+ binding: { store: "settings", path: "lyric.showTranslation" },
+ defaultValue: true,
+ },
+ {
+ key: "showRomanization",
+ type: "switch",
+ binding: { store: "settings", path: "lyric.showRomanization" },
+ defaultValue: true,
+ visible: () => useSettingsStore().lyric.engine === "physics",
+ },
+ {
+ key: "amllShowLineRomanization",
+ type: "switch",
+ binding: { store: "settings", path: "lyric.amllShowLineRomanization" },
+ defaultValue: true,
+ visible: () => useSettingsStore().lyric.engine === "amll",
+ },
+ {
+ key: "amllShowWordRomanization",
+ type: "switch",
+ binding: { store: "settings", path: "lyric.amllShowWordRomanization" },
+ defaultValue: true,
+ visible: () => useSettingsStore().lyric.engine === "amll",
+ },
+ ],
+ },
+ {
+ id: "lyricDisplay",
+ items: [
+ {
+ key: "enableWordHighlight",
+ type: "switch",
+ binding: { store: "settings", path: "lyric.enableWordHighlight" },
+ defaultValue: true,
+ visible: () => useSettingsStore().lyric.engine === "physics",
+ },
+ {
+ key: "enableFloatAnimation",
+ type: "switch",
+ binding: { store: "settings", path: "lyric.enableFloatAnimation" },
+ defaultValue: false,
+ visible: () => useSettingsStore().lyric.engine === "physics",
+ },
+ {
+ key: "enableEmphasizeEffect",
+ type: "switch",
+ binding: { store: "settings", path: "lyric.enableEmphasizeEffect" },
+ defaultValue: false,
+ visible: () => useSettingsStore().lyric.engine === "physics",
+ },
+ {
+ key: "enableBlur",
+ type: "switch",
+ binding: { store: "settings", path: "lyric.enableBlur" },
+ defaultValue: false,
+ },
+ {
+ key: "hidePassedLines",
+ type: "switch",
+ binding: { store: "settings", path: "lyric.hidePassedLines" },
+ defaultValue: false,
+ },
+ ],
+ },
+ {
+ id: "lyricSpring",
+ items: [
+ {
+ key: "springPreset",
+ type: "select",
+ binding: { store: "settings", path: "lyric.springPreset" },
+ options: [
+ { value: "default", labelKey: "settings.springPreset.default" },
+ { value: "smooth", labelKey: "settings.springPreset.smooth" },
+ { value: "responsive", labelKey: "settings.springPreset.responsive" },
+ { value: "jello", labelKey: "settings.springPreset.jello" },
+ { value: "heavy", labelKey: "settings.springPreset.heavy" },
+ { value: "noBounce", labelKey: "settings.springPreset.noBounce" },
+ { value: "custom", labelKey: "settings.springPreset.custom" },
+ ],
+ defaultValue: "default",
+ visible: () => useSettingsStore().lyric.engine === "physics",
+ indentChildren: false,
+ childrenCondition: () =>
+ useSettingsStore().lyric.engine !== "amll" &&
+ useSettingsStore().lyric.springPreset === "custom",
+ children: [
+ {
+ key: "springMass",
+ type: "slider",
+ binding: { store: "settings", path: "lyric.springMass" },
+ min: 0.1,
+ max: 5,
+ step: 0.1,
+ defaultValue: 0.9,
+ marks: { 0.1: "0.1", 0.9: "0.9", 5: "5" },
+ },
+ {
+ key: "springDamping",
+ type: "slider",
+ binding: { store: "settings", path: "lyric.springDamping" },
+ min: 1,
+ max: 50,
+ step: 0.5,
+ defaultValue: 15,
+ marks: { 1: "1", 15: "15", 50: "50" },
+ },
+ {
+ key: "springStiffness",
+ type: "slider",
+ binding: { store: "settings", path: "lyric.springStiffness" },
+ min: 10,
+ max: 300,
+ step: 5,
+ defaultValue: 90,
+ marks: { 10: "10", 90: "90", 300: "300" },
+ },
+ ],
+ },
+ ],
+ },
+ {
+ id: "lyricLayout",
+ items: [
+ {
+ key: "alignPosition",
+ type: "slider",
+ binding: { store: "settings", path: "lyric.alignPosition" },
+ min: 0.1,
+ max: 0.9,
+ step: 0.05,
+ defaultValue: 0.35,
+ marks: { 0.1: "0.1", 0.35: "0.35", 0.9: "0.9" },
+ },
+ {
+ key: "wordFadeWidth",
+ type: "slider",
+ binding: { store: "settings", path: "lyric.wordFadeWidth" },
+ min: 0.1,
+ max: 1,
+ step: 0.1,
+ defaultValue: 0.5,
+ marks: { 0.1: "0.1", 0.5: "0.5", 1: "1" },
+ },
+ {
+ key: "inactiveAlpha",
+ type: "slider",
+ binding: { store: "settings", path: "lyric.inactiveAlpha" },
+ min: 0,
+ max: 1,
+ step: 0.05,
+ defaultValue: 0.2,
+ marks: { 0: "0", 0.2: "0.2", 1: "1" },
+ visible: () => useSettingsStore().lyric.engine === "physics",
+ },
+ ],
+ },
+ {
+ id: "amllLyricSpring",
+ items: [
+ {
+ key: "useAMSpring",
+ type: "switch",
+ binding: { store: "settings", path: "lyric.useAMSpring" },
+ defaultValue: true,
+ visible: () => useSettingsStore().lyric.engine === "amll",
+ hideChildren: true,
+ childrenCondition: () => useSettingsStore().lyric.useAMSpring,
+ children: [
+ {
+ key: "amllVerticalSpringHeader",
+ type: "title",
+ children: [
+ {
+ key: "amllVerticalSpringMass",
+ type: "slider",
+ binding: { store: "settings", path: "lyric.amllVerticalSpringMass" },
+ min: 0.1,
+ max: 5,
+ step: 0.1,
+ defaultValue: 1,
+ marks: { 0.1: "0.1", 1: "1", 5: "5" },
+ },
+ {
+ key: "amllVerticalSpringDamping",
+ type: "slider",
+ binding: { store: "settings", path: "lyric.amllVerticalSpringDamping" },
+ min: 0,
+ max: 40,
+ step: 0.5,
+ defaultValue: 15,
+ marks: { 0: "0", 15: "15", 40: "40" },
+ },
+ {
+ key: "amllVerticalSpringStiffness",
+ type: "slider",
+ binding: { store: "settings", path: "lyric.amllVerticalSpringStiffness" },
+ min: 1,
+ max: 300,
+ step: 1,
+ defaultValue: 100,
+ marks: { 1: "1", 100: "100", 300: "300" },
+ },
+ {
+ key: "amllVerticalSpringSoft",
+ type: "switch",
+ binding: { store: "settings", path: "lyric.amllVerticalSpringSoft" },
+ defaultValue: false,
+ },
+ ],
+ },
+ {
+ key: "amllScaleSpringHeader",
+ type: "title",
+ children: [
+ {
+ key: "amllScaleSpringMass",
+ type: "slider",
+ binding: { store: "settings", path: "lyric.amllScaleSpringMass" },
+ min: 0.1,
+ max: 5,
+ step: 0.1,
+ defaultValue: 1,
+ marks: { 0.1: "0.1", 1: "1", 5: "5" },
+ },
+ {
+ key: "amllScaleSpringDamping",
+ type: "slider",
+ binding: { store: "settings", path: "lyric.amllScaleSpringDamping" },
+ min: 0,
+ max: 40,
+ step: 0.5,
+ defaultValue: 20,
+ marks: { 0: "0", 20: "20", 40: "40" },
+ },
+ {
+ key: "amllScaleSpringStiffness",
+ type: "slider",
+ binding: { store: "settings", path: "lyric.amllScaleSpringStiffness" },
+ min: 1,
+ max: 300,
+ step: 1,
+ defaultValue: 100,
+ marks: { 1: "1", 100: "100", 300: "300" },
+ },
+ {
+ key: "amllScaleSpringSoft",
+ type: "switch",
+ binding: { store: "settings", path: "lyric.amllScaleSpringSoft" },
+ defaultValue: false,
+ },
+ ],
+ },
+ ],
+ },
+ ],
+ },
+ ],
+};
+
+export default fullScreenLyricCategory;
diff --git a/src/settings/categories/lyric.ts b/src/settings/categories/lyric.ts
index 1148095..34dbaac 100644
--- a/src/settings/categories/lyric.ts
+++ b/src/settings/categories/lyric.ts
@@ -106,172 +106,6 @@ const lyricCategory: SettingCategory = {
},
],
},
- {
- id: "lyricGeneral",
- items: [
- {
- key: "adaptiveFontSize",
- type: "switch",
- binding: { store: "settings", path: "lyric.adaptiveFontSize" },
- defaultValue: true,
- },
- {
- key: "fontSize",
- type: "slider",
- binding: { store: "settings", path: "lyric.fontSize" },
- min: 30,
- max: 64,
- step: 1,
- defaultValue: 48,
- marks: { 30: "30", 48: "48", 64: "64" },
- },
- {
- key: "fontWeight",
- type: "slider",
- binding: { store: "settings", path: "lyric.fontWeight" },
- min: 100,
- max: 900,
- step: 100,
- defaultValue: 700,
- marks: { 100: "100", 400: "400", 700: "700", 900: "900" },
- },
- {
- key: "showTranslation",
- type: "switch",
- binding: { store: "settings", path: "lyric.showTranslation" },
- defaultValue: true,
- },
- {
- key: "showRomanization",
- type: "switch",
- binding: { store: "settings", path: "lyric.showRomanization" },
- defaultValue: true,
- },
- ],
- },
- {
- id: "lyricDisplay",
- items: [
- {
- key: "enableWordHighlight",
- type: "switch",
- binding: { store: "settings", path: "lyric.enableWordHighlight" },
- defaultValue: true,
- },
- {
- key: "enableFloatAnimation",
- type: "switch",
- binding: { store: "settings", path: "lyric.enableFloatAnimation" },
- defaultValue: false,
- },
- {
- key: "enableEmphasizeEffect",
- type: "switch",
- binding: { store: "settings", path: "lyric.enableEmphasizeEffect" },
- defaultValue: false,
- },
- {
- key: "enableBlur",
- type: "switch",
- binding: { store: "settings", path: "lyric.enableBlur" },
- defaultValue: false,
- },
- {
- key: "hidePassedLines",
- type: "switch",
- binding: { store: "settings", path: "lyric.hidePassedLines" },
- defaultValue: false,
- },
- ],
- },
- {
- id: "lyricSpring",
- items: [
- {
- key: "springPreset",
- type: "select",
- binding: { store: "settings", path: "lyric.springPreset" },
- options: [
- { value: "default", labelKey: "settings.springPreset.default" },
- { value: "smooth", labelKey: "settings.springPreset.smooth" },
- { value: "responsive", labelKey: "settings.springPreset.responsive" },
- { value: "jello", labelKey: "settings.springPreset.jello" },
- { value: "heavy", labelKey: "settings.springPreset.heavy" },
- { value: "noBounce", labelKey: "settings.springPreset.noBounce" },
- { value: "custom", labelKey: "settings.springPreset.custom" },
- ],
- defaultValue: "default",
- childrenCondition: () => useSettingsStore().lyric.springPreset === "custom",
- children: [
- {
- key: "springMass",
- type: "slider",
- binding: { store: "settings", path: "lyric.springMass" },
- min: 0.1,
- max: 5,
- step: 0.1,
- defaultValue: 0.9,
- marks: { 0.1: "0.1", 0.9: "0.9", 5: "5" },
- },
- {
- key: "springDamping",
- type: "slider",
- binding: { store: "settings", path: "lyric.springDamping" },
- min: 1,
- max: 50,
- step: 0.5,
- defaultValue: 15,
- marks: { 1: "1", 15: "15", 50: "50" },
- },
- {
- key: "springStiffness",
- type: "slider",
- binding: { store: "settings", path: "lyric.springStiffness" },
- min: 10,
- max: 300,
- step: 5,
- defaultValue: 90,
- marks: { 10: "10", 90: "90", 300: "300" },
- },
- ],
- },
- ],
- },
- {
- id: "lyricLayout",
- items: [
- {
- key: "alignPosition",
- type: "slider",
- binding: { store: "settings", path: "lyric.alignPosition" },
- min: 0.1,
- max: 0.9,
- step: 0.05,
- defaultValue: 0.35,
- marks: { 0.1: "0.1", 0.35: "0.35", 0.9: "0.9" },
- },
- {
- key: "wordFadeWidth",
- type: "slider",
- binding: { store: "settings", path: "lyric.wordFadeWidth" },
- min: 0.1,
- max: 1,
- step: 0.1,
- defaultValue: 0.5,
- marks: { 0.1: "0.1", 0.5: "0.5", 1: "1" },
- },
- {
- key: "inactiveAlpha",
- type: "slider",
- binding: { store: "settings", path: "lyric.inactiveAlpha" },
- min: 0,
- max: 1,
- step: 0.05,
- defaultValue: 0.2,
- marks: { 0: "0", 0.2: "0.2", 1: "1" },
- },
- ],
- },
],
};
diff --git a/src/settings/schema.ts b/src/settings/schema.ts
index 5ba42e4..b4a416c 100644
--- a/src/settings/schema.ts
+++ b/src/settings/schema.ts
@@ -3,6 +3,7 @@ import generalCategory from "./categories/general";
import appearanceCategory from "./categories/appearance";
import playerCategory from "./categories/player";
import lyricCategory from "./categories/lyric";
+import fullScreenLyricCategory from "./categories/fullScreenLyric";
import externalLyricCategory from "./categories/externalLyric";
import hotkeysCategory from "./categories/hotkeys";
import servicesCategory from "./categories/services";
@@ -18,6 +19,7 @@ export const settingsSchema: SettingCategory[] = [
appearanceCategory,
playerCategory,
lyricCategory,
+ fullScreenLyricCategory,
externalLyricCategory,
hotkeysCategory,
servicesCategory,
diff --git a/src/stores/media.ts b/src/stores/media.ts
index 3419739..edadbd0 100644
--- a/src/stores/media.ts
+++ b/src/stores/media.ts
@@ -4,7 +4,7 @@ import { findLyricIndex } from "@shared/utils/lyric";
import { useSettingsStore } from "@/stores/settings";
import { watchLyricPreference } from "@/services/lyricLoader";
import { parseLyric } from "@/utils/lyric/parse";
-import { extractLyricAuthor } from "@/utils/lyric/author";
+import { extractLyricAuthor, extractLyricAuthors } from "@/utils/lyric/author";
import { applyLyricExclude } from "@/utils/lyric/lyricStripper";
import { normalizeLyricLines } from "@/utils/lyric/normalize";
@@ -38,6 +38,9 @@ export const useMediaStore = defineStore("media", () => {
/** 当前歌词文件制作者 */
const lyricAuthor = ref(null);
+ /** 当前歌词文件制作者列表 */
+ const lyricAuthors = ref([]);
+
/** 同步当前歌词源到主进程 */
const syncToMain = (): void => {
try {
@@ -86,6 +89,7 @@ export const useMediaStore = defineStore("media", () => {
lyricContent.value = null;
parsedLyric.value = [];
lyricAuthor.value = null;
+ lyricAuthors.value = [];
lyricIndex.value = -1;
lyricLoading.value = true;
syncToMain();
@@ -115,6 +119,8 @@ export const useMediaStore = defineStore("media", () => {
parsedLyric.value = nextLines;
lyricAuthor.value =
hasContent && source && input ? extractLyricAuthor(input.content, source.format) : null;
+ lyricAuthors.value =
+ hasContent && source && input ? extractLyricAuthors(input.content, source.format) : [];
lyricIndex.value = -1;
lyricLoading.value = false;
syncToMain();
@@ -136,6 +142,7 @@ export const useMediaStore = defineStore("media", () => {
lyricContent.value = null;
parsedLyric.value = [];
lyricAuthor.value = null;
+ lyricAuthors.value = [];
lyricLoading.value = false;
lyricIndex.value = -1;
syncToMain();
@@ -149,6 +156,7 @@ export const useMediaStore = defineStore("media", () => {
lyricFormat,
parsedLyric,
lyricAuthor,
+ lyricAuthors,
lyricLoading,
lyricIndex,
setTrack,
diff --git a/src/stores/settings.ts b/src/stores/settings.ts
index 93b01fb..8de9de2 100644
--- a/src/stores/settings.ts
+++ b/src/stores/settings.ts
@@ -73,6 +73,8 @@ export const useSettingsStore = defineStore(
fontFamily: "",
showTranslation: true,
showRomanization: true,
+ amllShowLineRomanization: true,
+ amllShowWordRomanization: true,
enableWordHighlight: true,
enableFloatAnimation: false,
enableEmphasizeEffect: false,
@@ -88,6 +90,16 @@ export const useSettingsStore = defineStore(
enableExcludeLyrics: true,
excludeLyricsUserKeywords: [],
excludeLyricsUserRegexes: [],
+ engine: "physics",
+ useAMSpring: true,
+ amllVerticalSpringMass: 1,
+ amllVerticalSpringDamping: 15,
+ amllVerticalSpringStiffness: 100,
+ amllVerticalSpringSoft: false,
+ amllScaleSpringMass: 1,
+ amllScaleSpringDamping: 20,
+ amllScaleSpringStiffness: 100,
+ amllScaleSpringSoft: false,
});
/** 系统配置 - 传递主进程 */
diff --git a/src/types/settings-schema.ts b/src/types/settings-schema.ts
index 1099e77..c3d3f57 100644
--- a/src/types/settings-schema.ts
+++ b/src/types/settings-schema.ts
@@ -8,7 +8,8 @@ export type SettingWidgetType =
| "color"
| "button"
| "custom"
- | "number";
+ | "number"
+ | "title";
/** 选择项 */
export interface SettingOption {
@@ -51,6 +52,8 @@ export interface SettingItem {
hideDescription?: boolean;
/** 条件禁用 */
disabled?: () => boolean;
+ /** 条件隐藏 */
+ visible?: () => boolean;
/** button 类型的点击回调 */
action?: () => void;
/** custom 类型的组件 */
@@ -65,6 +68,8 @@ export interface SettingItem {
childrenCondition?: () => boolean;
/** 是否完全隐藏子项 */
hideChildren?: boolean;
+ /** 是否对子项进行左侧边线和缩进（默认 true） */
+ indentChildren?: boolean;
/** 标题旁的徽标 */
tag?: SettingTag;
}
diff --git a/src/types/settings.ts b/src/types/settings.ts
index aedc492..c86dd3b 100644
--- a/src/types/settings.ts
+++ b/src/types/settings.ts
@@ -5,7 +5,7 @@ import { ALL_PLATFORMS } from "@shared/types/platform";
import type { QualityLevel } from "@/utils/quality";
/** 播放器背景类型 */
-export type PlayerBgType = "blur" | "solid";
+export type PlayerBgType = "blur" | "solid" | "animation";
export type CoverLayout = "default" | "fullscreen";
/**
@@ -79,6 +79,10 @@ export interface LyricSettings {
showTranslation: boolean;
/** 是否显示音译歌词 */
showRomanization: boolean;
+ /** AMLL 是否显示逐行音译 */
+ amllShowLineRomanization: boolean;
+ /** AMLL 是否显示逐词音译 */
+ amllShowWordRomanization: boolean;
/** 逐字高亮效果 */
enableWordHighlight: boolean;
/** 逐字上浮动画 */
@@ -109,6 +113,20 @@ export interface LyricSettings {
excludeLyricsUserKeywords: string[];
/** 用户自定义正则 */
excludeLyricsUserRegexes: string[];
+ /** 歌词引擎类型 */
+ engine: "physics" | "amll";
+ /** AM 歌词是否启用物理回弹与缩放 */
+ useAMSpring: boolean;
+ /** AMLL 垂直位移弹簧参数 */
+ amllVerticalSpringMass: number;
+ amllVerticalSpringDamping: number;
+ amllVerticalSpringStiffness: number;
+ amllVerticalSpringSoft: boolean;
+ /** AMLL 缩放弹簧参数 */
+ amllScaleSpringMass: number;
+ amllScaleSpringDamping: number;
+ amllScaleSpringStiffness: number;
+ amllScaleSpringSoft: boolean;
}
/** 播放器设置 */
diff --git a/src/utils/lyric/author.ts b/src/utils/lyric/author.ts
index d3cd4e5..a2b54e0 100644
--- a/src/utils/lyric/author.ts
+++ b/src/utils/lyric/author.ts
@@ -1,19 +1,43 @@
import type { LyricFormat } from "@shared/types/lyrics";
/**
- * 从歌词原始内容中提取「歌词文件制作者」
+ * 从歌词原始内容中提取「歌词文件制作者」列表
* @param content - 歌词原始文本
* @param format - 歌词格式
+ * @returns 作者账号/名称的数组
*/
-export const extractLyricAuthor = (content: string, format: LyricFormat): string | null => {
+export const extractLyricAuthors = (content: string, format: LyricFormat): string[] => {
if (format === "ttml") {
- // 优先 GitHub 登录名
- const login = content.match(/key="ttmlAuthorGithubLogin"\s+value="([^"]*)"/)?.[1];
- const base = content.match(/key="ttmlAuthorGithub"\s+value="([^"]*)"/)?.[1];
- return (login || base || "").trim() || null;
+ // 优先提取 ttmlAuthorGithubLogin，作为可以直接用于跳转 GitHub 的账号
+ const logins = [...content.matchAll(/key="ttmlAuthorGithubLogin"\s+value="([^"]*)"/g)]
+ .map((m) => m[1].trim())
+ .filter(Boolean);
+ if (logins.length > 0) {
+ return Array.from(new Set(logins));
+ }
+ // 如果无 login 标识，从 ttmlAuthorGithub 主页链接中截取最后的用户名
+ const bases = [...content.matchAll(/key="ttmlAuthorGithub"\s+value="([^"]*)"/g)]
+ .map((m) => {
+ const val = m[1].trim();
+ const parts = val.split("/");
+ return parts[parts.length - 1] || val;
+ })
+ .filter(Boolean);
+ return Array.from(new Set(bases));
}
if (format === "lrc") {
- return content.match(/\[by:([^\]]+)\]/i)?.[1]?.trim() || null;
+ const match = content.match(/\[by:([^\]]+)\]/i)?.[1]?.trim();
+ return match ? [match] : [];
}
- return null;
+ return [];
+};
+
+/**
+ * 从歌词原始内容中提取首个「歌词文件制作者」
+ * @param content - 歌词原始文本
+ * @param format - 歌词格式
+ * @returns 首个作者名称或 null
+ */
+export const extractLyricAuthor = (content: string, format: LyricFormat): string | null => {
+ return extractLyricAuthors(content, format)[0] || null;
};
diff --git a/src/utils/lyric/parse.ts b/src/utils/lyric/parse.ts
index 98d7b1b..8cf868d 100644
--- a/src/utils/lyric/parse.ts
+++ b/src/utils/lyric/parse.ts
@@ -4,7 +4,11 @@ import { parseLRC } from "./parseLRC";
import { parseQRC } from "./parseQRC";
import { parseYRC } from "./parseYRC";
import { parseKRC } from "./parseKRC";
-import { parseTTML } from "./parseTTML";
+import { parseTTML, cleanTTMLTranslations } from "./parseTTML";
+import {
+ parseTTML as parseAMLLTtml,
+ parseYrc as parseAMLLYrc,
+} from "@applemusic-like-lyrics/lyric";
import { parseLyS } from "./parseLyS";
import { parseSRT } from "./parseSRT";
import { parseASS } from "./parseASS";
@@ -70,14 +74,26 @@ export const detectFormat = (text: string): LyricFormat => {
*/
const parseContent = (text: string, format: LyricFormat, preferredLang = ""): LyricLine[] => {
switch (format) {
- case "ttml":
- return parseTTML(text, preferredLang);
+ case "ttml": {
+ const cleaned = cleanTTMLTranslations(text, preferredLang);
+ try {
+ return parseAMLLTtml(cleaned).lines || [];
+ } catch (err) {
+ console.error("AMLL TTML parse failed, fallback to local parseTTML:", err);
+ return parseTTML(text, preferredLang);
+ }
+ }
case "qrc":
return parseQRC(text);
case "krc":
return parseKRC(text);
case "yrc":
- return parseYRC(text);
+ try {
+ return parseAMLLYrc(text) || [];
+ } catch (err) {
+ console.error("AMLL YRC parse failed, fallback to local parseYRC:", err);
+ return parseYRC(text);
+ }
case "lrc":
return parseLRC(text);
case "lys":
diff --git a/src/utils/lyric/parseTTML.ts b/src/utils/lyric/parseTTML.ts
index 2fd625f..f84b991 100644
--- a/src/utils/lyric/parseTTML.ts
+++ b/src/utils/lyric/parseTTML.ts
@@ -424,3 +424,79 @@ export const parseTTML = (text: string, preferredLang = ""): LyricLine[] => {
return lines;
};
+
+/**
+ * 清洗 TTML 中不需要的翻译，过滤非首选语言节点，避免上游解析器混淆
+ * @param ttmlContent 原始 TTML 内容
+ * @param preferredLang 偏好的语言（如 zh-CN）
+ * @returns 清洗后的 TTML 内容
+ */
+export const cleanTTMLTranslations = (ttmlContent: string, preferredLang = ""): string => {
+ /**
+ * 统计 TTML 中的语言
+ */
+ const langCounter = (ttml_text: string) => {
+ const langRegex = /(?<=<(span|translation)[^<>]+)xml:lang="([^"]+)"/g;
+ const matches = ttml_text.matchAll(langRegex);
+ const langSet = new Set();
+ for (const match of matches) {
+ if (match[2]) langSet.add(match[2]);
+ }
+ return Array.from(langSet);
+ };
+
+ /**
+ * 过滤语言并选择最佳匹配
+ */
+ const langFilter = (langs: string[]): string | null => {
+ if (langs.length <= 1) return null;
+
+ const langMatcher = (target: string) => {
+ return langs.find((lang) => {
+ try {
+ return new Intl.Locale(lang).maximize().script === target;
+ } catch {
+ return false;
+ }
+ });
+ };
+
+ // 优先匹配用户的偏好语言
+ if (preferredLang) {
+ const preferred = preferredLang.toLowerCase().replace(/_/g, "-");
+ const matched = langs.find((lang) => lang.toLowerCase().replace(/_/g, "-") === preferred);
+ if (matched) return matched;
+
+ const prefBase = preferred.split("-")[0];
+ const matchedBase = langs.find(
+ (lang) => lang.toLowerCase().replace(/_/g, "-").split("-")[0] === prefBase,
+ );
+ if (matchedBase) return matchedBase;
+ }
+
+ // 备选的中文脚本匹配优先级
+ const hans_matched = langMatcher("Hans");
+ if (hans_matched) return hans_matched;
+ const hant_matched = langMatcher("Hant");
+ if (hant_matched) return hant_matched;
+ const major = langs.find((key) => key.startsWith("zh"));
+ if (major) return major;
+ return langs[0];
+ };
+
+ /**
+ * 替换清洗标签
+ */
+ const ttmlCleaner = (ttml_text: string, major_lang: string | null): string => {
+ if (major_lang === null) return ttml_text;
+ const replacer = (match: string, lang: string) => (lang === major_lang ? match : "");
+ const translationRegex = /]+xml:lang="([^"]+)"[^>]*>[\s\S]*?<\/translation>/g;
+ const spanRegex = /]+xml:lang="([^" ]+)"[^>]*>[\s\S]*?<\/span>/g;
+ return ttml_text.replace(translationRegex, replacer).replace(spanRegex, replacer);
+ };
+
+ const context_lang = langCounter(ttmlContent);
+ const major = langFilter(context_lang);
+ const cleaned_ttml = ttmlCleaner(ttmlContent, major);
+ return cleaned_ttml.replace(/\n\s*/g, "");
+};