Merge pull request #7 from r-token/bug/fix-monthly-off-by-one

Fix an off-by-one bug on the 'monthly' preference

Author: r-token

CatchUp-SwiftUI.xcodeproj/project.pbxproj

@@ -504,7 +504,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.1.0;
+				MARKETING_VERSION = 3.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.tokensolutions.CatchUp;
 				PRODUCT_NAME = CatchUp;
 				SUPPORTS_MACCATALYST = NO;
@@ -532,7 +532,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.1.0;
+				MARKETING_VERSION = 3.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.tokensolutions.CatchUp;
 				PRODUCT_NAME = CatchUp;
 				SUPPORTS_MACCATALYST = NO;

CatchUp-SwiftUI/Utilities/Conversions.swift

@@ -136,25 +136,25 @@ struct Converter {
 		let weekday: String
 
 		switch contact.notification_preference_weekday {
-		case 0:
+		case 1:
 			weekday = "Sunday"
 			break
-		case 1:
+		case 2:
 			weekday = "Monday"
 			break
-		case 2:
+		case 3:
 			weekday = "Tuesday"
 			break
-		case 3:
+		case 4:
 			weekday = "Wednesday"
 			break
-		case 4:
+		case 5:
 			weekday = "Thursday"
 			break
-		case 5:
+		case 6:
 			weekday = "Friday"
 			break
-		case 6:
+		case 7:
 			weekday = "Saturday"
 			break
 		default:

CatchUp-SwiftUI/Utilities/NotificationHelper.swift

@@ -103,9 +103,9 @@ struct NotificationHelper {
         } else if contact.preferenceIsWeekly() || contact.preferenceIsMonthly() {
             components.hour = contact.notification_preference_hour
             components.minute = contact.notification_preference_minute
-            components.weekday = contact.notification_preference_weekday+1
+            components.weekday = contact.notification_preference_weekday
             if contact.notification_preference_week_of_month != 0 {
-                components.weekOfMonth = contact.notification_preference_week_of_month+1
+                components.weekOfMonth = contact.notification_preference_week_of_month
             }
         } else if contact.preferenceIsQuarterly() {
             print("Quarterly is handled separately by UNTimeIntervalNotificationTrigger. Fallthrough.")
@@ -154,12 +154,11 @@ struct NotificationHelper {
         } else if contact.preferenceIsWeekly() {
             dateComponents.hour = contact.notification_preference_hour
             dateComponents.minute = contact.notification_preference_minute
-            // weekday units are 1-7, I store them as 0-6 though. Need to add 1
-            dateComponents.weekday = contact.notification_preference_weekday+1
+            dateComponents.weekday = contact.notification_preference_weekday
         } else if contact.preferenceIsMonthly() {
             dateComponents.hour = contact.notification_preference_hour
             dateComponents.minute = contact.notification_preference_minute
-            dateComponents.weekday = contact.notification_preference_weekday+1
+            dateComponents.weekday = contact.notification_preference_weekday
             dateComponents.weekOfMonth = contact.notification_preference_week_of_month
         } else if contact.preferenceIsAnnually() || contact.preferenceIsCustom() {
             if contact.preferenceIsAnnually() {

CatchUp-SwiftUI/Views/DetailScreen Subviews/NotificationPreferenceView.swift

@@ -43,7 +43,7 @@ struct NotificationPreferenceView: View {
                 // Day of the Week Picker
                 Picker(selection: $contact.notification_preference_weekday, label: Text(whatDayText)) {
                     ForEach(0..<dayOptions.count, id: \.self) { index in
-                        Text(dayOptions[index].rawValue).tag(index)
+                        Text(dayOptions[index].rawValue).tag(index+1)
                     }
                 }
 
@@ -93,13 +93,13 @@ struct NotificationPreferenceView: View {
             if newValue != initialNotificationPreference {
                 print("contact.notification_preference changed")
                 initialNotificationPreference = 999
-                contact.notification_preference_week_of_month = .random(in: 2..<5)
 
                 if newValue == 2 { // weekly
                     whatDayText = "What day?"
                     contact.notification_preference_week_of_month = 0
                 } else if newValue == 3 { // monthly
                     whatDayText = "What day? We'll pick a random week."
+                    contact.notification_preference_week_of_month = .random(in: 2..<5)
                 } else if newValue == 4 { // quarterly
                     contact.notification_preference_quarterly_set_time = Date()
                     print("scheduling quarterly time interval notification")