Commit graph

339 commits

Author SHA1 Message Date
Yusuke Matsubara
c123767ae0 Add dependencies to com.android.support.test.rules and runner
Needed for ActivityTestRule used in SettingsActivityTest
2018-06-01 15:37:59 +09:00
Vivek Maskara
0e86741cc4
Merge branch 'master' into wikidataEdits 2018-05-31 10:02:38 +05:30
Vivek Maskara
4815e93fc9 Make P18 edits to corresponding wikidata entity on uploading from Nearby (#1495)
* Localisation updates from https://translatewiki.net.

* Integrate API for displaying featured images (#1456)

* Integrate API for displaying featured images

* Add pagination and refactor code so that it can be reused for category images

* Add license info to the images

* Fix author view

* Remove unused values

* Fix minor issues with featured images

* Fix null license url issue

* Remove some log lines

* Fix back navigation issue

* fix tests

* fix test inits

* Gracefully handling various error situations

* Added java docs

* Update pull_request_template.md (#1476)

* Update pull_request_template.md

* Remove Javadocs mention

* Added required/optional notes

* resolves #1464 : MediaDataExtractor is making inefficient (redundant) server calls (#1496)

* Open map of place where picture was taken (#1360)

* Intent to map added

*  Merge conflicts resolved

*  Added the functionality to hide FAB incase of null coordinate

*  Merge Conflict resolved

*  Improve pr quality

* Improve Quality

*  Added nested FAB animations

* Nested FAB implemented

*  Improve Quality

*  Added up arrow

*  Javadocs Added

* Add nearby tutorial (#1467)

* Add dependency for MaterialShowcase

* Add actionview class to get a reference to material showcase

* Create a NearbyMaterialShowcaseSequence class

* Apply sequence steps

* Add first three steps of nearby showcase

* Add sequence id constants to make sure they will be displayed only once

* Add last step of sequence to explain plus fab

* Create an object to prevent customize all sequences every time

* Fix typo

* Code cleanup

* Add strings to strings.xml

* Code cleanup

* Revert irrelevant change

* Revert irrelevant change

* Remove showcaseview for recenter button

* Use single showcaseView instead of sequence

* Add single showcase view insted of sequence to be able to edit text style

* Make sure it will be displayed only once

* Cleanup

* Update strings

* Change dismiss text style

* CONTRIBUTING: fix formatting of the gist of the guidelines (#1453)

* CONTRIBUTING: fix formatting of the gist of the guidelines

First level headings for a gist seems to be overkill.

So, replace first level headings with an ordered-list which
sounds more meaningful.

* CONTRIBUTING: specify clearly that 'blame' is a feature of "Git"

The contributing file specifies about the ability to know who wrote
something without the need of @author javadoc tags but incorrectly
attributes the feature to GitHub.

Correctly attribute the feature to where it belongs, Git, and specify
the name of the feature to help users easily take advantage of it.

* Feature/switch to butterknife (#1494)

* Implemented butterknife in MediaDetailFragment [issue #1491]

* Implemented butterknife in MediaDetailPagerFragment [[issue #1491]]

* post merge upstream master wip [[issue #1491]]

* Localisation updates from https://translatewiki.net.

* Bug fix #1504 (#1506)

* Bug fix #1504

* Filtered messages with ConnectException [issue #1504]

* A generalised message for exceptions in Nearby Activity [issue #1504]

* Localisation updates from https://translatewiki.net.

* Fix security exception crash while accessing network location provider (#1498)

* Fix security exception crash while accessing network location provider

* Added java docs

* Localisation updates from https://translatewiki.net.

* Log P18 edits to wikidata corresponding wikidata entity on uploading a nearby image

* Added java docs

* Fix test build

* Refresh nearby

* Refresh nearby list on successful edit

* Java docs

* Make authenticated wikidata edits

* Updated toast message to show entity name that was edited
2018-05-31 11:00:17 +10:00
neslihanturan
f0b8039778
Merge pull request #1449 from psh/consolidate-networking-libraries-step-1
Code cleanup + automated testing around GPS Categories
2018-05-27 08:41:03 +03:00
Anubhav Gupta
ae1cc86b03 Fixfor#1493 (#1548)
Update gradle dependencies
2018-05-26 03:40:12 +10:00
Paul Hawke
32cb8df9ae Consolidate the networking libraries - drop volley in favor of OkHttp 2018-05-25 01:42:12 -05:00
Vivek Maskara
2a0b9d8a0b Enable crosswiki notifications and minor UI fixes in displaying notif… (#1540)
* Enable crosswiki notifications and minor UI fixes in displaying notifications

* Added java docs
2018-05-24 15:54:31 +03:00
neslihanturan
8eed630ee5 Add nearby tutorial (#1467)
* Add dependency for MaterialShowcase

* Add actionview class to get a reference to material showcase

* Create a NearbyMaterialShowcaseSequence class

* Apply sequence steps

* Add first three steps of nearby showcase

* Add sequence id constants to make sure they will be displayed only once

* Add last step of sequence to explain plus fab

* Create an object to prevent customize all sequences every time

* Fix typo

* Code cleanup

* Add strings to strings.xml

* Code cleanup

* Revert irrelevant change

* Revert irrelevant change

* Remove showcaseview for recenter button

* Use single showcaseView instead of sequence

* Add single showcase view insted of sequence to be able to edit text style

* Make sure it will be displayed only once

* Cleanup

* Update strings

* Change dismiss text style
2018-05-18 16:52:11 +05:30
Vivek Maskara
30d7b5d35c Integrate API for displaying featured images (#1456)
* Integrate API for displaying featured images

* Add pagination and refactor code so that it can be reused for category images

* Add license info to the images

* Fix author view

* Remove unused values

* Fix minor issues with featured images

* Fix null license url issue

* Remove some log lines

* Fix back navigation issue

* fix tests

* fix test inits

* Gracefully handling various error situations

* Added java docs
2018-05-18 16:52:11 +05:30
neslihanturan
2a98bd21ce Add nearby tutorial (#1467)
* Add dependency for MaterialShowcase

* Add actionview class to get a reference to material showcase

* Create a NearbyMaterialShowcaseSequence class

* Apply sequence steps

* Add first three steps of nearby showcase

* Add sequence id constants to make sure they will be displayed only once

* Add last step of sequence to explain plus fab

* Create an object to prevent customize all sequences every time

* Fix typo

* Code cleanup

* Add strings to strings.xml

* Code cleanup

* Revert irrelevant change

* Revert irrelevant change

* Remove showcaseview for recenter button

* Use single showcaseView instead of sequence

* Add single showcase view insted of sequence to be able to edit text style

* Make sure it will be displayed only once

* Cleanup

* Update strings

* Change dismiss text style
2018-05-07 22:05:20 +10:00
Vivek Maskara
9845a6265d Integrate API for displaying featured images (#1456)
* Integrate API for displaying featured images

* Add pagination and refactor code so that it can be reused for category images

* Add license info to the images

* Fix author view

* Remove unused values

* Fix minor issues with featured images

* Fix null license url issue

* Remove some log lines

* Fix back navigation issue

* fix tests

* fix test inits

* Gracefully handling various error situations

* Added java docs
2018-05-07 11:09:23 +03:00
neslihanturan
3c2cc26d3b
Fix conflicts from #1366 fixing lint issues (#1470)
* lint issue #171 - added Locale.getDefault()

* lint issue #171 - added Locale.getDefault()

* lint issue #171 - added %d

* lint issue #171 - Changed version

* lint issue #171 - added singleLine="true"

* lint issue #171 - changed commit to apply

* lint issue #171 - added Locale.getDefault()

* lint issue #171 - added Locale.getDefault()

* Codacy issues #778 - nested if loop

* Codacy issues #778 - nested if loop

* Revert "lint issue #171 - added %d" since we dont edit translated string files

This reverts commit e4917cddcf.
2018-04-30 14:05:47 +03:00
Tanvi Dadu
9c91d7a799 Zoom (#1300)
*  Basic Zoom feature added along with button to control it

*  Pinch Zoom added

*  Merge Conflicts Resolved

*  Icons Changed

*  Compressed the high resolution images

* Fixed null pointer exception

* Fixed null pointer exception

*  Fixed exception

*  Fixed error

*  Fixed Resource availability issue
2018-04-26 03:18:58 +05:30
misaochan
d6a4188cb1 Merge remote-tracking branch 'refs/remotes/origin/2.7.x-release'
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
2018-04-23 20:14:21 +10:00
Josephine Lim
533297dce7
Versioning and changelog for v2.7.1 (#1457)
* Versioning

* Update changelog.md
2018-04-20 15:28:42 +10:00
Paul Hawke
22772c851e Moved tests over to Kotlin. (#1428) 2018-04-08 17:59:20 +10:00
Tanvi Dadu
0205274dd5 Fix Acra (#1414)
*  update Acra

*  Update to latest version
2018-04-03 02:15:28 +10:00
Josephine Lim
c6f728a6ed
Versioning and changelog for v2.7.0 (#1392)
* Update changelog.md

* Versioning for v2.7.0
2018-03-31 03:57:15 +10:00
Vivek Maskara
6eaac1de40
Merge branch 'master' into notificationFixes 2018-03-24 12:44:09 +05:30
maskara
238d96afe7 Remove duplicates from gradle file 2018-03-22 01:18:22 +05:30
maskara
e5c8e40b76 Suggested changes for notification fixes 2018-03-21 10:26:32 +05:30
maskara
21a6b1f00c Fixes in notifications for pending issues 2018-03-21 10:26:32 +05:30
knightshade
ad97ad24d4 Fixes app crash when tutorial mode in landscape mode.
Fixes #1287
2018-03-12 02:54:59 +05:30
Madhur Gupta
de673eb4ca Add Forgot Password Option in LoginActivity (#1242)
* Add Forgot Password Option in LoginActivity

* Add Forgot Password Option in LoginActivity

* Add Forgot Password Option in LoginActivity

* Update URL for the "beta" flavor

* Update forgotPassword function
2018-03-10 23:00:05 +05:30
neslihanturan
bc87ad5d51
Merge pull request #1237 from knight-shade/Fixes-#1225
Fixes #1225 bug causing multidex
2018-03-07 20:32:07 +02:00
knightshade
0acc42dd52 Fixes failing of tests after addition of multidex. 2018-03-07 23:09:39 +05:30
Jatin Rao
81147aada1 Fixes issue 1224 2018-03-03 19:55:09 +05:30
knightshade
d7e0c81969 Add multidex library and extend CommonsApplication from MultiDexApplication.
Fixes #1225
2018-03-02 10:28:28 +05:30
knightshade
e9602f5bb2 Update roboectric. 2018-02-26 07:32:20 +05:30
Josephine Lim
2773e24c94
Merge pull request #1182 from maskaravivek/crashFix
Fix crash in map view fragment
2018-02-25 19:26:11 +10:00
Ujjwal Agrawal
96173e26cf Changed Webviews to Custom Tabs in Nearby Places Dialog, AboutUsActivity (#1185)
* Changed Webviews to Custom Tabs in Nearby Places Dialog, AboutUsActivity

* Created method handleWebUrl in Utils.java
2018-02-25 00:27:49 +05:30
maskara
2979cfe072 Fix crash in map view fragment 2018-02-24 01:45:15 +05:30
Vishan Seru
054fa93460 Detecting pictures that are too dark (#926)
* Made the following changes:
->Added OpenCV library to the project
->Added functionality to detect if an image being uploaded is too dark
->Added functionality to detect if an image being uploaded is blurred

* Made corrections and changes based on gradle checkstyle requirements

* Updated gitignore to remove binary files related to OpenCV from project

* Image blurriness detection was undone. Images are checked only for being too dark now

* Removed OpenCV documentation folder containing a lot of html files

* Removed unnecessary buildScript usage in build.gradle file for opencv library and also added abi splits

* Removed OpenCV library usages and references from project

* Removed OpenCV library folder from project
2018-02-18 15:01:42 +05:30
misaochan
6dee869027 Merge remote-tracking branch 'refs/remotes/origin/2.6.7-release' 2018-02-01 01:48:57 +10:00
misaochan
bf2e0a0d90 Versioning for v2.6.7 2018-02-01 01:40:23 +10:00
Yusuke Matsubara
4aa4461d2c Move query file from assets to resources 2018-01-19 22:22:15 +09:00
misaochan
20f7140280 Versioning for 2.6.6 2018-01-16 19:19:24 +10:00
neslihanturan
7151c51cb3
Merge pull request #1012 from maskaravivek/build
Fix dex merge issue
2018-01-01 19:35:42 +03:00
misaochan
eb372eb093 Versioning for v2.6.5 2017-12-19 20:14:28 +10:00
maskara
eaaef3211e Fix dex merge issue 2017-12-10 15:07:27 +05:30
Paul Hawke
ed2a814042 Updated the version of mapbox sdk as there was a fix for a crash we are seeing. 2017-12-08 21:24:16 -06:00
misaochan
ad863b8ff3 Versioning for v2.6.4 2017-12-04 18:51:38 +10:00
Vivek Maskara
52b52c4895
Merge branch 'master' into dependency-injection 2017-12-04 02:17:16 +05:30
Josephine Lim
f8b389ee15
Merge pull request #983 from maskaravivek/nearbyRefactoring
Fix issues around location in nearby activity
2017-12-03 02:25:23 +10:00
Josephine Lim
7273604e82
Merge pull request #972 from maskaravivek/packageName
Use different package name for debug and release variants
2017-12-03 02:24:46 +10:00
maskara
d6b7af374d Git plugin 2017-12-02 21:25:14 +05:30
maskara
b9b906e11d Enable git util methods 2017-12-02 20:59:06 +05:30
maskara
2796e4277c Fix issues around location in nearby activity 2017-12-02 20:58:31 +05:30
Paul Hawke
fb30a34478 Merge branch 'master' into dependency-injection 2017-11-30 21:41:38 -06:00
Paul Hawke
ce32505ca3 Created a Robolectric unit test replacement for the NearbyActivity test. 2017-11-29 21:29:09 -06:00