]> gitweb.stoutner.com Git - PrivacyBrowserAndroid.git/commitdiff
Remove all the custom attr entries. https://redmine.stoutner.com/issues/1189
authorSoren Stoutner <soren@stoutner.com>
Wed, 10 Apr 2024 18:41:33 +0000 (11:41 -0700)
committerSoren Stoutner <soren@stoutner.com>
Wed, 10 Apr 2024 18:41:33 +0000 (11:41 -0700)
29 files changed:
app/src/main/java/com/stoutner/privacybrowser/activities/ViewHeadersActivity.kt
app/src/main/res/drawable/list_selector.xml [new file with mode: 0644]
app/src/main/res/drawable/list_selector_day.xml [deleted file]
app/src/main/res/drawable/list_selector_night.xml [deleted file]
app/src/main/res/layout-w900dp/bookmarks_drawer_bottom_appbar.xml
app/src/main/res/layout-w900dp/bookmarks_drawer_top_appbar.xml
app/src/main/res/layout/bookmarks_activity_item_linearlayout.xml
app/src/main/res/layout/bookmarks_bottom_appbar.xml
app/src/main/res/layout/bookmarks_databaseview_item_linearlayout.xml
app/src/main/res/layout/bookmarks_drawer_bottom_appbar.xml
app/src/main/res/layout/bookmarks_drawer_top_appbar.xml
app/src/main/res/layout/bookmarks_top_appbar.xml
app/src/main/res/layout/domain_name_linearlayout.xml
app/src/main/res/layout/domains_bottom_appbar.xml
app/src/main/res/layout/domains_top_appbar.xml
app/src/main/res/layout/main_framelayout_bottom_appbar.xml
app/src/main/res/layout/main_framelayout_top_appbar.xml
app/src/main/res/layout/move_to_folder_item_linearlayout.xml
app/src/main/res/layout/view_headers_bottom_appbar.xml
app/src/main/res/layout/view_headers_top_appbar.xml
app/src/main/res/layout/webview_framelayout_bottom_appbar.xml
app/src/main/res/layout/webview_framelayout_top_appbar.xml
app/src/main/res/values-night-v27/styles.xml
app/src/main/res/values-night/colors.xml
app/src/main/res/values-night/styles.xml
app/src/main/res/values-v27/styles.xml
app/src/main/res/values/attrs.xml [deleted file]
app/src/main/res/values/colors.xml
app/src/main/res/values/styles.xml

index b18365a5954362eef3e67a53815ffc806462f8d1..8a0cc6531789b831f9a44cd7175bf70fbd3dd1fb 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Copyright 2017-2024 Soren Stoutner <soren@stoutner.com>.
  *
- * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+ * 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
diff --git a/app/src/main/res/drawable/list_selector.xml b/app/src/main/res/drawable/list_selector.xml
new file mode 100644 (file)
index 0000000..20629ba
--- /dev/null
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright 2017, 2020, 2022-2024 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/>. -->
+
+<!-- This selector changes the background of activated items in a list view. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_activated="true"
+        android:drawable="@color/list_selector_activated" />
+</selector>
diff --git a/app/src/main/res/drawable/list_selector_day.xml b/app/src/main/res/drawable/list_selector_day.xml
deleted file mode 100644 (file)
index 1654785..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Copyright 2017,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/>. -->
-
-<!-- This selector changes the background of activated items in a list view. -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_activated="true"
-        android:drawable="@color/blue_200" />
-</selector>
diff --git a/app/src/main/res/drawable/list_selector_night.xml b/app/src/main/res/drawable/list_selector_night.xml
deleted file mode 100644 (file)
index 2c5059e..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Copyright 2017,2020,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/>. -->
-
-<!-- This selector changes the background of activated items in a list view. -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_activated="true"
-        android:drawable="@color/violet_700" />
-</selector>
index fd756a304eac186f2f3da87a9a625e555f009bcd..952eab6e70d5fa8498259fa88b763343034e0153 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017,2019-2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017, 2019-2022, 2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  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
@@ -92,7 +92,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="200dp"
         android:src="@drawable/bookmarks"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/bookmarks" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="130dp"
         android:src="@drawable/create_folder"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_folder" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="60dp"
         android:src="@drawable/create_bookmark"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_bookmark" />
 </FrameLayout>
