Fix the bookmarks dialogs to align the icons and the radio buttons. https://redmine...

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

diff --git a/app/src/main/res/layout/edit_bookmark_databaseview_dialog.xml b/app/src/main/res/layout/edit_bookmark_databaseview_dialog.xml
index 4c074a4988a357950e6b2e1f101897261cff43fa..f20966b9dd3d6c66bdd0757d4783ecf65572f3fa 100644 (file)
--- a/app/src/main/res/layout/edit_bookmark_databaseview_dialog.xml
+++ b/app/src/main/res/layout/edit_bookmark_databaseview_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2020 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2021 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -24,7 +24,7 @@
     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` prevents the display order edit text from being autoselected. -->
     <LinearLayout
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
@@ -50,74 +50,79 @@
                 android:layout_marginEnd="8dp" />
 
             <TextView
-                android:id="@+id/edit_bookmark_database_id_textview"
+                android:id="@+id/bookmark_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. -->
+        <!-- Current icon. -->
         <LinearLayout
+            android:id="@+id/current_icon_linearlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:orientation="horizontal" >
+            android:orientation="horizontal"
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="6dp" >
 
-            <!-- The column displaying the icons. -->
-            <LinearLayout
+            <RadioButton
+                android:id="@id/current_icon_radiobutton"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                android:orientation="vertical"
-                android:layout_marginStart="7dp" >
-
-                <ImageView
-                    android:id="@+id/edit_bookmark_current_icon"
-                    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_bookmark_webpage_favorite_icon"
-                    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_bookmark_icon_radiogroup"
+                android:layout_gravity="center_vertical"
+                android:checked="true" />
+
+            <ImageView
+                android:id="@+id/current_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="match_parent"
-                android:checkedButton="@+id/edit_bookmark_current_icon_radiobutton" >
-
-                <RadioButton
-                    android:id="@id/edit_bookmark_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_bookmark_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:layout_marginStart="7dp"
+                android:layout_gravity="center_vertical"
+                android:text="@string/current_bookmark_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="wrap_content"
+            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>
 
-        <!-- Bookmark name.  The `TextInputLayout` makes the `android:hint` float above the `EditText`. -->
+        <!-- Bookmark 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"
@@ -126,9 +131,9 @@
             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: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/edit_bookmark_name_edittext"
+                android:id="@+id/bookmark_name_edittext"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:hint="@string/bookmark_name"
@@ -137,7 +142,7 @@
                 android:selectAllOnFocus="true" />
         </com.google.android.material.textfield.TextInputLayout>
 
-        <!-- URL.  The `TextInputLayout` makes the `android:hint` float above the `EditText`. -->
+        <!-- URL.  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"
@@ -146,9 +151,9 @@
             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: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/edit_bookmark_url_edittext"
+                android:id="@+id/bookmark_url_edittext"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:hint="@string/bookmark_url"
@@ -174,7 +179,7 @@
                 android:textColor="?android:textColorPrimary" />
 
             <Spinner
-                android:id="@+id/edit_bookmark_folder_spinner"
+                android:id="@+id/bookmark_folder_spinner"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
         </LinearLayout>
@@ -196,10 +201,10 @@
                 android:textSize="18sp"
                 android:textColor="?android:textColorPrimary"
                 android:layout_marginEnd="6dp"
-                android:labelFor="@+id/edit_bookmark_display_order_edittext"/>
+                android:labelFor="@+id/bookmark_display_order_edittext"/>
 
             <EditText
-                android:id="@id/edit_bookmark_display_order_edittext"
+                android:id="@id/bookmark_display_order_edittext"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:imeOptions="actionGo"