From 6921979ea24a2edcb26cfa32ca8cf91aed2e4812 Mon Sep 17 00:00:00 2001
From: Justin Wyne <1986068+wyne@users.noreply.github.com>
Date: Thu, 16 Nov 2023 23:26:42 -0800
Subject: [PATCH] Cleanup

---
 App.tsx                                                       | 2 +-
 src/components/Buttons/AppInfoButton.tsx                      | 4 ++--
 src/components/Buttons/MultiplierButton.tsx                   | 4 ++--
 src/components/Headers/AppInfoHeader.tsx                      | 2 +-
 .../{PointSelectorBottomSheet.tsx => PointSelectorModal.tsx}  | 4 ++--
 src/{components => contexts}/PointSelectModalContext.tsx      | 0
 src/screens/GameScreen.tsx                                    | 3 +--
 7 files changed, 9 insertions(+), 10 deletions(-)
 rename src/components/{PointSelectorBottomSheet.tsx => PointSelectorModal.tsx} (96%)
 rename src/{components => contexts}/PointSelectModalContext.tsx (100%)

diff --git a/App.tsx b/App.tsx
index 9639718a..e66d4d33 100644
--- a/App.tsx
+++ b/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);
diff --git a/src/components/Buttons/AppInfoButton.tsx b/src/components/Buttons/AppInfoButton.tsx
index e3e1a539..3be3c503 100644
--- a/src/components/Buttons/AppInfoButton.tsx
+++ b/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 >
diff --git a/src/components/Buttons/MultiplierButton.tsx b/src/components/Buttons/MultiplierButton.tsx
index 43a3c1b9..ad72dca9 100644
--- a/src/components/Buttons/MultiplierButton.tsx
+++ b/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>
     );
diff --git a/src/components/Headers/AppInfoHeader.tsx b/src/components/Headers/AppInfoHeader.tsx
index fc808b21..22077e1c 100644
--- a/src/components/Headers/AppInfoHeader.tsx
+++ b/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>}
         />
     );
 };
diff --git a/src/components/PointSelectorBottomSheet.tsx b/src/components/PointSelectorModal.tsx
similarity index 96%
rename from src/components/PointSelectorBottomSheet.tsx
rename to src/components/PointSelectorModal.tsx
index fafbf084..0c40f475 100644
--- a/src/components/PointSelectorBottomSheet.tsx
+++ b/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,
diff --git a/src/components/PointSelectModalContext.tsx b/src/contexts/PointSelectModalContext.tsx
similarity index 100%
rename from src/components/PointSelectModalContext.tsx
rename to src/contexts/PointSelectModalContext.tsx
diff --git a/src/screens/GameScreen.tsx b/src/screens/GameScreen.tsx
index 6bb019f0..f3ffb49f 100644
--- a/src/screens/GameScreen.tsx
+++ b/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>;
 }