Move applicationModeChangedObservable from appData

osmandapp · Jul 23, 2024 · 19c30ab · 19c30ab
1 parent bdda83f
commit 19c30ab
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 17 deletions.
diff --git a/Sources/AppHost/OsmAndAppImpl.mm b/Sources/AppHost/OsmAndAppImpl.mm
@@ -200,6 +200,8 @@ - (instancetype) init
         [defaults registerDefaults:defResetSettings];
         NSDictionary *defResetRouting = [NSDictionary dictionaryWithObject:@"NO" forKey:@"reset_routing"];
         [defaults registerDefaults:defResetRouting];
+
+        _applicationModeChangedObservable = [[OAObservable alloc] init];
     }
     return self;
 }
@@ -426,6 +428,7 @@ - (BOOL) initializeImpl
 
     // Unpack app data
     _data = [NSKeyedUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] dataForKey:kAppData]];
+    [_data postInit];
 
     settings.simulateNavigation = NO;
     settings.simulateNavigationMode = [OASimulationMode toKey:EOASimulationModePreview];
@@ -1197,6 +1200,7 @@ - (void) setMapMode:(OAMapMode)mapMode
 }
 
 @synthesize mapModeObservable = _mapModeObservable;
+@synthesize applicationModeChangedObservable = _applicationModeChangedObservable;
 
 @synthesize gpxCollectionChangedObservable = _gpxCollectionChangedObservable;
 @synthesize gpxChangedObservable = _gpxChangedObservable;

diff --git a/Sources/AppHost/OsmAndAppProtocol.h b/Sources/AppHost/OsmAndAppProtocol.h
@@ -50,6 +50,7 @@
 @property(nonatomic) OAMapMode mapMode;
 @property(nonatomic) OAMapMode prevMapMode;
 @property(readonly) OAObservable* mapModeObservable;
+@property(readonly) OAObservable* applicationModeChangedObservable;
 
 @property(nonatomic) OAMapViewState* initialURLMapState;
 

diff --git a/Sources/Controllers/DashboardOnMap/MapSettings/OAMapSettingsMainScreen.mm b/Sources/Controllers/DashboardOnMap/MapSettings/OAMapSettingsMainScreen.mm
@@ -119,7 +119,7 @@ - (void)initView
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(productsRestored:) name:OAIAPProductsRestoredNotification object:nil];
     _applicationModeObserver = [[OAAutoObserverProxy alloc] initWith:self
                                                          withHandler:@selector(onApplicationModeChanged)
-                                                          andObserve:_app.data.applicationModeChangedObservable];
+                                                          andObserve:_app.applicationModeChangedObservable];
 }
 
 - (void)deinitView

diff --git a/Sources/Controllers/Map/Layers/OATerrainMapLayer.mm b/Sources/Controllers/Map/Layers/OATerrainMapLayer.mm
@@ -50,7 +50,7 @@ - (void) initLayer
 
     _applicationModeChangedObserver = [[OAAutoObserverProxy alloc] initWith:self
                                                            withHandler:@selector(onAppModeChanged)
-                                                            andObserve:[OsmAndApp instance].data.applicationModeChangedObservable];
+                                                            andObserve:OsmAndApp.instance.applicationModeChangedObservable];
 
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(onProfileSettingSet:)

