Refactor page switching code. https://redmine.stoutner.com/issues/1020

[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / adapters / WebViewStateAdapter.kt

diff --git a/app/src/main/java/com/stoutner/privacybrowser/adapters/WebViewStateAdapter.kt b/app/src/main/java/com/stoutner/privacybrowser/adapters/WebViewStateAdapter.kt
index 0d0fdef22c0800cf52af966eee07410271a6532b..e67a99a3abeb717fdf406196b4646b89bc2118eb 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/adapters/WebViewStateAdapter.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/adapters/WebViewStateAdapter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019-2023 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2019-2023 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
@@ -28,6 +28,8 @@ import androidx.recyclerview.widget.RecyclerView.NO_ID
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
 
+import com.google.android.material.tabs.TabLayout
+
 import com.stoutner.privacybrowser.R
 import com.stoutner.privacybrowser.fragments.WebViewTabFragment
 import com.stoutner.privacybrowser.views.NestedScrollWebView
@@ -82,7 +84,7 @@ class WebViewStateAdapter(fragmentActivity: FragmentActivity) : FragmentStateAda
             NO_ID
     }
 
-    fun addPage(pageNumber: Int, webViewViewPager2: ViewPager2, url: String, moveToNewPage: Boolean) {
+    fun addPage(pageNumber: Int, newTab: TabLayout.Tab, url: String, moveToNewPage: Boolean) {
         // Add a new page.
         webViewFragmentsList.add(WebViewTabFragment.createPage(pageNumber, url))
 
@@ -90,8 +92,10 @@ class WebViewStateAdapter(fragmentActivity: FragmentActivity) : FragmentStateAda
         notifyItemInserted(pageNumber)
 
         // Move to the new page if indicated.
-        if (moveToNewPage)
-            webViewViewPager2.currentItem = pageNumber
+        if (moveToNewPage) {
+            // Select the newTab.
+            newTab.select()
+        }
     }
 
     fun deletePage(pageNumber: Int, webViewPager2: ViewPager2): Boolean {