Astro plugin star map by vitaliy-sova-ios · Pull Request #5528 · osmandapp/OsmAnd-iOS

vitaliy-sova-ios · 2026-07-10T11:26:41Z

No description provided.

Buttons size and style the same we use on regular map + Liquid glass style by default

…stro_plugin_star_map

tigrim · 2026-07-13T11:44:52Z

                                                        colorIndex: int(item[keyColorIndex], fallback: nextColor % DirectionColor.allCases.count))
                             },
-                             celestialPaths: parseItems(json?[keyCelestialPaths]) { CelestialPathConfig(id: $0) })
+                             celestialPaths: parseItems(json?[keyCelestialPaths]) { CelestialPathConfig(id: $0) },


Is there a reason we're manually parsing [String: Any] instead of using Decodable?

tigrim · 2026-07-13T11:48:27Z

    private static let keyId = "id"
    private static let keyColorIndex = "colorIndex"
+
+    private static let keySavedMapPosition = "savedMapPosition"


private enum Keys {}

tigrim · 2026-07-13T11:51:17Z

+    private func commonInit() {
+        isUserInteractionEnabled = false
+        backgroundColor = .mapNightFilter
+        layer.compositingFilter = "multiplyBlendMode"


This approximately matches the astronomical red filter on Android. On Android, the effect is implemented using ColorMatrixColorFilter, which maps luminance to the red channel. UIKit does not provide a public equivalent of a color matrix filter for arbitrary UIView content, so on iOS we approximate the effect by applying a red overlay with the multiplyBlendMode compositing filter.

tigrim · 2026-07-13T11:53:21Z

+    func setOnDateTimeChangeListener(_ listener: @escaping (Date) -> Void) {
+        onDateTimeChangeListener = listener
+    }
+
+    func setDateTime(_ date: Date) {
+        currentDate = date
+        updateDisplay()
+    }
+
+    func getDateTime() -> Date {
+        currentDate
+    }


Java code style

tigrim · 2026-07-13T11:56:02Z

    }
+
+    func setArDirectionEnabled(_ enabled: Bool) {
+        arDirectionEnabled = enabled


Could we avoid calling updateArrowIcon() when the value hasn't changed?

tigrim · 2026-07-13T12:18:32Z

+        } else {
+            color = StarMapControlTheme.foreground(active: active, nightMode: nightMode)
+        }
+        print(color, active, isHighlighted)


tigrim · 2026-07-13T12:19:18Z

