diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/addfeed.xml | 7 | ||||
| -rw-r--r-- | app/src/main/res/layout/cover_fragment.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/feed_item_list_fragment.xml | 15 | ||||
| -rw-r--r-- | app/src/main/res/layout/feeditemlist_item.xml | 1 | ||||
| -rw-r--r-- | app/src/main/res/layout/quick_feed_discovery_item.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout/search_fragment.xml | 16 | ||||
| -rw-r--r-- | app/src/main/res/layout/searchlist_item_feed.xml | 20 | ||||
| -rw-r--r-- | app/src/main/res/layout/simple_list_fragment.xml | 11 | ||||
| -rw-r--r-- | app/src/main/res/layout/subscription_item.xml | 7 |
9 files changed, 65 insertions, 18 deletions
diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml index 3b9c0ffb4..9d14d209a 100644 --- a/app/src/main/res/layout/addfeed.xml +++ b/app/src/main/res/layout/addfeed.xml @@ -2,7 +2,8 @@ <LinearLayout 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" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical"> <androidx.appcompat.widget.Toolbar @@ -11,6 +12,7 @@ android:minHeight="?attr/actionBarSize" android:theme="?attr/actionBarTheme" app:title="@string/add_feed_label" + app:navigationIcon="?homeAsUpIndicator" android:id="@+id/toolbar"/> <androidx.cardview.widget.CardView @@ -19,8 +21,7 @@ app:cardCornerRadius="4dp" app:cardElevation="4dp" android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" - android:layout_marginTop="16dp"> + android:layout_marginRight="16dp"> <LinearLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/cover_fragment.xml b/app/src/main/res/layout/cover_fragment.xml index 4292344fd..31e7dbda7 100644 --- a/app/src/main/res/layout/cover_fragment.xml +++ b/app/src/main/res/layout/cover_fragment.xml @@ -20,7 +20,7 @@ android:transitionName="coverTransition" tools:src="@android:drawable/sym_def_app_icon" android:foreground="?attr/selectableItemBackgroundBorderless" - squareImageView:useMinimum="true" /> + squareImageView:direction="minimum" /> <TextView android:id="@+id/txtvPodcastTitle" diff --git a/app/src/main/res/layout/feed_item_list_fragment.xml b/app/src/main/res/layout/feed_item_list_fragment.xml index f2aa395de..2c5c30ed3 100644 --- a/app/src/main/res/layout/feed_item_list_fragment.xml +++ b/app/src/main/res/layout/feed_item_list_fragment.xml @@ -39,17 +39,17 @@ android:theme="?attr/actionBarTheme" android:layout_alignParentTop="true" android:id="@+id/toolbar" + app:navigationIcon="?homeAsUpIndicator" app:layout_collapseMode="pin"/> </com.google.android.material.appbar.CollapsingToolbarLayout> </com.google.android.material.appbar.AppBarLayout> - <de.danoeh.antennapod.view.NestedScrollingListView - android:clipToPadding="false" - app:layout_behavior="@string/appbar_scrolling_view_behavior" + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="match_parent" - android:id="@android:id/list" /> + app:layout_behavior="@string/appbar_scrolling_view_behavior" /> <ProgressBar android:id="@+id/progLoading" @@ -59,4 +59,11 @@ android:indeterminateOnly="true" android:visibility="gone"/> + <include + layout="@layout/more_content_list_footer" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:visibility="gone"/> + </androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/app/src/main/res/layout/feeditemlist_item.xml b/app/src/main/res/layout/feeditemlist_item.xml index 1bc18dc0a..66febc1d0 100644 --- a/app/src/main/res/layout/feeditemlist_item.xml +++ b/app/src/main/res/layout/feeditemlist_item.xml @@ -25,6 +25,7 @@ android:src="?attr/dragview_background" android:paddingEnd="8dp" android:paddingRight="8dp" + android:visibility="gone" tools:src="@drawable/ic_drag_vertical_grey600_48dp" tools:background="@android:color/holo_green_dark"/> diff --git a/app/src/main/res/layout/quick_feed_discovery_item.xml b/app/src/main/res/layout/quick_feed_discovery_item.xml index 3a0fe0b4b..e1c91f9d8 100644 --- a/app/src/main/res/layout/quick_feed_discovery_item.xml +++ b/app/src/main/res/layout/quick_feed_discovery_item.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:squareImageView="http://schemas.android.com/apk/de.danoeh.antennapod" android:layout_width="match_parent" android:layout_height="match_parent" android:padding="4dp" @@ -12,7 +13,8 @@ android:layout_height="match_parent" android:elevation="4dp" android:outlineProvider="bounds" - android:foreground="?android:attr/selectableItemBackground"/> + android:foreground="?android:attr/selectableItemBackground" + squareImageView:direction="width" /> </LinearLayout> diff --git a/app/src/main/res/layout/search_fragment.xml b/app/src/main/res/layout/search_fragment.xml index e9e59b592..ff40af775 100644 --- a/app/src/main/res/layout/search_fragment.xml +++ b/app/src/main/res/layout/search_fragment.xml @@ -22,9 +22,21 @@ android:layout_height="wrap_content" android:layout_gravity="center"/> - <ListView + <androidx.recyclerview.widget.RecyclerView android:layout_below="@id/toolbar" - android:id="@+id/listview" + android:id="@+id/recyclerViewFeeds" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="12dp" + android:paddingRight="12dp" + android:clipToPadding="false"/> + + <androidx.recyclerview.widget.RecyclerView + android:layout_below="@id/recyclerViewFeeds" + android:id="@+id/recyclerView" + android:layout_marginTop="-4dp" + android:paddingTop="12dp" + android:clipToPadding="false" android:layout_width="match_parent" android:layout_height="match_parent"/> </RelativeLayout> diff --git a/app/src/main/res/layout/searchlist_item_feed.xml b/app/src/main/res/layout/searchlist_item_feed.xml new file mode 100644 index 000000000..f5e76801e --- /dev/null +++ b/app/src/main/res/layout/searchlist_item_feed.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:squareImageView="http://schemas.android.com/apk/de.danoeh.antennapod" + android:layout_width="match_parent" + android:layout_height="96dp" + android:padding="4dp" + android:clipToPadding="false"> + + <de.danoeh.antennapod.view.SquareImageView + android:id="@+id/discovery_cover" + android:layout_width="match_parent" + android:layout_height="96dp" + android:elevation="4dp" + android:outlineProvider="bounds" + android:foreground="?android:attr/selectableItemBackground" + squareImageView:direction="height" /> + +</LinearLayout> + diff --git a/app/src/main/res/layout/simple_list_fragment.xml b/app/src/main/res/layout/simple_list_fragment.xml index 91392d0a4..5bd2925ad 100644 --- a/app/src/main/res/layout/simple_list_fragment.xml +++ b/app/src/main/res/layout/simple_list_fragment.xml @@ -11,11 +11,12 @@ android:layout_alignParentTop="true" android:id="@+id/toolbar"/> - <ListView android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_below="@id/toolbar" - android:id="@android:id/list" - android:clipToPadding="false"/> + <androidx.recyclerview.widget.RecyclerView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_below="@id/toolbar" + android:id="@+id/recyclerView" + android:clipToPadding="false"/> <ProgressBar android:id="@+id/progLoading" diff --git a/app/src/main/res/layout/subscription_item.xml b/app/src/main/res/layout/subscription_item.xml index d065c5cf1..177608a54 100644 --- a/app/src/main/res/layout/subscription_item.xml +++ b/app/src/main/res/layout/subscription_item.xml @@ -1,7 +1,9 @@ <?xml version='1.0' encoding='utf-8'?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" + xmlns:squareImageView="http://schemas.android.com/apk/de.danoeh.antennapod" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -10,7 +12,8 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:scaleType="centerCrop" - tools:src="@mipmap/ic_launcher_round" /> + tools:src="@mipmap/ic_launcher_round" + squareImageView:direction="width"/> <com.joanzapata.iconify.widget.IconTextView android:id="@+id/txtvTitle" |