From 42b0921ab6a9f0da74480c3635d18ce1f615b256 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Thu, 6 Oct 2022 12:17:31 +0800 Subject: [PATCH] More work on the player UI, more consistent nav bar item sizing --- .../App/Views/AudioPlayer/MiniPlayer.swift | 17 ++++++++++++----- .../App/Views/Home/HomeFeedViewIOS.swift | 4 ---- .../Sources/App/Views/LinkItemDetailView.swift | 2 +- .../Views/WebReader/WebReaderContainer.swift | 8 ++++---- apple/OmnivoreKit/Sources/Views/Fonts.swift | 5 ++++- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/apple/OmnivoreKit/Sources/App/Views/AudioPlayer/MiniPlayer.swift b/apple/OmnivoreKit/Sources/App/Views/AudioPlayer/MiniPlayer.swift index ebb7225d9..f4ccce43b 100644 --- a/apple/OmnivoreKit/Sources/App/Views/AudioPlayer/MiniPlayer.swift +++ b/apple/OmnivoreKit/Sources/App/Views/AudioPlayer/MiniPlayer.swift @@ -96,12 +96,11 @@ public struct MiniPlayer: View { }, label: { Image(systemName: "chevron.down") - .font(.appTitleTwo) + .font(.appNavbarIcon) .tint(.appGrayTextContrast) } ) - - .contentShape(Rectangle()) + // .contentShape(Rectangle()) } func viewArticle() { @@ -174,7 +173,7 @@ public struct MiniPlayer: View { .transition(.opacity) } } else { - HStack(alignment: .center) { + HStack(alignment: .center, spacing: 8) { let dim = 64.0 if let imageURL = itemAudioProperties.imageURL { @@ -219,7 +218,9 @@ public struct MiniPlayer: View { stopButton .frame(width: 28, height: 28) - }.frame(maxHeight: .infinity) + } + .padding(16) + .frame(maxHeight: .infinity) } if expanded { @@ -357,6 +358,8 @@ public struct MiniPlayer: View { .navigationBarTitleDisplayMode(.inline) .navigationBarItems(leading: Button(action: { self.showVoiceSheet = false }) { Image(systemName: "chevron.backward") + .font(.appNavbarIcon) + .tint(.appGrayTextContrast) }) } }.sheet(isPresented: $showLanguageSheet) { @@ -366,6 +369,8 @@ public struct MiniPlayer: View { .navigationBarTitleDisplayMode(.inline) .navigationBarItems(leading: Button(action: { self.showLanguageSheet = false }) { Image(systemName: "chevron.backward") + .font(.appNavbarIcon) + .tint(.appGrayTextContrast) }) } } @@ -441,6 +446,8 @@ public struct MiniPlayer: View { .navigationBarTitleDisplayMode(.inline) .navigationBarItems(leading: Button(action: { self.showVoiceSheet = false }) { Image(systemName: "chevron.backward") + .font(.appNavbarIcon) + .tint(.appGrayTextContrast) }) } } diff --git a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift index b7d1cfa21..0154e4eff 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift @@ -358,10 +358,6 @@ import Views } } } - - if viewModel.isLoading { - LoadingSection() - } } .listStyle(PlainListStyle()) } diff --git a/apple/OmnivoreKit/Sources/App/Views/LinkItemDetailView.swift b/apple/OmnivoreKit/Sources/App/Views/LinkItemDetailView.swift index 79f0ae710..04f6a5e5c 100644 --- a/apple/OmnivoreKit/Sources/App/Views/LinkItemDetailView.swift +++ b/apple/OmnivoreKit/Sources/App/Views/LinkItemDetailView.swift @@ -129,7 +129,7 @@ struct LinkItemDetailView: View { action: { self.presentationMode.wrappedValue.dismiss() }, label: { Image(systemName: "chevron.backward") - .font(.appTitleTwo) + .font(.appNavbarIcon) .foregroundColor(.appGrayTextContrast) .padding(.horizontal) } diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift index 83c78fbf9..7553e2cc2 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift @@ -111,10 +111,10 @@ struct WebReaderContainerView: View { var textToSpeechButtonImage: some View { if audioController.state == .stopped || audioController.itemAudioProperties?.itemID != self.item.id { - return Image(systemName: "headphones").font(Font.system(size: 19)) + return Image(systemName: "headphones").font(.appTitleThree) } let name = audioController.isPlayingItem(itemID: item.unwrappedID) ? "pause.circle" : "play.circle" - return Image(systemName: name).font(.appTitleTwo) + return Image(systemName: name).font(.appTitleThree) } var navBar: some View { @@ -124,7 +124,7 @@ struct WebReaderContainerView: View { action: { self.presentationMode.wrappedValue.dismiss() }, label: { Image(systemName: "chevron.backward") - .font(.appTitleTwo) + .font(.appNavbarIcon) .foregroundColor(.appGrayTextContrast) .padding(.horizontal) } @@ -139,7 +139,7 @@ struct WebReaderContainerView: View { action: { showPreferencesPopover.toggle() }, label: { Image(systemName: "textformat.size") - .font(.appTitleTwo) + .font(.appTitleThree) } ) .padding(.horizontal) diff --git a/apple/OmnivoreKit/Sources/Views/Fonts.swift b/apple/OmnivoreKit/Sources/Views/Fonts.swift index 03fb7d1ad..b3bc1f14d 100644 --- a/apple/OmnivoreKit/Sources/Views/Fonts.swift +++ b/apple/OmnivoreKit/Sources/Views/Fonts.swift @@ -14,7 +14,6 @@ public extension Font { .customFont(InterFont.regular.rawValue, size: 28, relativeTo: .title) } - /// 22pt, Inter-Regular static var appTitleTwo: Font { Font.custom(InterFont.regular.rawValue, size: 28, relativeTo: .title2) } @@ -23,6 +22,10 @@ public extension Font { Font.custom(InterFont.bold.rawValue, size: 24, relativeTo: .title2) } + static var appNavbarIcon: Font { + Font.custom(InterFont.regular.rawValue, size: 22, relativeTo: .title2) + } + /// 20pt, Inter-Regular static var appTitleThree: Font { Font.custom(InterFont.regular.rawValue, size: 20, relativeTo: .title3)