From 6a4b5618aa079086d0db038c552eb2ea3a6816f6 Mon Sep 17 00:00:00 2001
From: Lei Nelissen <lei@codified.nl>
Date: Sat, 1 Jan 2022 21:55:32 +0100
Subject: [PATCH] Resolve track pop-up spacing

---
 src/components/Button.tsx                     | 10 ++++---
 src/components/Modal.tsx                      | 13 +++++-----
 src/components/Typography.ts                  |  1 +
 src/components/WrappableButtonRow.tsx         | 13 ++++++++++
 .../Music/stacks/components/TrackListView.tsx | 13 +++++-----
 src/screens/modals/TrackPopupMenu.tsx         | 26 +++++++------------
 6 files changed, 42 insertions(+), 34 deletions(-)
 create mode 100644 src/components/WrappableButtonRow.tsx

diff --git a/src/components/Button.tsx b/src/components/Button.tsx
index 0ac543c..39dd6c2 100644
--- a/src/components/Button.tsx
+++ b/src/components/Button.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useState }  from 'react';
 import { SvgProps } from 'react-native-svg';
 import { 
-    PressableProps, ViewProps, 
+    PressableProps, ViewProps, View,
 } from 'react-native';
 import { THEME_COLOR } from 'CONSTANTS';
 import styled, { css } from 'styled-components/native';
@@ -13,7 +13,6 @@ interface ButtonProps extends PressableProps {
     style?: ViewProps['style'];
 }
 
-
 const BaseButton = styled.Pressable`
     padding: 16px;
     border-radius: 8px;
@@ -32,7 +31,7 @@ const ButtonText = styled.Text<{ active?: boolean }>`
     `}
 `;
 
