Merge branch 'trunk' into cmm-2174-background-anr

Author: nbradbury

Gemfile

@@ -9,7 +9,7 @@ gem 'fastlane', '~> 2.238'
 
 gem 'fastlane-plugin-firebase_app_distribution', '~> 1.0'
 gem 'fastlane-plugin-sentry'
-gem 'fastlane-plugin-wpmreleasetoolkit', '~> 14.11.3'
+gem 'fastlane-plugin-wpmreleasetoolkit', '~> 15.0.0'
 # gem 'fastlane-plugin-wpmreleasetoolkit', path: '../../release-toolkit'
 # gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', branch: ''
 

Gemfile.lock

@@ -9,7 +9,7 @@ GEM
     ast (2.4.3)
     atomos (0.1.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1281.0)
+    aws-partitions (1.1283.0)
     aws-sdk-core (3.254.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
@@ -74,12 +74,12 @@ GEM
     diffy (3.4.4)
     digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.6.20240107)
+    domain_name (0.6.20260902)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
     erb (6.0.7)
     erubi (1.13.1)
-    excon (1.7.0)
+    excon (1.7.1)
       logger
     faraday (2.14.3)
       faraday-net_http (>= 2.0, < 3.5)
@@ -159,7 +159,7 @@ GEM
       google-apis-firebaseappdistribution_v1alpha (>= 0.12.0)
     fastlane-plugin-sentry (1.29.0)
       os (~> 1.1, >= 1.1.4)
-    fastlane-plugin-wpmreleasetoolkit (14.11.3)
+    fastlane-plugin-wpmreleasetoolkit (15.0.0)
       buildkit (~> 1.5)
       chroma (= 0.2.0)
       diffy (~> 3.3)
