Merge pull request #12 from alyxferrari/version-1.0.6

Sobretium v1.0.6

Author: alyxandraio

Sobretium.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		035E0CEE2908DE7E00F71A06 /* AppBanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 035E0CED2908DE7E00F71A06 /* AppBanner.swift */; };
+		03A94CF6292427780084C8F3 /* WhatsNewKit in Frameworks */ = {isa = PBXBuildFile; productRef = 03A94CF5292427780084C8F3 /* WhatsNewKit */; };
 		1C229D3228EF523D006583DF /* SobretiumWatchApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C229D3128EF523D006583DF /* SobretiumWatchApp.swift */; };
 		1C229D3428EF523D006583DF /* WatchContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C229D3328EF523D006583DF /* WatchContentView.swift */; };
 		1C229D3628EF5241006583DF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1C229D3528EF5241006583DF /* Assets.xcassets */; };
@@ -130,6 +131,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				03A94CF6292427780084C8F3 /* WhatsNewKit in Frameworks */,
 				1C98187928FF246C00FF68BD /* PopupView in Frameworks */,
 				1C9F35EA28E60A3300C69CCB /* PathText in Frameworks */,
 				1C9F35ED28E60A6300C69CCB /* Time in Frameworks */,
@@ -336,6 +338,7 @@
 				1C9F35E928E60A3300C69CCB /* PathText */,
 				1C9F35EC28E60A6300C69CCB /* Time */,
 				1C98187828FF246C00FF68BD /* PopupView */,
+				03A94CF5292427780084C8F3 /* WhatsNewKit */,
 			);
 			productName = Sobretium;
 			productReference = 1C91B1DB28D0F2E00062C18A /* Sobretium.app */;
@@ -372,6 +375,7 @@
 				1C9F35E828E60A3300C69CCB /* XCRemoteSwiftPackageReference "CurvyText" */,
 				1C9F35EB28E60A6300C69CCB /* XCRemoteSwiftPackageReference "time" */,
 				1C98187728FF246C00FF68BD /* XCRemoteSwiftPackageReference "PopupView" */,
+				03A94CF4292427780084C8F3 /* XCRemoteSwiftPackageReference "WhatsNewKit" */,
 			);
 			productRefGroup = 1C91B1DC28D0F2E00062C18A /* Products */;
 			projectDirPath = "";
@@ -463,7 +467,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_ENTITLEMENTS = "SobretiumWatch Watch App/SobretiumWatch Watch App.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 225;
+				CURRENT_PROJECT_VERSION = 226;
 				DEVELOPMENT_ASSET_PATHS = "\"SobretiumWatch Watch App/Preview Content\"";
 				DEVELOPMENT_TEAM = W8C8UQ95CG;
 				ENABLE_PREVIEWS = YES;
@@ -477,7 +481,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.5;
+				MARKETING_VERSION = 1.0.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.alyxferrari.Sobretium.watchkitapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = watchos;
@@ -497,7 +501,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_ENTITLEMENTS = "SobretiumWatch Watch App/SobretiumWatch Watch App.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 225;
+				CURRENT_PROJECT_VERSION = 226;
 				DEVELOPMENT_ASSET_PATHS = "\"SobretiumWatch Watch App/Preview Content\"";
 				DEVELOPMENT_TEAM = W8C8UQ95CG;
 				ENABLE_PREVIEWS = YES;
@@ -511,7 +515,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.5;
+				MARKETING_VERSION = 1.0.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.alyxferrari.Sobretium.watchkitapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = watchos;
@@ -645,7 +649,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Sobretium/Sobretium.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 225;
+				CURRENT_PROJECT_VERSION = 246;
 				DEVELOPMENT_ASSET_PATHS = "\"Sobretium/Preview Content\"";
 				DEVELOPMENT_TEAM = W8C8UQ95CG;
 				ENABLE_PREVIEWS = YES;
@@ -667,15 +671,15 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.5;
+				MARKETING_VERSION = 1.0.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.alyxferrari.Sobretium;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
 		};
