Fix a crach when editing a bookmark in the bookmarks drawer. https://redmine.stoutne...

[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 2b6771a1cb3bcbb7d8bbd99183e04eb908ba465c..1184805eda9cc66ac6dd575ef65fcb1565eb7a9c 100644 (file)
--- a/app/src/main/res/layout/edit_bookmark_dialog.xml
+++ b/app/src/main/res/layout/edit_bookmark_dialog.xml
@@ -39,9 +39,8 @@
             <LinearLayout
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="10dp"
-                android:orientation="vertical" >
+                android:orientation="vertical"
+                android:layout_marginStart="7dp" >
 
                 <ImageView
                     android:id="@+id/edit_bookmark_current_icon"
@@ -53,7 +52,7 @@
                     tools:ignore="ContentDescription" />
 
                 <ImageView
-                    android:id="@+id/edit_bookmark_web_page_favorite_icon"
+                    android:id="@+id/edit_bookmark_webpage_favorite_icon"
                     android:layout_width="30dp"
                     android:layout_height="30dp"
                     android:layout_marginTop="6dp"
@@ -63,6 +62,7 @@
 
             <!-- 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" >
@@ -74,15 +74,17 @@
                     android:layout_marginTop="12dp"
                     android:layout_marginBottom="4dp"
                     android:text="@string/current_bookmark_icon"
-                    android:textSize="18sp" />
+                    android:textSize="18sp"
+                    android:textColor="?android:textColorPrimary" />
 
                 <RadioButton
-                    android:id="@+id/edit_bookmark_web_page_favorite_icon_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:textSize="18sp"
+                    android:textColor="?android:textColorPrimary" />
             </RadioGroup>
         </LinearLayout>
 
@@ -95,15 +97,15 @@
             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 `EditText`. -->
             <android.support.design.widget.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:inputType="textUri"
+                android:selectAllOnFocus="true" />
         </android.support.design.widget.TextInputLayout>
 
         <!-- `android.support.design.widget.TextInputLayout` makes the `android:hint` float above the `EditText`. -->
@@ -115,16 +117,15 @@
             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.-->
+            <!-- `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`. -->
             <EditText
                 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:inputType="textUri"
+                android:selectAllOnFocus="true" />
         </android.support.design.widget.TextInputLayout>
     </LinearLayout>
 </ScrollView>
\ No newline at end of file