From bb73f5ee037d61d7e91a4ea1e96ef36de84c0854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9as=20ade?= <andrecot2502@gmail.com>
Date: Tue, 3 Jan 2023 22:38:47 +0100
Subject: [PATCH 1/5] Add Advertisment Radar mode on Onboarding

---
 src/screens/Onboarding.js | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/screens/Onboarding.js b/src/screens/Onboarding.js
index 85c1fb8..0c957b7 100644
--- a/src/screens/Onboarding.js
+++ b/src/screens/Onboarding.js
@@ -14,7 +14,7 @@ import {
 } from 'react-native';
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import { responsiveHeight, responsiveWidth } from 'react-native-responsive-dimensions';
-import { AntDesign, Ionicons, MaterialCommunityIcons } from '@expo/vector-icons';
+import { AntDesign, FontAwesome, FontAwesome5, Ionicons, MaterialCommunityIcons } from '@expo/vector-icons';
 import { openCamera, openPicker } from 'react-native-image-crop-picker';
 import { useActionSheet } from '@expo/react-native-action-sheet';
 import { PERMISSIONS, request, requestNotifications, RESULTS } from 'react-native-permissions';
@@ -555,19 +555,30 @@ export default function Onboarding({ navigation }) {
         </View>
 
         <View style={styles.view}>
-          <View style={{ marginBottom: 30, ...Styles.center }}>
-            <Text style={styles.title}>{'Reste à l\'affût !'}</Text>
+          <View style={{ ...Styles.center }}>
+            <View style={styles.line}>
+              <Text style={{ ...styles.title, marginRight: 10 }}>{'Mode Radar'}</Text>
+              <MaterialCommunityIcons name='radar' size={30} color={Colors.mainBlue}/>
+            </View>
             <Text style={styles.subtitle}>
               {'Active le mode radar pour ne manquer aucun drop, même quand l\'application n\'est pas lancée !'}
             </Text>
-            <Text style={{ ...styles.subtitle, ...Fonts.regular(10.5, Colors.grey), marginVertical: 3 }}>
-              {'Ce mode utilise la géolocalisation en arrière plan.'}
-            </Text>
+            <View style={styles.test}>
+              <View style={{ alignItems: 'center' }}>
+                <FontAwesome name='battery-full' size={24} style={{ color: Colors.purple1, paddingVertical: 3 }}/>
+                <FontAwesome5 name='shield-alt' size={24} style={{ color: Colors.purple1, paddingVertical: 3 }}/>
+                <MaterialCommunityIcons name='bell-ring' size={24} style={{ color: Colors.purple1, paddingVertical: 3 }}/>
+              </View>
+              <View style={{ paddingHorizontal: 10 }}>
+                <Text style={{ ...Fonts.bold(13, Colors.purple1), paddingVertical: 5 }}>{'Ne consomme pas la batterie'}</Text>
+                <Text style={{ ...Fonts.bold(13, Colors.purple1), paddingVertical: 5 }}>{'Ne dévoile pas ta position'}</Text>
+                <Text style={{ ...Fonts.bold(13, Colors.purple1), paddingVertical: 5 }}>{'Détecte les drops pour toi'}</Text>
+              </View>
+            </View>
             <TouchableOpacity>
               <Text style={{ ...Fonts.regular(13, '#44a0eb'), marginTop: 5, textDecorationLine: 'underline' }}>en savoir plus</Text>
             </TouchableOpacity>
           </View>
-          <MaterialCommunityIcons name='radar' size={50} color={Colors.grey} />
           <LoadingGlassButton
             loading={loading}
             onPress={() => requestBackgroundGeolocationPermissions(
@@ -653,5 +664,16 @@ const styles = StyleSheet.create({
     marginTop: 10,
     textAlign: 'center',
     maxWidth: responsiveWidth(85),
+    marginBottom: 30,
+  },
+  line: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    marginVertical: 3,
+  },
+  test: {
+    flexDirection: 'row',
+    flexWrap: 'wrap',
+    justifyContent: 'space-between',
   },
 });

From 721e9621adfd3bb2c1797acfd0b663879f5e3104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9as=20ade?= <andrecot2502@gmail.com>
Date: Tue, 3 Jan 2023 22:44:08 +0100
Subject: [PATCH 2/5] Remove unused things

---
 src/screens/Onboarding.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/screens/Onboarding.js b/src/screens/Onboarding.js
index 0c957b7..492fc89 100644
--- a/src/screens/Onboarding.js
+++ b/src/screens/Onboarding.js
@@ -556,14 +556,14 @@ export default function Onboarding({ navigation }) {
 
         <View style={styles.view}>
           <View style={{ ...Styles.center }}>
-            <View style={styles.line}>
+            <View style={{ flexDirection: 'row', alignItems: 'center' }}>
               <Text style={{ ...styles.title, marginRight: 10 }}>{'Mode Radar'}</Text>
               <MaterialCommunityIcons name='radar' size={30} color={Colors.mainBlue}/>
             </View>
             <Text style={styles.subtitle}>
               {'Active le mode radar pour ne manquer aucun drop, même quand l\'application n\'est pas lancée !'}
             </Text>
-            <View style={styles.test}>
+            <View style={styles.list}>
               <View style={{ alignItems: 'center' }}>
                 <FontAwesome name='battery-full' size={24} style={{ color: Colors.purple1, paddingVertical: 3 }}/>
                 <FontAwesome5 name='shield-alt' size={24} style={{ color: Colors.purple1, paddingVertical: 3 }}/>
@@ -666,12 +666,7 @@ const styles = StyleSheet.create({
     maxWidth: responsiveWidth(85),
     marginBottom: 30,
   },
-  line: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    marginVertical: 3,
-  },
-  test: {
+  list: {
     flexDirection: 'row',
     flexWrap: 'wrap',
     justifyContent: 'space-between',

From 21f92289372e7e8d4aa94926df17ccf2082da2bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9as=20ade?= <andrecot2502@gmail.com>
Date: Tue, 3 Jan 2023 22:47:43 +0100
Subject: [PATCH 3/5] mini fix

---
 src/screens/Onboarding.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/screens/Onboarding.js b/src/screens/Onboarding.js
index 492fc89..9f12998 100644
--- a/src/screens/Onboarding.js
+++ b/src/screens/Onboarding.js
@@ -664,7 +664,7 @@ const styles = StyleSheet.create({
     marginTop: 10,
     textAlign: 'center',
     maxWidth: responsiveWidth(85),
-    marginBottom: 30,
+    marginBottom: 17,
   },
   list: {
     flexDirection: 'row',

From 85c7299a7e0c43030dff123a147b18095cc8e60b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9as=20ade?= <andrecot2502@gmail.com>
Date: Wed, 1 Feb 2023 23:27:04 +0100
Subject: [PATCH 4/5] WIP

---
 src/screens/Onboarding.js | 50 +++++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/screens/Onboarding.js b/src/screens/Onboarding.js
index 9f12998..7f56272 100644
--- a/src/screens/Onboarding.js
+++ b/src/screens/Onboarding.js
@@ -564,28 +564,31 @@ export default function Onboarding({ navigation }) {
               {'Active le mode radar pour ne manquer aucun drop, même quand l\'application n\'est pas lancée !'}
             </Text>
             <View style={styles.list}>
-              <View style={{ alignItems: 'center' }}>
-                <FontAwesome name='battery-full' size={24} style={{ color: Colors.purple1, paddingVertical: 3 }}/>
-                <FontAwesome5 name='shield-alt' size={24} style={{ color: Colors.purple1, paddingVertical: 3 }}/>
-                <MaterialCommunityIcons name='bell-ring' size={24} style={{ color: Colors.purple1, paddingVertical: 3 }}/>
+              <View style={styles.elementRadar}>
+                <FontAwesome name='battery-full' size={22} style={{ color: Colors.purple1, marginRight: 10 }}/>
+                <Text style={{ ...Fonts.bold(12, Colors.purple1) }}>{'Ne consomme pas la batterie'}</Text>
               </View>
-              <View style={{ paddingHorizontal: 10 }}>
-                <Text style={{ ...Fonts.bold(13, Colors.purple1), paddingVertical: 5 }}>{'Ne consomme pas la batterie'}</Text>
-                <Text style={{ ...Fonts.bold(13, Colors.purple1), paddingVertical: 5 }}>{'Ne dévoile pas ta position'}</Text>
-                <Text style={{ ...Fonts.bold(13, Colors.purple1), paddingVertical: 5 }}>{'Détecte les drops pour toi'}</Text>
+              <View style={styles.elementRadar}>
+                <FontAwesome5 name='shield-alt' size={22} style={{ color: Colors.purple1, marginLeft: 3, marginRight: 13 }}/>
+                <Text style={{ ...Fonts.bold(12, Colors.purple1) }}>{'Ne dévoile pas ta position'}</Text>
+              </View>
+              <View style={styles.elementRadar}>
+                <MaterialCommunityIcons name='bell-ring' size={22} style={{ color: Colors.purple1, marginLeft: 2, marginRight: 13 }}/>
+                <Text style={{ ...Fonts.bold(12, Colors.purple1) }}>{'Détecte les drops pour toi'}</Text>
               </View>
             </View>
             <TouchableOpacity>
-              <Text style={{ ...Fonts.regular(13, '#44a0eb'), marginTop: 5, textDecorationLine: 'underline' }}>en savoir plus</Text>
+              <Text style={{ ...Fonts.regular(12, '#44a0eb'), textDecorationLine: 'underline' }}>en savoir plus</Text>
             </TouchableOpacity>
+            <LoadingGlassButton
+              style={{ marginTop: 1 }}
+              loading={loading}
+              onPress={() => requestBackgroundGeolocationPermissions(
+                () => viewSliderRef.current?.goToView(8)
+              )}
+              text='Activer'
+            />
           </View>
-          <LoadingGlassButton
-            loading={loading}
-            onPress={() => requestBackgroundGeolocationPermissions(
-              () => viewSliderRef.current?.goToView(8)
-            )}
-            text='Activer'
-          />
         </View>
 
         <View style={styles.view}>
@@ -608,10 +611,10 @@ export default function Onboarding({ navigation }) {
   );
 }
 
-const LoadingGlassButton = ({ loading, onPress, disabled, text }) => (
+const LoadingGlassButton = ({ loading, onPress, disabled, text, style }) => (
   <GlassButton
     onPress={onPress}
-    style={text ? { ...styles.nextButton, paddingVertical: 15, width: 150 } : styles.nextButton}
+    style={text ? { ...styles.nextButton, paddingVertical: 15, width: 150, style } : { ...styles.nextButton, style }}
     disabled={disabled}
   >
     {text ? (
@@ -666,9 +669,14 @@ const styles = StyleSheet.create({
     maxWidth: responsiveWidth(85),
     marginBottom: 17,
   },
-  list: {
+  elementRadar: {
     flexDirection: 'row',
-    flexWrap: 'wrap',
-    justifyContent: 'space-between',
+    alignItems: 'center',
+    marginBottom: 10,
   },
+  buttonRadar: {
+    paddingHorizontal: 20,
+    paddingVertical: 10,
+    marginBottom: 40,
+  }
 });

From 82d450677320406c912a8130c2790ae4fe06436b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9as=20ade?= <andrecot2502@gmail.com>
Date: Wed, 8 Feb 2023 21:03:02 +0100
Subject: [PATCH 5/5] WIP

---
 src/screens/Onboarding.js | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/screens/Onboarding.js b/src/screens/Onboarding.js
index 7f56272..dfac0b3 100644
--- a/src/screens/Onboarding.js
+++ b/src/screens/Onboarding.js
@@ -577,17 +577,19 @@ export default function Onboarding({ navigation }) {
                 <Text style={{ ...Fonts.bold(12, Colors.purple1) }}>{'Détecte les drops pour toi'}</Text>
               </View>
             </View>
-            <TouchableOpacity>
-              <Text style={{ ...Fonts.regular(12, '#44a0eb'), textDecorationLine: 'underline' }}>en savoir plus</Text>
-            </TouchableOpacity>
-            <LoadingGlassButton
-              style={{ marginTop: 1 }}
-              loading={loading}
-              onPress={() => requestBackgroundGeolocationPermissions(
-                () => viewSliderRef.current?.goToView(8)
-              )}
-              text='Activer'
-            />
+            <View style={{ marginTop: '10%' }}>
+              <TouchableOpacity>
+                <Text style={{ ...Fonts.regular(12, '#44a0eb'), textDecorationLine: 'underline', textAlign: 'center' }}>en savoir plus</Text>
+              </TouchableOpacity>
+              <LoadingGlassButton
+                marginTopValue='4%'
+                loading={loading}
+                onPress={() => requestBackgroundGeolocationPermissions(
+                  () => viewSliderRef.current?.goToView(8)
+                )}
+                text='Activer'
+              />
+            </View>
           </View>
         </View>
 
@@ -611,10 +613,10 @@ export default function Onboarding({ navigation }) {
   );
 }
 
-const LoadingGlassButton = ({ loading, onPress, disabled, text, style }) => (
+const LoadingGlassButton = ({ loading, onPress, disabled, text, marginTopValue }) => (
   <GlassButton
     onPress={onPress}
-    style={text ? { ...styles.nextButton, paddingVertical: 15, width: 150, style } : { ...styles.nextButton, style }}
+    style={text ? { ...styles.nextButton, paddingVertical: 15, width: 150, marginTop: marginTopValue ? marginTopValue : '10%' } : { ...styles.nextButton }}
     disabled={disabled}
   >
     {text ? (
@@ -655,7 +657,6 @@ const styles = StyleSheet.create({
     paddingHorizontal: 20,
     paddingVertical: 10,
     marginBottom: 40,
-    marginTop: '10%',
   },
   title: {
     ...Fonts.bold(20, Colors.darkGrey),
@@ -674,9 +675,4 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     marginBottom: 10,
   },
-  buttonRadar: {
-    paddingHorizontal: 20,
-    paddingVertical: 10,
-    marginBottom: 40,
-  }
 });