Revert "Drop iOS 14 and macOS 11 support"

This reverts commit dcef7f47ff.
This commit is contained in:
Arkadiusz Fal
2023-10-15 13:35:23 +02:00
parent 053b4a22b8
commit 94915b0496
45 changed files with 695 additions and 88 deletions

View File

@@ -34,9 +34,8 @@ struct ChannelsView: View {
Text(channel.name)
.lineLimit(1)
}
#if !os(tvOS)
.backport
.badge(showUnwatchedFeedBadges ? feedCount.unwatchedByChannelText(channel) : nil)
#endif
Group {
#if os(tvOS)
@@ -74,9 +73,8 @@ struct ChannelsView: View {
Color.clear.padding(.bottom, 50)
.listRowBackground(Color.clear)
#if os(iOS)
.listRowSeparator(.hidden)
#endif
.backport
.listRowSeparator(false)
}
}
#if !os(tvOS)
@@ -91,6 +89,12 @@ struct ChannelsView: View {
subscriptions.load(force: true)
}
#if os(iOS)
.refreshControl { refreshControl in
subscriptions.load(force: true) {
refreshControl.endRefreshing()
}
}
.backport
.refreshable {
subscriptions.load(force: true)
}

View File

@@ -22,6 +22,12 @@ struct FeedView: View {
feed.loadResources()
}
#if os(iOS)
.refreshControl { refreshControl in
feed.loadResources(force: true) {
refreshControl.endRefreshing()
}
}
.backport
.refreshable {
feed.loadResources(force: true)
}