Skip to content

Commit 2b909b5

Browse files
committed
Merge branch 'master' into feature/adminweb
2 parents aceb6dd + b941212 commit 2b909b5

34 files changed

+8864
-15607
lines changed

apps/mobile/starter/.expo/packager-info.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

apps/mobile/starter/.expo/settings.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

apps/mobile/starter/.gitignore

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
node_modules/
2+
.expo/
3+
dist/
4+
npm-debug.*
5+
*.jks
6+
*.p8
7+
*.p12
8+
*.key
9+
*.mobileprovision
10+
*.orig.*
11+
web-build/
12+
13+
# macOS
14+
.DS_Store

apps/mobile/starter/App.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { StatusBar } from 'expo-status-bar';
2-
import React from 'react';
32
import { SafeAreaProvider } from 'react-native-safe-area-context';
43

54
import useCachedResources from './hooks/useCachedResources';

apps/mobile/starter/app.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@
2121
"ios": {
2222
"supportsTablet": true
2323
},
24+
"android": {
25+
"adaptiveIcon": {
26+
"foregroundImage": "./assets/images/adaptive-icon.png",
27+
"backgroundColor": "#ffffff"
28+
}
29+
},
2430
"web": {
2531
"favicon": "./assets/images/favicon.png"
2632
}

apps/mobile/starter/assets/fonts/SpaceMono-Regular.ttf

100644100755
File mode changed.
17.1 KB
Loading
21.2 KB
Loading
37.1 KB
Loading
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = function(api) {
22
api.cache(true);
33
return {
4-
presets: ['babel-preset-expo'],
4+
presets: ['babel-preset-expo']
55
};
66
};

0 commit comments

Comments
 (0)