bunch of random work

Shared/views/CustomizeView/SubViews/DayFilterPickerView.swift

@@ -12,13 +12,13 @@ struct DayFilterPickerView: View {
     @AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = DefaultTextColor.textColor
     @StateObject private var filteredDays = DaysFilterClass.shared
     
-    let weekdays = [("Sun", 1),
-                    ("mon", 2),
-                    ("tue", 3),
-                    ("wed", 4),
-                    ("thur", 5),
-                    ("fri", 6),
-                    ("sat", 7)]
+    let weekdays = [(Calendar.current.shortWeekdaySymbols[0], 1),
+                    (Calendar.current.shortWeekdaySymbols[1], 2),
+                    (Calendar.current.shortWeekdaySymbols[2], 3),
+                    (Calendar.current.shortWeekdaySymbols[3], 4),
+                    (Calendar.current.shortWeekdaySymbols[4], 5),
+                    (Calendar.current.shortWeekdaySymbols[5], 6),
+                    (Calendar.current.shortWeekdaySymbols[6], 7)]
     
     var body: some View {
         ZStack {

Shared/views/DayView/DayView.swift

@@ -320,13 +320,6 @@ struct ViewOffsetKey: PreferenceKey {
     }
 }
 
-private let itemFormatter: DateFormatter = {
-    let formatter = DateFormatter()
-    formatter.dateStyle = .short
-    formatter.timeStyle = .medium
-    return formatter
-}()
-
 struct DayView_Previews: PreviewProvider {
     static var previews: some View {
         DayView(viewModel: DayViewViewModel(addMonthStartWeekdayPadding: false)).environment(\.managedObjectContext, PersistenceController.shared.viewContext)

Shared/views/MonthView/MonthView.swift

@@ -204,6 +204,7 @@ extension MonthView {
             LazyVGrid(columns: columns, spacing: 15) {
                 ForEach(entries, id: \.self) { entry in
                     if filteredDays.currentFilters.contains(Int(entry.weekDay)) {
+                        let _ = print(entry.weekDay, entry.forDate, filteredDays.currentFilters, entry.id)
                         shape.view(withText: Text(""),
                                    bgColor: entry.mood == .placeholder ? .clear : moodTint.color(forMood: entry.mood),
                                    textColor: .clear)

Shared/views/SettingsView/SettingsView.swift

@@ -50,7 +50,7 @@ struct SettingsView: View {
                     if useCloudKit {
                         cloudKitStatus
                     }
-                    
+                    fixWeekday
                     exportData
                     importData
                     Divider()
@@ -96,6 +96,7 @@ struct SettingsView: View {
                 if selectedFile.startAccessingSecurityScopedResource() {
                     let dateFormatter = DateFormatter()
                     dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss +0000"
+                    dateFormatter.timeZone = TimeZone(abbreviation: "UTC")
                     
                     guard let input = String(data: try Data(contentsOf: selectedFile), encoding: .utf8) else { return }
                     defer { selectedFile.stopAccessingSecurityScopedResource() }
@@ -114,7 +115,10 @@ struct SettingsView: View {
                         moodEntry.forDate = dateFormatter.date(from: columns[3])
                         moodEntry.moodValue = Int16(columns[4])!
                         moodEntry.timestamp = dateFormatter.date(from: columns[5])
-                        moodEntry.weekDay = Int16(columns[6])!
+                        
+                        let localTime = dateFormatter.date(from: columns[3])!.toLocalTime()
+                        moodEntry.weekDay = Int16(Calendar.current.component(.weekday, from: localTime))
+                        
                         try! PersistenceController.shared.viewContext.save()
                     }
                     PersistenceController.shared.saveAndRunDataListerners()
@@ -208,6 +212,21 @@ struct SettingsView: View {
         .cornerRadius(Constants.viewsCornerRaidus, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
     }
     
+    private var fixWeekday: some View {
+        ZStack {
+            theme.currentTheme.secondaryBGColor
+            Button(action: {
+                PersistenceController.shared.fixWrongWeekdays()
+            }, label: {
+                Text("Fix Weekday")
+                    .foregroundColor(textColor)
+            })
+                .padding()
+        }
+        .fixedSize(horizontal: false, vertical: true)
+        .cornerRadius(Constants.viewsCornerRaidus, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
+    }
+    
     private var whyBackgroundMode: some View {
         ZStack {
             theme.currentTheme.secondaryBGColor