Merge pull request #27 from fga-eps-mds/develop

US02 e US06 e ajustes - Major Release

Author: GabrielDVpereira

App.js

@@ -6,7 +6,7 @@ import { BottomNavigation } from './src/navigation';
 import {
   LocationContextProvider,
   LanguageContextProvider,
-  TrunkContextProvider,
+  FamilyContextProvider,
   IdiomContextProvider,
 } from './src/contexts';
 import { useCustomFonts } from './src/helpers';
@@ -20,7 +20,7 @@ export default function App() {
 
   return (
     <IdiomContextProvider>
-      <TrunkContextProvider>
+      <FamilyContextProvider>
         <LanguageContextProvider>
           <LocationContextProvider>
             <SafeAreaProvider>
@@ -30,7 +30,7 @@ export default function App() {
             </SafeAreaProvider>
           </LocationContextProvider>
         </LanguageContextProvider>
-      </TrunkContextProvider>
+      </FamilyContextProvider>
     </IdiomContextProvider>
   );
 }

package-lock.json

@@ -17,9 +17,10 @@
     "@react-navigation/stack": "^6.0.7",
     "axios": "^0.21.4",
     "dotenv": "^10.0.0",
-    "expo": "~42.0.1",
+    "expo": "^43.0.0",
     "expo-app-loading": "^1.1.2",
     "expo-constants": "~11.0.1",
+    "expo-linking": "~2.4.2",
     "expo-location": "~12.1.2",
     "expo-status-bar": "~1.0.4",
     "react": "16.13.1",
@@ -29,10 +30,11 @@
     "react-native-maps": "0.28.0",
     "react-native-safe-area-context": "3.2.0",
     "react-native-screens": "~3.4.0",
+    "react-native-unimodules": "^0.14.10",
     "react-native-web": "~0.13.12"
   },
   "devDependencies": {
-    "@babel/core": "^7.9.0",
+    "@babel/core": "^7.12.9",
     "babel-eslint": "^10.1.0",
     "babel-plugin-module-resolver": "^4.1.0",
     "eslint": "^7.32.0",

package.json

@@ -0,0 +1,58 @@
+[
+  {
+    "id": 1,
+    "title": "Bases de Dados presentes no aplicativo",
+    "content": [
+      {
+        "id": 1,
+        "nome": "Glottolog",
+        "url": "https://glottolog.org/"
+      },
+      {
+        "id": 2,
+        "nome": "Funai",
+        "url": "https://www.gov.br/funai/pt-br"
+      },
+      {
+        "id": 3,
+        "nome": "PIB Socioambiental",
+        "url": "https://pib.socioambiental.org/pt/P%C3%A1gina_principal"
+      },
+      {
+        "id": 4,
+        "nome": "Lexibank",
+        "url": "https://github.com/lexibank/huntergatherer/"
+      }
+    ]
+  },
+  {
+    "id": 2,
+    "title": "Contribuidores",
+    "content": [
+      {
+        "id": 1,
+        "nome": "Altaci Corrêa Rubim"
+      },
+      {
+        "id": 2,
+        "nome": "Anari Braz Bomfim"
+      },
+      { "id": 3, "nome": "Carlos Rafael" },
+      { "id": 4, "nome": "Eunice da Rocha Moraes Rodrigues" },
+      { "id": 5, "nome": "Gabriel Davi" },
+      { "id": 6, "nome": "Helder Lourenço" },
+      { "id": 7, "nome": "Hérick Lima" },
+      { "id": 8, "nome": "Idiane Cruz da Silva" },
+      { "id": 9, "nome": "Ingrid Carvalho" },
+      { "id": 10, "nome": "Isadora Galvão" },
+      { "id": 11, "nome": "Jywateju Kayabi" },
+      { "id": 12, "nome": "Maria Gorete Neto" },
+      { "id": 13, "nome": "Micaella Gouveia" },
+      { "id": 14, "nome": "Pedro Igor" },
+      { "id": 15, "nome": "Sofia Patrocínio" },
+      { "id": 16, "nome": "Sâmela Ramos da Silva Meirelles" },
+      { "id": 17, "nome": "Thiago Costa Chacon" },
+      { "id": 18, "nome": "Waraxowoo’i Maurício Tapirapé" }
+    ]
+  }
+]

src/aboutScreenData.json

@@ -29,7 +29,7 @@ export function ContentBottomModal({ visible, toggle, content }) {
       style={styles.bottomModalContainer}
     >
       <Text style={styles.title}>{content.title}</Text>
-      <Text style={styles.subtitle}>Tronco Linguístico: {content.origin}</Text>
+      <Text style={styles.subtitle}>Família Linguística: {content.origin}</Text>
 
       <View style={styles.body}>
         {isEthnicityNotListNull && renderEthnicityList()}

src/assets/images/marker-50.png

@@ -1,9 +1,14 @@
 import React, { useEffect } from 'react';
 import MapView, { Marker } from 'react-native-maps';
 import { useState } from 'react/cjs/react.development';
-import markerImage from '../../assets/images/marker.png';
-import markerSelectedImage from '../../assets/images/marker-yellow.png';
+import markerImageFull from '../../assets/images/marker.png';
+import markerImage70 from '../../assets/images/marker-70.png';
+import markerImage50 from '../../assets/images/marker-50.png';
+import markerSelectedImageFull from '../../assets/images/marker-yellow.png';
+import markerSelectedImage70 from '../../assets/images/marker-yellow-70.png';
+import markerSelectedImage50 from '../../assets/images/marker-yellow-50.png';
 import styles from './styles';
+import { SCREEN_WIDTH } from '../../constants';
 
 export function GoogleMap({
   markers,
@@ -14,6 +19,10 @@ export function GoogleMap({
   ...props
 }) {
   const [selectedMarkerId, setSelectedMarkerId] = useState(null);
+  const [markerImage, setMarkerImage] = useState(markerImageFull);
+  const [markerSelectedImage, setMarkerSelectedImage] = useState(
+    markerSelectedImageFull
+  );
 
   const handlePressMarker = (marker) => {
     if (onPressMarker) {
@@ -22,6 +31,22 @@ export function GoogleMap({
     }
   };
 
+  const onRegionChange = (region) => {
+    const zoom = Math.log2(
+      360 * (SCREEN_WIDTH / 256 / region.longitudeDelta) + 1
+    );
+    if (zoom < 7 && zoom > 5) {
+      setMarkerImage(markerImage70);
+      setMarkerSelectedImage(markerSelectedImage70);
+    } else if (zoom < 5) {
+      setMarkerImage(markerImage50);
+      setMarkerSelectedImage(markerSelectedImage50);
+    } else {
+      setMarkerImage(markerImageFull);
+      setMarkerSelectedImage(markerSelectedImageFull);
+    }
+  };
+
   const handleMarkerDismiss = () => {
     setSelectedMarkerId(null);
   };
@@ -37,6 +62,7 @@ export function GoogleMap({
       style={[styles.map, mapStyle]}
       initialRegion={initialRegion}
       {...props}
+      onRegionChange={onRegionChange}
     >
       <Marker
         title="Você está aqui"

src/assets/images/marker-70.png

@@ -3,13 +3,13 @@ import { Text, View, TouchableOpacity } from 'react-native';
 import { AntDesign } from '@expo/vector-icons';
 import { useNavigation } from '@react-navigation/native';
 
-import styles from '../../screens/LanguagePerTrunk/styles';
+import styles from '../../screens/LanguagePerFamily/styles';
 
-export function ListLanguages({ listLanguage }) {
+export function Language({ language }) {
   const navigation = useNavigation();
 
-  return listLanguage.map((language) => (
-    <View key={language.id_lingua} style={styles.listcontainer}>
+  return (
+    <View style={styles.listcontainer}>
       <TouchableOpacity
         onPress={() => {
           navigation.navigate('LanguageInitial', { id: language.id_lingua });
@@ -25,5 +25,5 @@ export function ListLanguages({ listLanguage }) {
         />
       </TouchableOpacity>
     </View>
-  ));
+  );
 }

src/assets/images/marker-yellow-50.png

@@ -0,0 +1,12 @@
+import React from 'react';
+import { ActivityIndicator, View } from 'react-native';
+import { PRIMARY_BLUE } from '../../constants';
+import styles from './styles';
+
+export function Loading() {
+  return (
+    <View style={[styles.container, styles.horizontal]}>
+      <ActivityIndicator size="large" color={PRIMARY_BLUE} />
+    </View>
+  );
+}

src/assets/images/marker-yellow-70.png

@@ -0,0 +1,13 @@
+import { StyleSheet } from 'react-native';
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+  },
+  horizontal: {
+    padding: '50%',
+  },
+});
+
+export default styles;

src/components/ContentBottomModal/index.jsx

@@ -0,0 +1,14 @@
+import React from 'react';
+import { Text } from 'react-native';
+import { Loading } from '../Loading';
+import styles from './styles';
+
+export function LoadingOrEmptyMessage({ loading, isEmpty, emptyMessage }) {
+  if (loading) {
+    return <Loading />;
+  }
+  if (isEmpty) {
+    return <Text style={styles.text}>{emptyMessage}</Text>;
+  }
+  return null;
+}

src/components/GoogleMap/index.jsx

@@ -0,0 +1,14 @@
+import { StyleSheet } from 'react-native';
+import { MONTSERRAT_REGULAR } from '../../constants';
+
+const styles = StyleSheet.create({
+  text: {
+    marginTop: '50%',
+    fontSize: 16,
+    fontFamily: MONTSERRAT_REGULAR,
+    fontWeight: 'bold',
+    textAlign: 'center',
+  },
+});
+
+export default styles;

src/components/ListLanguages/index.jsx renamed to src/components/Language/index.jsx

@@ -69,7 +69,7 @@ export function ModalMod({ list, onChange, onChangeV, visual }) {
             <Pressable
               style={styles.flex}
               onPress={() => {
-                navigation.navigate('LanguagePerTrunk');
+                navigation.navigate('LanguagePerFamily');
                 onChangeV(false);
               }}
             >
@@ -80,7 +80,7 @@ export function ModalMod({ list, onChange, onChangeV, visual }) {
                 style={{ left: 5 }}
               />
               <Text style={styles.textmodal}>
-                Listar por família linguistica
+                Listar por família linguística
               </Text>
             </Pressable>
           </View>