Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Javadocs and minor refactoring for Nearby package #2188

Merged
merged 30 commits into from
Dec 20, 2018
Merged

Javadocs and minor refactoring for Nearby package #2188

Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
771ed58
Merge remote-tracking branch 'refs/remotes/commons-app/master'
misaochan Jul 28, 2018
d888b52
Merge remote-tracking branch 'refs/remotes/commons-app/master'
misaochan Jul 31, 2018
11c3772
Add Traceur for getting meaningful RxJava stack traces (#1832)
maskaravivek Aug 17, 2018
4c476e7
Hotfix for overwrite issue in 2.8.0 (#1838)
neslihanturan Aug 20, 2018
b743d02
Versioning and changelog for v2.8.2 (#1842)
misaochan Aug 20, 2018
efb8c5a
Merge branch '2.8-release' of https://github.com/commons-app/apps-and…
misaochan Aug 30, 2018
2db4e19
Merge remote-tracking branch 'refs/remotes/commons-app/master'
misaochan Sep 24, 2018
a900b1d
Merge remote-tracking branch 'refs/remotes/commons-app/master'
misaochan Oct 26, 2018
dccf73a
Merge remote-tracking branch 'refs/remotes/commons-app/master'
misaochan Dec 8, 2018
9c890ec
Delete unused MaterialShowcase class
misaochan Dec 8, 2018
656a46c
Add Javadocs and fix lint errors for DirectUpload.java
misaochan Dec 8, 2018
bb7983e
Fix whitespace and add docs
misaochan Dec 8, 2018
5b38f9c
Replace fragment.getActivity() with the parentActivity var
misaochan Dec 8, 2018
238114e
Rename unnecessarily-overloaded method getFromWikidataQuery(), add Ja…
misaochan Dec 8, 2018
c32e8d2
Javadocs and whitespaces for NearbyPlaces.java
misaochan Dec 8, 2018
8ebe9b9
Use local vars where possible instead of class fields. Non-constants …
misaochan Dec 8, 2018
959b53e
Missed one unnecessary class field
misaochan Dec 8, 2018
a8bfd4a
Remove unnecessary whitespaces that don't improve readability
misaochan Dec 8, 2018
9f82600
Add class summary
misaochan Dec 8, 2018
0e6faa7
Optimize imports
misaochan Dec 8, 2018
c759115
Fix access modifiers in Place.java
misaochan Dec 8, 2018
7aac64e
Clearer Javadocs
misaochan Dec 8, 2018
e2480fa
Merge remote-tracking branch 'refs/remotes/commons-app/master' into t…
misaochan Dec 16, 2018
3a7fe2d
Add Javadocs to Place.java
misaochan Dec 16, 2018
f2425fa
Merge remote-tracking branch 'refs/remotes/commons-app/master' into t…
misaochan Dec 16, 2018
e8c94b0
Merge remote-tracking branch 'refs/remotes/commons-app/master' into t…
misaochan Dec 20, 2018
bc11ad8
Remove residual conflict
misaochan Dec 20, 2018
aca60c8
Fix lint issues in Sitelinks
misaochan Dec 20, 2018
0dcedf0
Javadocs for Sitelinks.java
misaochan Dec 20, 2018
f25b267
DirectUpload: Replace nested conditionals with guard clauses
domdomegg Dec 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove residual conflict
  • Loading branch information
@misaochan
misaochan committed Dec 20, 2018
commit bc11ad8504f3e74de247ecfbf36dbc477ab4ce78
1 change: 0 additions & 1 deletion app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ List<Place> radiusExpander(LatLng curLatLng, String lang, boolean returnClosestR
}

/**
<<<<<<< HEAD
* Runs the Wikidata query to populate the Places around search location
* @param cur coordinates of search location
* @param lang user's language
Expand Down