diff --git a/Sources/Controllers/Map/OAMapHudViewController.mm b/Sources/Controllers/Map/OAMapHudViewController.mm
@@ -159,7 +159,7 @@ - (void) commonInit
 
     _applicaionModeObserver = [[OAAutoObserverProxy alloc] initWith:self
                                                         withHandler:@selector(onApplicationModeChanged:)
-                                                         andObserve:[OsmAndApp instance].data.applicationModeChangedObservable];
+                                                         andObserve:[OsmAndApp instance].applicationModeChangedObservable];
 
     _weatherSettingsChangeObserver = [[OAAutoObserverProxy alloc] initWith:self
                                                         withHandler:@selector(onWeatherSettingsChange:withKey:andValue:)

diff --git a/Sources/Controllers/Map/OAMapViewController.mm b/Sources/Controllers/Map/OAMapViewController.mm
@@ -350,7 +350,7 @@ - (void) commonInit
 
     _applicationModeChangedObserver = [[OAAutoObserverProxy alloc] initWith:self
                                                            withHandler:@selector(onAppModeChanged)
-                                                            andObserve:[OsmAndApp instance].data.applicationModeChangedObservable];
+                                                            andObserve:[OsmAndApp instance].applicationModeChangedObservable];
 
     _mapZoomObserver = [[OAAutoObserverProxy alloc] initWith:self
                                                  withHandler:@selector(onMapZoomChanged:withKey:andValue:)

diff --git a/Sources/Controllers/QuickAction/OAFloatingButtonsHudViewController.mm b/Sources/Controllers/QuickAction/OAFloatingButtonsHudViewController.mm
@@ -129,7 +129,7 @@ - (void)viewDidLoad
                                                     andObserve:[OARootViewController instance].mapPanel.mapViewController.elevationAngleObservable];
     _applicationModeObserver = [[OAAutoObserverProxy alloc] initWith:self
                                                          withHandler:@selector(onApplicationModeChanged)
-                                                          andObserve:[OsmAndApp instance].data.applicationModeChangedObservable];
+                                                          andObserve:[OsmAndApp instance].applicationModeChangedObservable];
     _actionsChangedObserver = [[OAAutoObserverProxy alloc] initWith:self
                                                         withHandler:@selector(onQuickActionButtonChanged:withKey:)
                                                          andObserve:[OAMapButtonsHelper sharedInstance].quickActionsChangedObservable];

diff --git a/Sources/Controllers/Settings/OAConfigureProfileViewController.m b/Sources/Controllers/Settings/OAConfigureProfileViewController.m
@@ -742,7 +742,7 @@ - (void) updateCopiedOrResetPrefs
     [[OARootViewController instance].mapPanel recreateAllControls];
     [OAMapStyleSettings.sharedInstance loadParameters];
     [[[OsmAndApp instance] mapSettingsChangeObservable] notifyEvent];
-    [[[OsmAndApp instance].data applicationModeChangedObservable] notifyEventWithKey:nil];
+    [OsmAndApp.instance.applicationModeChangedObservable notifyEventWithKey:nil];
     [self updateView];
 }
 

diff --git a/Sources/Controllers/Settings/OAMainSettingsViewController.m b/Sources/Controllers/Settings/OAMainSettingsViewController.m
@@ -85,7 +85,7 @@ - (void)registerObservers
                                                  andObserve:[OsmAndApp instance].availableAppModesChangedObservable]];
     [self addObserver:[[OAAutoObserverProxy alloc] initWith:self
                                                 withHandler:@selector(onAvailableAppModesChanged)
-                                                 andObserve:OsmAndApp.instance.data.applicationModeChangedObservable]];
+                                                 andObserve:OsmAndApp.instance.applicationModeChangedObservable]];
 }
 
 #pragma mark - UIViewController

diff --git a/Sources/Data/OAAppData.h b/Sources/Data/OAAppData.h
@@ -158,7 +158,7 @@ static const NSInteger kSlopeDefMaxZoom = 16;
 @property (nonatomic) OARTargetPoint *pointToNavigateBackup;
 @property (nonatomic) NSMutableArray<OARTargetPoint *> *intermediatePointsBackup;
 
-@property (readonly) OAObservable* applicationModeChangedObservable;
+- (void) postInit;
 
 - (void) clearPointToStart;
 - (void) clearPointToNavigate;

diff --git a/Sources/Data/OAAppData.m b/Sources/Data/OAAppData.m
@@ -176,7 +176,7 @@ @implementation OAAppData
     OACommonBoolean *_weatherWindAnimationUnitAutoProfile;
 }
 
