🐛 HotFix: Adjust Expo, Screens, App.tsx, Routes Private And Public

polijrorg · Jan 15, 2025 · 384ae4e · 384ae4e
1 parent 6161fe5
commit 384ae4e
Show file tree

Hide file tree

Showing 55 changed files with 8,247 additions and 5,702 deletions.
diff --git a/App.tsx b/App.tsx
@@ -1,11 +1,11 @@
 import AppProvider from '@hooks/index';
-import { NavigationContainer } from '@react-navigation/native';
 import Routes from '@routes/index';
 import { useFonts } from 'expo-font';
 import { ToastProvider } from 'react-native-toast-notifications';
 import { DataProvider } from 'src/context/DataContext';
 
 import React from 'react';
+import { NavigationContainer } from '@react-navigation/native';
 
 export default function App() {
   const [fontsLoaded] = useFonts({
@@ -21,10 +21,10 @@ export default function App() {
       <ToastProvider>
         <DataProvider>
           <AppProvider>
-            <Routes />
+            <Routes  />
           </AppProvider>
         </DataProvider>
       </ToastProvider>
-    </NavigationContainer>
+      </NavigationContainer>
   );
 }
diff --git a/app.json b/app.json
@@ -2,6 +2,7 @@
   "expo": {
     "name": "Sell Outer",
     "slug": "sell-out-expert",
+    "newArchEnabled": true,
     "icon": "./public/assets/icon.jpg",
     "version": "1.0.9",
     "assetBundlePatterns": [

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,11 +32,11 @@
     "@react-native-picker/picker": "2.7.5",
     "@react-navigation/bottom-tabs": "^6.5.12",
     "@react-navigation/material-top-tabs": "^6.6.6",
-    "@react-navigation/native": "^6.1.10",
-    "@react-navigation/native-stack": "^6.9.17",
+    "@react-navigation/native": "^7.0.14",
+    "@react-navigation/native-stack": "^7.2.0",
     "axios": "^1.6.7",
     "date-fns": "^3.6.0",
-    "expo": "~51.0.38",
+    "expo": "^52.0.25",
     "expo-dev-client": "~4.0.28",
     "expo-font": "~12.0.10",
     "expo-linear-gradient": "~13.0.2",
@@ -47,15 +47,15 @@
     "nookies": "^2.5.2",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-native": "0.74.5",
+    "react-native": "^0.76.6",
     "react-native-chart-kit": "^6.12.0",
-    "react-native-gesture-handler": "~2.16.1",
+    "react-native-gesture-handler": "^2.22.0",
     "react-native-modal": "^13.0.1",
     "react-native-pager-view": "6.3.0",
-    "react-native-reanimated": "~3.10.1",
+    "react-native-reanimated": "^3.16.7",
     "react-native-reanimated-carousel": "^3.5.1",
-    "react-native-safe-area-context": "4.10.5",
-    "react-native-screens": "3.31.1",
+    "react-native-safe-area-context": "^5.1.0",
+    "react-native-screens": "^4.5.0",
     "react-native-svg": "15.2.0",
     "react-native-svg-charts": "^5.4.0",
     "react-native-tab-view": "^3.5.2",
@@ -78,12 +78,12 @@
     "babel-loader": "^8.2.5",
     "babel-plugin-module-resolver": "^5.0.0",
     "babel-preset-expo": "~11.0.0",
-    "eslint": "8",
+    "eslint": "^9.18.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jsx-a11y": "^6.6.1",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-react": "^7.31.8",
+    "eslint-plugin-react": "^7.37.4",
     "eslint-plugin-react-hooks": "^4.6.0",
     "husky": "^8.0.1",
     "lint-staged": "15.2.0",

diff --git a/src/components/AccordionMentory/index.tsx b/src/components/AccordionMentory/index.tsx
@@ -1,6 +1,8 @@
 import React, { useState } from 'react';
-import { View, Text, TouchableWithoutFeedback, TextInput } from 'react-native';
+import { View, TouchableWithoutFeedback, TextInput, Text as RNCText } from 'react-native';
 import { FontAwesome } from '@expo/vector-icons';
+import * as S from './styles';
+import Text from '@components/Text';
 
 type AccordionProps = {
   title: string;
@@ -30,22 +32,14 @@ const AccordionMentory: React.FC<AccordionProps> = ({
   };
 
   return (
-    <View style={{ marginTop: 16, borderRadius: 8 }}>
+    <S.Wrapper>
       <TouchableWithoutFeedback onPress={toggleExpand}>
-        <View
-          style={{
-            flexDirection: 'row',
-            alignItems: 'center',
-            justifyContent: 'space-between',
-            backgroundColor: '#F1F3F5',
-            padding: 10,
-            borderRadius: 8,
-          }}
-        >
-          <Text style={{ flex: 0.9, fontFamily: 'Poppins' }}>{title}</Text>
+        <S.ViewWrapper>
+
+          <Text label={title} size='medium' />
           {showText && (
             <>
-              <Text
+              <RNCText
                 style={{
                   marginRight: 8,
                   fontFamily: 'PoppinsBold',
@@ -57,8 +51,8 @@ const AccordionMentory: React.FC<AccordionProps> = ({
                 }}
               >
                 I: {formatNumber(implementation)}
-              </Text>
-              <Text
+              </RNCText>
+              <RNCText
                 style={{
                   marginRight: 8,
                   fontFamily: 'PoppinsBold',
@@ -70,15 +64,15 @@ const AccordionMentory: React.FC<AccordionProps> = ({
                 }}
               >
                 C: {formatNumber(knowledge)}
-              </Text>
+              </RNCText>
             </>
           )}
           <FontAwesome
             name={isExpanded ? 'angle-up' : 'angle-down'}
             size={24}
             color="black"
           />
-        </View>
+        </S.ViewWrapper>
       </TouchableWithoutFeedback>
 
       {isExpanded && (
@@ -98,12 +92,12 @@ const AccordionMentory: React.FC<AccordionProps> = ({
               justifyContent: 'space-around',
             }}
           >
-            <Text style={{ fontFamily: 'Poppins', color: '#687076' }}>
+            <RNCText style={{ fontFamily: 'Poppins', color: '#687076' }}>
               Implementação: {formatNumber(implementation)}
-            </Text>
-            <Text style={{ fontFamily: 'Poppins', color: '#687076' }}>
+            </RNCText>
+            <RNCText style={{ fontFamily: 'Poppins', color: '#687076' }}>
               Conhecimento: {formatNumber(knowledge)}
-            </Text>
+            </RNCText>
           </View>
           <TextInput
             placeholder="Comentários"
@@ -123,7 +117,7 @@ const AccordionMentory: React.FC<AccordionProps> = ({
           />
         </View>
       )}
-    </View>
+    </S.Wrapper>
   );
 };
 

diff --git a/src/components/AccordionMentory/styles.ts b/src/components/AccordionMentory/styles.ts
@@ -0,0 +1,18 @@
+import { View } from 'react-native';
+import styled from 'styled-components/native';
+
+export const Wrapper = styled(View)`
+  margin-top: 16px;
+  border-radius: 8px;
+`;
+
+export const ViewWrapper = styled(View)`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+
+  background-color: '#F1F3F5';
+  padding: 10px;
+  border-radius: 8px;
+`;