diff --git a/.gitignore b/.gitignore index 550688797..6b8bcc714 100644 --- a/.gitignore +++ b/.gitignore @@ -187,3 +187,4 @@ tools/unix/maps/settings.sh # VS Code .vscode .cache +iphone/Maps/UI/Storyboard/Welcome.storyboard diff --git a/3party/bsdiff-courgette/bsdiff/bsdiff.h b/3party/bsdiff-courgette/bsdiff/bsdiff.h index 33a7421bc..324d9fcea 100644 --- a/3party/bsdiff-courgette/bsdiff/bsdiff.h +++ b/3party/bsdiff-courgette/bsdiff/bsdiff.h @@ -35,7 +35,7 @@ // 2013-04-10 - Added wrapper to apply a patch directly to files. // --Joshua Pawlicki // 2017-08-14 - Moved "apply" and "create" to the header file, rewrote -// all routines to use OMaps readers and writers instead +// all routines to use CoMaps readers and writers instead // of Courgette streams and files. // --Maxim Pimenov // 2019-01-24 - Got rid of the paged array. We have enough address space diff --git a/drape/glyph_manager.cpp b/drape/glyph_manager.cpp index 742da8742..e1f4885cc 100644 --- a/drape/glyph_manager.cpp +++ b/drape/glyph_manager.cpp @@ -598,7 +598,7 @@ GlyphImage GlyphManager::GetGlyphImage(GlyphFontAndId key, int pixelHeight, bool namespace { -hb_language_t OrganicMapsLanguageToHarfbuzzLanguage(int8_t lang) +hb_language_t CoMapsLanguageToHarfbuzzLanguage(int8_t lang) { // TODO(AB): can langs be converted faster? auto const svLang = StringUtf8Multilang::GetLangByCode(lang); @@ -625,7 +625,7 @@ text::TextMetrics GlyphManager::ShapeText(std::string_view utf8, int fontPixelHe const auto [text, segments] = harfbuzz_shaping::GetTextSegments(utf8); // TODO(AB): Optimize language conversion. - hb_language_t const hbLanguage = OrganicMapsLanguageToHarfbuzzLanguage(lang); + hb_language_t const hbLanguage = CoMapsLanguageToHarfbuzzLanguage(lang); text::TextMetrics allGlyphs; // For SplitText it's enough to know if the last visual (first logical) segment is RTL. diff --git a/iphone/Chart/Chart.xcodeproj/project.pbxproj b/iphone/Chart/Chart.xcodeproj/project.pbxproj index 973356a7b..b12c4e033 100644 --- a/iphone/Chart/Chart.xcodeproj/project.pbxproj +++ b/iphone/Chart/Chart.xcodeproj/project.pbxproj @@ -359,7 +359,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.chart; + PRODUCT_BUNDLE_IDENTIFIER = app.comaps.chart; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; }; @@ -380,7 +380,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.chart; + PRODUCT_BUNDLE_IDENTIFIER = app.comaps.chart; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; }; diff --git a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj index e0a62c5ee..6c02d082a 100644 --- a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj +++ b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj @@ -776,7 +776,7 @@ ); MACH_O_TYPE = staticlib; MODULEMAP_FILE = CoreApi.modulemap; - PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.coreapi; + PRODUCT_BUNDLE_IDENTIFIER = app.comaps.coreapi; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; diff --git a/iphone/CoreApi/CoreApi/Logger/Logger.mm b/iphone/CoreApi/CoreApi/Logger/Logger.mm index 203b874a9..d58f63692 100644 --- a/iphone/CoreApi/CoreApi/Logger/Logger.mm +++ b/iphone/CoreApi/CoreApi/Logger/Logger.mm @@ -58,7 +58,7 @@ static BOOL _fileLoggingEnabled = NO; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ dispatch_queue_attr_t attributes = dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, QOS_CLASS_UTILITY, 0); - fileLoggingQueue = dispatch_queue_create("app.organicmaps.fileLoggingQueue", attributes); + fileLoggingQueue = dispatch_queue_create("app.comaps.fileLoggingQueue", attributes); }); return fileLoggingQueue; } diff --git a/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj b/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj index 0a088d2e0..7d44d1b5d 100644 --- a/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj +++ b/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj @@ -251,7 +251,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.datepicker; + PRODUCT_BUNDLE_IDENTIFIER = app.comaps.datepicker; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; }; @@ -271,7 +271,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.datepicker; + PRODUCT_BUNDLE_IDENTIFIER = app.comaps.datepicker; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; }; diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 24b0d3aad..7620c2bce 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -670,11 +670,11 @@ NSString *const kSettingsSegue = @"Map2Settings"; [self.navigationController popToRootViewControllerAnimated:NO]; if (self.isViewLoaded) { [MWMRouter stopRouting]; - if ([action isEqualToString:@"app.organicmaps.3daction.bookmarks"]) + if ([action isEqualToString:@"app.comaps.3daction.bookmarks"]) [self.bookmarksCoordinator open]; - else if ([action isEqualToString:@"app.organicmaps.3daction.search"]) + else if ([action isEqualToString:@"app.comaps.3daction.search"]) [self.searchManager startSearchingWithIsRouting:NO]; - else if ([action isEqualToString:@"app.organicmaps.3daction.route"]) + else if ([action isEqualToString:@"app.comaps.3daction.route"]) [self.controlsManager onRoutePrepare]; } else { dispatch_async(dispatch_get_main_queue(), ^{ diff --git a/iphone/Maps/CoMaps-Debug.entitlements b/iphone/Maps/CoMaps-Debug.entitlements new file mode 100644 index 000000000..b70268516 --- /dev/null +++ b/iphone/Maps/CoMaps-Debug.entitlements @@ -0,0 +1,14 @@ + + + + + aps-environment + development + com.apple.developer.associated-domains + + applinks:comaps.app + + com.apple.developer.ubiquity-container-identifiers + + + diff --git a/iphone/Maps/OMaps-Release.entitlements b/iphone/Maps/CoMaps-Release.entitlements similarity index 50% rename from iphone/Maps/OMaps-Release.entitlements rename to iphone/Maps/CoMaps-Release.entitlements index eac295fce..f396b4c5a 100644 --- a/iphone/Maps/OMaps-Release.entitlements +++ b/iphone/Maps/CoMaps-Release.entitlements @@ -6,25 +6,14 @@ development com.apple.developer.associated-domains - applinks:omaps.app - applinks:omaps.at + applinks:comaps.app + applinks:comaps.at com.apple.developer.carplay-maps com.apple.developer.icloud-container-identifiers - - iCloud.app.organicmaps - + com.apple.developer.icloud-services - - CloudDocuments - CloudKit - - com.apple.developer.ubiquity-container-identifiers - - iCloud.app.organicmaps - - com.apple.developer.ubiquity-kvstore-identifier - $(TeamIdentifierPrefix)$(CFBundleIdentifier) + diff --git a/iphone/Maps/CoMaps.plist b/iphone/Maps/CoMaps.plist new file mode 100644 index 000000000..0c67376eb --- /dev/null +++ b/iphone/Maps/CoMaps.plist @@ -0,0 +1,5 @@ + + + + + diff --git a/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/AccentColor.colorset/Contents.json b/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from iphone/Maps/OMapsWidgetExtension/Assets.xcassets/AccentColor.colorset/Contents.json rename to iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/AppIcon.appiconset/Contents.json b/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from iphone/Maps/OMapsWidgetExtension/Assets.xcassets/AppIcon.appiconset/Contents.json rename to iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/Contents.json b/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/Contents.json similarity index 100% rename from iphone/Maps/OMapsWidgetExtension/Assets.xcassets/Contents.json rename to iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/Contents.json diff --git a/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/WidgetBackground.colorset/Contents.json b/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/WidgetBackground.colorset/Contents.json similarity index 100% rename from iphone/Maps/OMapsWidgetExtension/Assets.xcassets/WidgetBackground.colorset/Contents.json rename to iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/WidgetBackground.colorset/Contents.json diff --git a/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/logo.imageset/Contents.json b/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/logo.imageset/Contents.json similarity index 100% rename from iphone/Maps/OMapsWidgetExtension/Assets.xcassets/logo.imageset/Contents.json rename to iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/logo.imageset/Contents.json diff --git a/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/logo.imageset/logo.png b/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/logo.imageset/logo.png new file mode 100644 index 000000000..dac2abbdc Binary files /dev/null and b/iphone/Maps/CoMapsWidgetExtension/Assets.xcassets/logo.imageset/logo.png differ diff --git a/iphone/Maps/OMapsWidgetExtension/OMapsWidgetExtensionBundle.swift b/iphone/Maps/CoMapsWidgetExtension/CoMapsWidgetExtensionBundle.swift similarity index 69% rename from iphone/Maps/OMapsWidgetExtension/OMapsWidgetExtensionBundle.swift rename to iphone/Maps/CoMapsWidgetExtension/CoMapsWidgetExtensionBundle.swift index 5f85ff1b1..b9b6232f1 100644 --- a/iphone/Maps/OMapsWidgetExtension/OMapsWidgetExtensionBundle.swift +++ b/iphone/Maps/CoMapsWidgetExtension/CoMapsWidgetExtensionBundle.swift @@ -2,7 +2,7 @@ import WidgetKit import SwiftUI @main -struct OMapsWidgetExtensionBundle: WidgetBundle { +struct CoMapsWidgetExtensionBundle: WidgetBundle { var body: some Widget { TrackRecordingLiveActivityConfiguration() } diff --git a/iphone/Maps/OMapsWidgetExtension/Info.plist b/iphone/Maps/CoMapsWidgetExtension/Info.plist similarity index 100% rename from iphone/Maps/OMapsWidgetExtension/Info.plist rename to iphone/Maps/CoMapsWidgetExtension/Info.plist diff --git a/iphone/Maps/OMapsWidgetExtension/LiveActivity/AppLogo.swift b/iphone/Maps/CoMapsWidgetExtension/LiveActivity/AppLogo.swift similarity index 100% rename from iphone/Maps/OMapsWidgetExtension/LiveActivity/AppLogo.swift rename to iphone/Maps/CoMapsWidgetExtension/LiveActivity/AppLogo.swift diff --git a/iphone/Maps/OMapsWidgetExtension/LiveActivity/LiveActivityManager.swift b/iphone/Maps/CoMapsWidgetExtension/LiveActivity/LiveActivityManager.swift similarity index 100% rename from iphone/Maps/OMapsWidgetExtension/LiveActivity/LiveActivityManager.swift rename to iphone/Maps/CoMapsWidgetExtension/LiveActivity/LiveActivityManager.swift diff --git a/iphone/Maps/OMapsWidgetExtension/LiveActivity/StatisticDetailView.swift b/iphone/Maps/CoMapsWidgetExtension/LiveActivity/StatisticDetailView.swift similarity index 100% rename from iphone/Maps/OMapsWidgetExtension/LiveActivity/StatisticDetailView.swift rename to iphone/Maps/CoMapsWidgetExtension/LiveActivity/StatisticDetailView.swift diff --git a/iphone/Maps/OMapsWidgetExtension/LiveActivity/StatisticValueView.swift b/iphone/Maps/CoMapsWidgetExtension/LiveActivity/StatisticValueView.swift similarity index 100% rename from iphone/Maps/OMapsWidgetExtension/LiveActivity/StatisticValueView.swift rename to iphone/Maps/CoMapsWidgetExtension/LiveActivity/StatisticValueView.swift diff --git a/iphone/Maps/OMapsWidgetExtension/LiveActivity/TrackRecordingLiveActivityAttributes.swift b/iphone/Maps/CoMapsWidgetExtension/LiveActivity/TrackRecordingLiveActivityAttributes.swift similarity index 100% rename from iphone/Maps/OMapsWidgetExtension/LiveActivity/TrackRecordingLiveActivityAttributes.swift rename to iphone/Maps/CoMapsWidgetExtension/LiveActivity/TrackRecordingLiveActivityAttributes.swift diff --git a/iphone/Maps/OMapsWidgetExtension/LiveActivity/TrackRecordingLiveActivityConfiguration.swift b/iphone/Maps/CoMapsWidgetExtension/LiveActivity/TrackRecordingLiveActivityConfiguration.swift similarity index 100% rename from iphone/Maps/OMapsWidgetExtension/LiveActivity/TrackRecordingLiveActivityConfiguration.swift rename to iphone/Maps/CoMapsWidgetExtension/LiveActivity/TrackRecordingLiveActivityConfiguration.swift diff --git a/iphone/Maps/OMapsWidgetExtension/LiveActivity/TrackRecordingLiveActivityView.swift b/iphone/Maps/CoMapsWidgetExtension/LiveActivity/TrackRecordingLiveActivityView.swift similarity index 100% rename from iphone/Maps/OMapsWidgetExtension/LiveActivity/TrackRecordingLiveActivityView.swift rename to iphone/Maps/CoMapsWidgetExtension/LiveActivity/TrackRecordingLiveActivityView.swift diff --git a/iphone/Maps/Core/Editor/MWMEditorHelper.mm b/iphone/Maps/Core/Editor/MWMEditorHelper.mm index 8a2461d51..4bfcba973 100644 --- a/iphone/Maps/Core/Editor/MWMEditorHelper.mm +++ b/iphone/Maps/Core/Editor/MWMEditorHelper.mm @@ -33,7 +33,7 @@ osm::Editor::Instance().UploadChanges( oauthToken, {{"created_by", - std::string("Organic Maps " OMIM_OS_NAME " ") + AppInfo.sharedInfo.bundleVersion.UTF8String}, + std::string("CoMaps " OMIM_OS_NAME " ") + AppInfo.sharedInfo.bundleVersion.UTF8String}, {"bundle_id", NSBundle.mainBundle.bundleIdentifier.UTF8String}}, lambda); } diff --git a/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm b/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm index 6997c494a..fe44768ad 100644 --- a/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm +++ b/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm @@ -150,7 +150,7 @@ } else { if (errorPtr) { if (pointsCount == 0) { - *errorPtr = [NSError errorWithDomain:@"omaps.app.routing" + *errorPtr = [NSError errorWithDomain:@"comaps.app.routing" code:MWMRouterResultCodeStartPointNotFound userInfo:nil]; } else { @@ -161,7 +161,7 @@ } else { code = MWMRouterResultCodeStartPointNotFound; } - *errorPtr = [NSError errorWithDomain:@"omaps.app.routing" + *errorPtr = [NSError errorWithDomain:@"comaps.app.routing" code:code userInfo:nil]; } diff --git a/iphone/Maps/Core/Search/MWMSearch+CoreSpotlight.mm b/iphone/Maps/Core/Search/MWMSearch+CoreSpotlight.mm index 64c434051..ea7a0cfb8 100644 --- a/iphone/Maps/Core/Search/MWMSearch+CoreSpotlight.mm +++ b/iphone/Maps/Core/Search/MWMSearch+CoreSpotlight.mm @@ -49,7 +49,7 @@ CSSearchableItem * item = [[CSSearchableItem alloc] initWithUniqueIdentifier:categoryKeyString - domainIdentifier:@"omaps.app.categories" + domainIdentifier:@"comaps.app.categories" attributeSet:attrSet]; [items addObject:item]; } diff --git a/iphone/Maps/Core/Theme/Colors.swift b/iphone/Maps/Core/Theme/Colors.swift index fafb1b8cc..ba7a8c98c 100644 --- a/iphone/Maps/Core/Theme/Colors.swift +++ b/iphone/Maps/Core/Theme/Colors.swift @@ -1,10 +1,10 @@ class DayColors: IColors { var clear = UIColor.clear var primaryDark = UIColor(24, 128, 68, alpha100) - var primary = UIColor(0, 108, 53, alpha100) - var secondary = UIColor(45, 137, 83, alpha100) + var primary = UIColor(88, 129, 87, alpha100) + var secondary = UIColor(55, 101, 63, alpha100) // Light green color - var primaryLight = UIColor(36, 180, 98, alpha100) + var primaryLight = UIColor(124, 188, 123, alpha100) var menuBackground = UIColor(255, 255, 255, alpha90) var tabBarButtonBackground = UIColor(255, 255, 255, alpha70) var downloadBadgeBackground = UIColor(255, 55, 35, alpha100) diff --git a/iphone/Maps/Core/iCloud/CloudDirectoryMonitor.swift b/iphone/Maps/Core/iCloud/CloudDirectoryMonitor.swift index 2b15c261f..e48aad8ef 100644 --- a/iphone/Maps/Core/iCloud/CloudDirectoryMonitor.swift +++ b/iphone/Maps/Core/iCloud/CloudDirectoryMonitor.swift @@ -17,7 +17,7 @@ private let kDocumentsDirectoryName = "Documents" final class iCloudDocumentsMonitor: NSObject, CloudDirectoryMonitor { private static let sharedContainerIdentifier: String = { - var identifier = "iCloud.app.organicmaps" + var identifier = "iCloud.app.comaps" #if DEBUG identifier.append(".debug") #endif diff --git a/iphone/Maps/Core/iCloud/SynchronizationFileWriter.swift b/iphone/Maps/Core/iCloud/SynchronizationFileWriter.swift index 74666692c..fe92f5a9c 100644 --- a/iphone/Maps/Core/iCloud/SynchronizationFileWriter.swift +++ b/iphone/Maps/Core/iCloud/SynchronizationFileWriter.swift @@ -1,6 +1,6 @@ final class SynchronizationFileWriter { private let fileManager: FileManager - private let backgroundQueue = DispatchQueue(label: "iCloud.app.organicmaps.backgroundQueue", qos: .background) + private let backgroundQueue = DispatchQueue(label: "iCloud.app.comaps.backgroundQueue", qos: .background) private let fileCoordinator: NSFileCoordinator private let localDirectoryUrl: URL private let cloudDirectoryUrl: URL diff --git a/iphone/Maps/Images.xcassets/About/ic_social_media_github.imageset/Contents.json b/iphone/Maps/Images.xcassets/About/ic_social_media_bluesky.imageset/Contents.json similarity index 60% rename from iphone/Maps/Images.xcassets/About/ic_social_media_github.imageset/Contents.json rename to iphone/Maps/Images.xcassets/About/ic_social_media_bluesky.imageset/Contents.json index 4fc1bc3a4..afe8223ab 100644 --- a/iphone/Maps/Images.xcassets/About/ic_social_media_github.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/About/ic_social_media_bluesky.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "ic_social_media_github.pdf", + "filename" : "ic_social_media_bluesky.svg", "idiom" : "universal" } ], @@ -10,6 +10,6 @@ "version" : 1 }, "properties" : { - "template-rendering-intent" : "template" + "template-rendering-intent" : "original" } } diff --git a/iphone/Maps/Images.xcassets/About/ic_social_media_bluesky.imageset/ic_social_media_bluesky.svg b/iphone/Maps/Images.xcassets/About/ic_social_media_bluesky.imageset/ic_social_media_bluesky.svg new file mode 100644 index 000000000..c71e2018a --- /dev/null +++ b/iphone/Maps/Images.xcassets/About/ic_social_media_bluesky.imageset/ic_social_media_bluesky.svg @@ -0,0 +1,4 @@ + + + + diff --git a/iphone/Maps/Images.xcassets/About/ic_social_media_x.imageset/Contents.json b/iphone/Maps/Images.xcassets/About/ic_social_media_codeberg.imageset/Contents.json similarity index 60% rename from iphone/Maps/Images.xcassets/About/ic_social_media_x.imageset/Contents.json rename to iphone/Maps/Images.xcassets/About/ic_social_media_codeberg.imageset/Contents.json index bc8e83729..69182a0cb 100644 --- a/iphone/Maps/Images.xcassets/About/ic_social_media_x.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/About/ic_social_media_codeberg.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "ic_social_media_x.pdf", + "filename" : "ic_social_media_codeberg.svg", "idiom" : "universal" } ], @@ -10,6 +10,6 @@ "version" : 1 }, "properties" : { - "template-rendering-intent" : "template" + "template-rendering-intent" : "original" } } diff --git a/iphone/Maps/Images.xcassets/About/ic_social_media_codeberg.imageset/ic_social_media_codeberg.svg b/iphone/Maps/Images.xcassets/About/ic_social_media_codeberg.imageset/ic_social_media_codeberg.svg new file mode 100644 index 000000000..028b729ff --- /dev/null +++ b/iphone/Maps/Images.xcassets/About/ic_social_media_codeberg.imageset/ic_social_media_codeberg.svg @@ -0,0 +1,164 @@ + + + Codeberg logo + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Codeberg logo + + + + Robert Martinez + + + + + Codeberg and the Codeberg Logo are trademarks of Codeberg e.V. + + + 2020-04-09 + + + Codeberg e.V. + + + codeberg.org + + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/About/ic_social_media_github.imageset/ic_social_media_github.pdf b/iphone/Maps/Images.xcassets/About/ic_social_media_github.imageset/ic_social_media_github.pdf deleted file mode 100644 index f6c9e86e0..000000000 --- a/iphone/Maps/Images.xcassets/About/ic_social_media_github.imageset/ic_social_media_github.pdf +++ /dev/null @@ -1,92 +0,0 @@ -%PDF-1.7 - -1 0 obj - << >> -endobj - -2 0 obj - << /Length 3 0 R >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 0.000000 -0.217819 cm -0.000000 0.000000 0.000000 scn -26.830593 52.941193 m -11.993969 52.941193 0.000000 40.858803 0.000000 25.911240 c -0.000000 13.962856 7.684948 3.848797 18.346010 0.269115 c -19.678917 0.000008 20.167156 0.850716 20.167156 1.566326 c -20.167156 2.192963 20.123219 4.340881 20.123219 6.578869 c -12.659597 4.967518 11.105364 9.801018 11.105364 9.801018 c -9.905912 12.933655 8.128702 13.738785 8.128702 13.738785 c -5.685863 15.394619 8.306643 15.394619 8.306643 15.394619 c -11.016394 15.215580 12.438272 12.620064 12.438272 12.620064 c -14.836625 8.503262 18.701342 9.666470 20.256126 10.382626 c -20.478003 12.127979 21.189217 13.336220 21.944366 14.007339 c -15.991592 14.633976 9.728520 16.960934 9.728520 27.343552 c -9.728520 30.297146 10.793968 32.713623 12.482207 34.592987 c -12.215845 35.264107 11.282755 38.039211 12.749118 41.753448 c -12.749118 41.753448 15.014565 42.469604 20.122669 38.978893 c -22.309631 39.570564 24.565010 39.871555 26.830593 39.874088 c -29.096041 39.874088 31.405426 39.560493 33.537968 38.978893 c -38.646622 42.469604 40.912071 41.753448 40.912071 41.753448 c -42.378433 38.039211 41.444790 35.264107 41.178429 34.592987 c -42.911152 32.713623 43.932667 30.297146 43.932667 27.343552 c -43.932667 16.960934 37.669594 14.679012 31.672335 14.007339 c -32.649910 13.157181 33.493481 11.546379 33.493481 8.995346 c -33.493481 5.370628 33.449547 2.461521 33.449547 1.566872 c -33.449547 0.850716 33.938335 0.000008 35.270691 0.268566 c -45.931755 3.849346 53.616699 13.962856 53.616699 25.911240 c -53.660637 40.858803 41.622734 52.941193 26.830593 52.941193 c -h -f* -n -Q - -endstream -endobj - -3 0 obj - 1667 -endobj - -4 0 obj - << /Annots [] - /Type /Page - /MediaBox [ 0.000000 0.000000 53.616821 52.723373 ] - /Resources 1 0 R - /Contents 2 0 R - /Parent 5 0 R - >> -endobj - -5 0 obj - << /Kids [ 4 0 R ] - /Count 1 - /Type /Pages - >> -endobj - -6 0 obj - << /Pages 5 0 R - /Type /Catalog - >> -endobj - -xref -0 7 -0000000000 65535 f -0000000010 00000 n -0000000034 00000 n -0000001757 00000 n -0000001780 00000 n -0000001953 00000 n -0000002027 00000 n -trailer -<< /ID [ (some) (id) ] - /Root 6 0 R - /Size 7 ->> -startxref -2086 -%%EOF \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/About/ic_social_media_reddit.imageset/Contents.json b/iphone/Maps/Images.xcassets/About/ic_social_media_lemmy.imageset/Contents.json similarity index 79% rename from iphone/Maps/Images.xcassets/About/ic_social_media_reddit.imageset/Contents.json rename to iphone/Maps/Images.xcassets/About/ic_social_media_lemmy.imageset/Contents.json index abde151ef..a0cf64315 100644 --- a/iphone/Maps/Images.xcassets/About/ic_social_media_reddit.imageset/Contents.json +++ b/iphone/Maps/Images.xcassets/About/ic_social_media_lemmy.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "ic_social_media_reddit.pdf", + "filename" : "ic_social_media_lemmy.svg", "idiom" : "universal" } ], diff --git a/iphone/Maps/Images.xcassets/About/ic_social_media_lemmy.imageset/ic_social_media_lemmy.svg b/iphone/Maps/Images.xcassets/About/ic_social_media_lemmy.imageset/ic_social_media_lemmy.svg new file mode 100644 index 000000000..eb0772428 --- /dev/null +++ b/iphone/Maps/Images.xcassets/About/ic_social_media_lemmy.imageset/ic_social_media_lemmy.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + diff --git a/iphone/Maps/Images.xcassets/About/ic_social_media_reddit.imageset/ic_social_media_reddit.pdf b/iphone/Maps/Images.xcassets/About/ic_social_media_reddit.imageset/ic_social_media_reddit.pdf deleted file mode 100644 index b344df30b..000000000 --- a/iphone/Maps/Images.xcassets/About/ic_social_media_reddit.imageset/ic_social_media_reddit.pdf +++ /dev/null @@ -1,507 +0,0 @@ -%PDF-1.7 - -1 0 obj - << /Length 2 0 R - /Range [ 0.000000 1.000000 0.000000 1.000000 0.000000 1.000000 ] - /Domain [ 0.000000 1.000000 ] - /FunctionType 4 - >> -stream -{ 0.478431 exch 0.572549 exch 0.600000 exch dup 0.480000 gt { exch pop exch pop exch pop dup 0.480000 sub -2.043343 mul 0.478431 add exch dup 0.480000 sub -2.063983 mul 0.572549 add exch dup 0.480000 sub -2.063983 mul 0.600000 add exch } if dup 0.670000 gt { exch pop exch pop exch pop dup 0.670000 sub -1.127451 mul 0.090196 add exch dup 0.670000 sub -2.254903 mul 0.180392 add exch dup 0.670000 sub -2.598040 mul 0.207843 add exch } if dup 0.750000 gt { exch pop exch pop exch pop dup 0.750000 sub 1.288516 mul 0.000000 add exch dup 0.750000 sub 2.577031 mul 0.000000 add exch dup 0.750000 sub 2.969188 mul 0.000000 add exch } if dup 0.820000 gt { exch pop exch pop exch pop 0.090196 exch 0.180392 exch 0.207843 exch } if pop } -endstream -endobj - -2 0 obj - 730 -endobj - -3 0 obj - << /Length 4 0 R - /Range [ 0.000000 1.000000 0.000000 1.000000 0.000000 1.000000 ] - /Domain [ 0.000000 1.000000 ] - /FunctionType 4 - >> -stream -{ 1.000000 exch 0.400000 exch 0.000000 exch dup 0.000000 gt { exch pop exch pop exch pop dup 0.000000 sub 0.000000 mul 1.000000 add exch dup 0.000000 sub -0.258824 mul 0.400000 add exch dup 0.000000 sub 0.000000 mul 0.000000 add exch } if dup 0.500000 gt { exch pop exch pop exch pop dup 0.500000 sub -0.058824 mul 1.000000 add exch dup 0.500000 sub -0.039216 mul 0.270588 add exch dup 0.500000 sub 0.019608 mul 0.000000 add exch } if dup 0.700000 gt { exch pop exch pop exch pop dup 0.700000 sub -0.261438 mul 0.988235 add exch dup 0.700000 sub -0.130719 mul 0.262745 add exch dup 0.700000 sub 0.196078 mul 0.003922 add exch } if dup 0.820000 gt { exch pop exch pop exch pop dup 0.820000 sub -0.588235 mul 0.956863 add exch dup 0.820000 sub -0.274510 mul 0.247059 add exch dup 0.820000 sub 0.431372 mul 0.027451 add exch } if dup 0.920000 gt { exch pop exch pop exch pop dup 0.920000 sub -0.833333 mul 0.898039 add exch dup 0.920000 sub -0.392157 mul 0.219608 add exch dup 0.920000 sub 0.637255 mul 0.070588 add exch } if dup 1.000000 gt { exch pop exch pop exch pop 0.831373 exch 0.188235 exch 0.121569 exch } if pop } -endstream -endobj - -4 0 obj - 1121 -endobj - -5 0 obj - << /Length 6 0 R - /Range [ 0.000000 1.000000 0.000000 1.000000 0.000000 1.000000 ] - /Domain [ 0.000000 1.000000 ] - /FunctionType 4 - >> -stream -{ 0.996078 exch 1.000000 exch 1.000000 exch dup 0.000000 gt { exch pop exch pop exch pop dup 0.000000 sub 0.000000 mul 0.996078 add exch dup 0.000000 sub 0.000000 mul 1.000000 add exch dup 0.000000 sub 0.000000 mul 1.000000 add exch } if dup 0.400000 gt { exch pop exch pop exch pop dup 0.400000 sub -0.178253 mul 0.996078 add exch dup 0.400000 sub -0.106952 mul 1.000000 add exch dup 0.400000 sub -0.106952 mul 1.000000 add exch } if dup 0.510000 gt { exch pop exch pop exch pop dup 0.510000 sub -0.427807 mul 0.976471 add exch dup 0.510000 sub -0.320856 mul 0.988235 add exch dup 0.510000 sub -0.249554 mul 0.988235 add exch } if dup 0.620000 gt { exch pop exch pop exch pop dup 0.620000 sub -0.735294 mul 0.929412 add exch dup 0.620000 sub -0.490196 mul 0.952941 add exch dup 0.620000 sub -0.441177 mul 0.960784 add exch } if dup 0.700000 gt { exch pop exch pop exch pop dup 0.700000 sub -1.176468 mul 0.870588 add exch dup 0.700000 sub -0.980390 mul 0.913725 add exch dup 0.700000 sub -0.784312 mul 0.925490 add exch } if dup 0.720000 gt { exch pop exch pop exch pop dup 0.720000 sub -1.176472 mul 0.847059 add exch dup 0.720000 sub -1.176472 mul 0.894118 add exch dup 0.720000 sub -0.882354 mul 0.909804 add exch } if dup 0.760000 gt { exch pop exch pop exch pop dup 0.760000 sub -0.392157 mul 0.800000 add exch dup 0.760000 sub -0.294117 mul 0.847059 add exch dup 0.760000 sub -0.196078 mul 0.874510 add exch } if dup 0.800000 gt { exch pop exch pop exch pop dup 0.800000 sub 0.522876 mul 0.784314 add exch dup 0.800000 sub 0.130719 mul 0.835294 add exch dup 0.800000 sub 0.130719 mul 0.866667 add exch } if dup 0.830000 gt { exch pop exch pop exch pop dup 0.830000 sub 2.352936 mul 0.800000 add exch dup 0.830000 sub 0.980390 mul 0.839216 add exch dup 0.830000 sub 0.784312 mul 0.870588 add exch } if dup 0.850000 gt { exch pop exch pop exch pop dup 0.850000 sub 2.745100 mul 0.847059 add exch dup 0.850000 sub 1.045753 mul 0.858824 add exch dup 0.850000 sub 0.915034 mul 0.886275 add exch } if dup 0.880000 gt { exch pop exch pop exch pop dup 0.880000 sub 3.529415 mul 0.929412 add exch dup 0.880000 sub 1.568629 mul 0.890196 add exch dup 0.880000 sub 1.176472 mul 0.913725 add exch } if dup 0.900000 gt { exch pop exch pop exch pop 1.000000 exch 0.921569 exch 0.937255 exch } if pop } -endstream -endobj - -6 0 obj - 2294 -endobj - -7 0 obj - << /Length 8 0 R - /Range [ 0.000000 1.000000 0.000000 1.000000 0.000000 1.000000 ] - /Domain [ 0.000000 1.000000 ] - /FunctionType 4 - >> -stream -{ 0.090196 exch 0.180392 exch 0.207843 exch dup 0.000000 gt { exch pop exch pop exch pop dup 0.000000 sub -0.121704 mul 0.090196 add exch dup 0.000000 sub -0.243408 mul 0.180392 add exch dup 0.000000 sub -0.270453 mul 0.207843 add exch } if dup 0.290000 gt { exch pop exch pop exch pop dup 0.290000 sub -0.098039 mul 0.054902 add exch dup 0.290000 sub -0.187166 mul 0.109804 add exch dup 0.290000 sub -0.222816 mul 0.129412 add exch } if dup 0.730000 gt { exch pop exch pop exch pop dup 0.730000 sub -0.043573 mul 0.011765 add exch dup 0.730000 sub -0.101670 mul 0.027451 add exch dup 0.730000 sub -0.116195 mul 0.031373 add exch } if dup 1.000000 gt { exch pop exch pop exch pop 0.000000 exch 0.000000 exch 0.000000 exch } if pop } -endstream -endobj - -8 0 obj - 733 -endobj - -9 0 obj - << /Length 10 0 R - /Range [ 0.000000 1.000000 0.000000 1.000000 0.000000 1.000000 ] - /Domain [ 0.000000 1.000000 ] - /FunctionType 4 - >> -stream -{ 1.000000 exch 0.400000 exch 0.000000 exch dup 0.000000 gt { exch pop exch pop exch pop dup 0.000000 sub 0.000000 mul 1.000000 add exch dup 0.000000 sub -0.258824 mul 0.400000 add exch dup 0.000000 sub 0.000000 mul 0.000000 add exch } if dup 0.500000 gt { exch pop exch pop exch pop dup 0.500000 sub -0.058824 mul 1.000000 add exch dup 0.500000 sub -0.039216 mul 0.270588 add exch dup 0.500000 sub 0.019608 mul 0.000000 add exch } if dup 0.700000 gt { exch pop exch pop exch pop dup 0.700000 sub -0.261438 mul 0.988235 add exch dup 0.700000 sub -0.130719 mul 0.262745 add exch dup 0.700000 sub 0.196078 mul 0.003922 add exch } if dup 0.820000 gt { exch pop exch pop exch pop dup 0.820000 sub -0.588235 mul 0.956863 add exch dup 0.820000 sub -0.274510 mul 0.247059 add exch dup 0.820000 sub 0.431372 mul 0.027451 add exch } if dup 0.920000 gt { exch pop exch pop exch pop dup 0.920000 sub -0.833333 mul 0.898039 add exch dup 0.920000 sub -0.392157 mul 0.219608 add exch dup 0.920000 sub 0.637255 mul 0.070588 add exch } if dup 1.000000 gt { exch pop exch pop exch pop 0.831373 exch 0.188235 exch 0.121569 exch } if pop } -endstream -endobj - -10 0 obj - 1121 -endobj - -11 0 obj - << /Length 12 0 R - /Range [ 0.000000 1.000000 0.000000 1.000000 0.000000 1.000000 ] - /Domain [ 0.000000 1.000000 ] - /FunctionType 4 - >> -stream -{ 0.996078 exch 1.000000 exch 1.000000 exch dup 0.000000 gt { exch pop exch pop exch pop dup 0.000000 sub 0.000000 mul 0.996078 add exch dup 0.000000 sub 0.000000 mul 1.000000 add exch dup 0.000000 sub 0.000000 mul 1.000000 add exch } if dup 0.400000 gt { exch pop exch pop exch pop dup 0.400000 sub -0.178253 mul 0.996078 add exch dup 0.400000 sub -0.106952 mul 1.000000 add exch dup 0.400000 sub -0.106952 mul 1.000000 add exch } if dup 0.510000 gt { exch pop exch pop exch pop dup 0.510000 sub -0.427807 mul 0.976471 add exch dup 0.510000 sub -0.320856 mul 0.988235 add exch dup 0.510000 sub -0.249554 mul 0.988235 add exch } if dup 0.620000 gt { exch pop exch pop exch pop dup 0.620000 sub -0.735294 mul 0.929412 add exch dup 0.620000 sub -0.490196 mul 0.952941 add exch dup 0.620000 sub -0.441177 mul 0.960784 add exch } if dup 0.700000 gt { exch pop exch pop exch pop dup 0.700000 sub -1.176468 mul 0.870588 add exch dup 0.700000 sub -0.980390 mul 0.913725 add exch dup 0.700000 sub -0.784312 mul 0.925490 add exch } if dup 0.720000 gt { exch pop exch pop exch pop dup 0.720000 sub -1.176472 mul 0.847059 add exch dup 0.720000 sub -1.176472 mul 0.894118 add exch dup 0.720000 sub -0.882354 mul 0.909804 add exch } if dup 0.760000 gt { exch pop exch pop exch pop dup 0.760000 sub -0.392157 mul 0.800000 add exch dup 0.760000 sub -0.294117 mul 0.847059 add exch dup 0.760000 sub -0.196078 mul 0.874510 add exch } if dup 0.800000 gt { exch pop exch pop exch pop dup 0.800000 sub 0.522876 mul 0.784314 add exch dup 0.800000 sub 0.130719 mul 0.835294 add exch dup 0.800000 sub 0.130719 mul 0.866667 add exch } if dup 0.830000 gt { exch pop exch pop exch pop dup 0.830000 sub 2.352936 mul 0.800000 add exch dup 0.830000 sub 0.980390 mul 0.839216 add exch dup 0.830000 sub 0.784312 mul 0.870588 add exch } if dup 0.850000 gt { exch pop exch pop exch pop dup 0.850000 sub 2.745100 mul 0.847059 add exch dup 0.850000 sub 1.045753 mul 0.858824 add exch dup 0.850000 sub 0.915034 mul 0.886275 add exch } if dup 0.880000 gt { exch pop exch pop exch pop dup 0.880000 sub 3.529415 mul 0.929412 add exch dup 0.880000 sub 1.568629 mul 0.890196 add exch dup 0.880000 sub 1.176472 mul 0.913725 add exch } if dup 0.900000 gt { exch pop exch pop exch pop 1.000000 exch 0.921569 exch 0.937255 exch } if pop } -endstream -endobj - -12 0 obj - 2294 -endobj - -13 0 obj - << /Length 14 0 R - /Range [ 0.000000 1.000000 0.000000 1.000000 0.000000 1.000000 ] - /Domain [ 0.000000 1.000000 ] - /FunctionType 4 - >> -stream -{ 0.996078 exch 1.000000 exch 1.000000 exch dup 0.000000 gt { exch pop exch pop exch pop dup 0.000000 sub 0.000000 mul 0.996078 add exch dup 0.000000 sub 0.000000 mul 1.000000 add exch dup 0.000000 sub 0.000000 mul 1.000000 add exch } if dup 0.400000 gt { exch pop exch pop exch pop dup 0.400000 sub -0.178253 mul 0.996078 add exch dup 0.400000 sub -0.106952 mul 1.000000 add exch dup 0.400000 sub -0.106952 mul 1.000000 add exch } if dup 0.510000 gt { exch pop exch pop exch pop dup 0.510000 sub -0.427807 mul 0.976471 add exch dup 0.510000 sub -0.320856 mul 0.988235 add exch dup 0.510000 sub -0.249554 mul 0.988235 add exch } if dup 0.620000 gt { exch pop exch pop exch pop dup 0.620000 sub -0.735294 mul 0.929412 add exch dup 0.620000 sub -0.490196 mul 0.952941 add exch dup 0.620000 sub -0.441177 mul 0.960784 add exch } if dup 0.700000 gt { exch pop exch pop exch pop dup 0.700000 sub -1.176468 mul 0.870588 add exch dup 0.700000 sub -0.980390 mul 0.913725 add exch dup 0.700000 sub -0.784312 mul 0.925490 add exch } if dup 0.720000 gt { exch pop exch pop exch pop dup 0.720000 sub -1.176472 mul 0.847059 add exch dup 0.720000 sub -1.176472 mul 0.894118 add exch dup 0.720000 sub -0.882354 mul 0.909804 add exch } if dup 0.760000 gt { exch pop exch pop exch pop dup 0.760000 sub -0.392157 mul 0.800000 add exch dup 0.760000 sub -0.294117 mul 0.847059 add exch dup 0.760000 sub -0.196078 mul 0.874510 add exch } if dup 0.800000 gt { exch pop exch pop exch pop dup 0.800000 sub 0.522876 mul 0.784314 add exch dup 0.800000 sub 0.130719 mul 0.835294 add exch dup 0.800000 sub 0.130719 mul 0.866667 add exch } if dup 0.830000 gt { exch pop exch pop exch pop dup 0.830000 sub 2.352936 mul 0.800000 add exch dup 0.830000 sub 0.980390 mul 0.839216 add exch dup 0.830000 sub 0.784312 mul 0.870588 add exch } if dup 0.850000 gt { exch pop exch pop exch pop dup 0.850000 sub 2.745100 mul 0.847059 add exch dup 0.850000 sub 1.045753 mul 0.858824 add exch dup 0.850000 sub 0.915034 mul 0.886275 add exch } if dup 0.880000 gt { exch pop exch pop exch pop dup 0.880000 sub 3.529415 mul 0.929412 add exch dup 0.880000 sub 1.568629 mul 0.890196 add exch dup 0.880000 sub 1.176472 mul 0.913725 add exch } if dup 0.900000 gt { exch pop exch pop exch pop 1.000000 exch 0.921569 exch 0.937255 exch } if pop } -endstream -endobj - -14 0 obj - 2294 -endobj - -15 0 obj - << /Length 16 0 R - /Range [ 0.000000 1.000000 0.000000 1.000000 0.000000 1.000000 ] - /Domain [ 0.000000 1.000000 ] - /FunctionType 4 - >> -stream -{ 0.996078 exch 1.000000 exch 1.000000 exch dup 0.000000 gt { exch pop exch pop exch pop dup 0.000000 sub 0.000000 mul 0.996078 add exch dup 0.000000 sub 0.000000 mul 1.000000 add exch dup 0.000000 sub 0.000000 mul 1.000000 add exch } if dup 0.400000 gt { exch pop exch pop exch pop dup 0.400000 sub -0.178253 mul 0.996078 add exch dup 0.400000 sub -0.106952 mul 1.000000 add exch dup 0.400000 sub -0.106952 mul 1.000000 add exch } if dup 0.510000 gt { exch pop exch pop exch pop dup 0.510000 sub -0.427807 mul 0.976471 add exch dup 0.510000 sub -0.320856 mul 0.988235 add exch dup 0.510000 sub -0.249554 mul 0.988235 add exch } if dup 0.620000 gt { exch pop exch pop exch pop dup 0.620000 sub -0.735294 mul 0.929412 add exch dup 0.620000 sub -0.490196 mul 0.952941 add exch dup 0.620000 sub -0.441177 mul 0.960784 add exch } if dup 0.700000 gt { exch pop exch pop exch pop dup 0.700000 sub -1.176468 mul 0.870588 add exch dup 0.700000 sub -0.980390 mul 0.913725 add exch dup 0.700000 sub -0.784312 mul 0.925490 add exch } if dup 0.720000 gt { exch pop exch pop exch pop dup 0.720000 sub -1.176472 mul 0.847059 add exch dup 0.720000 sub -1.176472 mul 0.894118 add exch dup 0.720000 sub -0.882354 mul 0.909804 add exch } if dup 0.760000 gt { exch pop exch pop exch pop dup 0.760000 sub -0.392157 mul 0.800000 add exch dup 0.760000 sub -0.294117 mul 0.847059 add exch dup 0.760000 sub -0.196078 mul 0.874510 add exch } if dup 0.800000 gt { exch pop exch pop exch pop dup 0.800000 sub 0.522876 mul 0.784314 add exch dup 0.800000 sub 0.130719 mul 0.835294 add exch dup 0.800000 sub 0.130719 mul 0.866667 add exch } if dup 0.830000 gt { exch pop exch pop exch pop dup 0.830000 sub 2.352936 mul 0.800000 add exch dup 0.830000 sub 0.980390 mul 0.839216 add exch dup 0.830000 sub 0.784312 mul 0.870588 add exch } if dup 0.850000 gt { exch pop exch pop exch pop dup 0.850000 sub 2.745100 mul 0.847059 add exch dup 0.850000 sub 1.045753 mul 0.858824 add exch dup 0.850000 sub 0.915034 mul 0.886275 add exch } if dup 0.880000 gt { exch pop exch pop exch pop dup 0.880000 sub 3.529415 mul 0.929412 add exch dup 0.880000 sub 1.568629 mul 0.890196 add exch dup 0.880000 sub 1.176472 mul 0.913725 add exch } if dup 0.900000 gt { exch pop exch pop exch pop 1.000000 exch 0.921569 exch 0.937255 exch } if pop } -endstream -endobj - -16 0 obj - 2294 -endobj - -17 0 obj - << /Pattern << /P8 << /Matrix [ 14.362610 0.000000 -0.000000 14.362613 22.038727 24.872616 ] - /Shading << /Coords [ 0.500000 0.500000 0.000000 0.500000 0.500000 0.500000 ] - /ColorSpace /DeviceRGB - /Function 1 0 R - /Domain [ 0.000000 1.000000 ] - /ShadingType 3 - /Extend [ true true ] - >> - /PatternType 2 - /Type /Pattern - >> - /P4 << /Matrix [ -5.661150 0.000000 -0.000000 -8.311050 33.820557 23.848404 ] - /Shading << /Coords [ 0.500000 0.500000 0.000000 0.500000 0.500000 0.500000 ] - /ColorSpace /DeviceRGB - /Function 3 0 R - /Domain [ 0.000000 1.000000 ] - /ShadingType 3 - /Extend [ true true ] - >> - /PatternType 2 - /Type /Pattern - >> - /P3 << /Matrix [ 67.757545 0.000000 -0.000000 47.574448 -9.438629 5.617294 ] - /Shading << /Coords [ 0.500000 0.500000 0.000000 0.500000 0.500000 0.500000 ] - /ColorSpace /DeviceRGB - /Function 5 0 R - /Domain [ 0.000000 1.000000 ] - /ShadingType 3 - /Extend [ true true ] - >> - /PatternType 2 - /Type /Pattern - >> - /P6 << /Matrix [ 19.962078 0.000000 -0.000000 13.166471 14.088074 4.871584 ] - /Shading << /Coords [ 0.500000 0.500000 0.000000 0.500000 0.500000 0.500000 ] - /ColorSpace /DeviceRGB - /Function 7 0 R - /Domain [ 0.000000 1.000000 ] - /ShadingType 3 - /Extend [ true true ] - >> - /PatternType 2 - /Type /Pattern - >> - /P5 << /Matrix [ 5.661150 0.000000 -0.000000 -8.311050 14.080139 23.848404 ] - /Shading << /Coords [ 0.500000 0.500000 0.000000 0.500000 0.500000 0.500000 ] - /ColorSpace /DeviceRGB - /Function 9 0 R - /Domain [ 0.000000 1.000000 ] - /ShadingType 3 - /Extend [ true true ] - >> - /PatternType 2 - /Type /Pattern - >> - /P2 << /Matrix [ 22.463064 0.000000 -0.000000 19.595436 -0.751831 18.035271 ] - /Shading << /Coords [ 0.500000 0.500000 0.000000 0.500000 0.500000 0.500000 ] - /ColorSpace /DeviceRGB - /Function 11 0 R - /Domain [ 0.000000 1.000000 ] - /ShadingType 3 - /Extend [ true true ] - >> - /PatternType 2 - /Type /Pattern - >> - /P7 << /Matrix [ 17.522776 0.000000 -0.000000 17.522772 24.109650 32.843712 ] - /Shading << /Coords [ 0.500000 0.500000 0.000000 0.500000 0.500000 0.500000 ] - /ColorSpace /DeviceRGB - /Function 13 0 R - /Domain [ 0.000000 1.000000 ] - /ShadingType 3 - /Extend [ true true ] - >> - /PatternType 2 - /Type /Pattern - >> - /P1 << /Matrix [ 22.463062 0.000000 -0.000000 19.595436 26.458160 18.035271 ] - /Shading << /Coords [ 0.500000 0.500000 0.000000 0.500000 0.500000 0.500000 ] - /ColorSpace /DeviceRGB - /Function 15 0 R - /Domain [ 0.000000 1.000000 ] - /ShadingType 3 - /Extend [ true true ] - >> - /PatternType 2 - /Type /Pattern - >> - >> >> -endobj - -18 0 obj - << /Length 19 0 R >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm -1.000000 0.270588 0.000000 scn -24.000000 48.000000 m -10.745625 48.000000 0.000000 37.254375 0.000000 24.000000 c -0.000000 17.371876 2.686875 11.371876 7.029375 7.029377 c -2.458125 2.458126 l -1.550625 1.550625 2.193750 0.000000 3.476250 0.000000 c -24.000000 0.000000 l -37.254375 0.000000 48.000000 10.745625 48.000000 24.000000 c -48.000000 37.254375 37.254375 48.000000 24.000000 48.000000 c -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 32.000610 19.211273 cm -/Pattern cs -/P1 scn -5.604375 -0.000008 m -8.699586 -0.000008 11.208750 2.509155 11.208750 5.604366 c -11.208750 8.699576 8.699586 11.208740 5.604375 11.208740 c -2.509164 11.208740 0.000000 8.699576 0.000000 5.604366 c -0.000000 2.509155 2.509164 -0.000008 5.604375 -0.000008 c -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 4.790619 19.211273 cm -/Pattern cs -/P2 scn -5.604375 -0.000008 m -8.699586 -0.000008 11.208751 2.509155 11.208751 5.604366 c -11.208751 8.699576 8.699586 11.208740 5.604375 11.208740 c -2.509164 11.208740 0.000000 8.699576 0.000000 5.604366 c -0.000000 2.509155 2.509164 -0.000008 5.604375 -0.000008 c -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 8.013763 8.000610 cm -/Pattern cs -/P3 scn -15.999375 0.000000 m -24.835587 0.000000 31.998749 5.372583 31.998749 12.000000 c -31.998749 18.627419 24.835587 24.000000 15.999375 24.000000 c -7.163165 24.000000 0.000000 18.627419 0.000000 12.000000 c -0.000000 5.372583 7.163165 0.000000 15.999375 0.000000 c -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 13.588623 18.395630 cm -0.517647 0.129412 0.137255 scn -5.693889 2.771249 m -5.600139 0.738750 4.250139 -0.000000 2.680764 -0.000000 c -1.111389 -0.000000 -0.088610 1.040625 0.005140 3.073124 c -0.098890 5.105624 1.448890 6.451874 3.018265 6.451874 c -4.587640 6.451874 5.787639 4.803749 5.693889 2.771249 c -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 28.738617 18.397491 cm -0.517647 0.129412 0.137255 scn -5.693897 3.073123 m -5.787647 1.040623 4.589521 -0.000002 3.018271 -0.000002 c -1.447021 -0.000002 0.097022 0.736873 0.005147 2.771248 c --0.088603 4.803748 1.109523 6.451874 2.680773 6.451874 c -4.252024 6.451874 5.602022 5.107498 5.693897 3.073123 c -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 28.738892 18.397491 cm -/Pattern cs -/P4 scn -0.004859 2.593131 m -0.092984 0.690006 1.354857 0.000005 2.824857 0.000005 c -4.294858 0.000005 5.416109 1.033131 5.327984 2.936256 c -5.239859 4.839381 3.977982 6.084381 2.507982 6.084381 c -1.037982 6.084381 -0.083266 4.496255 0.004859 2.593131 c -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 13.956390 18.397491 cm -/Pattern cs -/P5 scn -5.327984 2.593131 m -5.239859 0.690006 3.977983 0.000005 2.507983 0.000005 c -1.037983 0.000005 -0.083266 1.033131 0.004859 2.936256 c -0.092984 4.839381 1.354859 6.084381 2.824859 6.084381 c -4.294859 6.084381 5.416109 4.496255 5.327984 2.593131 c -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 17.959930 12.230621 cm -0.733333 0.811765 0.854902 scn -6.053195 4.809387 m -4.069445 4.809387 2.168194 4.713762 0.409444 4.539387 c -0.109444 4.509387 -0.081806 4.203762 0.034444 3.930012 c -1.018819 1.621887 3.341945 0.000010 6.053195 0.000010 c -8.764445 0.000010 11.085693 1.621887 12.071943 3.930012 c -12.188193 4.203762 11.998818 4.509387 11.696943 4.539387 c -9.938193 4.713762 8.036945 4.809387 6.053195 4.809387 c -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 17.978485 11.713104 cm -1.000000 1.000000 1.000000 scn -6.034646 4.886261 m -4.056520 4.886261 2.160894 4.788761 0.407769 4.610636 c -0.107769 4.580636 -0.081606 4.269385 0.034644 3.991885 c -1.017144 1.646260 3.332769 0.000011 6.032769 0.000011 c -8.732769 0.000011 11.050269 1.648135 12.032768 3.991885 c -12.149018 4.269385 11.959645 4.580636 11.659645 4.610636 c -9.906521 4.788761 8.010894 4.886261 6.032769 4.886261 c -6.034646 4.886261 l -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 18.072906 12.018738 cm -/Pattern cs -/P6 scn -5.940217 4.809387 m -3.993967 4.809387 2.128341 4.713762 0.401466 4.539387 c -0.107091 4.509387 -0.080409 4.203762 0.033966 3.930012 c -0.999591 1.621887 3.279592 0.000013 5.940217 0.000013 c -8.600842 0.000013 10.878967 1.621887 11.846468 3.930012 c -11.960842 4.203762 11.773341 4.509387 11.478966 4.539387 c -9.753966 4.713762 7.888342 4.809387 5.940217 4.809387 c -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 28.805634 33.631866 cm -/Pattern cs -/P7 scn -3.971249 0.000006 m -6.164509 0.000006 7.942500 1.777994 7.942500 3.971255 c -7.942500 6.164515 6.164509 7.942505 3.971249 7.942505 c -1.777988 7.942505 0.000000 6.164515 0.000000 3.971255 c -0.000000 1.777994 1.777988 0.000006 3.971249 0.000006 c -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 23.096252 31.494385 cm -/Pattern cs -/P8 scn -0.860624 0.000005 m -0.384374 0.000005 0.000000 0.198754 0.000000 0.506254 c -0.000000 4.065004 2.895000 6.958130 6.451874 6.958130 c -6.928124 6.958130 7.312499 6.571880 7.312499 6.097505 c -7.312499 5.623130 6.926249 5.236880 6.451874 5.236880 c -3.843749 5.236880 1.721250 3.114379 1.721250 0.506254 c -1.721250 0.198754 1.334999 0.000005 0.860624 0.000005 c -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 14.739380 18.982513 cm -1.000000 0.380392 0.003922 scn -3.498749 1.066869 m -3.498749 0.329994 2.715000 -0.000004 1.749375 -0.000004 c -0.783750 -0.000004 0.000000 0.329994 0.000000 1.066869 c -0.000000 1.803744 0.783750 2.399994 1.749375 2.399994 c -2.715000 2.399994 3.498749 1.803744 3.498749 1.066869 c -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 29.790009 18.982513 cm -1.000000 0.380392 0.003922 scn -3.498748 1.066869 m -3.498748 0.329994 2.715000 -0.000004 1.749375 -0.000004 c -0.783750 -0.000004 0.000000 0.329994 0.000000 1.066869 c -0.000000 1.803744 0.783750 2.399994 1.749375 2.399994 c -2.715000 2.399994 3.498748 1.803744 3.498748 1.066869 c -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 17.073761 22.048126 cm -1.000000 0.768627 0.611765 scn -0.622500 0.000012 m -0.966297 0.000012 1.245000 0.303901 1.245000 0.678764 c -1.245000 1.053628 0.966297 1.357513 0.622500 1.357513 c -0.278703 1.357513 0.000000 1.053628 0.000000 0.678764 c -0.000000 0.303901 0.278703 0.000012 0.622500 0.000012 c -h -f -n -Q -q -1.000000 0.000000 -0.000000 1.000000 31.869385 22.048126 cm -1.000000 0.768627 0.611765 scn -0.622499 0.000012 m -0.966296 0.000012 1.245000 0.303901 1.245000 0.678764 c -1.245000 1.053628 0.966296 1.357513 0.622499 1.357513 c -0.278701 1.357513 0.000000 1.053628 0.000000 0.678764 c -0.000000 0.303901 0.278701 0.000012 0.622499 0.000012 c -h -f -n -Q - -endstream -endobj - -19 0 obj - 6453 -endobj - -20 0 obj - << /Annots [] - /Type /Page - /MediaBox [ 0.000000 0.000000 48.000000 48.000000 ] - /Resources 17 0 R - /Contents 18 0 R - /Parent 21 0 R - >> -endobj - -21 0 obj - << /Kids [ 20 0 R ] - /Count 1 - /Type /Pages - >> -endobj - -22 0 obj - << /Pages 21 0 R - /Type /Catalog - >> -endobj - -xref -0 23 -0000000000 65535 f -0000000010 00000 n -0000000924 00000 n -0000000946 00000 n -0000002251 00000 n -0000002274 00000 n -0000004752 00000 n -0000004775 00000 n -0000005692 00000 n -0000005714 00000 n -0000007020 00000 n -0000007044 00000 n -0000009524 00000 n -0000009548 00000 n -0000012028 00000 n -0000012052 00000 n -0000014532 00000 n -0000014556 00000 n -0000019561 00000 n -0000026072 00000 n -0000026096 00000 n -0000026273 00000 n -0000026349 00000 n -trailer -<< /ID [ (some) (id) ] - /Root 22 0 R - /Size 23 ->> -startxref -26410 -%%EOF \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/About/ic_social_media_x.imageset/ic_social_media_x.pdf b/iphone/Maps/Images.xcassets/About/ic_social_media_x.imageset/ic_social_media_x.pdf deleted file mode 100644 index 84c55b261..000000000 --- a/iphone/Maps/Images.xcassets/About/ic_social_media_x.imageset/ic_social_media_x.pdf +++ /dev/null @@ -1,85 +0,0 @@ -%PDF-1.7 - -1 0 obj - << >> -endobj - -2 0 obj - << /Length 3 0 R >> -stream -/DeviceRGB CS -/DeviceRGB cs -q -1.000000 0.000000 -0.000000 1.000000 2.000000 4.420242 cm -0.000000 0.000000 0.000000 scn -34.652576 39.771942 m -41.399529 39.771942 l -26.659435 22.924957 l -44.000000 0.000004 l -30.422474 0.000004 l -19.788071 13.903868 l -7.619895 0.000004 l -0.868864 0.000004 l -16.634869 18.019753 l -0.000000 39.771942 l -13.922218 39.771942 l -23.534790 27.063278 l -34.652576 39.771942 l -h -32.284615 4.038383 m -36.023178 4.038383 l -11.890789 35.945679 l -7.878923 35.945679 l -32.284615 4.038383 l -h -f -n -Q - -endstream -endobj - -3 0 obj - 514 -endobj - -4 0 obj - << /Annots [] - /Type /Page - /MediaBox [ 0.000000 0.000000 48.000000 48.000000 ] - /Resources 1 0 R - /Contents 2 0 R - /Parent 5 0 R - >> -endobj - -5 0 obj - << /Kids [ 4 0 R ] - /Count 1 - /Type /Pages - >> -endobj - -6 0 obj - << /Pages 5 0 R - /Type /Catalog - >> -endobj - -xref -0 7 -0000000000 65535 f -0000000010 00000 n -0000000034 00000 n -0000000604 00000 n -0000000626 00000 n -0000000799 00000 n -0000000873 00000 n -trailer -<< /ID [ (some) (id) ] - /Root 6 0 R - /Size 7 ->> -startxref -932 -%%EOF \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/1024.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/1024.png index d32f5cb3c..c453fe9d9 100644 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/1024.png and b/iphone/Maps/Images.xcassets/AppIcon.appiconset/1024.png differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/appicon_dark.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/appicon_dark.png index 10ac2df85..b1ef92a8b 100644 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/appicon_dark.png and b/iphone/Maps/Images.xcassets/AppIcon.appiconset/appicon_dark.png differ diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/appicon_tinted.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/appicon_tinted.png index 8505c30bb..fe6690693 100644 Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/appicon_tinted.png and b/iphone/Maps/Images.xcassets/AppIcon.appiconset/appicon_tinted.png differ diff --git a/iphone/Maps/Images.xcassets/AppIconDebug.appiconset/1024.png b/iphone/Maps/Images.xcassets/AppIconDebug.appiconset/1024.png index 09777dda6..17eb5fc86 100644 Binary files a/iphone/Maps/Images.xcassets/AppIconDebug.appiconset/1024.png and b/iphone/Maps/Images.xcassets/AppIconDebug.appiconset/1024.png differ diff --git a/iphone/Maps/Images.xcassets/logo.imageset/logo.svg b/iphone/Maps/Images.xcassets/logo.imageset/logo.svg index 14f52eba2..c2cb6586f 100644 --- a/iphone/Maps/Images.xcassets/logo.imageset/logo.svg +++ b/iphone/Maps/Images.xcassets/logo.imageset/logo.svg @@ -1 +1,24 @@ - \ No newline at end of file + + + + + + + + + CoMaps + \ No newline at end of file diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 0af976457..189364b04 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -465,7 +465,7 @@ ED2D743E2D14337500660FBF /* TrackRecordingLiveActivityAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D74302D14337500660FBF /* TrackRecordingLiveActivityAttributes.swift */; }; ED2D743F2D14337500660FBF /* TrackRecordingLiveActivityConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D74312D14337500660FBF /* TrackRecordingLiveActivityConfiguration.swift */; }; ED2D74402D14337500660FBF /* TrackRecordingLiveActivityView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D74322D14337500660FBF /* TrackRecordingLiveActivityView.swift */; }; - ED2D74412D14337500660FBF /* OMapsWidgetExtensionBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D74362D14337500660FBF /* OMapsWidgetExtensionBundle.swift */; }; + ED2D74412D14337500660FBF /* CoMapsWidgetExtensionBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D74362D14337500660FBF /* CoMapsWidgetExtensionBundle.swift */; }; ED2D745E2D1433DE00660FBF /* TrackRecordingActivityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D745D2D1433DE00660FBF /* TrackRecordingActivityManager.swift */; }; ED2D74652D14357F00660FBF /* TrackRecordingLiveActivityAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D74302D14337500660FBF /* TrackRecordingLiveActivityAttributes.swift */; }; ED2D74662D1435A600660FBF /* LiveActivityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D742D2D14337500660FBF /* LiveActivityManager.swift */; }; @@ -475,7 +475,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 /* OMapsWidgetExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = ED46DDCC2D098A0B007CACD6 /* OMapsWidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + ED46DDE12D098A0C007CACD6 /* CoMapsWidgetExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = ED46DDCC2D098A0B007CACD6 /* CoMapsWidgetExtension.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 */; }; @@ -752,7 +752,7 @@ dstPath = ""; dstSubfolderSpec = 13; files = ( - ED46DDE12D098A0C007CACD6 /* OMapsWidgetExtension.appex in Embed Foundation Extensions */, + ED46DDE12D098A0C007CACD6 /* CoMapsWidgetExtension.appex in Embed Foundation Extensions */, ); name = "Embed Foundation Extensions"; runOnlyForDeploymentPostprocessing = 0; @@ -1223,11 +1223,11 @@ 4B83AE482C2E59F800B0C3BC /* TTSTester.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = TTSTester.mm; sourceTree = ""; }; 4B83AE4A2C2E642100B0C3BC /* TTSTesterTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TTSTesterTest.m; sourceTree = ""; }; 5605022E1B6211E100169CAD /* sound-strings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "sound-strings"; path = "../../data/sound-strings"; sourceTree = ""; }; - 6741AA5D1BF340DE002C974C /* Organic Maps (Debug).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Organic Maps (Debug).app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 6741AA5D1BF340DE002C974C /* CoMaps (Debug).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "CoMaps (Debug).app"; sourceTree = BUILT_PRODUCTS_DIR; }; 6B9978341C89A316003B8AA0 /* editor.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = editor.config; path = ../../data/editor.config; sourceTree = ""; }; 8C4FB9C62BEFEFF400D44877 /* CarPlayWindowScaleAdjuster.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarPlayWindowScaleAdjuster.swift; sourceTree = ""; }; 8CB13C3A2BF1276A004288F2 /* CarplayPlaceholderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarplayPlaceholderView.swift; sourceTree = ""; }; - 8D1107310486CEB800E47090 /* OMaps.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = OMaps.plist; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; + 8D1107310486CEB800E47090 /* CoMaps.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = CoMaps.plist; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; 978D4A30199A11E600D72CA7 /* faq.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = faq.html; path = ../../data/faq.html; sourceTree = ""; }; 97A5967E19B9CD47007A963F /* copyright.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = copyright.html; path = ../../data/copyright.html; sourceTree = ""; }; 99012846243F0D6900C72B10 /* UIViewController+alternative.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+alternative.swift"; sourceTree = ""; }; @@ -1418,7 +1418,7 @@ CDCA278C2248F34C00167D87 /* MWMRouterResultCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRouterResultCode.h; sourceTree = ""; }; CDCA278F2248F3B800167D87 /* MWMLocationModeListener.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMLocationModeListener.h; sourceTree = ""; }; CDE0F3AD225B8D45008BA5C3 /* MWMSpeedCameraManagerMode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSpeedCameraManagerMode.h; sourceTree = ""; }; - ED097E762BB80C320006ED01 /* OMapsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OMapsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + ED097E762BB80C320006ED01 /* CoMapsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CoMapsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; ED0B1C302BC2951F00FB8EDD /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; ED0B1FEE2CAA9A25006E31A4 /* UIView+Highlight.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Highlight.swift"; sourceTree = ""; }; ED0C54972C6E14E800253A5F /* TrackRecordingManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackRecordingManager.swift; sourceTree = ""; }; @@ -1434,12 +1434,12 @@ ED2D74322D14337500660FBF /* TrackRecordingLiveActivityView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackRecordingLiveActivityView.swift; sourceTree = ""; }; ED2D74342D14337500660FBF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; ED2D74352D14337500660FBF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - ED2D74362D14337500660FBF /* OMapsWidgetExtensionBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OMapsWidgetExtensionBundle.swift; sourceTree = ""; }; + ED2D74362D14337500660FBF /* CoMapsWidgetExtensionBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoMapsWidgetExtensionBundle.swift; sourceTree = ""; }; ED2D745D2D1433DE00660FBF /* TrackRecordingActivityManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackRecordingActivityManager.swift; sourceTree = ""; }; 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 /* OMapsWidgetExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = OMapsWidgetExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; + ED46DDCC2D098A0B007CACD6 /* CoMapsWidgetExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = CoMapsWidgetExtension.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 = ""; }; @@ -1937,9 +1937,9 @@ 19C28FACFE9D520D11CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 6741AA5D1BF340DE002C974C /* Organic Maps (Debug).app */, - ED097E762BB80C320006ED01 /* OMapsTests.xctest */, - ED46DDCC2D098A0B007CACD6 /* OMapsWidgetExtension.appex */, + 6741AA5D1BF340DE002C974C /* CoMaps (Debug).app */, + ED097E762BB80C320006ED01 /* CoMapsTests.xctest */, + ED46DDCC2D098A0B007CACD6 /* CoMapsWidgetExtension.appex */, ); name = Products; sourceTree = ""; @@ -1959,14 +1959,14 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */, 34F73FA11E08300E00AC1FD6 /* Images.xcassets */, 34F73F5E1E082FF700AC1FD6 /* LocalizedStrings */, - 8D1107310486CEB800E47090 /* OMaps.plist */, + 8D1107310486CEB800E47090 /* CoMaps.plist */, ED0B1C302BC2951F00FB8EDD /* PrivacyInfo.xcprivacy */, 29B97315FDCFA39411CA2CEA /* Other Sources */, 19C28FACFE9D520D11CA2CBB /* Products */, 29B97317FDCFA39411CA2CEA /* Resources */, F6E2FBFB1E097B9F0083EBEC /* UI */, ED1ADA312BC6B19E0029209F /* Tests */, - ED2D74372D14337500660FBF /* OMapsWidgetExtension */, + ED2D74372D14337500660FBF /* CoMapsWidgetExtension */, ); indentWidth = 2; name = Maps; @@ -3227,15 +3227,15 @@ path = LiveActivity; sourceTree = ""; }; - ED2D74372D14337500660FBF /* OMapsWidgetExtension */ = { + ED2D74372D14337500660FBF /* CoMapsWidgetExtension */ = { isa = PBXGroup; children = ( ED2D74332D14337500660FBF /* LiveActivity */, ED2D74342D14337500660FBF /* Assets.xcassets */, ED2D74352D14337500660FBF /* Info.plist */, - ED2D74362D14337500660FBF /* OMapsWidgetExtensionBundle.swift */, + ED2D74362D14337500660FBF /* CoMapsWidgetExtensionBundle.swift */, ); - path = OMapsWidgetExtension; + path = CoMapsWidgetExtension; sourceTree = ""; }; ED43B8B92C12061600D07BAA /* DocumentPicker */ = { @@ -4070,9 +4070,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 6741A93D1BF340DE002C974C /* OMaps */ = { + 6741A93D1BF340DE002C974C /* CoMaps */ = { isa = PBXNativeTarget; - buildConfigurationList = 6741AA541BF340DE002C974C /* Build configuration list for PBXNativeTarget "OMaps" */; + buildConfigurationList = 6741AA541BF340DE002C974C /* Build configuration list for PBXNativeTarget "CoMaps" */; buildPhases = ( FA456C4E26BDCCC300B83C20 /* CopyFiles */, 6741A9411BF340DE002C974C /* Resources */, @@ -4087,14 +4087,14 @@ FA456C4D26BDCC9400B83C20 /* PBXTargetDependency */, ED46DDE02D098A0C007CACD6 /* PBXTargetDependency */, ); - name = OMaps; + name = CoMaps; productName = Maps; - productReference = 6741AA5D1BF340DE002C974C /* Organic Maps (Debug).app */; + productReference = 6741AA5D1BF340DE002C974C /* CoMaps (Debug).app */; productType = "com.apple.product-type.application"; }; - ED097E752BB80C320006ED01 /* OMapsTests */ = { + ED097E752BB80C320006ED01 /* CoMapsTests */ = { isa = PBXNativeTarget; - buildConfigurationList = ED097E802BB80C330006ED01 /* Build configuration list for PBXNativeTarget "OMapsTests" */; + buildConfigurationList = ED097E802BB80C330006ED01 /* Build configuration list for PBXNativeTarget "CoMapsTests" */; buildPhases = ( ED097E722BB80C320006ED01 /* Sources */, ED097E732BB80C320006ED01 /* Frameworks */, @@ -4105,14 +4105,14 @@ dependencies = ( ED097E7B2BB80C320006ED01 /* PBXTargetDependency */, ); - name = OMapsTests; + name = CoMapsTests; productName = OMapsTests; - productReference = ED097E762BB80C320006ED01 /* OMapsTests.xctest */; + productReference = ED097E762BB80C320006ED01 /* CoMapsTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - ED46DDCB2D098A0B007CACD6 /* OMapsWidgetExtension */ = { + ED46DDCB2D098A0B007CACD6 /* CoMapsWidgetExtension */ = { isa = PBXNativeTarget; - buildConfigurationList = ED46DDE62D098A0C007CACD6 /* Build configuration list for PBXNativeTarget "OMapsWidgetExtension" */; + buildConfigurationList = ED46DDE62D098A0C007CACD6 /* Build configuration list for PBXNativeTarget "CoMapsWidgetExtension" */; buildPhases = ( ED46DDC82D098A0B007CACD6 /* Sources */, ED46DDC92D098A0B007CACD6 /* Frameworks */, @@ -4122,11 +4122,11 @@ ); dependencies = ( ); - name = OMapsWidgetExtension; + name = CoMapsWidgetExtension; packageProductDependencies = ( ); productName = OMapsWidgetExtension; - productReference = ED46DDCC2D098A0B007CACD6 /* OMapsWidgetExtension.appex */; + productReference = ED46DDCC2D098A0B007CACD6 /* CoMapsWidgetExtension.appex */; productType = "com.apple.product-type.app-extension"; }; /* End PBXNativeTarget section */ @@ -4137,8 +4137,8 @@ attributes = { BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 1620; - ORGANIZATIONNAME = "Organic Maps"; + LastUpgradeCheck = 1640; + ORGANIZATIONNAME = CoMaps; TargetAttributes = { 6741A93D1BF340DE002C974C = { LastSwiftMigration = 1110; @@ -4221,9 +4221,9 @@ ); projectRoot = ""; targets = ( - 6741A93D1BF340DE002C974C /* OMaps */, - ED097E752BB80C320006ED01 /* OMapsTests */, - ED46DDCB2D098A0B007CACD6 /* OMapsWidgetExtension */, + 6741A93D1BF340DE002C974C /* CoMaps */, + ED097E752BB80C320006ED01 /* CoMapsTests */, + ED46DDCB2D098A0B007CACD6 /* CoMapsWidgetExtension */, ); }; /* End PBXProject section */ @@ -4926,7 +4926,7 @@ ED2D743E2D14337500660FBF /* TrackRecordingLiveActivityAttributes.swift in Sources */, ED2D743F2D14337500660FBF /* TrackRecordingLiveActivityConfiguration.swift in Sources */, ED2D74402D14337500660FBF /* TrackRecordingLiveActivityView.swift in Sources */, - ED2D74412D14337500660FBF /* OMapsWidgetExtensionBundle.swift in Sources */, + ED2D74412D14337500660FBF /* CoMapsWidgetExtensionBundle.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4935,12 +4935,12 @@ /* Begin PBXTargetDependency section */ ED097E7B2BB80C320006ED01 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 6741A93D1BF340DE002C974C /* OMaps */; + target = 6741A93D1BF340DE002C974C /* CoMaps */; targetProxy = ED097E7A2BB80C320006ED01 /* PBXContainerItemProxy */; }; ED46DDE02D098A0C007CACD6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = ED46DDCB2D098A0B007CACD6 /* OMapsWidgetExtension */; + target = ED46DDCB2D098A0B007CACD6 /* CoMapsWidgetExtension */; targetProxy = ED46DDDF2D098A0C007CACD6 /* PBXContainerItemProxy */; }; FA456C4D26BDCC9400B83C20 /* PBXTargetDependency */ = { @@ -5174,19 +5174,31 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDebug; - CODE_SIGN_ENTITLEMENTS = "OMaps-Debug.entitlements"; + CODE_SIGN_ENTITLEMENTS = "CoMaps-Debug.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 0; - DEVELOPMENT_TEAM = 9Z6432XD7L; + DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; + INFOPLIST_KEY_CFBundleDisplayName = CoMaps; + INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.navigation"; + INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = NO; + INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "Determining your location is necessary for navigation and for saving your recently travelled track."; + INFOPLIST_KEY_NSSupportsLiveActivities = YES; + INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; + INFOPLIST_KEY_UIMainStoryboardFile = Main; + INFOPLIST_KEY_UIStatusBarHidden = NO; + INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + IPHONEOS_DEPLOYMENT_TARGET = 18.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2022.11.17; + MACOSX_DEPLOYMENT_TARGET = 11.0; + MARKETING_VERSION = 2025.06.09; OTHER_SWIFT_FLAGS = "$(inherited)"; - PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.debug; + PRODUCT_BUNDLE_IDENTIFIER = app.comaps.debug; PROVISIONING_PROFILE_SPECIFIER = ""; }; name = Debug; @@ -5195,20 +5207,32 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_ENTITLEMENTS = "OMaps-Release.entitlements"; + CODE_SIGN_ENTITLEMENTS = "CoMaps-Release.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 0; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = 9Z6432XD7L; + DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; + INFOPLIST_KEY_CFBundleDisplayName = CoMaps; + INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.navigation"; + INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = NO; + INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "Determining your location is necessary for navigation and for saving your recently travelled track."; + INFOPLIST_KEY_NSSupportsLiveActivities = YES; + INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; + INFOPLIST_KEY_UIMainStoryboardFile = Main; + INFOPLIST_KEY_UIStatusBarHidden = NO; + INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + IPHONEOS_DEPLOYMENT_TARGET = 18.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2022.11.17; + MACOSX_DEPLOYMENT_TARGET = 11.0; + MARKETING_VERSION = 2025.06.09; OTHER_SWIFT_FLAGS = "$(inherited)"; - PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps; + PRODUCT_BUNDLE_IDENTIFIER = app.comaps; PROVISIONING_PROFILE_SPECIFIER = ""; }; name = Release; @@ -5222,9 +5246,10 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = 9Z6432XD7L; - PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.tests; + MACOSX_DEPLOYMENT_TARGET = 11.0; + PRODUCT_BUNDLE_IDENTIFIER = app.comaps.tests; PROVISIONING_PROFILE_SPECIFIER = ""; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Organic Maps (Debug).app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Organic Maps (Debug)"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CoMaps (Debug).app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/CoMaps (Debug)"; }; name = Debug; }; @@ -5237,9 +5262,10 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = 9Z6432XD7L; - PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.tests; + MACOSX_DEPLOYMENT_TARGET = 11.0; + PRODUCT_BUNDLE_IDENTIFIER = app.comaps.tests; PROVISIONING_PROFILE_SPECIFIER = ""; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Organic Maps (Debug).app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Organic Maps (Debug)"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CoMaps (Debug).app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/CoMaps (Debug)"; }; name = Release; }; @@ -5255,18 +5281,19 @@ "$(inherited)", ); GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = OMapsWidgetExtension/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = OMapsWidgetExtension; - INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2024 Organic Maps. All rights reserved."; + INFOPLIST_FILE = CoMapsWidgetExtension/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = CoMapsWidgetExtension; + INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 CoMaps. All rights reserved."; IPHONEOS_DEPLOYMENT_TARGET = 16.2; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = 11.0; MARKETING_VERSION = 2022.11.17; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.debug.widgetextension; + PRODUCT_BUNDLE_IDENTIFIER = app.comaps.debug.widgetextension; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; @@ -5285,17 +5312,18 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 9Z6432XD7L; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = OMapsWidgetExtension/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = OMapsWidgetExtension; - INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2024 Organic Maps. All rights reserved."; + INFOPLIST_FILE = CoMapsWidgetExtension/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = CoMapsWidgetExtension; + INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 CoMaps. All rights reserved."; IPHONEOS_DEPLOYMENT_TARGET = 16.2; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = 11.0; MARKETING_VERSION = 2022.11.17; - PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.widgetextension; + PRODUCT_BUNDLE_IDENTIFIER = app.comaps.widgetextension; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; @@ -5311,7 +5339,7 @@ baseConfigurationReference = 347526FA1DC0B00F00918CF5 /* common-debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - BUNDLE_IDENTIFIER = app.organicmaps.debug; + BUNDLE_IDENTIFIER = app.comaps.debug; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = Maps_Prefix.pch; @@ -5320,7 +5348,7 @@ "$(OMIM_ROOT)/3party/glm", "$(OMIM_ROOT)/3party/pugixml/pugixml/src", ); - INFOPLIST_FILE = OMaps.plist; + INFOPLIST_FILE = CoMaps.plist; OTHER_CFLAGS = ( "$(inherited)", "-Wall", @@ -5334,7 +5362,7 @@ ); OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_IDENTIFIER}"; - PRODUCT_NAME = "Organic Maps (Debug)"; + PRODUCT_NAME = "CoMaps (Debug)"; SDKROOT = iphoneos; SKIP_INSTALL = NO; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; @@ -5350,7 +5378,7 @@ baseConfigurationReference = 347526FB1DC0B00F00918CF5 /* common-release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - BUNDLE_IDENTIFIER = app.organicmaps; + BUNDLE_IDENTIFIER = app.comaps; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = Maps_Prefix.pch; @@ -5359,7 +5387,7 @@ "$(OMIM_ROOT)/3party/glm", "$(OMIM_ROOT)/3party/pugixml/pugixml/src", ); - INFOPLIST_FILE = OMaps.plist; + INFOPLIST_FILE = CoMaps.plist; OTHER_CFLAGS = ( "$(inherited)", "-Wall", @@ -5373,7 +5401,7 @@ ); OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_IDENTIFIER}"; - PRODUCT_NAME = "Organic Maps"; + PRODUCT_NAME = CoMaps; SDKROOT = iphoneos; SKIP_INSTALL = NO; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; @@ -5387,7 +5415,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 6741AA541BF340DE002C974C /* Build configuration list for PBXNativeTarget "OMaps" */ = { + 6741AA541BF340DE002C974C /* Build configuration list for PBXNativeTarget "CoMaps" */ = { isa = XCConfigurationList; buildConfigurations = ( 6741AA571BF340DE002C974C /* Debug */, @@ -5405,7 +5433,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - ED097E802BB80C330006ED01 /* Build configuration list for PBXNativeTarget "OMapsTests" */ = { + ED097E802BB80C330006ED01 /* Build configuration list for PBXNativeTarget "CoMapsTests" */ = { isa = XCConfigurationList; buildConfigurations = ( ED097E7C2BB80C330006ED01 /* Debug */, @@ -5414,7 +5442,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - ED46DDE62D098A0C007CACD6 /* Build configuration list for PBXNativeTarget "OMapsWidgetExtension" */ = { + ED46DDE62D098A0C007CACD6 /* Build configuration list for PBXNativeTarget "CoMapsWidgetExtension" */ = { isa = XCConfigurationList; buildConfigurations = ( ED46DDE32D098A0C007CACD6 /* Debug */, diff --git a/iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/OMaps.xcscheme b/iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/OMaps.xcscheme deleted file mode 100644 index 7d1a39c0d..000000000 --- a/iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/OMaps.xcscheme +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/OMaps-Debug.entitlements b/iphone/Maps/OMaps-Debug.entitlements deleted file mode 100644 index 790129a64..000000000 --- a/iphone/Maps/OMaps-Debug.entitlements +++ /dev/null @@ -1,30 +0,0 @@ - - - - - aps-environment - development - com.apple.developer.associated-domains - - applinks:omaps.app - applinks:omaps.at - - com.apple.developer.carplay-maps - - com.apple.developer.icloud-container-identifiers - - iCloud.app.organicmaps.debug - - com.apple.developer.icloud-services - - CloudDocuments - CloudKit - - com.apple.developer.ubiquity-container-identifiers - - iCloud.app.organicmaps.debug - - com.apple.developer.ubiquity-kvstore-identifier - $(TeamIdentifierPrefix)$(CFBundleIdentifier) - - diff --git a/iphone/Maps/OMaps.plist b/iphone/Maps/OMaps.plist deleted file mode 100644 index e77e7de88..000000000 --- a/iphone/Maps/OMaps.plist +++ /dev/null @@ -1,288 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleDisplayName - ${PRODUCT_NAME} - CFBundleDocumentTypes - - - CFBundleTypeIconFiles - - CFBundleTypeName - GPS Exchange Format (GPX) - LSHandlerRank - Default - LSItemContentTypes - - com.topografix.gpx - - - - CFBundleTypeIconFiles - - 320-pro.png - 64-pro.png - 44x58-pro.png - 22x29-pro.png - - CFBundleTypeName - Google Earth KML Document - LSHandlerRank - Default - LSItemContentTypes - - com.google.earth.kml - - - - CFBundleTypeIconFiles - - 320-pro.png - 64-pro.png - 44x58-pro.png - 22x29-pro.png - - CFBundleTypeName - Google Earth KMZ Document - LSHandlerRank - Default - LSItemContentTypes - - com.google.earth.kmz - - - - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - $(MARKETING_VERSION) - CFBundleSignature - ???? - CFBundleURLTypes - - - CFBundleTypeRole - Viewer - CFBundleURLSchemes - - mapswithme - mapsme - ge0 - geo - om - mapswithmepro - - - - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - ITSAppUsesNonExemptEncryption - - LSApplicationQueriesSchemes - - mailto - comgooglemaps - osmandmaps - yandexmaps - dgis - citymapper - moovit - uber - waze - gomaposm - - LSRequiresIPhoneOS - - LSSupportsOpeningDocumentsInPlace - - NSAppTransportSecurity - - NSAllowsArbitraryLoads - - NSExceptionDomains - - omaps.app - - NSExceptionAllowsInsecureHTTPLoads - - NSIncludesSubdomains - - NSThirdPartyExceptionRequiresForwardSecrecy - - - organicmaps.app - - NSExceptionAllowsInsecureHTTPLoads - - NSIncludesSubdomains - - NSThirdPartyExceptionRequiresForwardSecrecy - - - - - NSLocationWhenInUseUsageDescription - Determining your location is necessary for navigation and for saving your recently travelled track. - UIAppFonts - - FredokaOne-Regular.ttf - - UIApplicationShortcutItems - - - UIApplicationShortcutItemIconFile - ic_3dtouch_search - UIApplicationShortcutItemTitle - search - UIApplicationShortcutItemType - app.organicmaps.3daction.search - - - UIApplicationShortcutItemIconFile - ic_3dtouch_bookmarks - UIApplicationShortcutItemTitle - bookmarks_and_tracks - UIApplicationShortcutItemType - app.organicmaps.3daction.bookmarks - - - UIApplicationShortcutItemIconFile - ic_3dtouch_planing_route - UIApplicationShortcutItemTitle - route - UIApplicationShortcutItemType - app.organicmaps.3daction.route - - - UIBackgroundModes - - audio - fetch - location - - UIFileSharingEnabled - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UIPrerenderedIcon - - UIStatusBarHidden - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UTImportedTypeDeclarations - - - UTTypeConformsTo - - public.xml - - UTTypeDescription - Google Earth KML Document - UTTypeIdentifier - com.google.earth.kml - UTTypeReferenceURL - http://earth.google.com/kml/ - UTTypeTagSpecification - - com.apple.ostype - GKml - public.filename-extension - - kml - - public.mime-type - application/vnd.google-earth.kml+xml - - - - UTTypeConformsTo - - com.pkware.zip-archive - - UTTypeDescription - Google Earth KMZ Document - UTTypeIdentifier - com.google.earth.kmz - UTTypeReferenceURL - http://earth.google.com/kmz/ - UTTypeTagSpecification - - com.apple.ostype - GKmz - public.filename-extension - - kmz - - public.mime-type - application/vnd.google-earth.kmz+xml - - - - UTTypeConformsTo - - public.xml - - UTTypeDescription - GPS Exchange Format (GPX) - UTTypeIdentifier - com.topografix.gpx - UTTypeReferenceURL - http://www.topografix.com/GPX/1/ - UTTypeTagSpecification - - public.filename-extension - - gpx - GPX - - public.mime-type - - application/gpx+xml - - - - - NSUbiquitousContainers - - iCloud.app.organicmaps - - NSUbiquitousContainerIsDocumentScopePublic - - NSUbiquitousContainerSupportedFolderLevels - ANY - NSUbiquitousContainerName - OrganicMaps - - iCloud.app.organicmaps.debug - - NSUbiquitousContainerIsDocumentScopePublic - - NSUbiquitousContainerSupportedFolderLevels - ANY - NSUbiquitousContainerName - OrganicMapsDEBUG - - - NSSupportsLiveActivities - - - diff --git a/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/logo.imageset/logo.png b/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/logo.imageset/logo.png deleted file mode 100644 index 5c17369ef..000000000 Binary files a/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/logo.imageset/logo.png and /dev/null differ diff --git a/iphone/Maps/Tests/Bookmarks/Categories/RecentlyDeletedTests/RecentlyDeletedCategoriesViewModelTests.swift b/iphone/Maps/Tests/Bookmarks/Categories/RecentlyDeletedTests/RecentlyDeletedCategoriesViewModelTests.swift index b400c929e..f3f9ddae8 100644 --- a/iphone/Maps/Tests/Bookmarks/Categories/RecentlyDeletedTests/RecentlyDeletedCategoriesViewModelTests.swift +++ b/iphone/Maps/Tests/Bookmarks/Categories/RecentlyDeletedTests/RecentlyDeletedCategoriesViewModelTests.swift @@ -1,5 +1,5 @@ import XCTest -@testable import Organic_Maps__Debug_ +@testable import CoMaps__Debug_ final class RecentlyDeletedCategoriesViewModelTests: XCTestCase { var viewModel: RecentlyDeletedCategoriesViewModel! diff --git a/iphone/Maps/Tests/Classes/CarPlay/CarPlayServiceTests.swift b/iphone/Maps/Tests/Classes/CarPlay/CarPlayServiceTests.swift index 19e18442b..32eb23420 100644 --- a/iphone/Maps/Tests/Classes/CarPlay/CarPlayServiceTests.swift +++ b/iphone/Maps/Tests/Classes/CarPlay/CarPlayServiceTests.swift @@ -1,5 +1,5 @@ import XCTest -@testable import Organic_Maps__Debug_ +@testable import CoMaps__Debug_ final class CarPlayServiceTests: XCTestCase { diff --git a/iphone/Maps/Tests/Core/iCloudTests/DefaultLocalDirectoryMonitorTests/DefaultLocalDirectoryMonitorTests.swift b/iphone/Maps/Tests/Core/iCloudTests/DefaultLocalDirectoryMonitorTests/DefaultLocalDirectoryMonitorTests.swift index dee57229a..f8438dc93 100644 --- a/iphone/Maps/Tests/Core/iCloudTests/DefaultLocalDirectoryMonitorTests/DefaultLocalDirectoryMonitorTests.swift +++ b/iphone/Maps/Tests/Core/iCloudTests/DefaultLocalDirectoryMonitorTests/DefaultLocalDirectoryMonitorTests.swift @@ -1,5 +1,5 @@ import XCTest -@testable import Organic_Maps__Debug_ +@testable import CoMaps__Debug_ final class DefaultLocalDirectoryMonitorTests: XCTestCase { diff --git a/iphone/Maps/Tests/Core/iCloudTests/DefaultLocalDirectoryMonitorTests/LocalDirectoryMonitorDelegateMock.swift b/iphone/Maps/Tests/Core/iCloudTests/DefaultLocalDirectoryMonitorTests/LocalDirectoryMonitorDelegateMock.swift index 9a8d489c8..f865f6504 100644 --- a/iphone/Maps/Tests/Core/iCloudTests/DefaultLocalDirectoryMonitorTests/LocalDirectoryMonitorDelegateMock.swift +++ b/iphone/Maps/Tests/Core/iCloudTests/DefaultLocalDirectoryMonitorTests/LocalDirectoryMonitorDelegateMock.swift @@ -1,5 +1,5 @@ import XCTest -@testable import Organic_Maps__Debug_ +@testable import CoMaps__Debug_ class LocalDirectoryMonitorDelegateMock: LocalDirectoryMonitorDelegate { var contents = LocalContents() diff --git a/iphone/Maps/Tests/Core/iCloudTests/MetadataItemStubs.swift b/iphone/Maps/Tests/Core/iCloudTests/MetadataItemStubs.swift index 302eb7221..38deb86a3 100644 --- a/iphone/Maps/Tests/Core/iCloudTests/MetadataItemStubs.swift +++ b/iphone/Maps/Tests/Core/iCloudTests/MetadataItemStubs.swift @@ -1,4 +1,4 @@ -@testable import Organic_Maps__Debug_ +@testable import CoMaps__Debug_ extension LocalMetadataItem { static func stub(fileName: String, diff --git a/iphone/Maps/Tests/Core/iCloudTests/SynchronizationStateManagerTests.swift b/iphone/Maps/Tests/Core/iCloudTests/SynchronizationStateManagerTests.swift index 600be93ca..fbff8ab23 100644 --- a/iphone/Maps/Tests/Core/iCloudTests/SynchronizationStateManagerTests.swift +++ b/iphone/Maps/Tests/Core/iCloudTests/SynchronizationStateManagerTests.swift @@ -1,5 +1,5 @@ import XCTest -@testable import Organic_Maps__Debug_ +@testable import CoMaps__Debug_ final class SynchronizationtateManagerTests: XCTestCase { diff --git a/iphone/Maps/Tests/Core/iCloudTests/iCloudDirectoryMonitorTests/UbiquitousDirectoryMonitorDelegateMock.swift b/iphone/Maps/Tests/Core/iCloudTests/iCloudDirectoryMonitorTests/UbiquitousDirectoryMonitorDelegateMock.swift index d05f46663..c00804081 100644 --- a/iphone/Maps/Tests/Core/iCloudTests/iCloudDirectoryMonitorTests/UbiquitousDirectoryMonitorDelegateMock.swift +++ b/iphone/Maps/Tests/Core/iCloudTests/iCloudDirectoryMonitorTests/UbiquitousDirectoryMonitorDelegateMock.swift @@ -1,5 +1,5 @@ import XCTest -@testable import Organic_Maps__Debug_ +@testable import CoMaps__Debug_ class UbiquitousDirectoryMonitorDelegateMock: CloudDirectoryMonitorDelegate { var didFinishGatheringCalled = false diff --git a/iphone/Maps/Tests/Core/iCloudTests/iCloudDirectoryMonitorTests/iCloudDirectoryMonitorTests.swift b/iphone/Maps/Tests/Core/iCloudTests/iCloudDirectoryMonitorTests/iCloudDirectoryMonitorTests.swift index 3bd6fc6ba..cbc0ffc34 100644 --- a/iphone/Maps/Tests/Core/iCloudTests/iCloudDirectoryMonitorTests/iCloudDirectoryMonitorTests.swift +++ b/iphone/Maps/Tests/Core/iCloudTests/iCloudDirectoryMonitorTests/iCloudDirectoryMonitorTests.swift @@ -1,5 +1,5 @@ import XCTest -@testable import Organic_Maps__Debug_ +@testable import CoMaps__Debug_ typealias UbiquityIdentityToken = NSCoding & NSCopying & NSObjectProtocol @@ -8,7 +8,7 @@ class iCloudDirectoryMonitorTests: XCTestCase { var cloudMonitor: iCloudDocumentsMonitor! var mockFileManager: FileManagerMock! var mockDelegate: UbiquitousDirectoryMonitorDelegateMock! - var cloudContainerIdentifier: String = "iCloud.app.organicmaps.debug" + var cloudContainerIdentifier: String = "iCloud.app.comaps.debug" override func setUp() { super.setUp() diff --git a/iphone/Maps/Tests/UI/SearchOnMapTests/SearchOnMapTests.swift b/iphone/Maps/Tests/UI/SearchOnMapTests/SearchOnMapTests.swift index c670151e8..815ec8b63 100644 --- a/iphone/Maps/Tests/UI/SearchOnMapTests/SearchOnMapTests.swift +++ b/iphone/Maps/Tests/UI/SearchOnMapTests/SearchOnMapTests.swift @@ -1,5 +1,5 @@ import XCTest -@testable import Organic_Maps__Debug_ +@testable import CoMaps__Debug_ final class SearchOnMapTests: XCTestCase { diff --git a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuInteractor.swift b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuInteractor.swift index 8457445c3..68f07db72 100644 --- a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuInteractor.swift +++ b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuInteractor.swift @@ -49,7 +49,7 @@ extension BottomMenuInteractor: BottomMenuInteractorProtocol { func donate() { close() guard var url = Settings.donateUrl() else { return } - if url == "https://organicmaps.app/donate/" { + if url == "https://www.comaps.app/donate/" { url = L("translated_om_site_url") + "donate/" } viewController?.openUrl(url, externally: true) diff --git a/iphone/Maps/UI/Editor/MWMEditorNotesFooter.xib b/iphone/Maps/UI/Editor/MWMEditorNotesFooter.xib index 9b1c13750..5e9864fa8 100644 --- a/iphone/Maps/UI/Editor/MWMEditorNotesFooter.xib +++ b/iphone/Maps/UI/Editor/MWMEditorNotesFooter.xib @@ -1,9 +1,8 @@ - + - - + @@ -21,7 +20,7 @@ - Предложенные вами изменения на карте будут отправлены в OpenStreetMap. Если у вас есть дополнительные сведения об объекте, которые OMaps не может позволить отредактировать, напишите о них. + Предложенные вами изменения на карте будут отправлены в OpenStreetMap. Если у вас есть дополнительные сведения об объекте, которые CoMaps не может позволить отредактировать, напишите о них. @@ -30,7 +29,7 @@ -