X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fedit_bookmark_folder_databaseview_dialog.xml;h=cffc03d9e38fb24361c7a4ae8f389850481ea5fd;hb=99d687b50a4f750f0ca1f865b665931eecf511b5;hp=6ea35eeba0fddbd1ee46e26812147702bcff1b59;hpb=8807eaccc921d6e8535a40421fd58d8c71cee17f;p=PrivacyBrowserAndroid.git

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 6ea35eeb..cffc03d9 100644
--- 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,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2016-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"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="wrap_content"
     android:layout_width="match_parent" >
 
-    <!-- Setting `android:focusable` and `android:focusableInTouchMode` prevent `edit_bookmark_display_order_edittext` from being autoselected. -->
+    <!-- Setting `android:focusable` and `android:focusableInTouchMode` prevent the display order edit text from being autoselected. -->
     <LinearLayout
-        xmlns:tools="http://schemas.android.com/tools"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:orientation="vertical"
@@ -50,95 +50,138 @@
                 android:layout_marginEnd="8dp" />
 
             <TextView
-                android:id="@+id/edit_folder_database_id_textview"
+                android:id="@+id/folder_database_id_textview"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:textSize="18sp"
                 android:textColor="@color/gray_500" />
         </LinearLayout>
 
-        <!-- The icon selection rows. -->
+        <!-- Folder ID. -->
         <LinearLayout
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:orientation="horizontal" >
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="6dp"
+            android:layout_marginStart="7dp"
+            android:layout_marginEnd="7dp" >
 
-            <!-- The column displaying the icons. -->
-            <LinearLayout
+            <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                android:orientation="vertical"
-                android:layout_marginStart="7dp" >
-
-                <ImageView
-                    android:id="@+id/edit_folder_current_icon_imageview"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:layout_marginTop="6dp"
-                    android:layout_marginBottom="6dp"
-                    android:layout_gravity="center_vertical"
-                    tools:ignore="ContentDescription" />
-
-                <ImageView
-                    android:id="@+id/edit_folder_default_icon_imageview"
-                    android:layout_height="30dp"
-                    android:layout_width="30dp"
-                    android:layout_marginTop="6dp"
-                    android:layout_marginBottom="6dp"
-                    android:layout_gravity="center_vertical"
-                    android:src="@drawable/folder_blue_bitmap"
-                    tools:ignore="ContentDescription" />
-
-                <ImageView
-                    android:id="@+id/edit_folder_webpage_favorite_icon_imageview"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:layout_marginTop="6dp"
-                    android:layout_marginBottom="6dp"
-                    android:layout_gravity="center_vertical"
-                    tools:ignore="ContentDescription" />
-            </LinearLayout>
-
-            <!-- The column with the `RadioGroup`. -->
-            <RadioGroup
-                android:id="@+id/edit_folder_icon_radiogroup"
+                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="match_parent"
-                android:checkedButton="@+id/edit_folder_current_icon_radiobutton" >
-
-                <RadioButton
-                    android:id="@id/edit_folder_current_icon_radiobutton"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:layout_marginTop="6dp"
-                    android:layout_marginBottom="4dp"
-                    android:text="@string/current_bookmark_icon"
-                    android:textSize="18sp"
-                    android:textColor="?android:textColorPrimary" />
-
-                <RadioButton
-                    android:id="@+id/edit_folder_default_icon_radiobutton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginBottom="4dp"
-                    android:text="@string/default_folder_icon"
-                    android:textSize="18sp"
-                    android:textColor="?android:textColorPrimary" />
-
-                <RadioButton
-                    android:id="@+id/edit_folder_webpage_favorite_icon_radiobutton"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:text="@string/web_page_favorite_icon"
-                    android:textSize="18sp"
-                    android:textColor="?android:textColorPrimary" />
-            </RadioGroup>
+                android:layout_width="wrap_content"
+                android:textSize="18sp"
+                android:textColor="@color/gray_500" />
         </LinearLayout>
 
-        <!-- Folder name.  `android.support.design.widget.TextInputLayout` makes the `android:hint` float above the `EditText`. -->
-        <android.support.design.widget.TextInputLayout
+        <!-- Current icon. -->
+        <LinearLayout
+            android:id="@+id/current_icon_linearlayout"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="6dp" >
+
+            <RadioButton
+                android:id="@+id/current_icon_radiobutton"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:checked="true" />
+
+            <ImageView
+                android:id="@+id/current_icon_imageview"
+                android:layout_height="30dp"
+                android:layout_width="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/current_folder_icon"
+                android:textSize="18sp"
+                android:textColor="?android:textColorPrimary" />
+        </LinearLayout>
+
+        <!-- Default icon. -->
+        <LinearLayout
+            android:id="@+id/default_icon_linearlayout"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="6dp" >
+
+            <RadioButton
+                android:id="@+id/default_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:layout_height="30dp"
+                android:layout_width="30dp"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/folder_blue_bitmap"
+                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/default_folder_icon"
+                android:textSize="18sp"
+                android:textColor="?android:textColorPrimary" />
+        </LinearLayout>
+
+        <!-- Webpage favorite icon. -->
+        <LinearLayout
+            android:id="@+id/webpage_favorite_icon_linearlayout"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="6dp" >
+
+            <RadioButton
+                android:id="@+id/webpage_favorite_icon_radiobutton"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_gravity="center_vertical" />
+
+            <ImageView
+                android:id="@+id/webpage_favorite_icon_imageview"
+                android:layout_height="30dp"
+                android:layout_width="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/webpage_favorite_icon"
+                android:textSize="18sp"
+                android:textColor="?android:textColorPrimary" />
+        </LinearLayout>
+
+        <!-- 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"
@@ -146,16 +189,16 @@
             android:layout_marginStart="4dp"
             android:layout_marginEnd="4dp" >
 
-            <!-- `android:imeOptions="actionGo"` sets the keyboard to have a `go` key instead of a `new line` key.  `android:inputType="textUri"` disables spell check in the `EditText`. -->
-            <android.support.design.widget.TextInputEditText
-                android:id="@+id/edit_folder_name_edittext"
+            <!-- `android:imeOptions="actionGo"` sets the keyboard to have a "go" key instead of a "new line" key.  `android:inputType="textUri"` disables spell check in the edit text. -->
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/folder_name_edittext"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:hint="@string/folder_name"
                 android:imeOptions="actionGo"
                 android:inputType="textUri"
                 android:selectAllOnFocus="true" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
         <!-- Folder. -->
         <LinearLayout
@@ -174,7 +217,7 @@
                 android:textColor="?android:textColorPrimary" />
 
             <Spinner
-                android:id="@+id/edit_folder_parent_folder_spinner"
+                android:id="@+id/parent_folder_spinner"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
         </LinearLayout>
@@ -195,21 +238,17 @@
                 android:textSize="18sp"
                 android:textColor="?android:textColorPrimary"
                 android:layout_marginEnd="6dp"
-                android:labelFor="@+id/edit_folder_display_order_edittext"/>
+                android:labelFor="@+id/display_order_edittext"/>
 
             <EditText
-                android:id="@id/edit_folder_display_order_edittext"
+                android:id="@id/display_order_edittext"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:imeOptions="actionGo"
                 android:inputType="number"
-                android:selectAllOnFocus="true" />
+                android:selectAllOnFocus="true"
+                android:importantForAutofill="no"
+                tools:targetApi="26" />
         </LinearLayout>
-
-        <TextView
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:gravity="center_horizontal"
-            android:text="@string/folder_names_must_be_unique" />
     </LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>