Skip to content

Commit 8f33222

Browse files
micaellagouveiamicaellagouveia
authored
Merge pull request #20 from fga-eps-mds/develop
Major Release - MVP
2 parents 4b34e32 + 16a66bd commit 8f33222

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+8300
-29798
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ web-build/
1111

1212
# macOS
1313
.DS_Store
14+
.env

‎.idea/.gitignore

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎App.js

+15-9
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import { BottomNavigation } from './src/navigation';
66
import {
77
LocationContextProvider,
88
LanguageContextProvider,
9+
TrunkContextProvider,
10+
IdiomContextProvider,
911
} from './src/contexts';
1012
import { useCustomFonts } from './src/helpers';
1113

@@ -17,14 +19,18 @@ export default function App() {
1719
}
1820

1921
return (
20-
<LanguageContextProvider>
21-
<LocationContextProvider>
22-
<SafeAreaProvider>
23-
<NavigationContainer>
24-
<BottomNavigation />
25-
</NavigationContainer>
26-
</SafeAreaProvider>
27-
</LocationContextProvider>
28-
</LanguageContextProvider>
22+
<IdiomContextProvider>
23+
<TrunkContextProvider>
24+
<LanguageContextProvider>
25+
<LocationContextProvider>
26+
<SafeAreaProvider>
27+
<NavigationContainer>
28+
<BottomNavigation />
29+
</NavigationContainer>
30+
</SafeAreaProvider>
31+
</LocationContextProvider>
32+
</LanguageContextProvider>
33+
</TrunkContextProvider>
34+
</IdiomContextProvider>
2935
);
3036
}

‎app.config.js

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
export default {
2+
expo: {
3+
name: 'multilind-frontend',
4+
slug: 'multilind-frontend',
5+
version: '1.0.0',
6+
orientation: 'portrait',
7+
icon: './assets/icon.png',
8+
splash: {
9+
image: './assets/splash.png',
10+
resizeMode: 'contain',
11+
backgroundColor: '#ffffff',
12+
},
13+
updates: {
14+
fallbackToCacheTimeout: 0,
15+
},
16+
assetBundlePatterns: ['**/*'],
17+
ios: {
18+
supportsTablet: true,
19+
},
20+
android: {
21+
permissions: ['ACCESS_BACKGROUND_LOCATION'],
22+
adaptiveIcon: {
23+
foregroundImage: './assets/adaptive-icon.png',
24+
backgroundColor: '#FFFFFF',
25+
},
26+
package: 'com.gabrieldvpereira.multilindfrontend',
27+
},
28+
web: {
29+
favicon: './assets/favicon.png',
30+
},
31+
},
32+
};

‎app.json

-36
This file was deleted.

0 commit comments

Comments
 (0)