From 37d906e7f170523150620f3ccdb69eceed52b2c9 Mon Sep 17 00:00:00 2001
From: Kiryl Kaveryn <kirylkaveryn@gmail.com>
Date: Tue, 24 Dec 2024 12:16:42 +0400
Subject: [PATCH] [ios] pass `state enum+trackRecordingInfo` instead of Bool to
 the TR callback

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
---
 .../MapViewControls/MWMMapViewControlsManager.mm      |  4 ++--
 .../Core/TrackRecorder/TrackRecordingManager.swift    | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
index 982b46bba0..8944fc2075 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
@@ -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;
 }
diff --git a/iphone/Maps/Core/TrackRecorder/TrackRecordingManager.swift b/iphone/Maps/Core/TrackRecorder/TrackRecordingManager.swift
index eb2816e1f2..8e814445e7 100644
--- a/iphone/Maps/Core/TrackRecorder/TrackRecordingManager.swift
+++ b/iphone/Maps/Core/TrackRecorder/TrackRecordingManager.swift
@@ -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) }
   }
 }