fix: clean up lyrics implementation

This commit is contained in:
Lei Nelissen
2025-01-26 20:37:28 +01:00
parent dc9541eea7
commit 2f1b9c180d
3 changed files with 6 additions and 8 deletions

View File

@@ -63,7 +63,7 @@ function generateStyles(scheme: ColorSchemeName, highContrast: boolean) {
color: scheme === 'dark' ? '#fff' : '#000', color: scheme === 'dark' ? '#fff' : '#000',
}, },
trackBackground: { trackBackground: {
backgroundColor: scheme === 'dark' ? '#111' : '#fff', backgroundColor: scheme === 'dark' ? '#161616' : '#fff',
}, },
stackHeader: { stackHeader: {
color: scheme === 'dark' ? 'white' : 'black' color: scheme === 'dark' ? 'white' : 'black'

View File

@@ -4,7 +4,6 @@ import { GestureHandlerRootView } from 'react-native-gesture-handler';
import { Platform } from 'react-native'; import { Platform } from 'react-native';
import BackButton from '../Player/components/Backbutton'; import BackButton from '../Player/components/Backbutton';
import { ColoredBlurView } from '@/components/Colors'; import { ColoredBlurView } from '@/components/Colors';
import NowPlaying from '@/screens/Music/overlays/NowPlaying';
export default function Lyrics() { export default function Lyrics() {
return ( return (
@@ -12,7 +11,6 @@ export default function Lyrics() {
<ColoredBlurView style={{ flex: 1 }}> <ColoredBlurView style={{ flex: 1 }}>
{Platform.OS === 'android' && (<BackButton />)} {Platform.OS === 'android' && (<BackButton />)}
<LyricsRenderer /> <LyricsRenderer />
<NowPlaying inset />
</ColoredBlurView> </ColoredBlurView>
</GestureHandlerRootView> </GestureHandlerRootView>
); );

View File

@@ -11,7 +11,7 @@ import { LayoutChangeEvent } from 'react-native';
import { Defs, LinearGradient, Rect, Stop, Svg } from 'react-native-svg'; import { Defs, LinearGradient, Rect, Stop, Svg } from 'react-native-svg';
const Container = styled.TouchableOpacity` const Container = styled.TouchableOpacity`
border-radius: 8px; border-radius: 12px;
margin-top: 24px; margin-top: 24px;
margin-left: -16px; margin-left: -16px;
margin-right: -16px; margin-right: -16px;
@@ -67,10 +67,10 @@ function InnerLyricsPreview() {
onPress={handleShowLyrics} onPress={handleShowLyrics}
onLayout={handleLayoutChange} onLayout={handleLayoutChange}
> >
<Header style={defaultStyles.activeBackground}> <Header style={defaultStyles.trackBackground}>
<HeaderInnerContainer> <HeaderInnerContainer>
<LyricsIcon fill={defaultStyles.themeColor.color} /> <LyricsIcon fill={defaultStyles.textHalfOpacity.color} />
<Label style={defaultStyles.themeColor}> <Label style={defaultStyles.textHalfOpacity}>
{t('lyrics')} {t('lyrics')}
</Label> </Label>
</HeaderInnerContainer> </HeaderInnerContainer>
@@ -88,7 +88,7 @@ function InnerLyricsPreview() {
<Stop <Stop
offset="0" offset="0"
stopColor={defaultStyles.trackBackground.backgroundColor} stopColor={defaultStyles.trackBackground.backgroundColor}
stopOpacity={1} stopOpacity={0.9}
/> />
<Stop <Stop
offset="0.75" offset="0.75"