First wrong button text in View Headers in night theme. https://redmine.stoutner...

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

diff --git a/app/src/main/res/layout/view_request_dialog.xml b/app/src/main/res/layout/view_request_dialog.xml
index c42b88349ec44407bc3cce12307ccade8af976e8..4291d04a9a0ac0fdc29ace6f58f7228cd23fb582 100644 (file)
--- a/app/src/main/res/layout/view_request_dialog.xml
+++ b/app/src/main/res/layout/view_request_dialog.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2018 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2018,2020,2022-2023 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/>. -->
 
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
@@ -36,11 +36,11 @@
             android:layout_width="match_parent"
             android:text="@string/disposition"
             android:textSize="12sp"
-            android:textColor="@color/blue_700"
+            android:textColor="@color/blue_text"
             android:layout_marginTop="5dp" />
 
         <TextView
-            android:id="@+id/request_action"
+            android:id="@+id/request_disposition"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:textSize="16sp"
@@ -53,7 +53,7 @@
             android:layout_width="match_parent"
             android:text="@string/url"
             android:textSize="12sp"
-            android:textColor="@color/blue_700"
+            android:textColor="@color/blue_text"
             android:layout_marginTop="10dp" />
 
         <TextView
@@ -64,18 +64,18 @@
             android:textColor="?android:textColorPrimary"
             android:textIsSelectable="true" />
 
-        <!-- Blocklist -->
+        <!-- Filter List -->
         <TextView
-            android:id="@+id/request_blocklist_label"
+            android:id="@+id/request_filterlist_label"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:text="@string/blocklist"
+            android:text="@string/filterlist"
             android:textSize="12sp"
-            android:textColor="@color/blue_700"
+            android:textColor="@color/blue_text"
             android:layout_marginTop="10dp" />
 
         <TextView
-            android:id="@+id/request_blocklist"
+            android:id="@+id/request_filterlist"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:textSize="16sp"
@@ -89,7 +89,7 @@
             android:layout_width="match_parent"
             android:text="@string/sublist"
             android:textSize="12sp"
-            android:textColor="@color/blue_700"
+            android:textColor="@color/blue_text"
             android:layout_marginTop="10dp" />
 
         <TextView
@@ -100,36 +100,36 @@
             android:textColor="?android:textColorPrimary"
             android:textIsSelectable="true" />
 
-        <!-- Blocklist Entries. -->
+        <!-- Filter List Entries. -->
         <TextView
-            android:id="@+id/request_blocklist_entries_label"
+            android:id="@+id/request_filterlist_entries_label"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:text="@string/blocklist_entries"
+            android:text="@string/filterlist_entries"
             android:textSize="12sp"
-            android:textColor="@color/blue_700"
+            android:textColor="@color/blue_text"
             android:layout_marginTop="10dp" />
 
         <TextView
-            android:id="@+id/request_blocklist_entries"
+            android:id="@+id/request_filterlist_entries"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:textSize="16sp"
             android:textColor="?android:textColorPrimary"
             android:textIsSelectable="true" />
 
-        <!-- Blocklist Entries. -->
+        <!-- Filter List Entries. -->
         <TextView
-            android:id="@+id/request_blocklist_original_entry_label"
+            android:id="@+id/request_filterlist_original_entry_label"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:text="@string/blocklist_original_entry"
+            android:text="@string/filterlist_original_entry"
             android:textSize="12sp"
-            android:textColor="@color/blue_700"
+            android:textColor="@color/blue_text"
             android:layout_marginTop="10dp" />
 
         <TextView
-            android:id="@+id/request_blocklist_original_entry"
+            android:id="@+id/request_filterlist_original_entry"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:textSize="16sp"