bugs fixed

AngelLM · Dec 21, 2020 · 81b06d9 · 81b06d9
1 parent e871f1d
commit 81b06d9
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 52 deletions.
diff --git a/App.js b/App.js
@@ -197,7 +197,7 @@ const App = () => {
               name='About'
               component={About}
               options={{
-                title: 'Mando Chest Display 1.0.0',
+                title: 'Mando Chest Display 1.0',
                 headerTitleAlign: 'center',
                 headerTintColor: '#FFF',
                 headerStyle:{

diff --git a/styles/global.js b/styles/global.js
@@ -20,7 +20,7 @@ const globalStyles = StyleSheet.create({
     contentAbout: {
         flex: 1,
         flexDirection: 'column',
-        justifyContent: 'flex-start',
+        justifyContent: 'space-between',
         marginHorizontal: '10%',
         marginVertical: '2.5%',
     },

diff --git a/views/About.js b/views/About.js
@@ -9,49 +9,57 @@ const About = () => {
     return (
         <Container style={globalStyles.container}>
             <View style={globalStyles.contentAbout}>
-                <Text style={globalStyles.textAbout}>
-                    The development of this app took more than 100 hours. Since time is not transferable, would you like to gift me a coffee?
-                </Text>
-                <Text style={globalStyles.textAbout}>
-                    It will help me stay awake to create more projects like this one and to keep sharing them for free!
-                </Text>
-                <Text style={globalStyles.textAbout}>
-                    Thank you very much!  ( ^‿^)c[_]
-                </Text>
-                <View style={{flexDirection: 'row', justifyContent: 'center', alignItems: 'center', marginTop: 10}}>
-                    <Button 
-                        style={[globalStyles.button, {borderRadius: 20}]}
-                        onPress={() => Linking.openURL('https://www.paypal.com/paypalme/angellm/1')}
-                        >
-                        <Text style={{color: '#FFF', textTransform: 'capitalize'}}>
-                        <Entypo name="paypal"/>   Gift a coffee!   <MaterialCommunityIcons name="coffee"/></Text>
-                    </Button>
+                <View>
+                    <Text style={globalStyles.textAbout}>
+                        The development of this app took more than 100 hours. Since time is not transferable, would you like to buy me a coffee?
+                    </Text>
+                    <Text style={globalStyles.textAbout}>
+                        It will help me stay awake to create more projects like this one and to keep sharing them for free!
+                    </Text>
+                    <Text style={globalStyles.textAbout}>
+                        Thank you very much!  ( ^‿^)c[_]
+                    </Text>
+                    <View style={{flexDirection: 'row', justifyContent: 'center', alignItems: 'center', marginTop: 20}}>
+                        <Button 
+                            style={[globalStyles.button, {borderRadius: 50, marginHorizontal:10}]}
+                            onPress={() => Linking.openURL('https://twitter.com/_angellm')}
+                            >
+                            <MaterialCommunityIcons name="twitter" style={{fontSize: 26, color: '#FFF', marginHorizontal:10}}/>
+                        </Button>
+                        <Button 
+                            style={[globalStyles.button, {borderRadius: 50, marginHorizontal:10}]}
+                            onPress={() => Linking.openURL('https://www.youtube.com/AngelLM')}
+                            >
+                            <MaterialCommunityIcons name="youtube" style={{fontSize: 26, color: '#FFF', marginHorizontal:10}}/>
+                        </Button>
+                        <Button 
+                            style={[globalStyles.button, {borderRadius: 20, marginHorizontal:10}]}
+                            onPress={() => Linking.openURL('https://www.paypal.com/paypalme/angellm/1')}
+                            >
+                            <Text style={{color: '#FFF', textTransform: 'capitalize', fontSize:16, fontWeight:'400'}}>
+                            <Entypo name="paypal" style={{fontSize: 20}} />   Gift a coffee!   <MaterialCommunityIcons name="coffee" style={{fontSize: 20}} /></Text>
+                        </Button>
+                        <Button 
+                            style={[globalStyles.button, {borderRadius: 50, marginHorizontal:10}]}
+                            onPress={() => Linking.openURL('http://www.angel-lm.com')}
+                            >
+                            <MaterialCommunityIcons name="web" style={{fontSize: 26, color: '#FFF', marginHorizontal:10}}/>
+                        </Button>
+                        <Button 
+                            style={[globalStyles.button, {borderRadius: 50, marginHorizontal:10}]}
+                            onPress={() => Linking.openURL('https://www.instagram.com/angel_lm_/')}
+                            >
+                            <MaterialCommunityIcons name="instagram" style={{fontSize: 26, color: '#FFF', marginHorizontal:10}}/>
+                        </Button>
+                    </View>
                 </View>
-                <View style={{flexDirection: 'row', justifyContent: 'center', alignItems: 'center', marginTop: 20}}>
-                    <Button 
-                        style={[globalStyles.button, {borderRadius: 50, marginHorizontal:10}]}
-                        onPress={() => Linking.openURL('https://twitter.com/_angellm')}
-                        >
-                        <MaterialCommunityIcons name="twitter" style={{fontSize: 26, color: '#FFF', marginHorizontal:10}}/>
-                    </Button>
-                    <Button 
-                        style={[globalStyles.button, {borderRadius: 50, marginHorizontal:10}]}
-                        onPress={() => Linking.openURL('https://www.instagram.com/angel_lm_/')}
-                        >
-                        <MaterialCommunityIcons name="instagram" style={{fontSize: 26, color: '#FFF', marginHorizontal:10}}/>
-                    </Button>
-                    <Button 
-                        style={[globalStyles.button, {borderRadius: 50, marginHorizontal:10}]}
-                        onPress={() => Linking.openURL('https://www.youtube.com/AngelLM')}
-                        >
-                        <MaterialCommunityIcons name="youtube" style={{fontSize: 26, color: '#FFF', marginHorizontal:10}}/>
-                    </Button>
-                    <Button 
-                        style={[globalStyles.button, {borderRadius: 50, marginHorizontal:10}]}
-                        onPress={() => Linking.openURL('http://www.angel-lm.com')}
-                        >
-                        <MaterialCommunityIcons name="web" style={{fontSize: 26, color: '#FFF', marginHorizontal:10}}/>
-                    </Button>
+
+                <View style={{flexDirection: 'row', justifyContent: 'center', alignItems: 'center', marginTop: 10}}>
+                    <Text style={[globalStyles.textAbout, {color: '#1b322c'}]} onPress={() => Linking.openURL('https://github.com/AngelLM/MandoDisplayApp')}>
+                        Shared
+                    </Text>
+                    <Text style={globalStyles.textAbout}> under </Text>
+                    <Text style={[globalStyles.textAbout, {color: '#1b322c'}]} onPress={() => Linking.openURL('https://choosealicense.com/licenses/gpl-3.0/')}>GPLv3 License</Text>
                 </View>
             </View>
         </Container>

diff --git a/views/ColorPick.js b/views/ColorPick.js
@@ -31,7 +31,7 @@ const ColorPick = ({route}) => {
 
     return (
         <Container style={globalStyles.container}>
-            <View style={[globalStyles.content]}>
+            <View style={[globalStyles.contentSmall]}>
                 <ColorPicker
                     defaultColor= {colorStr}
                     onColorChange={color => setColorStr(fromHsv(color))}

diff --git a/views/Sequence.js b/views/Sequence.js
@@ -23,7 +23,7 @@ const Sequence = ({route}) => {
     useEffect(() => {
         let seqCopies = JSON.parse(JSON.stringify(sequences));
         setEditSequences(seqCopies);
-    }, [])
+    }, [route.params])
 
     const iSeq = sequences.findIndex(s => s.id === seq.id);
 
@@ -101,7 +101,7 @@ const Sequence = ({route}) => {
                         <Text style={globalStyles.text}>Start adding a new state!</Text>
                     ) : (null)}
 
-                    <View>
+                    <View style={{alignItems:'center'}}>
                         {seq.lightSequences.map((ligSeq, index) => (
                             <View style={{flexDirection: 'row'}}>
                                 <SmallDisplay lightSequence={ligSeq} colorSequence={seq.colorSequence}/>

diff --git a/views/Start.js b/views/Start.js
@@ -65,16 +65,16 @@ const Start = () => {
                     <View style={{borderBottomColor: 'white', borderBottomWidth: 1}}></View>
                 </View>
                 <View style={{justifyContent:'center', alignItems: 'center'}}>
-                    <Text style={globalStyles.textAbout}>
+                    <Text style={[globalStyles.textAbout, {fontSize: 20}]}>
                         {rndText}
                     </Text>
                     <Progress.Bar
                         style={styles.progress}
                         progress={state.progress}
                         color= '#FFF'
                         indeterminate={state.indeterminate}
-                        width={300}
-                        height={10}
+                        width={400}
+                        height={12}
                     />
                 </View>
                 <View style={{justifyContent:'center', alignItems: 'center'}}>

diff --git a/views/State.js b/views/State.js
@@ -10,7 +10,6 @@ import LedButton from '../components/LedButton';
 const State = ({route}) => {
     // Extracting the params sent via route
     const { sequences, seqId, state, setSequences, saveSequencesStorage, stateIndex } = route.params;
-
     // Copy the state object
     let stateCpy = JSON.parse(JSON.stringify(state));
     // Navigation
@@ -45,7 +44,6 @@ const State = ({route}) => {
         // Copy the sequences array and find the index for the current sequence that it is being edited
         let seqNew = JSON.parse(JSON.stringify(sequences)); //let seqNew = [...sequences];
         let index = seqNew.findIndex(s => s.id === seqId);
-
         // Edit the copied array to modify the light states to the current sequence
         seqNew[index].lightSequences[stateIndex].lightState = stateCpy.lightState;
         // Set the State