Commit graph

5094 commits

Author SHA1 Message Date
Sean Mac Gillicuddy
501e5f7f23 #3749 Improve MediaClient UnitTests - test rewrite 2020-06-25 08:57:03 +01:00
Sean Mac Gillicuddy
454d7adaa8 #3822 Convert SubCategoryImagesListFragment to use Pagination - remove no longer applicable test 2020-06-19 09:56:52 +01:00
Sean Mac Gillicuddy
f384a688a8 #3822 Convert SubCategoryImagesListFragment to use Pagination - add tests for ParentCategoriesDataSource 2020-06-19 09:42:23 +01:00
Sean Mac Gillicuddy
0f091600e8 #3822 Convert SubCategoryImagesListFragment to use Pagination - convert parent categories - delete list fragment - creat base class to support continuation requests in clients 2020-06-19 09:38:05 +01:00
Sean Mac Gillicuddy
5b87ed569c #3822 Convert SubCategoryImagesListFragment to use Pagination - convert subcategories - add continuation support in category client - rely on interfaces for callbacks of PageableMediaFragments 2020-06-18 14:28:19 +01:00
Sean Mac Gillicuddy
0dad78358d #3820 Convert CategoryImagesListFragment to use Pagination - replace CategoryImagesListFragment with CategoriesMediaFragment - disallow the construction of media objects without imageinfo 2020-06-18 12:58:46 +01:00
Sean Mac Gillicuddy
e5e110eafa #3818 Convert SubDepictionListFragment to use Pagination - replace SubDepictionList with Child and Parent Fragments - replace contracts with simple presenter declarations - move classes to appropriate packages - delete unused network models - delete duplicated paging classes 2020-06-18 10:51:01 +01:00
Sean Mac Gillicuddy
8318f78a71 Merge branch 'macgills/3780-media-construction' into macgills/3810-depicted-images-pagination
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/explore/BasePagingFragment.kt
#	app/src/main/java/fr/free/nrw/commons/media/MediaClient.kt
2020-06-18 09:36:05 +01:00
Sean Mac Gillicuddy
f96308e435 #3780 Create media using a combination of Entities & MwQueryResult - replace old site of thumbnail title with most relevant caption 2020-06-18 09:27:30 +01:00
Sean Mac Gillicuddy
eb9e94c603 #3780 Create media using a combination of Entities & MwQueryResult - update wikicode to align with expected behaviour 2020-06-18 09:02:52 +01:00
Sean Mac Gillicuddy
6bbf392e32 Merge remote-tracking branch 'origin/master' into macgills/3780-media-construction
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/Media.java
#	app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.kt
#	app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java
#	app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java
#	app/src/main/java/fr/free/nrw/commons/explore/BaseSearchFragment.kt
#	app/src/main/java/fr/free/nrw/commons/explore/depictions/SearchDepictionsFragment.kt
#	app/src/main/java/fr/free/nrw/commons/explore/media/MediaConverter.kt
#	app/src/main/java/fr/free/nrw/commons/explore/media/PageableMediaDataSource.kt
#	app/src/main/java/fr/free/nrw/commons/explore/media/SearchMediaAdapter.kt
#	app/src/main/java/fr/free/nrw/commons/media/MediaClient.kt
#	app/src/main/java/fr/free/nrw/commons/media/MediaInterface.java
#	app/src/main/java/fr/free/nrw/commons/upload/WikidataPlace.kt
#	app/src/test/kotlin/fr/free/nrw/commons/explore/BaseSearchPresenterTest.kt
#	app/src/test/kotlin/fr/free/nrw/commons/explore/media/PageableMediaDataSourceTest.kt
#	app/src/test/kotlin/fr/free/nrw/commons/media/MediaClientTest.kt
2020-06-18 08:54:29 +01:00
Seán Mac Gillicuddy
43b753dfe9
#3811 Convert MediaDataExtractor to Kotlin - convert (#3812) 2020-06-17 09:38:43 -07:00
Seán Mac Gillicuddy
422890cac4
#3813 Convert MediaClient to Kotlin (#3814)
* #3813 Convert MediaClient to Kotlin - convert

* #3813 Convert MediaClient to Kotlin - update tests

* #3813 Convert MediaClient to Kotlin - fix List typing

* #3813 Convert MediaClient to Kotlin - fix mock injecting
2020-06-17 09:38:17 -07:00
Seán Mac Gillicuddy
e3213aa5bd
#3816 Update Android Gradle Plugin to 4.0.0 (#3817)
* #3816 Update Android Gradle Plugin to 4.0.0 - upgrade AGP - remove explicit buildToolsVersion

