antebudimir/feishin
1
0
Fork 0
mirror of https://github.com/antebudimir/feishin.git synced 2026-01-01 10:23:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Refactor settings store and components

Browse source
This commit is contained in:
jeffvli 2023-03-30 06:44:33 -07:00
parent 373441e4c6
commit eecbcddea3
30 changed files with 894 additions and 832 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/renderer/layouts/default-layout.tsx
View file

@ -1,15 +1,15 @@
import { lazy } from 'react';
import isElectron from 'is-electron';
import styled from 'styled-components';
import { useGeneralSettings, useSettingsStore } from '/@/renderer/store/settings.store';
import { useWindowSettings, useSettingsStore } from '/@/renderer/store/settings.store';
import { Platform, PlaybackType } from '/@/renderer/types';
import { MainContent } from '/@/renderer/layouts/default-layout/main-content';
import { PlayerBar } from '/@/renderer/layouts/default-layout/player-bar';
if (!isElectron()) {
useSettingsStore.getState().actions.setSettings({
player: {
...useSettingsStore.getState().player,
playback: {
...useSettingsStore.getState().playback,
type: PlaybackType.WEB,
},
});
@ -41,7 +41,7 @@ interface DefaultLayoutProps {
}
export const DefaultLayout = ({ shell }: DefaultLayoutProps) => {
const { windowBarStyle } = useGeneralSettings();
const { windowBarStyle } = useWindowSettings();
return (
<>

4
src/renderer/layouts/default-layout/main-content.tsx
View file

@ -10,7 +10,7 @@ import { FullScreenPlayer } from '/@/renderer/features/player/components/full-sc
import { Sidebar } from '/@/renderer/features/sidebar/components/sidebar';
import { AppRoute } from '/@/renderer/router/routes';
import { useAppStore, useAppStoreActions, useFullScreenPlayerStore } from '/@/renderer/store';
import { useGeneralSettings } from '/@/renderer/store/settings.store';
import { useWindowSettings, useGeneralSettings } from '/@/renderer/store/settings.store';
import { Platform } from '/@/renderer/types';
import { constrainSidebarWidth, constrainRightSidebarWidth } from '/@/renderer/utils';
@ -154,7 +154,7 @@ export const MainContent = ({ shell }: { shell?: boolean }) => {
const [drawer, drawerHandler] = useDisclosure(false);
const location = useLocation();
const { sideQueueType, showQueueDrawerButton } = useGeneralSettings();
const { windowBarStyle } = useGeneralSettings();
const { windowBarStyle } = useWindowSettings();
const sidebarRef = useRef<HTMLDivElement | null>(null);
const rightSidebarRef = useRef<HTMLDivElement | null>(null);

4
src/renderer/layouts/window-bar.tsx
View file

@ -3,7 +3,7 @@ import isElectron from 'is-electron';
import { RiCheckboxBlankLine, RiCloseLine, RiSubtractLine } from 'react-icons/ri';
import styled from 'styled-components';
import { useCurrentStatus, useQueueStatus } from '/@/renderer/store';
import { useGeneralSettings } from '/@/renderer/store/settings.store';
import { useWindowSettings } from '/@/renderer/store/settings.store';
import { Platform, PlayerStatus } from '/@/renderer/types';
import appIcon from '../../../assets/icon.svg';
import macCloseHover from './assets/close-mac-hover.png';
@ -212,7 +212,7 @@ const MacOsControls = ({ controls, title }: WindowBarControlsProps) => {
export const WindowBar = () => {
const playerStatus = useCurrentStatus();
const { currentSong, index, length } = useQueueStatus();
const { windowBarStyle } = useGeneralSettings();
const { windowBarStyle } = useWindowSettings();
const statusString = playerStatus === PlayerStatus.PAUSED ? '(Paused) ' : '';
const queueString = length ? `(${index + 1} / ${length}) ` : '';