prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1305 from omnivore-app/chore/mac-app-resurrection

Browse source 
Mac App Updates
This commit is contained in:
Satindar Dhillon 2022-10-12 21:00:12 -07:00 committed by GitHub
commit 8c2089d1b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 46 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apple/OmnivoreKit/Sources/App/Views/Profile/Subscriptions.swift
View file

@ -64,6 +64,12 @@ struct SubscriptionsView: View {
)
.buttonStyle(RoundedRectButtonStyle())
}
} else if viewModel.subscriptions.isEmpty {
VStack(alignment: .center) {
Spacer()
Text("You have no current subscriptions.")
Spacer()
}
} else {
Group {
#if os(iOS)

42
apple/OmnivoreKit/Sources/App/Views/Registration/EmailAuth/EmailAuthView.swift
View file

@ -42,24 +42,34 @@ struct EmailAuthView: View {
}
}
var body: some View {
NavigationView {
ZStack {
Color.appBackground.edgesIgnoringSafeArea(.all)
primaryContent
.frame(maxWidth: 300)
#if os(iOS)
.navigationBarTitleDisplayMode(.inline)
#endif
.toolbar {
ToolbarItem(placement: .barTrailing) {
Button(
action: { presentationMode.wrappedValue.dismiss() },
label: { Image(systemName: "xmark").foregroundColor(.appGrayTextContrast) }
)
}
var innerBody: some View {
ZStack {
Color.appBackground.edgesIgnoringSafeArea(.all)
primaryContent
.frame(maxWidth: 300)
#if os(iOS)
.navigationBarTitleDisplayMode(.inline)
#endif
.toolbar {
ToolbarItem(placement: .barTrailing) {
Button(
action: { presentationMode.wrappedValue.dismiss() },
label: { Image(systemName: "xmark").foregroundColor(.appGrayTextContrast) }
)
}
}
}
}
var body: some View {
#if os(iOS)
NavigationView {
innerBody
}
#else
innerBody
.frame(minWidth: 400, minHeight: 400)
.buttonStyle(PlainButtonStyle())
#endif
}
}

2
apple/OmnivoreKit/Sources/App/Views/Registration/EmailAuth/EmailLoginFormView.swift
View file

@ -44,7 +44,7 @@ struct EmailLoginFormView: View {
VStack(spacing: 28) {
ScrollView(showsIndicators: false) {
if horizontalSizeClass == .regular {
Spacer(minLength: 150)
Spacer(minLength: isMacApp ? 50 : 150)
}
VStack {
VStack(alignment: .leading, spacing: 6) {

2
apple/OmnivoreKit/Sources/App/Views/Registration/EmailAuth/EmailSignupFormView.swift
View file

@ -86,7 +86,7 @@ struct EmailSignupFormView: View {
VStack(spacing: 28) {
ScrollView(showsIndicators: false) {
if horizontalSizeClass == .regular {
Spacer(minLength: 150)
Spacer(minLength: isMacApp ? 50 : 150)
}
VStack {
// Email

13
apple/OmnivoreKit/Sources/App/Views/WelcomeView.swift
View file

@ -43,7 +43,15 @@ struct WelcomeView: View {
headlineText
Button(
action: { showAboutPage = true },
action: {
#if os(iOS)
showAboutPage = true
#else
if let url = URL(string: "https://omnivore.app/about") {
NSWorkspace.shared.open(url)
}
#endif
},
label: {
HStack(spacing: 4) {
Text("Learn more")
@ -159,6 +167,9 @@ struct WelcomeView: View {
}
)
.padding(.vertical)
#if os(macOS)
.buttonStyle(PlainButtonStyle())
#endif
return
VStack(alignment: .center, spacing: 16) {