admin/Reflect
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build errors, resolve all warnings, and improve code quality

Browse Source 
Widget Extension Fixes:
- Create standalone WidgetDataProvider for widget data isolation
- Add WIDGET_EXTENSION compiler flag for conditional compilation
- Fix DataController references in widget-shared files
- Sync widget version numbers with main app (23, 1.0.2)
- Add WidgetBackground color to asset catalog

Warning Resolutions:
- Fix UIScreen.main deprecation in BGView and SharingListView
- Fix Text '+' concatenation deprecation in PurchaseButtonView and SettingsTabView
- Fix exhaustive switch in BiometricAuthManager (add .none case)
- Fix var to let in ExportService (3 instances)
- Fix unused result warning in NoteEditorView
- Fix ForEach duplicate ID warnings in MonthView and YearView

Code Quality Improvements:
- Wrap bypassSubscription in #if DEBUG for security
- Rename StupidAssCustomWidgetObservableObject to CustomWidgetStateViewModel
- Add @MainActor to IconViewModel
- Replace fatalError with graceful fallback in SharedModelContainer
- Add [weak self] to closures in DayViewViewModel
- Add OSLog-based AppLogger for production logging
- Add ImageCache with NSCache for memory efficiency
- Add AccessibilityHelpers with Reduce Motion support
- Create DataControllerProtocol for dependency injection
- Update .gitignore with secrets exclusions

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Trey t
2025-12-20 00:48:35 -06:00
parent 31a68b7102
commit 356ce9ea62
41 changed files with 1072 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Shared/Views/BGView.swift
View File

