Astro plugin star map

Resources/Images.xcassets/Colors/Map buttons/mapButtonBorderColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x4D",
+          "green" : "0x4D",
+          "red" : "0x4D"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x4D",
+          "green" : "0x4D",
+          "red" : "0x4D"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Resources/Images.xcassets/Icons/ic_navbar_close.imageset/Contents.json

@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ic_navbar_close@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ic_navbar_close@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Sources/Constants/OAColors.h

@@ -43,11 +43,6 @@
 #define color_dialog_buttons_dark 0xff8800
 #define color_on_map_icon_color 0x505050
 
-#define color_on_map_icon_background_color_tap_light 0xE6E6E6
-#define color_on_map_icon_background_color_tap_dark 0x595959
-
-#define color_on_map_icon_border_color 0x4D4D4D
-
 #define color_sky_day 0x8cbed6
 #define color_sky_night 0x05142e
 

Sources/Controllers/Map/OAHudButton.m

@@ -54,11 +54,11 @@ - (void)commonInit
 {
     self.unpressedColorDay = [UIColor colorNamed:ACColorNameMapButtonBgColorDefault].light;
     self.unpressedColorNight = [UIColor colorNamed:ACColorNameMapButtonBgColorDefault].dark;
-    self.pressedColorDay = UIColorFromRGB(color_on_map_icon_background_color_tap_light);
-    self.pressedColorNight = UIColorFromRGB(color_on_map_icon_background_color_tap_dark);
+    self.pressedColorDay = [UIColor colorNamed:ACColorNameMapButtonBgColorTap].light;
+    self.pressedColorNight = [UIColor colorNamed:ACColorNameMapButtonBgColorTap].dark;
     self.tintColorDay = [UIColor colorNamed:ACColorNameMapButtonIconColorDefault].light;
     self.tintColorNight = [UIColor colorNamed:ACColorNameMapButtonIconColorDefault].dark;
-    self.borderColor = UIColorFromRGB(color_on_map_icon_border_color);
+    self.borderColor = [UIColor colorNamed:ACColorNameMapButtonBorderColor];
     self.borderWidthDay = 0;
     self.borderWidthNight = 2;
 

Sources/Controllers/RoutePlanning/OARoutePlanningHudViewController.xib

@@ -513,7 +513,7 @@
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="onx-Gz-iEg">
                             <rect key="frame" x="0.0" y="0.0" width="64" height="42"/>
                             <color key="backgroundColor" white="0.0" alpha="0.80377358490566042" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                            <state key="normal" image="ic_navbar_close.png"/>
+                            <state key="normal" image="ic_navbar_close"/>
                             <connections>
                                 <action selector="closePressed:" destination="-1" eventType="touchUpInside" id="qhF-wP-sgx"/>
                             </connections>
@@ -556,7 +556,7 @@
         <image name="ic_custom_routes" width="30" height="30"/>
         <image name="ic_custom_straight_line.png" width="30" height="30"/>
         <image name="ic_custom_undo.png" width="30" height="30"/>
-        <image name="ic_navbar_close.png" width="28" height="28"/>
+        <image name="ic_navbar_close" width="28" height="28"/>
         <namedColor name="customSeparator">
             <color red="0.79607843137254897" green="0.7803921568627451" blue="0.81960784313725488" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>

Sources/Controllers/TargetMenu/Mapillary/OAMapillaryImageViewController.xib

@@ -88,7 +88,7 @@
                             <rect key="frame" x="0.0" y="16" width="44" height="44"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                             <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                            <state key="normal" image="ic_navbar_close.png"/>
+                            <state key="normal" image="ic_navbar_close"/>
                             <connections>
                                 <action selector="closePressed:" destination="-1" eventType="touchUpInside" id="gZd-S4-022"/>
                             </connections>
@@ -102,6 +102,6 @@
     </objects>
     <resources>
         <image name="ic_action_wifi_off.png" width="30" height="30"/>
-        <image name="ic_navbar_close.png" width="28" height="28"/>
+        <image name="ic_navbar_close" width="28" height="28"/>
     </resources>
 </document>

Sources/DownloadMapSource/OADownloadMapProgressViewController.xib

@@ -64,7 +64,7 @@
                         <constraint firstAttribute="width" constant="28" id="NPl-hq-TuC"/>
                     </constraints>
                     <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                    <state key="normal" image="ic_navbar_close.png"/>
+                    <state key="normal" image="ic_navbar_close"/>
                     <connections>
                         <action selector="navBarCancelButtonPressed:" destination="-1" eventType="touchUpInside" id="p67-N5-hcJ"/>
                     </connections>
@@ -140,6 +140,6 @@
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
     </objects>
     <resources>
-        <image name="ic_navbar_close.png" width="28" height="28"/>
+        <image name="ic_navbar_close" width="28" height="28"/>
     </resources>
 </document>

Sources/Helpers/MigrationManager.swift

@@ -22,6 +22,7 @@ final class MigrationManager: NSObject {
         case migrationHudButtonPositionsKey
         case migrateRouteRecalculationValues
         case migrateLocationIconSizeAndCourseIconSize
+        case migrateAstronomyPreferences
     }
 
     private struct HudMigrationScenario {
@@ -104,6 +105,10 @@ final class MigrationManager: NSObject {
                 migrateLocationIconSizeAndCourseIconSize()
                 defaults.set(true, forKey: MigrationKey.migrateLocationIconSizeAndCourseIconSize.rawValue)
             }
+            if !defaults.bool(forKey: MigrationKey.migrateAstronomyPreferences.rawValue) {
+                migrateAstronomyPreferences()
+                defaults.set(true, forKey: MigrationKey.migrateAstronomyPreferences.rawValue)
+            }
         }
     }
 