@@ -687,7 +691,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Sobretium/Sobretium.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 225;
+				CURRENT_PROJECT_VERSION = 246;
 				DEVELOPMENT_ASSET_PATHS = "\"Sobretium/Preview Content\"";
 				DEVELOPMENT_TEAM = W8C8UQ95CG;
 				ENABLE_PREVIEWS = YES;
@@ -706,15 +710,15 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.5;
+				MARKETING_VERSION = 1.0.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.alyxferrari.Sobretium;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;
 		};
@@ -751,6 +755,14 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
+		03A94CF4292427780084C8F3 /* XCRemoteSwiftPackageReference "WhatsNewKit" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/SvenTiigi/WhatsNewKit";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 2.0.0;
+			};
+		};
 		1C98187728FF246C00FF68BD /* XCRemoteSwiftPackageReference "PopupView" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/exyte/PopupView";
@@ -778,6 +790,11 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
+		03A94CF5292427780084C8F3 /* WhatsNewKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 03A94CF4292427780084C8F3 /* XCRemoteSwiftPackageReference "WhatsNewKit" */;
+			productName = WhatsNewKit;
+		};
 		1C98187828FF246C00FF68BD /* PopupView */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 1C98187728FF246C00FF68BD /* XCRemoteSwiftPackageReference "PopupView" */;

Sobretium.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import WhatsNewKit
 
 @main
 struct SobretiumApp: App {
@@ -14,6 +15,41 @@ struct SobretiumApp: App {
         WindowGroup {
             ContentView()
                 .environment(\.managedObjectContext, dataController.container.viewContext)
+                .environment(\.whatsNew, WhatsNewEnvironment(versionStore: UserDefaultsWhatsNewVersionStore(), whatsNewCollection: self))
         }
     }
 }
+
+extension SobretiumApp: WhatsNewCollectionProvider {
+    var whatsNewCollection: WhatsNewCollection {
+        WhatsNew(
+            version: "1.0.6",
+            title: .init(text: .init("What's New in " + AttributedString("Sobretium", attributes: .foregroundColor(.red)))),
+            features: [
+                .init(
+                    image: .init(systemName: "sparkles", foregroundColor: .yellow),
+                    title: "Extended tracker length support",
+                    subtitle: "Trackers with a length of 365 days or greater are now supported."
+                ),
+                .init(
+                    image: .init(systemName: "iphone", foregroundColor: .accentColor), // gray?
+                    title: "'What's New' summaries",
+                    subtitle: "That's this! Future app updates will ship with a summary of the changes introduced in the update."
+                ),
+                .init(
+                    image: .init(systemName: "wand.and.stars.inverse", foregroundColor: .cyan),
+                    title: "Bug Fixes",
+                    subtitle: "In previous versions, length summaries for each tracker on the tracker list didn't update until the app reloaded. This has been fixed."
+                )
+            ]
+        )
+    }
+}
+
+extension AttributeContainer {
+    static func foregroundColor(_ color: Color) -> Self {
+        var container = Self()
+        container.foregroundColor = color
+        return container
+    }
+}

Sobretium.xcodeproj/project.xcworkspace/xcuserdata/tarball.xcuserdatad/UserInterfaceState.xcuserstate

@@ -7,19 +7,24 @@
 
 import SwiftUI
 import LocalAuthentication
