aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/res/menu
diff options
context:
space:
mode:
authorHarsh Shandilya <msfjarvis@gmail.com>2020-05-10 19:21:39 +0530
committerGitHub <noreply@github.com>2020-05-10 19:21:39 +0530
commit041cf00510a75042223d1857660fc7f1dff958ef (patch)
tree1b56e67e2b71afe23ac51b680b62ad778272f162 /app/src/main/res/menu
parent94dc92f8d70870b57a7f8c4fe8adef152c1211ce (diff)
downloadHardenedPass-041cf00510a75042223d1857660fc7f1dff958ef.tar.gz
HardenedPass-041cf00510a75042223d1857660fc7f1dff958ef.zip
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
Diffstat (limited to 'app/src/main/res/menu')
-rw-r--r--app/src/main/res/menu/autofill_preference.xml8
-rw-r--r--app/src/main/res/menu/git_clone.xml9
-rw-r--r--app/src/main/res/menu/main_menu_git.xml29
-rw-r--r--app/src/main/res/menu/main_menu_no_auth.xml25
-rw-r--r--app/src/main/res/menu/main_menu_non_git.xml20
-rw-r--r--app/src/main/res/menu/pgp_handler.xml28
-rw-r--r--app/src/main/res/menu/pgp_handler_new_password.xml28
-rw-r--r--app/src/main/res/menu/pgp_handler_select_folder.xml12
8 files changed, 85 insertions, 74 deletions
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 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:pwstore="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- tools:context=".pwdstore.autofill.AutofillPreferenceActivity">
+ xmlns:pwstore="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ tools:context=".pwdstore.autofill.AutofillPreferenceActivity">
<item
android:id="@+id/action_search"
android:icon="@drawable/ic_search_white_24dp"
android:title="@string/action_search"
pwstore:actionViewClass="androidx.appcompat.widget.SearchView"
- pwstore:showAsAction="ifRoom|collapseActionView"/>
+ pwstore:showAsAction="ifRoom|collapseActionView" />
</menu>
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 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
xmlns:pwstore="http://schemas.android.com/apk/res-auto"
- tools:context="com.zeapo.pwdstore.git.GitServerConfigActivity" >
- <item android:id="@+id/user_pref"
- android:title="@string/action_settings"
+ xmlns:tools="http://schemas.android.com/tools"
+ tools:context="com.zeapo.pwdstore.git.GitServerConfigActivity">
+ <item
+ android:id="@+id/user_pref"
android:orderInCategory="100"
+ android:title="@string/action_settings"
pwstore:showAsAction="never" />
</menu>
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 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto">
- <item android:id="@+id/action_search"
- android:title="@string/action_search"
+ <item
+ android:id="@+id/action_search"
android:icon="@drawable/ic_search_white_24dp"
- app:showAsAction="always|collapseActionView"
- app:actionViewClass="androidx.appcompat.widget.SearchView" />
+ android:title="@string/action_search"
+ app:actionViewClass="androidx.appcompat.widget.SearchView"
+ app:showAsAction="always|collapseActionView" />
- <item android:id="@+id/git_sync"
+ <item
+ android:id="@+id/git_sync"
android:title="@string/git_sync" />
- <item android:id="@+id/git_pull"
+ <item
+ android:id="@+id/git_pull"
android:title="@string/git_pull" />
- <item android:id="@+id/git_push"
+ <item
+ android:id="@+id/git_push"
android:title="@string/git_push" />
- <item android:id="@+id/refresh"
+ <item
+ android:id="@+id/refresh"
android:title="@string/refresh_list" />
- <item android:id="@+id/user_pref"
- android:title="@string/action_settings"
- android:orderInCategory="100" />
+ <item
+ android:id="@+id/user_pref"
+ android:orderInCategory="100"
+ android:title="@string/action_settings" />
</menu>
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 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto">
- <item android:id="@+id/action_search"
- android:title="@string/action_search"
+ <item
+ android:id="@+id/action_search"
android:icon="@drawable/ic_search_white_24dp"
- app:showAsAction="always|collapseActionView"
- app:actionViewClass="androidx.appcompat.widget.SearchView" />
+ android:title="@string/action_search"
+ app:actionViewClass="androidx.appcompat.widget.SearchView"
+ app:showAsAction="always|collapseActionView" />
- <item android:id="@+id/git_pull"
- android:title="@string/git_pull"/>
+ <item
+ android:id="@+id/git_pull"
+ android:title="@string/git_pull" />
- <item android:id="@+id/refresh"
+ <item
+ android:id="@+id/refresh"
android:title="@string/refresh_list" />
- <item android:id="@+id/user_pref"
- android:title="@string/action_settings"
- android:orderInCategory="100" />
+ <item
+ android:id="@+id/user_pref"
+ android:orderInCategory="100"
+ android:title="@string/action_settings" />
</menu>
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 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto">
- <item android:id="@+id/action_search"
- android:title="@string/action_search"
+ <item
+ android:id="@+id/action_search"
android:icon="@drawable/ic_search_white_24dp"
- app:showAsAction="always|collapseActionView"
- app:actionViewClass="androidx.appcompat.widget.SearchView" />
+ android:title="@string/action_search"
+ app:actionViewClass="androidx.appcompat.widget.SearchView"
+ app:showAsAction="always|collapseActionView" />
- <item android:id="@+id/refresh"
+ <item
+ android:id="@+id/refresh"
android:title="@string/refresh_list" />
- <item android:id="@+id/user_pref"
- android:title="@string/action_settings"
- android:orderInCategory="100" />
+ <item
+ android:id="@+id/user_pref"
+ android:orderInCategory="100"
+ android:title="@string/action_settings" />
</menu>
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 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
xmlns:pwstore="http://schemas.android.com/apk/res-auto"
- tools:context="com.zeapo.pwdstore.crypto.PgpActivity" >
- <item android:title="@string/share_as_plaintext"
- android:icon="@drawable/ic_share_white_24dp"
- pwstore:showAsAction="ifRoom"
+ xmlns:tools="http://schemas.android.com/tools"
+ tools:context="com.zeapo.pwdstore.crypto.PgpActivity">
+ <item
android:id="@+id/share_password_as_plaintext"
- />
- <item android:title="@string/copy_password"
- android:icon="@drawable/ic_content_copy_white_24dp"
- pwstore:showAsAction="ifRoom"
+ android:icon="@drawable/ic_share_white_24dp"
+ android:title="@string/share_as_plaintext"
+ pwstore:showAsAction="ifRoom" />
+ <item
android:id="@+id/copy_password"
- />
- <item android:title="@string/edit_password"
- android:icon="@drawable/ic_edit_white_24dp"
- pwstore:showAsAction="ifRoom"
+ android:icon="@drawable/ic_content_copy_white_24dp"
+ android:title="@string/copy_password"
+ pwstore:showAsAction="ifRoom" />
+ <item
android:id="@+id/edit_password"
- />
+ android:icon="@drawable/ic_edit_white_24dp"
+ android:title="@string/edit_password"
+ pwstore:showAsAction="ifRoom" />
</menu>
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 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
xmlns:pwstore="http://schemas.android.com/apk/res-auto"
- tools:context="com.zeapo.pwdstore.crypto.PgpActivity" >
- <item android:title="@string/crypto_cancel"
- android:icon="@drawable/ic_clear_white_24dp"
- pwstore:showAsAction="ifRoom"
+ xmlns:tools="http://schemas.android.com/tools"
+ tools:context="com.zeapo.pwdstore.crypto.PgpActivity">
+ <item
android:id="@+id/crypto_cancel_add"
- />
- <item android:title="@string/crypto_save"
- android:icon="@drawable/ic_save_white_24dp"
- pwstore:showAsAction="ifRoom"
+ android:icon="@drawable/ic_clear_white_24dp"
+ android:title="@string/crypto_cancel"
+ pwstore:showAsAction="ifRoom" />
+ <item
android:id="@+id/crypto_confirm_add"
- />
- <item android:title="@string/crypto_save_and_copy"
- android:icon="@drawable/ic_save_copy_white_24dp"
- pwstore:showAsAction="ifRoom"
+ android:icon="@drawable/ic_save_white_24dp"
+ android:title="@string/crypto_save"
+ pwstore:showAsAction="ifRoom" />
+ <item
android:id="@+id/crypto_confirm_add_and_copy"
- />
+ android:icon="@drawable/ic_save_copy_white_24dp"
+ android:title="@string/crypto_save_and_copy"
+ pwstore:showAsAction="ifRoom" />
</menu>
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 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
xmlns:pwstore="http://schemas.android.com/apk/res-auto"
- tools:context="com.zeapo.pwdstore.SelectFolderActivity" >
- <item android:title="@string/crypto_select"
- android:icon="@drawable/ic_done_white_24dp"
- pwstore:showAsAction="ifRoom"
+ xmlns:tools="http://schemas.android.com/tools"
+ tools:context="com.zeapo.pwdstore.SelectFolderActivity">
+ <item
android:id="@+id/crypto_select"
- />
+ android:icon="@drawable/ic_done_white_24dp"
+ android:title="@string/crypto_select"
+ pwstore:showAsAction="ifRoom" />
</menu>