浏览代码

Merge pull request #7338 from nextcloud/passwordSnackbar

show snackbar when entering wrong passcode
Andy Scherzinger 4 年之前
父节点
当前提交
c3acfc9de8
共有 1 个文件被更改,包括 68 次插入66 次删除
  1. 68 66
      src/main/res/layout/passcodelock.xml

+ 68 - 66
src/main/res/layout/passcodelock.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
@@ -17,83 +16,86 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
 
     android:gravity="center_horizontal"
-    android:orientation="vertical"
     android:padding="@dimen/standard_padding">
 
-    <TextView
-        android:id="@+id/header"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/pass_code_enter_pass_code"
-        android:textColor="@color/text_color"
-        android:gravity="center_horizontal"
-        android:textSize="@dimen/two_line_primary_text_size"
-         />
+        android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/explanation"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/pass_code_configure_your_pass_code_explanation"
-        android:textAppearance="@android:style/TextAppearance.Small"
-        android:gravity="center_horizontal"
-        android:textSize="@dimen/two_line_secondary_text_size"
-         />
+        <TextView
+            android:id="@+id/header"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/pass_code_enter_pass_code"
+            android:textColor="@color/text_color"
+            android:textSize="@dimen/two_line_primary_text_size" />
 
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal" >
+        <TextView
+            android:id="@+id/explanation"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/pass_code_configure_your_pass_code_explanation"
+            android:textAppearance="@android:style/TextAppearance.Small"
+            android:textSize="@dimen/two_line_secondary_text_size" />
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/txt0"
-            android:focusable="true"
-            style="@style/PassCodeStyle"
-            android:cursorVisible="true"
-            android:textCursorDrawable="@color/primary"
-            android:imeOptions="flagNoExtractUi"
-            android:importantForAutofill="no"
-            android:hint="@string/hidden_character">
-            <requestFocus/>
-        </com.google.android.material.textfield.TextInputEditText>
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal">
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/txt1"
-            style="@style/PassCodeStyle"
-            android:cursorVisible="true"
-            android:imeOptions="flagNoExtractUi"
-            android:importantForAutofill="no"
-            android:hint="@string/hidden_character" />
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/txt0"
+                style="@style/PassCodeStyle"
+                android:cursorVisible="true"
+                android:focusable="true"
+                android:hint="@string/hidden_character"
+                android:imeOptions="flagNoExtractUi"
+                android:importantForAutofill="no"
+                android:textCursorDrawable="@color/primary">
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/txt2"
-            style="@style/PassCodeStyle"
-            android:cursorVisible="true"
-            android:imeOptions="flagNoExtractUi"
-            android:importantForAutofill="no"
-            android:hint="@string/hidden_character" />
+                <requestFocus />
+            </com.google.android.material.textfield.TextInputEditText>
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/txt3"
-            style="@style/PassCodeStyle"
-            android:cursorVisible="true"
-            android:imeOptions="flagNoExtractUi"
-            android:importantForAutofill="no"
-            android:hint="@string/hidden_character" />
-    </LinearLayout>
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/txt1"
+                style="@style/PassCodeStyle"
+                android:cursorVisible="true"
+                android:hint="@string/hidden_character"
+                android:imeOptions="flagNoExtractUi"
+                android:importantForAutofill="no" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/cancel"
-        android:theme="@style/Button.Primary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/common_cancel"
-        app:cornerRadius="@dimen/button_corner_radius" />
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/txt2"
+                style="@style/PassCodeStyle"
+                android:cursorVisible="true"
+                android:hint="@string/hidden_character"
+                android:imeOptions="flagNoExtractUi"
+                android:importantForAutofill="no" />
 
-</LinearLayout>
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/txt3"
+                style="@style/PassCodeStyle"
+                android:cursorVisible="true"
+                android:hint="@string/hidden_character"
+                android:imeOptions="flagNoExtractUi"
+                android:importantForAutofill="no" />
+        </LinearLayout>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/common_cancel"
+            android:theme="@style/Button.Primary"
+            app:cornerRadius="@dimen/button_corner_radius" />
+    </LinearLayout>
+</ScrollView>