view model to load page in PageFragment

app/src/main/java/org/wikipedia/activity/SingleWebViewActivity.kt

@@ -33,7 +33,7 @@ import org.wikipedia.history.HistoryEntry
 import org.wikipedia.page.LinkHandler
 import org.wikipedia.page.PageActivity
 import org.wikipedia.page.PageTitle
-import org.wikipedia.page.PageViewModel
+import org.wikipedia.page.PageViewState
 import org.wikipedia.staticdata.MainPageNameData
 import org.wikipedia.util.StringUtil
 import org.wikipedia.util.UriUtil
@@ -48,7 +48,7 @@ class SingleWebViewActivity : BaseActivity() {
     private var showBackButton = false
     private var isWebForm = false
     private var wasFormSubmitted = false
-    val blankModel = PageViewModel()
+    val blankModel = PageViewState()
 
     @SuppressLint("SetJavaScriptEnabled")
     public override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/org/wikipedia/bridge/CommunicationBridge.kt

@@ -17,7 +17,7 @@ import org.wikipedia.dataclient.RestService
 import org.wikipedia.dataclient.ServiceFactory
 import org.wikipedia.json.JsonUtil
 import org.wikipedia.page.PageTitle
-import org.wikipedia.page.PageViewModel
+import org.wikipedia.page.PageViewState
 import org.wikipedia.util.UriUtil
 import org.wikipedia.util.log.L
 
@@ -42,7 +42,7 @@ class CommunicationBridge constructor(private val communicationBridgeListener: C
 
     interface CommunicationBridgeListener {
         val webView: WebView
-        val model: PageViewModel
+        val model: PageViewState
         val isPreview: Boolean
         val toolbarMargin: Int
         val messageCardHeight: Int

app/src/main/java/org/wikipedia/bridge/JavaScriptActionHandler.kt

@@ -10,7 +10,7 @@ import org.wikipedia.extensions.getStrings
 import org.wikipedia.json.JsonUtil
 import org.wikipedia.page.Namespace
 import org.wikipedia.page.PageTitle
-import org.wikipedia.page.PageViewModel
+import org.wikipedia.page.PageViewState
 import org.wikipedia.settings.Prefs
 import org.wikipedia.util.DimenUtil
 import java.util.Date
@@ -118,7 +118,7 @@ object JavaScriptActionHandler {
         return "pcs.c1.Page.setEditButtons($isEditable, $isProtected)"
     }
 
-    fun setFooter(model: PageViewModel): String {
+    fun setFooter(model: PageViewState): String {
         if (model.page == null) {
             return ""
         }
@@ -152,7 +152,7 @@ object JavaScriptActionHandler {
                 "})"
     }
 
-    fun appendReadMode(model: PageViewModel): String {
+    fun appendReadMode(model: PageViewState): String {
         if (model.page == null) {
             return ""
         }

app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpWebViewClient.kt

@@ -11,7 +11,7 @@ import okhttp3.Response
 import org.wikipedia.WikipediaApp
 import org.wikipedia.dataclient.RestService
 import org.wikipedia.page.LinkHandler
-import org.wikipedia.page.PageViewModel
+import org.wikipedia.page.PageViewState
 import org.wikipedia.util.UriUtil
 import org.wikipedia.util.log.L
 import java.io.IOException
@@ -23,7 +23,7 @@ abstract class OkHttpWebViewClient : WebViewClient() {
         They should not be made into general Interceptors.
      */
 
-    abstract val model: PageViewModel
+    abstract val model: PageViewState
     abstract val linkHandler: LinkHandler
 
     override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {

app/src/main/java/org/wikipedia/edit/preview/EditPreviewFragment.kt

@@ -32,7 +32,7 @@ import org.wikipedia.page.ExclusiveBottomSheetPresenter
 import org.wikipedia.page.LinkHandler
 import org.wikipedia.page.PageActivity
 import org.wikipedia.page.PageTitle
-import org.wikipedia.page.PageViewModel
+import org.wikipedia.page.PageViewState
 import org.wikipedia.page.references.PageReferences
 import org.wikipedia.page.references.ReferenceDialog
 import org.wikipedia.staticdata.MainPageNameData
@@ -58,7 +58,7 @@ class EditPreviewFragment : Fragment(), CommunicationBridgeListener, ReferenceDi
     val isActive get() = binding.editPreviewContainer.visibility == View.VISIBLE
 
     override lateinit var linkHandler: LinkHandler
-    override val model = PageViewModel()
+    override val model = PageViewState()
     override val webView get() = binding.editPreviewWebview
     override val isPreview = true
     override val toolbarMargin = 0

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

@@ -63,6 +63,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
@@ -122,7 +123,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))
                 }
             }
         }
@@ -631,13 +632,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) {