Merge pull request #717 from lovegaoshi/dev

feat: miniplayer collapse on sharemenu
lovegaoshi · Jan 10, 2025 · f12fc0b · f12fc0b
2 parents ab2e16e + 3675a17
commit f12fc0b
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 7 deletions.
diff --git a/src/components/dialogs/NoxInput.tsx b/src/components/dialogs/NoxInput.tsx
@@ -13,7 +13,7 @@ interface InputProps {
   text: string;
   setText: (text: string) => void;
   secureTextEntry?: boolean;
-  style?: TextStyle;
+  style?: TextStyle | TextStyle[];
   reactNative?: boolean;
   numberOfLines?: number;
 }

diff --git a/src/components/miniplayer/View.tsx b/src/components/miniplayer/View.tsx
@@ -19,6 +19,7 @@ import TrackInfo from './TrackInfo';
 import PlayerControls from '../player/controls/PlayerProgressControls';
 import Lrc from './Lrc';
 import ProgressBar from './ProgressBar';
+import { useNoxSetting } from '@stores/useApp';
 
 const SnapToRatio = 0.15;
 
@@ -110,7 +111,10 @@ export default () => {
     };
   });
 
-  useEffect(expand, []);
+  useEffect(() => {
+    expand();
+    useNoxSetting.setState({ collapse, expand });
+  }, []);
 
   return (
     <GestureDetector gesture={lrcVisible ? disabledGesture : scrollDragGesture}>

diff --git a/src/components/playlist/BiliSearch/BiliSearchbar.tsx b/src/components/playlist/BiliSearch/BiliSearchbar.tsx
@@ -49,6 +49,7 @@ export default ({
   const setExternalSearchText = useNoxSetting(
     state => state.setExternalSearchText,
   );
+  const miniPlayerCollapse = useNoxSetting(state => state.collapse);
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const [sharedData, setSharedData] = useState<any>(null);
   const [, setSharedMimeType] = useState<string | null>(null);
@@ -83,6 +84,7 @@ export default ({
       route: NoxRoutes.PlayerHome,
       options: { screen: NoxRoutes.Playlist },
     });
+    miniPlayerCollapse();
     return handleSearch(data);
   };
 

diff --git a/src/components/playlists/Playlists.tsx b/src/components/playlists/Playlists.tsx
@@ -185,7 +185,7 @@ export default () => {
             copy.splice(toIndex, 0, removed[0]!);
             setPlaylistIds(copy);
           }}
-          extraData={[currentPlaylist.id, currentPlayingList.id]}
+          extraData={[currentPlaylist.id, currentPlayingList.id, playerStyle]}
         />
       </View>
       <View style={styles.bottomInfo}>

diff --git a/src/components/setting/appearances/NoWeebDialog.tsx b/src/components/setting/appearances/NoWeebDialog.tsx
@@ -73,7 +73,7 @@ const NoWeebDialog = ({ visible, setVisible }: Props) => {
           <View style={styles.colorBlockSpace} />
           <Text>{t('AppearanceSettings.PrimaryColor')}</Text>
           <NoxInput
-            style={styles.marginTop}
+            style={[styles.marginTop, { color: playerStyle.colors.onSurface }]}
             autofocus={false}
             selectTextOnFocus={false}
             text={primaryColor}
@@ -93,7 +93,7 @@ const NoWeebDialog = ({ visible, setVisible }: Props) => {
           <View style={styles.colorBlockSpace} />
           <Text>{t('AppearanceSettings.SecondaryColor')}</Text>
           <NoxInput
-            style={styles.marginTop}
+            style={[styles.marginTop, { color: playerStyle.colors.onSurface }]}
             autofocus={false}
             selectTextOnFocus={false}
             text={secondaryColor}
@@ -113,7 +113,7 @@ const NoWeebDialog = ({ visible, setVisible }: Props) => {
           <View style={styles.colorBlockSpace} />
           <Text>{t('AppearanceSettings.ContrastColor')}</Text>
           <NoxInput
-            style={styles.marginTop}
+            style={[styles.marginTop, { color: playerStyle.colors.onSurface }]}
             autofocus={false}
             selectTextOnFocus={false}
             text={contrastColor}
@@ -133,7 +133,7 @@ const NoWeebDialog = ({ visible, setVisible }: Props) => {
           <View style={styles.colorBlockSpace} />
           <Text>{t('AppearanceSettings.BackgroundColor')}</Text>
           <NoxInput
-            style={styles.marginTop}
+            style={[styles.marginTop, { color: playerStyle.colors.onSurface }]}
             autofocus={false}
             selectTextOnFocus={false}
             text={backgroundColor}

diff --git a/src/components/styles/AzusaThemeRaw.ts b/src/components/styles/AzusaThemeRaw.ts
@@ -117,6 +117,7 @@ export default {
   colors: {
     background: 'rgba(255, 255, 255, 0.4)',
     karaokeOn: 'rgba(103, 80, 164, 1)',
+    karaokeOff: 'rgba(83, 79, 89, 1)',
   },
   playerControlIconContained: undefined,
   loadingIcon:

diff --git a/src/stores/useAPMUI.ts b/src/stores/useAPMUI.ts
@@ -29,6 +29,8 @@ export interface APMUIStore {
   setSongMenuVisible: (val: boolean) => void;
   songMenuSongIndexes: number[];
   setSongMenuSongIndexes: (val: number[]) => void;
+  collapse: () => void;
+  expand: () => void;
 }
 
 const store: StateCreator<APMUIStore, [], [], APMUIStore> = set => ({
@@ -66,6 +68,8 @@ const store: StateCreator<APMUIStore, [], [], APMUIStore> = set => ({
   setSongMenuVisible: val => set({ songMenuVisible: val }),
   songMenuSongIndexes: [],
   setSongMenuSongIndexes: val => set({ songMenuSongIndexes: val }),
+  collapse: () => void 0,
+  expand: () => void 0,
 });
 
 export default store;