X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fedit_bookmark_folder_dialog.xml;h=9a0b397727fd437cb73daa4981eb6a18311d9a4e;hb=771125363f79df7b3a6b85321a08c7c201b54661;hp=0ac3158635b5fdf132cb50f490394cf57bfe2274;hpb=871520acac2bd75f528e943c1b2a650017c852b9;p=PrivacyBrowserAndroid.git

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 0ac31586..9a0b3977 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-2017 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>.
 
@@ -20,12 +20,11 @@
 
 <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" >
 
     <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="vertical" >
@@ -41,11 +40,10 @@
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:orientation="vertical"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="10dp" >
+                android:layout_marginStart="7dp" >
 
                 <ImageView
-                    android:id="@+id/edit_folder_current_icon"
+                    android:id="@+id/edit_folder_current_icon_imageview"
                     android:layout_height="30dp"
                     android:layout_width="30dp"
                     android:layout_marginTop="12dp"
@@ -54,7 +52,7 @@
                     tools:ignore="ContentDescription" />
 
                 <ImageView
-                    android:id="@+id/edit_folder_default_icon"
+                    android:id="@+id/edit_folder_default_icon_imageview"
                     android:layout_height="30dp"
                     android:layout_width="30dp"
                     android:layout_marginTop="6dp"
@@ -64,7 +62,7 @@
                     tools:ignore="ContentDescription" />
 
                 <ImageView
-                    android:id="@+id/edit_folder_web_page_favorite_icon"
+                    android:id="@+id/edit_folder_web_page_favorite_icon_imageview"
                     android:layout_height="30dp"
                     android:layout_width="30dp"
                     android:layout_marginTop="6dp"
@@ -87,7 +85,8 @@
                     android:layout_marginTop="12dp"
                     android:layout_marginBottom="4dp"
                     android:text="@string/current_folder_icon"
-                    android:textSize="18sp"/>
+                    android:textSize="18sp"
+                    android:textColor="?android:textColorPrimary" />
 
                 <RadioButton
                     android:id="@+id/edit_folder_default_icon_radiobutton"
@@ -96,7 +95,8 @@
                     android:layout_marginTop="5dp"
                     android:layout_marginBottom="4dp"
                     android:text="@string/default_folder_icon"
-                    android:textSize="18sp" />
+                    android:textSize="18sp"
+                    android:textColor="?android:textColorPrimary" />
 
                 <RadioButton
                     android:id="@+id/edit_folder_web_page_icon_radiobutton"
@@ -104,21 +104,21 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
                     android:text="@string/web_page_favorite_icon"
-                    android:textSize="18sp" />
+                    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
+        <!-- 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:layout_marginTop="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: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"
@@ -126,7 +126,7 @@
                 android:imeOptions="actionGo"
                 android:inputType="textUri"
                 android:selectAllOnFocus="true" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
         <TextView
             android:layout_height="wrap_content"