2.3.4

Interactive Widget

CalendarX/Component/ScacleButton.swift

@@ -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/Model/CalendarPreference.swift

@@ -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/CalendarXApp.swift → CalendarX/Module/CalendarXApp.swift

@@ -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/Module/CalendarXView.swift

@@ -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/Module/Calender/AlertView.swift

@@ -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)
     }
 }

CalendarX/Module/Calender/DateView.swift

@@ -30,6 +30,7 @@ struct DateView: View {
             FestivalsView(festivals: appDate.festivals)
             EventsView(events: appDate.events, showEvents: showEvents)
         }
+        .padding()
     }
 
 

CalendarX/Module/Calender/MainView.swift

@@ -23,7 +23,7 @@ struct MainView: View {
                      dayView: dayView)
         .equatable()
         .frame(height: .mainHeight)
-
+        .padding()
     }
 
     private func header() -> some View {
@@ -32,22 +32,27 @@ struct MainView: View {
             MonthYearPicker(date: $viewModel.date, colorScheme: viewModel.colorScheme, tint: viewModel.tint)
 
             Spacer()
+
+
+            if viewModel.keyboardShortcut {
+                Group {
+                    Button(action: viewModel.lastMonth) { }.keyboardShortcut(.leftArrow, modifiers: [])
+                    Button(action: viewModel.reset) {}.keyboardShortcut(.space, modifiers: [])
+                    Button(action: viewModel.nextMonth) {}.keyboardShortcut(.rightArrow, modifiers: [])
+                    Button(action: viewModel.lastYear) {}.keyboardShortcut(.upArrow, modifiers: [])
+                    Button(action: viewModel.nextYear) {}.keyboardShortcut(.downArrow, modifiers: [])
+                }
+                .buttonStyle(.borderless)
+            }
+
+
             Group {
-                Button(action: viewModel.lastMonth) {}.keyboardShortcut(.leftArrow, modifiers: [])
-                Button(action: viewModel.reset) {}.keyboardShortcut(.space, modifiers: [])
-                Button(action: viewModel.nextMonth) {}.keyboardShortcut(.rightArrow, modifiers: [])
-                Button(action: viewModel.lastYear) {}.keyboardShortcut(.upArrow, modifiers: [])
-                Button(action: viewModel.nextYear) {}.keyboardShortcut(.downArrow, modifiers: [])
+                ScacleImageButton(image: .leftArrow, action: viewModel.lastMonth)
+                ScacleImageButton(image: .circle, action: viewModel.reset)
+                ScacleImageButton(image: .rightArrow, action: viewModel.nextMonth)
             }
-            .frame(maxWidth: 1)
-            .opacity(.zero)
-
-            ScacleImageButton(image: .leftArrow, action: viewModel.lastMonth)
-                .frame(width: .buttonWidth)
-            ScacleImageButton(image: .circle, action: viewModel.reset)
-                .frame(width: .buttonWidth)
-            ScacleImageButton(image: .rightArrow, action: viewModel.nextMonth)
-                .frame(width: .buttonWidth)
+            .frame(width: .buttonWidth)
+
 
         }
 

CalendarX/Module/MenuBar/MenuBarController.swift

@@ -94,8 +94,7 @@ extension MenubarController {
 
     private func showPopover(_ sender: Any?) {
         guard let event = NSApp.currentEvent else { return }
-
-        Router.to(event.isRightClicked)
+        Router.set(event.isRightClicked ? .settings: .calendar)
         popover.show(sender)
         monitor.start()
     }

CalendarX/Module/MenuBar/MenubarItemController.swift

@@ -89,15 +89,17 @@ extension MenubarItemController {
 extension MenubarItemController {
     private var icon: NSImage? { style == .default ? calendarIcon : .none }
     private var title: NSAttributedString {
-        var attributes: [NSAttributedString.Key : Any] = [.font: NSFont.statusItem], title = ""
-        if style == .default {
-            attributes[.baselineOffset] = -1
-            attributes[.font] = NSFont.statusIcon
-            title = Date().day.description
-        }  else if style == .text {
-            title = pref.text
+
+        let title = switch style {
+        case .default: Date().day.description
+        case .text: pref.text
+        case .date: pref.dateItemTitle
+        }
+
+        let attributes: [NSAttributedString.Key : Any] = if style == .default {
+            [.font: NSFont.statusIcon, .baselineOffset: -1]
         } else {
-            title = pref.dateItemTitle
+            [.font: NSFont.statusItem]
         }
         return NSAttributedString(string:  title, attributes: attributes)
     }

CalendarX/Module/Settings/AboutView.swift

@@ -60,5 +60,7 @@ struct AboutView: View {
 
         }
         .frame(height: .mainHeight, alignment: .top)
+        .padding()
+
     }
 }

CalendarX/Module/Settings/AppearanceSettingsView.swift

@@ -29,7 +29,8 @@ struct AppearanceSettingsView: View {
 
         }
         .frame(maxHeight: .infinity, alignment: .top)
-
+        .padding()
+
     }
 
 }

CalendarX/Module/Settings/CalendarSettingsView.swift

@@ -13,7 +13,7 @@ struct CalendarSettingsView: View {
 
     @StateObject
     private var viewModel = CalendarViewModel()
-    
+
     var body: some View {
         VStack(spacing: 20) {
 
@@ -26,17 +26,18 @@ struct CalendarSettingsView: View {
                 EmptyView()
             }
 
-
-
             Section {
                 weekRow
                 eventsRow
                 lunarRow
                 holidaysRow
+                keyboardShortcutRow
             }
 
         }
         .frame(maxHeight: .infinity, alignment: .top)
+        .padding()
+
     }
 }
 
@@ -50,7 +51,10 @@ extension CalendarSettingsView {
 
     @ViewBuilder
     private var eventsRow: some View {
-        let isOn = Binding(get: viewModel.getEventStatut, set: viewModel.setEventStatut)
+        let isOn = Binding(
+            get: viewModel.getEventStatut,
+            set: viewModel.setEventStatut
+        )
         Toggle(isOn: isOn) { Text(L10n.Calendar.showEvents).font(.title3) }
             .checkboxStyle()
 
@@ -66,6 +70,15 @@ extension CalendarSettingsView {
             .checkboxStyle()
     }
 
+    private var keyboardShortcutRow: some View {
+        Toggle(isOn: $viewModel.keyboardShortcut) {
+            HStack {
+                Text(L10n.Calendar.keyboardShortcut).font(.title3)
+                ScacleImageButton(image: .tips, action:  AlertViewModel.keyboardShortcut)
+            }
+        }
+        .checkboxStyle()
+    }
 }
 
 

CalendarX/Module/Settings/MenuBarSettingsView.swift

@@ -49,7 +49,8 @@ struct MenubarSettingsView: View {
 
         }
         .focusable(false)
-
+        .padding()
+
     }