mirror of
https://github.com/austinried/subtracks.git
synced 2025-12-27 09:09:29 +01:00
* start of music store refactor moving stuff into a state cache better separate it from view logic * added paginated list/album list * reworked fetchAlbumList to remove ui state refactored home screen to use new method i broke playing songs somehow, JS thread goes into a loop * don't reset parts manually, do it all at once * fixed perf issue related to too many rerenders rerenders were caused by strict equality check on object/array picks switched artistInfo to new store updated zustand and fixed deprecation warnings * update typescript and use workspace tsc version for vscode * remove old artistInfo * switched to new playlist w/songs removed more unused stuff * remove unused + (slightly) rework search * refactor star * use only original/large imges for covers/artist fix view artist from context menu add loading indicators to song list and artist views (show info we have right away) * set starred/unstar assuming it works and correct state on error * reorg, remove old music slice files * added back fix for song cover art * sort artists by localCompare name * update licenses * fix now playing background grey bar * update react-native-gesture-handler for node-fetch security alert * fix another gradient height grey bar issue * update licenses again * remove thumbnail cache * rename to remove "Library" from methods * Revert "remove thumbnail cache" This reverts commit e0db4931f11bbf4cd8e73102d06505c6ae85f4a6. * use ids for lists, pull state later * Revert "use only original/large imges for covers/artist" This reverts commit c9aea9065ce6ebe3c8b09c10dd74d4de153d76fd. * deep equal ListItem props for now this needs a bigger refactor * use immer as middleware * refactor api client to use string method hoping to use this for requestKey/deduping next * use thumbnails in list items * Revert "refactor api client to use string method" This reverts commit 234326135b7af96cb91b941e7ca515f45c632556. * rename/cleanup * store servers by id * get rid of settings selectors * renames for clarity remove unused estimateContentLength setting * remove trackplayer selectors * fix migration for library filter settings * fixed shuffle order reporting wrong track/queue * removed the other selectors * don't actually need es6/react for our state * fix slow artist sort on star localeCompare is too slow for large lists
192 lines
6.8 KiB
TypeScript
192 lines
6.8 KiB
TypeScript
import { useFirstRun } from '@app/hooks/settings'
|
|
import BottomTabBar from '@app/navigation/BottomTabBar'
|
|
import LibraryTopTabNavigator from '@app/navigation/LibraryTopTabNavigator'
|
|
import ArtistView from '@app/screens/ArtistView'
|
|
import Home from '@app/screens/Home'
|
|
import Search from '@app/screens/Search'
|
|
import SearchResultsView from '@app/screens/SearchResultsView'
|
|
import ServerView from '@app/screens/ServerView'
|
|
import SettingsView from '@app/screens/Settings'
|
|
import SongListView from '@app/screens/SongListView'
|
|
import WebViewScreen from '@app/screens/WebViewScreen'
|
|
import colors from '@app/styles/colors'
|
|
import font from '@app/styles/font'
|
|
import { BottomTabNavigationProp, createBottomTabNavigator } from '@react-navigation/bottom-tabs'
|
|
import { RouteProp, StackActions } from '@react-navigation/native'
|
|
import React, { useEffect } from 'react'
|
|
import { StyleSheet } from 'react-native'
|
|
import { createNativeStackNavigator, NativeStackNavigationProp } from 'react-native-screens/native-stack'
|
|
|
|
type TabStackParamList = {
|
|
main: undefined
|
|
album: { id: string; title: string }
|
|
artist: { id: string; title: string }
|
|
playlist: { id: string; title: string }
|
|
results: { query: string; type: 'album' | 'song' | 'artist' }
|
|
}
|
|
|
|
type AlbumScreenNavigationProp = NativeStackNavigationProp<TabStackParamList, 'album'>
|
|
type AlbumScreenRouteProp = RouteProp<TabStackParamList, 'album'>
|
|
type AlbumScreenProps = {
|
|
route: AlbumScreenRouteProp
|
|
navigation: AlbumScreenNavigationProp
|
|
}
|
|
|
|
const AlbumScreen: React.FC<AlbumScreenProps> = ({ route }) => (
|
|
<SongListView id={route.params.id} title={route.params.title} type="album" />
|
|
)
|
|
|
|
type ArtistScreenNavigationProp = NativeStackNavigationProp<TabStackParamList, 'artist'>
|
|
type ArtistScreenRouteProp = RouteProp<TabStackParamList, 'artist'>
|
|
type ArtistScreenProps = {
|
|
route: ArtistScreenRouteProp
|
|
navigation: ArtistScreenNavigationProp
|
|
}
|
|
|
|
const ArtistScreen: React.FC<ArtistScreenProps> = ({ route }) => (
|
|
<ArtistView id={route.params.id} title={route.params.title} />
|
|
)
|
|
|
|
type PlaylistScreenNavigationProp = NativeStackNavigationProp<TabStackParamList, 'playlist'>
|
|
type PlaylistScreenRouteProp = RouteProp<TabStackParamList, 'playlist'>
|
|
type PlaylistScreenProps = {
|
|
route: PlaylistScreenRouteProp
|
|
navigation: PlaylistScreenNavigationProp
|
|
}
|
|
|
|
const PlaylistScreen: React.FC<PlaylistScreenProps> = ({ route }) => (
|
|
<SongListView id={route.params.id} title={route.params.title} type="playlist" />
|
|
)
|
|
|
|
type ResultsScreenNavigationProp = NativeStackNavigationProp<TabStackParamList, 'results'>
|
|
type ResultsScreenRouteProp = RouteProp<TabStackParamList, 'results'>
|
|
type ResultsScreenProps = {
|
|
route: ResultsScreenRouteProp
|
|
navigation: ResultsScreenNavigationProp
|
|
}
|
|
|
|
const ResultsScreen: React.FC<ResultsScreenProps> = ({ route }) => (
|
|
<SearchResultsView query={route.params.query} type={route.params.type} />
|
|
)
|
|
|
|
const styles = StyleSheet.create({
|
|
stackheaderStyle: {
|
|
backgroundColor: colors.gradient.high,
|
|
// backgroundColor: 'transparent',
|
|
},
|
|
stackheaderTitleStyle: {
|
|
fontSize: 18,
|
|
fontFamily: font.semiBold,
|
|
color: colors.text.primary,
|
|
},
|
|
})
|
|
|
|
const itemScreenOptions = {
|
|
title: '',
|
|
headerStyle: styles.stackheaderStyle,
|
|
headerHideShadow: true,
|
|
headerTintColor: 'white',
|
|
headerTitleStyle: styles.stackheaderTitleStyle,
|
|
// headerTranslucent: true,
|
|
}
|
|
|
|
function createTabStackNavigator(Component: React.ComponentType<any>) {
|
|
const Stack = createNativeStackNavigator<TabStackParamList>()
|
|
|
|
const Navigator: React.FC<{ navigation: BottomTabNavigationProp<{ a: undefined }, 'a'> }> = ({ navigation }) => {
|
|
useEffect(() => {
|
|
return navigation.addListener('tabPress', () => {
|
|
navigation.dispatch(StackActions.popToTop())
|
|
})
|
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
}, [])
|
|
|
|
return (
|
|
<Stack.Navigator initialRouteName="main">
|
|
<Stack.Screen name="main" component={Component} options={{ headerShown: false }} />
|
|
<Stack.Screen name="album" component={AlbumScreen} options={{ headerShown: false }} />
|
|
<Stack.Screen name="artist" component={ArtistScreen} options={{ headerShown: false }} />
|
|
<Stack.Screen name="playlist" component={PlaylistScreen} options={{ headerShown: false }} />
|
|
<Stack.Screen name="results" component={ResultsScreen} options={itemScreenOptions} />
|
|
</Stack.Navigator>
|
|
)
|
|
}
|
|
|
|
return Navigator
|
|
}
|
|
|
|
const HomeTab = createTabStackNavigator(Home)
|
|
const LibraryTab = createTabStackNavigator(LibraryTopTabNavigator)
|
|
const SearchTab = createTabStackNavigator(Search)
|
|
|
|
type SettingsStackParamList = {
|
|
main: undefined
|
|
server?: { id?: string }
|
|
web: { uri: string }
|
|
}
|
|
|
|
type ServerScreenNavigationProp = NativeStackNavigationProp<SettingsStackParamList, 'server'>
|
|
type ServerScreenRouteProp = RouteProp<SettingsStackParamList, 'server'>
|
|
type ServerScreenProps = {
|
|
route: ServerScreenRouteProp
|
|
navigation: ServerScreenNavigationProp
|
|
}
|
|
const ServerScreen: React.FC<ServerScreenProps> = ({ route }) => <ServerView id={route.params?.id} />
|
|
|
|
type WebScreenNavigationProp = NativeStackNavigationProp<SettingsStackParamList, 'web'>
|
|
type WebScreenRouteProp = RouteProp<SettingsStackParamList, 'web'>
|
|
type WebScreenProps = {
|
|
route: WebScreenRouteProp
|
|
navigation: WebScreenNavigationProp
|
|
}
|
|
const WebScreen: React.FC<WebScreenProps> = ({ route }) => <WebViewScreen uri={route.params.uri} />
|
|
|
|
const SettingsStack = createNativeStackNavigator()
|
|
|
|
const SettingsTab = () => {
|
|
return (
|
|
<SettingsStack.Navigator initialRouteName="main">
|
|
<SettingsStack.Screen name="main" component={SettingsView} options={{ headerShown: false }} />
|
|
<SettingsStack.Screen
|
|
name="server"
|
|
component={ServerScreen}
|
|
options={{
|
|
title: 'Edit Server',
|
|
headerStyle: styles.stackheaderStyle,
|
|
headerHideShadow: true,
|
|
headerTintColor: 'white',
|
|
headerTitleStyle: styles.stackheaderTitleStyle,
|
|
}}
|
|
/>
|
|
<SettingsStack.Screen
|
|
name="web"
|
|
component={WebScreen}
|
|
options={{
|
|
title: 'Web View',
|
|
headerStyle: styles.stackheaderStyle,
|
|
headerHideShadow: true,
|
|
headerTintColor: 'white',
|
|
headerTitleStyle: styles.stackheaderTitleStyle,
|
|
}}
|
|
/>
|
|
</SettingsStack.Navigator>
|
|
)
|
|
}
|
|
|
|
const Tab = createBottomTabNavigator()
|
|
|
|
const BottomTabNavigator = () => {
|
|
const firstRun = useFirstRun()
|
|
|
|
return (
|
|
<Tab.Navigator tabBar={BottomTabBar} initialRouteName={firstRun ? 'settings' : 'home'}>
|
|
<Tab.Screen name="home" component={HomeTab} options={{ tabBarLabel: 'Home' }} />
|
|
<Tab.Screen name="library" component={LibraryTab} options={{ tabBarLabel: 'Library' }} />
|
|
<Tab.Screen name="search" component={SearchTab} options={{ tabBarLabel: 'Search' }} />
|
|
<Tab.Screen name="settings" component={SettingsTab} options={{ tabBarLabel: 'Settings' }} />
|
|
</Tab.Navigator>
|
|
)
|
|
}
|
|
|
|
export default BottomTabNavigator
|