index cda02c0aaf77b5adf4a891160a1f43daa7854001..5c104efaff37319f56a606a243c83ffb4a9f4fdb 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017,2019-2020,2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017, 2019-2020, 2022, 2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  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
@@ -92,7 +92,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="155dp"
         android:src="@drawable/bookmarks"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/bookmarks" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="85dp"
         android:src="@drawable/create_folder"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_folder" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
         android:src="@drawable/create_bookmark"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_bookmark" />
 </FrameLayout>
index 91d72724df7910664dabbbaaf1061693652b3ad2..5ca452b2f39de42e99862affa551d133c48bdd28 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2017,2020,2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2016-2017, 2020, 2022, 2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  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
@@ -26,7 +26,7 @@
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
     android:orientation="horizontal"
-    android:background="?attr/listSelectorDrawable"
+    android:background="@drawable/list_selector"
     tools:ignore="UseCompoundDrawables" >
 
     <ImageView
@@ -46,4 +46,4 @@
         android:layout_margin="10dp"
         android:lines="1"
         android:ellipsize="end" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
index 372935661f1809fb3729199620595bdb4fb302b1..2f54dafdb11195e4391af7d7b6b107d966470a5e 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2016-2022, 2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  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
@@ -66,7 +66,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="140dp"
         android:src="@drawable/create_folder"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_folder" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -77,6 +77,6 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="70dp"
         android:src="@drawable/create_bookmark"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_bookmark" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
index 548b56bd60c8c8f7d74e02de5c3c66ae90ae5a77..9a09da349eb92ded1d60f4a41ef78d62ef6ebaf7 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2017,2019,2022-2023 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2016-2017, 2019, 2022-2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  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
@@ -24,7 +24,7 @@
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
     android:orientation="vertical"
-    android:background="?attr/listSelectorDrawable" >
+    android:background="@drawable/list_selector" >
 
     <!-- First row. -->
     <LinearLayout
index 3ec8e144f15c01acd8241e968f67113ae0c1d9e1..f6531e729d4b00a835f2cce4833ee3797d63370a 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017-2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017-2022, 2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  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
@@ -91,7 +91,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="200dp"
         android:src="@drawable/bookmarks"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/bookmarks" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="130dp"
         android:src="@drawable/create_folder"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_folder" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="60dp"
         android:src="@drawable/create_bookmark"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_bookmark" />
 </FrameLayout>
index bea5b9d2d8b0cccaa0cd58763baa4fa46eac6cf5..4f70475b47b5195bb3fe4dfacdaea1126f9502f8 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017-2020,2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017-2020, 2022, 2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  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
@@ -91,7 +91,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="155dp"
         android:src="@drawable/bookmarks"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/bookmarks" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="85dp"
         android:src="@drawable/create_folder"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_folder" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
         android:src="@drawable/create_bookmark"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_bookmark" />
 </FrameLayout>
index b87da014cb1bbef3a26280609a90a20d69d987bc..9ba8a12035ceb532c65238771fb2243fecee2412 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2016-2022, 2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  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
@@ -63,7 +63,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="85dp"
         android:src="@drawable/create_folder"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_folder" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -73,6 +73,6 @@
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
         android:src="@drawable/create_bookmark"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_bookmark" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
index 1317d281b2763f754803f0f75230e2a06348ec4a..a42fd086330c495bab40526d7f29247dca698003 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2017,2020,2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017, 2020, 2022, 2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  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
@@ -25,7 +25,7 @@
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
     android:orientation="horizontal"
-    android:background="?attr/listSelectorDrawable" >
+    android:background="@drawable/list_selector" >
 
     <TextView
         android:id="@+id/domain_name_textview"
@@ -36,4 +36,4 @@
         android:layout_margin="10dp"
         android:lines="1"
         android:ellipsize="end" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
index c91af5db1a2d63c6917d3528886c1a8f56470219..7fc27db45929376ba3e881fb3dab6f7c49195585 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2017,2019-2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017, 2019-2022, 2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  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
@@ -57,6 +57,6 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="70dp"
         android:src="@drawable/add"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/add_domain" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
index 1d62297fc032e4cb8c951fd7f787053ce2ff3048..101cfe366a823e0fd7256f3770c117fe33d64af5 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2017,2019-2020,2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017, 2019-2020, 2022, 2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  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
@@ -54,6 +54,6 @@
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
         android:src="@drawable/add"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/add_domain" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
index 497a823bd3f4bdc46bd50fa7a0be9e2f0ec3c8b4..d11ae7cf42f533b90b490be994fc66fd73112398 100644 (file)
             android:layout_width="wrap_content"
             android:layout_gravity="start"
             app:menu="@menu/webview_navigation_menu_bottom_appbar"
