From d971897c864bd32499ad55c22499ca78c3656cd5 Mon Sep 17 00:00:00 2001 From: prostarz Date: Mon, 11 Nov 2024 21:57:29 +0000 Subject: [PATCH] fix(ui): lib page enocide bg image uri --- backend/handlers/updater/index.ts | 9 +++- .../cards/continuePlaying/BackgroundImage.tsx | 2 +- src/features/settings/components/section.tsx | 21 ++++++--- .../components/tabs/general/index.tsx | 12 ++++- .../tabs/general/settings/title-bar.tsx | 45 +++++++++++++++++++ src/i18n/translations/english.json | 4 +- 6 files changed, 82 insertions(+), 11 deletions(-) create mode 100644 src/features/settings/components/tabs/general/settings/title-bar.tsx diff --git a/backend/handlers/updater/index.ts b/backend/handlers/updater/index.ts index 9964a0e..dd36d0f 100644 --- a/backend/handlers/updater/index.ts +++ b/backend/handlers/updater/index.ts @@ -1,9 +1,14 @@ -import { app } from "electron"; import electronUpdater from "electron-updater"; import { settings } from "../../utils/settings/settings"; const { autoUpdater } = electronUpdater; +autoUpdater.setFeedURL({ + provider: "github", + owner: "team-falkor", + repo: "app", +}); + class Updater { private settings = settings; private updateAvailable = false; @@ -15,7 +20,7 @@ class Updater { if (!check) return false; // Return true if update is available - if (check.updateInfo.version === app.getVersion()) return false; + if (!check?.updateInfo?.version) return false; this.updateAvailable = true; return true; diff --git a/src/features/library/components/cards/continuePlaying/BackgroundImage.tsx b/src/features/library/components/cards/continuePlaying/BackgroundImage.tsx index cddbf77..53f0124 100644 --- a/src/features/library/components/cards/continuePlaying/BackgroundImage.tsx +++ b/src/features/library/components/cards/continuePlaying/BackgroundImage.tsx @@ -8,7 +8,7 @@ const BackgroundImage: React.FC = ({ className, }) => { const isRemoteImage = /^https?:\/\//i.test(bgImage); - const realImagePath = isRemoteImage ? bgImage : `local:${bgImage}`; + const realImagePath = isRemoteImage ? bgImage : `local:${encodeURI(bgImage)}`; return (
) => { const { t } = useLanguageContext(); return ( -
- {!!title && ( -

- {t("settings.settings." + title)} -

- )} +
+
+ {!!title && ( +

+ {t("settings.settings." + title)} +

+ )} + {!!description && ( +

+ {t("settings.settings." + description)} +

+ )} +
{children}
); diff --git a/src/features/settings/components/tabs/general/index.tsx b/src/features/settings/components/tabs/general/index.tsx index 5ff9d40..3368431 100644 --- a/src/features/settings/components/tabs/general/index.tsx +++ b/src/features/settings/components/tabs/general/index.tsx @@ -6,6 +6,7 @@ import { SettingsSection } from "../../section"; import SettingTitle from "../../title"; import SettingsContainer from "../container"; import LanguageDropdown from "./settings/language"; +import TitleBarDropdown from "./settings/title-bar"; const GeneralSetting = () => { const { t } = useLanguageContext(); @@ -50,8 +51,17 @@ const GeneralSetting = () => {
+ +
+ +
+
+ -
+
diff --git a/src/features/settings/components/tabs/general/settings/title-bar.tsx b/src/features/settings/components/tabs/general/settings/title-bar.tsx new file mode 100644 index 0000000..4a32678 --- /dev/null +++ b/src/features/settings/components/tabs/general/settings/title-bar.tsx @@ -0,0 +1,45 @@ +import { SettingsTitleBarStyle } from "@/@types"; +import { Button } from "@/components/ui/button"; +import { + DropdownMenu, + DropdownMenuContent, + DropdownMenuLabel, + DropdownMenuRadioGroup, + DropdownMenuRadioItem, + DropdownMenuSeparator, + DropdownMenuTrigger, +} from "@/components/ui/dropdown-menu"; +import { useSettings } from "@/hooks"; + +const TitleBarDropdown = () => { + const { settings, updateSetting } = useSettings(); + + return ( + + + + + + Title Bar Style + + + updateSetting("titleBarStyle", value as SettingsTitleBarStyle) + } + > + Native + Icons + + Traffic Lights + + None + + + + ); +}; + +export default TitleBarDropdown; diff --git a/src/i18n/translations/english.json b/src/i18n/translations/english.json index 8a3cc11..32dca86 100644 --- a/src/i18n/translations/english.json +++ b/src/i18n/translations/english.json @@ -24,7 +24,9 @@ "check-for-plugin-updates-on-startup": "Check for plugin updates on startup", "check-for-app-updates-on-startup": "Check for app updates on startup", "update_settings": "Update Settings", - "enable_developer_console": "Enable Developer Console" + "enable_developer_console": "Enable Developer Console", + "change-title-bar-style": "Change Title Bar Style", + "change_title_bar_style_description": "Some options require a restart to take effect" } }, "view_more": "View More",