2.3.4

Interactive Widget

Author: ZzzM

CalendarX.xcodeproj/project.pbxproj

@@ -31,7 +31,11 @@ struct ScacleImageButton: View {
     }
 
     var body: some View {
-        ScacleButton(action: action, label: { image.font(.title3).appForeground(color) })
+        ScacleButton(action: action) {
+            image
+                .font(.title3)
+                .appForeground(color)
+        }
     }
 }
 

CalendarX/Assets.xcassets/GitHub.imageset/Contents.json

@@ -24,7 +24,9 @@ struct CalendarPreference  {
 
     @AppStorage(CalendarStorageKey.showHolidays, store: .group)
     var showHolidays: Bool = true
-    
+
+    @AppStorage(CalendarStorageKey.keyboardShortcut, store: .group)
+    var keyboardShortcut: Bool = true
 }
 
 extension CalendarPreference {

CalendarX/Assets.xcassets/GitHub.imageset/GitHub.svg

@@ -31,7 +31,7 @@ struct CalendarXApp: App {
 
 class CalendarXDelegate: NSObject & NSApplicationDelegate {
 
-    lazy var rootView = RootView()
+    lazy var rootView = CalendarXView()
     lazy var popover = MenubarPopover(rootView)
     lazy var controller =  MenubarController(popover)
 
@@ -43,7 +43,7 @@ class CalendarXDelegate: NSObject & NSApplicationDelegate {
             .forEach { $0.terminate() }
 
     }
-    
+
     func applicationDidFinishLaunching(_ notification: Notification) {
         _ = controller
     }

CalendarX/Assets.xcassets/Recommendations/HostsX.imageset/HostsX.png

@@ -0,0 +1,59 @@
+import SwiftUI
+import CalendarXShared
+
+struct CalendarXView: View {
+    
+    @StateObject
+    private var router = Router.shared
+    
+    @StateObject
+    private var alertVM = AlertViewModel.shared
+
+    @StateObject
+    private var settingsVM = SettingsViewModel()
+
+    
+    private let mainVM = MainViewModel()
+    
+    var body: some View {
+        
+        ZStack {
+            Color.appBackground.padding(.top, -15)
+            rootView
+            detailView
+            AlertView(viewModel: alertVM)
+        }
+        .appForeground(.appPrimary)
+        .environment(\.locale, settingsVM.locale)
+        .envTint(settingsVM.color)
+        .envColorScheme(settingsVM.colorScheme)
+        .onChange(of: settingsVM.locale, notification: NSLocale.currentLocaleDidChangeNotification)
+
+    }
+
+    @ViewBuilder
+    private var rootView: some View {
+        switch router.root {
+        case .calendar: MainView(viewModel: mainVM)
+        case .settings: SettingsView(viewModel: settingsVM)
+        case .unknown: EmptyView()
+        }
+    }
+
+
+    @ViewBuilder
+    private var detailView: some View {
+        switch router.path {
+        case .date(let appDate): DateView(appDate: appDate).fullScreenCover()
+        case .recommendations: RecommendationsView().fullScreenCover()
+        case .menubarSettings: MenubarSettingsView().fullScreenCover()
+        case .appearanceSettings: AppearanceSettingsView(viewModel: settingsVM).fullScreenCover()
+        case .calendarSettings: CalendarSettingsView().fullScreenCover()
+        case .about: AboutView().fullScreenCover()
+        default: EmptyView()
+        }
+    }
+
+
+}
+

CalendarX/Assets.xcassets/Recommendations/OnlySwitch.imageset/OnlySwitch.png

@@ -11,26 +11,32 @@ import Combine
 struct AlertView: View {
 
     @ObservedObject
-    var alert: AlertAction
+    var viewModel: AlertViewModel
 
     var body: some View {
 
-
         ZStack(alignment: .bottom) {
 
             Color.black
-                .opacity(alert.isPresented ? 0.5: 0)
-                .onTapGesture(perform: alert.dismiss)
-
+                .opacity(viewModel.isPresented ? 0.5: 0)
+                .onTapGesture(perform: viewModel.dismiss)
 
-            if alert.isPresented {
+            if viewModel.isPresented {
                 VStack {
 
-                    alert.image.font(.largeTitle).appForeground(.accentColor)
-                    Text(alert.message).font(.title3).multilineTextAlignment(.center).padding(.vertical, 5)
+                    viewModel.image.font(.largeTitle).appForeground(.accentColor)
+
+                    if let message = viewModel.message {
+                        Text(message).font(.title3).multilineTextAlignment(.center).padding(.vertical, 5)
+                    }
+
+                    if let yes = viewModel.yes {
+                        ScacleCapsuleButton(title: yes, foregroundColor: .white, backgroundColor: .accentColor, action: viewModel.action)
+                    }
 
-                    ScacleCapsuleButton(title: alert.yes, foregroundColor: .white, backgroundColor: .accentColor, action: alert.action)
-                    ScacleCapsuleButton(title: alert.no, foregroundColor: .white, backgroundColor: .appSecondary, action: alert.dismiss)
+                    if let no = viewModel.no {
+                        ScacleCapsuleButton(title: no, foregroundColor: .white, backgroundColor: .appSecondary, action: viewModel.dismiss)
+                    }
 
                 }
                 .padding()
@@ -39,5 +45,6 @@ struct AlertView: View {
                 .padding()
             }
         }
+        .zIndex(1)
     }
 }