Skip to content

Commit

Permalink
Use the Palace search view
Browse files Browse the repository at this point in the history
  • Loading branch information
io7m committed Oct 25, 2023
1 parent 247ac99 commit a33fc87
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 25 deletions.
9 changes: 0 additions & 9 deletions simplified-ui-accounts/src/main/res/drawable/search.xml

This file was deleted.

28 changes: 15 additions & 13 deletions simplified-ui-accounts/src/main/res/menu/account_list_registry.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="UTF-8"?>

<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto">

<item
android:id="@+id/accountMenuActionSearch"
android:title="@string/accountMenuSearch"
app:actionViewClass="org.thepalaceproject.theme.core.PalaceSearchView"
app:showAsAction="ifRoom" />

<item
android:id="@+id/accountMenuActionReload"
android:icon="@drawable/refresh"
android:title="@string/accountMenuRefresh"
app:showAsAction="never" />

<item
android:id="@+id/accountMenuActionSearch"
android:icon="@drawable/search"
android:title="@string/accountMenuSearch"
app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="ifRoom" />
<item
android:id="@+id/accountMenuActionReload"
android:icon="@drawable/refresh"
android:title="@string/accountMenuRefresh"
app:showAsAction="never" />
</menu>
8 changes: 5 additions & 3 deletions simplified-ui-catalog/src/main/res/menu/catalog.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="UTF-8"?>

<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">

<item
android:id="@+id/catalogMenuActionSearch"
android:icon="@drawable/search"
android:title="@string/catalogSearch"
app:actionViewClass="androidx.appcompat.widget.SearchView"
app:actionViewClass="org.thepalaceproject.theme.core.PalaceSearchView"
app:showAsAction="ifRoom" />

</menu>

0 comments on commit a33fc87

Please sign in to comment.