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=e67a99a3abeb717fdf406196b4646b89bc2118eb;hpb=6f53fabebc2ce78292a268e6ad0712dec8b6f3d9;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 e67a99a3..d1663630 100644 --- 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() @@ -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)