Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Particle settings #328

Merged
merged 3 commits into from
Nov 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,026 changes: 657 additions & 369 deletions package-lock.json

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,11 @@
"expo-system-ui": "~2.4.0",
"expo-updates": "~0.18.12",
"firebase": "^9.17.1",
"jest": "^29.2.1",
"jest-expo": "^48.0.2",
"moment": "^2.29.4",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-moment": "^1.1.3",
"react-native": "0.72.4",
"react-native": "0.72.5",
"react-native-animated-pagination-dots": "^0.1.73",
"react-native-elements": "^3.4.2",
"react-native-gesture-handler": "~2.12.0",
Expand Down Expand Up @@ -87,6 +85,7 @@
"eslint-plugin-prettier": "^5.0.0",
"gh-pages": "^4.0.0",
"jest": "^29.5.0",
"jest-expo": "^48.0.2",
"prettier": "^3.0.1",
"react-test-renderer": "^18.2.0",
"redux-mock-store": "^1.5.4"
Expand Down
6 changes: 6 additions & 0 deletions redux/SettingsSlice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ export interface SettingsState {
multiplier: number;
currentGameId: string | undefined;
onboarded: string | undefined;
showPointParticles: boolean;
};

const initialState: SettingsState = {
home_fullscreen: false,
multiplier: 1,
currentGameId: undefined,
onboarded: undefined,
showPointParticles: false,
};

