X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fcreate_home_screen_shortcut_dialog.xml;h=aaadcd459facdf7bc324802eeb25d063ee740037;hb=84989e138cb593d5a2f70be848db4889aaa8da88;hp=32d2eb4d997fce68b98497025c4246695494e5c9;hpb=9c582d802e641b2b6d27271310fc16898020b470;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/layout/create_home_screen_shortcut_dialog.xml b/app/src/main/res/layout/create_home_screen_shortcut_dialog.xml
index 32d2eb4d..aaadcd45 100644
--- a/app/src/main/res/layout/create_home_screen_shortcut_dialog.xml
+++ b/app/src/main/res/layout/create_home_screen_shortcut_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2019 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -18,26 +18,81 @@
   You should have received a copy of the GNU General Public License
   along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<RelativeLayout
-    android:id="@+id/create_home_screen_shortcut_dialog_relativelayout"
+<ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content" >
-
-    <!-- android:imeOptions="actionGo" sets the keyboard to have a "go" key instead of a "new line" key.
-        android:imeOptions=flagNoExtractUi" doesn't cover up the entire UI when typing in landscape orientation.
-        android:inputType="textUri" disables spell check in the EditText.
-        android:singleLine="true" is not needed in a Dialog.-->
-    <EditText
-        android:id="@+id/shortcut_name_edittext"
-        android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent" >
+
+    <LinearLayout
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginLeft="4dp"
-        android:layout_marginRight="4dp"
-        android:layout_marginBottom="16dp"
-        android:hint="@string/shortcut_name"
-        android:imeOptions="actionGo|flagNoExtractUi"
-        android:inputType="textUri" />
-
-</RelativeLayout>
\ No newline at end of file
+        android:layout_width="match_parent"
+        android:orientation="vertical" >
+
+        <!-- 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="16dp"
+            android:layout_marginBottom="4dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp" >
+
+            <!-- `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/shortcut_name_edittext"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/shortcut_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 `EditText`. -->
+        <com.google.android.material.textfield.TextInputLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp" >
+
+            <!-- `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/url_edittext"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/url"
+                android:imeOptions="actionGo"
+                android:inputType="textUri"
+                android:selectAllOnFocus="true" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <RadioGroup
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:layout_marginBottom="2dp"
+            android:layout_marginStart="6dp"
+            android:layout_marginEnd="6dp"
+            android:checkedButton="@+id/open_with_default_browser_radiobutton" >
+
+            <RadioButton
+                android:id="@id/open_with_default_browser_radiobutton"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:text="@string/open_with_default_browser"
+                android:textSize="18sp"
+                android:textColor="?android:textColorPrimary" />
+
+            <RadioButton
+                android:id="@+id/open_with_privacy_browser_radiobutton"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginTop="4dp"
+                android:text="@string/open_with_privacy_browser"
+                android:textSize="18sp"
+                android:textColor="?android:textColorPrimary" />
+        </RadioGroup>
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file