Combine drawable files. https://redmine.stoutner.com/issues/794

[PrivacyBrowserAndroid.git] / app / src / main / res / layout / webview_framelayout.xml

diff --git a/app/src/main/res/layout/webview_framelayout.xml b/app/src/main/res/layout/webview_framelayout.xml
index bb6de103e3b667ecfb175e0eb945e384871d80f9..42b4095436fb9c1bec5f405bc794615c0ac8387a 100644 (file)
--- a/app/src/main/res/layout/webview_framelayout.xml
+++ b/app/src/main/res/layout/webview_framelayout.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2019 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2019-2020,2022 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
 
-  Privacy Browser is free software: you can redistribute it and/or modify
+  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 is distributed in the hope that it will be useful,
+  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.  If not, see <http://www.gnu.org/licenses/>. -->
+  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
@@ -25,12 +25,16 @@
     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: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.
@@ -41,7 +45,7 @@
         android:layout_height="3dp"
         android:layout_width="match_parent"
         android:max="100"
-        android:progressTint="@color/yellow_a700"
+        android:progressTint="?attr/progressTintColor"
         android:progressBackgroundTint="@color/transparent"
         android:visibility="gone"
         tools:ignore="UnusedAttribute" />