From 4d70c8a3c3e0896c4eb7fdf7930ec183b2c37c00 Mon Sep 17 00:00:00 2001 From: Arkadiusz Fal Date: Thu, 25 May 2023 17:13:01 +0200 Subject: [PATCH] Change subscriptions view picker --- Shared/Subscriptions/SubscriptionsView.swift | 21 ++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/Shared/Subscriptions/SubscriptionsView.swift b/Shared/Subscriptions/SubscriptionsView.swift index 68123910..71798b16 100644 --- a/Shared/Subscriptions/SubscriptionsView.swift +++ b/Shared/Subscriptions/SubscriptionsView.swift @@ -31,7 +31,16 @@ struct SubscriptionsView: View { .navigationBarTitleDisplayMode(.inline) .toolbar { ToolbarItem(placement: .principal) { - subscriptionsMenu + HStack { + Picker("Page", selection: $subscriptionsViewPage) { + Label("Feed", systemImage: "film").tag(Page.feed) + Label("Channels", systemImage: "person.3.fill").tag(Page.channels) + } + .pickerStyle(.segmented) + + subscriptionsMenu + } + .frame(maxWidth: 500) } ToolbarItem { @@ -61,11 +70,6 @@ struct SubscriptionsView: View { #if os(iOS) var subscriptionsMenu: some View { Menu { - Picker("Page", selection: $subscriptionsViewPage) { - Label("Feed", systemImage: "film").tag(Page.feed) - Label("Channels", systemImage: "person.3.fill").tag(Page.channels) - } - if subscriptionsViewPage == .feed { ListingStyleButtons(listingStyle: $subscriptionsListingStyle) } @@ -84,12 +88,9 @@ struct SubscriptionsView: View { } } label: { HStack(spacing: 12) { - menuLabel - .foregroundColor(.primary) - Image(systemName: "chevron.down.circle.fill") .foregroundColor(.accentColor) - .imageScale(.small) + .imageScale(.large) } .transaction { t in t.animation = nil } }