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

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

diff --git a/app/src/main/res/layout/edit_bookmark_dialog.xml b/app/src/main/res/layout/edit_bookmark_dialog.xml
index 677626290045c87cc38dac80671b56d379fb29e5..8ce9763b971f5487a44c3010201bbeaec16f794e 100644 (file)
--- a/app/src/main/res/layout/edit_bookmark_dialog.xml
+++ b/app/src/main/res/layout/edit_bookmark_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017,2019-2021 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -18,108 +18,120 @@
   You should have received a copy of the GNU General Public License
   along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<LinearLayout
+<ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent" >
 
-    <!-- The icon selection rows. -->
     <LinearLayout
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:orientation="horizontal">
+        android:orientation="vertical" >
 
-        <!-- The column displaying the icons. -->
+        <!-- Current icon. -->
         <LinearLayout
+            android:id="@+id/current_icon_linearlayout"
             android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="10dp"
-            android:orientation="vertical" >
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="6dp" >
 
-            <ImageView
-                android:id="@+id/edit_bookmark_current_icon"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:layout_marginTop="12dp"
-                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"
-                tools:ignore="ContentDescription" />
+                android:checked="true" />
 
             <ImageView
-                android:id="@+id/edit_bookmark_web_page_favorite_icon"
+                android:id="@+id/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" />
+
+            <TextView
+                android:layout_height="wrap_content"
+                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>
 
-        <!-- The column with the `RadioGroup`. -->
-        <RadioGroup
+        <!-- Webpage favorite icon. -->
+        <LinearLayout
+            android:id="@+id/webpage_favorite_icon_linearlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:checkedButton="@+id/edit_bookmark_current_icon_radiobutton" >
+            android:orientation="horizontal"
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="6dp" >
 
             <RadioButton
-                android:id="@id/edit_bookmark_current_icon_radiobutton"
+                android:id="@+id/webpage_favorite_icon_radiobutton"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                android:layout_marginTop="12dp"
-                android:layout_marginBottom="4dp"
-                android:text="@string/current_bookmark_icon"
-                android:textSize="18sp" />
+                android:layout_gravity="center_vertical" />
 
-            <RadioButton
-                android:id="@+id/edit_bookmark_web_page_favorite_icon_radiobutton"
+            <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_marginTop="5dp"
-                android:text="@string/web_page_favorite_icon"
-                android:textSize="18sp" />
-        </RadioGroup>
-    </LinearLayout>
+                android:layout_marginStart="7dp"
+                android:layout_gravity="center_vertical"
+                android:text="@string/webpage_favorite_icon"
+                android:textSize="18sp"
+                android:textColor="?android:textColorPrimary" />
+        </LinearLayout>
 
-    <!-- `android.support.design.widget.TextInputLayout` makes the `android:hint` float above the `EditText`. -->
-    <android.support.design.widget.TextInputLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="6dp"
-        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_bookmark_name_edittext"
+        <!-- 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:hint="@string/bookmark_name"
-            android:imeOptions="actionGo"
-            android:inputType="textUri" />
-    </android.support.design.widget.TextInputLayout>
-
-    <!-- `android.support.design.widget.TextInputLayout` makes the `android:hint` float above the `EditText`. -->
-    <android.support.design.widget.TextInputLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_marginTop="6dp"
-        android:layout_marginBottom="12dp"
-        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:singleLine="true"` is not needed in a Dialog.-->
-        <EditText
-            android:id="@+id/edit_bookmark_url_edittext"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="6dp"
+            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 edit text. -->
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/bookmark_name_edittext"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:hint="@string/bookmark_name"
+                android:imeOptions="actionGo"
+                android:inputType="textUri"
+                android:selectAllOnFocus="true" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <!-- 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:hint="@string/bookmark_url"
-            android:imeOptions="actionGo"
-            android:inputType="textUri" />
-    </android.support.design.widget.TextInputLayout>
-</LinearLayout>
\ No newline at end of file
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="12dp"
+            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 edit text. -->
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/bookmark_url_edittext"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:hint="@string/bookmark_url"
+                android:imeOptions="actionGo"
+                android:inputType="textUri"
+                android:selectAllOnFocus="true" />
+        </com.google.android.material.textfield.TextInputLayout>
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file