@@ -600,6 +605,12 @@ final class MigrationManager: NSObject {
         }
     }
 
+    private func migrateAstronomyPreferences() {
+        if let plugin = OAPluginsHelper.getPlugin(AstronomyPlugin.self) as? AstronomyPlugin {
+            plugin.migrateLegacyStarWatcherSettingsIfNeeded()
+        }
+    }
+
     // MARK: - Import old versions
 
     func changeJsonMigrationToV2(_ json: [String: String]) -> [String: String] {
@@ -610,7 +621,8 @@ final class MigrationManager: NSObject {
             "top_widget_panel_order": "widget_top_panel_order",
             "bottom_widget_panel_order": "widget_bottom_panel_order",
             "shared_string_automatic": "driving_region_automatic",
-            "external_input_device": "selected_external_input_device"
+            "external_input_device": "selected_external_input_device",
+            "star_watcher_settings": "astronomy_settings"
         ]
 
         let changeWidgetIds = [

Sources/Plugins/Astronomy/AstroConfigureViewBottomSheet.swift

@@ -93,7 +93,7 @@ final class AstroConfigureViewBottomSheet: UIViewController, UISheetPresentation
     }
 
     private func configureNavigationBar() {
-        let imageClose = OAUtilities.resize(UIImage.templateImageNamed("ic_navbar_close"),
+        let imageClose = OAUtilities.resize(.icNavbarClose,
                                             newSize: CGSize(width: 24, height: 24))?.withRenderingMode(.alwaysTemplate)
         let closeButton = UIBarButtonItem(image: imageClose, style: .plain, target: self, action: #selector(closeAction))
         closeButton.tintColor = .label

Sources/Plugins/Astronomy/AstroUtils.swift

@@ -60,18 +60,18 @@ private final class AstroRedFilterOverlayView: UIView {
         super.init(coder: coder)
         commonInit()
     }
-
-    private func commonInit() {
-        isUserInteractionEnabled = false
-        backgroundColor = .red
-        layer.compositingFilter = "multiplyBlendMode"
-    }
-
+
     override func layoutSubviews() {
         super.layoutSubviews()
         layer.cornerRadius = superview?.layer.cornerRadius ?? 0
         layer.masksToBounds = layer.cornerRadius > 0
     }
+
+    private func commonInit() {
+        isUserInteractionEnabled = false
+        backgroundColor = .mapNightFilter
+        layer.compositingFilter = "multiplyBlendMode"
+    }
 }
 
 enum AstroRedFilter {
@@ -111,6 +111,17 @@ enum AstroRedFilter {
 }
 
 enum AstroUtils {
+    struct Twilight {
+        let sunrise: Date?
+        let sunset: Date?
+        let civilDawn: Date?
+        let civilDusk: Date?
+        let nauticalDawn: Date?
+        let nauticalDusk: Date?
+        let astroDawn: Date?
+        let astroDusk: Date?
+    }
+
     private static let customStarLock = NSLock()
 
     static let solarSystemWikidataIds: [String: Body] = [
@@ -126,17 +137,6 @@ enum AstroUtils {
         "Q339": Body.pluto
     ]
 
-    struct Twilight {
-        let sunrise: Date?
-        let sunset: Date?
-        let civilDawn: Date?
-        let civilDusk: Date?
-        let nauticalDawn: Date?
-        let nauticalDusk: Date?
-        let astroDawn: Date?
-        let astroDusk: Date?
-    }
-
     static func astronomyTime(from date: Date) -> Time {
         Time.companion.fromMillisecondsSince1970(millis: Int64(date.timeIntervalSince1970 * 1000.0))
     }
@@ -303,19 +303,6 @@ enum AstroUtils {
         return formatter.string(from: date)
     }
 
-    private static func filterRiseSetDate(_ date: Date?, windowStart: Date?, windowEnd: Date?) -> Date? {
-        guard let date else {
-            return nil
-        }
-        if let windowStart, date < windowStart {
-            return nil
-        }
-        if let windowEnd, date > windowEnd {
-            return nil
-        }
-        return date
-    }
-
     static func bodyName(_ body: Body) -> String {
         bodyDisplayName(body)
     }
@@ -352,17 +339,17 @@ enum AstroUtils {
 
     static func color(for body: Body) -> UIColor {
         if body === Body.sun {
-            return UIColor(red: 1.0, green: 0.69, blue: 0.20, alpha: 1.0)
+            return .solarSun
         } else if body === Body.moon {
-            return UIColor(white: 0.88, alpha: 1.0)
+            return .solarMoon
         } else if body === Body.mars {
-            return UIColor(red: 0.95, green: 0.36, blue: 0.22, alpha: 1.0)
+            return .solarMars
         } else if body === Body.jupiter {
-            return UIColor(red: 0.95, green: 0.73, blue: 0.48, alpha: 1.0)
+            return .solarJupiter
         } else if body === Body.saturn {
-            return UIColor(red: 0.95, green: 0.82, blue: 0.52, alpha: 1.0)
+            return .solarSaturn
         } else if body === Body.neptune || body === Body.uranus {
-            return UIColor(red: 0.42, green: 0.73, blue: 1.0, alpha: 1.0)
+            return .solarUranusNeptune
         } else {
             return UIColor(red: 0.87, green: 0.90, blue: 1.0, alpha: 1.0)
         }
@@ -371,16 +358,15 @@ enum AstroUtils {
     static func color(for type: SkyObjectType, magnitude: Double?) -> UIColor {
         switch type {
         case .STAR:
-            let brightness = max(0.45, min(1.0, 1.0 - ((magnitude ?? 2.0) / 8.0)))
-            return UIColor(red: brightness, green: brightness, blue: 1.0, alpha: 1.0)
+            return .starDot
         case .GALAXY, .GALAXY_CLUSTER:
-            return UIColor(red: 0.52, green: 0.74, blue: 1.0, alpha: 1.0)
+            return .deepSkyGalaxyDot
         case .NEBULA:
-            return UIColor(red: 0.85, green: 0.45, blue: 0.95, alpha: 1.0)
+            return .deepSkyNebulaDot
         case .OPEN_CLUSTER, .GLOBULAR_CLUSTER:
-            return UIColor(red: 0.50, green: 0.95, blue: 0.78, alpha: 1.0)
+            return .deepSkyClusterDot
         case .BLACK_HOLE:
-            return UIColor(red: 0.95, green: 0.45, blue: 0.35, alpha: 1.0)
+            return .deepSkyBlackHoleDot
         case .CONSTELLATION:
             return UIColor(red: 0.80, green: 0.86, blue: 1.0, alpha: 1.0)
         case .SUN, .MOON, .PLANET:
@@ -478,4 +464,17 @@ enum AstroUtils {
         formatter.timeStyle = .short
         return formatter.string(from: date)
     }
+
+    private static func filterRiseSetDate(_ date: Date?, windowStart: Date?, windowEnd: Date?) -> Date? {
+        guard let date else {
+            return nil
+        }
+        if let windowStart, date < windowStart {
+            return nil
+        }
+        if let windowEnd, date > windowEnd {
+            return nil
+        }
+        return date
+    }
 }

Sources/Plugins/Astronomy/AstronomyPlugin.swift

@@ -8,13 +8,50 @@
 
 import UIKit
 
-@objc(AstronomyPlugin)
-final class AstronomyPlugin: OAPlugin {
-    let dataProvider: AstroDataDbProvider
+@objc final class AstronomyPlugin: OAPlugin {
+    private enum PreferenceId {
+        static let settings = "astronomy_settings"
+        static let legacySettings = "star_watcher_settings"
+        static let recent = "astronomy_recently_viewed"
+    }
+
+    let dataProvider = AstroDataDbProvider()
+
+    var astroSettings: AstronomyPluginSettings { astronomySettingsStorage }
+    var recentSearchChips: [StarMapRecentChip] = []
+
+    private let settingsPref: OACommonString = OAAppSettings.sharedManager()
+        .registerStringPreference(PreferenceId.settings, defValue: "")
+        .makeProfile()
+        .makeShared()
+
+    private let legacySettingsPref: OACommonString = OAAppSettings.sharedManager()
+        .registerStringPreference(PreferenceId.legacySettings, defValue: "")
+        .makeProfile()
+
+    private let recentPref: OACommonString = OAAppSettings.sharedManager()
+        .registerStringPreference(PreferenceId.recent, defValue: "")
+        .makeGlobal()
+
+    private lazy var astronomySettingsStorage = AstronomyPluginSettings(settingsPref: settingsPref, recentPref: recentPref)
 
     override init() {
-        dataProvider = AstroDataDbProvider()
         super.init()
+        recentSearchChips = astronomySettingsStorage.recentChips()
+    }
+
+    func saveRecentSearchChips() {
+        astronomySettingsStorage.setRecentChips(recentSearchChips)
+    }
+
+    func migrateLegacyStarWatcherSettingsIfNeeded() {
+        for appMode in OAApplicationMode.allPossibleValues() {
+            guard legacySettingsPref.isSet(for: appMode), !settingsPref.isSet(for: appMode) else {
+                continue
+            }
+            settingsPref.set(legacySettingsPref.get(appMode), mode: appMode)
+        }
+        astronomySettingsStorage.reloadFromPreference()
     }
 
     override func getId() -> String? {