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

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

diff --git a/app/src/main/res/layout/create_bookmark_folder_dialog.xml b/app/src/main/res/layout/create_bookmark_folder_dialog.xml
index 4311bf7fed2e07f0ad0baab519634f99052a1d49..51cb7e2ebcb3bdfda9b26f02ee286e5f8761d065 100644 (file)
--- a/app/src/main/res/layout/create_bookmark_folder_dialog.xml
+++ b/app/src/main/res/layout/create_bookmark_folder_dialog.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2019,2021 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2016-2019, 2021-2024 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"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="wrap_content"
-    android:layout_width="match_parent" >
+    android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools" >
 
     <LinearLayout
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:orientation="vertical" >
 
-        <!-- Default icon. -->
+        <!-- Default folder icon. -->
         <LinearLayout
-            android:id="@+id/default_icon_linearlayout"
+            android:id="@+id/default_folder_icon_linearlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:orientation="horizontal"
@@ -39,14 +39,14 @@
             android:layout_marginBottom="6dp" >
 
             <RadioButton
-                android:id="@+id/default_icon_radiobutton"
+                android:id="@+id/default_folder_icon_radiobutton"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:checked="true" />
 
             <ImageView
-                android:id="@+id/default_icon_imageview"
+                android:id="@+id/default_folder_icon_imageview"
                 android:layout_height="30dp"
                 android:layout_width="30dp"
                 android:layout_gravity="center_vertical"
@@ -70,7 +70,7 @@
             android:layout_width="match_parent"
             android:orientation="horizontal"
             android:layout_marginTop="6dp"
-            android:layout_marginBottom="12dp" >
+            android:layout_marginBottom="6dp" >
 
             <RadioButton
                 android:id="@+id/webpage_favorite_icon_radiobutton"
@@ -95,6 +95,46 @@
                 android:textColor="?android:textColorPrimary" />
         </LinearLayout>
 
+        <!-- Custom icon. -->
+        <LinearLayout
+            android:id="@+id/custom_icon_linearlayout"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:layout_marginTop="6dp" >
+
+            <RadioButton
+                android:id="@+id/custom_icon_radiobutton"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_gravity="center_vertical" />
+
+            <ImageView
+                android:id="@+id/custom_icon_imageview"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center_vertical"
+                tools:ignore="ContentDescription" />
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginStart="7dp"
+                android:layout_gravity="center_vertical"
+                android:text="@string/custom_folder_icon"
+                android:textSize="18sp"
+                android:textColor="?android:textColorPrimary" />
+        </LinearLayout>
+
+        <!-- Browse button. -->
+        <Button
+            android:id="@+id/browse_button"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="@string/browse"
+            android:layout_marginBottom="12dp" />
+
         <!-- The text input layout makes the `android:hint` float above the edit text. -->
         <com.google.android.material.textfield.TextInputLayout
             android:layout_height="wrap_content"
@@ -114,13 +154,5 @@
                 <requestFocus />
             </com.google.android.material.textfield.TextInputEditText>
         </com.google.android.material.textfield.TextInputLayout>
-
-        <TextView
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:gravity="center_horizontal"
-            android:text="@string/folder_names_must_be_unique"
-            android:layout_marginStart="7dp"
-            android:layout_marginEnd="7dp" />
     </LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>