TopDogLabs/Andromida
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Signed-off-by: Matt Bruce <mbrucedogs@gmail.com>

Browse Source
This commit is contained in:
Matt Bruce 2026-01-26 18:29:41 -06:00
parent 9c57230e55
commit 576afad258
10 changed files with 44 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Andromida/App/Views/History/HistoryDayDetailSheet.swift
View File

@ -78,7 +78,6 @@ struct HistoryDayDetailSheet: View {
.presentationBackground(AppSurface.primary)
.presentationDetents([.medium, .large])
.presentationDragIndicator(.visible)
.presentationSizing(.form)
}
private var emptyState: some View {

2
Andromida/App/Views/History/HistoryView.swift
View File

@ -90,7 +90,7 @@ struct HistoryView: View {
ritualPicker
// Month calendars - 2-column grid on iPad/landscape
LazyVGrid(columns: monthColumns, alignment: .leading, spacing: Design.Spacing.large) {
LazyVGrid(columns: monthColumns, alignment: .top, spacing: Design.Spacing.large) {
ForEach(months, id: \.self) { month in
HistoryMonthView(
month: month,

1
Andromida/App/Views/Insights/Components/InsightDetailSheet.swift
View File

@ -74,7 +74,6 @@ struct InsightDetailSheet: View {
}
}
}
.presentationSizing(.form)
}
// MARK: - Header Section

83
Andromida/App/Views/Rituals/Sheets/ArcDetailSheet.swift → Andromida/App/Views/Rituals/ArcDetailView.swift
View File

@ -1,5 +1,5 @@
//
// ArcDetailSheet.swift
// ArcDetailView.swift
// Andromida
//
// A detailed view of a completed arc showing per-habit breakdown,
@ -15,12 +15,12 @@ private struct ArcIdentifiableDate: Identifiable {
let date: Date
}
/// Sheet displaying detailed analytics for a completed arc.
struct ArcDetailSheet: View {
/// View displaying detailed analytics for a completed arc.
/// Presented via NavigationLink push from RitualDetailView.
struct ArcDetailView: View {
@Bindable var store: RitualStore
let arc: RitualArc
let ritual: Ritual
@Environment(\.dismiss) private var dismiss
@State private var selectedDateItem: ArcIdentifiableDate?
private let calendar = Calendar.current
@ -61,42 +61,37 @@ struct ArcDetailSheet: View {
}
var body: some View {
NavigationStack {
ScrollView {
VStack(alignment: .leading, spacing: Design.Spacing.large) {
// Header
headerSection
// Stats overview
statsSection
// Habit breakdown
habitBreakdownSection
// Calendar history
calendarSection
}
.padding(Design.Spacing.large)
}
.background(AppSurface.primary)
.navigationTitle(String(localized: "Arc \(arc.arcNumber) Details"))
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .confirmationAction) {
Button(String(localized: "Done")) {
dismiss()
}
}
}
.sheet(item: $selectedDateItem) { item in
HistoryDayDetailSheet(
date: item.date,
completions: arcHabitCompletions(for: item.date),
store: store
)
ScrollView {
VStack(alignment: .leading, spacing: Design.Spacing.large) {
// Header
headerSection
// Stats overview
statsSection
// Habit breakdown
habitBreakdownSection
// Calendar history
calendarSection
}
.padding(Design.Spacing.large)
.adaptiveContentWidth()
}
.background(LinearGradient(
colors: [AppSurface.primary, AppSurface.secondary],
startPoint: .topLeading,
endPoint: .bottomTrailing
))
.navigationTitle(String(localized: "Arc \(arc.arcNumber) Details"))
.navigationBarTitleDisplayMode(.inline)
.sheet(item: $selectedDateItem) { item in
HistoryDayDetailSheet(
date: item.date,
completions: arcHabitCompletions(for: item.date),
store: store
)
}
.presentationSizing(.form)
}
/// Returns habit completions for a specific date within this arc
@ -333,9 +328,11 @@ struct ArcDetailSheet: View {
}
#Preview {
ArcDetailSheet(
store: RitualStore.preview,
arc: RitualStore.preview.rituals.first!.latestArc!,
ritual: RitualStore.preview.rituals.first!
)
NavigationStack {
ArcDetailView(
store: RitualStore.preview,
arc: RitualStore.preview.rituals.first!.latestArc!,
ritual: RitualStore.preview.rituals.first!
)
}
}

8
Andromida/App/Views/Rituals/RitualDetailView.swift
View File

@ -12,7 +12,6 @@ struct RitualDetailView: View {
@State private var showingDeleteConfirmation = false
@State private var showingEndArcConfirmation = false
@State private var showingStartArcConfirmation = false
@State private var selectedArcForDetail: RitualArc?
init(store: RitualStore, categoryStore: CategoryStore, ritual: Ritual) {
self.store = store
@ -142,9 +141,6 @@ struct RitualDetailView: View {
.sheet(isPresented: $showingEditSheet) {
RitualEditSheet(store: store, categoryStore: categoryStore, ritual: ritual)
}
.sheet(item: $selectedArcForDetail) { arc in
ArcDetailSheet(store: store, arc: arc, ritual: ritual)
}
.alert(String(localized: "Delete Ritual?"), isPresented: $showingDeleteConfirmation) {
Button(String(localized: "Cancel"), role: .cancel) {}
Button(String(localized: "Delete"), role: .destructive) {
@ -400,8 +396,8 @@ struct RitualDetailView: View {
let possibleCheckIns = habits.count * arc.durationDays
let completionRate = possibleCheckIns > 0 ? Int(Double(totalCheckIns) / Double(possibleCheckIns) * 100) : 0
return Button {
selectedArcForDetail = arc
return NavigationLink {
ArcDetailView(store: store, arc: arc, ritual: ritual)
} label: {
HStack {
VStack(alignment: .leading, spacing: Design.Spacing.xSmall) {

1
Andromida/App/Views/Rituals/Sheets/ArcRenewalSheet.swift
View File

@ -58,7 +58,6 @@ struct ArcRenewalSheet: View {
.sheet(isPresented: $showingEditSheet) {
RitualEditSheet(store: store, categoryStore: categoryStore, ritual: ritual)
}
.presentationSizing(.form)
}
private var celebrationHeader: some View {

2
Andromida/App/Views/Rituals/Sheets/PresetLibrarySheet.swift
View File

@ -47,7 +47,6 @@ struct PresetLibrarySheet: View {
}
.presentationDetents([.large])
.presentationDragIndicator(.visible)
.presentationSizing(.form)
}
// MARK: - Category Picker
@ -197,7 +196,6 @@ struct PresetDetailSheet: View {
}
.presentationDetents([.medium, .large])
.presentationDragIndicator(.visible)
.presentationSizing(.form)
}
private var headerSection: some View {

3
Andromida/App/Views/Rituals/Sheets/RitualEditSheet.swift
View File

@ -93,7 +93,6 @@ struct RitualEditSheet: View {
}
.presentationDetents([.large])
.presentationDragIndicator(.visible)
.presentationSizing(.form)
}
// MARK: - Form Sections
@ -557,7 +556,6 @@ struct IconPickerSheet: View {
}
.presentationDetents([.medium, .large])
.presentationDragIndicator(.visible)
.presentationSizing(.form)
}
private func iconButton(_ icon: String) -> some View {
@ -674,7 +672,6 @@ struct HabitIconPickerSheet: View {
}
.presentationDetents([.medium, .large])
.presentationDragIndicator(.visible)
.presentationSizing(.form)
}
private func iconButton(_ icon: String) -> some View {

1
Andromida/App/Views/Settings/CategoryEditSheet.swift
View File

@ -120,7 +120,6 @@ struct CategoryEditSheet: View {
}
}
.presentationDetents([.medium])
.presentationSizing(.form)
}
private func loadCategory() {

2
Andromida/App/Views/Today/TodayView.swift
View File

@ -51,7 +51,7 @@ struct TodayView: View {
}
} else {
// Use 2-column grid on iPad/landscape when multiple rituals
LazyVGrid(columns: ritualColumns, alignment: .leading, spacing: Design.Spacing.large) {
LazyVGrid(columns: ritualColumns, alignment: .top, spacing: Design.Spacing.large) {
ForEach(todayRituals) { ritual in
TodayRitualSectionView(
focusTitle: ritual.title,