-            app:itemIconTint="?attr/navigationIconTintColor" />
+            app:itemIconTint="@color/blue_icon" />
 
         <!-- Include the bookmarks drawer, which varies based on screen width. -->
         <include layout="@layout/bookmarks_drawer_bottom_appbar" />
index 3b43be9d7ae9da5c6d2c2ff2a85e04695d398735..ea289cd7f9900747277ea7b3e72fa0c95663ee0c 100644 (file)
             android:layout_width="wrap_content"
             android:layout_gravity="start"
             app:menu="@menu/webview_navigation_menu_top_appbar"
-            app:itemIconTint="?attr/navigationIconTintColor" />
+            app:itemIconTint="@color/blue_icon" />
 
         <!-- Include the bookmarks drawer, which varies based on screen width. -->
         <include layout="@layout/bookmarks_drawer_top_appbar" />
index 144b0ac2a86bc462e336046301044bd3fff8d938..76f041c693bee09dcd8e8599df34b3870d0f864f 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016-2017,2022-2023 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2016-2017, 2022-2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  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
@@ -24,7 +24,7 @@
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
     android:orientation="horizontal"
-    android:background="?attr/listSelectorDrawable"
+    android:background="@drawable/list_selector"
     tools:ignore="UseCompoundDrawables">
 
     <!-- Subfolder spacer. -->
index eddf4477d3250013fdafab27bfcff44b903d527d..0219c09a1c2f667a348683c45fbab8d671600354 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017-2023 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017-2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  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
         android:orientation="vertical"
         app:layout_dodgeInsetEdges="bottom" >
 
-        <!-- `android:layout_weight="1"` causes the swipe refresh layout to fill all the remaining space. -->
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-            android:id="@+id/swiperefreshlayout"
+        <!-- The frame layout allows the swipe refresh layout and the progress bar to occupy the same space. -->
+        <FrameLayout
             android:layout_height="0dp"
             android:layout_width="match_parent"
-            android:layout_weight="1">
+            android:layout_weight="1" >
 
-            <ScrollView
-                android:id="@+id/scrollview"
-                android:layout_height="wrap_content"
+            <!-- `android:layout_weight="1"` causes the swipe refresh layout to fill all the remaining space. -->
+            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                android:id="@+id/swiperefreshlayout"
+                android:layout_height="match_parent"
                 android:layout_width="match_parent" >
 
-                <LinearLayout
+                <ScrollView
+                    android:id="@+id/scrollview"
                     android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
-                    android:orientation="vertical"
-                    android:layout_margin="10dp" >
-
-                    <!-- SSL information. -->
-                    <TextView
-                        android:id="@+id/ssl_information_title_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:text="@string/ssl_information"
-                        android:textAlignment="center"
-                        android:textSize="18sp"
-                        android:textColor="@color/blue_text"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/ssl_information_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textIsSelectable="true"
-                        android:layout_marginBottom="8dp" />
+                    android:layout_width="match_parent" >
 
-                    <!-- SSL Buttons. -->
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/ssl_buttons_constraintlayout"
+                    <LinearLayout
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
-                        android:layout_marginBottom="16dp"
-                        tools:ignore="MissingConstraints" >
+                        android:orientation="vertical"
+                        android:layout_margin="10dp" >
 
-                        <androidx.constraintlayout.helper.widget.Flow
+                        <!-- SSL information. -->
+                        <TextView
+                            android:id="@+id/ssl_information_title_textview"
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"
-                            app:constraint_referenced_ids="ciphers_button,certificate_button"
-                            app:flow_wrapMode="chain"
-                            app:flow_firstHorizontalStyle="packed"
-                            app:flow_horizontalGap="15dp" />
+                            android:text="@string/ssl_information"
+                            android:textAlignment="center"
+                            android:textSize="18sp"
+                            android:textColor="@color/blue_text"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/ssl_information_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textIsSelectable="true"
+                            android:layout_marginBottom="8dp" />
 
-                        <androidx.appcompat.widget.AppCompatButton
-                            android:id="@+id/ciphers_button"
+                        <!-- SSL Buttons. -->
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:id="@+id/ssl_buttons_constraintlayout"
                             android:layout_height="wrap_content"
-                            android:layout_width="wrap_content"
-                            android:text="@string/ciphers"
-                            android:onClick="showCiphers"
-                            app:backgroundTint="@color/button_background_selector"
-                            android:textColor="@color/button_text_selector"
-                            tools:ignore="ButtonStyle" />
-
-                        <androidx.appcompat.widget.AppCompatButton
-                            android:id="@+id/certificate_button"
+                            android:layout_width="match_parent"
+                            android:layout_marginBottom="16dp"
+                            tools:ignore="MissingConstraints" >
+
+                            <androidx.constraintlayout.helper.widget.Flow
+                                android:layout_height="wrap_content"
+                                android:layout_width="match_parent"
+                                app:constraint_referenced_ids="ciphers_button,certificate_button"
+                                app:flow_wrapMode="chain"
+                                app:flow_firstHorizontalStyle="packed"
+                                app:flow_horizontalGap="15dp" />
+
+                            <androidx.appcompat.widget.AppCompatButton
+                                android:id="@+id/ciphers_button"
+                                android:layout_height="wrap_content"
+                                android:layout_width="wrap_content"
+                                android:text="@string/ciphers"
+                                android:onClick="showCiphers"
+                                app:backgroundTint="@color/button_background_selector"
+                                android:textColor="@color/button_text_selector"
+                                tools:ignore="ButtonStyle" />
+
+                            <androidx.appcompat.widget.AppCompatButton
+                                android:id="@+id/certificate_button"
+                                android:layout_height="wrap_content"
+                                android:layout_width="wrap_content"
+                                android:text="@string/certificate"
+                                android:onClick="showCertificate"
+                                app:backgroundTint="@color/button_background_selector"
+                                android:textColor="@color/button_text_selector"
+                                tools:ignore="ButtonStyle" />
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                        <!-- Request headers. -->
+                        <TextView
+                            android:id="@+id/request_headers_title_textview"
                             android:layout_height="wrap_content"
-                            android:layout_width="wrap_content"
-                            android:text="@string/certificate"
-                            android:onClick="showCertificate"
-                            app:backgroundTint="@color/button_background_selector"
-                            android:textColor="@color/button_text_selector"
-                            tools:ignore="ButtonStyle" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <!-- Request headers. -->
-                    <TextView
-                        android:id="@+id/request_headers_title_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:text="@string/request_headers"
-                        android:textAlignment="center"
-                        android:textSize="18sp"
-                        android:textColor="@color/blue_text"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/request_headers_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textIsSelectable="true"
-                        android:layout_marginBottom="8dp" />
+                            android:layout_width="match_parent"
+                            android:text="@string/request_headers"
+                            android:textAlignment="center"
+                            android:textSize="18sp"
+                            android:textColor="@color/blue_text"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/request_headers_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textIsSelectable="true"
+                            android:layout_marginBottom="8dp" />
 
-                    <!-- Response message. -->
-                    <TextView
-                        android:id="@+id/response_message_title_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:text="@string/response_message"
-                        android:textAlignment="center"
-                        android:textSize="18sp"
-                        android:textColor="@color/blue_text"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/response_message_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textIsSelectable="true"
-                        android:layout_marginBottom="8dp" />
+                        <!-- Response message. -->
+                        <TextView
+                            android:id="@+id/response_message_title_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:text="@string/response_message"
+                            android:textAlignment="center"
+                            android:textSize="18sp"
+                            android:textColor="@color/blue_text"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/response_message_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textIsSelectable="true"
+                            android:layout_marginBottom="8dp" />
 
-                    <!-- Response headers. -->
-                    <!-- The title text is set programatically. -->
-                    <TextView
-                        android:id="@+id/response_headers_title_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textAlignment="center"
-                        android:textSize="18sp"
-                        android:textColor="@color/blue_text"
-                        android:textStyle="bold" />
+                        <!-- Response headers. -->
+                        <!-- The title text is set programatically. -->
+                        <TextView
+                            android:id="@+id/response_headers_title_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textAlignment="center"
+                            android:textSize="18sp"
+                            android:textColor="@color/blue_text"
+                            android:textStyle="bold" />
 
-                    <TextView
-                        android:id="@+id/response_headers_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textIsSelectable="true"
-                        android:layout_marginBottom="8dp" />
+                        <TextView
+                            android:id="@+id/response_headers_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textIsSelectable="true"
+                            android:layout_marginBottom="8dp" />
 
-                    <!-- Response body. -->
-                    <!-- The title text is set programatically. -->
-                    <TextView
-                        android:id="@+id/response_body_title_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textAlignment="center"
-                        android:textSize="18sp"
-                        android:textColor="@color/blue_text"
-                        android:textStyle="bold" />
+                        <!-- Response body. -->
+                        <!-- The title text is set programatically. -->
+                        <TextView
+                            android:id="@+id/response_body_title_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textAlignment="center"
+                            android:textSize="18sp"
+                            android:textColor="@color/blue_text"
+                            android:textStyle="bold" />
 