-@synthesize applicationModeChangedObservable = _applicationModeChangedObservable, mapLayersConfiguration = _mapLayersConfiguration, weatherSettingsChangeObservable = _weatherSettingsChangeObservable;
+@synthesize mapLayersConfiguration = _mapLayersConfiguration, weatherSettingsChangeObservable = _weatherSettingsChangeObservable;
 
 - (instancetype) init
 {
@@ -265,10 +265,6 @@ - (void) commonInit
 
     _wikipediaChangeObservable = [[OAObservable alloc] init];
 
-    _applicationModeChangedObservable = [[OAObservable alloc] init];
-    _applicationModeChangedObserver = [[OAAutoObserverProxy alloc] initWith:self
-                                                           withHandler:@selector(onAppModeChanged)
-                                                            andObserve:_applicationModeChangedObservable];
     _mapLayersConfiguration = [[OAMapLayersConfiguration alloc] init];
     // Profile settings
     _lastMapSourceProfile = [OACommonMapSource withKey:kLastMapSourceKey defValue:[[OAMapSource alloc] initWithResource:@"default.render.xml"
@@ -445,6 +441,16 @@ - (void) dealloc
     }
 }
 
+- (void) postInit
+{
+    if (!_applicationModeChangedObserver)
+    {
+        _applicationModeChangedObserver = [[OAAutoObserverProxy alloc] initWith:self
+                                                                    withHandler:@selector(onAppModeChanged)
+                                                                     andObserve:OsmAndApp.instance.applicationModeChangedObservable];
+    }
+}
+
 - (void) onAppModeChanged
 {
     dispatch_async(dispatch_get_main_queue(), ^{

diff --git a/Sources/Helpers/OAAppSettings.m b/Sources/Helpers/OAAppSettings.m
@@ -5016,7 +5016,7 @@ - (void)setApplicationModePref:(OAApplicationMode *)applicationMode markAsLastUs
         if (markAsLastUsed)
             [_lastUsedApplicationMode set:applicationMode.stringKey];
         [[ThemeManager shared] configureWithAppMode: applicationMode];
-        [[[OsmAndApp instance].data applicationModeChangedObservable] notifyEventWithKey:prevAppMode];
+        [OsmAndApp.instance.applicationModeChangedObservable notifyEventWithKey:prevAppMode];
     }
 }
 

diff --git a/Sources/Helpers/ScreenOrientationHelper.swift b/Sources/Helpers/ScreenOrientationHelper.swift
@@ -48,7 +48,7 @@ class ScreenOrientationHelper : NSObject {
 
         let app: OsmAndAppProtocol = OsmAndApp.swiftInstance()
         let applicationModeChangedSelector = #selector(onApplicationModeChanged as () -> Void)
-        applicationModeChangedObserver = OAAutoObserverProxy(self, withHandler: applicationModeChangedSelector, andObserve: app.data.applicationModeChangedObservable)
+        applicationModeChangedObserver = OAAutoObserverProxy(self, withHandler: applicationModeChangedSelector, andObserve: app.applicationModeChangedObservable)
     }
 
     deinit {

diff --git a/Sources/POI/OAPOIFiltersHelper.mm b/Sources/POI/OAPOIFiltersHelper.mm
@@ -434,7 +434,7 @@ - (instancetype)init
 
         _applicationModeObserver = [[OAAutoObserverProxy alloc] initWith:self
                                                              withHandler:@selector(onApplicationModeChanged)
-                                                              andObserve:OsmAndApp.instance.data.applicationModeChangedObservable];
+                                                              andObserve:OsmAndApp.instance.applicationModeChangedObservable];
     }
     return self;
 }

diff --git a/Sources/Plugins/ExternalSensorsPlugin/OAExternalSensorsPlugin.mm b/Sources/Plugins/ExternalSensorsPlugin/OAExternalSensorsPlugin.mm
@@ -70,7 +70,10 @@ - (void)disable
 - (void)setEnabled:(BOOL)enabled
 {
     [super setEnabled:enabled];
-    [[OARootViewController instance] updateLeftPanelMenu];
+    if (OsmAndApp.instance.initialized)
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [[OARootViewController instance] updateLeftPanelMenu];
+        });
 }
 
 - (BOOL)isEnabled