* #3816 Update Android Gradle Plugin to 4.0.0 - remove extraneous multiDexEnabled

* #3816 Update Android Gradle Plugin to 4.0.0 - update Travis to use bundled build tools
2020-06-17 09:37:43 -07:00
Sean Mac Gillicuddy
6b3a19c92e #3810 Convert DepictedImagesFragment to use Pagination - align test with returned values 2020-06-17 11:03:34 +01:00
Sean Mac Gillicuddy
48b3002d05 #3810 Convert DepictedImagesFragment to use Pagination - map to empty result with no pages 2020-06-17 10:46:04 +01:00
Sean Mac Gillicuddy
310c29c2bd #3810 Convert DepictedImagesFragment to use Pagination - rename base classes to better reflect usage 2020-06-17 10:40:20 +01:00
Sean Mac Gillicuddy
181a63a233 #3810 Convert DepictedImagesFragment to use Pagination - extract common media paging methods - convert to DepictedImages to use pagination 2020-06-17 08:52:04 +01:00
Seán Mac Gillicuddy
c77ed747fe
#3772 Convert SearchImagesFragment to use Pagination (#3779) 2020-06-16 16:58:48 +03:00
Vivek Maskara
e4190f3f7d
With option for associating image with wikipedia article (#3783) 2020-06-16 16:51:06 +03:00
Sean Mac Gillicuddy
48a4e10170 #3808 Construct media objects that depict an item id correctly - use generator to construct media for DepictedImages 2020-06-16 12:05:01 +01:00
translatewiki.net
a4379fde02 Localisation updates from https://translatewiki.net. 2020-06-15 22:10:45 +02:00
translatewiki.net
b7ba1f0f57 Localisation updates from https://translatewiki.net. 2020-06-11 19:22:24 +02:00
Seán Mac Gillicuddy
f4d81eb4ca
#3760 Convert SearchCategoriesFragment to use Pagination (#3770) 2020-06-10 15:57:13 +03:00
translatewiki.net
63ab4a25aa Localisation updates from https://translatewiki.net. 2020-06-08 17:02:27 +02:00
Ashish Kumar
27cc41069f
Fixes #3784 (#3787)
* Added empty constructor in ContributionsListFragment
* Initialise ContributionsListFragment's callaback in onAttach
2020-06-05 13:51:08 +03:00
translatewiki.net
884e34887e Localisation updates from https://translatewiki.net. 2020-06-04 17:44:58 +02:00
translatewiki.net
0882516d6e Localisation updates from https://translatewiki.net. 2020-06-01 22:29:08 +02:00
Sean Mac Gillicuddy
e96b7f6f81 #3780 Create media using a combination of Entities & MwQueryResult - construct media with an entity - move fields from media down to contribution - move dynamic fields outside of media - remove unused constructors - remove all unnecessary fetching of captions/descriptions - bump database version 2020-05-29 14:30:10 +01:00
Sean Mac Gillicuddy
d85d11441d #3772 fix compilation 2020-05-28 13:40:48 +01:00
Sean Mac Gillicuddy
350b19e62f Merge branch 'macgills/3760-categories-pagination' into macgills/3772-images-pagination
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/Media.java
#	app/src/main/java/fr/free/nrw/commons/media/MediaClient.java
#	app/src/main/java/fr/free/nrw/commons/media/MediaDetailInterface.java
#	app/src/main/java/fr/free/nrw/commons/media/MediaInterface.java
2020-05-28 13:26:52 +01:00
Sean Mac Gillicuddy
043efde00e #3760 remove duplicate dependency 2020-05-28 13:10:34 +01:00
Sean Mac Gillicuddy
be075c8013 Merge remote-tracking branch 'origin/master' into macgills/3760-categories-pagination 2020-05-28 13:02:37 +01:00
Vivek Maskara
d863a404f1
With lazy loading of contributions (#3566) 2020-05-28 14:54:41 +03:00
Sean Mac Gillicuddy
02714649e8 #3760 remove test that got re-added by merge 2020-05-28 12:52:17 +01:00
Sean Mac Gillicuddy
1a1a8389d5 Merge remote-tracking branch 'origin/master' into macgills/3760-categories-pagination
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java
#	app/src/main/java/fr/free/nrw/commons/explore/SearchModule.java
#	app/src/main/java/fr/free/nrw/commons/explore/categories/SearchCategoryFragment.java
#	app/src/main/java/fr/free/nrw/commons/explore/depictions/DepictionAdapter.kt
#	app/src/main/java/fr/free/nrw/commons/explore/depictions/SearchDepictionsFragment.kt
#	app/src/main/java/fr/free/nrw/commons/explore/depictions/SearchDepictionsFragmentContract.kt
#	app/src/main/java/fr/free/nrw/commons/explore/depictions/SearchDepictionsFragmentPresenter.kt
#	app/src/main/java/fr/free/nrw/commons/nearby/PlaceAdapterDelegate.kt
#	app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java
2020-05-28 12:39:59 +01:00
Seán Mac Gillicuddy
c216fdf0d4
#3756 Convert SearchDepictionsFragment to use Pagination (#3758) 2020-05-28 14:10:04 +03:00
Sotirios Siamandouras
0ebd59a223
Fixes #3712 Changed button attributes (#3718)
* Fixes #3712 Changed Widget.AppCompat.Button.Borderless to Widget.AppCompat.Button

* Update upload_depicts_fragment.xml

* Update upload_depicts_fragment.xml

Removed unnecessary line
2020-05-28 09:00:09 +01:00
V Bhavna Haritsa
cda4a8fa76
updated the readme with new links (#3773) 2020-05-27 15:30:23 +05:30
Seán Mac Gillicuddy
b063d6bdfd #3468 Switch from RvRenderer to AdapterDelegates (#3750)
* #3468 Switch from RvRenderer to AdapterDelegates - replace SearchDepictionsRenderer

* #3468 Switch from RvRenderer to AdapterDelegates - replace UploadCategoryDepictionsRenderer

* #3468 Switch from RvRenderer to AdapterDelegates - update BaseAdapter to be easier to use

* #3468 Switch from RvRenderer to AdapterDelegates - replace SearchImagesRenderer

* #3468 Switch from RvRenderer to AdapterDelegates - replace SearchCategoriesRenderer

* #3468 Switch from RvRenderer to AdapterDelegates - replace NotificationRenderer

* #3468 Switch from RvRenderer to AdapterDelegates - replace UploadDepictsRenderer

* #3468 Switch from RvRenderer to AdapterDelegates - replace PlaceRenderer

* #3468 fix constant import

* #3468 Switch from RvRenderer to AdapterDelegates - resolve id conflict
2020-05-27 19:44:21 +10:00
Vaibhav
82d662c8ef Add destroyed column to BookmarkLocation table (##3729) (#3774)
* Add destroyed column to BookmarkLocation table (##3729)

* switch with fall through for migrations
2020-05-27 10:10:00 +01:00
translatewiki.net
7a49ca12a4 Localisation updates from https://translatewiki.net. 2020-05-26 17:04:25 +02:00
Sean Mac Gillicuddy
37c7eb060a #3772 Convert SearchImagesFragment to use Pagination - allow viewpager to load more data 2020-05-26 12:28:19 +01:00
Sean Mac Gillicuddy
c0fcf1a1c3 #3772 Convert SearchImagesFragment to use Pagination - convert SearchImagesFragment - tidy up showing the empty view - make search fragments show snackbar with appropriate text 2020-05-26 11:14:25 +01:00
Sean Mac Gillicuddy
6368e500a8 #3760 Convert SearchCategoriesFragment to use Pagination - extract functionality of pagination to base classes - add category pagination 2020-05-25 13:01:27 +01:00
Seán Mac Gillicuddy
df76aef070
#3763 IllegalArgumentException at fetchImagesForDepictedItem - pass entityId in (#3764) 2020-05-22 01:50:49 +10:00
Seán Mac Gillicuddy
618ace707b
#3752 Media details do not show depiction - make request return all languages available and choose preferred or first (#3761) 2020-05-21 21:51:20 +09:00
neslihanturan
3f31c3eded
Add bookmarks to Nearby map (#3728)
* Remove bookmark button from row button set and put to upper level list item

* Fix npe caused by lookinf for parent fragment, we don't have one anymore

* style

* Add new icons for bookmarked places

* Change bookmarked info when bookmarked

* Add pic field to bookmark dao so that we can retrieve them later

* Put bookmarks as the first item of list

* Add bookmark as a label

* Add logic to filter nearby

* remove unneeded changes

* fix word

* Remove logs

* Remove unused part of code

* Fix tests

* Remove logs

* simplify icon picking

* remove redundant margin left

* Remove non needed map and swap

* Add main thread annotation

* Fix tests
2020-05-21 20:58:27 +10:00
Seán Mac Gillicuddy
384afa6c44
#3753 Item label/description: Fall back to non-empty language - attempt to read labels by language or the first one in the list (#3759) 2020-05-21 08:54:09 +09:00
Seán Mac Gillicuddy
de3377c0fe
#3120 Suggest categories based on depictions (#3736) 2020-05-20 17:26:16 +03:00