Pixelfed/PixelDroid-App-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove enableplaceholders config option

Browse Source
This commit is contained in:
Matthieu 2021-11-28 19:00:18 +01:00
parent f22cd47452
commit 58b668e09a
8 changed files with 23 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/FeedContentRepository.kt
View File

@ -48,8 +48,7 @@ class FeedContentRepository<T: FeedContentDatabase> @ExperimentalPagingApi
return Pager( return Pager(
config = PagingConfig(initialLoadSize = NETWORK_PAGE_SIZE, config = PagingConfig(initialLoadSize = NETWORK_PAGE_SIZE,
pageSize = NETWORK_PAGE_SIZE, pageSize = NETWORK_PAGE_SIZE,
enablePlaceholders = false, prefetchDistance = 20
prefetchDistance = 50
), ),
remoteMediator = mediator, remoteMediator = mediator,
pagingSourceFactory = pagingSourceFactory pagingSourceFactory = pagingSourceFactory

19
app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/notifications/NotificationsRemoteMediator.kt
View File

@ -41,18 +41,14 @@ class NotificationsRemoteMediator @Inject constructor(
override suspend fun load(loadType: LoadType, state: PagingState<Int, Notification>): MediatorResult { override suspend fun load(loadType: LoadType, state: PagingState<Int, Notification>): MediatorResult {
val (max_id, min_id) = when (loadType) { val maxId = when (loadType) {
LoadType.REFRESH -> { LoadType.REFRESH -> null
Pair<String?, String?>(null, null)
}
LoadType.PREPEND -> { LoadType.PREPEND -> {
//No prepend for the moment, might be nice to add later //No prepend for the moment, might be nice to add later
return MediatorResult.Success(endOfPaginationReached = true) return MediatorResult.Success(endOfPaginationReached = true)
} }
LoadType.APPEND -> { LoadType.APPEND -> state.lastItemOrNull()?.id
Pair<String?, String?>(state.lastItemOrNull()?.id, null) ?: return MediatorResult.Success(endOfPaginationReached = true)
}
} }
try { try {
@ -61,10 +57,9 @@ class NotificationsRemoteMediator @Inject constructor(
val api = apiHolder.api ?: apiHolder.setToCurrentUser() val api = apiHolder.api ?: apiHolder.setToCurrentUser()
val apiResponse = api.notifications( val apiResponse = api.notifications(
max_id = max_id, max_id = maxId,
min_id = min_id, limit = state.config.pageSize.toString()
limit = state.config.pageSize.toString(), )
)
apiResponse.forEach{it.user_id = user.user_id; it.instance_uri = user.instance_uri} apiResponse.forEach{it.user_id = user.user_id; it.instance_uri = user.instance_uri}

15
app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/postFeeds/HomeFeedRemoteMediator.kt
View File

@ -26,18 +26,14 @@ class HomeFeedRemoteMediator @Inject constructor(
override suspend fun load(loadType: LoadType, state: PagingState<Int, HomeStatusDatabaseEntity>): MediatorResult { override suspend fun load(loadType: LoadType, state: PagingState<Int, HomeStatusDatabaseEntity>): MediatorResult {
val (max_id, min_id) = when (loadType) { val maxId = when (loadType) {
LoadType.REFRESH -> { LoadType.REFRESH -> null
Pair<String?, String?>(null, null)
}
LoadType.PREPEND -> { LoadType.PREPEND -> {
//No prepend for the moment, might be nice to add later //No prepend for the moment, might be nice to add later
return MediatorResult.Success(endOfPaginationReached = true) return MediatorResult.Success(endOfPaginationReached = true)
} }
LoadType.APPEND -> { LoadType.APPEND -> state.lastItemOrNull()?.id
Pair<String?, String?>(state.lastItemOrNull()?.id, null) ?: return MediatorResult.Success(endOfPaginationReached = true)
}
} }
try { try {
@ -46,8 +42,7 @@ class HomeFeedRemoteMediator @Inject constructor(
val api = apiHolder.api ?: apiHolder.setToCurrentUser() val api = apiHolder.api ?: apiHolder.setToCurrentUser()
val apiResponse = api.timelineHome( val apiResponse = api.timelineHome(
max_id= max_id, max_id= maxId, limit = state.config.pageSize.toString()
min_id = min_id, limit = state.config.pageSize.toString()
) )
val dbObjects = apiResponse.map{ val dbObjects = apiResponse.map{

15
app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/postFeeds/PublicFeedRemoteMediator.kt
View File

@ -41,18 +41,14 @@ class PublicFeedRemoteMediator @Inject constructor(
override suspend fun load(loadType: LoadType, state: PagingState<Int, PublicFeedStatusDatabaseEntity>): MediatorResult { override suspend fun load(loadType: LoadType, state: PagingState<Int, PublicFeedStatusDatabaseEntity>): MediatorResult {
val (max_id, min_id) = when (loadType) { val maxId = when (loadType) {
LoadType.REFRESH -> { LoadType.REFRESH -> null
Pair<String?, String?>(null, null)
}
LoadType.PREPEND -> { LoadType.PREPEND -> {
//No prepend for the moment, might be nice to add later //No prepend for the moment, might be nice to add later
return MediatorResult.Success(endOfPaginationReached = true) return MediatorResult.Success(endOfPaginationReached = true)
} }
LoadType.APPEND -> { LoadType.APPEND -> state.lastItemOrNull()?.id
Pair<String?, String?>(state.lastItemOrNull()?.id, null) ?: return MediatorResult.Success(endOfPaginationReached = true)
}
} }
try { try {
@ -61,8 +57,7 @@ class PublicFeedRemoteMediator @Inject constructor(
val api = apiHolder.api ?: apiHolder.setToCurrentUser() val api = apiHolder.api ?: apiHolder.setToCurrentUser()
val apiResponse = api.timelinePublic( val apiResponse = api.timelinePublic(
max_id = max_id, max_id = maxId,
min_id = min_id,
limit = state.config.pageSize.toString(), limit = state.config.pageSize.toString(),
) )

3
app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/accountLists/FollowersContentRepository.kt
View File

@ -21,8 +21,7 @@ class FollowersContentRepository @ExperimentalPagingApi
return Pager( return Pager(
config = PagingConfig( config = PagingConfig(
initialLoadSize = NETWORK_PAGE_SIZE, initialLoadSize = NETWORK_PAGE_SIZE,
pageSize = NETWORK_PAGE_SIZE, pageSize = NETWORK_PAGE_SIZE),
enablePlaceholders = false),
pagingSourceFactory = { pagingSourceFactory = {
FollowersPagingSource(api, accountId, following) FollowersPagingSource(api, accountId, following)
} }

4
app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/hashtags/HashTagContentRepository.kt
View File

@ -24,8 +24,8 @@ class HashTagContentRepository @ExperimentalPagingApi
return Pager( return Pager(
config = PagingConfig( config = PagingConfig(
initialLoadSize = NETWORK_PAGE_SIZE, initialLoadSize = NETWORK_PAGE_SIZE,
pageSize = NETWORK_PAGE_SIZE, pageSize = NETWORK_PAGE_SIZE
enablePlaceholders = false), ),
pagingSourceFactory = { pagingSourceFactory = {
HashTagPagingSource(api, hashtag) HashTagPagingSource(api, hashtag)
} }

3
app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/profile/ProfileContentRepository.kt
View File

@ -19,8 +19,7 @@ class ProfileContentRepository @ExperimentalPagingApi
return Pager( return Pager(
config = PagingConfig( config = PagingConfig(
initialLoadSize = NETWORK_PAGE_SIZE, initialLoadSize = NETWORK_PAGE_SIZE,
pageSize = NETWORK_PAGE_SIZE, pageSize = NETWORK_PAGE_SIZE),
enablePlaceholders = false),
pagingSourceFactory = { pagingSourceFactory = {
ProfilePagingSource(api, accountId) ProfilePagingSource(api, accountId)
} }

3
app/src/main/java/org/pixeldroid/app/posts/feeds/uncachedFeeds/search/SearchContentRepository.kt
View File

@ -28,8 +28,7 @@ class SearchContentRepository<T: FeedContent> @ExperimentalPagingApi
return Pager( return Pager(
config = PagingConfig( config = PagingConfig(
initialLoadSize = NETWORK_PAGE_SIZE, initialLoadSize = NETWORK_PAGE_SIZE,
pageSize = NETWORK_PAGE_SIZE, pageSize = NETWORK_PAGE_SIZE),
enablePlaceholders = false),
pagingSourceFactory = { pagingSourceFactory = {
SearchPagingSource<T>(api, query, type) SearchPagingSource<T>(api, query, type)
} }