@@ -190,7 +190,7 @@ GEM
     git (1.19.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    google-apis-androidpublisher_v3 (0.106.0)
+    google-apis-androidpublisher_v3 (0.107.0)
       google-apis-core (>= 0.15.0, < 2.a)
     google-apis-core (1.2.5)
       addressable (~> 2.9)
@@ -228,7 +228,7 @@ GEM
       googleauth (~> 1.9)
       mini_mime (~> 1.0)
     google-logging-utils (0.2.0)
-    googleauth (1.17.3)
+    googleauth (1.17.4)
       faraday (>= 1.0, < 3.a)
       google-cloud-env (~> 2.2)
       google-logging-utils (~> 0.1)
@@ -306,7 +306,7 @@ GEM
     rake (13.4.2)
     rake-compiler (1.3.1)
       rake
-    rbs (4.1.3)
+    rbs (4.2.0)
       logger
       prism (>= 1.6.0)
       tsort
@@ -325,7 +325,7 @@ GEM
       uber (< 0.2.0)
     retriable (4.2.0)
     rexml (3.4.4)
-    rmagick (7.1.1)
+    rmagick (7.1.3)
       observer (~> 0.1)
       pkg-config (~> 1.4)
     rouge (3.28.0)
@@ -395,7 +395,7 @@ DEPENDENCIES
   fastlane (~> 2.238)
   fastlane-plugin-firebase_app_distribution (~> 1.0)
   fastlane-plugin-sentry
-  fastlane-plugin-wpmreleasetoolkit (~> 14.11.3)
+  fastlane-plugin-wpmreleasetoolkit (~> 15.0.0)
   rmagick (~> 7.1)
 
 BUNDLED WITH

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

@@ -36,7 +36,11 @@ data class MediaLoader(
                 }
 
                 if (currentAction !is NextPage) {
-                    state = updateState(state.copy(isLoading = true, emptyState = null))
+                    // Apply the new filter together with the loading state. Otherwise the first search
+                    // enters the loading state still carrying the previous (empty) filter, which makes
+                    // the picker hide the loading spinner instead of showing it (see CMM-2382).
+                    val loadingState = state.applyFilterFor(currentAction)
+                    state = updateState(loadingState.copy(isLoading = true, emptyState = null))
                 }
                 val updatedState = loadState(currentAction, state)
                 if (state != updatedState) {
@@ -56,10 +60,8 @@ data class MediaLoader(
         return when (loadAction) {
             is Start -> {
                 if (state.domainItems.isEmpty()) {
-                    buildDomainModel(
-                        mediaSource.load(filter = loadAction.filter),
-                        state.copy(filter = loadAction.filter)
-                    )
+                    val filteredState = state.applyFilterFor(loadAction)
+                    buildDomainModel(mediaSource.load(filter = filteredState.filter), filteredState)
                 } else {
                     state
                 }
@@ -81,19 +83,30 @@ data class MediaLoader(
                 buildDomainModel(load, state)
             }
             is Filter -> {
-                val load = mediaSource.load(filter = loadAction.filter)
-                buildDomainModel(load, state.copy(filter = loadAction.filter))
+                val filteredState = state.applyFilterFor(loadAction)
+                buildDomainModel(mediaSource.load(filter = filteredState.filter), filteredState)
             }
             is ClearFilter -> {
-                val load = mediaSource.load(filter = null)
-                buildDomainModel(load, state.copy(filter = null))
+                val filteredState = state.applyFilterFor(loadAction)
+                buildDomainModel(mediaSource.load(filter = filteredState.filter), filteredState)
             }
             is Retry -> {
                 buildDomainModel(mediaSource.load(filter = state.filter), state)
             }
         }
     }
 
+    // Single source of truth for the filter an action implies, so the loading state and the loaded
+    // state stay in sync. Any action carrying a filter must be handled here (see CMM-2382).
+    private fun DomainModel.applyFilterFor(loadAction: LoadAction): DomainModel {
+        return when (loadAction) {
+            is Start -> copy(filter = loadAction.filter)
+            is Filter -> copy(filter = loadAction.filter)
+            is ClearFilter -> copy(filter = null)
+            else -> this
+        }
+    }
+
     private suspend fun FlowCollector<DomainModel>.updateState(
         updatedState: DomainModel
     ): DomainModel {

WordPress/src/main/java/org/wordpress/android/ui/posts/prepublishing/home/compose/PrepublishingHomeSocialNoConnectionsItem.kt

@@ -41,7 +41,8 @@ fun PrepublishingHomeSocialNoConnectionsItem(
     Column(
         modifier = Modifier
             .background(backgroundColor)
-            .then(modifier),
+            .then(modifier)
+            .padding(Margin.ExtraLarge.value),
     ) {
         TrainOfIcons(
             iconModels = connectionIconModels,

WordPress/src/main/java/org/wordpress/android/ui/posts/social/compose/PostSocialSharingItem.kt

@@ -41,7 +41,8 @@ fun PostSocialSharingItem(
         iconCount = model.iconModels.size,
         modifier = Modifier
             .background(backgroundColor)
-            .then(modifier),
+            .then(modifier)
+            .padding(Margin.ExtraLarge.value),
     ) { textColumnModifier ->
         Column(modifier = textColumnModifier) {
             Text(

WordPress/src/main/java/org/wordpress/android/ui/postsrs/terms/TermSelectionActivity.kt

@@ -53,8 +53,6 @@ class TermSelectionActivity : BaseAppCompatActivity() {
                         viewModel::onTermToggled,
                     onSearchQueryChanged =
                         viewModel::onSearchQueryChanged,
-                    onLoadMore =
-                        viewModel::onLoadMore,
                     onAddTermClicked =
                         viewModel::onAddTermClicked,
                     onAddDialogDismissed =

WordPress/src/main/java/org/wordpress/android/ui/postsrs/terms/TermSelectionModels.kt

@@ -10,8 +10,6 @@ data class SelectableTerm(
 data class TermSelectionUiState(
     val isLoading: Boolean = true,
     val isSearching: Boolean = false,
-    val isLoadingMore: Boolean = false,
-    val canLoadMore: Boolean = false,
     val error: String? = null,
     val terms: List<SelectableTerm> = emptyList(),
     val searchQuery: String = "",

WordPress/src/main/java/org/wordpress/android/ui/postsrs/terms/TermSelectionScreen.kt

@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
@@ -57,7 +56,6 @@ fun TermSelectionScreen(
     onSaveClicked: () -> Unit,
     onTermToggled: (Long) -> Unit,
     onSearchQueryChanged: (String) -> Unit,
-    onLoadMore: () -> Unit,
     onAddTermClicked: () -> Unit,
     onAddDialogDismissed: () -> Unit,
     onAddTermConfirmed: (String, Long?) -> Unit,
@@ -141,13 +139,9 @@ fun TermSelectionScreen(
                         terms = uiState.terms,
                         searchQuery = uiState.searchQuery,
                         isSearching = uiState.isSearching,
-                        canLoadMore = uiState.canLoadMore,
-                        isLoadingMore =
-                            uiState.isLoadingMore,
                         onSearchQueryChanged =
                             onSearchQueryChanged,
                         onTermToggled = onTermToggled,
-                        onLoadMore = onLoadMore,
                     )
             }
         }
@@ -194,11 +188,8 @@ private fun TermListContent(
     terms: List<SelectableTerm>,
     searchQuery: String,
     isSearching: Boolean,
-    canLoadMore: Boolean,
-    isLoadingMore: Boolean,
     onSearchQueryChanged: (String) -> Unit,
     onTermToggled: (Long) -> Unit,
-    onLoadMore: () -> Unit,
 ) {
     Column(modifier = Modifier.fillMaxSize()) {
         OutlinedTextField(
@@ -268,52 +259,11 @@ private fun TermListContent(
                             }
                         )
                     }
-                    if (canLoadMore) {
-                        item(key = "load_more") {
-                            LoadMoreItem(
-                                isLoading =
-                                    isLoadingMore,
-                                onLoadMore = onLoadMore,
-                            )
-                        }
-                    }
                 }
         }
     }
 }
 
-@Composable
-private fun LoadMoreItem(
-    isLoading: Boolean,
-    onLoadMore: () -> Unit,
-) {
-    Box(
-        modifier = Modifier
-            .fillMaxWidth()
-            .clickable(
-                enabled = !isLoading,
-                onClick = onLoadMore
-            )
-            .padding(16.dp),
-        contentAlignment = Alignment.Center,
-    ) {
-        if (isLoading) {
-            CircularProgressIndicator(
-                modifier = Modifier.size(24.dp),
-                strokeWidth = 2.dp,
-            )
-        } else {
-            Text(
-                text = stringResource(
-                    R.string.post_rs_settings_load_more
-                ),
-                style = MaterialTheme.typography.bodyMedium,
-                color = MaterialTheme.colorScheme.primary,
-            )
-        }
-    }
-}
-
 @Composable
 private fun TermRow(
     term: SelectableTerm,