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

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

diff --git a/app/src/main/res/layout/edit_bookmark_folder_databaseview_dialog.xml b/app/src/main/res/layout/edit_bookmark_folder_databaseview_dialog.xml
index 9dffbe5b1db34ab4125918a261f59fb2aeded54c..db029e392afda56cd7ef3f4985f4165ed72b0173 100644 (file)
--- a/app/src/main/res/layout/edit_bookmark_folder_databaseview_dialog.xml
+++ b/app/src/main/res/layout/edit_bookmark_folder_databaseview_dialog.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2021 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2016-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"
@@ -57,6 +57,31 @@
                 android:textColor="@color/gray_500" />
         </LinearLayout>
 
+        <!-- Folder ID. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="6dp"
+            android:layout_marginStart="7dp"
+            android:layout_marginEnd="7dp" >
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:text="@string/folder_id"
+                android:textSize="18sp"
+                android:textColor="?android:textColorPrimary"
+                android:layout_marginEnd="8dp" />
+
+            <TextView
+                android:id="@+id/folder_id_textview"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:textSize="18sp"
+                android:textColor="@color/gray_500" />
+        </LinearLayout>
+
         <!-- Current icon. -->
         <LinearLayout
             android:id="@+id/current_icon_linearlayout"
@@ -90,9 +115,9 @@
                 android:textColor="?android:textColorPrimary" />
         </LinearLayout>
 
-        <!-- 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"
@@ -100,13 +125,13 @@
             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" />
 
             <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"
@@ -155,11 +180,51 @@
                 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" />
+
         <!-- Folder name.  The text input layout makes the `android:hint` float above the edit text. -->
         <com.google.android.material.textfield.TextInputLayout
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:layout_marginTop="12dp"
+            android:layout_marginTop="6dp"
             android:layout_marginBottom="6dp"
             android:layout_marginStart="4dp"
             android:layout_marginEnd="4dp" >
@@ -222,16 +287,7 @@
                 android:imeOptions="actionGo"
                 android:inputType="number"
                 android:selectAllOnFocus="true"
-                android:importantForAutofill="no"
-                tools:targetApi="26" />
+                android:importantForAutofill="no" />
         </LinearLayout>
-
-        <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>