+        resetButton.updateTheme(nightmod: nightMode, active: active)
+
+        if pressed {
+            let pressedColorDay = UIColor(rgb: color_on_map_icon_background_color_tap_light).withAlphaComponent(StarMapControlTheme.defaultBackgroundAlpha)


asset color?

tigrim · 2026-07-13T12:19:29Z

+
+        if pressed {
+            let pressedColorDay = UIColor(rgb: color_on_map_icon_background_color_tap_light).withAlphaComponent(StarMapControlTheme.defaultBackgroundAlpha)
+            let pressedColorNight = UIColor(rgb: color_on_map_icon_background_color_tap_dark).withAlphaComponent(StarMapControlTheme.defaultBackgroundAlpha)


tigrim · 2026-07-13T12:19:38Z

+    override func layoutSubviews() {
+        super.layoutSubviews()
+        guard bounds.width > 0, bounds.height > 0 else { return }
+        if #available(iOS 26.0, *) {


tigrim · 2026-07-13T12:19:47Z

+        layer.shadowOpacity = 0.35
+        layer.shadowRadius = 5
+        layer.shadowOffset = CGSize(width: 0, height: 2)
+        layer.borderColor = UIColor(rgb: color_on_map_icon_border_color).cgColor


- Add mapButtonBorderColor asset and migrate color constants to asset-based system - Make AstronomyPluginSettings and nested types Codable for simplified JSON serialization - Refactor DateTimeSelectionView to use properties instead of setter methods - Update UI components to use typed icon assets instead of string-based icon names - Simplify glass background management with weak view references - Standardize control card theme methods (add border and pressed background) - Remove redundant manual JSON parsing/serialization code

tigrim · 2026-07-16T09:51:00Z

-            return
-        }
-        UserDefaults.standard.set(string, forKey: Self.storageKey)
+        UserDefaults.standard.set(object: settings, forKey: storageKey)


This setting should be shared across platforms. Follow the Android implementation

tigrim · 2026-07-17T09:49:02Z


    private func getMyDataInsertionOrderMap(_ quickPresetType: StarMapSearchQuickPresetType) -> [String: Int] {
-        let config = parentStarMapController?.searchStarMapConfig() ?? AstronomyPluginSettings.load().starMap
+        let config = parentStarMapController?.searchStarMapConfig() ?? plugin.astroSettings.getStarMapConfig()


don't use get

tigrim · 2026-07-17T09:50:35Z

+        .makeProfile()
+        .makeShared()
+
+    private let recentPref: OACommonString = OAAppSettings.sharedManager()


Is this also configured as .makeGlobal().makeShared() on Android?

On Android, they are stored only in RAM, for a single session. On iOS, they need to be saved across sessions and shared among all profiles.

Why does the logic differ from Android?

tigrim · 2026-07-17T09:55:22Z

-    let dataProvider: AstroDataDbProvider
+@objc final class AstronomyPlugin: OAPlugin {
+    private enum PreferenceId {
+        static let settings = "astronomy_settings"


Handle Android legacy star_watcher_settings too. Android migrates it to astronomy_settings, and this key may exist in backup/cloud exports. Since this setting is now cross-platform, iOS should register star_watcher_settings as profile/shared and migrate its value to astronomy_settings when the new pref is empty.

…on iOS Register the legacy profile/shared preference so cloud and file backups can apply it, then copy into astronomy_settings only when the new pref is empty (after plugin init and profile import/sync).

tigrim · 2026-07-20T11:08:58Z

+        let hasProfileItems = items.contains { $0 is OAProfileSettingsItem }
+        if hasProfileItems,
+           let plugin = OAPluginsHelper.getPlugin(AstronomyPlugin.self) as? AstronomyPlugin {
+            plugin.migrateLegacyStarWatcherSettingsIfNeeded()


Why is migration needed here?

tigrim · 2026-07-20T11:10:05Z

+        .makeProfile()
+        .makeShared()
+
+    private let recentPref: OACommonString = OAAppSettings.sharedManager()


Why does the logic differ from Android?

tigrim · 2026-07-20T11:11:13Z

    override init() {
        super.init()
-        recentSearchChips = astronomySettingsStorage.getRecentChips()
+        migrateLegacyStarWatcherSettingsIfNeeded()


You are already performing the migration at startup

removed from AstronomyPlugin.init

tigrim · 2026-07-21T07:17:17Z

+    private let legacySettingsPref: OACommonString = OAAppSettings.sharedManager()
+        .registerStringPreference(PreferenceId.legacySettings, defValue: "")
+        .makeProfile()
+        .makeShared()


Will this setting be included in the imported file? If so, .makeShared() should be removed

tigrim · 2026-07-21T07:17:29Z

+
+    private let recentPref: OACommonString = OAAppSettings.sharedManager()
+        .registerStringPreference(PreferenceId.recent, defValue: "")
+        .makeGlobal()


.makeGlobal() ?

tigrim · 2026-07-21T07:32:09Z

+        applyPillAppearance()
+    }
+
+    func setValue(_ text: String) {


SwiftLint order

tigrim · 2026-07-21T07:33:11Z

+        layer.borderWidth = nightMode ? 2 : 0
+    }
+
+    override func layoutSubviews() {


tigrim · 2026-07-21T07:35:44Z

+        nav.navigationBar.prefersLargeTitles = true
+        searchNavigationController = nav
+
+        if UIDevice.current.userInterfaceIdiom == .pad {


OAUtilities.isIPad

tigrim · 2026-07-21T07:37:11Z

-        let cameraSliderTopConstraint = sliderContainer.topAnchor.constraint(equalTo: cameraButton.bottomAnchor, constant: Layout.contentPadding)
-        cameraSliderTopConstraint.priority = .defaultHigh
+        addRoundButton(zoomOutButton,
+                       iconName: "ic_custom_map_zoom_out",


Why not pass the icon from the asset catalog directly?

tigrim · 2026-07-21T07:39:35Z

        setNeedsDisplay()
    }
+
+    func getAltitude() -> Double {


don't use get

tigrim · 2026-07-21T07:41:50Z

        return value
    }
+
+    private func commonInit() {


SwiftLint order

tigrim · 2026-07-21T07:42:12Z


-    @objc func showSearchDialog() {
+    @objc private func showSearchDialog() {
        if UIDevice.current.userInterfaceIdiom == .pad, searchViewController != nil {


dmpr0 and others added 10 commits June 25, 2026 14:19

Update Astronomy plugin to use dynamic named colors

4cbf29d

Changed buttons

c12fa80

Buttons size and style the same we use on regular map + Liquid glass style by default

Added Inertial scrolling & zoom buttons for mac

33044d8

Remove camera button and unify AR/camera behavior

c792bb0

Refactor AR controls into dedicated component

48653f1

Fix SwiftLint warnings

8892c6a

Changed colors and alpha

8099f44

Merge branch 'master' into astro_plugin_star_map

4250a13

Merge remote-tracking branch 'origin/feature/astronomy-colors' into a…

e5426e3

…stro_plugin_star_map

Use color asset extensions in AstroUtils

90d5a26

vitaliy-sova-ios requested review from alex-dev-neo and tigrim July 10, 2026 11:26

tigrim reviewed Jul 13, 2026

View reviewed changes

vitaliy-sova-ios added 4 commits July 14, 2026 11:53

Fix buttons opacity

08ace4e

DayNight cache

9b2abf7

Refactor astronomy UI components

abfdcc5

tigrim reviewed Jul 16, 2026

View reviewed changes

vitaliy-sova-ios added 2 commits July 17, 2026 11:34

Persist astronomy settings and recent chips

bade85b

Merge branch 'master' into astro_plugin_star_map

af03df6

tigrim reviewed Jul 17, 2026

View reviewed changes

vitaliy-sova-ios added 2 commits July 17, 2026 17:30

Code review fixes

b871e21

Migrate Android legacy star_watcher_settings into astronomy_settings …

37a369e

…on iOS Register the legacy profile/shared preference so cloud and file backups can apply it, then copy into astronomy_settings only when the new pref is empty (after plugin init and profile import/sync).

tigrim reviewed Jul 20, 2026

View reviewed changes

Code review fixes

c02d9e7

tigrim reviewed Jul 21, 2026

View reviewed changes

Uh oh!

Conversation

vitaliy-sova-ios commented Jul 10, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants