From 041cf00510a75042223d1857660fc7f1dff958ef Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 10 May 2020 19:21:39 +0530 Subject: Treewide codestyle cleanup (#765) - Updated gitignore and checked in the IDE's codestyle config - Removed spotless as the underlying ktlint backend has failed to resolve the super frustrating import order bug[1] in nearly a year - Reformat the entire codebase based on the previously committed code style configuration. 1: https://github.com/pinterest/ktlint/issues/527 --- app/src/main/res/anim/scale_down.xml | 2 +- app/src/main/res/anim/scale_up.xml | 2 +- app/src/main/res/color/toggle_button_selector.xml | 3 +- app/src/main/res/drawable/ic_action_new_folder.xml | 6 +- .../main/res/drawable/ic_action_new_password.xml | 6 +- .../main/res/drawable/ic_action_secure_24dp.xml | 10 ++-- app/src/main/res/drawable/ic_add_white_48dp.xml | 6 +- .../main/res/drawable/ic_autofill_new_password.xml | 6 +- app/src/main/res/drawable/ic_clear_white_24dp.xml | 6 +- app/src/main/res/drawable/ic_content_copy.xml | 6 +- .../res/drawable/ic_content_copy_white_24dp.xml | 6 +- app/src/main/res/drawable/ic_delete_white_24dp.xml | 6 +- app/src/main/res/drawable/ic_done_white_24dp.xml | 6 +- app/src/main/res/drawable/ic_edit_white_24dp.xml | 6 +- .../res/drawable/ic_keyboard_arrow_right_24dp.xml | 10 ++-- .../main/res/drawable/ic_launcher_foreground.xml | 37 ++++++------ .../res/drawable/ic_move_folder_white_24dp.xml | 6 +- .../main/res/drawable/ic_multiple_files_24dp.xml | 10 ++-- app/src/main/res/drawable/ic_person_black_24dp.xml | 10 ++-- .../main/res/drawable/ic_save_copy_white_24dp.xml | 6 +- app/src/main/res/drawable/ic_save_white_24dp.xml | 6 +- app/src/main/res/drawable/ic_search_black_24dp.xml | 10 ++-- app/src/main/res/drawable/ic_search_white_24dp.xml | 6 +- app/src/main/res/drawable/ic_share_white_24dp.xml | 6 +- app/src/main/res/drawable/ic_warning_red_24dp.xml | 10 ++-- .../main/res/drawable/password_row_background.xml | 19 ++++--- app/src/main/res/layout/activity_git_clone.xml | 55 +++++++++--------- app/src/main/res/layout/activity_git_config.xml | 30 +++++----- .../res/layout/activity_oreo_autofill_filter.xml | 7 ++- app/src/main/res/layout/activity_pwdstore.xml | 6 +- app/src/main/res/layout/autofill_instructions.xml | 20 +++---- app/src/main/res/layout/autofill_recycler_view.xml | 26 ++++----- app/src/main/res/layout/autofill_row_layout.xml | 50 ++++++++-------- app/src/main/res/layout/decrypt_layout.xml | 66 +++++++++++----------- app/src/main/res/layout/encrypt_layout.xml | 34 +++++------ .../res/layout/folder_creation_dialog_fragment.xml | 6 +- app/src/main/res/layout/fragment_autofill.xml | 16 +++--- app/src/main/res/layout/fragment_pwgen.xml | 4 +- app/src/main/res/layout/fragment_show_ssh_key.xml | 4 +- app/src/main/res/layout/fragment_ssh_keygen.xml | 6 +- .../main/res/layout/fragment_to_clone_or_not.xml | 33 ++++++----- app/src/main/res/layout/fragment_xkpwgen.xml | 24 ++++---- app/src/main/res/layout/git_passphrase_layout.xml | 1 + app/src/main/res/layout/item_create_sheet.xml | 17 +++--- app/src/main/res/layout/oreo_autofill_dataset.xml | 2 +- .../main/res/layout/oreo_autofill_instructions.xml | 16 +++--- app/src/main/res/layout/otp_confirm_layout.xml | 2 +- app/src/main/res/layout/password_recycler_view.xml | 13 ++--- app/src/main/res/layout/password_row_layout.xml | 12 ++-- app/src/main/res/layout/select_folder_layout.xml | 7 ++- app/src/main/res/menu/autofill_preference.xml | 8 +-- app/src/main/res/menu/git_clone.xml | 9 +-- app/src/main/res/menu/main_menu_git.xml | 29 ++++++---- app/src/main/res/menu/main_menu_no_auth.xml | 25 ++++---- app/src/main/res/menu/main_menu_non_git.xml | 20 ++++--- app/src/main/res/menu/pgp_handler.xml | 28 ++++----- app/src/main/res/menu/pgp_handler_new_password.xml | 28 ++++----- .../main/res/menu/pgp_handler_select_folder.xml | 12 ++-- app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 4 +- .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 4 +- app/src/main/res/values-ar/strings.xml | 2 +- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/attrs.xml | 2 +- app/src/main/res/values/styles.xml | 4 +- app/src/main/res/xml/autofill_config.xml | 15 +++-- app/src/main/res/xml/preference.xml | 58 +++++++++---------- 72 files changed, 474 insertions(+), 458 deletions(-) (limited to 'app/src/main/res') diff --git a/app/src/main/res/anim/scale_down.xml b/app/src/main/res/anim/scale_down.xml index b6ece430..3d574180 100644 --- a/app/src/main/res/anim/scale_down.xml +++ b/app/src/main/res/anim/scale_down.xml @@ -1,5 +1,5 @@ - + - + - + diff --git a/app/src/main/res/drawable/ic_action_new_folder.xml b/app/src/main/res/drawable/ic_action_new_folder.xml index 44666001..99e306a0 100644 --- a/app/src/main/res/drawable/ic_action_new_folder.xml +++ b/app/src/main/res/drawable/ic_action_new_folder.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_action_new_password.xml b/app/src/main/res/drawable/ic_action_new_password.xml index 38350bd3..4ccd0dc9 100644 --- a/app/src/main/res/drawable/ic_action_new_password.xml +++ b/app/src/main/res/drawable/ic_action_new_password.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_action_secure_24dp.xml b/app/src/main/res/drawable/ic_action_secure_24dp.xml index ec7b4c21..8d6bfabf 100644 --- a/app/src/main/res/drawable/ic_action_secure_24dp.xml +++ b/app/src/main/res/drawable/ic_action_secure_24dp.xml @@ -1,10 +1,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_add_white_48dp.xml b/app/src/main/res/drawable/ic_add_white_48dp.xml index fe734cc1..76c77217 100644 --- a/app/src/main/res/drawable/ic_add_white_48dp.xml +++ b/app/src/main/res/drawable/ic_add_white_48dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_autofill_new_password.xml b/app/src/main/res/drawable/ic_autofill_new_password.xml index 958de190..e4426a93 100644 --- a/app/src/main/res/drawable/ic_autofill_new_password.xml +++ b/app/src/main/res/drawable/ic_autofill_new_password.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_clear_white_24dp.xml b/app/src/main/res/drawable/ic_clear_white_24dp.xml index 24b2e1c6..644238d0 100644 --- a/app/src/main/res/drawable/ic_clear_white_24dp.xml +++ b/app/src/main/res/drawable/ic_clear_white_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_content_copy.xml b/app/src/main/res/drawable/ic_content_copy.xml index 1c426554..a4ef6408 100644 --- a/app/src/main/res/drawable/ic_content_copy.xml +++ b/app/src/main/res/drawable/ic_content_copy.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_content_copy_white_24dp.xml b/app/src/main/res/drawable/ic_content_copy_white_24dp.xml index 45a8b864..ecae410f 100644 --- a/app/src/main/res/drawable/ic_content_copy_white_24dp.xml +++ b/app/src/main/res/drawable/ic_content_copy_white_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_delete_white_24dp.xml b/app/src/main/res/drawable/ic_delete_white_24dp.xml index 2ca348f9..869f6347 100644 --- a/app/src/main/res/drawable/ic_delete_white_24dp.xml +++ b/app/src/main/res/drawable/ic_delete_white_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_done_white_24dp.xml b/app/src/main/res/drawable/ic_done_white_24dp.xml index 1f17bd43..436553a0 100644 --- a/app/src/main/res/drawable/ic_done_white_24dp.xml +++ b/app/src/main/res/drawable/ic_done_white_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_edit_white_24dp.xml b/app/src/main/res/drawable/ic_edit_white_24dp.xml index 7f32de65..a0af4c84 100644 --- a/app/src/main/res/drawable/ic_edit_white_24dp.xml +++ b/app/src/main/res/drawable/ic_edit_white_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_right_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_right_24dp.xml index ede2c488..2a2bfe9b 100644 --- a/app/src/main/res/drawable/ic_keyboard_arrow_right_24dp.xml +++ b/app/src/main/res/drawable/ic_keyboard_arrow_right_24dp.xml @@ -1,10 +1,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index 4072a948..037467fb 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -3,23 +3,24 @@ android:height="108dp" android:viewportWidth="110.34687" android:viewportHeight="110.34687"> - - - - - + + + + + diff --git a/app/src/main/res/drawable/ic_move_folder_white_24dp.xml b/app/src/main/res/drawable/ic_move_folder_white_24dp.xml index 2849e158..dcc65e6b 100644 --- a/app/src/main/res/drawable/ic_move_folder_white_24dp.xml +++ b/app/src/main/res/drawable/ic_move_folder_white_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_multiple_files_24dp.xml b/app/src/main/res/drawable/ic_multiple_files_24dp.xml index a504b9cc..1894abbf 100644 --- a/app/src/main/res/drawable/ic_multiple_files_24dp.xml +++ b/app/src/main/res/drawable/ic_multiple_files_24dp.xml @@ -1,10 +1,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_person_black_24dp.xml b/app/src/main/res/drawable/ic_person_black_24dp.xml index b2cb337b..55495d5a 100644 --- a/app/src/main/res/drawable/ic_person_black_24dp.xml +++ b/app/src/main/res/drawable/ic_person_black_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" /> diff --git a/app/src/main/res/drawable/ic_save_copy_white_24dp.xml b/app/src/main/res/drawable/ic_save_copy_white_24dp.xml index 53465e16..224ffd6b 100644 --- a/app/src/main/res/drawable/ic_save_copy_white_24dp.xml +++ b/app/src/main/res/drawable/ic_save_copy_white_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_save_white_24dp.xml b/app/src/main/res/drawable/ic_save_white_24dp.xml index cac6eef4..721f1629 100644 --- a/app/src/main/res/drawable/ic_save_white_24dp.xml +++ b/app/src/main/res/drawable/ic_save_white_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_search_black_24dp.xml b/app/src/main/res/drawable/ic_search_black_24dp.xml index affc7ba2..d23ea57f 100644 --- a/app/src/main/res/drawable/ic_search_black_24dp.xml +++ b/app/src/main/res/drawable/ic_search_black_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" /> diff --git a/app/src/main/res/drawable/ic_search_white_24dp.xml b/app/src/main/res/drawable/ic_search_white_24dp.xml index 6a5ca808..54f8c20e 100644 --- a/app/src/main/res/drawable/ic_search_white_24dp.xml +++ b/app/src/main/res/drawable/ic_search_white_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_share_white_24dp.xml b/app/src/main/res/drawable/ic_share_white_24dp.xml index cbe3d4aa..e22fc850 100644 --- a/app/src/main/res/drawable/ic_share_white_24dp.xml +++ b/app/src/main/res/drawable/ic_share_white_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_warning_red_24dp.xml b/app/src/main/res/drawable/ic_warning_red_24dp.xml index cea44306..6b60ad67 100644 --- a/app/src/main/res/drawable/ic_warning_red_24dp.xml +++ b/app/src/main/res/drawable/ic_warning_red_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z" /> diff --git a/app/src/main/res/drawable/password_row_background.xml b/app/src/main/res/drawable/password_row_background.xml index 51f14173..c7fb2949 100644 --- a/app/src/main/res/drawable/password_row_background.xml +++ b/app/src/main/res/drawable/password_row_background.xml @@ -1,14 +1,15 @@ - - - - - - - - - + + + + + + + diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml index d4113cd6..9249ffbf 100644 --- a/app/src/main/res/layout/activity_git_clone.xml +++ b/app/src/main/res/layout/activity_git_clone.xml @@ -3,44 +3,44 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="?android:attr/windowBackground" android:padding="@dimen/activity_horizontal_margin" - tools:context="com.zeapo.pwdstore.git.GitOperationActivity" - android:background="?android:attr/windowBackground"> + tools:context="com.zeapo.pwdstore.git.GitOperationActivity"> + android:text="@string/server_protocol" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/server_label" /> @@ -61,11 +61,12 @@ + + app:layout_constraintTop_toBottomOf="@id/server_user_layout"> @@ -97,10 +98,10 @@ android:layout_height="wrap_content" android:layout_margin="8dp" android:hint="@string/server_port_hint" - app:layout_constraintStart_toEndOf="@id/label_server_url" - app:layout_constraintTop_toBottomOf="@id/server_user_layout" + app:layout_constraintDimensionRatio="1:0.8" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintDimensionRatio="1:0.8"> + app:layout_constraintStart_toEndOf="@id/label_server_url" + app:layout_constraintTop_toBottomOf="@id/server_user_layout"> + android:inputType="textWebEmailAddress" /> @@ -144,8 +145,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - app:layout_constraintTop_toBottomOf="@id/label_connection_mode" - app:layout_constraintStart_toStartOf="parent"> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/label_connection_mode"> + android:text="@string/crypto_save" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/connection_mode_group" /> diff --git a/app/src/main/res/layout/activity_git_config.xml b/app/src/main/res/layout/activity_git_config.xml index e9d769b8..ec6ff7a1 100644 --- a/app/src/main/res/layout/activity_git_config.xml +++ b/app/src/main/res/layout/activity_git_config.xml @@ -3,8 +3,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:padding="@dimen/activity_horizontal_margin" android:background="?android:attr/windowBackground" + android:padding="@dimen/activity_horizontal_margin" tools:context="com.zeapo.pwdstore.git.GitConfigActivity" tools:layout_editor_absoluteX="0dp" tools:layout_editor_absoluteY="81dp"> @@ -15,8 +15,8 @@ android:layout_height="wrap_content" android:layout_margin="8dp" android:hint="@string/git_user_name_hint" - app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" tools:layout_editor_absoluteY="64dp"> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/username_input_layout"> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/email_input_layout" /> + android:textSize="24sp" + android:textStyle="bold" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/save_button" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/git_tools_title" /> + app:layout_constraintTop_toBottomOf="@id/git_tools_title" + tools:text="HASH" /> + + app:layout_constraintTop_toBottomOf="@id/searchLayout"> + tools:text="Phishing-resistant search" /> + android:orientation="vertical" + tools:context=".PasswordStore"> + android:orientation="vertical" /> diff --git a/app/src/main/res/layout/autofill_instructions.xml b/app/src/main/res/layout/autofill_instructions.xml index e7cf3dd1..4193c4b9 100644 --- a/app/src/main/res/layout/autofill_instructions.xml +++ b/app/src/main/res/layout/autofill_instructions.xml @@ -7,10 +7,10 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingBottom="20dp" android:paddingLeft="24dp" + android:paddingTop="20dp" android:paddingRight="24dp" - android:paddingTop="20dp"> + android:paddingBottom="20dp"> + android:contentDescription="@string/autofill_ins_1_hint" + android:src="@drawable/autofill_ins_1" /> + android:contentDescription="@string/autofill_ins_2_hint" + android:src="@drawable/autofill_ins_2" /> + android:layout_marginBottom="8dp" + android:contentDescription="@string/autofill_ins_3_hint" + android:src="@drawable/autofill_ins_3" /> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent"> + tools:itemCount="20" + tools:listitem="@layout/autofill_row_layout" /> + app:elevation="6dp" + app:pressedTranslationZ="12dp" + app:rippleColor="?attr/colorSecondary" /> diff --git a/app/src/main/res/layout/autofill_row_layout.xml b/app/src/main/res/layout/autofill_row_layout.xml index acdeed6b..56a72854 100644 --- a/app/src/main/res/layout/autofill_row_layout.xml +++ b/app/src/main/res/layout/autofill_row_layout.xml @@ -1,37 +1,37 @@ - + android:paddingRight="@dimen/activity_horizontal_margin"> - + - + - + - - + + diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml index 71566178..1c0c9b35 100644 --- a/app/src/main/res/layout/decrypt_layout.xml +++ b/app/src/main/res/layout/decrypt_layout.xml @@ -1,9 +1,9 @@ @@ -58,8 +58,8 @@ android:id="@+id/divider" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="16dp" android:layout_marginTop="16dp" + android:layout_marginBottom="16dp" android:src="@drawable/divider" app:layout_constraintTop_toBottomOf="@id/crypto_password_last_changed" tools:ignore="ContentDescription" /> @@ -70,8 +70,8 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/activity_vertical_margin" android:visibility="invisible" - tools:visibility="visible" - app:layout_constraintTop_toBottomOf="@id/divider"> + app:layout_constraintTop_toBottomOf="@id/divider" + tools:visibility="visible"> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintStart_toEndOf="@id/crypto_password_show_label" /> @@ -116,15 +116,15 @@ android:id="@+id/crypto_copy_username" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" android:layout_alignParentTop="true" + android:layout_alignParentEnd="true" android:background="?android:attr/windowBackground" android:contentDescription="@string/copy_username" android:src="@drawable/ic_content_copy" android:visibility="invisible" - app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toEndOf="parent" - tools:visibility="visible"/> + app:layout_constraintTop_toTopOf="parent" + tools:visibility="visible" /> + tools:visibility="visible" /> + app:layout_constraintTop_toBottomOf="@id/crypto_username_show_label" + tools:visibility="visible" /> + app:layout_constraintTop_toTopOf="@id/crypto_otp_show_label" + tools:visibility="visible" /> + app:layout_constraintTop_toBottomOf="@id/crypto_username_show" /> + android:typeface="monospace" + app:layout_constraintTop_toBottomOf="@id/crypto_otp_show_label" /> + app:layout_constraintTop_toBottomOf="@id/crypto_otp_show" /> + android:typeface="monospace" + app:layout_constraintTop_toBottomOf="@id/crypto_extra_show_label" /> + app:layout_constraintTop_toBottomOf="@id/crypto_extra_show" /> diff --git a/app/src/main/res/layout/encrypt_layout.xml b/app/src/main/res/layout/encrypt_layout.xml index 3b0b8068..bab1214e 100644 --- a/app/src/main/res/layout/encrypt_layout.xml +++ b/app/src/main/res/layout/encrypt_layout.xml @@ -1,9 +1,9 @@ + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/crypto_password_category"> + + android:layout_height="wrap_content" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/name_input_layout"> + + android:layout_height="wrap_content" + android:inputType="textVisiblePassword" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/password_input_layout" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/generate_password"> + android:layout_height="wrap_content" + android:inputType="textMultiLine|textVisiblePassword" /> diff --git a/app/src/main/res/layout/folder_creation_dialog_fragment.xml b/app/src/main/res/layout/folder_creation_dialog_fragment.xml index 375b4a30..eaae3c60 100644 --- a/app/src/main/res/layout/folder_creation_dialog_fragment.xml +++ b/app/src/main/res/layout/folder_creation_dialog_fragment.xml @@ -1,7 +1,5 @@ - + android:inputType="textNoSuggestions|textVisiblePassword" /> diff --git a/app/src/main/res/layout/fragment_autofill.xml b/app/src/main/res/layout/fragment_autofill.xml index 21a9d95a..713c8ba5 100644 --- a/app/src/main/res/layout/fragment_autofill.xml +++ b/app/src/main/res/layout/fragment_autofill.xml @@ -1,25 +1,25 @@ + android:paddingBottom="20dp"> + + android:inputType="textUri" /> + android:layout_weight="1" /> + android:text="@string/autofill_apps_never" /> diff --git a/app/src/main/res/layout/fragment_pwgen.xml b/app/src/main/res/layout/fragment_pwgen.xml index df01c62e..6510c006 100644 --- a/app/src/main/res/layout/fragment_pwgen.xml +++ b/app/src/main/res/layout/fragment_pwgen.xml @@ -7,10 +7,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingBottom="20dp" android:paddingLeft="24dp" - android:paddingRight="24dp" android:paddingTop="20dp" + android:paddingRight="24dp" + android:paddingBottom="20dp" tools:context=".MainActivityFragment"> + android:paddingBottom="20dp"> + + diff --git a/app/src/main/res/layout/fragment_to_clone_or_not.xml b/app/src/main/res/layout/fragment_to_clone_or_not.xml index 5aa94e8a..80b5e7b5 100644 --- a/app/src/main/res/layout/fragment_to_clone_or_not.xml +++ b/app/src/main/res/layout/fragment_to_clone_or_not.xml @@ -1,8 +1,7 @@ @@ -11,37 +10,37 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:src="@mipmap/ic_launcher" android:contentDescription="@string/app_icon_hint" - app:layout_constraintTop_toTopOf="parent" + android:src="@mipmap/ic_launcher" app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent" /> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@+id/app_icon" /> @@ -49,13 +48,13 @@ android:id="@+id/use_local_directory" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="48dp" android:onClick="createNewRepository" android:text="@string/initialize" android:textSize="12sp" - android:layout_marginTop="48dp" - app:layout_constraintTop_toBottomOf="@id/app_name" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent" /> + app:layout_constraintTop_toBottomOf="@id/app_name" /> + app:layout_constraintTop_toBottomOf="@id/use_local_directory" /> diff --git a/app/src/main/res/layout/fragment_xkpwgen.xml b/app/src/main/res/layout/fragment_xkpwgen.xml index 6e9ebd29..c6b03445 100644 --- a/app/src/main/res/layout/fragment_xkpwgen.xml +++ b/app/src/main/res/layout/fragment_xkpwgen.xml @@ -49,19 +49,19 @@ + android:text="@string/xkpwgen_numbers" /> @@ -73,19 +73,19 @@ + android:text="@string/xkpwgen_symbols" /> @@ -116,9 +116,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" - android:maxLength="2" android:ems="10" - android:inputType="number" /> + android:inputType="number" + android:maxLength="2" /> diff --git a/app/src/main/res/layout/git_passphrase_layout.xml b/app/src/main/res/layout/git_passphrase_layout.xml index c0922471..27c52412 100644 --- a/app/src/main/res/layout/git_passphrase_layout.xml +++ b/app/src/main/res/layout/git_passphrase_layout.xml @@ -13,6 +13,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> + - diff --git a/app/src/main/res/layout/oreo_autofill_dataset.xml b/app/src/main/res/layout/oreo_autofill_dataset.xml index 4917347c..9176dc7d 100644 --- a/app/src/main/res/layout/oreo_autofill_dataset.xml +++ b/app/src/main/res/layout/oreo_autofill_dataset.xml @@ -12,13 +12,13 @@ + android:layout_height="match_parent"> + android:paddingBottom="20dp"> + android:textSize="16sp" + android:textStyle="bold" /> + android:textSize="16sp" + tools:text="Firefox: Fill and save credentials" /> diff --git a/app/src/main/res/layout/otp_confirm_layout.xml b/app/src/main/res/layout/otp_confirm_layout.xml index 4e6e777a..c94a9404 100644 --- a/app/src/main/res/layout/otp_confirm_layout.xml +++ b/app/src/main/res/layout/otp_confirm_layout.xml @@ -8,9 +8,9 @@ android:id="@+id/hotp_remember_checkbox" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginEnd="16dp" android:layout_marginStart="16dp" android:layout_marginTop="8dp" + android:layout_marginEnd="16dp" android:text="@string/dialog_update_check" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/password_recycler_view.xml b/app/src/main/res/layout/password_recycler_view.xml index 05707f04..2ee16478 100644 --- a/app/src/main/res/layout/password_recycler_view.xml +++ b/app/src/main/res/layout/password_recycler_view.xml @@ -1,13 +1,12 @@ - diff --git a/app/src/main/res/layout/password_row_layout.xml b/app/src/main/res/layout/password_row_layout.xml index 257b9d4c..72dc72bf 100644 --- a/app/src/main/res/layout/password_row_layout.xml +++ b/app/src/main/res/layout/password_row_layout.xml @@ -1,7 +1,7 @@ + app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/select_folder_layout.xml b/app/src/main/res/layout/select_folder_layout.xml index 1fd32853..b89b0943 100644 --- a/app/src/main/res/layout/select_folder_layout.xml +++ b/app/src/main/res/layout/select_folder_layout.xml @@ -1,11 +1,12 @@ + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + android:orientation="vertical" /> diff --git a/app/src/main/res/menu/autofill_preference.xml b/app/src/main/res/menu/autofill_preference.xml index ff184adc..6f516499 100644 --- a/app/src/main/res/menu/autofill_preference.xml +++ b/app/src/main/res/menu/autofill_preference.xml @@ -1,12 +1,12 @@ + xmlns:pwstore="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + tools:context=".pwdstore.autofill.AutofillPreferenceActivity"> + pwstore:showAsAction="ifRoom|collapseActionView" /> diff --git a/app/src/main/res/menu/git_clone.xml b/app/src/main/res/menu/git_clone.xml index d170cca8..9197996b 100644 --- a/app/src/main/res/menu/git_clone.xml +++ b/app/src/main/res/menu/git_clone.xml @@ -1,9 +1,10 @@ - + diff --git a/app/src/main/res/menu/main_menu_git.xml b/app/src/main/res/menu/main_menu_git.xml index 90989495..fd71cb15 100644 --- a/app/src/main/res/menu/main_menu_git.xml +++ b/app/src/main/res/menu/main_menu_git.xml @@ -1,26 +1,31 @@ - + android:title="@string/action_search" + app:actionViewClass="androidx.appcompat.widget.SearchView" + app:showAsAction="always|collapseActionView" /> - - - - - + diff --git a/app/src/main/res/menu/main_menu_no_auth.xml b/app/src/main/res/menu/main_menu_no_auth.xml index 9036c261..dac7fa3a 100644 --- a/app/src/main/res/menu/main_menu_no_auth.xml +++ b/app/src/main/res/menu/main_menu_no_auth.xml @@ -1,20 +1,23 @@ - + android:title="@string/action_search" + app:actionViewClass="androidx.appcompat.widget.SearchView" + app:showAsAction="always|collapseActionView" /> - + - - + diff --git a/app/src/main/res/menu/main_menu_non_git.xml b/app/src/main/res/menu/main_menu_non_git.xml index 7745b544..bb12b269 100644 --- a/app/src/main/res/menu/main_menu_non_git.xml +++ b/app/src/main/res/menu/main_menu_non_git.xml @@ -1,17 +1,19 @@ - + android:title="@string/action_search" + app:actionViewClass="androidx.appcompat.widget.SearchView" + app:showAsAction="always|collapseActionView" /> - - + diff --git a/app/src/main/res/menu/pgp_handler.xml b/app/src/main/res/menu/pgp_handler.xml index 755ee209..e00bec6d 100644 --- a/app/src/main/res/menu/pgp_handler.xml +++ b/app/src/main/res/menu/pgp_handler.xml @@ -1,20 +1,20 @@ - + - + - + + android:icon="@drawable/ic_edit_white_24dp" + android:title="@string/edit_password" + pwstore:showAsAction="ifRoom" /> diff --git a/app/src/main/res/menu/pgp_handler_new_password.xml b/app/src/main/res/menu/pgp_handler_new_password.xml index 6b110ba1..18ba3729 100644 --- a/app/src/main/res/menu/pgp_handler_new_password.xml +++ b/app/src/main/res/menu/pgp_handler_new_password.xml @@ -1,20 +1,20 @@ - + - + - + + android:icon="@drawable/ic_save_copy_white_24dp" + android:title="@string/crypto_save_and_copy" + pwstore:showAsAction="ifRoom" /> diff --git a/app/src/main/res/menu/pgp_handler_select_folder.xml b/app/src/main/res/menu/pgp_handler_select_folder.xml index a09c6b56..f278f5ae 100644 --- a/app/src/main/res/menu/pgp_handler_select_folder.xml +++ b/app/src/main/res/menu/pgp_handler_select_folder.xml @@ -1,11 +1,11 @@ - + + android:icon="@drawable/ic_done_white_24dp" + android:title="@string/crypto_select" + pwstore:showAsAction="ifRoom" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 5ed0a2df..a8a8fa55 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - - + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 5ed0a2df..a8a8fa55 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - - + + diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 133f96a5..50662965 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -130,4 +130,4 @@ إختر و طابق مع ... إلصاق كلمة السر الجديدة - + diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index d29e8f82..3da83d33 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -180,4 +180,4 @@ Nikdy nepárovat Smazat Failed to get last changed date - + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 372b3154..ce19d489 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -171,4 +171,4 @@ Bildschirmfoto des Schalters in Accessibility Services Bildschirmfoto von Autofill in Aktion Das Abrufen des letzten Änderungsdatums ist fehlgeschlagen. - + diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 1916cc83..12b48b8b 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -220,4 +220,4 @@ Username: Nombre de usuario\n… o algún contenido extra Error al obtener la fecha de último cambio Presiona copiar para calcular el HOTP - + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 3dad40e9..ba1bf538 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -220,4 +220,4 @@ nom d\'utilisateur: quelque chose d\'autre contenu supplémentaire Failed to get last changed date Appuyez sur copie pour calculer le HOTP - + diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c8fb396b..61eb4337 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -137,4 +137,4 @@ 一致しない 削除 最終変更日の取得に失敗しました - + diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 6b87a10c..a536a54b 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -134,4 +134,4 @@ 从不匹配 删除 获取上次修改日期失败 - + diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index db52f31b..7ba5cf93 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -131,4 +131,4 @@ 手動 刪除 Failed to get last changed date - + diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 913b7a4d..86a86e63 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 1f1bb005..da33e0b6 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -83,7 +83,9 @@ @color/secondary_color @color/color_control_normal true - @style/ThemeOverlay.AppTheme.TextInputEditText.OutlinedBox + + @style/ThemeOverlay.AppTheme.TextInputEditText.OutlinedBox +