-                    <TextView
-                        android:id="@+id/response_body_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textIsSelectable="true" />
-                </LinearLayout>
-            </ScrollView>
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+                        <TextView
+                            android:id="@+id/response_body_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textIsSelectable="true" />
+                    </LinearLayout>
+                </ScrollView>
+            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+            <!-- The progress bar looks best with a minimum height of 3dp for the top app bar and 4dp for the bottom app bar. -->
+            <ProgressBar
+                android:id="@+id/progress_bar"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_gravity="bottom"
+                android:minHeight="4dp"
+                android:progressTint="@color/blue_text"
+                android:progressBackgroundTint="@color/transparent"
+                android:background="?android:attr/colorBackground"
+                android:visibility="gone" />
+        </FrameLayout>
 
         <!-- The app bar theme must be specified here because the activity uses a `NoActionBar` theme. -->
         <com.google.android.material.appbar.AppBarLayout
             android:background="?android:attr/colorBackground"
             android:theme="@style/PrivacyBrowserAppBar" >
 
-            <!-- The frame layout allows the toolbar and the progress bar to occupy the same space. -->
-            <FrameLayout
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
                 android:layout_height="wrap_content"
-                android:layout_width="match_parent" >
-
-                <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/toolbar"
-                    android:layout_height="wrap_content"
-                    android:layout_width="match_parent" />
-
-                <!-- Android automatically uses a different, skinnier drawable with padding for indeterminate horizontal progress bars in API >= 21.
-                    They make this very difficult to override.  https://redmine.stoutner.com/issues/241
-                    `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="wrap_content"
-                    android:layout_width="match_parent"
-                    android:minHeight="3dp"
-                    android:layout_gravity="bottom"
-                    android:visibility="gone"
-                    tools:ignore="UnusedAttribute" />
-            </FrameLayout>
+                android:layout_width="match_parent" />
         </com.google.android.material.appbar.AppBarLayout>
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
index 0358048cd1ed5e2ec34ad25d93dd9660c942e1e3..588ff6b74c4f6b1708a6dc53fdc9f23aeeeb0e8e 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017-2023 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017-2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  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
             android:background="?android:attr/colorBackground"
             android:theme="@style/PrivacyBrowserAppBar" >
 
-            <!-- The frame layout allows the toolbar and the progress bar to occupy the same space. -->
-            <FrameLayout
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
                 android:layout_height="wrap_content"
-                android:layout_width="match_parent" >
-
-                <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/toolbar"
-                    android:layout_height="wrap_content"
-                    android:layout_width="match_parent" />
-
-                <!-- Android automatically uses a different, skinnier drawable with padding for indeterminate horizontal progress bars in API >= 21.
-                    They make this very difficult to override.  https://redmine.stoutner.com/issues/241
-                    `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="wrap_content"
-                    android:layout_width="match_parent"
-                    android:minHeight="3dp"
-                    android:layout_gravity="bottom"
-                    android:visibility="gone"
-                    tools:ignore="UnusedAttribute" />
-            </FrameLayout>
+                android:layout_width="match_parent" />
         </com.google.android.material.appbar.AppBarLayout>
 
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-            android:id="@+id/swiperefreshlayout"
-            android:layout_height="match_parent"
-            android:layout_width="match_parent">
+        <!-- The frame layout allows the progress bar and the swipe refresh layout to occupy the same space. -->
+        <FrameLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent" >
 
-            <ScrollView
-                android:id="@+id/view_source_scrollview"
+            <!-- The progress bar looks best with a minimum height of 3dp for the top app bar and 4dp for the bottom app bar. -->
+            <ProgressBar
+                android:id="@+id/progress_bar"
+                style="?android:attr/progressBarStyleHorizontal"
                 android:layout_height="wrap_content"
-                android:layout_width="match_parent" >
-
-                <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_gravity="top"
+                android:minHeight="3dp"
+                android:progressTint="@color/blue_text"
+                android:progressBackgroundTint="@color/transparent"
+                android:visibility="gone" />
+
+            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                android:id="@+id/swiperefreshlayout"
+                android:layout_height="match_parent"
+                android:layout_width="match_parent">
+
+                <ScrollView
+                    android:id="@+id/view_source_scrollview"
                     android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
-                    android:orientation="vertical"
-                    android:layout_margin="10dp" >
+                    android:layout_width="match_parent" >
 
