Merge pull request #17187 from GitStartHQ/issue/16656-Quick_Start_Retain_Quick_Start_focus_point_after_device_rotation

Quick Start: Retain Quick Start focus point after device rotation #16656

Author: AjeshRPai

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

@@ -209,6 +209,7 @@ public class WPMainActivity extends LocaleAwareActivity implements
     public static final String ARG_SELECTED_SITE = "SELECTED_SITE_ID";
     public static final String ARG_STAT_TO_TRACK = "stat_to_track";
     public static final String ARG_EDITOR_ORIGIN = "editor_origin";
+    public static final String ARG_CURRENT_FOCUS = "CURRENT_FOCUS";
 
     // Track the first `onResume` event for the current session so we can use it for Analytics tracking
     private static boolean mFirstResume = true;
@@ -228,6 +229,7 @@ public class WPMainActivity extends LocaleAwareActivity implements
     private static final String MAIN_BOTTOM_SHEET_TAG = "MAIN_BOTTOM_SHEET_TAG";
     private static final String BLOGGING_REMINDERS_BOTTOM_SHEET_TAG = "BLOGGING_REMINDERS_BOTTOM_SHEET_TAG";
     private final Handler mHandler = new Handler();
+    private FocusPointInfo mCurrentActiveFocusPoint = null;
 
     @Inject AccountStore mAccountStore;
     @Inject SiteStore mSiteStore;
@@ -383,6 +385,12 @@ && getIntent().getExtras().getBoolean(ARG_CONTINUE_JETPACK_CONNECT, false)) {
             }
             checkDismissNotification();
             checkTrackAnalyticsEvent();
+        } else {
+            FocusPointInfo current = (FocusPointInfo)
+                    savedInstanceState.getSerializable(ARG_CURRENT_FOCUS);
+            if (current != null) {
+                mHandler.post(() -> addOrRemoveQuickStartFocusPoint(current.getTask(), true));
+            }
         }
 
         // ensure the deep linking activity is enabled. It may have been disabled elsewhere and failed to get re-enabled
@@ -438,7 +446,6 @@ && getIntent().getExtras().getBoolean(ARG_CONTINUE_JETPACK_CONNECT, false)) {
         }
 
         scheduleLocalNotifications();
-
         initViewModel();
 
         if (getIntent().getBooleanExtra(ARG_OPEN_BLOGGING_REMINDERS, false)) {
@@ -513,6 +520,12 @@ private void scheduleLocalNotifications() {
         mWeeklyRoundupScheduler.schedule();
     }
 
+    @Override
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+        outState.putSerializable(ARG_CURRENT_FOCUS, mCurrentActiveFocusPoint);
+        super.onSaveInstanceState(outState);
+    }
+
     private void initViewModel() {
         mFloatingActionButton = findViewById(R.id.fab_button);
         mFabTooltip = findViewById(R.id.fab_tooltip);
@@ -1007,7 +1020,7 @@ public void onPageChanged(int position) {
         mReaderTracker.onBottomNavigationTabChanged();
         PageType pageType = WPMainNavigationView.getPageType(position);
         trackLastVisiblePage(pageType, true);
-
+        mCurrentActiveFocusPoint = null;
         if (pageType == PageType.READER) {
             // MySite fragment might not be attached to activity, so we need to remove focus point from here
             QuickStartUtils.removeQuickStartFocusPoint(findViewById(R.id.root_view_main));
@@ -1337,6 +1350,7 @@ private void addOrRemoveQuickStartFocusPoint(QuickStartTask activeTask, boolean
                 verticalOffset = 0;
             }
             if (targetView != null && shouldAdd) {
+                mCurrentActiveFocusPoint = new FocusPointInfo(activeTask, true);
                 QuickStartUtils.addQuickStartFocusPointAboveTheView(
                         parentView,
                         targetView,

WordPress/src/main/java/org/wordpress/android/viewmodel/main/WPMainActivityViewModel.kt

@@ -47,6 +47,7 @@ import org.wordpress.android.util.merge
 import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.ScopedViewModel
 import org.wordpress.android.viewmodel.SingleLiveEvent
+import java.io.Serializable
 import java.util.Date
 import java.util.Locale
 import javax.inject.Inject
@@ -389,5 +390,9 @@ class WPMainActivityViewModel @Inject constructor(
     data class FocusPointInfo(
         val task: QuickStartTask,
         val isVisible: Boolean
-    )
+    ) : Serializable {
+        companion object {
+            const val serialVersionUID = 1L
+        }
+    }
 }