X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Ffragments%2FWebViewTabFragment.kt;h=2dae24194687477fb1da939cd13a21d48c795793;hb=HEAD;hp=154ea2dd20849b76d730407fad3ac5929ae8bc2f;hpb=5186b668274b09e37b371c0a134e53255c98ad98;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/WebViewTabFragment.kt b/app/src/main/java/com/stoutner/privacybrowser/fragments/WebViewTabFragment.kt index 154ea2dd..2dae2419 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/WebViewTabFragment.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/WebViewTabFragment.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2020,2022-2023 Soren Stoutner . + * Copyright 2019-2020,2022-2023 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -35,11 +35,12 @@ import com.stoutner.privacybrowser.views.NestedScrollWebView import java.util.Calendar // Define the class constants. -private const val CREATE_NEW_PAGE = "create_new_page" -private const val PAGE_NUMBER = "page_number" -private const val URL = "url" -private const val SAVED_STATE = "saved_state" -private const val SAVED_NESTED_SCROLL_WEBVIEW_STATE = "saved_nested_scroll_webview_state" +private const val CREATE_NEW_PAGE = "A" +private const val BOTTOM_APP_BAR = "B" +private const val PAGE_POSITION = "C" +private const val SAVED_NESTED_SCROLL_WEBVIEW_STATE = "D" +private const val SAVED_STATE = "E" +private const val URL = "F" class WebViewTabFragment : Fragment() { // Define the public variables. @@ -48,7 +49,7 @@ class WebViewTabFragment : Fragment() { // The public interface is used to send information back to the parent activity. interface NewTabListener { @SuppressLint("ClickableViewAccessibility") - fun initializeWebView(nestedScrollWebView: NestedScrollWebView, pageNumber: Int, progressBar: ProgressBar, url: String, restoringState: Boolean) + fun initializeWebView(nestedScrollWebView: NestedScrollWebView, pagePosition: Int, progressBar: ProgressBar, urlString: String, restoringState: Boolean) } // Declare the class variables. @@ -58,14 +59,15 @@ class WebViewTabFragment : Fragment() { private lateinit var nestedScrollWebView: NestedScrollWebView companion object { - fun createPage(pageNumber: Int, url: String?): WebViewTabFragment { + fun createPage(pageNumber: Int, url: String?, bottomAppBar: Boolean): WebViewTabFragment { // Create an arguments bundle. val argumentsBundle = Bundle() // Store the argument in the bundle. argumentsBundle.putBoolean(CREATE_NEW_PAGE, true) - argumentsBundle.putInt(PAGE_NUMBER, pageNumber) + argumentsBundle.putInt(PAGE_POSITION, pageNumber) argumentsBundle.putString(URL, url) + argumentsBundle.putBoolean(BOTTOM_APP_BAR, bottomAppBar) // Create a new instance of the WebView tab fragment. val webViewTabFragment = WebViewTabFragment() @@ -77,13 +79,14 @@ class WebViewTabFragment : Fragment() { return webViewTabFragment } - fun restorePage(savedState: Bundle, savedNestedScrollWebViewState: Bundle): WebViewTabFragment { + fun restorePage(savedState: Bundle, savedNestedScrollWebViewState: Bundle, bottomAppBar: Boolean): WebViewTabFragment { // Create an arguments bundle val argumentsBundle = Bundle() // Store the saved states in the arguments bundle. argumentsBundle.putBundle(SAVED_STATE, savedState) argumentsBundle.putBundle(SAVED_NESTED_SCROLL_WEBVIEW_STATE, savedNestedScrollWebViewState) + argumentsBundle.putBoolean(BOTTOM_APP_BAR, bottomAppBar) // Create a new instance of the WebView tab fragment. val webViewTabFragment = WebViewTabFragment() @@ -105,51 +108,46 @@ class WebViewTabFragment : Fragment() { } override fun onCreateView(layoutInflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - // Check to see if the fragment is being restarted. - return if (savedInstanceState == null) { // The fragment is not being restarted. Load and configure a new fragment. + // Get the bottom app bar status from the arguments. + val bottomAppBar = requireArguments().getBoolean(BOTTOM_APP_BAR) + + // Inflate the tab's WebView according to the app bar position. Setting false at the end of inflater.inflate does not attach the inflated layout as a child of container. + // The fragment will take care of attaching the root automatically. + val newPageView = if (bottomAppBar) + layoutInflater.inflate(R.layout.webview_framelayout_bottom_appbar, container, false) + else + layoutInflater.inflate(R.layout.webview_framelayout_top_appbar, container, false) + + // Get handles for the views. + nestedScrollWebView = newPageView.findViewById(R.id.nestedscroll_webview) + val progressBar = newPageView.findViewById(R.id.progress_bar) + + // Store the WebView fragment ID in the nested scroll WebView. + nestedScrollWebView.webViewFragmentId = fragmentId + + // Check to see if the fragment is being restarted without the app being killed. + return if (savedInstanceState == null) { // The fragment is not being restarted. It is either new or is being restored after the app was killed. // Check to see if a new page is being created. if (requireArguments().getBoolean(CREATE_NEW_PAGE)) { // A new page is being created. // Get the variables from the arguments - val pageNumber = requireArguments().getInt(PAGE_NUMBER) + val pagePosition = requireArguments().getInt(PAGE_POSITION) val url = requireArguments().getString(URL)!! - // Inflate the tab's WebView. Setting false at the end of inflater.inflate does not attach the inflated layout as a child of container. - // The fragment will take care of attaching the root automatically. - val newPageView = layoutInflater.inflate(R.layout.webview_framelayout, container, false) - - // Get handles for the views. - nestedScrollWebView = newPageView.findViewById(R.id.nestedscroll_webview) - val progressBar = newPageView.findViewById(R.id.progress_bar) - - // Store the WebView fragment ID in the nested scroll WebView. - nestedScrollWebView.webViewFragmentId = fragmentId - // Request the main activity initialize the WebView. - newTabListener.initializeWebView(nestedScrollWebView, pageNumber, progressBar, url, false) + newTabListener.initializeWebView(nestedScrollWebView, pagePosition, progressBar, url, false) // Return the new page view. newPageView - } else { // A page is being restored. + } else { // A page is being restored after the app was killed. // Get the saved states from the arguments. - val savedState = requireArguments().getBundle(SAVED_STATE) + val savedState = requireArguments().getBundle(SAVED_STATE)!! val savedNestedScrollWebViewState = requireArguments().getBundle(SAVED_NESTED_SCROLL_WEBVIEW_STATE)!! - // Inflate the tab's WebView. Setting false at the end of inflater.inflate does not attach the inflated layout as a child of container. - // The fragment will take care of attaching the root automatically. - val newPageView = layoutInflater.inflate(R.layout.webview_framelayout, container, false) - - // Get handles for the views. - nestedScrollWebView = newPageView.findViewById(R.id.nestedscroll_webview) - val progressBar = newPageView.findViewById(R.id.progress_bar) - - // Store the WebView fragment ID in the nested scroll WebView. - nestedScrollWebView.webViewFragmentId = fragmentId - // Restore the nested scroll WebView state. nestedScrollWebView.restoreNestedScrollWebViewState(savedNestedScrollWebViewState) // Restore the WebView state. - nestedScrollWebView.restoreState(savedState!!) + nestedScrollWebView.restoreState(savedState) // Initialize the WebView. newTabListener.initializeWebView(nestedScrollWebView, 0, progressBar, "", true)