+import WhatsNewKit
 
 struct ContentView: View {
     @AppStorage("stealth") var stealth: Bool = false
     @AppStorage("biometry") var biometry: Bool = false
     @AppStorage("launchCount") var launchCount: Int = 0
+    @Environment(\.managedObjectContext) var moc
+    @Environment(\.whatsNew) var whatsNewEnvironment
+    @FetchRequest(sortDescriptors: []) var entries: FetchedResults<SobrietyEntry>
     @State var addTrackerSheetPresented: Bool = false
     @State var editTrackerSheetPresented: Bool = false
-    @FetchRequest(sortDescriptors: []) var entries: FetchedResults<SobrietyEntry>
     @State var deletionCandidate: SobrietyEntry?
     @State var deletionAlertPresented: Bool = false
-    @Environment(\.managedObjectContext) var moc
     @State var authenticated: Bool = false
     @State var linkSelection: String?
+    #if DEBUG
+    @State var whatsNew: WhatsNew?
+    #endif
     var updateListenerTask: Task<Void, Error>? = nil
     init() {
         updateListenerTask = listenForTransactions()
@@ -36,10 +41,18 @@ struct ContentView: View {
                         }
                     } else {
                         List {
+                            #if DEBUG
+                            Section(header: Text("Debug")) {
+                                Button("Present 'What's New' Sheet") {
+                                    whatsNew = whatsNewEnvironment.whatsNewCollection.last!
+                                }
+                                .sheet(whatsNew: $whatsNew)
+                            }
+                            #endif
                             Section(header: Text(stealth ? "Trackers" : "Sobriety Trackers")) {
                                 ForEach(entries) { entry in
                                     if entry.startDate != nil && entry.name != nil {
-                                        NavigationLink(tag: entry.name!, selection: $linkSelection) {
+                                        NavigationLink(tag: entry.name ?? UUID().uuidString, selection: $linkSelection) {
                                             RingView(entry)
                                         } label: {
                                             SobrietyEntryLabel(entry)
@@ -110,6 +123,7 @@ struct ContentView: View {
                         deletionAlertPresented = false
                     }
                 }
+                .whatsNewSheet()
             }
         }
         .onAppear(perform: authenticate)
@@ -142,7 +156,7 @@ struct ContentView: View {
         launchCount += 1
         for entry in entries {
             if entry.defaultEntry {
-                linkSelection = entry.name!
+                linkSelection = entry.name ?? UUID().uuidString
                 authenticated = true
                 return
             }

Sobretium/Entrypoint/SobretiumApp.swift

@@ -8,16 +8,16 @@
 import SwiftUI
 
 struct SobrietyEntryLabel: View {
-    @State var entry: SobrietyEntry
+    @ObservedObject var entry: SobrietyEntry
     let gradient = LinearGradient(gradient: Gradient(colors: [.accentColor, .cyan, .accentColor]), startPoint: .leading, endPoint: .trailing)
     init(_ entry: SobrietyEntry) {
-        self._entry = State(initialValue: entry)
+        self._entry = ObservedObject(initialValue: entry)
     }
     var body: some View {
         HStack {
-            Text(entry.name!)
+            Text(entry.name ?? "Error")
             Spacer()
-            Text(entry.startDate!.daysAgoString)
+            Text((entry.startDate ?? Date()).daysAgoString)
                 .frame(minWidth: 0, minHeight: 0)
                 .padding(.vertical, 5)
                 .padding(.horizontal, 15)

Sobretium/Main View/ContentView.swift

@@ -11,16 +11,16 @@ struct RingView: View {
     @Environment(\.presentationMode) var presentation
     @Environment(\.managedObjectContext) var moc
     @AppStorage("ringType") var ringType: Bool = false
-    @State var entry: SobrietyEntry
+    @ObservedObject var entry: SobrietyEntry
     @State var editTrackerSheetPresented: Bool = false
     @State var resetDateAlertPresented: Bool = false
     let gradient = LinearGradient(gradient: Gradient(colors: [.accentColor, .cyan, .accentColor]), startPoint: .leading, endPoint: .trailing)
     init(_ entry: SobrietyEntry) {
-        self._entry = State(initialValue: entry)
+        self._entry = ObservedObject(initialValue: entry)
     }
     var body: some View {
         VStack {
-            Text(entry.subtitle ?? "I've been \(entry.name!.lowercased()) free for")
+            Text(entry.subtitle ?? "I've been \((entry.name ?? "Error").lowercased()) free for")
                 .frame(minWidth: 0, minHeight: 0)
                 .padding(.vertical, 5)
                 .padding(.horizontal, 15)
@@ -29,11 +29,11 @@ struct RingView: View {
                     Capsule()
                         .stroke(gradient, lineWidth: 1)
                 }
-            SobrietyRings(false, entry, ringType)
+            SobrietyRings(entry, ringType)
         }
         .toolbar {
             ToolbarItem(placement: .principal) {
-                Text(entry.name!)
+                Text(entry.name ?? "Error")
                     .fixedSize(horizontal: true, vertical: false)
                     .font(.headline)
             }