From 020976e257f5de127ad21493c451839c3061950c Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Mon, 8 Feb 2021 13:29:58 +0530
Subject: [PATCH] build: update remaining dependencies

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 .../dev/msfjarvis/lobsters/data/api/LobstersApiTest.kt |  8 ++++----
 .../lobsters/data/remote/LobstersPagingSource.kt       |  5 +++++
 .../dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt    |  4 ++++
 app/src/main/res/values/strings.xml                    |  1 +
 buildSrc/src/main/java/Dependencies.kt                 | 10 +++++-----
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/api/src/test/java/dev/msfjarvis/lobsters/data/api/LobstersApiTest.kt b/api/src/test/java/dev/msfjarvis/lobsters/data/api/LobstersApiTest.kt
index 77c9764b..c6fe7042 100644
--- a/api/src/test/java/dev/msfjarvis/lobsters/data/api/LobstersApiTest.kt
+++ b/api/src/test/java/dev/msfjarvis/lobsters/data/api/LobstersApiTest.kt
@@ -4,10 +4,10 @@ import dev.msfjarvis.lobsters.injection.ApiModule
 import dev.msfjarvis.lobsters.injection.MoshiModule
 import dev.msfjarvis.lobsters.util.TestUtils
 import kotlinx.coroutines.runBlocking
-import okhttp3.mockwebserver.Dispatcher
-import okhttp3.mockwebserver.MockResponse
-import okhttp3.mockwebserver.MockWebServer
-import okhttp3.mockwebserver.RecordedRequest
+import mockwebserver3.Dispatcher
+import mockwebserver3.MockResponse
+import mockwebserver3.MockWebServer
+import mockwebserver3.RecordedRequest
 import org.junit.AfterClass
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
diff --git a/app/src/main/java/dev/msfjarvis/lobsters/data/remote/LobstersPagingSource.kt b/app/src/main/java/dev/msfjarvis/lobsters/data/remote/LobstersPagingSource.kt
index 619e39ed..f50b5c2e 100644
--- a/app/src/main/java/dev/msfjarvis/lobsters/data/remote/LobstersPagingSource.kt
+++ b/app/src/main/java/dev/msfjarvis/lobsters/data/remote/LobstersPagingSource.kt
@@ -1,6 +1,7 @@
 package dev.msfjarvis.lobsters.data.remote
 
 import androidx.paging.PagingSource
+import androidx.paging.PagingState
 import dev.msfjarvis.lobsters.data.local.LobstersPost
 import dev.msfjarvis.lobsters.data.repo.LobstersRepository
 import javax.inject.Inject
@@ -26,4 +27,8 @@ class LobstersPagingSource @Inject constructor(
       LoadResult.Error(e)
     }
   }
+
+  override fun getRefreshKey(state: PagingState<Int, LobstersPost>): Int {
+    return state.pages.size + 1
+  }
 }
diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt
index 2f434064..04aade2e 100644
--- a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt
+++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt
@@ -100,6 +100,10 @@ fun LobstersItem(
       )
       CoilImage(
         data = "${LobstersApi.BASE_URL}/${post.submitter_user.avatarUrl}",
+        contentDescription = stringResource(
+          R.string.avatar_content_description,
+          post.submitter_user.username
+        ),
         fadeIn = true,
         requestBuilder = {
           transformations(CircleCropTransformation())
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ada50823..94b2c294 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,6 +5,7 @@
   <string name="hottest_posts">Hottest</string>
   <string name="saved_posts">Saved</string>
   <string name="submitted_by">submitted by %1$s</string>
+  <string name="avatar_content_description">%1$s\'s avatar</string>
   <string name="add_to_saved_posts">Add to saved posts</string>
   <string name="remove_from_saved_posts">Remove from saved posts</string>
 </resources>
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index b0f04052..fc93d519 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -39,8 +39,8 @@ object Dependencies {
       const val foundation = "androidx.compose.foundation:foundation:$COMPOSE_VERSION"
       const val foundationLayout = "androidx.compose.foundation:foundation-layout:$COMPOSE_VERSION"
       const val material = "androidx.compose.material:material:$COMPOSE_VERSION"
-      const val navigation = "androidx.navigation:navigation-compose:1.0.0-alpha05"
-      const val paging = "androidx.paging:paging-compose:1.0.0-alpha05"
+      const val navigation = "androidx.navigation:navigation-compose:1.0.0-alpha06"
+      const val paging = "androidx.paging:paging-compose:1.0.0-alpha06"
       const val runtime = "androidx.compose.runtime:runtime:$COMPOSE_VERSION"
       const val ui = "androidx.compose.ui:ui:$COMPOSE_VERSION"
       const val uiUnit = "androidx.compose.ui:ui-unit:$COMPOSE_VERSION"
@@ -62,13 +62,13 @@ object Dependencies {
 
   object ThirdParty {
 
-    const val accompanist = "dev.chrisbanes.accompanist:accompanist-coil:0.4.2"
+    const val accompanist = "dev.chrisbanes.accompanist:accompanist-coil:0.5.0"
 
     object Moshi {
 
       private const val version = "1.11.0"
       const val lib = "com.squareup.moshi:moshi:$version"
-      const val moshiMetadataReflect = "dev.zacsweers.moshix:moshi-metadata-reflect:0.7.1"
+      const val moshiMetadataReflect = "dev.zacsweers.moshix:moshi-metadata-reflect:0.8.0"
     }
 
     object Retrofit {
@@ -90,7 +90,7 @@ object Dependencies {
 
     const val daggerHilt = "com.google.dagger:hilt-android-testing:$DAGGER_HILT_VERSION"
     const val junit = "junit:junit:4.13.1"
-    const val mockWebServer = "com.squareup.okhttp3:mockwebserver:4.6.0"
+    const val mockWebServer = "com.squareup.okhttp3:mockwebserver3-junit4:5.0.0-alpha.2"
     const val uiTest = "androidx.compose.ui:ui-test:$COMPOSE_VERSION"
 
     object AndroidX {