diff options
| author | Harsh Shandilya <msfjarvis@gmail.com> | 2020-05-03 01:39:16 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-03 01:39:16 +0530 |
| commit | 69e887f3d8602438389161449bdff4539c67c72e (patch) | |
| tree | 79a5c235d98fbd66e9362cff7ca0719fbe3385b4 /app/src/main/res/menu | |
| parent | ced8bcca01dc2545edc3ef17e0cd44922dd97e61 (diff) | |
| download | HardenedPass-69e887f3d8602438389161449bdff4539c67c72e.tar.gz HardenedPass-69e887f3d8602438389161449bdff4539c67c72e.zip | |
Better handle non-git repositories (#756)
Diffstat (limited to 'app/src/main/res/menu')
| -rw-r--r-- | app/src/main/res/menu/main_menu_git.xml (renamed from app/src/main/res/menu/main_menu.xml) | 17 | ||||
| -rw-r--r-- | app/src/main/res/menu/main_menu_non_git.xml | 20 |
2 files changed, 27 insertions, 10 deletions
diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu_git.xml index 2e126d33..40c99550 100644 --- a/app/src/main/res/menu/main_menu.xml +++ b/app/src/main/res/menu/main_menu_git.xml @@ -1,16 +1,13 @@ <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" + xmlns:app="http://schemas.android.com/apk/res-auto" tools:context=".pwdstore" > <item android:id="@+id/action_search" - android:title="@string/action_search" - android:icon="@drawable/ic_search_white_24dp" - pwstore:showAsAction="always|collapseActionView" - pwstore:actionViewClass="androidx.appcompat.widget.SearchView" /> - - <!--<item android:id="@+id/menu_add_category"--> - <!--android:title="New category"/>--> + android:title="@string/action_search" + android:icon="@drawable/ic_search_white_24dp" + app:showAsAction="always|collapseActionView" + app:actionViewClass="androidx.appcompat.widget.SearchView" /> <item android:id="@+id/git_sync" android:title="@string/git_sync"/> @@ -21,8 +18,8 @@ <item android:id="@+id/refresh" android:title="@string/refresh_list" - pwstore:showAsAction="never" - android:icon="@drawable/ic_refresh_white_24dp"/> + android:icon="@drawable/ic_refresh_white_24dp" + app:showAsAction="never"/> <item android:id="@+id/user_pref" android:title="@string/action_settings" diff --git a/app/src/main/res/menu/main_menu_non_git.xml b/app/src/main/res/menu/main_menu_non_git.xml new file mode 100644 index 00000000..dc7d20cc --- /dev/null +++ b/app/src/main/res/menu/main_menu_non_git.xml @@ -0,0 +1,20 @@ +<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" + tools:context=".pwdstore" > + + <item android:id="@+id/action_search" + android:title="@string/action_search" + android:icon="@drawable/ic_search_white_24dp" + app:showAsAction="always|collapseActionView" + app:actionViewClass="androidx.appcompat.widget.SearchView" /> + + <item android:id="@+id/refresh" + android:title="@string/refresh_list" + android:icon="@drawable/ic_refresh_white_24dp" + app:showAsAction="never"/> + + <item android:id="@+id/user_pref" + android:title="@string/action_settings" + android:orderInCategory="100"/> +</menu> |