Upgrade project.

Author: sharmadhiraj

app/build.gradle

@@ -3,11 +3,11 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     defaultConfig {
         applicationId "com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide"
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 30
         multiDexEnabled true
         versionCode 1
         versionName "1.0"
@@ -28,31 +28,31 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     //Support
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.android.material:material:1.1.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.0'
     implementation 'androidx.cardview:cardview:1.0.0'
 
     //Architecture Components
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 
     //Paging
-    implementation 'androidx.paging:paging-runtime:2.1.2'
+    implementation 'androidx.paging:paging-runtime-ktx:3.0.0'
 
     //Networking
-    implementation 'com.squareup.retrofit2:retrofit:2.6.1'
-    implementation 'com.squareup.retrofit2:converter-gson:2.6.1'
-    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.9.0'
 
     //Rx
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.6'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.10'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
 
     //Image
     implementation 'com.squareup.picasso:picasso:2.71828'
 
     //Testing
-    testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }

app/src/main/java/com/sharmadhiraj/androidpaginglibrarystepbystepimplementationguide/activity/NewsListActivity.kt

@@ -32,15 +32,16 @@ class NewsListActivity : AppCompatActivity() {
         newsListAdapter = NewsListAdapter { viewModel.retry() }
         recycler_view.adapter = newsListAdapter
         viewModel.newsList.observe(this,
-                Observer {
-                    newsListAdapter.submitList(it)
-                })
+            Observer {
+                newsListAdapter.submitList(it)
+            })
     }
 
     private fun initState() {
         txt_error.setOnClickListener { viewModel.retry() }
         viewModel.getState().observe(this, Observer { state ->
-            progress_bar.visibility = if (viewModel.listIsEmpty() && state == LOADING) VISIBLE else GONE
+            progress_bar.visibility =
+                if (viewModel.listIsEmpty() && state == LOADING) VISIBLE else GONE
             txt_error.visibility = if (viewModel.listIsEmpty() && state == ERROR) VISIBLE else GONE
             if (!viewModel.listIsEmpty()) {
                 newsListAdapter.setState(state ?: State.DONE)

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

@@ -22,7 +22,7 @@ class ListFooterViewHolder(view: View) : RecyclerView.ViewHolder(view) {
     companion object {
         fun create(retry: () -> Unit, parent: ViewGroup): ListFooterViewHolder {
             val view = LayoutInflater.from(parent.context)
-                    .inflate(R.layout.item_list_footer, parent, false)
+                .inflate(R.layout.item_list_footer, parent, false)
             view.txt_error.setOnClickListener { retry() }
             return ListFooterViewHolder(view)
         }

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

@@ -16,7 +16,10 @@ class NewsListAdapter(private val retry: () -> Unit)
     private var state = State.LOADING
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return if (viewType == DATA_VIEW_TYPE) NewsViewHolder.create(parent) else ListFooterViewHolder.create(retry, parent)
+        return if (viewType == DATA_VIEW_TYPE) NewsViewHolder.create(parent) else ListFooterViewHolder.create(
+            retry,
+            parent
+        )
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {

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

@@ -22,7 +22,7 @@ class NewsViewHolder(view: View) : RecyclerView.ViewHolder(view) {
     companion object {
         fun create(parent: ViewGroup): NewsViewHolder {
             val view = LayoutInflater.from(parent.context)
-                    .inflate(R.layout.item_news, parent, false)
+                .inflate(R.layout.item_news, parent, false)
             return NewsViewHolder(view)
         }
     }

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

@@ -11,17 +11,17 @@ interface NetworkService {
 
     @GET("everything?q=sports&apiKey=aa67d8d98c8e4ad1b4f16dbd5f3be348")
     fun getNews(
-            @Query("page") page: Int,
-            @Query("pageSize") pageSize: Int
+        @Query("page") page: Int,
+        @Query("pageSize") pageSize: Int
     ): Single<Response>
 
     companion object {
         fun getService(): NetworkService {
             val retrofit = Retrofit.Builder()
-                    .baseUrl("https://newsapi.org/v2/")
-                    .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
-                    .addConverterFactory(GsonConverterFactory.create())
-                    .build()
+                .baseUrl("https://newsapi.org/v2/")
+                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .addConverterFactory(GsonConverterFactory.create())
+                .build()
             return retrofit.create(NetworkService::class.java)
         }
     }

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

@@ -11,50 +11,55 @@ import io.reactivex.functions.Action
 import io.reactivex.schedulers.Schedulers
 
 class NewsDataSource(
-        private val networkService: NetworkService,
-        private val compositeDisposable: CompositeDisposable)
-    : PageKeyedDataSource<Int, News>() {
+    private val networkService: NetworkService,
+    private val compositeDisposable: CompositeDisposable
+) : PageKeyedDataSource<Int, News>() {
 
     var state: MutableLiveData<State> = MutableLiveData()
     private var retryCompletable: Completable? = null
 
 
-    override fun loadInitial(params: LoadInitialParams<Int>, callback: LoadInitialCallback<Int, News>) {
+    override fun loadInitial(
+        params: LoadInitialParams<Int>,
+        callback: LoadInitialCallback<Int, News>
+    ) {
         updateState(State.LOADING)
         compositeDisposable.add(
-                networkService.getNews(1, params.requestedLoadSize)
-                        .subscribe(
-                                { response ->
-                                    updateState(DONE)
-                                    callback.onResult(response.news,
-                                            null,
-                                            2
-                                    )
-                                },
-                                {
-                                    updateState(ERROR)
-                                    setRetry(Action { loadInitial(params, callback) })
-                                }
+            networkService.getNews(1, params.requestedLoadSize)
+                .subscribe(
+                    { response ->
+                        updateState(DONE)
+                        callback.onResult(
+                            response.news,
+                            null,
+                            2
                         )
+                    },
+                    {
+                        updateState(ERROR)
+                        setRetry(Action { loadInitial(params, callback) })
+                    }
+                )
         )
     }
 
     override fun loadAfter(params: LoadParams<Int>, callback: LoadCallback<Int, News>) {
         updateState(State.LOADING)
         compositeDisposable.add(
-                networkService.getNews(params.key, params.requestedLoadSize)
-                        .subscribe(
-                                { response ->
-                                    updateState(DONE)
-                                    callback.onResult(response.news,
-                                            params.key + 1
-                                    )
-                                },
-                                {
-                                    updateState(ERROR)
-                                    setRetry(Action { loadAfter(params, callback) })
-                                }
+            networkService.getNews(params.key, params.requestedLoadSize)
+                .subscribe(
+                    { response ->
+                        updateState(DONE)
+                        callback.onResult(
+                            response.news,
+                            params.key + 1
                         )
+                    },
+                    {
+                        updateState(ERROR)
+                        setRetry(Action { loadAfter(params, callback) })
+                    }
+                )
         )
     }
 
@@ -67,10 +72,12 @@ class NewsDataSource(
 
     fun retry() {
         if (retryCompletable != null) {
-            compositeDisposable.add(retryCompletable!!
+            compositeDisposable.add(
+                retryCompletable!!
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe())
+                    .subscribe()
+            )
         }
     }
 

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

@@ -5,9 +5,9 @@ import androidx.paging.DataSource
 import io.reactivex.disposables.CompositeDisposable
 
 class NewsDataSourceFactory(
-        private val compositeDisposable: CompositeDisposable,
-        private val networkService: NetworkService)
-    : DataSource.Factory<Int, News>() {
+    private val compositeDisposable: CompositeDisposable,
+    private val networkService: NetworkService
+) : DataSource.Factory<Int, News>() {
 
     val newsDataSourceLiveData = MutableLiveData<NewsDataSource>()
 

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

@@ -3,12 +3,12 @@ package com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data
 import com.google.gson.annotations.SerializedName
 
 data class Response(
-        @SerializedName("articles")
-        val news: List<News>
+    @SerializedName("articles")
+    val news: List<News>
 )
 
 data class News(
-        val title: String,
-        @SerializedName("urlToImage")
-        val image: String?
+    val title: String,
+    @SerializedName("urlToImage")
+    val image: String?
 )

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

@@ -14,22 +14,22 @@ class NewsListViewModel : ViewModel() {
     var newsList: LiveData<PagedList<News>>
     private val compositeDisposable = CompositeDisposable()
     private val pageSize = 5
-    private val newsDataSourceFactory: NewsDataSourceFactory
+    private val newsDataSourceFactory: NewsDataSourceFactory =
+        NewsDataSourceFactory(compositeDisposable, networkService)
 
     init {
-        newsDataSourceFactory = NewsDataSourceFactory(compositeDisposable, networkService)
         val config = PagedList.Config.Builder()
-                .setPageSize(pageSize)
-                .setInitialLoadSizeHint(pageSize * 2)
-                .setEnablePlaceholders(false)
-                .build()
+            .setPageSize(pageSize)
+            .setInitialLoadSizeHint(pageSize * 2)
+            .setEnablePlaceholders(false)
+            .build()
         newsList = LivePagedListBuilder(newsDataSourceFactory, config).build()
     }
 
 
     fun getState(): LiveData<State> = Transformations.switchMap(
-            newsDataSourceFactory.newsDataSourceLiveData,
-            NewsDataSource::state
+        newsDataSourceFactory.newsDataSourceLiveData,
+        NewsDataSource::state
     )
 
     fun retry() {

app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -2,13 +2,13 @@
     xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
+    android:viewportWidth="108"
+    android:viewportHeight="108">
     <path
         android:fillType="evenOdd"
         android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1">
+        android:strokeWidth="1"
+        android:strokeColor="#00000000">
         <aapt:attr name="android:fillColor">
             <gradient
                 android:endX="78.5885"
@@ -29,6 +29,6 @@
         android:fillColor="#FFFFFF"
         android:fillType="nonZero"
         android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1" />
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
 </vector>