Skip to content

Commit

Permalink
Merge branch 'mobile' into fix/upload
Browse files Browse the repository at this point in the history
# 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
  • Loading branch information
dragos1195 committed Oct 7, 2024
2 parents 1fe7884 + 01ac115 commit cc78e4d
Show file tree
Hide file tree
Showing 152 changed files with 43,795 additions and 35,577 deletions.
66,286 changes: 35,106 additions & 31,180 deletions mobile/.tamagui/tamagui.config.json

Large diffs are not rendered by default.

31 changes: 20 additions & 11 deletions mobile/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"expo": {
"name": "VoteMonitor",
"slug": "vote-monitor",
"version": "0.2.1",
"version": "1.0.9",
"scheme": "mobile",
"orientation": "portrait",
"icon": "./assets/icons/icon.png",
Expand All @@ -12,21 +12,26 @@
"resizeMode": "contain",
"backgroundColor": "#FDD20C"
},
"assetBundlePatterns": ["**/*"],
"assetBundlePatterns": [
"**/*"
],
"ios": {
"supportsTablet": true,
"bundleIdentifier": "org.commitglobal.votemonitor",
"buildNumber": "54",
"buildNumber": "65",
"config": {
"usesNonExemptEncryption": false
},
"infoPlist": {
"UIBackgroundModes": ["fetch", "remote-notification"]
"UIBackgroundModes": [
"fetch",
"remote-notification"
]
}
},
"android": {
"softwareKeyboardLayoutMode": "pan",
"versionCode": 54,
"versionCode": 65,
"adaptiveIcon": {
"foregroundImage": "./assets/icons/adaptive-icon.png",
"backgroundColor": "#FDD20C"
Expand All @@ -41,9 +46,9 @@
"eas": {
"projectId": "93e17628-ddcd-4e67-849c-b356a18a6082"
},
"message": "Logs and persist gate improevments",
"updateCritical": 35,
"updateVersion": 35
"message": "Remove KeyboardAware",
"updateCritical": 48,
"updateVersion": 48
},
"owner": "commit-global",
"runtimeVersion": {
Expand Down Expand Up @@ -74,14 +79,18 @@
"color": "#FDD20C"
}
],
["@morrowdigital/watermelondb-expo-plugin"],
[
"@morrowdigital/watermelondb-expo-plugin"
],
[
"expo-build-properties",
{
"android": {
"kotlinVersion": "1.6.10",
"packagingOptions": {
"pickFirst": ["**/libc++_shared.so"]
"pickFirst": [
"**/libc++_shared.so"
]
}
}
}
Expand All @@ -105,4 +114,4 @@
"react-native-compressor"
]
}
}
}
87 changes: 0 additions & 87 deletions mobile/app/(app)/(drawer)/(tabs)/(observation)/index.tsx

This file was deleted.

119 changes: 0 additions & 119 deletions mobile/app/(app)/(drawer)/(tabs)/inbox.tsx

This file was deleted.

34 changes: 0 additions & 34 deletions mobile/app/(app)/_layout.tsx

This file was deleted.

Loading

0 comments on commit cc78e4d

Please sign in to comment.