Commit graph

128 commits

Author SHA1 Message Date
Vivek Maskara
752d634114
Merge branch 'master' into structured-data 2020-04-14 10:52:12 -07:00
translatewiki.net
e859c71905 Localisation updates from https://translatewiki.net. 2020-04-14 05:21:28 +02:00
Sean Mac Gillicuddy
2e43995276 Merge remote-tracking branch 'origin/master' into structured-data
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java
2020-03-24 08:21:02 +00:00
translatewiki.net
a31499b11f Localisation updates from https://translatewiki.net. 2020-03-23 14:57:26 +01:00
Sean Mac Gillicuddy
1404bb0da6 Merge remote-tracking branch 'origin/master' into structured-data
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java
#	app/src/main/java/fr/free/nrw/commons/repository/UploadRemoteDataSource.java
#	app/src/main/java/fr/free/nrw/commons/repository/UploadRepository.java
#	app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java
#	app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java
#	app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaPresenter.java
#	app/src/test/kotlin/fr/free/nrw/commons/upload/FileProcessorTest.kt
#	app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaPresenterTest.kt
2020-03-20 14:40:13 +00:00
Anmol Gupta
a63a3580de
Change "Archived" notifications to "Read" notifications (#3554)
* Change archived to read

* Change string names
2020-03-20 14:20:20 +00:00
Sean Mac Gillicuddy
719f32c27e Merge remote-tracking branch 'origin/master' into structured-data
# Conflicts:
#	app/build.gradle
#	app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
#	app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java
#	app/src/main/java/fr/free/nrw/commons/contributions/model/DisplayableContribution.java
#	app/src/main/java/fr/free/nrw/commons/upload/ImageProcessingService.java
#	app/src/main/java/fr/free/nrw/commons/upload/SpinnerLanguagesAdapter.java
#	app/src/main/java/fr/free/nrw/commons/upload/UploadService.java
#	app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java
#	app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditService.java
2020-03-20 08:46:39 +00:00
translatewiki.net
d028cf189c Localisation updates from https://translatewiki.net. 2020-03-19 15:02:56 +01:00
Seán Mac Gillicuddy
942cef5d5e
#3222 Merge master into Structured Data branch, fix conflicts (#3447)
* [WIP] Fixes #2942. Set 'depicts' automatically for images uploaded via 'Nearby'

* Feature/refractor uploads [WIP] (#2887)

* Fix duplicate param information (#2515)

* Bug fix issue #2476 (#2526)

* Added wikidataEntityID in all db versions, handled db.execSql via method runQuery

* Versioning and changelog for v2.10.2 (#2531)

* Update changelog.md

* Versioning for v2.10.2

* Update changelog.md

* Bugfix/issue 2580 (#2584)

* Corrected string placedholders in certain string files

* Corrected string placedholders in certain string files[Bug fix #2580]

* Bug Fix #2585 (#2647)

* Bug Fix #2585
* Added null checks on view in SearchImageFragment when updating views from external sources
* Disposed the disposables in SearchActivity and SearchImageFragment when no longer in active lifecycle

* use FragmentUtils to verify fragment active state

* Bug Fix issue #2648 (#2678)

* Bug Fix issue #2648
* Handled external storage permission before file download

* * Removed redudant check for permission in MediaDetailPagerFragment (Dexter already does that)
* Removed duplicate code in PermissionUtil$checkPermissionsAndPerformAction, used the existing function with conditional extra parameters

* string name typo correction

* BugFix issue #2652 (#2706)

* Addded null check on bookmark before operating on it

* BugFix issue #2711 (#2712)

* Added null checks in OkHttpJsonApiClient$searchImages MwQueryResponse

* BugFix #2718 (#2719)

* Handled null auth cookies

* Fix #2791: NPE when nominating for deletion and leaving screen (#2792)

* Bug Fix issue #2789 (#2790)

* Handled Illegal State Exception for non existent appropriate view parents in ViewUtils$showShortSnackbar

* BugFix #2720 (#2831)

BugFix deprecated licenes #2720

* ui fixes, wip, upload

* *Issue #2886, BugFix #2832[wip]
* updated UploadActivity code
* modified ui
* Updated UploadPresenterTest

* * updated interfaces names to follow names suffixed with Contract
* added test cases

* card view elevation

* view pager disabled swipe

* bug fix, duplicate image

* used existing non-swipable view pager

* Avoid image view resize with keyboard, added adjustPan and stateVisible as softinputMode for UploadActivity

* retain UploadBaseFragment instances on orientation changes

* * Added test cases for UploadMediaPresenter
* Injected io and main thread schedulers

* categories presenter test cased wip

* Added CategoriesPresenter test

* * Added the logic to show open map (with to be uploaded image's coordinates while uploading image)

* codacy suggested changes * added java docs

* Added travis_wait fot android-wait-for-emulator

* ranamed interface onResponseCallback to Callback

* * Added api to delete picture in UploadModel
* cleanUp in UploadModel. once upload has been initiated
* Removed unused methods from UploadModel and the corresponding test class

* * Added tests for UploadPresenter
* Travis suggested changes
* Addded copy previous title and description

* * Made the upload add descriptions visible when keyboard visible
* add description request focus only when user manually requests it

* Added JavaDocs, review suggested changes

* Fix dagger injection

* use DialogUtil to show info in descriptions

* use activity context for DialogUtil

* Minor changes

* refactored title

* ui for depicts

* bug fix

* basic architecture for depicts

* adde architecture components for depicts

* [WIP] ApacheHttpClientMediaWikiApi.wikidataEditEntity: JSON param creation uses object instead of string

* resolved dagger errors

* multilingual captions and next button error resolved

* fixed next button issues in depicts fragment

* captions and depicts

* resolved previous button click issues

* fixed bindview error and added multi-captions

* replaced description and caption with uploadmediadetail

* refactored few classes

* modified ui of depicts

* minor fixes

* Bug fix, reduced the add description edit text clickable bound (#2973)

* moved depicts before categories

* replaced previous filename with captions

* removed time from filename

* added depicts suggestions

* [WIP] Wikidata Sandbox (Q4115189) test

* changes layout of layout_upload_depicts

* changed layout of upload_depicts

* code stuck at IO_SCHEDULER

* labels and description for depicts activity

* Bugfix/uploads (#3000)

* merged with master

* BugFix IllegalStateException
* setRetainState(true), not required with FragmentStatePagerAdapter
* Increase the ViewPager's Offscreen Limit, we want all the fragments to be active

* BugFix, clear selected categoris for previous upload session
* Clear Selected Categories
* Addded JavaDocs for CategoriesModel

* Code Formatting in app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java

* Added class level JavaDoc UploadRemoteDataSource

* Added class level JavaDoc for UploadRepository

* Added JavaDocs for ThumbnailsAdapter

* Added JavaDocs for MediaLicensePresenter, CategoriesPresenter

* Removed null check on category query
* Show default catgeories based on image title and gps location when category text empty
* Allow search for empty category search

* Attached image scale listener to upload media image

* Bug fix, reduced the add description edit text clickable bound

* Fix memory leak (#3001)

* Bugfix/uploads (#3002)

* merged with master

* BugFix IllegalStateException
* setRetainState(true), not required with FragmentStatePagerAdapter
* Increase the ViewPager's Offscreen Limit, we want all the fragments to be active

* BugFix, clear selected categoris for previous upload session
* Clear Selected Categories
* Addded JavaDocs for CategoriesModel

* Code Formatting in app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java

* Added class level JavaDoc UploadRemoteDataSource

* Added class level JavaDoc for UploadRepository

* Added JavaDocs for ThumbnailsAdapter

* Added JavaDocs for MediaLicensePresenter, CategoriesPresenter

* Removed null check on category query
* Show default catgeories based on image title and gps location when category text empty
* Allow search for empty category search

* Attached image scale listener to upload media image

* Bug fix, reduced the add description edit text clickable bound

* Added tooltip in Title in UploadMediaFragment

* BugFix recent categories

* Updated test methods

* Bugfix/uploads (#3011)

* merged with master

* BugFix IllegalStateException
* setRetainState(true), not required with FragmentStatePagerAdapter
* Increase the ViewPager's Offscreen Limit, we want all the fragments to be active

* BugFix, clear selected categoris for previous upload session
* Clear Selected Categories
* Addded JavaDocs for CategoriesModel

* Code Formatting in app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java

* Added class level JavaDoc UploadRemoteDataSource

* Added class level JavaDoc for UploadRepository

* Added JavaDocs for ThumbnailsAdapter

* Added JavaDocs for MediaLicensePresenter, CategoriesPresenter

* Removed null check on category query
* Show default catgeories based on image title and gps location when category text empty
* Allow search for empty category search

* Attached image scale listener to upload media image

* Bug fix, reduced the add description edit text clickable bound

* Added tooltip in Title in UploadMediaFragment

* BugFix recent categories

* Updated test methods

* Avoid memory leak, free the adpater in MediaLicenseFragment.onDestroyView

* bugfix/uploads (#3012)

* merged with master

* BugFix IllegalStateException
* setRetainState(true), not required with FragmentStatePagerAdapter
* Increase the ViewPager's Offscreen Limit, we want all the fragments to be active

* BugFix, clear selected categoris for previous upload session
* Clear Selected Categories
* Addded JavaDocs for CategoriesModel

* Code Formatting in app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java

* Added class level JavaDoc UploadRemoteDataSource

* Added class level JavaDoc for UploadRepository

* Added JavaDocs for ThumbnailsAdapter

* Added JavaDocs for MediaLicensePresenter, CategoriesPresenter

* Removed null check on category query
* Show default catgeories based on image title and gps location when category text empty
* Allow search for empty category search

* Attached image scale listener to upload media image

* Bug fix, reduced the add description edit text clickable bound

* Added tooltip in Title in UploadMediaFragment

* BugFix recent categories

* Updated test methods

* Avoid memory leak, free the adpater in MediaLicenseFragment.onDestroyView

* BugFix Illegal State Exception in ViewpPagerAdapter

* Remove irrelevant comment

* merge conflict with strings (#3016)

* [WIP] Fixed duplicated subscriprion for 'addPropertyP180'

* added documentation

* fixed issue #3006

* resolved issue #3004

* fixed issue with categoryPresenterTest.kt

* send captions as labels

* fixed issue with the captions

* optimised imports

* added upload for captions

* minor changes

* resolved issue with uploading captions

* resolved issue with api call

* uploading captions to wikibase

* added some tests and documentation

* undo formatting changes

* uploaded captions as labels to wikibase

* minor changes

* resolved error with spinner adpater

* adding captions to local database

* Fixed issue #3035

* fixed issue #3033

* fixed issue #3005

* fixed issue #3005

* added search for depicts

* fixed issue with compile time

* fixe issue with project build

* fixed issue #3044

* merged uploading depicts into branch

* uploading depicts

* rebased branch

* fixed crash due to depicts

* modified depicts interface

* Resolve merge conflicts

* Fix issues with API calls

* Use wikidata token

* searching depictions from depicts activity

* added some documentation and other changes

* fixed crash on selecting depictions

* sending wikidataentity id to upload depictions

* added changes after review

* Fixed issue with next button diabling in media detail activity

* added tests for depictions

* added all the unit tests and fixed few more issues

* showing captions in media details

* show captions in media details

* added documentations and worked upon review comments

* parsing response for depictions

* displaying captions and depiction QID in media detail

* added documentation

* fetching labels from QIDs

* captions working perfectly

* added documentations and code cleaning

* minor changes

* minor changes

* Showing items in explore

* added search via depicts in explore

* Added setOffscreenPageLimit in ViewPager

* show captions in explore

* show captions in home

* showing depict images under items

* added documentation and code refactoring

* enabled pagination in depiction search

* added some tests and media deatils in depiction detail activity

* fixed bug with back button in media

* fixed issue #3100

* fixed issue #3098

* fixed issue #3099

* fixed issue #3104 and #3098

* showing captions in place of title in home and explore:media

* show captions in explore:depiction image list activity

* showing depictions in media details

* showing depictions in media details in production flavor

* fixed issue #3108 and #3107

* fix isse #3108

* fixed issue #3110 and #3112

* fixed issue #3113

* added documentations

* fixed issue #3076 and #3109

* added depiction search test

* fixed issue #3113

* fixed issue #3111

* fixed issue #3106

* Showing items in explore

* minor change

* fixed issue #3118 and some other changes

* added MVP in searchdepictionsfragment

* added mvp architecture

* added MVP architecture to DepictedImagesDetailsActivity

* added documentation and some minor changes

* added image to depicted item in search depictions

* * Use callbacks from renderer to fetch thumbnails

* adding fresco to load image in depictions

* adding thumbnail image for depictions in upload and explore

* pagination issues

* fixed issue --(showing previous depiction thumbnail in explore)

* Fixed the logic for pagination

* hide progress on success of last page

* adding sub-items and parent items to search in explore

* minor changes for review comments

* fixed issue #3119

* fixed issue #3130

* changes after review comments

* showing child classes for depictions

* Showing child items

* showing parent classes for depicted items

* adding localised search for parent and child items

* clicking on any child class or parent class should call the corresponding class items

* fixed issue of showing wrong thumbnail for P18 item

* fixed issue #3132

* added test for DepictedImagesPresenter.java

* added unit tests for depicted items parent and child classes

* removed unused imports and code formatting

* fixed issue in search test

* deleting unnecessary .attach_pid9313 file

* deleting unnecessary .attach_pid9655 file

* added SearchDepictionsPresenterTest

* changes after review comments

* updates for review comments

* added more documentations

* removed unused code and classes and addressed spacing changes

* changes after review

* fixed build issues in the app

* worked on some review comments

* fixed issue:wrong thumbnail appears on wikidata item

* minor change

* worked on some review changes

* worked on review comments

* minor change

* addressed remaining review comments

* replaced hardcoded jpgs with pageIds to fetch captions

* added documentation

* removed hardcoded extensions and worked on review comments

* review comments

* [WIP] Added Depicts values for flavors

* [WIP] Minor fix

* [WIP] Minor fixes

* [WIP] Fixed URL

* [WIP] Fixed URLs and tokens

* Fixed MediaClient: added check for null in continuation store

* Fixed Media::from, changed return from null to new Media()

* [WIP] Merged with master

* Fix #3254 Displays a proper message in explore section when no result for caption

* Updated Mockito to org.mockito:mockito-inline:2.13.0

* [WIP] Fixed tests after merging

* [WIP] Fixed some JUnit tests

* Fixed 'accessing from wrong thread' error

* #3222 Delete manifest declaration of activity as fragment - stop casting MainActivity to CatgoryImagesCallback - fix tests

* Remove unit test not associated with any class - make CategoryPresenterTest more idiomatic

* fix compilation errors

Co-authored-by: Vitaly V. Pinchuk <vetal.978@gmail.com>
Co-authored-by: Ashish Kumar <ashishkumar468@gmail.com>
Co-authored-by: vanshikaarora <vanshikaa937@gmail.com>
Co-authored-by: Vivek Maskara <maskaravivek@gmail.com>
Co-authored-by: Vanshika Arora <34261945+vanshikaarora@users.noreply.github.com>
Co-authored-by: Somanshu and Himanshu <somanshS14@gmail.com>
2020-03-10 22:30:30 +10:00
translatewiki.net
5fd88ef1a8 Localisation updates from https://translatewiki.net. 2020-03-09 16:34:48 +01:00
translatewiki.net
fa1d8bc20b Localisation updates from https://translatewiki.net. 2020-03-05 17:27:56 +01:00
translatewiki.net
d423dbb0be Localisation updates from https://translatewiki.net. 2020-02-20 15:57:46 +01:00
translatewiki.net
af97e40c13 Localisation updates from https://translatewiki.net. 2020-02-17 14:53:42 +01:00
translatewiki.net
b13d88837e Localisation updates from https://translatewiki.net. 2020-02-06 14:53:47 +01:00
translatewiki.net
61bfe84594 Localisation updates from https://translatewiki.net. 2020-01-30 15:48:34 +01:00
translatewiki.net
c682ba83d7 Localisation updates from https://translatewiki.net. 2020-01-20 11:30:54 +01:00
translatewiki.net
8824076c1a Localisation updates from https://translatewiki.net. 2020-01-13 16:07:10 +01:00
translatewiki.net
28e96eb54c Localisation updates from https://translatewiki.net. 2019-12-12 15:20:00 +01:00
translatewiki.net
6e1df96b98 Localisation updates from https://translatewiki.net. 2019-11-04 15:46:48 +01:00
translatewiki.net
b31cf11e56 Localisation updates from https://translatewiki.net. 2019-10-07 19:42:13 +02:00
translatewiki.net
dfe59c4034 Localisation updates from https://translatewiki.net. 2019-10-01 16:26:47 +02:00
translatewiki.net
0c3b00244f Localisation updates from https://translatewiki.net. 2019-06-27 18:16:27 +02:00
translatewiki.net
54f6dd667f Localisation updates from https://translatewiki.net. 2019-05-13 14:29:38 +02:00
translatewiki.net
a4ac27d5d3 Localisation updates from https://translatewiki.net. 2019-05-09 16:54:18 +02:00
translatewiki.net
047059c490 Localisation updates from https://translatewiki.net. 2019-04-29 17:26:12 +02:00
translatewiki.net
c127bcfea4 Localisation updates from https://translatewiki.net. 2019-04-25 20:12:55 +02:00
translatewiki.net
987bf25921 Localisation updates from https://translatewiki.net. 2019-04-22 22:05:39 +02:00
translatewiki.net
99ae8f27bc Localisation updates from https://translatewiki.net. 2019-04-18 16:57:09 +02:00
translatewiki.net
fb0d025f33 Localisation updates from https://translatewiki.net. 2019-04-15 17:33:30 +02:00
translatewiki.net
07c335e054 Localisation updates from https://translatewiki.net. 2019-04-04 19:57:33 +02:00
translatewiki.net
76e5a30fb5 Localisation updates from https://translatewiki.net. 2019-04-01 20:24:14 +02:00
translatewiki.net
a62aaadf90 Localisation updates from https://translatewiki.net. 2019-03-28 19:31:43 +01:00
translatewiki.net
fc3d24254c Localisation updates from https://translatewiki.net. 2019-03-25 18:57:07 +01:00
translatewiki.net
a1a65d0832 Localisation updates from https://translatewiki.net. 2019-03-21 10:56:28 +01:00
translatewiki.net
341f9614a7 Localisation updates from https://translatewiki.net. 2019-03-18 08:45:15 +01:00
translatewiki.net
80225360f8 Localisation updates from https://translatewiki.net. 2019-03-07 16:07:39 +01:00
Christian Fotteler
def0d3da43 Fixes Lego Messages in strings.xml for "uploaded_by_myself" and changes the message generation in "ReasonBuilder.java". Adds translations for "uploaded_by_myself"-String in English, German, French, Spanish and Dutch. (#2532) 2019-03-05 23:21:41 +05:30
translatewiki.net
831970112d Localisation updates from https://translatewiki.net. 2019-02-25 10:39:24 +01:00
translatewiki.net
b5a479ce93 Localisation updates from https://translatewiki.net. 2019-02-14 09:07:01 +01:00
translatewiki.net
cb3a570090 Localisation updates from https://translatewiki.net. 2019-02-07 15:54:04 +01:00
translatewiki.net
8c12cc48e0 Localisation updates from https://translatewiki.net. 2019-02-04 08:57:03 +01:00
translatewiki.net
f6029be842 Localisation updates from https://translatewiki.net. 2019-01-30 23:38:57 +01:00
translatewiki.net
cd322d2f57 Localisation updates from https://translatewiki.net. 2019-01-07 10:04:32 +01:00
translatewiki.net
10e57bd8d0 Localisation updates from https://translatewiki.net. 2019-01-03 16:38:22 +01:00
translatewiki.net
da36d2cda3 Localisation updates from https://translatewiki.net. 2018-12-27 10:46:23 +01:00
translatewiki.net
174e58c49f Localisation updates from https://translatewiki.net. 2018-12-17 08:49:29 +01:00
translatewiki.net
1070137741 Localisation updates from https://translatewiki.net. 2018-12-10 08:06:17 +01:00
translatewiki.net
c2addd902a Localisation updates from https://translatewiki.net. 2018-11-29 17:48:02 +01:00
translatewiki.net
7d238dc65b Localisation updates from https://translatewiki.net. 2018-11-26 07:52:48 +01:00
translatewiki.net
38891269fa Localisation updates from https://translatewiki.net. 2018-11-22 07:25:01 +01:00