gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] pass state enum+trackRecordingInfo instead of Bool to the TR callback

Browse source 
Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn 2024-12-24 12:16:42 +04:00 • committed by Roman Tsisyk
parent d747702611
commit 37d906e7f1
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
View file

@ -64,8 +64,8 @@ NSString *const kMapToCategorySelectorSegue = @"MapToCategorySelectorSegue";
self.menuState = MWMBottomMenuStateInactive;
self.menuRestoreState = MWMBottomMenuStateInactive;
self.isAddingPlace = NO;
[TrackRecordingManager.shared addObserver:self recordingIsActiveDidChangeHandler:^(BOOL isActive) {
[self setTrackRecordingButtonHidden:!isActive];
[TrackRecordingManager.shared addObserver:self recordingIsActiveDidChangeHandler:^(TrackRecordingState state, TrackInfo * trackInfo) {
[self setTrackRecordingButtonHidden:state == TrackRecordingStateInactive];
}];
return self;
}

11
iphone/Maps/Core/TrackRecorder/TrackRecordingManager.swift
View file

@ -1,4 +1,5 @@
enum TrackRecordingState: Equatable {
@objc
enum TrackRecordingState: Int, Equatable {
case inactive
case active
}
@ -17,7 +18,7 @@ protocol TrackRecordingObserver: AnyObject {
func removeObserver(_ observer: AnyObject)
}
typealias TrackRecordingStateHandler = (Bool) -> Void
typealias TrackRecordingStateHandler = (TrackRecordingState, TrackInfo?) -> Void
@objcMembers
final class TrackRecordingManager: NSObject {
@ -134,6 +135,7 @@ final class TrackRecordingManager: NSObject {
trackRecorder.setTrackRecordingUpdateHandler { [weak self] info in
guard let self else { return }
self.trackRecordingInfo = info
self.notifyObservers()
self.activityManager?.update(info)
}
}
@ -187,6 +189,7 @@ final class TrackRecordingManager: NSObject {
trackRecorder.stopTrackRecording()
activityManager?.stop()
notifyObservers()
switch savingOption {
case .withoutSaving:
break
@ -226,7 +229,7 @@ extension TrackRecordingManager: TrackRecordingObserver {
func addObserver(_ observer: AnyObject, recordingIsActiveDidChangeHandler: @escaping TrackRecordingStateHandler) {
let observation = Observation(observer: observer, recordingStateDidChangeHandler: recordingIsActiveDidChangeHandler)
observations.append(observation)
recordingIsActiveDidChangeHandler(recordingState == .active)
recordingIsActiveDidChangeHandler(recordingState, trackRecordingInfo)
}
@objc
@ -236,6 +239,6 @@ extension TrackRecordingManager: TrackRecordingObserver {
private func notifyObservers() {
observations = observations.filter { $0.observer != nil }
observations.forEach { $0.recordingStateDidChangeHandler?(recordingState == .active) }
observations.forEach { $0.recordingStateDidChangeHandler?(recordingState, trackRecordingInfo) }
}
}