Commit graph

59 commits

Author SHA1 Message Date
Josephine Lim
22d2b1795c
Remove wrong imports that cause failed build (#1775) 2018-08-02 00:51:31 +10:00
misaochan
d05cf395d8 Merge remote-tracking branch 'origin/2.8-release' into 2.8-release
# Conflicts:
#	app/build.gradle
#	app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java
2018-07-28 23:39:15 +10:00
Tanvi Dadu
e9c0aa22ea Feedback module (#1742)
*  Implemented Statistics

*  Basic Structure Implemented

*  Layout made screen independent and menu inflated

*  Share Screenshot using cache

*  Improved the Image Bound and added strings

*  Improved the quality of Pr

*  Wired to navigation drawer

*  Changed the bounds of the image

*  Added Info icon

* Removed the unecessary functionality

*  Updated JavaDocs and fetch the username

*  Fetch JsonObject from the api using JavaRx and OkHttp

* Added JavaDocs and improved quality

* fixed strings file

*  Improved the quality of pr

*  Render thanks , images used in articles on screen

*  fetch and rendered the upload count

*  FeaturedImages statistics rendered and Javadocs added

*  added ProgressBar

*  Added Class for calculating level

*  added level info and returned level info

*  level up info rendered on achievement activity

*  Inflated Level Number

*  Added the structure for badge

*  Added LevelUpInfo Programmetically on Drawable

*  aligned the text

*  changed the text

*  Implemented the structure for changing colour of drawable

*  Added functionality to change colours of badge during runtime

*  Added custom alert for share option

*  Improved the UI of screen

*  Added the alertDialog for info button

*  Improved the quality of PR

*  Added Builder model

*  Added Enum Model and increased levels to 15

* removed redundant class

*  Changed strings and added subtext

* Feedback Module: Add reverts rate parameter (#1649)

* Fetched Revert Count

* Refactored Achievements class and display the fetched results

* Refactored the levelController to include revert as parameter

*  Fixed error

*  Fixed bug

*  Added information for parameters and improved code quality

*  Javadocs added

*  Added null check and javadocs

*  Removed extra spaces
2018-07-26 13:12:51 +05:30
Ujjwal Agrawal
86878fb62d Add feature to Browse commons via app (#1716)
* Search activity, image search fragment added

* Removed explore icon xml

* Updated Javadocs for search Activity and Navigation Base Activity

* SearchImageItem class updated

* Javadocs added for search activity

* removed redundant code and added javadocs for search image modules

* Javadocs added for updateImageList  method

* Rename featuredImage to explore

* Fixed null query issue

* changed cisibility to gone in case of successful Fetch

* Consolidate the networking libraries - drop volley in favor of OkHttp

* Extracted a few networking related items into a new Dagger module and finished the process of mocking the main component for tests.

* Refactoring to extract GpsCategoryModel and ensure single-responsibility-principle is maintained in CategoryApi.

* fixed featured image back bug

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

* Javadocs added

* Add option to set image as wallpaper (#1535)

* Add option to set image as wallpaper

* Added java docs

* Toast message on setting the wallpaper successfully

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

* SearchHistory Fragment added

* Search History Item added

* Content Provider, RecentSearchesDao added

* Database version changed to 7 and added methods for find, save ,..

* Delete icon deleted

* Reverted changes in gradle files

* Reverted changes in gradle files 2

* Optimized Improts

* reverted refractor for container name

* Refactored packagename, changed name to query in POJO class.

* Updated lastUsed to lastSearched

* Javadocs updated

* Check if user has been in search page for 5 seconds if yes then save it to history

* If else indentation updated

* added import in test

* edittext replaced with Searchview

* RxSearchview added

* Added support for API 21+

* Snackbar removed on success

* Improved code

* Pagination added

* Removed unnecessary toast

* Comment added in method

* Support for landscape mode added

* Fixed screen rotation issue on Explore and Search activity

* Clear focus added

* Delete all function added in Content Provider and called from fragment

* Scrollbar Recyclerview added

* Share Icon changed to 32 dp and back button added in explore, search activity.

* Removed unnecessary code

* Wrote and run tests for Recent Searches
 (creating db, migrating from versions, deletion, finding,..

* Category Search Fragment added

* Adapter factory added

* Renderer added

* Improvements

* Viewpager adapter added

* Updated XML

* Improvements in category card design

* tabs colors changed

* renamed images to media

* Java docs improved

* Javadoc added for setTabs

* JavaDoc for ViewPagerAdapter added

* Refreshed listview after delete

* Added mediaContainer

* Fixed ghost issue in image search fragment

* Ghost issue for categories fixed

* Removed Calling API call onback press

* Category Details activity added

* Menu added in category details activity

* back button added

* back button bugs

* Improvements in category images fragment

* JavaDoc added for some methods

* trimming added, Tab layout hided, recent searches refreshed

* SubCategory list fragment added, API added to extract subCategory Details

* API params updated to get more precise results

* Javadocs added for MWAPI method

* Pagination removed

* Fix API for fetching images inside category

* Parent category API added

* Fix #1704

* Fix #1704 corrected

* Fix #1702

* Fix #1702 and #1704

* added try catch statements

* Optimimzed imports

* loops replaced with Functions

* Javadocs for various methods added

* Fix java docs for Dao

* Javadocs for various methods added

* Fix java docs for Dao

* More javadocs added for explore Feature

* Javadocs added

* Javadocs added

* Improvements in indentation (#1739)
2018-07-24 10:17:24 +03:00
Vivek Maskara
25b463901f Fix conflict between different product flavors (#1726)
* Fix conflict between different product flavors so that beta and prod apps could coexist

* Fix category content provider
2018-07-20 02:03:28 +10:00
dlsrks1021
e8b2dd7163 remove unused imports (#1606) 2018-06-21 07:28:27 +09:00
misaochan
a9ae072c73 Merge remote-tracking branch 'refs/remotes/commons-app/master' into upload-overhaul-fork
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
2018-06-05 18:28:41 +10:00
maskara
edaa0dd05a Fix build 2018-06-01 01:15:28 +05:30
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
misaochan
c885c31cc5 Merge remote-tracking branch 'refs/remotes/commons-app/master' into upload-overhaul-fork 2018-05-29 16:39:52 +10:00
misaochan
bc1adca999 Add Dagger usage to FileProcessor 2018-05-26 00:03:48 +10:00
Paul Hawke
a66a0e8ca0 Refactoring to extract GpsCategoryModel and ensure single-responsibility-principle is maintained in CategoryApi. 2018-05-25 01:55:03 -05:00
Paul Hawke
c7948c817b Extracted a few networking related items into a new Dagger module and finished the process of mocking the main component for tests. 2018-05-25 01:50:35 -05:00
Paul Hawke
32cb8df9ae Consolidate the networking libraries - drop volley in favor of OkHttp 2018-05-25 01:42:12 -05:00
neslihanturan
32d36944fc
Revert "Wmhack2018 (#1536)" (#1539)
This reverts commit 01cb9ccd70.
2018-05-19 23:02:29 +03:00
Elliott Eggleston
01cb9ccd70 Wmhack2018 (#1536)
* Add new activity to manifest

* Create review activity layout base

* Add a new menu item to drawer for peer review

* Add a top menu with randomizer icon to review activity

* Add strings for review button

* Add activity to ActivityBuilderModule for injection

* Add a new drawer item to start review acitivty

* Create base of the Review Activity

* Add fragment pager

* Add new fragment for injection

* Create a fragment pager layout

* Wikimedia hackathon 2018 (#1533)

* First draft of fn to get random recent image

* Use log entries for requests to beta, try to connect refresh button

FIXME: runs http request on main thread, breaks

* Tweak button connection

* Add ReviewController class

* Fix fragments

* Wmhack2018 (#1534)

* tiny fixes

* Load pictures into activities

* Re-use same class for all review fragments (#1537)

And try to add pager indicator

* [WIP] category check

* [WIP] add on-click actions to ReviewActivity

* [WIP] add SendThankTask

* Make it beautiful

* Use standalone category extraction code in MediaDataExtractor

* Add categories to category review page
2018-05-19 23:00:06 +03:00
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
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
Vivek Maskara
463673f942
Merge branch 'master' into featuredImages 2018-03-24 12:46:38 +05:30
Vivek Maskara
50d9cff8c6
Merge branch 'master' into directNearbyUploadsNew 2018-03-21 17:54:03 +05:30
misaochan
2099a99e4f Add Dagger injector to render() 2018-03-16 20:36:57 +10:00
Suchit Kar
369570537e Add delete task 2018-03-13 02:02:39 +05:30
maskara
123c4adbfd Minor changes to make things work 2018-03-03 00:30:44 +05:30
misaochan
3f7e22058a Fix whitespace 2018-03-03 00:02:20 +05:30
misaochan
119c4fb782 Manual injection into PlaceRenderer constructor to allow dependency injection 2018-03-03 00:01:11 +05:30
misaochan
351c3f2534 Give CommonsApplicationComponent access to DirectUpload 2018-03-02 23:59:07 +05:30
misaochan
84e8693525 Create new method in CommonsApplicationModule for providing title/desc for Nearby Uploads 2018-03-02 23:58:34 +05:30
misaochan
89d0f8da8f Add NearbyMapFragment to FragmentBuilderModule 2018-03-02 23:57:52 +05:30
Suchit Kar
4b0f1f6a09 Injected API, Session Manager 2018-03-01 20:14:02 +05:30
Manuel Lorenzo
304bf51f5f Fixing some lint issues for #171 2018-02-07 11:32:24 +01:00
maskara
9c23a8c34b Make login work across sessions 2018-02-06 01:52:53 +05:30
maskara
41d6abdf40 Remove unused code 2018-01-22 04:09:43 +05:30
maskara
28a6a3b71d Integrate notifications API 2018-01-22 03:46:54 +05:30
maskara
d78c7befbd Revert "Revert "Merge pull request #1024 from neslihanturan/displayNotificationsUI""
This reverts commit d253db5444.
2018-01-21 14:54:25 +05:30
misaochan
d253db5444 Revert "Merge pull request #1024 from neslihanturan/displayNotificationsUI"
This reverts commit 031e53c988, reversing
changes made to 0aa20effe0.

revert UI notifications
2018-01-16 18:52:25 +10:00
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
neslihanturan
48c7a0372e Prepare base for new activity 2018-01-09 18:16:17 +03:00
Paul Hawke
874627e3f5 Injected the ModifierSequenceDao where needed. 2018-01-05 13:01:20 -06:00
Paul Hawke
9927879680 Injected the ContributionDao where needed. 2018-01-05 08:34:48 -06:00
Paul Hawke
1d3befcbd2 Injected the CategoryDao where needed. 2018-01-05 08:34:48 -06:00
neslihanturan
4ba9f6ba14 Contributes Android Injector annotation for dagger 2017-12-20 19:08:17 +03:00
Paul Hawke
02b5b9b680 Merge branch 'master' into dependency-injection 2017-11-24 22:30:08 -06:00
maskara
a61124a580 Fix: Location update in nearby activity 2017-11-22 01:11:02 +05:30
maskara
6a7b7cbbe8 Introduce dagger 2017-11-12 01:04:10 +05:30
Paul Hawke
9aa021695b @Injected shared preferences where needed 2017-09-27 21:30:41 -05:00
Paul Hawke
1b840502a9 Small code cleanup 2017-09-27 20:48:42 -05:00
Paul Hawke
2d91e81121 Merge branch 'master' into dependency-injection 2017-09-13 20:29:50 -05:00