From d9ede44d7d63cf93fdfc3678a8cd9b2eb399837a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= <clement.lebihan773@gmail.com>
Date: Mon, 10 Apr 2023 22:43:28 +0200
Subject: [PATCH] moved functionnal NotificationView into it's dedicated file

---
 front/views/settings/NotificationView.tsx | 96 +++++++++++++++--------
 front/views/settings/SettingsView.tsx     | 38 +--------
 2 files changed, 65 insertions(+), 69 deletions(-)

diff --git a/front/views/settings/NotificationView.tsx b/front/views/settings/NotificationView.tsx
index facbe6b..b0c66d9 100644
--- a/front/views/settings/NotificationView.tsx
+++ b/front/views/settings/NotificationView.tsx
@@ -1,36 +1,68 @@
 import React from "react";
-import { View } from 'react-native';
+import { View } from "react-native";
 import { Center, Button, Text, Switch, Heading } from "native-base";
-import { translate } from "../../i18n/i18n";
+import { translate, Translate } from "../../i18n/i18n";
+import { useDispatch } from "react-redux";
+import { RootState, useSelector } from "../../state/Store";
+import { useLanguage } from "../../state/LanguageSlice";
+import { SettingsState, updateSettings } from '../../state/SettingsSlice';
 
-const NotificationsView = ({navigation}) => {
-    return (
-        <Center style={{ flex: 1, justifyContent: 'center' }}>
+const NotificationsView = ({ navigation }) => {
+	const dispatch = useDispatch();
+	const settings: SettingsState = useSelector(
+		(state: RootState) => state.settings
+	);
+	return (
+		<Center style={{ flex: 1, justifyContent: "center" }}>
+			<Heading style={{ textAlign: "center" }}>
+				<Translate translationKey="notifBtn" />
+			</Heading>
+			<View style={{ margin: 20 }}>
+				<Text style={{ textAlign: "center" }}>Push notifications</Text>
+				<Switch
+					value={settings.enablePushNotifications}
+					style={{ alignSelf: "center", margin: 10 }}
+					colorScheme="primary"
+					onValueChange={(value) => {
+						dispatch(updateSettings({ enablePushNotifications: value }));
+					}}
+				/>
+			</View>
+			<View style={{ margin: 20 }}>
+				<Text style={{ textAlign: "center" }}>Email notifications</Text>
+				<Switch
+					value={settings.enableMailNotifications}
+					style={{ alignSelf: "center", margin: 10 }}
+					colorScheme="primary"
+					onValueChange={(value) => {
+						dispatch(updateSettings({ enableMailNotifications: value }));
+					}}
+				/>
+			</View>
+			<View style={{ margin: 20 }}>
+				<Text style={{ textAlign: "center" }}>Training reminder</Text>
+				<Switch
+					value={settings.enableLessongsReminders}
+					style={{ alignSelf: "center", margin: 10 }}
+					colorScheme="primary"
+					onValueChange={(value) => {
+						dispatch(updateSettings({ enableLessongsReminders: value }));
+					}}
+				/>
+			</View>
+			<View style={{ margin: 20 }}>
+				<Text style={{ textAlign: "center" }}>New songs</Text>
+				<Switch
+					value={settings.enableReleaseAlerts}
+					style={{ alignSelf: "center", margin: 10 }}
+					colorScheme="primary"
+					onValueChange={(value) => {
+						dispatch(updateSettings({ enableReleaseAlerts: value }));
+					}}
+				/>
+			</View>
+		</Center>
+	);
+};
 
-            <Heading style={{ textAlign: "center" }}>{ translate('notifBtn')}</Heading>
-            <Button variant='outline' style={{ margin: 10}} onPress={() => navigation.navigate('Settings')} >{ translate('backBtn') }</Button>
-
-            <View style={{margin: 20}} >
-                <Text style={{ textAlign: "center" }}>Push notifications</Text>
-                <Switch style={{ alignSelf: 'center', margin: 10 }} colorScheme="primary"/>
-            </View>
-
-            <View style={{margin: 20}}>
-                <Text style={{ textAlign: "center" }}>Email notifications</Text>
-                <Switch style={{ alignSelf: 'center', margin: 10 }} colorScheme="primary"/>
-            </View>
-
-            <View style={{margin: 20}}>
-                <Text style={{ textAlign: "center" }}>Training reminder</Text>
-                <Switch style={{ alignSelf: 'center', margin: 10 }} colorScheme="primary"/>
-            </View>
-
-            <View style={{margin: 20}}>
-                <Text style={{ textAlign: "center" }}>New songs</Text>
-                <Switch style={{ alignSelf: 'center', margin: 10 }} colorScheme="primary"/>
-            </View>
-        </Center>
-    )
-}
-
-export default NotificationsView;
\ No newline at end of file
+export default NotificationsView;
diff --git a/front/views/settings/SettingsView.tsx b/front/views/settings/SettingsView.tsx
index 7251a10..db03126 100644
--- a/front/views/settings/SettingsView.tsx
+++ b/front/views/settings/SettingsView.tsx
@@ -14,6 +14,7 @@ import { FontAwesome, MaterialCommunityIcons, FontAwesome5 } from '@expo/vector-
 import ChangePasswordForm from '../../components/forms/changePasswordForm';
 import ChangeEmailForm from '../../components/forms/changeEmailForm';
 import ProfileSettings from './SettingsProfileView';
+import NotificationsView from './NotificationView';
 
 import API, { APIError } from '../../API';
 
@@ -158,43 +159,6 @@ export const PreferencesView = ({navigation}) => {
 	)
 }
 
-const NotificationsView = ({navigation}) => {
-	const dispatch = useDispatch();
-	const settings: SettingsState = useSelector((state: RootState) => state.settings);
-	return (
-		<Center style={{ flex: 1, justifyContent: 'center' }}>
-
-			<Heading style={{ textAlign: "center" }}>
-				<Translate translationKey='notifBtn'/>
-			</Heading>
-			<View style={{margin: 20}} >
-				<Text style={{ textAlign: "center" }}>Push notifications</Text>
-				<Switch value={settings.enablePushNotifications} style={{ alignSelf: 'center', margin: 10 }} colorScheme="primary"
-					onValueChange={(value) => { dispatch(updateSettings({ enablePushNotifications: value })) }}
-				/>
-			</View>
-			<View style={{margin: 20}}>
-				<Text style={{ textAlign: "center" }}>Email notifications</Text>
-				<Switch value={settings.enableMailNotifications} style={{ alignSelf: 'center', margin: 10 }} colorScheme="primary"
-					onValueChange={(value) => { dispatch(updateSettings({ enableMailNotifications: value })) }}
-				/>
-			</View>
-			<View style={{margin: 20}}>
-				<Text style={{ textAlign: "center" }}>Training reminder</Text>
-				<Switch value={settings.enableLessongsReminders} style={{ alignSelf: 'center', margin: 10 }} colorScheme="primary"
-					onValueChange={(value) => { dispatch(updateSettings({ enableLessongsReminders: value })) }}
-				/>
-			</View>
-			<View style={{margin: 20}}>
-				<Text style={{ textAlign: "center" }}>New songs</Text>
-				<Switch value={settings.enableReleaseAlerts} style={{ alignSelf: 'center', margin: 10 }} colorScheme="primary"
-					onValueChange={(value) => { dispatch(updateSettings({ enableReleaseAlerts: value })) }}
-				/>
-			</View>
-		</Center>
-	)
-}
-
 export const PrivacyView = ({navigation}) => {
 	return (
 		<Center style={{ flex: 1}}>