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

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.kt
index 3e6acce2a0820758051297c0d18bfbee828abaaf..f43e66d1fc74281202731d91dcc9b829a3d4a0f4 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.kt
@@ -644,7 +644,7 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook
             drawerLayout.visibility = View.GONE
 
             // Initialize the WebView state adapter.
             drawerLayout.visibility = View.GONE
 
             // Initialize the WebView state adapter.

-            webViewStateAdapter = WebViewStateAdapter(this)
+            webViewStateAdapter = WebViewStateAdapter(this, bottomAppBar)

 
             // Set the pager adapter on the web view pager.
             webViewViewPager2.adapter = webViewStateAdapter
 
             // Set the pager adapter on the web view pager.
             webViewViewPager2.adapter = webViewStateAdapter

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 7a7913a5de77dc7288f192cc380976c7df31594c..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
@@ -34,7 +34,7 @@ import com.stoutner.privacybrowser.views.NestedScrollWebView
 
 import java.util.LinkedList
 
 
 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>()
 
     // Define the class variables.
     private val webViewFragmentsList = LinkedList<WebViewTabFragment>()
 


@@ -84,7 +84,7 @@ class WebViewStateAdapter(fragmentActivity: FragmentActivity) : FragmentStateAda
 
     fun addPage(pagePosition: Int, url: String) {
         // Add a new page.
 
     fun addPage(pagePosition: Int, url: String) {
         // Add a new page.

-        webViewFragmentsList.add(pagePosition, WebViewTabFragment.createPage(pagePosition, url))
+        webViewFragmentsList.add(pagePosition, WebViewTabFragment.createPage(pagePosition, url, bottomAppBar))

 
         // Update the view pager.
         notifyItemInserted(pagePosition)
 
         // Update the view pager.
         notifyItemInserted(pagePosition)


@@ -156,7 +156,7 @@ class WebViewStateAdapter(fragmentActivity: FragmentActivity) : FragmentStateAda
 
     fun restorePage(savedState: Bundle, savedNestedScrollWebViewState: Bundle) {
         // Restore the page.
 
     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)
 
         // Update the view pager.  The position is zero indexed.
         notifyItemInserted(webViewFragmentsList.size - 1)

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 34568cb50ee073a4716b5967671bba2da2626517..2dae24194687477fb1da939cd13a21d48c795793 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/WebViewTabFragment.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/WebViewTabFragment.kt
@@ -36,10 +36,11 @@ import java.util.Calendar
 
 // Define the class constants.
 private const val CREATE_NEW_PAGE = "A"
 
 // Define the class constants.
 private const val CREATE_NEW_PAGE = "A"

-private const val PAGE_POSITION = "B"
-private const val URL = "C"
-private const val SAVED_STATE = "D"
-private const val SAVED_NESTED_SCROLL_WEBVIEW_STATE = "E"
+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.
 
 class WebViewTabFragment : Fragment() {
     // Define the public variables.


@@ -58,7 +59,7 @@ class WebViewTabFragment : Fragment() {
     private lateinit var nestedScrollWebView: NestedScrollWebView
 
     companion object {
     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()
 
             // Create an arguments bundle.
             val argumentsBundle = Bundle()
 


@@ -66,6 +67,7 @@ class WebViewTabFragment : Fragment() {
             argumentsBundle.putBoolean(CREATE_NEW_PAGE, true)
             argumentsBundle.putInt(PAGE_POSITION, pageNumber)
             argumentsBundle.putString(URL, url)
             argumentsBundle.putBoolean(CREATE_NEW_PAGE, true)
             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()
 
             // Create a new instance of the WebView tab fragment.
             val webViewTabFragment = WebViewTabFragment()


@@ -77,13 +79,14 @@ class WebViewTabFragment : Fragment() {
             return webViewTabFragment
         }
 
             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)
             // 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()
 
             // Create a new instance of the WebView tab fragment.
             val webViewTabFragment = WebViewTabFragment()


@@ -105,6 +108,23 @@ class WebViewTabFragment : Fragment() {
     }
 
     override fun onCreateView(layoutInflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
     }
 
     override fun onCreateView(layoutInflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {

+        // 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<ProgressBar>(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.
         // 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.


@@ -113,17 +133,6 @@ class WebViewTabFragment : Fragment() {
                 val pagePosition = requireArguments().getInt(PAGE_POSITION)
                 val url = requireArguments().getString(URL)!!
 
                 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<ProgressBar>(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, pagePosition, progressBar, url, false)
 
                 // Request the main activity initialize the WebView.
                 newTabListener.initializeWebView(nestedScrollWebView, pagePosition, progressBar, url, false)
 


@@ -134,17 +143,6 @@ class WebViewTabFragment : Fragment() {
                 val savedState = requireArguments().getBundle(SAVED_STATE)!!
                 val savedNestedScrollWebViewState = requireArguments().getBundle(SAVED_NESTED_SCROLL_WEBVIEW_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<ProgressBar>(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 nested scroll WebView state.
                 nestedScrollWebView.restoreNestedScrollWebViewState(savedNestedScrollWebViewState)
 

diff --git a/app/src/main/res/layout/webview_framelayout.xml b/app/src/main/res/layout/webview_framelayout.xml
deleted file mode 100644 (file)
index 42b4095..0000000
--- a/app/src/main/res/layout/webview_framelayout.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Copyright © 2019-2020,2022 Soren Stoutner <soren@stoutner.com>.
-
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
-
-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
-
-<!-- The frame layout allows the progress bar to float above the WebView. -->
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <!-- The nested scroll WebView is created with `visibility="invisible"` to prevent a white background splash in night mode because there is a delay in setting the background color.
-        It is set visible in `initializeWebView()` or `onProgressChanged()` in `MainWebViewActivity`. -->
-    <com.stoutner.privacybrowser.views.NestedScrollWebView
-        android:id="@+id/nestedscroll_webview"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:background="?android:attr/colorBackground"
-        android:visibility="invisible" />
-
-    <!-- `android:max` changes the maximum `ProgressBar` value from 10000 to 100 to match progress percentage.
-        `android:layout_height="2dp"` works best for API >= 23, but `3dp` is required for visibility on API <= 22.
-        `tools:ignore="UnusedAttribute"` removes the lint warning about `progressTint` and `progressBackgroundTint` not applying to API < 21. -->
-    <ProgressBar
-        android:id="@+id/progress_bar"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_height="3dp"
-        android:layout_width="match_parent"
-        android:max="100"
-        android:progressTint="?attr/progressTintColor"
-        android:progressBackgroundTint="@color/transparent"
-        android:visibility="gone"
-        tools:ignore="UnusedAttribute" />
-</FrameLayout>
\ No newline at end of file

diff --git a/app/src/main/res/layout/webview_framelayout_bottom_appbar.xml b/app/src/main/res/layout/webview_framelayout_bottom_appbar.xml
new file mode 100644 (file)
index 0000000..16ece12
--- /dev/null
+++ b/app/src/main/res/layout/webview_framelayout_bottom_appbar.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright 2019-2020,2022-2023 Soren Stoutner <soren@stoutner.com>.
+
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+
+  Privacy Browser Android is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  Privacy Browser Android is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+
+<!-- The frame layout allows the progress bar to float above the WebView. -->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <!-- The nested scroll WebView is created with `visibility="invisible"` to prevent a white background splash in night mode because there is a delay in setting the background color.
+        It is set visible in `initializeWebView()` or `onProgressChanged()` in `MainWebViewActivity`. -->
+    <com.stoutner.privacybrowser.views.NestedScrollWebView
+        android:id="@+id/nestedscroll_webview"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:background="?android:attr/colorBackground"
+        android:visibility="invisible" />
+
+    <!-- `android:max` changes the maximum `ProgressBar` value from 10000 to 100 to match progress percentage.
+        `android:layout_height="2dp"` works best for API >= 23, but `3dp` is required for visibility on API <= 22.-->
+    <ProgressBar
+        android:id="@+id/progress_bar"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_height="3dp"
+        android:layout_width="match_parent"
+        android:layout_gravity="bottom"
+        android:max="100"
+        android:progressTint="?attr/progressTintColor"
+        android:progressBackgroundTint="@color/transparent"
+        android:visibility="gone" />
+</FrameLayout>

diff --git a/app/src/main/res/layout/webview_framelayout_top_appbar.xml b/app/src/main/res/layout/webview_framelayout_top_appbar.xml
new file mode 100644 (file)
index 0000000..a404f30
--- /dev/null
+++ b/app/src/main/res/layout/webview_framelayout_top_appbar.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright 2019-2020,2022-2023 Soren Stoutner <soren@stoutner.com>.
+
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+
+  Privacy Browser Android is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  Privacy Browser Android is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+
+<!-- The frame layout allows the progress bar to float above the WebView. -->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <!-- The nested scroll WebView is created with `visibility="invisible"` to prevent a white background splash in night mode because there is a delay in setting the background color.
+        It is set visible in `initializeWebView()` or `onProgressChanged()` in `MainWebViewActivity`. -->
+    <com.stoutner.privacybrowser.views.NestedScrollWebView
+        android:id="@+id/nestedscroll_webview"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:background="?android:attr/colorBackground"
+        android:visibility="invisible" />
+
+    <!-- `android:max` changes the maximum `ProgressBar` value from 10000 to 100 to match progress percentage.
+        `android:layout_height="2dp"` works best for API >= 23, but `3dp` is required for visibility on API <= 22.-->
+    <ProgressBar
+        android:id="@+id/progress_bar"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_height="3dp"
+        android:layout_width="match_parent"
+        android:max="100"
+        android:progressTint="?attr/progressTintColor"
+        android:progressBackgroundTint="@color/transparent"
+        android:visibility="gone" />
+</FrameLayout>