Offline mode: Post conflict resolution overlay

WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java

@@ -92,6 +92,7 @@
 import org.wordpress.android.ui.posts.PostDatePickerDialogFragment;
 import org.wordpress.android.ui.posts.PostListFragment;
 import org.wordpress.android.ui.posts.PostNotificationScheduleTimeDialogFragment;
+import org.wordpress.android.ui.posts.PostResolutionOverlayFragment;
 import org.wordpress.android.ui.posts.PostSettingsListDialogFragment;
 import org.wordpress.android.ui.posts.PostSettingsTagsFragment;
 import org.wordpress.android.ui.posts.PostTimePickerDialogFragment;
@@ -555,4 +556,6 @@ public interface AppComponent {
     void inject(WeekWidgetBlockListProviderFactory object);
 
     void inject(WPMainNavigationView object);
+
+    void inject(PostResolutionOverlayFragment object);
 }

WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java

@@ -33,6 +33,7 @@
 import org.wordpress.android.ui.posts.EditorBloggingPromptsViewModel;
 import org.wordpress.android.ui.posts.EditorJetpackSocialViewModel;
 import org.wordpress.android.ui.posts.PostListMainViewModel;
+import org.wordpress.android.ui.posts.PostResolutionOverlayViewModel;
 import org.wordpress.android.ui.posts.editor.StorePostViewModel;
 import org.wordpress.android.ui.posts.prepublishing.PrepublishingViewModel;
 import org.wordpress.android.ui.posts.prepublishing.categories.PrepublishingCategoriesViewModel;
@@ -539,4 +540,9 @@ abstract class ViewModelModule {
     @IntoMap
     @ViewModelKey(EditorJetpackSocialViewModel.class)
     abstract ViewModel editorJetpackSocialViewModel(EditorJetpackSocialViewModel viewModel);
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(PostResolutionOverlayViewModel.class)
+    abstract ViewModel postResolutionOverlayViewModel(PostResolutionOverlayViewModel viewModel);
 }

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

@@ -1,5 +1,6 @@
 package org.wordpress.android.ui.posts
 
+import android.util.Log
 import org.wordpress.android.R
 import org.wordpress.android.analytics.AnalyticsTracker.Stat.UNPUBLISHED_REVISION_DIALOG_LOAD_LOCAL_VERSION_CLICKED
 import org.wordpress.android.analytics.AnalyticsTracker.Stat.UNPUBLISHED_REVISION_DIALOG_LOAD_UNPUBLISHED_VERSION_CLICKED
