mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-26 12:23:58 +01:00
* Resolved merged conflicts * Resolved merge conflicts and updated workflow * Updated Location Flow and merged conflicts * Update flow and merge conflicts * Fixed LocationPicker's location flow * Removed redundant code from LocationPermissionsHelper * Fixed Explore fragment crashing and incorrect behaviour * Updated LocationPicker Flow * Fixed Nearby not working as intended * Final update to location flow of all maps * Added the reqested changes and fixed bugs * Resolved requested change in in-app camera location flow * Fixed In-app camera location flow * Resolved conflicts in ContributionsListFragment * Updated java doc as requested * Resolved nearby card dialog not being shown * Optimised LocationPermissionsHelper javadoc * Made requested changes for preference check * Added javadoc and requested comment for later reference * Implemented requested code changes * Fixed failing test due to changes made during PR * Added string resource for ExploreMapFragment * Changed string resource for rationale dialog * Added standard location flow information in LocationPermissionsHelper * Added javadoc for doNotAskForLocationPermission * Removed unused import * Updated javadoc * Removed values-yue-hant * Fix some merge conflict errors * Fix minor errors due to mergre conflicts * Fix some refactor errors * Fixed minor bug due to merging conflicts * Delete app/src/main/res/values-yue-hant directory * Final changes to NearbyParentFragment * Fixes #5686 map coordinates set to image coords * Removed some redundant code from recenterMap * Removed one test whose method no longer exists * Removed unused method from contract of nearby * Removed redundant method from NearbyParentFragment * nearby: add a FIXME about the possibly redudant code --------- Co-authored-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
This commit is contained in:
parent
1f2e31d45b
commit
04f9ef4819
16 changed files with 421 additions and 297 deletions
|
|
@ -282,6 +282,8 @@
|
|||
<string name="nearby_location_not_available">Nearby might not work properly, Location not available.</string>
|
||||
<string name="upload_location_access_denied">Location access denied. Please set your location manually to use this feature.</string>
|
||||
<string name="location_permission_rationale_nearby">Permission required to display a list of nearby places</string>
|
||||
<string name="location_permission_rationale_explore">Permission required to display a list of nearby images</string>
|
||||
|
||||
|
||||
<string name="nearby_directions">Directions</string>
|
||||
<string name="nearby_wikidata">Wikidata</string>
|
||||
|
|
@ -355,7 +357,7 @@
|
|||
<string name="share_app_title">Share App</string>
|
||||
<string name="rotate">Rotate</string>
|
||||
|
||||
<string name="error_fetching_nearby_places">Error fetching nearby places.</string>
|
||||
<string name="error_fetching_nearby_places">Could not load nearby places</string>
|
||||
<string name="no_pictures_in_this_area">No pictures in this area</string>
|
||||
<string name="no_nearby_places_around">No nearby places around</string>
|
||||
<string name="error_fetching_nearby_monuments">Error fetching nearby monuments.</string>
|
||||
|
|
@ -586,7 +588,7 @@ Upload your first media by tapping on the add button.</string>
|
|||
<string name="coordinates_edit_helper_edit_message_else">Could not add coordinates.</string>
|
||||
<string name="description_edit_helper_edit_message_else">Could not add descriptions.</string>
|
||||
<string name="caption_edit_helper_edit_message_else">Could not add caption.</string>
|
||||
<string name="coordinates_picking_unsuccessful">Unable to get coordinates.</string>
|
||||
<string name="coordinates_picking_unsuccessful">Image\'s coordinates not updated</string>
|
||||
<string name="descriptions_picking_unsuccessful">Unable to get descriptions.</string>
|
||||
<string name="description_activity_title">Edit descriptions and captions</string>
|
||||
|
||||
|
|
@ -623,8 +625,10 @@ Upload your first media by tapping on the add button.</string>
|
|||
<string name="cannot_open_location_settings">Failed to open location settings. Please turn on location manually</string>
|
||||
<string name="recommend_high_accuracy_mode">For best results, choose the High Accuracy mode.</string>
|
||||
<string name="ask_to_turn_location_on">Turn on location?</string>
|
||||
<string name="ask_to_turn_location_on_text">Kindly turn on location services for the app show your current location</string>
|
||||
<string name="nearby_needs_location">Nearby needs location enabled to work properly</string>
|
||||
<string name="upload_map_location_access">You need to give access to your current location to set location automatically.</string>
|
||||
<string name="explore_map_needs_location">Explore map needs location permission to display nearby images</string>
|
||||
<string name="upload_map_location_access">You need to give location permission to set location automatically.</string>
|
||||
<string name="use_location_from_similar_image">Did you shoot these two pictures at the same place? Do you want to use the latitude/longitude of the picture on the right?</string>
|
||||
<string name="load_more">Load More</string>
|
||||
<string name="nearby_no_results">No places found, try changing your search criteria.</string>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue