Commit graph

212 commits

Author SHA1 Message Date
misaochan
a458b8ad06 Merge branch 'master' of https://github.com/commons-app/apps-android-commons 2018-06-06 18:59:37 +10:00
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
Aarnav Jindal
5aba7459bd Fix issue #1332 : Contribution Image auto/manual refresh if fetching fails 2018-04-30 14:22:50 +03:00
Vivek Maskara
50d9cff8c6
Merge branch 'master' into directNearbyUploadsNew 2018-03-21 17:54:03 +05:30
neslihanturan
bad68d9499
Merge pull request #1265 from knight-shade/Fixes-#1262
Fixes #1262 Show correct image upload count in beta build variants.
2018-03-16 12:55:27 +02:00
neslihanturan
eaba96b509
Merge pull request #1176 from hismaeel/1119
Fixed Hard Coded Column issue. #1119
2018-03-16 11:09:47 +02:00
knightshade
cc02da8582 Removed debug logs used in development. 2018-03-11 11:03:14 +05:30
knightshade
2ae46a4c33 Modified the code to only function in beta build variant. 2018-03-07 16:06:36 +05:30
knightshade
7c32f57c31 Fixed upload count to show correct number of pictures upload by user in beta version of app.
Fixes #1262
2018-03-06 23:05:01 +05:30
neslihanturan
41494bea5b Fix conflicts 2018-03-06 20:32:28 +03:00
neslihanturan
5b88111289 Fix conflicts 2018-03-06 19:47:18 +03:00
misaochan
56d20106a3 Tidy up comments 2018-03-03 00:02:20 +05:30
misaochan
4f74aaed15 Improve debug logging in ContributionController 2018-03-03 00:01:11 +05:30
misaochan
5a50e63142 Add comment explaining fix 2018-03-03 00:00:48 +05:30
misaochan
1167837b9f Check that fragment is added to activity to prevent crash 2018-03-03 00:00:48 +05:30
misaochan
6cdf153bc1 Add TODO to fix IllegalStateException 2018-03-03 00:00:48 +05:30
misaochan
970df6e751 Send sharedprefs to handleImagePicked() camera case 2018-03-02 23:57:32 +05:30
misaochan
bbe58f003f Make controller method public and add call to initiateCameraUpload() in NearbyMapFragment 2018-03-02 23:57:32 +05:30
misaochan
13a73fdcac Create boolean for isDirectUpload and pass shared prefs to ShareActivity.java 2018-03-02 23:53:07 +05:30
misaochan
4e971eb708 Image handling now works 2018-03-02 23:52:32 +05:30
misaochan
da7916069f Implement onActivityResult() in map fragment 2018-03-02 23:52:32 +05:30
misaochan
1a7ea256cc Create ContributionController object 2018-03-02 23:52:32 +05:30
hismaeel
c54be08845 Fixed Hard Coded Column issue. #1119 2018-02-21 13:39:26 -05:00
Vishan Seru
4fc3040d52 Synced branch with master 2018-02-18 00:32:25 +05:30
Manuel Lorenzo
304bf51f5f Fixing some lint issues for #171 2018-02-07 11:32:24 +01:00
misaochan
f9c6240eaa Add comment explaining fix 2018-01-25 03:38:08 +10:00
misaochan
dc06fe789f Check that fragment is added to activity to prevent crash 2018-01-25 03:35:12 +10:00
misaochan
05044d4b9a Add TODO to fix IllegalStateException 2018-01-25 03:30:16 +10:00
maskara
7c54e95321 More cleanup based on comments 2018-01-14 02:09:32 +05:30
maskara
eb3e448452 Refactoring based on comments 2018-01-13 23:59:45 +05:30
maskara
e1afa6081e Refactor usage of dagger application with fixed dagger application 2018-01-13 16:16:47 +05:30
neslihanturan
1224302ccb
Merge pull request #1047 from psh/more-database-cleanup
More database related cleanup
2018-01-12 17:41:58 +03:00
misaochan
84b7cda560 Send sharedprefs to handleImagePicked() camera case 2018-01-11 18:58:20 +10:00
misaochan
17e2c9baf3 Make controller method public and add call to initiateCameraUpload() in NearbyMapFragment 2018-01-11 18:41:03 +10:00
Paul Hawke
4bd72462e5 More cleanup now that clean Dao classes are available from Dagger. 2018-01-05 19:53:51 -06:00
maskara
b639b649d7 Avoid crash when service is disconnected 2018-01-06 02:36:51 +05:30
Paul Hawke
9927879680 Injected the ContributionDao where needed. 2018-01-05 08:34:48 -06:00
misaochan
ef3eda7d10 Create boolean for isDirectUpload and pass shared prefs to ShareActivity.java 2018-01-02 21:01:00 +10:00
misaochan
443acab313 Image handling now works 2018-01-01 21:00:28 +10:00
misaochan
3dde0319a0 Implement onActivityResult() in map fragment 2018-01-01 20:56:37 +10:00
misaochan
da5e20a547 Create ContributionController object 2018-01-01 20:19:25 +10:00
Paul Hawke
7c80991049 Extracted and tested the database interactions from Contribution. 2017-12-21 13:56:36 -06:00
Paul Hawke
02b5b9b680 Merge branch 'master' into dependency-injection 2017-11-24 22:30:08 -06:00
Vivek Maskara
f0d11a6074
Merge pull request #949 from ramarajesh2112/issue-944
Issue-944: Fix for same activity getting instantiated multiple times
2017-11-23 02:50:04 +05:30
Josephine Lim
591575faaf
Merge pull request #952 from JohnKal/master
Fixed issue #894
2017-11-21 15:45:45 +10:00
Ram Gudivada
3c9b325e58 Changed activity creation logic
- for home activity it will reuse existing activity from back stack and
  also clears all current activities
- for nearby, about and settings, it will use the existing activity from
  back stack
2017-11-20 21:37:10 -08:00
maskara
8dd8e09f2a Fixes NPE in Util function 2017-11-16 17:32:45 +05:30
maskara
d4bafd94e0 Fixes leaks in contribution and nearby activity 2017-11-13 23:15:53 +05:30
JohnKal
8dc9103ec0 Fixed issue #894 2017-11-12 13:02:16 +02:00
maskara
6a7b7cbbe8 Introduce dagger 2017-11-12 01:04:10 +05:30