diff options
author | H. Lehmann <ByteHamster@users.noreply.github.com> | 2019-11-09 01:58:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-09 01:58:54 +0100 |
commit | a48172fb4279b5cd31a7f60b643a4e7491d3ac4e (patch) | |
tree | 1fc4130c2af4566071b1ace9eb10bc4b71e854c9 /app/src/main/res | |
parent | 43be061a644440a7210ea92f3268a0bc604047d3 (diff) | |
parent | 5b710e10f0f5bf0c0e606a287a8e6e166da7e0d1 (diff) | |
download | AntennaPod-a48172fb4279b5cd31a7f60b643a4e7491d3ac4e.zip |
Merge pull request #3596 from ByteHamster/prominent-add-podcast
Even more prominent subscribe button
Diffstat (limited to 'app/src/main/res')
4 files changed, 39 insertions, 28 deletions
diff --git a/app/src/main/res/layout/onlinefeedview_activity.xml b/app/src/main/res/layout/onlinefeedview_activity.xml index b55993fcf..4ed8a0341 100644 --- a/app/src/main/res/layout/onlinefeedview_activity.xml +++ b/app/src/main/res/layout/onlinefeedview_activity.xml @@ -9,7 +9,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" app:cardCornerRadius="4dp" - android:layout_margin="16dp" + android:layout_margin="32dp" android:elevation="16dp"> <FrameLayout @@ -23,10 +23,40 @@ android:layout_height="wrap_content" android:id="@+id/progressBar" android:layout_gravity="center"/> - <ListView - android:id="@+id/listview" + + <LinearLayout + android:id="@+id/feedDisplay" android:layout_width="match_parent" - android:layout_height="match_parent"/> + android:layout_height="wrap_content" + android:orientation="vertical"> + + <include layout="@layout/feeditemlist_header"/> + + <Spinner + android:id="@+id/spinnerAlternateUrls" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:layout_marginTop="8dp" + android:padding="8dp" + android:textColor="?android:attr/textColorPrimary" + android:textSize="@dimen/text_size_micro"/> + + <Button + android:id="@+id/butSubscribe" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:focusable="false" + android:text="@string/subscribe_label"/> + + <ListView + android:id="@+id/listview" + android:layout_width="match_parent" + android:layout_height="match_parent"/> + + </LinearLayout> </FrameLayout> </androidx.cardview.widget.CardView> diff --git a/app/src/main/res/layout/onlinefeedview_header.xml b/app/src/main/res/layout/onlinefeedview_header.xml index 20fbb8026..aa690e142 100644 --- a/app/src/main/res/layout/onlinefeedview_header.xml +++ b/app/src/main/res/layout/onlinefeedview_header.xml @@ -6,27 +6,6 @@ android:layout_height="wrap_content" android:layout_width="match_parent"> - <include layout="@layout/feeditemlist_header"/> - - <Spinner - android:id="@+id/spinnerAlternateUrls" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:layout_marginTop="8dp" - android:padding="8dp" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/text_size_micro"/> - - <Button - android:id="@+id/butSubscribe" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="16dp" - android:focusable="false" - android:text="@string/subscribe_label"/> - <TextView android:id="@+id/txtvDescription" android:layout_width="wrap_content" diff --git a/app/src/main/res/layout/quick_feed_discovery.xml b/app/src/main/res/layout/quick_feed_discovery.xml index a80b9381a..561eadf45 100644 --- a/app/src/main/res/layout/quick_feed_discovery.xml +++ b/app/src/main/res/layout/quick_feed_discovery.xml @@ -52,8 +52,6 @@ android:numColumns="4" app:layout_columnWeight="1" app:layout_rowWeight="1" - android:horizontalSpacing="4dp" - android:verticalSpacing="4dp" android:scrollbars="none" android:layout_marginTop="8dp" android:layout_centerInParent="true" 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 6b0c98013..3a0fe0b4b 100644 --- a/app/src/main/res/layout/quick_feed_discovery_item.xml +++ b/app/src/main/res/layout/quick_feed_discovery_item.xml @@ -2,12 +2,16 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:padding="4dp" + android:clipToPadding="false"> <de.danoeh.antennapod.view.SquareImageView android:id="@+id/discovery_cover" android:layout_width="match_parent" android:layout_height="match_parent" + android:elevation="4dp" + android:outlineProvider="bounds" android:foreground="?android:attr/selectableItemBackground"/> </LinearLayout> |