diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm index fe608f7dd0..0fd95e9fac 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm @@ -10,7 +10,6 @@ #import "MapViewController.h" #import "SwiftBridge.h" #import "UIImageView+Coloring.h" -#import "location_util.h" #include "geometry/angles.hpp" diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index bd43d84590..24d2ae8dfc 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -493,7 +493,7 @@ ED43B8BD2C12063500D07BAA /* DocumentPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED43B8BC2C12063500D07BAA /* DocumentPicker.swift */; }; ED46DDCE2D098A0B007CACD6 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED46DDCD2D098A0B007CACD6 /* WidgetKit.framework */; }; ED46DDD02D098A0B007CACD6 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED46DDCF2D098A0B007CACD6 /* SwiftUI.framework */; }; - ED46DDE12D098A0C007CACD6 /* OMapsWidgetExtensionExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = ED46DDCC2D098A0B007CACD6 /* OMapsWidgetExtensionExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + ED46DDE12D098A0C007CACD6 /* OMapsWidgetExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = ED46DDCC2D098A0B007CACD6 /* OMapsWidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; ED4DC7772CAEDECC0029B338 /* ProductsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED4DC7752CAEDECC0029B338 /* ProductsViewModel.swift */; }; ED4DC7782CAEDECC0029B338 /* ProductButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED4DC7732CAEDECC0029B338 /* ProductButton.swift */; }; ED4DC7792CAEDECC0029B338 /* ProductsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED4DC7742CAEDECC0029B338 /* ProductsViewController.swift */; }; @@ -767,7 +767,7 @@ dstPath = ""; dstSubfolderSpec = 13; files = ( - ED46DDE12D098A0C007CACD6 /* OMapsWidgetExtensionExtension.appex in Embed Foundation Extensions */, + ED46DDE12D098A0C007CACD6 /* OMapsWidgetExtension.appex in Embed Foundation Extensions */, ); name = "Embed Foundation Extensions"; runOnlyForDeploymentPostprocessing = 0; @@ -1454,7 +1454,7 @@ ED3EAC1F2B03C88100220A4A /* BottomTabBarButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomTabBarButton.swift; sourceTree = ""; }; ED43B8BC2C12063500D07BAA /* DocumentPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentPicker.swift; sourceTree = ""; }; ED46DD922D06F804007CACD6 /* TrackRecordingButtonArea.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackRecordingButtonArea.swift; sourceTree = ""; }; - ED46DDCC2D098A0B007CACD6 /* OMapsWidgetExtensionExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = OMapsWidgetExtensionExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; + ED46DDCC2D098A0B007CACD6 /* OMapsWidgetExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = OMapsWidgetExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; ED46DDCD2D098A0B007CACD6 /* WidgetKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WidgetKit.framework; path = System/Library/Frameworks/WidgetKit.framework; sourceTree = SDKROOT; }; ED46DDCF2D098A0B007CACD6 /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; }; ED48BBB817C2B1E2003E7E92 /* CircleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircleView.h; sourceTree = ""; }; @@ -1922,7 +1922,7 @@ children = ( 6741AA5D1BF340DE002C974C /* Organic Maps (Debug).app */, ED097E762BB80C320006ED01 /* OMapsTests.xctest */, - ED46DDCC2D098A0B007CACD6 /* OMapsWidgetExtensionExtension.appex */, + ED46DDCC2D098A0B007CACD6 /* OMapsWidgetExtension.appex */, ); name = Products; sourceTree = ""; @@ -4092,9 +4092,9 @@ productReference = ED097E762BB80C320006ED01 /* OMapsTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - ED46DDCB2D098A0B007CACD6 /* OMapsWidgetExtensionExtension */ = { + ED46DDCB2D098A0B007CACD6 /* OMapsWidgetExtension */ = { isa = PBXNativeTarget; - buildConfigurationList = ED46DDE62D098A0C007CACD6 /* Build configuration list for PBXNativeTarget "OMapsWidgetExtensionExtension" */; + buildConfigurationList = ED46DDE62D098A0C007CACD6 /* Build configuration list for PBXNativeTarget "OMapsWidgetExtension" */; buildPhases = ( ED46DDC82D098A0B007CACD6 /* Sources */, ED46DDC92D098A0B007CACD6 /* Frameworks */, @@ -4104,11 +4104,11 @@ ); dependencies = ( ); - name = OMapsWidgetExtensionExtension; + name = OMapsWidgetExtension; packageProductDependencies = ( ); productName = OMapsWidgetExtensionExtension; - productReference = ED46DDCC2D098A0B007CACD6 /* OMapsWidgetExtensionExtension.appex */; + productReference = ED46DDCC2D098A0B007CACD6 /* OMapsWidgetExtension.appex */; productType = "com.apple.product-type.app-extension"; }; /* End PBXNativeTarget section */ @@ -4202,7 +4202,7 @@ targets = ( 6741A93D1BF340DE002C974C /* OMaps */, ED097E752BB80C320006ED01 /* OMapsTests */, - ED46DDCB2D098A0B007CACD6 /* OMapsWidgetExtensionExtension */, + ED46DDCB2D098A0B007CACD6 /* OMapsWidgetExtension */, ); }; /* End PBXProject section */ @@ -4934,7 +4934,7 @@ }; ED46DDE02D098A0C007CACD6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = ED46DDCB2D098A0B007CACD6 /* OMapsWidgetExtensionExtension */; + target = ED46DDCB2D098A0B007CACD6 /* OMapsWidgetExtension */; targetProxy = ED46DDDF2D098A0C007CACD6 /* PBXContainerItemProxy */; }; FA456C4D26BDCC9400B83C20 /* PBXTargetDependency */ = { @@ -5178,7 +5178,7 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 0; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 9Z6432XD7L; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -5195,6 +5195,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); + MARKETING_VERSION = 2022.11.17; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.debug.widgetextension; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -5224,7 +5225,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 2022.11.17; PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.widgetextension; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -5344,7 +5345,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - ED46DDE62D098A0C007CACD6 /* Build configuration list for PBXNativeTarget "OMapsWidgetExtensionExtension" */ = { + ED46DDE62D098A0C007CACD6 /* Build configuration list for PBXNativeTarget "OMapsWidgetExtension" */ = { isa = XCConfigurationList; buildConfigurations = ( ED46DDE32D098A0C007CACD6 /* Debug */, diff --git a/iphone/Maps/UI/EditBookmark/BookmarkUIUtils.swift b/iphone/Maps/UI/EditBookmark/BookmarkUIUtils.swift index 32717db091..865a3f8746 100644 --- a/iphone/Maps/UI/EditBookmark/BookmarkUIUtils.swift +++ b/iphone/Maps/UI/EditBookmark/BookmarkUIUtils.swift @@ -1,6 +1,6 @@ import Foundation -extension BookmarkColor: CaseIterable { +extension BookmarkColor { public static var allCases: [BookmarkColor] = [.red, .pink, .purple, .deepPurple, .blue, .lightBlue, .cyan, .teal, .green, .lime, .yellow, .orange, .deepOrange, .brown, .gray, .blueGray] diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorSegmentedTableViewCell.mm b/iphone/Maps/UI/Editor/Cells/MWMEditorSegmentedTableViewCell.mm index c070a92dc7..7048206a4b 100644 --- a/iphone/Maps/UI/Editor/Cells/MWMEditorSegmentedTableViewCell.mm +++ b/iphone/Maps/UI/Editor/Cells/MWMEditorSegmentedTableViewCell.mm @@ -71,6 +71,7 @@ value = Yes; break; default: + value = Unknown; NSAssert(false, @"Unexpected YesNoUnknown value %ld", static_cast(self.segmentedControl.selectedSegmentIndex)); } diff --git a/iphone/Maps/UI/Editor/MWMEditorViewController.mm b/iphone/Maps/UI/Editor/MWMEditorViewController.mm index 98c225b1fa..a67bade268 100644 --- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm +++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm @@ -93,14 +93,6 @@ void cleanupAdditionalLanguages(std::vector const & names, }); } -std::vector extractLanguageCodes(const std::vector& names) -{ - std::vector languageCodes; - for (const auto& name : names) - languageCodes.push_back(static_cast(name.m_code)); - return languageCodes; -} - std::vector cellsForAdditionalNames(osm::NamesDataSource const & ds, std::vector const & newAdditionalLanguages, BOOL showAdditionalNames) diff --git a/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift b/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift index 46969ca151..a7a657e205 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift +++ b/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift @@ -180,9 +180,9 @@ extension PlacePageInteractor: PlacePageButtonsViewControllerDelegate { extension PlacePageInteractor: PlacePageEditBookmarkOrTrackViewControllerDelegate { func didPressEdit(_ data: PlacePageEditData) { switch data { - case .bookmark(let placePageBookmarkData): + case .bookmark: MWMPlacePageManagerHelper.editBookmark(placePageData) - case .track(let placePageTrackData): + case .track: MWMPlacePageManagerHelper.editTrack(placePageData) } } diff --git a/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm b/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm index dbaaac446b..725991feb8 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm @@ -7,7 +7,6 @@ #import "MWMStorage+UI.h" #import "SwiftBridge.h" #import "MWMMapViewControlsManager+AddPlace.h" -#import "location_util.h" #import #import