Skip to content

Add iOS About page #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
austin-smith merged 2 commits into from
Jul 11, 2026
Merged

Add iOS About page #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2816bb
add ios about page
austin-smith Jul 11, 2026
c6dc645
refine about page styling
austin-smith Jul 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
138 changes: 109 additions & 29 deletions ComputerSolitaire/Views/AboutView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,84 @@
#if os(macOS)
import Foundation
import SwiftUI

#if os(iOS)
enum AppInfo {
static let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "—"
static let copyrightYear = String(Calendar.current.component(.year, from: Date()))
static let githubURL = URL(string: "https://github.com/austin-smith/ComputerSolitaire")!
}

struct AboutView: View {
var body: some View {
ScrollView {
VStack(spacing: 16) {
Image("AppIconPreviewDefault")
.resizable()
.aspectRatio(contentMode: .fit)
.frame(width: 100, height: 100)
.clipShape(.rect(cornerRadius: 22, style: .continuous))
.shadow(color: .black.opacity(0.15), radius: 12, x: 0, y: 6)
.accessibilityHidden(true)

VStack(spacing: 4) {
Text("Computer Solitaire")
.font(.system(size: 24, weight: .bold, design: .monospaced))
.foregroundStyle(.primary)

Text("Solitaire game for your computer")
.font(.system(size: 15, weight: .medium))
.foregroundStyle(.secondary)
}

Text("Computer Solitaire is a low-frills, ad-free solitaire game for your computer. Includes Klondike, FreeCell, and other things you enjoy.")
.font(.system(size: 14))
.foregroundStyle(.primary)
.multilineTextAlignment(.center)
.fixedSize(horizontal: false, vertical: true)
.padding(.horizontal, 24)

VStack(spacing: 2) {
HStack(spacing: 8) {
Text("Version")
.font(.system(size: 14, weight: .medium))
.foregroundStyle(.secondary)
Text(AppInfo.version)
.font(.system(size: 14, weight: .medium, design: .monospaced))
.foregroundStyle(.primary)
}

Text("© \(AppInfo.copyrightYear) Austin Smith")
.font(.system(size: 12))
.foregroundStyle(.tertiary)
.padding(.top, 12)
}
.accessibilityElement(children: .combine)

VStack(spacing: 8) {
Divider()
.padding(.horizontal, 24)

Link("GitHub", destination: AppInfo.githubURL)
.buttonStyle(.bordered)
.controlSize(.regular)
}
}
.frame(maxWidth: .infinity)
.padding(.top, 32)
.padding(.bottom, 40)
}
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
.navigationTitle("About")
.navigationBarTitleDisplayMode(.inline)
}
}

#Preview("About") {
NavigationStack {
AboutView()
}
}
#else
struct AboutView: View {
@Environment(\.openURL) private var openURL

Expand All @@ -16,47 +94,51 @@ struct AboutView: View {

var body: some View {
VStack(spacing: 12) {
VStack(spacing: 12) {
VStack(spacing: 8) {
Image(nsImage: NSApp.applicationIconImage)
.resizable()
.aspectRatio(contentMode: .fit)
.frame(width: 128, height: 128)
.frame(width: 100, height: 100)
.clipShape(RoundedRectangle(cornerRadius: 22, style: .continuous))
.shadow(color: .black.opacity(0.15), radius: 12, x: 0, y: 6)

VStack(spacing: 4) {
VStack(spacing: 3) {
Text("Computer Solitaire")
.font(.system(size: 22, weight: .bold, design: .monospaced))
.foregroundStyle(.primary)

Text("Solitaire game for your computer")
.font(.system(size: 13, weight: .medium))
.foregroundStyle(.secondary)
}
}

VStack(spacing: 16) {
Text("Fully native solitaire game for your computer.")
.font(.system(size: 11))
.foregroundStyle(.secondary)
.multilineTextAlignment(.center)
.lineLimit(nil)
.fixedSize(horizontal: false, vertical: true)
Text("Computer Solitaire is a low-frills, ad-free solitaire game for your computer. Includes Klondike, FreeCell, and other things you enjoy.")
.font(.system(size: 11))
.foregroundStyle(.primary)
.multilineTextAlignment(.center)
.fixedSize(horizontal: false, vertical: true)

VStack(spacing: 2) {
HStack(spacing: 8) {
Text("Version")
.font(.system(size: 11, weight: .medium))
.foregroundStyle(.secondary)
Text(appVersion)
.font(.system(size: 11, weight: .medium, design: .monospaced))
.foregroundStyle(.primary)
}

Text("© \(copyrightYear) Austin Smith")
.font(.system(size: 10))
.foregroundStyle(.tertiary)
.padding(.top, 12)
VStack(spacing: 2) {
HStack(spacing: 8) {
Text("Version")
.font(.system(size: 11, weight: .medium))
.foregroundStyle(.secondary)
Text(appVersion)
.font(.system(size: 11, weight: .medium, design: .monospaced))
.foregroundStyle(.primary)
}

Text("© \(copyrightYear) Austin Smith")
.font(.system(size: 10))
.foregroundStyle(.tertiary)
.padding(.top, 8)
}

VStack(spacing: 8) {
VStack(spacing: 6) {
Divider()
.padding(.horizontal, 24)

Button {
guard let url = URL(string: "https://github.com/austin-smith/ComputerSolitaire") else { return }
openURL(url)
Expand All @@ -66,10 +148,9 @@ struct AboutView: View {
.buttonStyle(.bordered)
.controlSize(.regular)
}

}
.padding(.horizontal, 28)
.padding(.vertical, 24)
.padding(.vertical, 16)
.frame(maxWidth: .infinity, maxHeight: .infinity)
.background(.regularMaterial, in: RoundedRectangle(cornerRadius: 0))
}
Expand All @@ -79,5 +160,4 @@ struct AboutView: View {
AboutView()
.frame(width: 320, height: 380)
}

#endif
24 changes: 24 additions & 0 deletions ComputerSolitaire/Views/SettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ struct SettingsView: View {
#endif

helpSection

#if os(iOS)
aboutSection
#endif
}
.navigationTitle("Settings")
#if os(iOS)
Expand Down Expand Up @@ -287,6 +291,26 @@ struct SettingsView: View {
}
}

#if os(iOS)
private var aboutSection: some View {
Section {
NavigationLink {
AboutView()
} label: {
HStack {
Text("Computer Solitaire")
Spacer()
Text(AppInfo.version)
.fontDesign(.monospaced)
.foregroundStyle(.secondary)
}
}
} header: {
Text("About")
}
}
#endif

// MARK: - Custom controls

private func variantCard(_ variant: GameVariant) -> some View {
Expand Down