diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/activity_ssh_keygen.xml | 53 | ||||
| -rw-r--r-- | app/src/main/res/layout/folder_dialog_fragment.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_show_ssh_key.xml | 32 | ||||
| -rw-r--r-- | app/src/main/res/layout/git_credential_layout.xml | 2 |
4 files changed, 21 insertions, 68 deletions
diff --git a/app/src/main/res/layout/activity_ssh_keygen.xml b/app/src/main/res/layout/activity_ssh_keygen.xml index 6ec3f2fb..17180f06 100644 --- a/app/src/main/res/layout/activity_ssh_keygen.xml +++ b/app/src/main/res/layout/activity_ssh_keygen.xml @@ -13,16 +13,11 @@ android:layout_height="wrap_content" android:orientation="vertical" android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/activity_vertical_margin" android:paddingRight="@dimen/activity_horizontal_margin"> - <androidx.appcompat.widget.AppCompatTextView - android:layout_width="wrap_content" - android:layout_height="48dp" - android:gravity="center_vertical" - android:text="@string/ssh_keygen_length" /> - <com.google.android.material.button.MaterialButtonToggleGroup - android:id="@+id/key_length_group" + android:id="@+id/key_type_group" style="@style/TextAppearance.MaterialComponents.Headline1" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -30,48 +25,38 @@ app:singleSelection="true"> <com.google.android.material.button.MaterialButton - android:id="@+id/key_length_2048" + android:id="@+id/key_type_rsa" + style="?attr/materialButtonOutlinedStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/ssh_keygen_label_rsa" /> + + <com.google.android.material.button.MaterialButton + android:id="@+id/key_type_ecdsa" style="?attr/materialButtonOutlinedStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/key_length_2048" /> + android:text="@string/ssh_keygen_label_ecdsa" /> <com.google.android.material.button.MaterialButton - android:id="@+id/key_length_4096" + android:id="@+id/key_type_ed25519" style="?attr/materialButtonOutlinedStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/key_length_4096" /> + android:text="@string/ssh_keygen_label_ed25519" /> </com.google.android.material.button.MaterialButtonToggleGroup> - <com.google.android.material.textfield.TextInputLayout + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/key_type_explanation" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:hint="@string/ssh_keygen_passphrase" - app:endIconMode="password_toggle"> - - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/passphrase" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:fontFamily="@font/sourcecodepro" - android:importantForAccessibility="no" - android:inputType="textPassword" /> - </com.google.android.material.textfield.TextInputLayout> + android:paddingTop="8dp" /> - <com.google.android.material.textfield.TextInputLayout + <com.google.android.material.checkbox.MaterialCheckBox + android:id="@+id/key_require_authentication" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:hint="@string/ssh_keygen_comment"> - - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/comment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="text" /> - </com.google.android.material.textfield.TextInputLayout> + android:text="@string/ssh_keygen_require_authentication" /> <com.google.android.material.button.MaterialButton android:id="@+id/generate" diff --git a/app/src/main/res/layout/folder_dialog_fragment.xml b/app/src/main/res/layout/folder_dialog_fragment.xml index e426af53..521dacb1 100644 --- a/app/src/main/res/layout/folder_dialog_fragment.xml +++ b/app/src/main/res/layout/folder_dialog_fragment.xml @@ -31,7 +31,7 @@ android:id="@+id/set_gpg_key" android:layout_width="0dp" android:layout_height="wrap_content" - app:layout_constraintEnd_toEndOf="parent" android:text="@string/new_folder_set_gpg_key" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/folder_name_container" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/fragment_show_ssh_key.xml b/app/src/main/res/layout/fragment_show_ssh_key.xml deleted file mode 100644 index a933759e..00000000 --- a/app/src/main/res/layout/fragment_show_ssh_key.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?><!-- - ~ Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved. - ~ SPDX-License-Identifier: GPL-3.0-only - --> - -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingLeft="24dp" - android:paddingTop="20dp" - android:paddingRight="24dp" - android:paddingBottom="20dp"> - - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/public_key" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textIsSelectable="true" /> - - <androidx.appcompat.widget.AppCompatTextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/ssh_keygen_tip" - android:textSize="16sp" /> - - </LinearLayout> -</ScrollView> diff --git a/app/src/main/res/layout/git_credential_layout.xml b/app/src/main/res/layout/git_credential_layout.xml index 180b904a..3e520bf1 100644 --- a/app/src/main/res/layout/git_credential_layout.xml +++ b/app/src/main/res/layout/git_credential_layout.xml @@ -14,8 +14,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" app:endIconMode="password_toggle" - app:hintEnabled="true" app:errorEnabled="true" + app:hintEnabled="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> |