-export default function Button(props: ButtonProps) {
+const Button = React.forwardRef<View, ButtonProps>(function Button(props, ref) {
     const { icon: Icon, title, ...rest } = props;
     const defaultStyles = useDefaultStyles();
     const [isPressed, setPressed] = useState(false);
@@ -42,6 +41,7 @@ export default function Button(props: ButtonProps) {
     return (
         <BaseButton
             {...rest}
+            ref={ref}
             onPressIn={handlePressIn}
             onPressOut={handlePressOut}
             style={[ 
@@ -62,4 +62,6 @@ export default function Button(props: ButtonProps) {
             <ButtonText active={isPressed}>{title}</ButtonText>
         </BaseButton>
     );
-}
\ No newline at end of file
+});
+
+export default Button;
\ No newline at end of file
diff --git a/src/components/Modal.tsx b/src/components/Modal.tsx
index ef646ba..51dfcde 100644
--- a/src/components/Modal.tsx
+++ b/src/components/Modal.tsx
@@ -16,8 +16,9 @@ const Background = styled(Pressable)`
 const Container = styled(Pressable)<Pick<Props, 'fullSize'>>`
     margin: auto 20px;
     padding: 4px;
-    border-radius: 8px;
-    overflow: hidden;
+    border-radius: 12px;
+    flex: 0 0 auto;
+    background: salmon;
     
     ${props => props.fullSize && css`
         flex: 1;
@@ -35,11 +36,9 @@ const Modal: React.FC<Props> = ({ children, fullSize = true }) => {
 
     return (
         <Background style={defaultStyles.modal} onPress={closeModal}>
-            <SafeAreaView style={{ flex: 1 }}>
-                <Container style={defaultStyles.modalInner} fullSize={fullSize}>
-                    {children}
-                </Container>
-            </SafeAreaView>
+            <Container style={defaultStyles.modalInner} fullSize={fullSize}>
+                {children}
+            </Container>
         </Background>
     );
 };
diff --git a/src/components/Typography.ts b/src/components/Typography.ts
index 68f94a1..416c2e7 100644
--- a/src/components/Typography.ts
+++ b/src/components/Typography.ts
@@ -10,4 +10,5 @@ export const Header = styled(Text)`
 export const SubHeader = styled(Text)`
     font-size: 24px;
     margin: 12px 0;
+    font-weight: 500;
 `;
\ No newline at end of file
diff --git a/src/components/WrappableButtonRow.tsx b/src/components/WrappableButtonRow.tsx
new file mode 100644
index 0000000..d5d17de
--- /dev/null
+++ b/src/components/WrappableButtonRow.tsx
@@ -0,0 +1,13 @@
+import styled from 'styled-components/native';
+import Button from './Button';
+
+export const WrappableButtonRow = styled.View`
+    flex: 0 0 auto;
+    flex-direction: row;
+    flex-wrap: wrap;
+    margin: 6px -2px;
+`;
+
+export const WrappableButton = styled(Button)`
+    margin: 2px;
+`;
\ No newline at end of file
diff --git a/src/screens/Music/stacks/components/TrackListView.tsx b/src/screens/Music/stacks/components/TrackListView.tsx
index 814f97c..6b5d2ee 100644
--- a/src/screens/Music/stacks/components/TrackListView.tsx
+++ b/src/screens/Music/stacks/components/TrackListView.tsx
@@ -9,12 +9,12 @@ import { THEME_COLOR } from 'CONSTANTS';
 import TouchableHandler from 'components/TouchableHandler';
 import useCurrentTrack from 'utility/useCurrentTrack';
 import TrackPlayer from 'react-native-track-player';
-import Button from 'components/Button';
 import Play from 'assets/play.svg';
 import Shuffle from 'assets/shuffle.svg';
 import useDefaultStyles from 'components/Colors';
 import usePlayTracks from 'utility/usePlayTracks';
 import { EntityId } from '@reduxjs/toolkit';
+import { WrappableButtonRow, WrappableButton } from 'components/WrappableButtonRow';
 
 const Screen = Dimensions.get('screen');
 
@@ -26,7 +26,7 @@ const styles = StyleSheet.create({
     artist: {
         fontSize: 24,
         opacity: 0.5,
-        marginBottom: 24
+        marginBottom: 12
     },
     index: {
         width: 20,
@@ -109,10 +109,11 @@ const TrackListView: React.FC<TrackListViewProps> = ({
             <AlbumImage source={{ uri: getImage(entityId) }} style={defaultStyles.imageBackground} />
             <Text style={[ defaultStyles.text, styles.name ]} >{title}</Text>
             <Text style={[ defaultStyles.text, styles.artist ]}>{artist}</Text>
-            <Button title={playButtonText} icon={Play} onPress={playEntity} />
-            <View style={{ height: 4 }}></View>
-            <Button title={shuffleButtonText} icon={Shuffle} onPress={shuffleEntity} />
-            <View style={{ marginTop: 15 }}>
+            <WrappableButtonRow>
+                <WrappableButton title={playButtonText} icon={Play} onPress={playEntity} />
+                <WrappableButton title={shuffleButtonText} icon={Shuffle} onPress={shuffleEntity} />
+            </WrappableButtonRow>
+            <View style={{ marginTop: 8 }}>
                 {trackIds.map((trackId, i) =>
                     <TouchableHandler
                         key={trackId}
diff --git a/src/screens/modals/TrackPopupMenu.tsx b/src/screens/modals/TrackPopupMenu.tsx
index 4ab87a8..c7d87fa 100644
--- a/src/screens/modals/TrackPopupMenu.tsx
+++ b/src/screens/modals/TrackPopupMenu.tsx
@@ -7,24 +7,17 @@ import { SubHeader } from 'components/Typography';
 import styled from 'styled-components/native';
 import usePlayTrack from 'utility/usePlayTrack';
 import { t } from '@localisation';
-import Button from 'components/Button';
 import PlayIcon from 'assets/play.svg';
 import QueueAppendIcon from 'assets/queue-append.svg';
 import Text from 'components/Text';
+import { WrappableButton, WrappableButtonRow } from 'components/WrappableButtonRow';
 
 type Route = RouteProp<ModalStackParams, 'TrackPopupMenu'>;
 
 const Container = styled.View`
     padding: 20px;
-`;
-
-const Buttons = styled.View`
-    margin-top: 20px;
-`;
-
-const ButtonSpacing = styled.View`
-    width: 8px;
-    height: 4px;
+    flex: 0 0 auto;
+    flex-direction: column;
 `;
 
 function TrackPopupMenu() {
@@ -51,13 +44,12 @@ function TrackPopupMenu() {
     return (
         <Modal fullSize={false}>
             <Container>
-                <SubHeader>{track?.Name}</SubHeader>
-                <Text>{track?.Album} - {track?.AlbumArtist}</Text>
-                <Buttons>
-                    <Button title={t('play-next')} icon={PlayIcon} onPress={handlePlayNext} />
-                    <ButtonSpacing />
-                    <Button title={t('add-to-queue')} icon={QueueAppendIcon} onPress={handleAddToQueue} />
-                </Buttons>
+                <SubHeader style={{ textAlign: 'center' }}>{track?.Name}</SubHeader>
+                <Text style={{ marginBottom: 18, textAlign: 'center' }}>{track?.Album} - {track?.AlbumArtist}</Text>
+                <WrappableButtonRow>
+                    <WrappableButton title={t('play-next')} icon={PlayIcon} onPress={handlePlayNext} />
+                    <WrappableButton title={t('add-to-queue')} icon={QueueAppendIcon} onPress={handleAddToQueue} />
+                </WrappableButtonRow>
             </Container>
         </Modal>
     );