Merge pull request #14905 from wordpress-mobile/feature/14761-open-blogging-reminders-from-posts-screen

Show blogging reminders bottom sheet from posts list

Author: ravishanker

WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingReminderUtils.kt

@@ -12,17 +12,16 @@ object BloggingReminderUtils {
         isBottomSheetShowing: LiveData<Event<Boolean>>,
         lifecycleOwner: LifecycleOwner,
         tag: String,
-        getSupportFragmentManager: () -> FragmentManager
+        getSupportFragmentManager: () -> FragmentManager?
     ) {
         isBottomSheetShowing.observeEvent(lifecycleOwner,
             { isShowing: Boolean ->
-                val fm: FragmentManager = getSupportFragmentManager()
-                var bottomSheet = fm
-                    .findFragmentByTag(tag) as BloggingReminderBottomSheetFragment?
+                val fm: FragmentManager = getSupportFragmentManager() ?: return@observeEvent
+                var bottomSheet = fm.findFragmentByTag(tag) as BloggingReminderBottomSheetFragment?
                 if (isShowing && bottomSheet == null) {
                     bottomSheet = BloggingReminderBottomSheetFragment()
                     bottomSheet.show(
-                        getSupportFragmentManager(),
+                        fm,
                         tag
                     )
                 } else if (!isShowing && bottomSheet != null) {

WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingRemindersViewModel.kt

@@ -200,6 +200,12 @@ class BloggingRemindersViewModel @Inject constructor(
         _isFirstTimeFlow.value = state.getBoolean(IS_FIRST_TIME_FLOW)
     }
 
+    fun onPostCreated(siteId: Int, isNewPost: Boolean?) {
+        if (isNewPost == true && bloggingRemindersManager.shouldShowBloggingRemindersPrompt(siteId)) {
+            showBottomSheet(siteId, PROLOGUE)
+        }
+    }
+
     enum class Screen {
         PROLOGUE, SELECTION, EPILOGUE
     }

WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java

@@ -81,7 +81,6 @@
 import org.wordpress.android.ui.bloggingreminders.BloggingReminderUtils;
 import org.wordpress.android.ui.bloggingreminders.BloggingRemindersManager;
 import org.wordpress.android.ui.bloggingreminders.BloggingRemindersViewModel;
-import org.wordpress.android.ui.bloggingreminders.BloggingRemindersViewModel.Screen;
 import org.wordpress.android.ui.main.WPMainNavigationView.OnPageListener;
 import org.wordpress.android.ui.main.WPMainNavigationView.PageType;
 import org.wordpress.android.ui.mlp.ModalLayoutPickerFragment;
@@ -1089,10 +1088,11 @@ public void onClick(View v) {
                                     UploadUtils.publishPost(WPMainActivity.this, post, site, mDispatcher);
                                 }
                             });
-                    boolean isNewPost = data.getBooleanExtra(EditPostActivity.EXTRA_IS_NEW_POST, false);
-                    if (isNewPost && mBloggingRemindersManager.shouldShowBloggingRemindersPrompt(site.getId())) {
-                        mBloggingRemindersViewModel.showBottomSheet(site.getId(), Screen.PROLOGUE);
-                    }
+
+                    mBloggingRemindersViewModel.onPostCreated(
+                            site.getId(),
+                            data.getBooleanExtra(EditPostActivity.EXTRA_IS_NEW_POST, false)
+                    );
                 }
                 break;
             case RequestCodes.CREATE_SITE:

WordPress/src/main/java/org/wordpress/android/ui/posts/PostsListActivity.kt

@@ -34,6 +34,8 @@ import org.wordpress.android.ui.LocaleAwareActivity
 import org.wordpress.android.ui.PagePostCreationSourcesDetail.STORY_FROM_POSTS_LIST
 import org.wordpress.android.ui.RequestCodes
 import org.wordpress.android.ui.ScrollableViewInitializedListener
+import org.wordpress.android.ui.bloggingreminders.BloggingReminderUtils.observeBottomSheet
+import org.wordpress.android.ui.bloggingreminders.BloggingRemindersViewModel
 import org.wordpress.android.ui.main.MainActionListItem.ActionType
 import org.wordpress.android.ui.notifications.SystemNotificationsTracker
 import org.wordpress.android.ui.pages.SnackbarMessageHolder
@@ -85,6 +87,7 @@ class PostsListActivity : LocaleAwareActivity(),
     @Inject internal lateinit var editPostRepository: EditPostRepository
     @Inject internal lateinit var mediaPickerLauncher: MediaPickerLauncher
     @Inject internal lateinit var storiesMediaPickerResultHandler: StoriesMediaPickerResultHandler
+    @Inject internal lateinit var bloggingRemindersViewModel: BloggingRemindersViewModel
 
     private lateinit var site: SiteModel
     private lateinit var binding: PostListActivityBinding
@@ -164,6 +167,7 @@ class PostsListActivity : LocaleAwareActivity(),
             setupActionBar()
             setupContent()
             initViewModel(initPreviewState, currentBottomSheetPostId)
+            initBloggingReminders()
             initCreateMenuViewModel()
             loadIntentData(intent)
         }
@@ -324,6 +328,26 @@ class PostsListActivity : LocaleAwareActivity(),
         setupFabEvents()
     }
 
+    private fun initBloggingReminders() {
+        bloggingRemindersViewModel = ViewModelProvider(
+                this,
+                viewModelFactory
+        ).get(BloggingRemindersViewModel::class.java)
+
+        observeBottomSheet(
+                bloggingRemindersViewModel.isBottomSheetShowing,
+                this,
+                BLOGGING_REMINDERS_FRAGMENT_TAG,
+                {
+                    if (!this.isFinishing) {
+                        this.supportFragmentManager
+                    } else {
+                        null
+                    }
+                }
+        )
+    }
+
     private fun setupActions() {
         viewModel.dialogAction.observe(this@PostsListActivity, {
             it?.show(this@PostsListActivity, supportFragmentManager, uiHelpers)
@@ -438,6 +462,10 @@ class PostsListActivity : LocaleAwareActivity(),
             }
 
             viewModel.handleEditPostResult(data)
+            bloggingRemindersViewModel.onPostCreated(
+                    site.id,
+                    data?.getBooleanExtra(EditPostActivity.EXTRA_IS_NEW_POST, false)
+            )
         } else if (requestCode == RequestCodes.REMOTE_PREVIEW_POST) {
             viewModel.handleRemotePreviewClosing()
         } else if (requestCode == RequestCodes.PHOTO_PICKER &&
@@ -601,6 +629,8 @@ class PostsListActivity : LocaleAwareActivity(),
     }
 
     companion object {
+        private const val BLOGGING_REMINDERS_FRAGMENT_TAG = "blogging_reminders_fragment_tag"
+
         @JvmStatic
         fun buildIntent(context: Context, site: SiteModel): Intent {
             val intent = Intent(context, PostsListActivity::class.java)