Merge tag 'v1.4.1' into develop

Version 1.4.1

Author: LaurentTreguier

.github/workflows/publishing.yml

@@ -142,8 +142,6 @@ jobs:
           case "${{ github.ref_name }}" in
           v*.*.*)
             export track=beta;;
-          hotfix/*)
-            export track=beta;;
           *)
             export track=internal;;
           esac

app/src/legacy/kotlin/app/fyreplace/fyreplace/legacy/extensions/ViewExt.kt

@@ -6,6 +6,7 @@ import android.view.HapticFeedbackConstants
 import android.view.View
 import android.view.inputmethod.InputMethodManager
 import androidx.core.graphics.Insets
+import androidx.core.graphics.Insets.max
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
@@ -21,7 +22,9 @@ fun View.updatePaddingWithSystemInsets(basePadding: Insets) =
 
 fun View.updatePaddingWithImeInsets(basePadding: Insets) =
     ViewCompat.setOnApplyWindowInsetsListener(this) { view, insets ->
-        view.updatePadding(basePadding + insets.getInsets(WindowInsetsCompat.Type.ime()))
+        val imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime())
+        val barInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+        view.updatePadding(basePadding + max(imeInsets, barInsets))
         return@setOnApplyWindowInsetsListener insets
     }
 

app/src/legacy/kotlin/app/fyreplace/fyreplace/legacy/ui/fragments/FeedFragment.kt

@@ -72,8 +72,10 @@ class FeedFragment :
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         adapter = FeedAdapter(em, viewLifecycleOwner, cvm.isAuthenticated, this, this)
+        adapter.replaceAll(vm.posts.value)
         bd.recyclerView.adapter = adapter
         bd.swipe.setOnRefreshListener { launch { refreshListing() } }
+        vm.posts.launchCollect(action = adapter::replaceAll)
     }
 
     override fun onStart() {
@@ -117,7 +119,6 @@ class FeedFragment :
         vm.startListing().launchCollect(retry = if (retryCount < 3) ::retryListing else null) {
             bd.swipe.isRefreshing = false
             retryCount = 0
-            adapter.replaceAll(it)
         }.invokeOnCompletion {
             if (listing == currentListing) {
                 bd.swipe.isRefreshing = false

app/src/legacy/kotlin/app/fyreplace/fyreplace/legacy/viewmodels/FeedViewModel.kt

@@ -31,7 +31,8 @@ class FeedViewModel @Inject constructor(
     private val postService: PostServiceClient
 ) : BaseViewModel() {
     private lateinit var votesChannel: SendChannel<Vote>
-    private val posts = MutableStateFlow(emptyList<Post>())
+    private val mPosts = MutableStateFlow(emptyList<Post>())
+    val posts = mPosts.asStateFlow()
     val isEmpty = posts.map(List<Post>::isEmpty).asState(true)
     val emptyText = MutableStateFlow(R.string.feed_empty).asStateFlow()
     private val stalePostIds = mutableSetOf<ByteString>()
@@ -68,7 +69,7 @@ class FeedViewModel @Inject constructor(
     }
 
     fun reset() {
-        posts.value = emptyList()
+        mPosts.value = emptyList()
         stalePostIds.clear()
     }
 
@@ -80,7 +81,7 @@ class FeedViewModel @Inject constructor(
                 spread = spread
             )
         )
-        posts.value = posts.value.filter { it.id != postId }
+        mPosts.value = posts.value.filter { it.id != postId }
     }
 
     private suspend fun FlowCollector<List<Post>>.emitFeed(newPost: Post) {
@@ -102,20 +103,20 @@ class FeedViewModel @Inject constructor(
             pruneStalePosts()
         }
 
-        posts.value = newFeed
+        mPosts.value = newFeed
         emit(newFeed)
     }
 
     private fun pruneStalePosts() {
         for (id in stalePostIds) {
-            posts.value = posts.value.filter { it.id != id }
+            mPosts.value = posts.value.filter { it.id != id }
         }
 
         stalePostIds.clear()
     }
 
     private fun incrementCommentCount(postId: ByteString) {
-        posts.value = posts.value.map {
+        mPosts.value = posts.value.map {
             when (it.id) {
                 postId -> it.copy(comment_count = it.comment_count + 1)
                 else -> it

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-androidPlugin = "9.1.0"
+androidPlugin = "9.1.1"
 kotlinPlugin = "2.3.20"
 sentryPlugin = "6.4.0"
 openapiPlugin = "7.21.0"