-                    <!-- SSL information. -->
-                    <TextView
-                        android:id="@+id/ssl_information_title_textview"
+                    <LinearLayout
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
-                        android:text="@string/ssl_information"
-                        android:textAlignment="center"
-                        android:textSize="18sp"
-                        android:textColor="@color/blue_text"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/ssl_information_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textIsSelectable="true"
-                        android:layout_marginBottom="8dp" />
+                        android:orientation="vertical"
+                        android:layout_margin="10dp" >
 
-                    <!-- SSL Buttons. -->
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/ssl_buttons_constraintlayout"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:layout_marginBottom="16dp"
-                        tools:ignore="MissingConstraints" >
-
-                        <androidx.constraintlayout.helper.widget.Flow
+                        <!-- SSL information. -->
+                        <TextView
+                            android:id="@+id/ssl_information_title_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:text="@string/ssl_information"
+                            android:textAlignment="center"
+                            android:textSize="18sp"
+                            android:textColor="@color/blue_text"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/ssl_information_textview"
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"
-                            app:constraint_referenced_ids="ciphers_button,certificate_button"
-                            app:flow_wrapMode="chain"
-                            app:flow_firstHorizontalStyle="packed"
-                            app:flow_horizontalGap="15dp" />
+                            android:textIsSelectable="true"
+                            android:layout_marginBottom="8dp" />
 
-                        <androidx.appcompat.widget.AppCompatButton
-                            android:id="@+id/ciphers_button"
+                        <!-- SSL Buttons. -->
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:id="@+id/ssl_buttons_constraintlayout"
                             android:layout_height="wrap_content"
-                            android:layout_width="wrap_content"
-                            android:text="@string/ciphers"
-                            android:onClick="showCiphers"
-                            app:backgroundTint="@color/button_background_selector"
-                            android:textColor="@color/button_text_selector"
-                            tools:ignore="ButtonStyle" />
-
-                        <androidx.appcompat.widget.AppCompatButton
-                            android:id="@+id/certificate_button"
+                            android:layout_width="match_parent"
+                            android:layout_marginBottom="16dp"
+                            tools:ignore="MissingConstraints" >
+
+                            <androidx.constraintlayout.helper.widget.Flow
+                                android:layout_height="wrap_content"
+                                android:layout_width="match_parent"
+                                app:constraint_referenced_ids="ciphers_button,certificate_button"
+                                app:flow_wrapMode="chain"
+                                app:flow_firstHorizontalStyle="packed"
+                                app:flow_horizontalGap="15dp" />
+
+                            <androidx.appcompat.widget.AppCompatButton
+                                android:id="@+id/ciphers_button"
+                                android:layout_height="wrap_content"
+                                android:layout_width="wrap_content"
+                                android:text="@string/ciphers"
+                                android:onClick="showCiphers"
+                                app:backgroundTint="@color/button_background_selector"
+                                android:textColor="@color/button_text_selector"
+                                tools:ignore="ButtonStyle" />
+
+                            <androidx.appcompat.widget.AppCompatButton
+                                android:id="@+id/certificate_button"
+                                android:layout_height="wrap_content"
+                                android:layout_width="wrap_content"
+                                android:text="@string/certificate"
+                                android:onClick="showCertificate"
+                                app:backgroundTint="@color/button_background_selector"
+                                android:textColor="@color/button_text_selector"
+                                tools:ignore="ButtonStyle" />
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                        <!-- Request headers. -->
+                        <TextView
+                            android:id="@+id/request_headers_title_textview"
                             android:layout_height="wrap_content"
-                            android:layout_width="wrap_content"
-                            android:text="@string/certificate"
-                            android:onClick="showCertificate"
-                            app:backgroundTint="@color/button_background_selector"
-                            android:textColor="@color/button_text_selector"
-                            tools:ignore="ButtonStyle" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <!-- Request headers. -->
-                    <TextView
-                        android:id="@+id/request_headers_title_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:text="@string/request_headers"
-                        android:textAlignment="center"
-                        android:textSize="18sp"
-                        android:textColor="@color/blue_text"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/request_headers_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textIsSelectable="true"
-                        android:layout_marginBottom="8dp" />
+                            android:layout_width="match_parent"
+                            android:text="@string/request_headers"
+                            android:textAlignment="center"
+                            android:textSize="18sp"
+                            android:textColor="@color/blue_text"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/request_headers_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textIsSelectable="true"
+                            android:layout_marginBottom="8dp" />
 
