aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorAlex Ning <chineseperson5@gmail.com>2020-09-18 16:07:41 +0000
committerAlex Ning <chineseperson5@gmail.com>2020-09-18 16:07:41 +0000
commitbf906b8a6cc81423edf681efe2218e1689816855 (patch)
treeea989a4b35ce71e325be8fbb34deea1e1fdf7f58 /app/src/main/res
parent8a999a04c372311bed0f3d890a42e387969e2954 (diff)
downloadinfinity-for-reddit-bf906b8a6cc81423edf681efe2218e1689816855.tar
infinity-for-reddit-bf906b8a6cc81423edf681efe2218e1689816855.tar.gz
infinity-for-reddit-bf906b8a6cc81423edf681efe2218e1689816855.tar.bz2
infinity-for-reddit-bf906b8a6cc81423edf681efe2218e1689816855.tar.lz
infinity-for-reddit-bf906b8a6cc81423edf681efe2218e1689816855.tar.xz
infinity-for-reddit-bf906b8a6cc81423edf681efe2218e1689816855.tar.zst
infinity-for-reddit-bf906b8a6cc81423edf681efe2218e1689816855.zip
Hide Security option if no biometric authentication available. Require biometric authentication when going into security settings.
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/dialog_select_header.xml48
-rw-r--r--app/src/main/res/values/strings.xml9
-rw-r--r--app/src/main/res/xml/main_preferences.xml1
3 files changed, 35 insertions, 23 deletions
diff --git a/app/src/main/res/layout/dialog_select_header.xml b/app/src/main/res/layout/dialog_select_header.xml
index 14c68249..31d49a9f 100644
--- a/app/src/main/res/layout/dialog_select_header.xml
+++ b/app/src/main/res/layout/dialog_select_header.xml
@@ -1,37 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:paddingStart="16dp"
android:paddingEnd="16dp">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:text="@string/header6"
- android:textColor="?attr/primaryTextColor"
- android:textSize="?attr/font_default"
- android:fontFamily="?attr/font_family" />
-
- <SeekBar
+ <com.google.android.material.slider.Slider
android:id="@+id/seek_bar_dialog_select_header"
- android:layout_width="0dp"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:padding="16dp"
- android:max="5"
- android:theme="@style/Widget.AppCompat.SeekBar.Discrete" />
+ android:valueFrom="1"
+ android:valueTo="6"
+ android:stepSize="1"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:text="@string/header1"
+ android:layout_gravity="start"
+ android:text="@string/large"
+ android:textColor="?attr/primaryTextColor"
+ android:textSize="?attr/font_default"
+ android:fontFamily="?attr/font_family"
+ app:layout_constraintTop_toBottomOf="@+id/seek_bar_dialog_select_header"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="end"
+ android:text="@string/small"
android:textColor="?attr/primaryTextColor"
android:textSize="?attr/font_default"
- android:fontFamily="?attr/font_family" />
+ android:fontFamily="?attr/font_family"
+ app:layout_constraintTop_toBottomOf="@+id/seek_bar_dialog_select_header"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent" />
-</LinearLayout> \ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 337f759d..6020561e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -859,17 +859,18 @@
<string name="view_full_comment_markdown">View Full Markdown</string>
- <string name="unlock_account_section">Unlock Account Section</string>
-
<string name="select_user_flair_success">User flair selected</string>
<string name="select_user_flair_failed">Cannot select user flair</string>
<string name="select_this_user_flair">Select this user flair?</string>
<string name="select_header_size">Select Header Size</string>
- <string name="header1">H1</string>
- <string name="header6">H6</string>
+ <string name="large">Large</string>
+ <string name="small">Small</string>
<string name="insert_link">Insert Link</string>
<string name="text_hint">Text</string>
<string name="link_hint">Link</string>
+ <string name="unlock_account_section">Unlock Account Section</string>
+ <string name="unlock">Unlock</string>
+
</resources>
diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
index 48bf5697..f2990908 100644
--- a/app/src/main/res/xml/main_preferences.xml
+++ b/app/src/main/res/xml/main_preferences.xml
@@ -42,6 +42,7 @@
app:fragment="ml.docilealligator.infinityforreddit.Settings.DownloadLocationPreferenceFragment" />
<Preference
+ app:key="security"
app:title="@string/settings_security_title"
android:icon="@drawable/ic_security_24dp"
app:fragment="ml.docilealligator.infinityforreddit.Settings.SecurityPreferenceFragment" />