fix: abrepeat

android/app/src/main/java/com/noxplay/noxplayer/APMWidgetModule.kt

@@ -2,10 +2,8 @@ package com.noxplay.noxplayer
 
 import android.appwidget.AppWidgetManager
 import android.content.ComponentName
-import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import android.util.Log
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod

android/build.gradle

@@ -5,7 +5,7 @@ import org.apache.tools.ant.taskdefs.condition.Os
 buildscript {
     ext {
         minSdkVersion = 24
-        compileSdkVersion = 34
+        compileSdkVersion = 35
         targetSdkVersion = 34
 
         // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.

src/components/explore/bilibili/View.tsx → src/components/explore/Bilibili.tsx

@@ -10,27 +10,24 @@ import { ActivityIndicator, Text } from 'react-native-paper';
 import { useTranslation } from 'react-i18next';
 
 import { styles } from '@components/style';
-import { BiliSongsTabCard, BiliSongsArrayTabCard } from '../SongTab';
-import { BiliSongRow } from '../SongRow';
-import { UseBiliExplore } from './useBiliExplore';
+import { BiliSongsTabCard, BiliSongsArrayTabCard } from './SongTab';
+import { BiliSongRow } from './SongRow';
+import useBiliExplore from '@stores/explore/bilibili';
 
 interface Props {
-  useBiliExplore: UseBiliExplore;
   style?: ViewStyle;
 }
-export default ({ style, useBiliExplore }: Props) => {
+export default ({ style }: Props) => {
   const { t } = useTranslation();
-  const {
-    loading,
-    refreshing,
-    onRefresh,
-    biliDynamic,
-    biliRanking,
-    biliMusicTop,
-    biliMusicHot,
-    biliMusicNew,
-    init,
-  } = useBiliExplore;
+  const loading = useBiliExplore(state => state.loading);
+  const refreshing = useBiliExplore(state => state.refreshing);
+  const onRefresh = useBiliExplore(state => state.onRefresh);
+  const biliDynamic = useBiliExplore(state => state.biliDynamic);
+  const biliRanking = useBiliExplore(state => state.biliRanking);
+  const biliMusicTop = useBiliExplore(state => state.biliMusicTop);
+  const biliMusicHot = useBiliExplore(state => state.biliMusicHot);
+  const biliMusicNew = useBiliExplore(state => state.biliMusicNew);
+  const init = useBiliExplore(state => state.init);
 
   useEffect(() => {
     init();

src/components/explore/View.tsx

@@ -2,22 +2,18 @@ import * as React from 'react';
 import { StyleSheet } from 'react-native';
 
 import { useNoxSetting } from '@stores/useApp';
-import useBiliExplore from './bilibili/useBiliExplore';
-import useYTMExplore from './ytmusic/useYTMExplore';
-import BiliExplore from './bilibili/View';
-import YTMExplore from './ytmusic/View';
+import BiliExplore from './Bilibili';
+import YTMExplore from './YTMusic';
 import SiteSelector from '../login/SiteSelector';
 import { Site } from '@enums/Network';
 import { useAPM } from '@stores/usePersistStore';
 
 const LoginComponent = ({ loginSite }: { loginSite: Site }) => {
-  const biliExplore = useBiliExplore();
-  const ytmExplore = useYTMExplore();
   switch (loginSite) {
     case Site.YTM:
-      return <YTMExplore useYTMExplore={ytmExplore} />;
+      return <YTMExplore />;
     default:
-      return <BiliExplore useBiliExplore={biliExplore} />;
+      return <BiliExplore />;
   }
 };
 

src/components/explore/ytmusic/View.tsx → src/components/explore/YTMusic.tsx

@@ -11,10 +11,10 @@ import {
 } from 'libmuse';
 
 import { styles } from '@components/style';
-import { UseYTMExplore } from './useYTMExplore';
-import { YTSongRow } from '../SongRow';
+import useYTMExplore from '@stores/explore/ytm';
+import { YTSongRow } from './SongRow';
 import { fetchYtmPlaylist } from '@utils/mediafetch/ytbPlaylist.muse';
-import { BiliSongsArrayTabCard } from '../SongTab';
+import { BiliSongsArrayTabCard } from './SongTab';
 import SongTS from '@objects/Song';
 import { Source } from '@enums/MediaFetch';
 
@@ -120,12 +120,12 @@ const YTMixedContent = ({ content, key }: ContentProps) => {
   }
 };
 
-interface Props {
-  useYTMExplore: UseYTMExplore;
-}
-export default ({ useYTMExplore }: Props) => {
+export default () => {
   const [activeMood, setActiveMood] = useState('');
-  const { moods, refreshHome, initialize, contents } = useYTMExplore;
+  const moods = useYTMExplore(state => state.moods);
+  const refreshHome = useYTMExplore(state => state.refreshHome);
+  const initialize = useYTMExplore(state => state.initialize);
+  const contents = useYTMExplore(state => state.homedata)?.results;
 
   const onClickMood = (mood: string) => {
     const newMood = mood === activeMood ? '' : mood;

src/components/login/google/YTM.tsx

@@ -151,10 +151,13 @@ const styles = StyleSheet.create({
   },
   avatarContainerStyle: {
     flexDirection: 'row',
-    paddingLeft: 20,
+    paddingLeft: 10,
     paddingVertical: 10,
+    flex: 0,
+    flexGrow: 0,
   },
   avatarUsernameStyle: {
     paddingLeft: 10,
+    flex: 1,
   },
 });

src/components/login/google/useYTMLogin.ts

@@ -1,5 +1,5 @@
 import { get_current_user } from 'libmuse';
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 
 export interface User {
   channel_id: string;

src/components/player/controls/usePlayerControls.ts

@@ -67,7 +67,7 @@ export default () => {
   });
 
   useTrackPlayerEvents([Event.PlaybackProgressUpdated], async event => {
-    const playmode = getState().playmode;
+    const { playmode } = getState();
     saveLastPlayDuration(event.position);
     const currentSongId = track?.song?.id ?? '';
     // prepare for cross fading if enabled, playback is > 50% done and crossfade preparation isnt done
@@ -137,14 +137,28 @@ export default () => {
   });
 
   useTrackPlayerEvents([Event.PlaybackState], async event => {
+    console.log('[abrepeat] active track changed', event.state);
     switch (event.state) {
       case State.Loading:
         loadingTracker.current = true;
         break;
     }
     if (event.state !== State.Ready) return;
     updateCurrentSongMetadata();
-    const song = (await TrackPlayer.getActiveTrack())?.song as NoxMedia.Song;
+    const { playmode, currentPlayingId } = getState();
+    if (!loadingTracker.current || playmode !== NoxRepeatMode.RepeatTrack) {
+      return;
+    }
+    const newABRepeat = getABRepeatRaw(currentPlayingId);
+    if (newABRepeat[0] === 0) return;
+    loadingTracker.current = false;
+    const trackDuration = (await TrackPlayer.getProgress()).duration;
+    TrackPlayer.seekTo(trackDuration * newABRepeat[0]);
+  });
+
+  useTrackPlayerEvents([Event.PlaybackActiveTrackChanged], async event => {
+    const song = event.track?.song as NoxMedia.Song;
+    console.log('[abrepeat] active track changed', song);
     const newABRepeat = getABRepeatRaw(song.id);
     logger.debug(`[SongReady] logging ABRepeat as ${newABRepeat}`);
     setABRepeat(newABRepeat);
@@ -154,6 +168,7 @@ export default () => {
     setBRepeatDuration(newABRepeat[1] * trackDuration);
     if (newABRepeat[0] === 0) return;
     TrackPlayer.seekTo(trackDuration * newABRepeat[0]);
+    console.log('[abrepeat] initialized');
   });
 
   return {

src/stores/explore/bilibili.ts

@@ -0,0 +1,47 @@
+import { create } from 'zustand';
+
+import { fetchDynamic } from '@utils/mediafetch/biliDynamic';
+import { fetchRanking } from '@utils/mediafetch/biliRanking';
+import { fetchCurrentMusicTop } from '@utils/mediafetch/biliMusicTop';
+import { fetchMusicHot } from '@utils/mediafetch/biliMusicHot';
+import { fetchMusicNew } from '@utils/mediafetch/biliMusicNew';
+import { BiliCatSongs } from '@components/explore/SongTab';
+
+interface BiliExplore {
+  biliDynamic: BiliCatSongs;
+  biliRanking: BiliCatSongs;
+  biliMusicTop: NoxMedia.Song[];
+  biliMusicHot: NoxMedia.Song[];
+  biliMusicNew: NoxMedia.Song[];
+  refreshing: boolean;
+  loading: boolean;
+  onRefresh: () => void;
+  init: () => void;
+}
+
+export default create<BiliExplore>((set, get) => ({
+  biliDynamic: {},
+  biliRanking: {},
+  biliMusicTop: [],
+  biliMusicHot: [],
+  biliMusicNew: [],
+  refreshing: false,
+  loading: true,
+  onRefresh: async () => {
+    set({ refreshing: true });
+    set({ biliDynamic: await fetchDynamic(), refreshing: false });
+  },
+  init: async () => {
+    if (!get().loading) {
+      return;
+    }
+    set({
+      loading: false,
+      biliRanking: await fetchRanking(),
+      biliDynamic: await fetchDynamic(),
+      biliMusicTop: await fetchCurrentMusicTop(),
+      biliMusicHot: await fetchMusicHot(),
+      biliMusicNew: await fetchMusicNew(),
+    });
+  },
+}));

src/stores/explore/ytm.ts

@@ -0,0 +1,37 @@
+// a store version of hook. with this, we can use explore w/ android auto
+import { get_home, Home, Mood } from 'libmuse';
+import { create } from 'zustand';
+
+interface YTMExplore {
+  homedata?: Home;
+  moods: Mood[];
+  continuation?: Home['continuation'];
+  refreshHome: (params?: string) => Promise<Home>;
+  loading: boolean;
+  initialize: () => Promise<void>;
+}
+
+export const useYTMExplore = create<YTMExplore>((set, get) => ({
+  moods: [],
+  loading: true,
+  initialize: async () => {
+    const { refreshHome, loading } = get();
+    if (!loading) {
+      return;
+    }
+    const homedata = await refreshHome();
+    set({
+      homedata,
+      moods: homedata.moods,
+      continuation: homedata.continuation,
+      loading: false,
+    });
+  },
+  refreshHome: async (params?: string) => {
+    const homedata = await get_home({ params });
+    set({ homedata, continuation: homedata.continuation });
+    return homedata;
+  },
+}));
+
+export default useYTMExplore;