Commit graph

672 commits

Author SHA1 Message Date
neslihanturan
e7efd7e162
Fix auto zoom issue #3391 Zoom level gets reset at every second. (#3564)
* Add method to check if curr location marker is vsible or not

* Recenter map if users see their current location marker

* Add new methods to Contract
2020-03-27 00:53:11 +10:00
Aryan Tyagi
021105ac4d
Add a dialog to prompt user if location is off in Nearby when L… (#3438) 2020-03-18 15:50:00 +05:30
318anushka
bdb61dfda6
Fixes #2238 scalebar added in map (#3511)
* scalebar added in map

* changes reverted in .idea/Project.xml

* magic numbers replaced with constants for scalebar

* Default setting for scaling unit

* Default setting for scalebar refresh interval

* Reformatted code for adding scalebar

* dimen values for scalebar params
2020-03-17 08:41:31 +00:00
Anmol Gupta
34a016d49d
Change item background according to the theme (#3480)
* Change item  background according to the theme

* Change background colour of item on being selected

* Change background colors using XML selectors
2020-03-16 10:13:20 +00:00
taakanksha
61a3f45512
openStreetMap attribution enabled (#3485) 2020-03-11 09:51:38 +00:00
Seán Mac Gillicuddy
1584ffe0e2
Added Support for System Wide Dark Theme (#3460)
* Added Support for System Wide Dark Theme

* changed methods to private

* Moved Strings to strings.xml

* Used Dagger to reduce code repetition

* Changes made as per review suggestions

* Minor Changes

* Fixes as per suggestions

* Minor Fixes as per suggestion

* made the variables static

* removed irrelevant code
2020-03-05 14:33:57 +00:00
Aryan Tyagi
fffff62f5c
Fixed a type in NearbyParentFragment.java where significantly was written instead of slightly while adding a log using Timber (#3432) 2020-02-25 13:56:50 +02:00
Kshitij Bhardwaj
96f4a5c08f
Fixes #3355 : Do not display pins at all when "Needs Photo" is selected (#3407)
* ic_custom_greyed_out_marker: removing grey marker

* NearbyParentFragment: changing function name and description

* change method name to hideAllMarkers
2020-02-19 20:43:19 +02:00
Ashish Kumar
fdbe53d1e5
Fixes #3371 (#3372)
* Is UserBrowsing should first check if last known location is non-null before checkig if last location and current locations are close
2020-02-05 01:00:57 +10:00
Ashish Kumar
05e98307be
Fixes #3303 (#3322)
* Fixes #3303
* Refactor Nearby to alig lifecycle methods

* Pass updated place list to listfragment

* Added default zoom rate to mapbox

* Removed NearbyListFragmet and added the ui login to handle the same in NearbyParentFragment

* More code refactor
* Make BottomSheetList hideable
* onFragmentHide, hide the bottom sheets

* BigFix, Fragmet visibility, register/un-register camera move based on fragments lifecycke

* More code refactor
* Let the ExecutorUtil have non-ui thread
* Add Location Marker on non-ui thread (the non-ui stuffs)

* BugFixes
* Removed configchanges "orientation" from MainActivity in Manifest (That was messing with the fragment lifecycle)
* Some null checks
* Initialise lastknown location in onMapReady

* UI Fixes
* Adjusted UI to support dark and no-dark themes both (in nearby)
* Do not update map on Location Slightly changed

* Fix failing test case, let TestCommonsApplication extend Application instead of CommonsApplication

* start map view when nearby is visible

* start the map when NearbyFragmet is visible

* More bugfixes
* Added DUMMY view for NearbyPresenter's onDetach State
* Added a wrapper frame layout parent for MapView to preven it from drawing above other views

* More bugfixes (Fixes #3287)
* Gray out the un-selected markers from the nearby filter list

* BugFix, search this area should search the nearby places for the current camera position

* More BugFixes
* Handle null primitives with proxy
* Current location marker flow via permission flow

* onCameraMove should have null-check on NearbyController.latestSearchLocation instead of currentLocation

* Search for places around last focus location

* Handle location updates
* If the user is browsing the map, donot update the map with current location
2020-02-04 11:05:29 +02:00
Vivek Maskara
2290545bc9
Suggest and auto fill title and description based on image location (#3323)
* Suggest and auto fill title and description based on image location

* with java docs
2020-01-29 13:24:37 +03:00
Vivek Maskara
b0be4970ef Convert few model classes to kotlin (#3270) 2019-12-07 02:36:53 +10:00
Manuel Alcaraz
f7cca31c53 Optimize imports (#3272) 2019-12-06 17:51:36 +09:00
Vivek Maskara
2f9a71911a Remove unused code from the app (#3276) 2019-12-05 18:07:21 +05:30
Ashish Kumar
452f799cb3 Fixes #3260, handle null latlng when adding current location marker (#3261) 2019-12-03 17:44:31 +10:00
Vivek Maskara
9244c0015b Fix write to parcelable for Place object (#3248) 2019-12-01 17:03:08 +10:00
neslihanturan
1c470241e3 Fix multiple current location marker issue (#3243) 2019-11-29 21:45:25 +05:30
neslihanturan
21503fc786 Disable current location button during markers load (#3238) 2019-11-30 00:18:53 +10:00
neslihanturan
3e5360ae4d Prevent NPE (#3241) 2019-11-30 00:18:05 +10:00
neslihanturan
b3c11842f3 Fixes #1450 Add filter to nearby (#3178)
* Add layout items for nearby filter list and filter item

(cherry picked from commit b96f8a68ce)

* Edit nearby query

(cherry picked from commit 1f3c8c8deb)

* Add filter items to nearby parent fragment xml

(cherry picked from commit d0beadd0e0)

* Add icon for green marker

(cherry picked from commit f65ca0387a)

* Add layout util file to organize layout utilities

(cherry picked from commit 5c57939245)

* Add pic parameter to nearby result item

(cherry picked from commit 86007e4bb6)

* Add pic parameter to place type

(cherry picked from commit 25c358b67f)

* Add green marker styling

(cherry picked from commit 929c92d887)

* Inıt search layouts on Nearby parent

(cherry picked from commit 2ac38a1919)

* Style green markers at nearby controller

(cherry picked from commit 3e08f39f8e)

* Edit bookmark daos to include pic to tables

(cherry picked from commit 48d69edf3b)

* TODO foc bookmark dao item but works now

(cherry picked from commit f748399720)

* Style nearby filter area

(cherry picked from commit 6267e488b0)

* fix style of filter tab

(cherry picked from commit 5f843bf366)

* Add nearby list adapter

(cherry picked from commit 56334afe03)

* Current status, list size is working, visibility working, filter mechanism is ready

(cherry picked from commit 7d75c9c589)

* Filtering works

(cherry picked from commit 8a13cf7728)

* Filter function works

(cherry picked from commit 78368a2c0c)

* Fix style issues

(cherry picked from commit 2204f70255)

* Add divider to recyclerview

(cherry picked from commit c8100b55d7)

* Hide bottom sheets accordingly

(cherry picked from commit c5deba8b0b)

* Code cleanup

(cherry picked from commit cf8f64f3cb)

* Add actions to chips

* Fetch destroyed information from servers

* Add destroyed places icon

* Make chip filter functions work

* Revert irrelevant changes

* Revert accidentally replaced strings

* Remove unneeded lines

* Remove only places expalanation from trings

* Do not filter if nearby places are not loaded

* Add triple checkbox for add none and neutral

* Make tri checkbox work

* Fix travis issue

* Add coments

* fix search this area button locaton

* Set initial place type state and recover it between each populate places
2019-11-28 18:22:32 +10:00
neslihanturan
44cdd2fdc7 Refactor nearby classes mvp (#2969)
* Create parent contract

* Create map child contract and fill methods

* Add javadocs and specific interfaces for list

* Move general method to parent and add javadocs for parent

* Add explanation for keeping an emty View interface under NearbyListContract

* Move constracts under contract package

* Create presenters for map and list and implement user actions accordingly

* Add javadocs

* Add presenter, contract and fragment for parent Fragment of both NearyListFragment and NearbyMapFragment

* Implement missing methods

* Fix typo

* Add main views on fragment

* İmplement child fragment logic and their retain

* Relate parent presenter with parent fragment

* Add all location permission related methods to view contract and implement in fragment. Call them from presenter by passing locationServiceManager parameter

* Define refreshView method as updateMapAndList which is a better naming. Define it at presenter part.

* Define a presenter variable in fragment and call updateMapAndList method from there, if permissions are okay

* Add lock neabry method to unlisten nearby operations during updates

* Add network connection established check on view side, check it from presenter

* try to simplify previous method during refactor

* Add missing methods for NearbyMap

* Connect child fragment and prent fragment with presenter

* Change nearby design, first create views then register listeners

* AddnetworkBroadcatsReceiver on view side, call it from presenter

* Add comments

* Change the old NearbyFragment by our new NearbyParentFragment for first tests

* Prevent crash caused child fragment is actually null by checking if it is attached or not.

* Makes sure that initialize nearby operations method is called just after all views and fragments are ready and attached

* Make sure updateMAoAndList method is called when everything ready

* Rename a method with prepoer name

* Call update map and add required markers

* Find out zoom level problem

* Implement add nearby markers and add current marker methods

* remove unneeded codes copied from previous implementation

* Revert "remove unneeded codes copied from previous implementation"

This reverts commit 42539651de.

* add some commits and clear code

* Remove location listener implementation from view, handle them in presenter instead. And add timber debug notes and required method calls

* Style ,issues

* Refactor a variable name to camel case and bind search this area view

* Search this area button action is added

* Mostly implement search this area methods, not tested yet even once

* Make sure everything is called in required order and seach this area method basically works

* Rename methods accordingly and add Javadocs

* Add current location marker and remove circle around it

* Remove unused methods

* Add current location marker with object animator and remove previous marker is exists

* include clear map into add markers method and reorder methods

* Make search this area button appear at correct time

* Try to load un search this area is called

* Clear logs

* Add changes for permission made by Vivek to newly added fragments along with our nearby classes

* Add a view to nearby map ragment and insert map view as an item inside it

* Add logs to uınderstand why on meap ready callback is never called

* Add list item clicked and bottom sheet for list of nearby items is expanded

* Make nearby map ready callback came

* Add required methods to be called after map view is ready

* State: Map ready call is not called but permissions and methods are in correct order

* Remove unused logs

* Try to use SupportMapFragment instead, still no success...

* use SupportMapFragment instead

* Remove unused Near

* Upgrade mapbox sdk versions

* Remove Style import from fragment/NearbyMapFragment

* Remove Style import from **fragments/NearbyParentFragment

* Remove nearby/NearbyMapFragment

* Remove unused/old NearbyFragment and NearbyMapFragment

* Remove import of already removed class

* Make sure you removed everything related with mapbox implementation

* Update mapbox map

* Remove unused classes, do not forget centerMapToPlace doesn't work on this branch

* Remove Style class it required updated version of mapbox map

* Add base codes for new activity

* Prove that our mapbox sdk let us implement the map directly inside the activity

* Add base codes for testing mapbox activity in a single fragment inside activity

* Add codes from mapbox demo repository to test support fragment, map works in a single layer fragment

* Add base codes for test layered fragment activity

* Add Support fragment inside a fragment and proves that layered fragmentw with map works

* Test view pager and tab layout with support map fragment to see it works, it works!

* Move Contributions Fragment related codes to test activity

* Move nearby card methods

* Inject location manager and implement NerabyParentFragmentContract.View on test fragment

* Coppy the content of SupportMapFragment from mapbox repository, use this code to modify later. This method war suggested by mapbox team instead of extending the class

* Implement NearbyMapContract.View on our new SupportMapFragment

* Start to mplement logic of checking permissions

* Fix small dagger issue to inject location manager properly

* Request permission for nearby places if fragment is loaded and tab is selected

* Initialize map operations if map ready and tab is selected

* Markers loads at correct time

* Style the map according to new version of mapbox map

* Add some map elements like FABs and give their actions

* Implement map marker click actions

* Implement nearby Fabs logic with a small issue

* fix FABs are not closing problem

* Unkown problem occurs at map load when I try to use MainActivity again.

* Revert "Unkown problem occurs at map load when I try to use MainActivity again."

This reverts commit 3dc084415b.

* Search this area buttons are added but button function does not work and button visibility is problematic

* Fix issue with MainActivity with the help of Ashish

* Fix search this area button visibility issue

* Fix the issues with updating search nearby markers and camera position together

* Fix progress bar visibility issue

* Prevent loding map each time tab selected

* Take toolbar back

* Implement back button with presenter

* Add click actoion to bottom sheet details

* Add nearby list into bottom sheeet

* Make reuse existing fragments if there is any

* Code cleanup

* Cleanup

* Code cleanup

* Add lifecyle codes to prevent leaks

* Cleanup

* Code cleanup

* cleanup

* Make list item clicked and map focus to same place

* Add bookmark from list fragment

* Make nearby card click action work

* Revert "Fix conflicts"

This reverts commit f3451745d3, reversing
changes made to c5d4d5533d.

* Code cleanup

* Cleanup

* Make recenter button work when list sheet is expanded

* Cleanup

* Code cleanups

* NPE issue is not detected for now, can be solved on seperate PR

* Update map after Wikidata edit

* Cherry picked previously reverted merge, hoping this will fix enourmus amounts of diff files

* Previous merge bringed an file which should be deleted. Delete it.

* Revert irrelevant changes on build.gradle

* Revert irrelevant changes

* Jetbrains annotation is not included to build gradle, this issue caused build issues on my branch so I removed it to be able to build

* Rename ListView

* Use a singleton to access the presenter, instead of passing it to a variable inside fragment

* Fix code style issues

* Move hardcoded colors to colors.xml file

* Make larger methods smaller

* Make current location marker follow

* Do not track users position if user is searching around

* Revert irrelevant shanges at build gradle

* Remove unneeded variable

* Remove mvp directory, add sub directories directly under nearby directory instead

* Remove unneeded public definiton

* Remove unneeded namespace

* Add public defiiton, it is needed to reach the constructor.
2019-10-16 00:32:05 +10:00
PavelAplevich
864ecad2e7 Working with #3129 issue (#3146)
* Replace Hard-Coded strings with those from strings.xml.
2019-09-09 11:01:30 +05:30
Ufald
67d9afe77e Center map on location clicked in nearby list and notification card(#2060) (#2366)
* center map on location clicked in nearby (#2060)

* improved animation

* Center map on location clicked in nearby list

* removed unnecessary methods

* center map on location clicked in nearby notification card

* some minor changes

* travis build error

* resolved errors

* Tidy up PR
2019-08-05 14:00:42 +03:00
Vivek Maskara
f855bb5da9 With attribution enabled for OSM (#2997) 2019-06-10 19:28:39 +03:00
Vivek Maskara
8971743479 Fixes #2888: Use Dexter for requesting location permissions (#2925)
* Use dexter to ask for location permissions

* Addressed code review comments
2019-06-08 08:45:30 +03:00
Shubham Pinjwani
40e8182c9b removed Search This Area button if network connection is lost (#2774)
* removed Search This Area button if no connection is lost
2019-04-26 11:08:43 +03:00
Madhur Gupta
70b19754fb Completed TODO init views using bind view #2804 (#2808)
* Completed TODO init views using bind view #2804

* Added TODO
2019-04-20 14:14:49 +05:30
Vivek Maskara
dcbf076965
Update master with backend overhaul branch (#2829)
* Beginnings of integration with Wikipedia client library. (#2642)

* Remove remaining unnecessary API version check.

* Roll up sleeves.

* Add and integrate the beginnings of app adapter.

* Remove vestigial event logging logic.

Event logging is no longer used in this app.

* Beginnings: remove StringUtils and associated redundancies.

* Remove redundant capitalize() method.

* Remove redundant urlEncode() method.

* Remove redundant (and incomplete) language lists.

* Remove redundant usages of SimpleDateFormat.

* Remove redundant json type adapter.

* Remove redundant MW error model classes.

* Rip out redundant MW model classes.

* Pass SessionManager into AppAdapter instead of injecting.

* Wire up more of the AppAdapter.

* Remove redundant Gson initialization and type adapters.

* Rip out PageTitle.

This was being used in some slightly incorrect/unexpected ways.

* Don't need static WikiSite.

* Bump data client library version

* Bump library version and fix build

* Fix tests

* Fix build

* Fix media of the day

* With fixes in recently modified APIs
2019-04-02 08:35:22 +05:30
Vivek Maskara
2021baa080 Consistent handling of web and geo urls (#2750)
* Consistent handling of web and geo urls

* Remove Google map intent
2019-03-28 18:23:36 +05:30
Zhao Gang
0afcce8919 Remove unused nearby map style code (#2672) 2019-03-19 21:36:33 +00:00
Dmitry Brant
8474c04c64 Fix crash(es) caused by failing to dispose Rx observables (#2669) 2019-03-19 21:08:04 +00:00
Dmitry Brant
351109440f Fix memory leak(s). (#2674) 2019-03-19 19:59:33 +00:00
Divyanshu Shukla
16df68a073 Fix #2246: Remove NPE in Nearby (#2247) 2019-03-17 15:20:17 +00:00
Vanshika Arora
9d55c1e8d7 Fix #2245: Correct back button behaviour from nearby fragment (#2301) 2019-03-16 16:27:25 +00:00
Vitaly V. Pinchuk
a26b62f51b Fix #1334: Refactor variable names of nearby_query.rq (#2583)
* all variables were refactored to camelCase
2019-03-16 21:09:39 +05:30
Vivek Maskara
7cb87f3cab Consolidate shared prefs to a single store (#2613)
* Consolidate shared prefs to a single store
* Fix achievements activity
* Fix store usage
2019-03-16 13:56:56 +00:00
Adam Jones
51f58b7118 Add MapBox localization (#2614) 2019-03-16 19:07:21 +05:30
Adam Jones
0bbfd54465 Fix #2610: Use dark map theme in night mode (#2611) 2019-03-16 18:03:15 +05:30
Vivek Maskara
57e685cf6c Fix #2593: Migrate to androidX (#2594)
* Update dependencies and migrate to androidX
* Make gradle properties tidy
2019-03-16 11:22:37 +00:00
Zhao Gang
bb40c24de8 Fix #2520: Fix dangling snackbar in NearbyFragment (#2521)
NetworkBroadcastReceiver is unregistered in onPause() and not reregistered in onResume(). This causes the snackbar doesn't disappear after network becomes available. Fixed this and improved the null checking logic in snackbar related code.
2019-03-15 23:47:21 +00:00
Yusuke Matsubara
b5051f9a4f Use Timber.e(Throwable t, String message, Object... args) (#2582) 2019-03-15 08:34:25 +05:30
Vanshika Arora
0c717ecad1 removed inactive icons from the bottom panel in nearby (#2549)
* removing inactive icons

* removing inactive icons

* requested changes
2019-03-09 10:44:12 +05:30
Ronan Brigdale
de9a72d465 Fix Lint Issues #171: Remove unused imports (#2533)
* Fix Lint Issues #171: Remove unused imports

Removed unused Java imports

* Fix Lint Issues #171: Perfromance issue, close cursor

Cursor was not closed when no longer needed
2019-03-02 19:30:50 +05:30
Madhur Gupta
ef6fd9f292 Fix Bug #2477 (#2488) 2019-02-27 01:58:15 +05:30
Madhur Gupta
5dffea4242 Fix Bug #2489 (#2491)
* Fix Bug #2489

* Removed Unused import Log statement
2019-02-27 01:57:43 +05:30
Vanshika Arora
105e5d7894 Made nearby notification also visible to right-to-left languages (#2365)
* Fixed Issue #2334

* resolved gradle changes

* changed gragle.wrapper
2019-02-27 01:55:27 +05:30
Vivek Maskara
5a6402cd07 Make nearby query faster (#2419)
* Make nearby query faster

* Fix query
2019-02-10 20:53:02 +05:30
Vivek Maskara
f12837650a Use JSON SPARQL query for fetching nearby places (#2398)
* Use JSON response for nearby places

* Move okhttp calls to a different class

* wip

* Fetch picture of the day using JSON API

* Search images using JSON APIs

* tests

* Fix injection based on code review comments
2019-02-06 10:40:30 +05:30
Shubham Pinjwani
1d1088cfe5 Nearby map not loading on changing orientation issue solved(#2368) (#2372) 2019-02-06 02:10:57 +05:30
Shubham Pinjwani
29bea33035 hide the notification card if there's no nearby location (#2396)
* hide the notification card if there's no nearby location

* some minor changes
2019-02-06 01:59:44 +05:30