From 53443a6cf2d8df3cc800d3ebba2e8063fdafc3a9 Mon Sep 17 00:00:00 2001 From: Koen J Date: Thu, 5 Dec 2024 16:51:56 +0100 Subject: [PATCH] Only show announcements on subscriptions if home is not enabled. Add margin top to subscriptions. --- .../fragment/mainactivity/main/SubscriptionsFeedFragment.kt | 4 +++- app/src/main/res/layout/fragment_feed.xml | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionsFeedFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionsFeedFragment.kt index 1dca7b88..47ba32bd 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionsFeedFragment.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionsFeedFragment.kt @@ -124,7 +124,9 @@ class SubscriptionsFeedFragment : MainFragment() { initializeToolbarContent(); setPreviewsEnabled(Settings.instance.subscriptions.previewFeedItems); - showAnnouncementView() + if (Settings.instance.tabs.find { it.id == 0 }?.enabled != true) { + showAnnouncementView() + } } fun onShown() { diff --git a/app/src/main/res/layout/fragment_feed.xml b/app/src/main/res/layout/fragment_feed.xml index 7d8cf27a..f1eeed7e 100644 --- a/app/src/main/res/layout/fragment_feed.xml +++ b/app/src/main/res/layout/fragment_feed.xml @@ -116,7 +116,8 @@ android:visibility="gone" android:id="@+id/empty_pager_container" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="wrap_content" + android:layout_marginTop="30dp" />