Skip to content

Commit cc78e4d

Browse files
committed
Merge branch 'mobile' into fix/upload
# Conflicts: # mobile/app/(observer)/(app)/form-questionnaire/[questionId].tsx # mobile/app/(observer)/(app)/report-issue.tsx # mobile/assets/locales/en/translations.json # mobile/contexts/persist-query/PersistQueryContext.provider.tsx # mobile/hooks/useCamera.tsx # mobile/package-lock.json # mobile/package.json
2 parents 1fe7884 + 01ac115 commit cc78e4d

152 files changed

Lines changed: 43795 additions & 35577 deletions

File tree

Some content is hidden

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

mobile/.tamagui/tamagui.config.json

Lines changed: 35106 additions & 31180 deletions
Large diffs are not rendered by default.

mobile/app.json

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"expo": {
33
"name": "VoteMonitor",
44
"slug": "vote-monitor",
5-
"version": "0.2.1",
5+
"version": "1.0.9",
66
"scheme": "mobile",
77
"orientation": "portrait",
88
"icon": "./assets/icons/icon.png",
@@ -12,21 +12,26 @@
1212
"resizeMode": "contain",
1313
"backgroundColor": "#FDD20C"
1414
},
15-
"assetBundlePatterns": ["**/*"],
15+
"assetBundlePatterns": [
16+
"**/*"
17+
],
1618
"ios": {
1719
"supportsTablet": true,
1820
"bundleIdentifier": "org.commitglobal.votemonitor",
19-
"buildNumber": "54",
21+
"buildNumber": "65",
2022
"config": {
2123
"usesNonExemptEncryption": false
2224
},
2325
"infoPlist": {
24-
"UIBackgroundModes": ["fetch", "remote-notification"]
26+
"UIBackgroundModes": [
27+
"fetch",
28+
"remote-notification"
29+
]
2530
}
2631
},
2732
"android": {
2833
"softwareKeyboardLayoutMode": "pan",
29-
"versionCode": 54,
34+
"versionCode": 65,
3035
"adaptiveIcon": {
3136
"foregroundImage": "./assets/icons/adaptive-icon.png",
3237
"backgroundColor": "#FDD20C"
@@ -41,9 +46,9 @@
4146
"eas": {
4247
"projectId": "93e17628-ddcd-4e67-849c-b356a18a6082"
4348
},
44-
"message": "Logs and persist gate improevments",
45-
"updateCritical": 35,
46-
"updateVersion": 35
49+
"message": "Remove KeyboardAware",
50+
"updateCritical": 48,
51+
"updateVersion": 48
4752
},
4853
"owner": "commit-global",
4954
"runtimeVersion": {
@@ -74,14 +79,18 @@
7479
"color": "#FDD20C"
7580
}
7681
],
77-
["@morrowdigital/watermelondb-expo-plugin"],
82+
[
83+
"@morrowdigital/watermelondb-expo-plugin"
84+
],
7885
[
7986
"expo-build-properties",
8087
{
8188
"android": {
8289
"kotlinVersion": "1.6.10",
8390
"packagingOptions": {
84-
"pickFirst": ["**/libc++_shared.so"]
91+
"pickFirst": [
92+
"**/libc++_shared.so"
93+
]
8594
}
8695
}
8796
}
@@ -105,4 +114,4 @@
105114
"react-native-compressor"
106115
]
107116
}
108-
}
117+
}

mobile/app/(app)/(drawer)/(tabs)/(observation)/index.tsx

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

mobile/app/(app)/(drawer)/(tabs)/inbox.tsx

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

mobile/app/(app)/_layout.tsx

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

0 commit comments

Comments
 (0)