X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fadapters%2FWebViewStateAdapter.kt;h=d16636308671ea3ee0b5f194bcb3ee63c1f90cdc;hb=f196ab85ff8aaab92fb32a4a310a91921ab8fb83;hp=0d0fdef22c0800cf52af966eee07410271a6532b;hpb=5dd60cebd26469bcc597e1ccede8706fb403dfc1;p=PrivacyBrowserAndroid.git 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 0d0fdef2..d1663630 100644 --- 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 . + * Copyright 2019-2023 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -34,7 +34,7 @@ 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() @@ -82,16 +82,12 @@ class WebViewStateAdapter(fragmentActivity: FragmentActivity) : FragmentStateAda NO_ID } - fun addPage(pageNumber: Int, webViewViewPager2: ViewPager2, 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) - webViewViewPager2.currentItem = pageNumber + notifyItemInserted(pagePosition) } fun deletePage(pageNumber: Int, webViewPager2: ViewPager2): Boolean { @@ -160,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)