diff --git a/android/app/src/main/java/fun/upup/musicfree/utils/UtilsModule.java b/android/app/src/main/java/fun/upup/musicfree/utils/UtilsModule.java index 45cf9aa..3fdae26 100644 --- a/android/app/src/main/java/fun/upup/musicfree/utils/UtilsModule.java +++ b/android/app/src/main/java/fun/upup/musicfree/utils/UtilsModule.java @@ -1,38 +1,33 @@ package fun.upup.musicfree.utils; -import android.widget.Toast; import android.app.Activity; +import android.widget.Toast; -import com.facebook.react.bridge.NativeModule; import com.facebook.react.bridge.ReactApplicationContext; -import com.facebook.react.bridge.ReactContext; import com.facebook.react.bridge.ReactContextBaseJavaModule; import com.facebook.react.bridge.ReactMethod; -import java.util.Map; -import java.util.HashMap; - public class UtilsModule extends ReactContextBaseJavaModule { - private static ReactApplicationContext reactContext; + private static ReactApplicationContext reactContext; - private static final String DURATION_SHORT_KEY = "SHORT"; - private static final String DURATION_LONG_KEY = "LONG"; + private static final String DURATION_SHORT_KEY = "SHORT"; + private static final String DURATION_LONG_KEY = "LONG"; - public UtilsModule(ReactApplicationContext context) { - super(context); - reactContext = context; - } + public UtilsModule(ReactApplicationContext context) { + super(context); + reactContext = context; + } - @Override - public String getName() { - return "NativeUtils"; - } + @Override + public String getName() { + return "NativeUtils"; + } - @ReactMethod - public void show(String message, int duration) { - Toast.makeText(getReactApplicationContext(), message, duration).show(); - } + @ReactMethod + public void show(String message, int duration) { + Toast.makeText(getReactApplicationContext(), message, duration).show(); + } @ReactMethod public void exitApp() { diff --git a/src/components/base/appBarWithSearch.tsx b/src/components/base/ComplexAppBar.tsx similarity index 50% rename from src/components/base/appBarWithSearch.tsx rename to src/components/base/ComplexAppBar.tsx index ba9088b..2b7ff1a 100644 --- a/src/components/base/appBarWithSearch.tsx +++ b/src/components/base/ComplexAppBar.tsx @@ -16,7 +16,7 @@ interface IComplexAppBarProps { onSearchPress?: () => void; menuOptions?: IMenuOption[]; } -export default function AppBarWithSearch(props: IComplexAppBarProps) { +export default function ComplexAppBar(props: IComplexAppBarProps) { const navigation = useNavigation(); const {title, onSearchPress, menuOptions = []} = props; const {colors} = useTheme(); @@ -38,37 +38,45 @@ export default function AppBarWithSearch(props: IComplexAppBarProps) { }} /> - - - }> - {menuOptions.map(_ => - _.show === false ? ( - <> - ) : ( - { - _?.onPress?.(); - setMenuVisible(false); - }} + {onSearchPress ? ( + + ) : ( + <> + )} + {menuOptions.length !== 0 ? ( + - ), - )} - + }> + {menuOptions.map(_ => + _.show === false ? ( + <> + ) : ( + { + _?.onPress?.(); + setMenuVisible(false); + }} + /> + ), + )} + + ) : ( + <> + )} ); } diff --git a/src/native/utils/index.ts b/src/native/utils/index.ts index 7a14725..7b7e27d 100644 --- a/src/native/utils/index.ts +++ b/src/native/utils/index.ts @@ -2,6 +2,7 @@ import {NativeModules} from 'react-native'; interface INativeUtils { exitApp: () => void; + // getRealPath: (filePath: string) => Promise; } const NativeUtils = NativeModules.NativeUtils; diff --git a/src/pages/localMusic/index.tsx b/src/pages/localMusic/index.tsx index 0575138..6bd0434 100644 --- a/src/pages/localMusic/index.tsx +++ b/src/pages/localMusic/index.tsx @@ -1,21 +1,17 @@ import React from 'react'; import {StyleSheet} from 'react-native'; import rpx from '@/utils/rpx'; -import {useNavigation, useTheme} from '@react-navigation/native'; -import {Appbar} from 'react-native-paper'; -import ThemeText from '@/components/base/themeText'; import {SafeAreaView} from 'react-native-safe-area-context'; import StatusBar from '@/components/base/statusBar'; import LocalMusicList from './localMusicList'; import MusicBar from '@/components/musicBar'; import {useEffect} from 'react'; import Download from '@/core/download'; +import ComplexAppBar from '@/components/base/ComplexAppBar'; +import DocumentPicker from 'react-native-document-picker'; +import Toast from '@/utils/toast'; export default function LocalMusic() { - const navigation = useNavigation(); - - const {colors} = useTheme(); - useEffect(() => { Download.setup(); }, []); @@ -23,22 +19,26 @@ export default function LocalMusic() { return ( - - { - navigation.goBack(); - }} - /> - - - 本地音乐 - - - + @@ -50,12 +50,4 @@ const style = StyleSheet.create({ width: rpx(750), flex: 1, }, - appbar: { - shadowColor: 'transparent', - backgroundColor: '#2b333eaa', - }, - header: { - backgroundColor: 'transparent', - shadowColor: 'transparent', - }, }); diff --git a/src/pages/sheetDetail/components/navBar.tsx b/src/pages/sheetDetail/components/navBar.tsx index ce19418..44956fc 100644 --- a/src/pages/sheetDetail/components/navBar.tsx +++ b/src/pages/sheetDetail/components/navBar.tsx @@ -1,6 +1,6 @@ import React from 'react'; import {useNavigation, useRoute} from '@react-navigation/native'; -import AppBarWithSearch from '@/components/base/appBarWithSearch'; +import ComplexAppBar from '@/components/base/ComplexAppBar'; import MusicSheet from '@/core/musicSheet'; import {ROUTE_PATH} from '@/entry/router'; import useDialog from '@/components/dialogs/useDialog'; @@ -14,7 +14,7 @@ export default function () { const {showDialog} = useDialog(); return ( - { navigation.navigate(ROUTE_PATH.SEARCH_MUSIC_LIST, {