Skip to content

Commit

Permalink
Merge branch 'uk-retreat/improvements' into Alerts
Browse files Browse the repository at this point in the history
  • Loading branch information
ErikSin committed Dec 3, 2024
2 parents 8cdb51f + 846bfe9 commit 7645fff
Show file tree
Hide file tree
Showing 37 changed files with 3,616 additions and 1,979 deletions.
13 changes: 12 additions & 1 deletion app.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,18 @@
}
],
["./expo-config-plugins/removeExpoInputStyles.js"],
["./expo-config-plugins/targetArmArchsOnly.js"]
["./expo-config-plugins/targetArmArchsOnly.js"],
[
"react-native-share",
{
"android": [
"com.facebook.katana",
"com.instagram.android",
"com.twitter.android",
"com.zhiliaoapp.musically"
]
}
]
],
"android": {
"allowBackup": false,
Expand Down
13 changes: 6 additions & 7 deletions messages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -935,6 +935,9 @@
"description": "Button to share an observation",
"message": "Share"
},
"screens.Observation.TrackList.track": {
"message": "Track"
},
"screens.Observation.cancel": {
"description": "Button to cancel delete of observation",
"message": "Cancel"
Expand Down Expand Up @@ -1562,6 +1565,9 @@
"screens.Sync.ProjectSyncDisplay.waitingForDevices": {
"message": "Waiting for devices"
},
"screens.Track.ObservationList.observation": {
"message": "Observation"
},
"screens.Track.ObservationList.observations": {
"message": "Observations"
},
Expand Down Expand Up @@ -1657,12 +1663,5 @@
},
"sharedComponents.RoleWithIcon.participant": {
"message": "Participant"
},
"sharedComponents.WifiBar.noWifi": {
"message": "No Internet"
},
"sharedComponents.WifiBar.wifi": {
"description": "Label for wifi network name",
"message": "WiFi:"
}
}
Loading

0 comments on commit 7645fff

Please sign in to comment.