Add custom menu bar options and localization updates

- Introduced a new custom menu bar format in AppModel, allowing users to toggle the display of the Nepal flag and the Bikram Sambat year.
- Updated SettingsView to include toggles for the new custom options, enhancing user control over the menu bar display.
- Added corresponding localization strings for the custom menu bar settings in both English and Nepali.
- Implemented unit tests to ensure the correct functionality and persistence of the custom menu bar settings.

Author: adarshaacharya

Sources/SajiloApp/Core/Foundation/AppLanguage.swift

@@ -99,6 +99,9 @@ enum L10n {
     static let launchAtLogin = LocalizedStringResource("settings.launch-at-login", bundle: .sajiloResources)
     static let showDockIcon = LocalizedStringResource("settings.show-dock-icon", bundle: .sajiloResources)
     static let menuBar = LocalizedStringResource("settings.menu-bar", bundle: .sajiloResources)
+    static let menuBarCustom = LocalizedStringResource("settings.menu-bar-custom", bundle: .sajiloResources)
+    static let menuBarShowFlag = LocalizedStringResource("settings.menu-bar-show-flag", bundle: .sajiloResources)
+    static let menuBarShowYear = LocalizedStringResource("settings.menu-bar-show-year", bundle: .sajiloResources)
     static let modules = LocalizedStringResource("settings.modules", bundle: .sajiloResources)
     static let weatherLocation = LocalizedStringResource("settings.weather-location", bundle: .sajiloResources)
     static let forexFavourites = LocalizedStringResource("settings.forex-favourites", bundle: .sajiloResources)

Sources/SajiloApp/Features/AppModel.swift

@@ -11,6 +11,7 @@ final class AppModel {
         case nepaliFlag
         case englishShort
         case numeric
+        case custom
 
         var id: String { rawValue }
 
@@ -24,15 +25,18 @@ final class AppModel {
             switch self {
             case .nepaliShort: return "\(day) \(date.nepaliMonthName)"
             case .nepaliLong: return "\(day) \(date.nepaliMonthName) \(year)"
-            case .nepaliFlag: return "🇳🇵 \(day) \(date.nepaliMonthName)"
+            case .nepaliFlag: return "🇳🇵 \(day) \(date.nepaliMonthName) \(year)"
             case .englishShort: return "\(date.day) \(date.englishMonthName)"
             case .numeric: return numerals.slashedDate(date)
+            case .custom: return "\(day) \(date.nepaliMonthName) \(year)"
             }
         }
     }
 
     private enum DefaultsKey {
         static let menuBarFormat = "menuBarFormat"
+        static let customMenuBarShowsFlag = "customMenuBarShowsFlag"
+        static let customMenuBarShowsYear = "customMenuBarShowsYear"
         static let appLanguage = "appLanguage"
         static let numeralStyle = "numeralStyle"
         static let weatherEnabled = "weatherEnabled"
@@ -60,6 +64,16 @@ final class AppModel {
         didSet { defaults.set(selectedMenuBarFormat.rawValue, forKey: DefaultsKey.menuBarFormat) }
     }
 
+    /// The Custom menu-bar option starts with the full Nepali date, then lets
+    /// people keep or remove the two pieces that matter most at a glance.
+    var customMenuBarShowsFlag: Bool {
+        didSet { defaults.set(customMenuBarShowsFlag, forKey: DefaultsKey.customMenuBarShowsFlag) }
+    }
+
+    var customMenuBarShowsYear: Bool {
+        didSet { defaults.set(customMenuBarShowsYear, forKey: DefaultsKey.customMenuBarShowsYear) }
+    }
+
     var appLanguage: AppLanguage {
         didSet { defaults.set(appLanguage.rawValue, forKey: DefaultsKey.appLanguage) }
     }
@@ -247,7 +261,21 @@ final class AppModel {
     }
 
     var menuBarTitle: String {
-        selectedMenuBarFormat.title(for: today, numerals: numeralStyle)
+        menuBarTitle(for: selectedMenuBarFormat)
+    }
+
+    func menuBarTitle(for format: MenuBarFormat) -> String {
+        guard format == .custom else {
+            return format.title(for: today, numerals: numeralStyle)
+        }
+
+        let day = numeralStyle.string(from: today.day)
+        let year = numeralStyle.string(from: today.year)
+        var parts: [String] = []
+        if customMenuBarShowsFlag { parts.append("🇳🇵") }
+        parts.append("\(day) \(today.nepaliMonthName)")
+        if customMenuBarShowsYear { parts.append(year) }
+        return parts.joined(separator: " ")
     }
 
     var visibleCards: [DashboardCard] {
@@ -322,6 +350,8 @@ final class AppModel {
 
         selectedMenuBarFormat = defaults.string(forKey: DefaultsKey.menuBarFormat)
             .flatMap(MenuBarFormat.init(rawValue:)) ?? .nepaliShort
+        customMenuBarShowsFlag = defaults.object(forKey: DefaultsKey.customMenuBarShowsFlag) as? Bool ?? true
+        customMenuBarShowsYear = defaults.object(forKey: DefaultsKey.customMenuBarShowsYear) as? Bool ?? true
         appLanguage = defaults.string(forKey: DefaultsKey.appLanguage)
             .flatMap(AppLanguage.init(rawValue:)) ?? .mixed
         numeralStyle = defaults.string(forKey: DefaultsKey.numeralStyle)

Sources/SajiloApp/Features/Settings/SettingsView.swift

@@ -74,9 +74,18 @@ struct SettingsView: View {
                         // picker previews exactly what appears in the menu bar.
                         Picker(L10n.display, selection: $model.selectedMenuBarFormat) {
                             ForEach(AppModel.MenuBarFormat.allCases) { format in
-                                Text(verbatim: format.title(for: model.today)).tag(format)
+                                if format == .custom {
+                                    Text(L10n.menuBarCustom).tag(format)
+                                } else {
+                                    Text(verbatim: model.menuBarTitle(for: format)).tag(format)
+                                }
                             }
                         }
+
+                        if model.selectedMenuBarFormat == .custom {
+                            Toggle(L10n.menuBarShowFlag, isOn: $model.customMenuBarShowsFlag)
+                            Toggle(L10n.menuBarShowYear, isOn: $model.customMenuBarShowsYear)
+                        }
                     }
 
                     SettingsSection(L10n.modules) {

Sources/SajiloApp/Resources/en.lproj/Localizable.strings

@@ -92,6 +92,9 @@
 "settings.launch-at-login" = "Launch at login";
 "settings.launch-unavailable-note" = "Move Sajilo to your Applications folder to enable this.";
 "settings.menu-bar" = "Menu bar";
+"settings.menu-bar-custom" = "Custom…";
+"settings.menu-bar-show-flag" = "Show Nepal flag";
+"settings.menu-bar-show-year" = "Show BS year";
 "settings.modules" = "Modules";
 "settings.numerals" = "Numerals";
 "settings.rates-source" = "Rates source";

Sources/SajiloApp/Resources/ne.lproj/Localizable.strings

@@ -92,6 +92,9 @@
 "settings.launch-at-login" = "लगइनमा सुरु गर्नुहोस्";
 "settings.launch-unavailable-note" = "यो सुविधा चलाउन Sajilo लाई तपाईंको Applications फोल्डरमा सार्नुहोस्।";
 "settings.menu-bar" = "मेनु बार";
+"settings.menu-bar-custom" = "अनुकूलन…";
+"settings.menu-bar-show-flag" = "नेपालको झण्डा देखाउनुहोस्";
+"settings.menu-bar-show-year" = "वि.सं. वर्ष देखाउनुहोस्";
 "settings.modules" = "मोड्युलहरू";
 "settings.numerals" = "अङ्कहरू";
 "settings.rates-source" = "दर स्रोत";

Tests/SajiloAppTests/NumeralStyleTests.swift

@@ -64,6 +64,30 @@ struct NumeralStyleTests {
         #expect(model.menuBarTitle == NumeralStyle.devanagari.slashedDate(model.today))
     }
 
+    @Test func flagFormatIncludesTheBikramSambatYear() {
+        let model = makeModel()
+        model.selectedMenuBarFormat = .nepaliFlag
+
+        #expect(model.menuBarTitle.hasPrefix("🇳🇵 "))
+        #expect(model.menuBarTitle.contains("२०८३"))
+    }
+
+    @Test func customMenuBarFormatPersistsItsFlagAndYearChoices() {
+        let defaults = makeDefaults()
+        let model = makeModel(defaults: defaults)
+        model.selectedMenuBarFormat = .custom
+        model.customMenuBarShowsFlag = false
+        model.customMenuBarShowsYear = true
+
+        #expect(model.menuBarTitle.contains("🇳🇵") == false)
+        #expect(model.menuBarTitle.contains("२०८३"))
+
+        let restored = makeModel(defaults: defaults)
+        #expect(restored.selectedMenuBarFormat == .custom)
+        #expect(restored.customMenuBarShowsFlag == false)
+        #expect(restored.customMenuBarShowsYear)
+    }
+
     /// `englishShort` was already Latin by definition; the preference must not
     /// turn its month name into digits or otherwise disturb it.
     @Test func englishShortFormatIsUnaffected() {