@@ -42,12 +42,9 @@ struct BGView: View, Equatable {
var numDown: Int
let iconSize = 35
init() {
let screenWidth = UIScreen.main.bounds.width
numAcross = Int(screenWidth)/iconSize
let screenHeight = UIScreen.main.bounds.height
numDown = Int(screenHeight)/iconSize
init(screenSize: CGSize = CGSize(width: 393, height: 852)) {
numAcross = Int(screenSize.width) / iconSize
numDown = Int(screenSize.height) / iconSize
}
var randomMood: Mood? {
@@ -80,6 +77,7 @@ struct BGView: View, Equatable {
}
}
#if !WIDGET_EXTENSION
struct BGView_Previews: PreviewProvider {
static var previews: some View {
BGView().modelContainer(DataController.shared.container)
@@ -92,3 +90,4 @@ struct BGView_Previews: PreviewProvider {
.modelContainer(DataController.shared.container)
}
}
#endif

1
Shared/Views/CustomIcon/IconViewModel.swift
View File

@@ -7,6 +7,7 @@
import SwiftUI
@MainActor
class IconViewModel: ObservableObject {
static let numberOfBGItems = 109

16
Shared/Views/CustomizeView/CustomizeView.swift
View File

@@ -579,7 +579,7 @@ struct VotingLayoutPickerCompact: View {
struct CustomWidgetSection: View {
@AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system
@AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = DefaultTextColor.textColor
@StateObject private var selectedWidget = StupidAssCustomWidgetObservableObject()
@StateObject private var selectedWidget = CustomWidgetStateViewModel()
var body: some View {
VStack(spacing: 12) {
@@ -591,16 +591,16 @@ struct CustomWidgetSection: View {
.cornerRadius(12)
.onTapGesture {
EventLogger.log(event: "show_widget")
selectedWidget.fuckingWrapped = widget.copy() as? CustomWidgetModel
selectedWidget.showFuckingSheet = true
selectedWidget.selectedItem = widget.copy() as? CustomWidgetModel
selectedWidget.showSheet = true
}
}
// Add button
Button(action: {
EventLogger.log(event: "tap_create_new_widget")
selectedWidget.fuckingWrapped = CustomWidgetModel.randomWidget
selectedWidget.showFuckingSheet = true
selectedWidget.selectedItem = CustomWidgetModel.randomWidget
selectedWidget.showSheet = true
}) {
ZStack {
RoundedRectangle(cornerRadius: 12)
@@ -625,9 +625,9 @@ struct CustomWidgetSection: View {
.foregroundColor(.accentColor)
}
}
.sheet(isPresented: $selectedWidget.showFuckingSheet) {
if let fuckingWrapped = selectedWidget.fuckingWrapped {
CreateWidgetView(customWidget: fuckingWrapped)
.sheet(isPresented: $selectedWidget.showSheet) {
if let selectedItem = selectedWidget.selectedItem {
CreateWidgetView(customWidget: selectedItem)
}
}
}

16
Shared/Views/CustomizeView/SubViews/CustomWigetView.swift
View File

@@ -10,7 +10,7 @@ import SwiftUI
struct CustomWigetView: View {
@AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system
@AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = DefaultTextColor.textColor
@StateObject private var selectedWidget = StupidAssCustomWidgetObservableObject()
@StateObject private var selectedWidget = CustomWidgetStateViewModel()
var body: some View {
ZStack {
@@ -24,8 +24,8 @@ struct CustomWigetView: View {
.cornerRadius(10)
.onTapGesture {
EventLogger.log(event: "show_widget")
selectedWidget.fuckingWrapped = widget.copy() as? CustomWidgetModel
selectedWidget.showFuckingSheet = true
selectedWidget.selectedItem = widget.copy() as? CustomWidgetModel
selectedWidget.showSheet = true
}
}
RoundedRectangle(cornerRadius: 10).fill().foregroundColor(theme.currentTheme.secondaryBGColor)
@@ -35,8 +35,8 @@ struct CustomWigetView: View {
)
.onTapGesture {
EventLogger.log(event: "tap_create_new_widget")
selectedWidget.fuckingWrapped = CustomWidgetModel.randomWidget
selectedWidget.showFuckingSheet = true
selectedWidget.selectedItem = CustomWidgetModel.randomWidget
selectedWidget.showSheet = true
}
}
.padding()
@@ -52,9 +52,9 @@ struct CustomWigetView: View {
}
.fixedSize(horizontal: false, vertical: true)
.cornerRadius(Constants.viewsCornerRaidus, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
.sheet(isPresented: $selectedWidget.showFuckingSheet) {
if let fuckingWrapped = selectedWidget.fuckingWrapped {
CreateWidgetView(customWidget: fuckingWrapped)
.sheet(isPresented: $selectedWidget.showSheet) {
if let selectedItem = selectedWidget.selectedItem {
CreateWidgetView(customWidget: selectedItem)
}
}
}

8
Shared/Views/DayView/DayViewViewModel.swift
View File

@@ -35,12 +35,14 @@ class DayViewViewModel: ObservableObject {
init(addMonthStartWeekdayPadding: Bool) {
self.addMonthStartWeekdayPadding = addMonthStartWeekdayPadding
DataController.shared.switchContainerListeners.append {
DataController.shared.switchContainerListeners.append { [weak self] in
guard let self = self else { return }
self.getGroupedData(addMonthStartWeekdayPadding: self.addMonthStartWeekdayPadding)
}
DataController.shared.addNewDataListener {
withAnimation{
DataController.shared.addNewDataListener { [weak self] in
guard let self = self else { return }
withAnimation {
self.updateData()
}
}

10
Shared/Views/MonthView/MonthDetailView.swift
View File

@@ -13,7 +13,7 @@ struct MonthDetailView: View {
@AppStorage(UserDefaultsStore.Keys.moodTint.rawValue, store: GroupUserDefaults.groupDefaults) private var moodTint: MoodTints = .Default
@AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = DefaultTextColor.textColor
@StateObject private var shareImage = StupidAssShareObservableObject()
@StateObject private var shareImage = ShareImageStateViewModel()
@State private var showingSheet = false
@State private var selectedEntry: MoodEntryModel?
@@ -58,8 +58,8 @@ struct MonthDetailView: View {
impactMed.impactOccurred()
let _image = self.image
self.shareImage.showFuckingSheet = true
self.shareImage.fuckingWrappedShrable = _image
self.shareImage.showSheet = true
self.shareImage.selectedShareImage = _image
}
}
.background(
@@ -81,8 +81,8 @@ struct MonthDetailView: View {
.background(
theme.currentTheme.bg
)
.sheet(isPresented: self.$shareImage.showFuckingSheet) {
if let uiImage = self.shareImage.fuckingWrappedShrable {
.sheet(isPresented: self.$shareImage.showSheet) {
if let uiImage = self.shareImage.selectedShareImage {
ShareSheet(photo: uiImage)
}
}

54
Shared/Views/MonthView/MonthView.swift
View File

@@ -18,20 +18,20 @@ struct MonthView: View {
@AppStorage(UserDefaultsStore.Keys.shape.rawValue, store: GroupUserDefaults.groupDefaults) private var shape: BGShape = .circle
@StateObject private var shareImage = StupidAssShareObservableObject()
@StateObject private var shareImage = ShareImageStateViewModel()
// store a value that gets changed when user updates custom colors to update the view since the moodTint doesn't change
@AppStorage(UserDefaultsStore.Keys.customMoodTintUpdateNumber.rawValue, store: GroupUserDefaults.groupDefaults) private var customMoodTintUpdateNumber: Int = 0
@EnvironmentObject var iapManager: IAPManager
@StateObject private var selectedDetail = StupidAssDetailViewObservableObject()
@StateObject private var selectedDetail = DetailViewStateViewModel()
@State private var showingSheet = false
@StateObject private var onboardingData = OnboardingDataDataManager.shared
@StateObject private var filteredDays = DaysFilterClass.shared
class StupidAssDetailViewObservableObject: ObservableObject {
@Published var fuckingWrapped: MonthDetailView? = nil
@Published var showFuckingSheet = false
class DetailViewStateViewModel: ObservableObject {
@Published var selectedItem: MonthDetailView? = nil
@Published var showSheet = false
}
// Heatmap-style grid with tight spacing
@@ -70,12 +70,12 @@ struct MonthView: View {
entries: entries,
parentViewModel: viewModel
)
selectedDetail.fuckingWrapped = detailView
selectedDetail.showFuckingSheet = true
selectedDetail.selectedItem = detailView
selectedDetail.showSheet = true
},
onShare: { image in
shareImage.fuckingWrappedShrable = image
shareImage.showFuckingSheet = true
shareImage.selectedShareImage = image
shareImage.showSheet = true
}
)
}
@@ -139,12 +139,12 @@ struct MonthView: View {
theme.currentTheme.bg
.edgesIgnoringSafeArea(.all)
)
.sheet(isPresented: $selectedDetail.showFuckingSheet,
.sheet(isPresented: $selectedDetail.showSheet,
onDismiss: didDismiss) {
selectedDetail.fuckingWrapped
selectedDetail.selectedItem
}
.sheet(isPresented: self.$shareImage.showFuckingSheet) {
if let uiImage = self.shareImage.fuckingWrappedShrable {
.sheet(isPresented: self.$shareImage.showSheet) {
if let uiImage = self.shareImage.selectedShareImage {
ImageOnlyShareSheet(photo: uiImage)
}
}
@@ -157,8 +157,8 @@ struct MonthView: View {
func didDismiss() {
selectedDetail.showFuckingSheet = false
selectedDetail.fuckingWrapped = nil
selectedDetail.showSheet = false
selectedDetail.selectedItem = nil
}
}
@@ -329,8 +329,8 @@ struct MonthCard: View {
// Weekday Labels
HStack(spacing: 2) {
ForEach(weekdayLabels, id: \.self) { day in
Text(day)
ForEach(weekdayLabels.indices, id: \.self) { index in
Text(weekdayLabels[index])
.font(.caption2.weight(.medium))
.foregroundColor(textColor.opacity(0.5))
.frame(maxWidth: .infinity)
@@ -384,6 +384,26 @@ struct HeatmapCell: View {
RoundedRectangle(cornerRadius: 4)
.fill(cellColor)
.aspectRatio(1, contentMode: .fit)
.accessibilityLabel(accessibilityDescription)
.accessibilityHint(entry.mood != .placeholder && entry.mood != .missing ? "Double tap to edit" : "")
}
private var accessibilityDescription: String {
if entry.mood == .placeholder {
return "Empty day"
} else if entry.mood == .missing {
return "No mood logged for \(formattedDate)"
} else if !isFiltered {
return "\(formattedDate): \(entry.mood.strValue) (filtered out)"
} else {
return "\(formattedDate): \(entry.mood.strValue)"
}
}
private var formattedDate: String {
let formatter = DateFormatter()
formatter.dateStyle = .medium
return formatter.string(from: entry.forDate)
}
private var cellColor: Color {

2
Shared/Views/NoteEditorView.swift
View File

@@ -461,7 +461,7 @@ struct EntryDetailView: View {
}
if entry.photoID != nil {
Button("Remove Photo", role: .destructive) {
PhotoManager.shared.deletePhoto(id: entry.photoID!)
_ = PhotoManager.shared.deletePhoto(id: entry.photoID!)
_ = DataController.shared.updatePhoto(forDate: entry.forDate, photoID: nil)
}
}

9
Shared/Views/PurchaseButtonView.swift
View File

@@ -181,14 +181,7 @@ struct PurchaseButtonView: View {
.foregroundColor(.orange)
if let expirationDate = iapManager.trialExpirationDate {
Text(String(localized: "purchase_view_trial_expires_in"))
.foregroundColor(textColor)
+
Text(" ")
+
Text(expirationDate, style: .relative)
.foregroundColor(.orange)
.bold()
Text("\(Text(String(localized: "purchase_view_trial_expires_in")).foregroundColor(textColor)) \(Text(expirationDate, style: .relative).foregroundColor(.orange).bold())")
}
}
.font(.body)

8
Shared/Views/SettingsView/SettingsTabView.swift
View File

@@ -96,13 +96,7 @@ struct UpgradeBannerView: View {
.foregroundColor(.orange)
if let expirationDate = trialExpirationDate {
Text("Trial expires in ")
.font(.system(size: 14, weight: .medium))
.foregroundColor(textColor.opacity(0.8))
+
Text(expirationDate, style: .relative)
.font(.system(size: 14, weight: .bold))
.foregroundColor(.orange)
Text("\(Text("Trial expires in ").font(.system(size: 14, weight: .medium)).foregroundColor(textColor.opacity(0.8)))\(Text(expirationDate, style: .relative).font(.system(size: 14, weight: .bold)).foregroundColor(.orange))")
} else {
Text("Trial expired")
.font(.system(size: 14, weight: .medium))

22
Shared/Views/Sharing/SharingListView.swift
View File

@@ -26,12 +26,12 @@ struct SharingListView: View {
@AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system
@AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = DefaultTextColor.textColor
class StupidAssObservableObject: ObservableObject {
@Published var fuckingWrappedShrable: WrappedSharable? = nil
@Published var showFuckingSheet = false
class ShareStateViewModel: ObservableObject {
@Published var selectedItem: WrappedSharable? = nil
@Published var showSheet = false
}
@StateObject private var selectedShare = StupidAssObservableObject()
@StateObject private var selectedShare = ShareStateViewModel()
var sharebleItems = [WrappedSharable]()
@MainActor
@@ -91,8 +91,8 @@ struct SharingListView: View {
func didDismiss() {
selectedShare.showFuckingSheet = false
selectedShare.fuckingWrappedShrable = nil
selectedShare.showSheet = false
selectedShare.selectedItem = nil
}
var body: some View {
@@ -100,8 +100,8 @@ struct SharingListView: View {
ScrollView {
ForEach(sharebleItems, id: \.self) { item in
Button(action: {
selectedShare.fuckingWrappedShrable = item
selectedShare.showFuckingSheet = true
selectedShare.selectedItem = item
selectedShare.showSheet = true
}, label: {
ZStack {
theme.currentTheme.secondaryBGColor
@@ -127,7 +127,7 @@ struct SharingListView: View {
.cornerRadius(Constants.viewsCornerRaidus, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
.scaledToFill()
.clipped()
.contentShape(Path(CGRect(x: 0, y: 0, width: UIScreen.main.bounds.width, height: 88)))
.contentShape(Rectangle())
.padding([.leading, .trailing])
})
}
@@ -139,9 +139,9 @@ struct SharingListView: View {
theme.currentTheme.bg
.edgesIgnoringSafeArea(.top)
)
.sheet(isPresented: $selectedShare.showFuckingSheet,
.sheet(isPresented: $selectedShare.showSheet,
onDismiss: didDismiss) {
selectedShare.fuckingWrappedShrable?.destination
selectedShare.selectedItem?.destination
}
}

10
Shared/Views/SharingTemplates/AllMoodsTotalTemplate.swift
View File

@@ -22,7 +22,7 @@ struct AllMoodsTotalTemplate: View, SharingTemplate {
@AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system
@AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = .white
@StateObject private var shareImage = StupidAssShareObservableObject()
@StateObject private var shareImage = ShareImageStateViewModel()
private var entries = [MoodMetrics]()
@MainActor
@@ -166,8 +166,8 @@ struct AllMoodsTotalTemplate: View, SharingTemplate {
HStack(alignment: .center) {
Button(action: {
let _image = self.image
self.shareImage.showFuckingSheet = true
self.shareImage.fuckingWrappedShrable = _image
self.shareImage.showSheet = true
self.shareImage.selectedShareImage = _image
}, label: {
Text("Share")
.font(.title)
@@ -206,8 +206,8 @@ struct AllMoodsTotalTemplate: View, SharingTemplate {
.scaleEffect(2)
} else {
mainView
.sheet(isPresented: self.$shareImage.showFuckingSheet) {
if let uiImage = self.shareImage.fuckingWrappedShrable {
.sheet(isPresented: self.$shareImage.showSheet) {
if let uiImage = self.shareImage.selectedShareImage {
ShareSheet(photo: uiImage)
}
}

10
Shared/Views/SharingTemplates/CurrentStreakTemplate.swift
View File

@@ -18,7 +18,7 @@ struct CurrentStreakTemplate: View, SharingTemplate {
let moodEntries: [MoodEntryModel]
@State var showSharingTemplate = false
@StateObject private var shareImage = StupidAssShareObservableObject()
@StateObject private var shareImage = ShareImageStateViewModel()
@Environment(\.presentationMode) var presentationMode
@AppStorage(UserDefaultsStore.Keys.moodTint.rawValue, store: GroupUserDefaults.groupDefaults) private var moodTint: MoodTints = .Default
@@ -109,8 +109,8 @@ struct CurrentStreakTemplate: View, SharingTemplate {
HStack(alignment: .center) {
Button(action: {
let _image = self.image
self.shareImage.showFuckingSheet = true
self.shareImage.fuckingWrappedShrable = _image
self.shareImage.showSheet = true
self.shareImage.selectedShareImage = _image
}, label: {
Text("Share")
.font(.title)
@@ -118,8 +118,8 @@ struct CurrentStreakTemplate: View, SharingTemplate {
.foregroundColor(Color.white)
.padding(.top, 20)
})
.sheet(isPresented: self.$shareImage.showFuckingSheet) {
if let uiImage = self.shareImage.fuckingWrappedShrable {
.sheet(isPresented: self.$shareImage.showSheet) {
if let uiImage = self.shareImage.selectedShareImage {
ShareSheet(photo: uiImage)
}
}

10
Shared/Views/SharingTemplates/LongestStreakTemplate.swift
View File

@@ -28,7 +28,7 @@ struct LongestStreakTemplate: View, SharingTemplate {
@State var selectedMood: Mood = .great
@State var showSharingTemplate = false
@StateObject private var shareImage = StupidAssShareObservableObject()
@StateObject private var shareImage = ShareImageStateViewModel()
@Environment(\.presentationMode) var presentationMode
@AppStorage(UserDefaultsStore.Keys.moodTint.rawValue, store: GroupUserDefaults.groupDefaults) private var moodTint: MoodTints = .Default
@@ -185,8 +185,8 @@ struct LongestStreakTemplate: View, SharingTemplate {
HStack(alignment: .center) {
Button(action: {
let _image = self.image
self.shareImage.showFuckingSheet = true
self.shareImage.fuckingWrappedShrable = _image
self.shareImage.showSheet = true
self.shareImage.selectedShareImage = _image
}, label: {
Text("Share")
.font(.title)
@@ -194,8 +194,8 @@ struct LongestStreakTemplate: View, SharingTemplate {
.foregroundColor(Color.white)
.padding(.top, 20)
})
.sheet(isPresented: self.$shareImage.showFuckingSheet) {
if let uiImage = self.shareImage.fuckingWrappedShrable {
.sheet(isPresented: self.$shareImage.showSheet) {
if let uiImage = self.shareImage.selectedShareImage {
ShareSheet(photo: uiImage)
}
}

10
Shared/Views/SharingTemplates/MonthTotalTemplate.swift
View File

@@ -20,7 +20,7 @@ struct MonthTotalTemplate: View, SharingTemplate {
private var month = Calendar.current.dateComponents([.month], from: Date()).month!
@State var showSharingTemplate = false
@StateObject private var shareImage = StupidAssShareObservableObject()
@StateObject private var shareImage = ShareImageStateViewModel()
@Environment(\.presentationMode) var presentationMode
@AppStorage(UserDefaultsStore.Keys.moodTint.rawValue, store: GroupUserDefaults.groupDefaults) private var moodTint: MoodTints = .Default
@@ -149,8 +149,8 @@ struct MonthTotalTemplate: View, SharingTemplate {
HStack(alignment: .center) {
Button(action: {
let _image = self.image
self.shareImage.showFuckingSheet = true
self.shareImage.fuckingWrappedShrable = _image
self.shareImage.showSheet = true
self.shareImage.selectedShareImage = _image
}, label: {
Text("Share")
.font(.title)
@@ -158,8 +158,8 @@ struct MonthTotalTemplate: View, SharingTemplate {
.foregroundColor(Color.white)
.padding(.top, 20)
})
.sheet(isPresented: self.$shareImage.showFuckingSheet) {
if let uiImage = self.shareImage.fuckingWrappedShrable {
.sheet(isPresented: self.$shareImage.showSheet) {
if let uiImage = self.shareImage.selectedShareImage {
ShareSheet(photo: uiImage)
}
}

27
Shared/Views/YearView/YearView.swift
View File

@@ -24,7 +24,7 @@ struct YearView: View {
@EnvironmentObject var iapManager: IAPManager
@StateObject public var viewModel: YearViewModel
@StateObject private var filteredDays = DaysFilterClass.shared
@StateObject private var shareImage = StupidAssShareObservableObject()
@StateObject private var shareImage = ShareImageStateViewModel()
@State private var trialWarningHidden = false
@State private var showSubscriptionStore = false
@@ -49,8 +49,8 @@ struct YearView: View {
theme: theme,
filteredDays: filteredDays.currentFilters,
onShare: { image in
shareImage.fuckingWrappedShrable = image
shareImage.showFuckingSheet = true
shareImage.selectedShareImage = image
shareImage.showSheet = true
}
)
}
@@ -100,8 +100,8 @@ struct YearView: View {
.sheet(isPresented: $showSubscriptionStore) {
FeelsSubscriptionStoreView()
}
.sheet(isPresented: $shareImage.showFuckingSheet) {
if let uiImage = shareImage.fuckingWrappedShrable {
.sheet(isPresented: $shareImage.showSheet) {
if let uiImage = shareImage.selectedShareImage {
ImageOnlyShareSheet(photo: uiImage)
}
}
@@ -340,8 +340,8 @@ struct YearCard: View {
// Month Labels
HStack(spacing: 2) {
ForEach(months, id: \.self) { month in
Text(month)
ForEach(months.indices, id: \.self) { index in
Text(months[index])
.font(.system(size: 9, weight: .medium))
.foregroundColor(textColor.opacity(0.5))
.frame(maxWidth: .infinity)
@@ -419,6 +419,19 @@ struct YearHeatmapCell: View {
RoundedRectangle(cornerRadius: 2)
.fill(cellColor)
.aspectRatio(1, contentMode: .fit)
.accessibilityLabel(accessibilityDescription)
}
private var accessibilityDescription: String {
if !isFiltered {
return "Filtered out"
} else if color == Mood.placeholder.color {
return "Empty"
} else if color == Mood.missing.color {
return "No mood logged"
} else {
return "Mood entry"
}
}
private var cellColor: Color {