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

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

diff --git a/app/src/main/res/layout/domain_settings_fragment.xml b/app/src/main/res/layout/domain_settings_fragment.xml
index a519047839ac7a81a2369a8b3c4770ef1d723117..34cf2c3e6dd3e6dd00d1348f803f535f9657455b 100644 (file)
--- a/app/src/main/res/layout/domain_settings_fragment.xml
+++ b/app/src/main/res/layout/domain_settings_fragment.xml
@@ -1,7 +1,7 @@
 <?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>.
 
@@ -213,9 +213,9 @@
                 android:textSize="13sp" />
         </LinearLayout>
 
-        <!-- Form Data. This may be removed one the minimum API >= 26. -->
+        <!-- User Agent. -->
         <LinearLayout
-            android:id="@+id/form_data_linearlayout"
+            android:id="@+id/user_agent_linearlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:orientation="vertical"
@@ -224,7 +224,7 @@
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
-                android:text="@string/form_data" />
+                android:text="@string/user_agent" />
 
             <LinearLayout
                 android:layout_height="wrap_content"
@@ -232,29 +232,38 @@
                 android:orientation="horizontal" >
 
                 <ImageView
-                    android:id="@+id/form_data_imageview"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:layout_marginTop="1dp"
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
-                    android:src="@drawable/form_data_enabled"
-                    app:tint="@color/yellow_icon_selector"
-                    android:contentDescription="@string/form_data" />
+                    android:src="@drawable/user_agent"
+                    app:tint="@color/blue_icon"
+                    android:contentDescription="@string/user_agent" />
 
                 <Spinner
-                    android:id="@+id/form_data_spinner"
+                    android:id="@+id/user_agent_spinner"
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent" />
             </LinearLayout>
 
             <TextView
-                android:id="@+id/form_data_textview"
+                android:id="@+id/user_agent_textview"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:layout_marginStart="45dp"
                 android:layout_marginEnd="36dp"
                 android:textSize="13sp" />
+
+            <EditText
+                android:id="@+id/custom_user_agent_edittext"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="40dp"
+                android:layout_marginEnd="60dp"
+                android:inputType="textUri"
+                android:hint="@string/custom_user_agent"
+                android:importantForAutofill="no" />
         </LinearLayout>
 
         <!-- EasyList. -->
@@ -553,7 +562,8 @@
                 <Spinner
                     android:id="@+id/block_all_third_party_requests_spinner"
                     android:layout_height="wrap_content"
-                    android:layout_width="match_parent" />
+                    android:layout_width="match_parent"
+                    tools:ignore="TooManyViews" />
             </LinearLayout>
 
             <TextView
@@ -565,59 +575,6 @@
                 android:textSize="13sp" />
         </LinearLayout>
 
-        <!-- User Agent. -->
-        <LinearLayout
-            android:id="@+id/user_agent_linearlayout"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:padding="12dp" >
-
-            <TextView
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:text="@string/user_agent" />
-
-            <LinearLayout
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:orientation="horizontal" >
-
-                <ImageView
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:layout_marginTop="1dp"
-                    android:layout_marginEnd="10dp"
-                    android:layout_gravity="center_vertical"
-                    android:src="@drawable/user_agent"
-                    app:tint="@color/blue_icon"
-                    android:contentDescription="@string/user_agent" />
-
-                <Spinner
-                    android:id="@+id/user_agent_spinner"
-                    android:layout_height="wrap_content"
-                    android:layout_width="match_parent" />
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/user_agent_textview"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:layout_marginStart="45dp"
-                android:layout_marginEnd="36dp"
-                android:textSize="13sp" />
-
-            <EditText
-                android:id="@+id/custom_user_agent_edittext"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:layout_marginStart="40dp"
-                android:layout_marginEnd="60dp"
-                android:inputType="textUri"
-                android:hint="@string/custom_user_agent"
-                android:importantForAutofill="no" />
-        </LinearLayout>
-
         <!-- Font Size. -->
         <LinearLayout
             android:id="@+id/font_size_linearlayout"
@@ -682,8 +639,7 @@
             <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
-                android:text="@string/swipe_to_refresh"
-                tools:ignore="TooManyViews" />
+                android:text="@string/swipe_to_refresh" />
 
             <LinearLayout
                 android:layout_height="wrap_content"