From 47b18e7753f89b603e96b2a58b8396fec94e17ab Mon Sep 17 00:00:00 2001 From: eisa01 Date: Wed, 27 Aug 2025 21:08:18 +0200 Subject: [PATCH] [ios] Move branch data to PlacePagePreview Signed-off-by: eisa01 --- .../CoreApi/PlacePageData/Common/PlacePagePreviewData.h | 2 ++ .../CoreApi/PlacePageData/Common/PlacePagePreviewData.mm | 4 ++++ iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm | 3 +++ .../Components/PlacePageHeader/PlacePageHeaderBuilder.swift | 1 - .../PlacePageHeader/PlacePageHeaderPresenter.swift | 5 +---- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.h b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.h index 8b5a10fa6..c062e3b69 100644 --- a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.h +++ b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.h @@ -35,12 +35,14 @@ NS_ASSUME_NONNULL_BEGIN @property(nonatomic, readonly, nullable) NSString *title; @property(nonatomic, readonly, nullable) NSString *secondaryTitle; @property(nonatomic, readonly, nullable) NSString *subtitle; +@property(nonatomic, readonly, nullable) NSString *branch; @property(nonatomic, readonly, nullable) NSString *coordinates; @property(nonatomic, readonly, nullable) NSString *secondarySubtitle; @property(nonatomic, readonly) PlacePageDataSchedule schedule; @property(nonatomic, readonly) BOOL isMyPosition; - (instancetype)initWithTrackInfo:(TrackInfo * _Nonnull)trackInfo; +- (void)setBranch:(NSString * _Nullable)branch; @end diff --git a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm index eaa1527b3..d93a539d3 100644 --- a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm +++ b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm @@ -59,6 +59,10 @@ static PlacePageDataSchedule convertOpeningHours(std::string_view rawOH) return self; } +- (void)setBranch:(NSString * _Nullable)branch { + _branch = branch; +} + @end @implementation PlacePagePreviewData (Core) diff --git a/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm b/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm index 94249a6b4..ae9c5bcef 100644 --- a/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm +++ b/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm @@ -75,6 +75,9 @@ static PlacePageRoadType convertRoadType(RoadWarningMarkType roadType) { }]; } _previewData = [[PlacePagePreviewData alloc] initWithRawData:rawData()]; + + // Set branch from infoData to previewData + [_previewData setBranch:_infoData.branch]; auto const &countryId = rawData().GetCountryId(); if (!countryId.empty()) { diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderBuilder.swift b/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderBuilder.swift index 08df08516..73d52a8e5 100644 --- a/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderBuilder.swift +++ b/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderBuilder.swift @@ -6,7 +6,6 @@ class PlacePageHeaderBuilder { let viewController = storyboard.instantiateViewController(ofType: PlacePageHeaderViewController.self); let presenter = PlacePageHeaderPresenter(view: viewController, placePagePreviewData: data.previewData, - branch: data.infoData?.branch, objectType: data.objectType, delegate: delegate, headerType: headerType) diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderPresenter.swift b/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderPresenter.swift index 75ecc2f3a..27597a8e8 100644 --- a/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderPresenter.swift +++ b/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderPresenter.swift @@ -23,21 +23,18 @@ class PlacePageHeaderPresenter { private weak var view: PlacePageHeaderViewProtocol? private let placePagePreviewData: PlacePagePreviewData - private let branch: String? let objectType: PlacePageObjectType private weak var delegate: PlacePageHeaderViewControllerDelegate? private let headerType: HeaderType init(view: PlacePageHeaderViewProtocol, placePagePreviewData: PlacePagePreviewData, - branch: String?, objectType: PlacePageObjectType, delegate: PlacePageHeaderViewControllerDelegate?, headerType: HeaderType) { self.view = view self.delegate = delegate self.placePagePreviewData = placePagePreviewData - self.branch = branch self.objectType = objectType self.headerType = headerType } @@ -45,7 +42,7 @@ class PlacePageHeaderPresenter { extension PlacePageHeaderPresenter: PlacePageHeaderPresenterProtocol { func configure() { - view?.setTitle(placePagePreviewData.title, secondaryTitle: placePagePreviewData.secondaryTitle, branch: branch) + view?.setTitle(placePagePreviewData.title, secondaryTitle: placePagePreviewData.secondaryTitle, branch: placePagePreviewData.branch) switch headerType { case .flexible: view?.isExpandViewHidden = false