Skip to content

Commit 34ab6f5

Browse files
authored
#3810 Convert DepictedImagesFragment to use Pagination (#3815)
* #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 * #3756 Convert SearchDepictionsFragment to use Pagination - convert SearchDepictionsFragment * #3756 Convert SearchDepictionsFragment to use Pagination - fix presenter unit tests now that view is not nullable - fix Category prefix imports * #3756 Convert SearchDepictionsFragment to use Pagination - test DataSource related classes * #3756 Convert SearchDepictionsFragment to use Pagination - reset rx scheduler - ignore failing test * #3760 Convert SearchCategoriesFragment to use Pagination - extract functionality of pagination to base classes - add category pagination * #3772 Convert SearchImagesFragment to use Pagination - convert SearchImagesFragment - tidy up showing the empty view - make search fragments show snackbar with appropriate text * #3772 Convert SearchImagesFragment to use Pagination - allow viewpager to load more data * #3760 remove test that got re-added by merge * #3760 remove duplicate dependency * #3772 fix compilation * #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 * #3808 Construct media objects that depict an item id correctly - use generator to construct media for DepictedImages * #3810 Convert DepictedImagesFragment to use Pagination - extract common media paging methods - convert to DepictedImages to use pagination * #3810 Convert DepictedImagesFragment to use Pagination - rename base classes to better reflect usage * #3810 Convert DepictedImagesFragment to use Pagination - map to empty result with no pages * #3810 Convert DepictedImagesFragment to use Pagination - align test with returned values * #3780 Create media using a combination of Entities & MwQueryResult - update wikicode to align with expected behaviour * #3780 Create media using a combination of Entities & MwQueryResult - replace old site of thumbnail title with most relevant caption
1 parent 4b22583 commit 34ab6f5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+306
-987
lines changed

app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package fr.free.nrw.commons
22

33
import androidx.core.text.HtmlCompat
4-
import fr.free.nrw.commons.depictions.Media.DepictedImagesFragment.PAGE_ID_PREFIX
4+
import fr.free.nrw.commons.media.PAGE_ID_PREFIX
55
import fr.free.nrw.commons.media.IdAndCaptions
66
import fr.free.nrw.commons.media.MediaClient
77
import io.reactivex.Single

app/src/main/java/fr/free/nrw/commons/depictions/DepictionModule.java

Lines changed: 0 additions & 27 deletions
This file was deleted.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package fr.free.nrw.commons.depictions
2+
3+
import dagger.Binds
4+
import dagger.Module
5+
import fr.free.nrw.commons.depictions.Media.DepictedImagesContract
6+
import fr.free.nrw.commons.depictions.Media.DepictedImagesPresenter
7+
import fr.free.nrw.commons.depictions.subClass.SubDepictionListContract
8+
import fr.free.nrw.commons.depictions.subClass.SubDepictionListPresenter
9+
10+
/**
11+
* The Dagger Module for explore:depictions related presenters and (some other objects maybe in future)
12+
*/
13+
@Module
14+
abstract class DepictionModule {
15+
@Binds
16+
abstract fun SubDepictionListPresenter.bindsSubDepictionListPresenter()
17+
: SubDepictionListContract.UserActionListener
18+
19+
20+
@Binds
21+
abstract fun DepictedImagesPresenter.bindsDepictedImagesContractPresenter()
22+
: DepictedImagesContract.Presenter
23+
}

app/src/main/java/fr/free/nrw/commons/depictions/GridViewAdapter.java

Lines changed: 0 additions & 119 deletions
This file was deleted.

app/src/main/java/fr/free/nrw/commons/depictions/Media/DepictedImagesContract.java

Lines changed: 0 additions & 98 deletions
This file was deleted.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package fr.free.nrw.commons.depictions.Media
2+
3+
import fr.free.nrw.commons.Media
4+
import fr.free.nrw.commons.explore.PagingContract
5+
6+
/**
7+
* Contract with which DepictedImagesFragment and its presenter will talk to each other
8+
*/
9+
interface DepictedImagesContract {
10+
interface View : PagingContract.View<Media>
11+
interface Presenter : PagingContract.Presenter<Media>
12+
}

0 commit comments

Comments
 (0)