Merge branch 'master' of https://github.com/matheralvs/econominhas-mobile

Author: diegohfcelestino

.eslintrc.js

@@ -3,7 +3,7 @@ module.exports = {
   extends: ['universe/native'],
   rules: {
     'import/order': [
-      'error',
+      'warn',
       {
         groups: ['builtin', 'external', 'internal'],
         pathGroups: [
@@ -12,6 +12,11 @@ module.exports = {
             group: 'external',
             position: 'before',
           },
+          {
+            pattern: '~/**',
+            group: 'external',
+            position: 'after',
+          },
         ],
         pathGroupsExcludedImportTypes: ['react'],
         'newlines-between': 'always',

.vscode/settings.json

@@ -3,9 +3,10 @@
   "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
     "source.fixAll": "explicit",
-    "source.fixAll.eslint": "explicit"
+    "source.fixAll.eslint": "explicit",
+    "source.organizeImports": "always"
   },
   "[typescript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   }
-}
+}

App.tsx

@@ -1,7 +1,6 @@
 import { GoogleSignin } from '@react-native-google-signin/google-signin';
 
-import App from './src';
-import { default as CustomThemeProvider } from './src/contexts/customTheme';
+import { App } from './src';
 
 GoogleSignin.configure({
   webClientId:
@@ -11,11 +10,7 @@ GoogleSignin.configure({
 });
 
 function Main() {
-  return (
-    <CustomThemeProvider>
-      <App />
-    </CustomThemeProvider>
-  );
+  return <App />;
 }
 
 export default Main;

assets/fonts/NunitoSansBold.ttf

@@ -3,16 +3,27 @@ module.exports = function (api) {
   return {
     presets: ['babel-preset-expo'],
     plugins: [
+      'nativewind/babel',
       [
         'module-resolver',
         {
+          root: ['./src'],
           alias: {
-            '@src': './src',
-            '@hooks': './src/hooks',
+            '~/@types': './src/types',
+            '~/assets': './src/assets',
+            '~/components': './src/components',
+            '~/contexts': './src/contexts',
+            '~/hooks': './src/hooks',
+            '~/navigation': './src/navigation',
+            '~/screens': './src/screens',
+            '~/services': './src/services',
+            '~/utils': './src/utils',
+            '~/storage': './src/storage',
+            '~/constants': './src/constants',
+            '~/dtos': './src/dtos',
           },
         },
       ],
-      ['babel-plugin-styled-components'],
     ],
   };
 };

assets/fonts/NunitoSansExtraBold.ttf

@@ -25,12 +25,12 @@
     "expo-updates": "~0.18.17",
     "jest": "^29.2.1",
     "jest-expo": "~49.0.0",
+    "nativewind": "2.0.11",
     "react": "18.2.0",
     "react-native": "0.72.6",
     "react-native-mmkv": "^2.11.0",
     "react-native-safe-area-context": "4.6.3",
-    "react-native-screens": "~3.22.0",
-    "styled-components": "^6.1.1"
+    "react-native-screens": "~3.22.0"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
@@ -42,13 +42,13 @@
     "@typescript-eslint/eslint-plugin": "^6.13.1",
     "@typescript-eslint/parser": "^6.13.1",
     "babel-plugin-module-resolver": "^5.0.0",
-    "babel-plugin-styled-components": "^2.1.4",
     "eslint": "^8.55.0",
     "eslint-config-universe": "^12.0.0",
     "git-commit-msg-linter": "^5.0.4",
     "husky": "^8.0.3",
     "lint-staged": "^15.2.0",
     "prettier": "^3.1.0",
+    "tailwindcss": "3.3.2",
     "typescript": "^5.1.3"
   },
   "jest": {
@@ -60,8 +60,5 @@
     ]
   },
   "license": "MIT",
-  "private": true,
-  "resolutions": {
-    "styled-components": "^5"
-  }
-}
+  "private": true
+}