const settingsSlice = createSlice({
Expand All @@ -26,6 +28,9 @@ const settingsSlice = createSlice({
toggleHomeFullscreen(state) {
state.home_fullscreen = !state.home_fullscreen;
},
toggleshowPointParticles(state) {
state.showPointParticles = !state.showPointParticles;
},
setMultiplier(state, action: PayloadAction<number>) {
state.multiplier = action.payload;
},
Expand All @@ -42,6 +47,7 @@ export const {
toggleHomeFullscreen,
setMultiplier,
setOnboardedVersion,
toggleshowPointParticles,
} = settingsSlice.actions;

export default settingsSlice.reducer;
8 changes: 7 additions & 1 deletion redux/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ const settingsPersistConfig = {
key: 'settings',
version: 0,
storage: AsyncStorage,
whitelist: ['home_fullscreen', 'multiplier', 'currentGameId', 'onboarded'],
whitelist: [
'home_fullscreen',
'multiplier',
'currentGameId',
'onboarded',
'showPointParticles'
],
};

const gamesPersistConfig = {
Expand Down
2 changes: 1 addition & 1 deletion src/Navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const Navigation = () => {

let onboarded = true;

if (onboardedSemVer == null || onboardedSemVer?.compare(new SemVer(appVersion)) == -1) {
if (onboardedSemVer == null || onboardedSemVer?.compare(new SemVer('2.2.2')) == -1) {
onboarded = false;
}

Expand Down
5 changes: 2 additions & 3 deletions src/components/Buttons/FullscreenButton.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import React from 'react';
import { useDispatch } from 'react-redux';
import analytics from '@react-native-firebase/analytics';

import { useAppSelector } from '../../../redux/hooks';
import { useAppDispatch, useAppSelector } from '../../../redux/hooks';
import HeaderButton from './HeaderButton';
import { Icon } from 'react-native-elements/dist/icons/Icon';
import { systemBlue } from '../../constants';
import { toggleHomeFullscreen } from '../../../redux/SettingsSlice';

const FullscreenButton: React.FunctionComponent = ({ }) => {
const dispatch = useDispatch();
const dispatch = useAppDispatch();
const fullscreen = useAppSelector(state => state.settings.home_fullscreen);

const expandHandler = async () => {
Expand Down
5 changes: 2 additions & 3 deletions src/components/EditPlayer.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import React from 'react';
import { Text, View, StyleSheet, TouchableOpacity, NativeSyntheticEvent, TextInputEndEditingEventData } from 'react-native';
import { useDispatch } from 'react-redux';
import { Icon, Input } from 'react-native-elements';

import { palette, systemBlue } from '../constants';
import { selectGameById, updateGame } from '../../redux/GamesSlice';
import { selectPlayerById } from '../../redux/PlayersSlice';
import { removePlayer, updatePlayer } from '../../redux/PlayersSlice';
import analytics from '@react-native-firebase/analytics';
import { useAppSelector } from '../../redux/hooks';
import { useAppDispatch, useAppSelector } from '../../redux/hooks';

interface Props {
playerId: string;
Expand All @@ -18,7 +17,7 @@ interface Props {
}

const EditPlayer: React.FunctionComponent<Props> = ({ playerId, index, setPlayerWasAdded, playerWasAdded }) => {
const dispatch = useDispatch();
const dispatch = useAppDispatch();
const currentGame = useAppSelector(state => selectGameById(state, state.settings.currentGameId));
const player = useAppSelector(state => selectPlayerById(state, playerId));

Expand Down
12 changes: 8 additions & 4 deletions src/components/PlayerTiles/AdditionTile/TouchSurface.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ import React from 'react';
import { StyleSheet, TouchableHighlight, View } from 'react-native';
import { ScoreParticle } from './ScoreParticle';
import { useState } from 'react';
import { useDispatch } from 'react-redux';
import { playerRoundScoreIncrement } from '../../../../redux/PlayersSlice';
import { useAppSelector } from '../../../../redux/hooks';
import { useAppDispatch, useAppSelector } from '../../../../redux/hooks';
import { selectGameById } from '../../../../redux/GamesSlice';
import * as Haptics from 'expo-haptics';
import analytics from '@react-native-firebase/analytics';
Expand All @@ -23,7 +22,10 @@ type Props = {

export const TouchSurface: React.FunctionComponent<Props> = (
{ playerIndex, fontColor, playerId, scoreType }: Props) => {
const dispatch = useDispatch();

const showPointParticles = useAppSelector(state => state.settings.showPointParticles);
const dispatch = useAppDispatch();

const [particles, setParticles] = useState<ScoreParticleProps[]>([]);

const multiplier = useAppSelector(state => state.settings.multiplier);
Expand All @@ -44,7 +46,9 @@ export const TouchSurface: React.FunctionComponent<Props> = (
};

const scoreChangeHandler = () => {
addParticle();
if (showPointParticles) {
addParticle();
}
Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
analytics().logEvent('score_change', {
player_index: playerIndex,
Expand Down
24 changes: 23 additions & 1 deletion src/screens/AppInfoScreen.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import React from 'react';
import { Text, View, StyleSheet, Alert, ScrollView } from 'react-native';
import { Platform } from 'react-native';
import { Platform, Switch } from 'react-native';
import * as Application from 'expo-application';
import analytics from '@react-native-firebase/analytics';
import { NativeStackNavigationProp } from '@react-navigation/native-stack';
import { ParamListBase } from '@react-navigation/routers';

import RotatingIcon from '../components/AppInfo/RotatingIcon';
import { Button } from 'react-native-elements';
import { useAppDispatch, useAppSelector } from '../../redux/hooks';
import { toggleshowPointParticles } from '../../redux/SettingsSlice';

interface Props {
navigation: NativeStackNavigationProp<ParamListBase, string, undefined>;
Expand All @@ -17,6 +19,10 @@ const AppInfoScreen: React.FunctionComponent<Props> = ({ navigation }) => {
const buildNumber = Application.nativeBuildVersion;
const appVersion = Application.nativeApplicationVersion;

const showPointParticles = useAppSelector(state => state.settings.showPointParticles);
const dispatch = useAppDispatch();
const toggleSwitch = () => { dispatch(toggleshowPointParticles()); };

const alertWithVersion = async () => {
Alert.alert(`ScorePad with Rounds\n` +
`v${appVersion} (${buildNumber})\n` +
Expand All @@ -34,6 +40,16 @@ const AppInfoScreen: React.FunctionComponent<Props> = ({ navigation }) => {
</Text>
</View>

<View style={styles.paragraph}>
<Text style={styles.header}>Settings</Text>
<View style={styles.settingElement}>
<Text style={{ fontSize: 20 }}>
Point particle effect
</Text>
<Switch onValueChange={toggleSwitch} value={showPointParticles} />
</View>
</View>

<View style={styles.paragraph}>
<Text style={styles.header}>Instructions</Text>
<Text style={styles.text}>
Expand Down Expand Up @@ -62,6 +78,12 @@ const styles = StyleSheet.create({
text: {
fontSize: 16,
paddingVertical: 20,
},
settingElement: {
flexDirection: 'row',
justifyContent: 'space-between',
alignItems: 'center',
paddingVertical: 10,
}
});

Expand Down