@@ -28,7 +29,8 @@ private const val POST_TYPE = "post_type"
 class PostListDialogHelper(
     private val showDialog: (DialogHolder) -> Unit,
     private val checkNetworkConnection: () -> Boolean,
-    private val analyticsTracker: AnalyticsTrackerWrapper
+    private val analyticsTracker: AnalyticsTrackerWrapper,
+    private val showConflictResolutionOverlay: ((PostModel) -> Unit)? = null
 ) {
     // Since we are using DialogFragments we need to hold onto which post will be published or trashed / resolved
     private var localPostIdForDeleteDialog: Int? = null
@@ -114,6 +116,7 @@ class PostListDialogHelper(
         showDialog.invoke(dialogHolder)
     }
 
+    // todo: THis is the one  ... maybe the dialog holder can be passed instead
     fun showConflictedPostResolutionDialog(post: PostModel) {
         val dialogHolder = DialogHolder(
             tag = CONFIRM_ON_CONFLICT_LOAD_REMOTE_POST_DIALOG_TAG,
@@ -123,7 +126,10 @@ class PostListDialogHelper(
             negativeButton = UiStringRes(R.string.dialog_confirm_load_remote_post_discard_web)
         )
         localPostIdForConflictResolutionDialog = post.id
-        showDialog.invoke(dialogHolder)
+        Log.i(javaClass.simpleName, "***=> show the improved dialog ${dialogHolder.javaClass.simpleName}")
+        showConflictResolutionOverlay?.invoke(post)
+        // todo: annmarie - show the improved
+        // showDialog.invoke(dialogHolder)
     }
 
     fun showAutoSaveRevisionDialog(post: PostModel) {
@@ -172,6 +178,7 @@ class PostListDialogHelper(
                 localPostIdForScheduledPostSyncDialog = null
                 publishPost(it)
             }
+            // todo: annmarie
             CONFIRM_ON_CONFLICT_LOAD_REMOTE_POST_DIALOG_TAG -> localPostIdForConflictResolutionDialog?.let {
                 localPostIdForConflictResolutionDialog = null
                 // here load version from remote
@@ -189,6 +196,7 @@ class PostListDialogHelper(
                 localPostIdForMoveTrashedPostToDraftDialog = null
                 moveTrashedPostToDraft(it)
             }
+            // todo: annmarie
             CONFIRM_ON_AUTOSAVE_REVISION_DIALOG_TAG -> localPostIdForAutosaveRevisionResolutionDialog?.let {
                 // open the editor with the restored auto save
                 localPostIdForAutosaveRevisionResolutionDialog = null
@@ -217,9 +225,11 @@ class PostListDialogHelper(
             CONFIRM_SYNC_SCHEDULED_POST_DIALOG_TAG -> localPostIdForScheduledPostSyncDialog = null
             CONFIRM_TRASH_POST_WITH_LOCAL_CHANGES_DIALOG_TAG -> localPostIdForTrashPostWithLocalChangesDialog = null
             CONFIRM_TRASH_POST_WITH_UNSAVED_CHANGES_DIALOG_TAG -> localPostIdForTrashPostWithUnsavedChangesDialog = null
+            // todo: annmarie
             CONFIRM_ON_CONFLICT_LOAD_REMOTE_POST_DIALOG_TAG -> localPostIdForConflictResolutionDialog?.let {
                 updateConflictedPostWithLocalVersion(it)
             }
+            // todo: annmarie
             CONFIRM_ON_AUTOSAVE_REVISION_DIALOG_TAG -> localPostIdForAutosaveRevisionResolutionDialog?.let {
                 // open the editor with the local post (don't use the auto save version)
                 editLocalPost(it)

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

@@ -2,6 +2,7 @@ package org.wordpress.android.ui.posts
 
 import android.annotation.SuppressLint
 import android.content.Intent
+import android.util.Log
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
@@ -128,6 +129,10 @@ class PostListMainViewModel @Inject constructor(
     private val _dialogAction = SingleLiveEvent<DialogHolder>()
     val dialogAction: LiveData<DialogHolder> = _dialogAction
 
+    // todo: annmarie a holder for the post resolution overlay
+    private val _conflictResolutionAction = SingleLiveEvent<PostModel>()
+    val conflictResolutionAction: LiveData<PostModel> = _conflictResolutionAction
+
     private val _postUploadAction = SingleLiveEvent<PostUploadAction>()
     val postUploadAction: LiveData<PostUploadAction> = _postUploadAction
 
@@ -150,6 +155,8 @@ class PostListMainViewModel @Inject constructor(
     private val postListDialogHelper: PostListDialogHelper by lazy {
         PostListDialogHelper(
             showDialog = { _dialogAction.postValue(it) },
+            // todo: annmarie
+            showConflictResolutionOverlay = { _conflictResolutionAction.postValue(it) },
             checkNetworkConnection = this::checkNetworkConnection,
             analyticsTracker = analyticsTracker
         )
@@ -478,6 +485,12 @@ class PostListMainViewModel @Inject constructor(
         )
     }
 
+    // Post Resolution Overlay Actions
+    fun onPostResolutionOverlayAction(action: PostResolutionOverlayAction) {
+        // todo: annmarie - implement this and remove the log
+        Log.i(javaClass.simpleName, "***=> onPostResolutionOverlayAction for ${action.name}")
+    }
+
     private fun showPrepublishingBottomSheet(post: PostModel) {
         currentBottomSheetPostId = LocalId(post.id)
         editPostRepository.loadPostByLocalPostId(post.id)