X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fedit_bookmark_folder_dialog.xml;h=997a8b455a36cac02559bad138d430420e12070b;hp=2286cbdfb2d2c74b9c4c2f49cb3f57582d8487a8;hb=54c70ca476ba2f53ae274df1ac725be3919e8f56;hpb=c4ad9f457f41cbc86391e0099629cd94a235258a

diff --git a/app/src/main/res/layout/edit_bookmark_folder_dialog.xml b/app/src/main/res/layout/edit_bookmark_folder_dialog.xml
index 2286cbdf..997a8b45 100644
--- a/app/src/main/res/layout/edit_bookmark_folder_dialog.xml
+++ b/app/src/main/res/layout/edit_bookmark_folder_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017,2019 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -18,113 +18,121 @@
   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_height="wrap_content"
-    android:layout_width="match_parent"
-    android:orientation="vertical" >
+    android:layout_width="match_parent" >
 
-    <!-- The icon selection rows. -->
     <LinearLayout
+        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"
-        android:orientation="horizontal">
+        android:orientation="vertical" >
 
-        <!-- The column displaying the icons. -->
+        <!-- The icon selection rows. -->
         <LinearLayout
             android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:orientation="vertical"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="10dp" >
-
-            <ImageView
-                android:id="@+id/edit_folder_current_icon"
-                android:layout_height="30dp"
-                android:layout_width="30dp"
-                android:layout_marginTop="12dp"
-                android:layout_marginBottom="6dp"
-                android:layout_gravity="center_vertical"
-                tools:ignore="ContentDescription" />
-
-            <ImageView
-                android:id="@+id/edit_folder_default_icon"
-                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_web_page_favorite_icon"
-                android:layout_height="30dp"
-                android:layout_width="30dp"
-                android:layout_marginTop="6dp"
-                android:layout_marginBottom="12dp"
-                android:layout_gravity="center_vertical"
-                tools:ignore="ContentDescription" />
-        </LinearLayout>
-
-        <!-- The column with the `RadioGroup`. -->
-        <RadioGroup
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:checkedButton="@+id/edit_folder_current_icon_radiobutton">
+            android:orientation="horizontal">
 
-            <RadioButton
-                android:id="@id/edit_folder_current_icon_radiobutton"
+            <!-- The column displaying the icons. -->
+            <LinearLayout
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                android:layout_marginTop="12dp"
-                android:layout_marginBottom="4dp"
-                android:text="@string/current_folder_icon"
-                android:textSize="18sp"/>
-
-            <RadioButton
-                android:id="@+id/edit_folder_default_icon_radiobutton"
-                android:layout_width="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginStart="7dp" >
+
+                <ImageView
+                    android:id="@+id/edit_folder_current_icon_imageview"
+                    android:layout_height="30dp"
+                    android:layout_width="30dp"
+                    android:layout_marginTop="12dp"
+                    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_web_page_favorite_icon_imageview"
+                    android:layout_height="30dp"
+                    android:layout_width="30dp"
+                    android:layout_marginTop="6dp"
+                    android:layout_marginBottom="12dp"
+                    android:layout_gravity="center_vertical"
+                    tools:ignore="ContentDescription" />
+            </LinearLayout>
+
+            <!-- The column with the `RadioGroup`. -->
+            <RadioGroup
+                android:id="@+id/edit_folder_icon_radio_group"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:layout_marginBottom="4dp"
-                android:text="@string/default_folder_icon"
-                android:textSize="18sp" />
-
-            <RadioButton
-                android:id="@+id/edit_folder_web_page_icon_radiobutton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:text="@string/web_page_favorite_icon"
-                android:textSize="18sp" />
-        </RadioGroup>
-    </LinearLayout>
+                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="12dp"
+                    android:layout_marginBottom="4dp"
+                    android:text="@string/current_folder_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_web_page_icon_radiobutton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:text="@string/web_page_favorite_icon"
+                    android:textSize="18sp"
+                    android:textColor="?android:textColorPrimary" />
+            </RadioGroup>
+        </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="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.support.design.widget.TextInputEditText
-            android:id="@+id/edit_folder_name_edittext"
+        <!-- The `TextInputLayout` makes the `android:hint` float above the `EditText`. -->
+        <com.google.android.material.textfield.TextInputLayout
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:hint="@string/folder_name"
-            android:imeOptions="actionGo"
-            android:inputType="textUri" />
-    </android.support.design.widget.TextInputLayout>
+            android:layout_marginTop="6dp"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="4dp" >
 
-    <TextView
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:gravity="center_horizontal"
-        android:text="@string/folder_names_must_be_unique" />
-</LinearLayout>
\ No newline at end of file
+            <!-- `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. -->
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/edit_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" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <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