Skip to content

Commit 85b1517

Browse files
committed
Fix auto import changes.
1 parent 08ddc7b commit 85b1517

File tree

3 files changed

+8
-25
lines changed

3 files changed

+8
-25
lines changed

app/src/main/java/com/sharmadhiraj/androidpaginglibrarystepbystepimplementationguide/adapter/NewsListAdapter.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.adapter
22

33
import android.view.ViewGroup
4-
import androidx.paging.PagingDataAdapter
4+
import androidx.paging.PagedListAdapter
55
import androidx.recyclerview.widget.DiffUtil
66
import androidx.recyclerview.widget.RecyclerView
77
import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.News
88
import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.State
99

10-
class NewsListAdapter(private val retry: () -> Unit) :
11-
PagingDataAdapter<News, RecyclerView.ViewHolder>(NewsDiffCallback) {
10+
class NewsListAdapter(private val retry: () -> Unit)
11+
: PagedListAdapter<News, RecyclerView.ViewHolder>(NewsDiffCallback) {
1212

1313
private val DATA_VIEW_TYPE = 1
1414
private val FOOTER_VIEW_TYPE = 2

app/src/main/java/com/sharmadhiraj/androidpaginglibrarystepbystepimplementationguide/data/NewsDataSource.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data
22

33
import androidx.lifecycle.MutableLiveData
4-
import androidx.paging.PagingSource
4+
import androidx.paging.PageKeyedDataSource
55
import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.State.DONE
66
import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.State.ERROR
77
import io.reactivex.Completable
@@ -13,7 +13,7 @@ import io.reactivex.schedulers.Schedulers
1313
class NewsDataSource(
1414
private val networkService: NetworkService,
1515
private val compositeDisposable: CompositeDisposable
16-
) : PagingSource<Int, News>() {
16+
) : PageKeyedDataSource<Int, News>() {
1717

1818
var state: MutableLiveData<State> = MutableLiveData()
1919
private var retryCompletable: Completable? = null

app/src/main/java/com/sharmadhiraj/androidpaginglibrarystepbystepimplementationguide/viewModel/NewsListViewModel.kt

+3-20
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,10 @@ package com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.viewM
33
import androidx.lifecycle.LiveData
44
import androidx.lifecycle.Transformations
55
import androidx.lifecycle.ViewModel
6+
import androidx.paging.LivePagedListBuilder
67
import androidx.paging.PagedList
7-
import androidx.paging.Pager
8-
import androidx.paging.PagingConfig
9-
import androidx.paging.liveData
10-
import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.NetworkService
11-
import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.News
12-
import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.NewsDataSource
13-
import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.NewsDataSourceFactory
14-
import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.State
8+
import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.*
159
import io.reactivex.disposables.CompositeDisposable
16-
import kotlinx.coroutines.Dispatchers
1710

1811
class NewsListViewModel : ViewModel() {
1912

@@ -30,17 +23,7 @@ class NewsListViewModel : ViewModel() {
3023
.setInitialLoadSizeHint(pageSize * 2)
3124
.setEnablePlaceholders(false)
3225
.build()
33-
newsList = Pager<Int, News>(
34-
PagingConfig(
35-
config.pageSize,
36-
config.prefetchDistance,
37-
config.enablePlaceholders,
38-
config.initialLoadSizeHint,
39-
config.maxSize
40-
),
41-
this.initialLoadKey,
42-
newsDataSourceFactory.asPagingSourceFactory(Dispatchers.IO)
43-
).liveData.build()
26+
newsList = LivePagedListBuilder(newsDataSourceFactory, config).build()
4427
}
4528

4629

0 commit comments

Comments
 (0)