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/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 ++++----- 8 files changed, 85 insertions(+), 74 deletions(-) (limited to 'app/src/main/res/menu') 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" /> -- cgit v1.2.3