<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ Copyright © 2016-2017,2019-2022 Soren Stoutner <soren@stoutner.com>.
- This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+ This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
- Privacy Browser is free software: you can redistribute it and/or modify
+ Privacy Browser Android is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
- Privacy Browser is distributed in the hope that it will be useful,
+ Privacy Browser Android is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Privacy Browser. If not, see <http://www.gnu.org/licenses/>. -->
+ along with Privacy Browser Android. If not, see <http://www.gnu.org/licenses/>. -->
<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:tools="http://schemas.android.com/tools"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical" >
- <!-- The icon selection rows. -->
+ <!-- Current icon. -->
<LinearLayout
+ android:id="@+id/current_icon_linearlayout"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:orientation="horizontal" >
+ android:orientation="horizontal"
+ android:layout_marginTop="12dp"
+ android:layout_marginBottom="6dp" >
- <!-- The column displaying the icons. -->
- <LinearLayout
+ <RadioButton
+ android:id="@+id/current_icon_radiobutton"
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_gravity="center_vertical"
+ android:checked="true" />
+
+ <ImageView
+ android:id="@+id/current_icon_imageview"
+ android:layout_width="30dp"
+ android:layout_height="30dp"
+ android:layout_gravity="center_vertical"
+ tools:ignore="ContentDescription" />
+
+ <TextView
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="?attr/primaryTextColorSelector" />
-
- <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="?attr/primaryTextColorSelector" />
- </RadioGroup>
+ android:layout_width="wrap_content"
+ android:layout_marginStart="7dp"
+ android:layout_gravity="center_vertical"
+ android:text="@string/current_bookmark_icon"
+ android:textSize="18sp"
+ android:textColor="?android:textColorPrimary" />
+ </LinearLayout>
+
+ <!-- Webpage favorite icon. -->
+ <LinearLayout
+ android:id="@+id/webpage_favorite_icon_linearlayout"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:orientation="horizontal"
+ android:layout_marginTop="6dp"
+ android:layout_marginBottom="6dp" >
+
+ <RadioButton
+ android:id="@+id/webpage_favorite_icon_radiobutton"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_gravity="center_vertical" />
+
+ <ImageView
+ android:id="@+id/webpage_favorite_icon_imageview"
+ android:layout_height="30dp"
+ android:layout_width="30dp"
+ android:layout_gravity="center_vertical"
+ tools:ignore="ContentDescription" />
+
+ <TextView
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_marginStart="7dp"
+ android:layout_gravity="center_vertical"
+ android:text="@string/webpage_favorite_icon"
+ android:textSize="18sp"
+ android:textColor="?android:textColorPrimary" />
</LinearLayout>
- <!-- `android.support.design.widget.TextInputLayout` makes the `android:hint` float above the `EditText`. -->
- <android.support.design.widget.TextInputLayout
+ <!-- The text input layout 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:layout_marginTop="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_bookmark_name_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/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" />
- </android.support.design.widget.TextInputLayout>
+ </com.google.android.material.textfield.TextInputLayout>
- <!-- `android.support.design.widget.TextInputLayout` makes the `android:hint` float above the `EditText`. -->
- <android.support.design.widget.TextInputLayout
+ <!-- The text input layout 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: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`. -->
- <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/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" />
- </android.support.design.widget.TextInputLayout>
+ </com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</ScrollView>
\ No newline at end of file
projects / PrivacyBrowserAndroid.git / blobdiff