mirror of
https://github.com/Jellify-Music/App.git
synced 2026-05-06 19:39:28 -05:00
style fixes, sign out flow fixes, maestro fixes
This commit is contained in:
@@ -66,7 +66,7 @@ appId: com.jellify
|
||||
- tapOn:
|
||||
text: "About"
|
||||
- assertVisible:
|
||||
text: "Jellify"
|
||||
text: "Made with love"
|
||||
- assertVisible:
|
||||
text: "View Source"
|
||||
- assertVisible:
|
||||
|
||||
@@ -124,9 +124,7 @@ export default function AddToPlaylist({ track }: { track: BaseItemDto }): React.
|
||||
|
||||
<YStack gap={'$2'} margin={'$2'}>
|
||||
<TextTicker {...TextTickerConfig}>
|
||||
<Text bold fontSize={'$6'}>
|
||||
{getItemName(track)}
|
||||
</Text>
|
||||
<Text bold>{getItemName(track)}</Text>
|
||||
</TextTicker>
|
||||
|
||||
<TextTicker {...TextTickerConfig}>
|
||||
|
||||
@@ -74,7 +74,7 @@ export function Text(props: TextProps): React.JSX.Element {
|
||||
return (
|
||||
<Paragraph
|
||||
fontWeight={props.bold ? '$6' : '$4'}
|
||||
fontSize='$5'
|
||||
fontSize='$4'
|
||||
lineHeight={'$1'}
|
||||
lineBreakMode='clip'
|
||||
userSelect='none'
|
||||
|
||||
@@ -32,7 +32,7 @@ export default function PlayerScreen(): React.JSX.Element {
|
||||
const { bottom } = useSafeAreaInsets()
|
||||
|
||||
return (
|
||||
<SafeAreaView style={{ flex: 1 }}>
|
||||
<SafeAreaView style={{ flex: 1 }} edges={['top']}>
|
||||
<View flex={1}>
|
||||
{nowPlaying && (
|
||||
<ZStack fullscreen>
|
||||
|
||||
@@ -47,7 +47,7 @@ export default function DeletePlaylist({
|
||||
})
|
||||
|
||||
return (
|
||||
<View margin={'$2'}>
|
||||
<View margin={'$4'}>
|
||||
<Text bold textAlign='center'>{`Delete playlist ${
|
||||
route.params.playlist.Name ?? 'Untitled Playlist'
|
||||
}?`}</Text>
|
||||
|
||||
@@ -96,6 +96,8 @@ export default function LibraryScreen({ route, navigation }: LibraryTabProps): R
|
||||
component={DeletePlaylist}
|
||||
options={{
|
||||
title: 'Delete Playlist',
|
||||
headerShown: false,
|
||||
sheetGrabberVisible: true,
|
||||
}}
|
||||
/>
|
||||
</LibraryStack.Group>
|
||||
|
||||
@@ -35,6 +35,7 @@ export default function SettingsScreen(): React.JSX.Element {
|
||||
/* https://www.reddit.com/r/reactnative/comments/1dgktbn/comment/lxd23sj/?utm_source=share&utm_medium=web3x&utm_name=web3xcss&utm_term=1&utm_content=share_button */
|
||||
presentation: 'formSheet',
|
||||
sheetAllowedDetents: 'fitToContents',
|
||||
sheetGrabberVisible: true,
|
||||
headerShown: false,
|
||||
}}
|
||||
/>
|
||||
|
||||
@@ -6,9 +6,8 @@ import Icon from '../../components/Global/components/icon'
|
||||
import { useJellifyContext } from '../../providers'
|
||||
import { useNetworkContext } from '../../providers/Network'
|
||||
import { useResetQueueContext } from '../../providers/Player/queue'
|
||||
import { useNavigation } from '@react-navigation/native'
|
||||
import { NativeStackNavigationProp } from '@react-navigation/native-stack'
|
||||
import { RootStackParamList } from '../types'
|
||||
import navigationRef from '../../../navigation'
|
||||
|
||||
export default function SignOutModal({ navigation }: SignOutModalProps): React.JSX.Element {
|
||||
const { server } = useJellifyContext()
|
||||
@@ -16,8 +15,6 @@ export default function SignOutModal({ navigation }: SignOutModalProps): React.J
|
||||
const resetQueue = useResetQueueContext()
|
||||
const { clearDownloads } = useNetworkContext()
|
||||
|
||||
const rootNavigation = useNavigation<NativeStackNavigationProp<RootStackParamList>>()
|
||||
|
||||
return (
|
||||
<YStack margin={'$6'}>
|
||||
<H5>{`Sign out of ${server?.name ?? 'Jellyfin'}?`}</H5>
|
||||
@@ -43,7 +40,7 @@ export default function SignOutModal({ navigation }: SignOutModalProps): React.J
|
||||
borderColor={'$danger'}
|
||||
onPress={() => {
|
||||
navigation.goBack()
|
||||
rootNavigation.popTo('Login')
|
||||
navigationRef.navigate('Login', { screen: 'ServerAddress' }, { pop: true })
|
||||
|
||||
clearDownloads()
|
||||
resetQueue()
|
||||
|
||||
@@ -24,10 +24,10 @@ export default function Root(): React.JSX.Element {
|
||||
|
||||
switch (type) {
|
||||
case 'Audio':
|
||||
detent = 0.25
|
||||
detent = 0.3
|
||||
break
|
||||
case 'MusicAlbum':
|
||||
detent = 0.2
|
||||
detent = 0.25
|
||||
break
|
||||
case 'Playlist':
|
||||
detent = 0.2
|
||||
|
||||
Vendored
+2
-1
@@ -15,6 +15,7 @@ import DiscoverStackParamList from './Discover/types'
|
||||
import { NavigatorScreenParams } from '@react-navigation/native'
|
||||
import TabParamList from './Tabs/types'
|
||||
import { PlayerParamList } from './Player/types'
|
||||
import LoginStackParamList from './Login/types'
|
||||
|
||||
export type BaseStackParamList = {
|
||||
Artist: {
|
||||
@@ -51,7 +52,7 @@ export type TracksProps = NativeStackScreenProps<BaseStackParamList, 'Tracks'>
|
||||
export type InstantMixProps = NativeStackScreenProps<BaseStackParamList, 'InstantMix'>
|
||||
|
||||
export type RootStackParamList = {
|
||||
Login: undefined
|
||||
Login: NavigatorScreenParams<LoginStackParamList>
|
||||
Tabs: NavigatorScreenParams<TabParamList>
|
||||
|
||||
PlayerRoot: NavigatorScreenParams<PlayerParamList>
|
||||
|
||||
Reference in New Issue
Block a user