-                    <!-- Response message. -->
-                    <TextView
-                        android:id="@+id/response_message_title_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:text="@string/response_message"
-                        android:textAlignment="center"
-                        android:textSize="18sp"
-                        android:textColor="@color/blue_text"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/response_message_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textIsSelectable="true"
-                        android:layout_marginBottom="8dp" />
+                        <!-- Response message. -->
+                        <TextView
+                            android:id="@+id/response_message_title_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:text="@string/response_message"
+                            android:textAlignment="center"
+                            android:textSize="18sp"
+                            android:textColor="@color/blue_text"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/response_message_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textIsSelectable="true"
+                            android:layout_marginBottom="8dp" />
 
-                    <!-- Response headers. -->
-                    <!-- The title text is set programatically. -->
-                    <TextView
-                        android:id="@+id/response_headers_title_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textAlignment="center"
-                        android:textSize="18sp"
-                        android:textColor="@color/blue_text"
-                        android:textStyle="bold" />
+                        <!-- Response headers. -->
+                        <!-- The title text is set programatically. -->
+                        <TextView
+                            android:id="@+id/response_headers_title_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textAlignment="center"
+                            android:textSize="18sp"
+                            android:textColor="@color/blue_text"
+                            android:textStyle="bold" />
 
-                    <TextView
-                        android:id="@+id/response_headers_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textIsSelectable="true"
-                        android:layout_marginBottom="8dp" />
+                        <TextView
+                            android:id="@+id/response_headers_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textIsSelectable="true"
+                            android:layout_marginBottom="8dp" />
 
-                    <!-- Response body. -->
-                    <!-- The title text is set programatically. -->
-                    <TextView
-                        android:id="@+id/response_body_title_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textAlignment="center"
-                        android:textSize="18sp"
-                        android:textColor="@color/blue_text"
-                        android:textStyle="bold" />
+                        <!-- Response body. -->
+                        <!-- The title text is set programatically. -->
+                        <TextView
+                            android:id="@+id/response_body_title_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textAlignment="center"
+                            android:textSize="18sp"
+                            android:textColor="@color/blue_text"
+                            android:textStyle="bold" />
 
-                    <TextView
-                        android:id="@+id/response_body_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textIsSelectable="true" />
-                </LinearLayout>
-            </ScrollView>
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+                        <TextView
+                            android:id="@+id/response_body_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textIsSelectable="true" />
+                    </LinearLayout>
+                </ScrollView>
+            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+        </FrameLayout>
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
index e9460c658a4f05a336058d55f5dbd2607cad45e0..db8dfdddaf3abe9e9a9eb6876d4fc9c2c95378c2 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2019-2020,2022-2023 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2019-2020, 2022-2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  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
@@ -43,7 +43,7 @@
         android:layout_width="match_parent"
         android:layout_gravity="bottom"
         android:max="100"
-        android:progressTint="?attr/progressTintColor"
+        android:progressTint="@color/blue_text"
         android:progressBackgroundTint="@color/transparent"
         android:visibility="gone" />
 </FrameLayout>
index 084e9d367047723a09c28d7f83bef22dfd7db7b2..417bb311dc4ed70f5601ba12e0eac42a95b21e1e 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2019-2020,2022-2023 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2019-2020, 2022-2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  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
@@ -42,7 +42,7 @@
         android:layout_height="2dp"
         android:layout_width="match_parent"
         android:max="100"
-        android:progressTint="?attr/progressTintColor"
+        android:progressTint="@color/blue_text"
         android:progressBackgroundTint="@color/transparent"
         android:visibility="gone" />
 </FrameLayout>
index 7edb9a6e6300bdaaff64f36b586078f0fbda5d3f..0875d83d94a5569b38d9e416a53b0fb41039732b 100644 (file)
         <item name="android:actionModeBackground">?android:attr/colorBackground</item>
         <item name="android:textColorHighlight">@color/violet_700</item>
         <item name="colorAccent">@color/violet_500</item>
-
-        <!-- Tints. -->
-        <item name="fabIconTintColor">@color/gray_875</item>
-        <item name="navigationIconTintColor">@color/violet_500</item>
-        <item name="progressTintColor">@color/violet_500</item>
-
-        <!-- Drawables. -->
-        <item name="listSelectorDrawable">@drawable/list_selector_night</item>
     </style>
 
     <style name="PrivacyBrowserAppBar" parent="ThemeOverlay.AppCompat.DayNight.ActionBar" >
