diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/search_fragment.xml | 79 | ||||
| -rw-r--r-- | app/src/main/res/menu/episodes.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/menu/feedlist.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/menu/queue.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/menu/subscriptions.xml | 8 |
5 files changed, 49 insertions, 47 deletions
diff --git a/app/src/main/res/layout/search_fragment.xml b/app/src/main/res/layout/search_fragment.xml index 28d4778f7..5745cf655 100644 --- a/app/src/main/res/layout/search_fragment.xml +++ b/app/src/main/res/layout/search_fragment.xml @@ -1,51 +1,54 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_height="match_parent" - android:layout_width="match_parent"> + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent"> <androidx.appcompat.widget.Toolbar - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="?attr/actionBarSize" - android:theme="?attr/actionBarTheme" - app:navigationIcon="?homeAsUpIndicator" - app:title="@string/search_label" - android:id="@+id/toolbar"/> + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?attr/actionBarSize" + android:theme="?attr/actionBarTheme" + app:navigationIcon="?homeAsUpIndicator" + app:title="@string/search_label" /> <com.google.android.material.chip.Chip - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/toolbar" - android:id="@+id/feed_title_chip" - android:layout_marginLeft="10dp" - android:layout_marginRight="0dp" - app:closeIconVisible="true"/> + android:id="@+id/feed_title_chip" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/toolbar" + android:layout_marginLeft="10dp" + android:layout_marginRight="0dp" + android:visibility="gone" + app:closeIconVisible="true" /> <ProgressBar - android:layout_centerInParent="true" - android:id="@+id/progressBar" - style="?android:attr/progressBarStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center"/> + android:id="@+id/progressBar" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:layout_gravity="center" + android:visibility="gone" + style="?android:attr/progressBarStyle" /> <androidx.recyclerview.widget.RecyclerView - android:layout_below="@id/feed_title_chip" - android:id="@+id/recyclerViewFeeds" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingLeft="12dp" - android:paddingRight="12dp" - android:clipToPadding="false"/> + android:id="@+id/recyclerViewFeeds" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/feed_title_chip" + android:paddingLeft="12dp" + android:paddingRight="12dp" + android:clipToPadding="false" /> <de.danoeh.antennapod.view.EpisodeItemListRecyclerView - android:id="@+id/recyclerView" - android:layout_below="@id/recyclerViewFeeds" - android:layout_marginTop="-4dp" - android:paddingTop="12dp" - android:paddingHorizontal="@dimen/additional_horizontal_spacing" - android:layout_width="match_parent" - android:layout_height="match_parent"/> + android:id="@+id/recyclerView" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_below="@id/recyclerViewFeeds" + android:layout_marginTop="-4dp" + android:paddingTop="12dp" + android:paddingHorizontal="@dimen/additional_horizontal_spacing" /> + </RelativeLayout> diff --git a/app/src/main/res/menu/episodes.xml b/app/src/main/res/menu/episodes.xml index 22121c905..7a311aedb 100644 --- a/app/src/main/res/menu/episodes.xml +++ b/app/src/main/res/menu/episodes.xml @@ -6,8 +6,7 @@ <item android:id="@+id/action_search" android:icon="@drawable/ic_search" - custom:showAsAction="collapseActionView|always" - custom:actionViewClass="androidx.appcompat.widget.SearchView" + custom:showAsAction="always" android:title="@string/search_label"/> <item diff --git a/app/src/main/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml index 306be66d1..12cbc2e5e 100644 --- a/app/src/main/res/menu/feedlist.xml +++ b/app/src/main/res/menu/feedlist.xml @@ -33,8 +33,7 @@ <item android:id="@+id/action_search" android:icon="@drawable/ic_search" - custom:showAsAction="always|collapseActionView" - custom:actionViewClass="androidx.appcompat.widget.SearchView" + custom:showAsAction="always" android:title="@string/search_label"/> <item diff --git a/app/src/main/res/menu/queue.xml b/app/src/main/res/menu/queue.xml index 34d8f32c0..2d341d8e4 100644 --- a/app/src/main/res/menu/queue.xml +++ b/app/src/main/res/menu/queue.xml @@ -19,8 +19,7 @@ <item android:id="@+id/action_search" android:icon="@drawable/ic_search" - custom:showAsAction="collapseActionView|ifRoom" - custom:actionViewClass="androidx.appcompat.widget.SearchView" + custom:showAsAction="ifRoom" android:title="@string/search_label"/> <item diff --git a/app/src/main/res/menu/subscriptions.xml b/app/src/main/res/menu/subscriptions.xml index b1cc89eb6..9276db562 100644 --- a/app/src/main/res/menu/subscriptions.xml +++ b/app/src/main/res/menu/subscriptions.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:custom="http://schemas.android.com/apk/res-auto"> - + <item + android:id="@+id/action_search" + android:icon="@drawable/ic_search" + custom:showAsAction="always" + android:title="@string/search_label"/> <item android:id="@+id/refresh_item" android:title="@string/refresh_label" android:menuCategory="container" custom:showAsAction="always" android:icon="@drawable/ic_refresh"/> - - <item android:id="@+id/subscriptions_filter" android:title="@string/filter" |