Merge pull request #20184 from wordpress-mobile/issue-post-list-tab-s…

…witching Fixes: Issue post list tab switching
wordpress-mobile · Feb 14, 2024 · 333c1c7 · 333c1c7
2 parents c548dee + 81eb6e1
commit 333c1c7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt
@@ -401,9 +401,18 @@ class PostListMainViewModel @Inject constructor(
     }
 
     fun handleEditPostResult(data: Intent?) {
+        switchToDraftTabIfNeeded(data)
         postActionHandler.handleEditPostResult(data)
     }
 
+    private fun switchToDraftTabIfNeeded(data: Intent?) {
+        if (data != null && data.getBooleanExtra(EditPostActivity.EXTRA_IS_NEW_POST, false) &&
+            data.getBooleanExtra(EditPostActivity.EXTRA_HAS_CHANGES, false)
+        ) {
+            _selectTab.value = POST_LIST_PAGES.indexOf(DRAFTS)
+        }
+    }
+
     private fun editRestoredAutoSavePost(localPostId: Int) {
         val post = postStore.getPostByLocalPostId(localPostId)
         if (post != null) {

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostsListActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostsListActivity.kt
@@ -364,7 +364,7 @@ class PostsListActivity : LocaleAwareActivity(),
         }
     }
 
-    private fun setupActions() {
+    private fun PostListActivityBinding.setupActions() {
         viewModel.dialogAction.observe(this@PostsListActivity) {
             it?.show(this@PostsListActivity, supportFragmentManager, uiHelpers)
         }
@@ -377,13 +377,18 @@ class PostsListActivity : LocaleAwareActivity(),
                     uploadActionUseCase,
                     uploadUtilsWrapper
                 ) { isFirstTimePublishing ->
+                    changeTabsOnPostUpload()
                     bloggingRemindersViewModel.onPublishingPost(site.id, isFirstTimePublishing)
                     reviewViewModel.onPublishingPost(isFirstTimePublishing)
                 }
             }
         }
     }
 
+    private fun PostListActivityBinding.changeTabsOnPostUpload() {
+        tabLayout.getTabAt(PostListType.PUBLISHED.ordinal)?.select()
+    }
+
     private fun PostListActivityBinding.loadViewState(state: PostListMainViewState) {
         if (state.isFabVisible) {
             fabButton.show()