index fee950be89861886a991d96928140b203065de9c..9056ce1ed83fa4c4a13af8cdd93f9d8969ede1d2 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016-2017,2020,2022-2023 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2016-2017, 2020, 2022-2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  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
     <color name="disabled_button_text">@color/gray_500</color>
     <color name="disabled_icon">@color/gray_500</color>
     <color name="domain_settings_url_background">@color/dark_blue_40</color>
+    <color name="fab_icon">@color/gray_875</color>
     <color name="ghosted_icon">@color/gray_700</color>
     <color name="icon">@color/white</color>
+    <color name="list_selector_activated">@color/violet_700</color>
     <color name="parent_folder_text">@color/gray_300</color>
     <color name="red_background">@color/red_700_40</color>
     <color name="red_icon">@color/red_night</color>
index 06703b20732d12aa0f0a8822848984ad80f8cf8d..8020167b3d36f3f23804131e98e6148befb6086e 100644 (file)
         <item name="android:actionModeBackground">?android:attr/colorBackground</item>
         <item name="android:textColorHighlight">@color/violet_700</item>
         <item name="colorAccent">@color/violet_500</item>
-
-        <!-- Tints. -->
-        <item name="fabIconTintColor">@color/gray_875</item>
-        <item name="navigationIconTintColor">@color/violet_500</item>
-        <item name="progressTintColor">@color/violet_500</item>
-
-        <!-- Drawables. -->
-        <item name="listSelectorDrawable">@drawable/list_selector_night</item>
     </style>
 
     <style name="PrivacyBrowserAppBar" parent="ThemeOverlay.AppCompat.DayNight.ActionBar" >
index a78f4c7976232dc010bfd984ec3b8a46b0f7ee79..6c0b35cd42ed8072d450e579ea6893539d41a2a3 100644 (file)
         <item name="android:actionModeBackground">?android:attr/colorBackground</item>
         <item name="android:textColorHighlight">@color/blue_200</item>
         <item name="colorAccent">@color/blue_700</item>
-
-        <!-- Tints. -->
-        <item name="fabIconTintColor">@color/white</item>
-        <item name="navigationIconTintColor">@color/blue_800</item>
-        <item name="progressTintColor">@color/blue_700</item>
-
-        <!-- Drawables. -->
-        <item name="listSelectorDrawable">@drawable/list_selector_day</item>
     </style>
 
     <style name="PrivacyBrowserAppBar" parent="ThemeOverlay.AppCompat.DayNight.ActionBar" >
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
deleted file mode 100644 (file)
index ecce232..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Copyright 2017-2022, 2024 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/>. -->
-
-<resources>
-    <!-- Colors. -->
-    <attr name="aboutBackground" format="color" />
-    <attr name="activatedListViewItemBackground" format="color" />
-
-    <!-- Tint Colors. -->
-    <attr name="fabIconTintColor" format="color" />
-    <attr name="navigationIconTintColor" format="color" />
-    <attr name="progressTintColor" format="color" />
-
-    <!-- Drawables.  -->
-    <attr name="listSelectorDrawable" format="reference" />
-</resources>
index 807bca3a182c49d703904e48ed1c371936dbc5f1..19bc381061f08b89514213f08828abf4c0c6146b 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016-2017,2020,2022-2023 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2016-2017, 2020, 2022-2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  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
     <color name="disabled_button_text">@color/gray_400</color>
     <color name="disabled_icon">@color/gray_600</color>
     <color name="domain_settings_url_background">@color/green_200</color>
+    <color name="fab_icon">@color/white</color>
     <color name="ghosted_icon">@color/gray_425</color>
     <color name="icon">@color/gray_925</color>
+    <color name="list_selector_activated">@color/blue_200</color>
     <color name="parent_folder_text">@color/gray_700</color>
     <color name="red_background">@color/red_100</color>
     <color name="red_icon">@color/red_900</color>
index 470b1a7343fa5c7086f1137d9036d649f92a49f0..6dd998ad999cd38ec656f19c76fad15ec3d82a9b 100644 (file)
         <item name="android:actionModeBackground">?android:attr/colorBackground</item>
         <item name="android:textColorHighlight">@color/blue_200</item>
         <item name="colorAccent">@color/blue_700</item>
-
-        <!-- Tints. -->
-        <item name="fabIconTintColor">@color/white</item>
-        <item name="navigationIconTintColor">@color/blue_800</item>
-        <item name="progressTintColor">@color/blue_700</item>
-
-        <!-- Drawables. -->
-        <item name="listSelectorDrawable">@drawable/list_selector_day</item>
     </style>
 
     <style name="PrivacyBrowserAppBar" parent="ThemeOverlay.AppCompat.DayNight.ActionBar" >