X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fedit_bookmark_dialog.xml;h=43a427d1d6d8eecf1ee2d02cbd5a8d2c859444dc;hp=1768ca08f8470414af2e39302da729df33644703;hb=bc2e180db377eedadbe1ea455d8fb311ead8f9d6;hpb=8951c7351854bbfc9f2815e74b81cc2a4d606bf0

diff --git a/app/src/main/res/layout/edit_bookmark_dialog.xml b/app/src/main/res/layout/edit_bookmark_dialog.xml
index 1768ca08..43a427d1 100644
--- 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 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017,2019-2020 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -18,79 +18,114 @@
   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"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingStart="4dp"
-    android:paddingEnd="4dp" >
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent" >
 
     <LinearLayout
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:orientation="horizontal"
-        android:paddingTop="12dp"
-        android:paddingBottom="4dp"
-        android:paddingStart="20dp"
-        android:paddingEnd="0dp" >
-
-        <ImageView
-            android:id="@+id/edit_bookmark_new_favorite_icon"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:contentDescription="@string/new_favorite_icon" />
-
-        <TextView
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:text="@string/use_new_icon"
-            android:textColor="@color/black"
-            android:textSize="20sp"
-            android:paddingStart="8dp"
-            android:paddingEnd="4dp" />
-
-        <CheckBox
-            android:id="@+id/edit_bookmark_use_new_favorite_icon_checkbox"
+        android:orientation="vertical" >
+
+        <!-- The icon selection rows. -->
+        <LinearLayout
             android:layout_height="wrap_content"
-            android:layout_width="wrap_content" />
-    </LinearLayout>
+            android:layout_width="match_parent"
+            android:orientation="horizontal" >
 
-    <!-- `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: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.-->
-        <android.support.design.widget.TextInputEditText
-            android:id="@+id/edit_bookmark_name_edittext"
+            <!-- The column displaying the icons. -->
+            <LinearLayout
+                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="12dp"
+                    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"
+                    tools:ignore="ContentDescription" />
+            </LinearLayout>
+
+            <!-- The column with the `RadioGroup`. -->
+            <RadioGroup
+                android:id="@+id/edit_bookmark_icon_radiogroup"
+                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="12dp"
+                    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>
+        </LinearLayout>
+
+        <!-- The `TextInputLayout` 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:layout_marginTop="12dp"
+            android:layout_marginBottom="6dp"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="4dp" >
 
-    <!-- `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: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: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: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 `TextInputLayout` 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/edit_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