Skip to content

#3780 Create media using a combination of Entities & MwQueryResult #3786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 30 commits into from
Jun 25, 2020
Merged

#3780 Create media using a combination of Entities & MwQueryResult #3786

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
88c307d
#3468 Switch from RvRenderer to AdapterDelegates - replace SearchDepi…
macgills May 12, 2020
c7d25e1
#3468 Switch from RvRenderer to AdapterDelegates - replace UploadCate…
macgills May 12, 2020
58af240
#3468 Switch from RvRenderer to AdapterDelegates - update BaseAdapter…
macgills May 13, 2020
f083eb6
#3468 Switch from RvRenderer to AdapterDelegates - replace SearchImag…
macgills May 13, 2020
1c50591
#3468 Switch from RvRenderer to AdapterDelegates - replace SearchCate…
macgills May 13, 2020
8a39fdd
#3468 Switch from RvRenderer to AdapterDelegates - replace Notificati…
macgills May 13, 2020
456b864
#3468 Switch from RvRenderer to AdapterDelegates - replace UploadDepi…
macgills May 13, 2020
3b42296
#3468 Switch from RvRenderer to AdapterDelegates - replace PlaceRenderer
macgills May 14, 2020
9f2dcb8
Merge remote-tracking branch 'origin/master' into macgills/3468-adapt…
macgills May 15, 2020
4866fee
#3756 Convert SearchDepictionsFragment to use Pagination - convert Se…
macgills May 19, 2020
8d13122
Merge remote-tracking branch 'origin/master' into macgills/3756-depic…
macgills May 19, 2020
9af97c4
#3756 Convert SearchDepictionsFragment to use Pagination - fix presen…
macgills May 20, 2020
0fd81d0
#3756 Convert SearchDepictionsFragment to use Pagination - test DataS…
macgills May 20, 2020
ec53377
#3756 Convert SearchDepictionsFragment to use Pagination - reset rx s…
macgills May 20, 2020
6368e50
#3760 Convert SearchCategoriesFragment to use Pagination - extract fu…
macgills May 25, 2020
c0fcf1a
#3772 Convert SearchImagesFragment to use Pagination - convert Searc…
macgills May 26, 2020
37c7eb0
#3772 Convert SearchImagesFragment to use Pagination - allow viewpag…
macgills May 26, 2020
1a1a838
Merge remote-tracking branch 'origin/master' into macgills/3760-categ…
macgills May 28, 2020
0271464
#3760 remove test that got re-added by merge
macgills May 28, 2020
be075c8
Merge remote-tracking branch 'origin/master' into macgills/3760-categ…
macgills May 28, 2020
043efde
#3760 remove duplicate dependency
macgills May 28, 2020
350b19e
Merge branch 'macgills/3760-categories-pagination' into macgills/3772…
macgills May 28, 2020
d85d114
#3772 fix compilation
macgills May 28, 2020
e96b7f6
#3780 Create media using a combination of Entities & MwQueryResult - …
macgills May 29, 2020
48a4e10
#3808 Construct media objects that depict an item id correctly - use …
macgills Jun 16, 2020
6bbf392
Merge remote-tracking branch 'origin/master' into macgills/3780-media…
macgills Jun 18, 2020
eb9e94c
#3780 Create media using a combination of Entities & MwQueryResult - …
macgills Jun 18, 2020
f96308e
#3780 Create media using a combination of Entities & MwQueryResult - …
macgills Jun 18, 2020
7d487c3
Merge branch 'master' into macgills/3780-media-construction
macgills Jun 24, 2020
747839b
Merge remote-tracking branch 'origin/master' into macgills/3780-media…
macgills Jun 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
236 changes: 10 additions & 226 deletions .idea/codeStyles/Project.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ dependencies {
implementation 'com.karumi:dexter:5.0.0'
implementation "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION"

//paging
implementation "androidx.paging:paging-runtime-ktx:2.1.2"
implementation "androidx.paging:paging-rxjava2-ktx:2.1.2"

kapt "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION"
implementation "com.hannesdorfmann:adapterdelegates4-kotlin-dsl-layoutcontainer:$ADAPTER_DELEGATES_VERSION"
implementation "com.hannesdorfmann:adapterdelegates4-pagination:$ADAPTER_DELEGATES_VERSION"
Expand Down
Loading