Move the progress bar to the bottom when using the bottom app bar. https://redmine...

[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 e67a99a3abeb717fdf406196b4646b89bc2118eb..d16636308671ea3ee0b5f194bcb3ee63c1f90cdc 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/adapters/WebViewStateAdapter.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/adapters/WebViewStateAdapter.kt
@@ -28,15 +28,13 @@ 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
 
 import java.util.LinkedList
 
-class WebViewStateAdapter(fragmentActivity: FragmentActivity) : FragmentStateAdapter(fragmentActivity) {
+class WebViewStateAdapter(fragmentActivity: FragmentActivity, private val bottomAppBar: Boolean) : FragmentStateAdapter(fragmentActivity) {
     // Define the class variables.
     private val webViewFragmentsList = LinkedList<WebViewTabFragment>()
 
@@ -84,18 +82,12 @@ class WebViewStateAdapter(fragmentActivity: FragmentActivity) : FragmentStateAda
             NO_ID
     }
 
-    fun addPage(pageNumber: Int, newTab: TabLayout.Tab, url: String, moveToNewPage: Boolean) {
+    fun addPage(pagePosition: Int, url: String) {
         // Add a new page.
-        webViewFragmentsList.add(WebViewTabFragment.createPage(pageNumber, url))
+        webViewFragmentsList.add(pagePosition, WebViewTabFragment.createPage(pagePosition, url, bottomAppBar))
 
         // Update the view pager.
-        notifyItemInserted(pageNumber)
-
-        // Move to the new page if indicated.
-        if (moveToNewPage) {
-            // Select the newTab.
-            newTab.select()
-        }
+        notifyItemInserted(pagePosition)
     }
 
     fun deletePage(pageNumber: Int, webViewPager2: ViewPager2): Boolean {
@@ -164,7 +156,7 @@ class WebViewStateAdapter(fragmentActivity: FragmentActivity) : FragmentStateAda
 
     fun restorePage(savedState: Bundle, savedNestedScrollWebViewState: Bundle) {
         // Restore the page.
-        webViewFragmentsList.add(WebViewTabFragment.restorePage(savedState, savedNestedScrollWebViewState))
+        webViewFragmentsList.add(WebViewTabFragment.restorePage(savedState, savedNestedScrollWebViewState, bottomAppBar))
 
         // Update the view pager.  The position is zero indexed.
         notifyItemInserted(webViewFragmentsList.size - 1)