Merge branch 'trunk' into feat/CMM-1148-Create-stats-Top-card

Author: adalpari

Gemfile

@@ -8,6 +8,7 @@ gem 'nokogiri'
 
 ### Fastlane Plugins
 
+gem 'fastlane-plugin-firebase_app_distribution', '~> 0.10'
 gem 'fastlane-plugin-sentry'
 gem 'fastlane-plugin-wpmreleasetoolkit', '~> 13.8'
 # gem 'fastlane-plugin-wpmreleasetoolkit', path: '../../release-toolkit'

Gemfile.lock

@@ -169,6 +169,9 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.4.1)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    fastlane-plugin-firebase_app_distribution (0.10.1)
+      google-apis-firebaseappdistribution_v1 (~> 0.3.0)
+      google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
     fastlane-plugin-sentry (1.29.0)
       os (~> 1.1, >= 1.1.4)
     fastlane-plugin-wpmreleasetoolkit (13.8.1)
@@ -204,6 +207,10 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
+    google-apis-firebaseappdistribution_v1 (0.3.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-firebaseappdistribution_v1alpha (0.2.0)
+      google-apis-core (>= 0.11.0, < 2.a)
     google-apis-iamcredentials_v1 (0.17.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-playcustomapp_v1 (0.13.0)
@@ -358,6 +365,7 @@ PLATFORMS
 DEPENDENCIES
   danger-dangermattic (~> 1.2)
   fastlane (~> 2)
+  fastlane-plugin-firebase_app_distribution (~> 0.10)
   fastlane-plugin-sentry
   fastlane-plugin-wpmreleasetoolkit (~> 13.8)
   nokogiri

WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerFragment.kt

@@ -69,7 +69,6 @@ import org.wordpress.android.util.SnackbarItem
 import org.wordpress.android.util.SnackbarItem.Action
 import org.wordpress.android.util.SnackbarItem.Info
 import org.wordpress.android.util.SnackbarSequencer
-import org.wordpress.android.util.ActivityUtils
 import org.wordpress.android.util.UriWrapper
 import org.wordpress.android.util.WPLinkMovementMethod
 import org.wordpress.android.util.WPMediaUtils
@@ -477,9 +476,6 @@ class MediaPickerFragment : Fragment(), MenuProvider {
             is PhotoListUiModel.Empty -> {
                 setupAdapter(listOf())
                 actionableEmptyView.updateLayoutForSearch(uiModel.isSearching, 0)
-                if (uiModel.isSearching) {
-                    ActivityUtils.hideKeyboardForced(actionableEmptyView)
-                }
                 actionableEmptyView.title.text = uiHelpers.getTextOfUiString(requireContext(), uiModel.title)
 
                 actionableEmptyView.subtitle.applyOrHide(uiModel.htmlSubtitle) { htmlSubtitle ->
@@ -492,18 +488,6 @@ class MediaPickerFragment : Fragment(), MenuProvider {
                     )
                     actionableEmptyView.subtitle.movementMethod = WPLinkMovementMethod.getInstance()
                 }
-                actionableEmptyView.image.applyOrHide(uiModel.image) { image ->
-                    this.setImageResource(image)
-                }
-                actionableEmptyView.bottomImage.applyOrHide(uiModel.bottomImage) { bottomImage ->
-                    this.setImageResource(bottomImage)
-                    if (uiModel.bottomImageDescription != null) {
-                        this.contentDescription = uiHelpers.getTextOfUiString(
-                            requireContext(),
-                            uiModel.bottomImageDescription
-                        ).toString()
-                    }
-                }
                 actionableEmptyView.button.applyOrHide(uiModel.retryAction) { action ->
                     this.setText(R.string.retry)
                     this.setOnClickListener {

WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModel.kt

@@ -193,9 +193,6 @@ class MediaPickerViewModel @Inject constructor(
             PhotoListUiModel.Empty(
                 title = domainModel.emptyState.title,
                 htmlSubtitle = domainModel.emptyState.htmlSubtitle,
-                image = domainModel.emptyState.image,
-                bottomImage = domainModel.emptyState.bottomImage,
-                bottomImageDescription = domainModel.emptyState.bottomImageDescription,
                 isSearching = isSearching == true,
                 retryAction = if (isSearching == true) null else this::retry
             )
@@ -733,9 +730,6 @@ class MediaPickerViewModel @Inject constructor(
         data class Empty(
             val title: UiString,
             val htmlSubtitle: UiString? = null,
-            val image: Int? = null,
-            val bottomImage: Int? = null,
-            val bottomImageDescription: UiString? = null,
             val isSearching: Boolean = false,
             val retryAction: (() -> Unit)? = null
         ) : PhotoListUiModel()

WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.kt

@@ -28,9 +28,12 @@ import androidx.core.content.ContextCompat
 import androidx.core.os.BundleCompat
 import androidx.core.text.HtmlCompat
 import androidx.core.view.isVisible
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.RecyclerView
+import kotlinx.coroutines.launch
 import com.google.android.material.R as MaterialR
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
@@ -236,6 +239,7 @@ class ReaderPostListFragment : ViewPagerFragment(), OnPostSelectedListener, OnFo
     private var postSearchAdapterPos = 0
     private var siteSearchAdapterPos = 0
     private var searchTabsPos = NO_POSITION
+    private var pendingScrollToBlogId: Long? = null
 
     private var isFilterableScreen = false
     private var isFiltered = false
@@ -537,6 +541,14 @@ class ReaderPostListFragment : ViewPagerFragment(), OnPostSelectedListener, OnFo
         ) { readerData: FollowStatusChanged ->
             setFollowStatusForBlog(readerData)
         }
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                postListViewModel.scrollToSiteId.collect { blogId ->
+                    pendingScrollToBlogId = blogId
+                }
+            }
+        }
     }
 
     private fun toggleJetpackBannerIfEnabled(showIfEnabled: Boolean, animateOnScroll: Boolean) {
@@ -1993,6 +2005,10 @@ class ReaderPostListFragment : ViewPagerFragment(), OnPostSelectedListener, OnFo
                     AppLog.d(AppLog.T.READER, "reader post list > restoring position")
                     recyclerView.scrollRecycleViewToPosition(restorePosition)
                 }
+                pendingScrollToBlogId?.let { blogId ->
+                    scrollToFirstPostFromBlog(blogId)
+                    pendingScrollToBlogId = null
+                }
                 if (isSearching && !isSearchTabsShowing()) {
                     showSearchTabs()
                 } else if (isSearching) {
@@ -2216,6 +2232,17 @@ class ReaderPostListFragment : ViewPagerFragment(), OnPostSelectedListener, OnFo
         }
     }
 
+    /*
+     * scroll to the first post from the specified blog
+     */
+    private fun scrollToFirstPostFromBlog(blogId: Long) {
+        if (!hasPostAdapter()) return
+        val position = getPostAdapter().getPositionOfFirstPostFromBlog(blogId)
+        if (position > -1) {
+            recyclerView.scrollRecycleViewToPosition(position)
+        }
+    }
+
     /*
      * same as above but clears posts before refreshing
      */

WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderPostAdapter.java

@@ -755,6 +755,24 @@ public boolean isEmpty() {
         return (mPosts == null || mPosts.size() == 0);
     }
 
+    /**
+     * Returns the adapter position of the first post from the specified blog, or -1 if not found.
+     */
+    public int getPositionOfFirstPostFromBlog(long blogId) {
+        if (mPosts == null) return -1;
+        for (int i = 0; i < mPosts.size(); i++) {
+            if (mPosts.get(i).blogId == blogId) {
+                int adapterPosition = i + getItemPositionOffset();
+                // Account for gap marker if it appears before this position
+                if (mGapMarkerPosition > -1 && adapterPosition >= mGapMarkerPosition) {
+                    adapterPosition++;
+                }
+                return adapterPosition;
+            }
+        }
+        return -1;
+    }
+
     private boolean isBookmarksList() {
         return (getPostListType() == ReaderPostListType.TAG_FOLLOWED
                 && (mCurrentTag != null && mCurrentTag.isBookmarked()));

WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderPostCardActionsHandler.kt

@@ -5,6 +5,9 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -125,6 +128,12 @@ class ReaderPostCardActionsHandler @Inject constructor(
     private val _refreshPosts = MediatorLiveData<Event<Unit>>()
     val refreshPosts: LiveData<Event<Unit>> = _refreshPosts
 
+    // Emits a blog ID to scroll to after undo block action. This provides visual feedback
+    // to the user that the undo was successful by scrolling to show the restored posts.
+    // The event is consumed by ReaderPostListFragment after posts are refreshed.
+    private val _scrollToSiteId = MutableSharedFlow<Long>()
+    val scrollToSiteId: SharedFlow<Long> = _scrollToSiteId.asSharedFlow()
+
     init {
         dispatcher.register(siteNotificationsUseCase)
     }
@@ -437,8 +446,10 @@ class ReaderPostCardActionsHandler @Inject constructor(
                                 UiStringRes(R.string.undo),
                                 {
                                     coroutineScope.launch {
+                                        val blogId = it.blockedBlogData.blogId
                                         undoBlockBlogUseCase.undoBlockBlog(it.blockedBlogData, source)
                                         _refreshPosts.postValue(Event(Unit))
+                                        _scrollToSiteId.emit(blogId)
                                         _snackbarEvents.postValue(
                                             Event(
                                                 SnackbarMessageHolder(

WordPress/src/main/java/org/wordpress/android/ui/reader/viewmodels/ReaderPostListViewModel.kt

@@ -71,6 +71,8 @@ class ReaderPostListViewModel @Inject constructor(
     private val _updateFollowStatus = MediatorLiveData<FollowStatusChanged>()
     val updateFollowStatus: LiveData<FollowStatusChanged> = _updateFollowStatus
 
+    val scrollToSiteId = readerPostCardActionsHandler.scrollToSiteId
+
     fun start(readerViewModel: ReaderViewModel?) {
         this.readerViewModel = readerViewModel