Cleanup

App.tsx

@@ -7,7 +7,7 @@ import { Navigation } from './src/Navigation';
 import { View } from 'react-native';
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import analytics from '@react-native-firebase/analytics';
-import { PointSelectModalContextProvider } from './src/components/PointSelectModalContext';
+import { PointSelectModalContextProvider } from './src/contexts/PointSelectModalContext';
 
 if (process.env.EXPO_PUBLIC_FIREBASE_ANALYTICS == "false") {
     analytics().setAnalyticsCollectionEnabled(false);

src/components/Buttons/AppInfoButton.tsx

@@ -17,8 +17,8 @@ const AppInfoButton: React.FunctionComponent<Props> = ({ navigation }) => {
             navigation.navigate('AppInfo');
             await analytics().logEvent('app_info');
         }}>
-            <Icon name="info-circle"
-                type="font-awesome-5"
+            <Icon name="gear"
+                type="font-awesome"
                 size={20}
                 color={systemBlue} />
         </HeaderButton >

src/components/Buttons/MultiplierButton.tsx

@@ -3,7 +3,7 @@ import { Text, View, StyleSheet, TouchableHighlight } from 'react-native';
 
 import { useAppSelector } from '../../../redux/hooks';
 import { systemBlue } from '../../constants';
-import { usePointSelectModalContext } from '../PointSelectModalContext';
+import { usePointSelectModalContext } from '../../contexts/PointSelectModalContext';
 
 const MultiplierButton: React.FunctionComponent = ({ }) => {
     const addendOne = useAppSelector(state => state.settings.addendOne);
@@ -22,7 +22,7 @@ const MultiplierButton: React.FunctionComponent = ({ }) => {
     return (
         <TouchableHighlight onPress={handlePress}>
             <View style={styles.button}>
-                <Text style={styles.buttonText}>{addendOne},{addendTwo}</Text>
+                <Text style={styles.buttonText}>{addendOne}, {addendTwo}</Text>
             </View>
         </TouchableHighlight>
     );

src/components/Headers/AppInfoHeader.tsx

@@ -15,7 +15,7 @@ const AppInfoHeader: React.FunctionComponent<Props> = ({ navigation }: Props) =>
     return (
         <CustomHeader navigation={navigation}
             headerLeft={<MenuButton navigation={navigation} />}
-            headerCenter={<Text style={styles.title}>Info</Text>}
+            headerCenter={<Text style={styles.title}>Settings</Text>}
         />
     );
 };

src/components/PointSelectorBottomSheet.tsx → src/components/PointSelectorModal.tsx

@@ -3,7 +3,7 @@ import { View, StyleSheet, Text } from 'react-native';
 import { useAppDispatch, useAppSelector } from '../../redux/hooks';
 import { BottomSheetBackdrop, BottomSheetBackdropProps, BottomSheetModal } from '@gorhom/bottom-sheet';
 
-import { usePointSelectModalContext } from './PointSelectModalContext';
+import { usePointSelectModalContext } from '../contexts/PointSelectModalContext';
 import { Picker } from '@react-native-picker/picker';
 import { setAddendOne, setAddendTwo, setMultiplier } from '../../redux/SettingsSlice';
 
@@ -64,7 +64,7 @@ const PointSelectorBottomSheet: React.FunctionComponent<Props> = ({ }) => {
             handleIndicatorStyle={{ backgroundColor: 'white' }}
         >
             <View style={styles.modalContainer}>
-                <Text style={{ color: 'white', fontSize: 20 }}>Tap Actions</Text>
+                <Text style={{ color: 'white', fontSize: 20 }}>Point Values</Text>
 
                 <View style={{
                     flex: 1,

src/screens/GameScreen.tsx

@@ -9,10 +9,9 @@ import { useAppSelector } from '../../redux/hooks';
 import PlayerTile from '../components/PlayerTile';
 import { selectGameById } from '../../redux/GamesSlice';
 import GameBottomSheet, { bottomSheetHeight } from '../components/GameBottomSheet';
-import PointSelectorBottomSheet from '../components/PointSelectorBottomSheet';
+import PointSelectorBottomSheet from '../components/PointSelectorModal';
 import { BottomSheetModalProvider } from '@gorhom/bottom-sheet';
 
-
 interface Props {
     navigation: NativeStackNavigationProp<ParamListBase, string, undefined>;
 }