view model to load page in PageFragment

app/src/main/java/org/wikipedia/page/PageActivity.kt

@@ -62,6 +62,7 @@ import org.wikipedia.navtab.NavTab
 import org.wikipedia.notifications.AnonymousNotificationHelper
 import org.wikipedia.notifications.NotificationActivity
 import org.wikipedia.page.linkpreview.LinkPreviewDialog
+import org.wikipedia.page.pageload.PageLoadOptions
 import org.wikipedia.page.tabs.TabActivity
 import org.wikipedia.readinglist.ReadingListActivity
 import org.wikipedia.readinglist.ReadingListMode
@@ -119,7 +120,7 @@ class PageActivity : BaseActivity(), PageFragment.Callback, LinkPreviewDialog.Lo
             // and reload the page...
             pageFragment.model.title?.let { title ->
                 pageFragment.model.curEntry?.let { entry ->
-                    pageFragment.loadPage(title, entry, pushBackStack = false, squashBackstack = false, isRefresh = true)
+                    pageFragment.loadPage(title, entry, options = PageLoadOptions(pushBackStack = false, squashBackStack = false, isRefresh = true))
                 }
             }
         }
@@ -613,13 +614,14 @@ class PageActivity : BaseActivity(), PageFragment.Callback, LinkPreviewDialog.Lo
             // Close the link preview, if one is open.
             hideLinkPreview()
             onPageCloseActionMode()
-            when (position) {
-                TabPosition.CURRENT_TAB -> pageFragment.loadPage(pageTitle, entry, pushBackStack = true, squashBackstack = false)
-                TabPosition.CURRENT_TAB_SQUASH -> pageFragment.loadPage(pageTitle, entry, pushBackStack = true, squashBackstack = true)
-                TabPosition.NEW_TAB_BACKGROUND -> pageFragment.openInNewBackgroundTab(pageTitle, entry)
-                TabPosition.NEW_TAB_FOREGROUND -> pageFragment.openInNewForegroundTab(pageTitle, entry)
-                else -> pageFragment.openFromExistingTab(pageTitle, entry)
+            val options = when (position) {
+                TabPosition.CURRENT_TAB -> PageLoadOptions(tabPosition = position)
+                TabPosition.CURRENT_TAB_SQUASH -> PageLoadOptions(tabPosition = position, squashBackStack = true)
+                TabPosition.NEW_TAB_BACKGROUND -> PageLoadOptions(tabPosition = position)
+                TabPosition.NEW_TAB_FOREGROUND -> PageLoadOptions(tabPosition = position, pushBackStack = false)
+                TabPosition.EXISTING_TAB -> PageLoadOptions(tabPosition = position, pushBackStack = true, squashBackStack = true)
             }
+            pageFragment.loadPage(pageTitle, entry, options)
         }
     }
 

app/src/main/java/org/wikipedia/page/PageContainerLongPressHandler.kt

@@ -3,17 +3,18 @@ package org.wikipedia.page
 import org.wikipedia.Constants.InvokeSource
 import org.wikipedia.LongPressHandler.WebViewMenuCallback
 import org.wikipedia.history.HistoryEntry
+import org.wikipedia.page.pageload.PageLoadOptions
 import org.wikipedia.readinglist.ReadingListBehaviorsUtil
 import org.wikipedia.readinglist.database.ReadingListPage
 
 class PageContainerLongPressHandler(private val fragment: PageFragment) : WebViewMenuCallback {
 
     override fun onOpenLink(entry: HistoryEntry) {
-        fragment.loadPage(entry.title, entry)
+        fragment.onPageLoadPage(entry.title, entry)
     }
 
     override fun onOpenInNewTab(entry: HistoryEntry) {
-        fragment.openInNewBackgroundTab(entry.title, entry)
+        fragment.loadPage(entry.title, entry, options = PageLoadOptions(tabPosition = PageActivity.TabPosition.NEW_TAB_BACKGROUND))
     }
 
     override fun onAddRequest(entry: HistoryEntry, addToDefault: Boolean) {

app/src/main/java/org/wikipedia/page/PageViewModel.kt

@@ -4,20 +4,30 @@ import org.wikipedia.dataclient.okhttp.OkHttpConnectionFactory
 import org.wikipedia.history.HistoryEntry
 import org.wikipedia.readinglist.database.ReadingListPage
 
-class PageViewModel {
-
-    var page: Page? = null
-    var title: PageTitle? = null
-    var curEntry: HistoryEntry? = null
-    var readingListPage: ReadingListPage? = null
-    var hasWatchlistExpiry = false
-    var isWatched = false
-    var forceNetwork = false
-    var isReadMoreLoaded = false
+data class PageViewModel(
+    var page: Page? = null,
+    var title: PageTitle? = null,
+    var curEntry: HistoryEntry? = null,
+    var readingListPage: ReadingListPage? = null,
+    var hasWatchlistExpiry: Boolean = false,
+    var isWatched: Boolean = false,
+    var forceNetwork: Boolean = false,
+    var isReadMoreLoaded: Boolean = false
+) {
+    // Computed properties remain in the class body
     val isInReadingList get() = readingListPage != null
-    val cacheControl get() = if (forceNetwork) OkHttpConnectionFactory.CACHE_CONTROL_FORCE_NETWORK else OkHttpConnectionFactory.CACHE_CONTROL_NONE
+
+    val cacheControl get() = if (forceNetwork)
+        OkHttpConnectionFactory.CACHE_CONTROL_FORCE_NETWORK
+    else
+        OkHttpConnectionFactory.CACHE_CONTROL_NONE
+
     val shouldLoadAsMobileWeb get() =
         title?.run { namespace() === Namespace.SPECIAL || isMainPage } ?: run { false } ||
-          page?.run { pageProperties.namespace !== Namespace.MAIN && pageProperties.namespace !== Namespace.USER &&
-                  pageProperties.namespace !== Namespace.PROJECT && pageProperties.namespace !== Namespace.DRAFT || isMainPage } ?: run { false }
+                page?.run {
+                    pageProperties.namespace !== Namespace.MAIN &&
+                            pageProperties.namespace !== Namespace.USER &&
+                            pageProperties.namespace !== Namespace.PROJECT &&
+                            pageProperties.namespace !== Namespace.DRAFT || isMainPage
+                } ?: run { false }
 }