From 074d443f0fb81ea17958ffdde3e1a2b774981d28 Mon Sep 17 00:00:00 2001 From: Yannik Bloscheck Date: Thu, 12 Jun 2025 22:20:56 +0200 Subject: [PATCH] More rebranding including the team identifier, url scheme, and links on about screen Signed-off-by: Konstantin Pastbin --- .gitignore | 1 - 3party/bsdiff-courgette/bsdiff/bsdiff.h | 2 +- drape/glyph_manager.cpp | 4 +- iphone/Chart/Chart.xcodeproj/project.pbxproj | 4 +- .../CoreApi/CoreApi.xcodeproj/project.pbxproj | 2 +- .../DatePicker.xcodeproj/project.pbxproj | 4 +- iphone/Maps/.gitignore | 7 +- .../BookmarksListInfoViewController.xib | 2 +- .../BookmarksListViewController.xib | 2 +- .../BookmarksList/Cells/BookmarksListCell.xib | 2 +- .../Cells/BookmarksListSectionHeader.xib | 2 +- .../BookmarksList/Cells/SubgroupCell.xib | 4 +- .../Categories/Actions/BMCActionsCell.xib | 2 +- .../Categories/BMCActionsCreateCell.xib | 2 +- .../Categories/BMCView/BMCViewController.xib | 4 +- ...ookmarksCategoriesBackupAndRestoreCell.xib | 2 +- .../Categories/BMCCategoriesHeader.xib | 2 +- .../Categories/Categories/BMCCategoryCell.xib | 4 +- .../Notifications/BMCNotificationsCell.xib | 2 +- iphone/Maps/Categories/UIKitCategories.m | 2 +- .../LocationServicesDisabledAlert.xib | 2 +- .../Classes/CustomAlert/MWMOsmReauthAlert.xib | 4 +- .../Views/MWMNavigationInfoView.xib | 4 +- .../RoutePreview/MWMiPadRoutePreview.xib | 4 +- .../RoutePreview/MWMiPhoneRoutePreview.xib | 4 +- .../RouteManager/RouteManagerCell.xib | 2 +- .../RouteManagerViewController.xib | 8 +- .../TransportTransitSteps/TransportRuler.xib | 2 +- .../TransportTransitIntermediatePoint.xib | 2 +- .../TransportTransitPedestrian.xib | 2 +- .../TransportTransitTrain.xib | 2 +- iphone/Maps/CoMaps-Debug.entitlements | 16 +- iphone/Maps/CoMaps-Release.entitlements | 17 +- iphone/Maps/CoMaps.plist | 236 +++++++++++++++++- .../Core/iCloud/CloudDirectoryMonitor.swift | 2 +- .../About/ic_about_faq.imageset/Contents.json | 1 + .../ic_about_news.imageset/Contents.json | 1 + .../ic_about_rate_app.imageset/Contents.json | 1 + .../Contents.json | 1 + .../Contents.json | 1 + .../ic_about_volunteer.imageset/Contents.json | 1 + .../ic_christmas_tree.imageset/Contents.json | 4 + .../Contents.json | 1 + .../Contents.json | 1 + .../Contents.json | 1 + .../Contents.json | 1 + .../Contents.json | 1 + .../Contents.json | 1 + .../Contents.json | 1 + .../Contents.json | 1 + .../Contents.json | 3 +- .../Contents.json | 1 + .../About/osm_logo.imageset/Contents.json | 4 + .../af.lproj/Localizable.strings | 2 +- .../ar.lproj/Localizable.strings | 4 +- .../az.lproj/Localizable.strings | 6 +- .../be.lproj/Localizable.strings | 6 +- .../bg.lproj/Localizable.strings | 2 +- .../ca.lproj/Localizable.strings | 4 +- .../cs.lproj/Localizable.strings | 2 +- .../da.lproj/Localizable.strings | 2 +- .../de.lproj/Localizable.strings | 4 +- .../el.lproj/Localizable.strings | 2 +- .../en-GB.lproj/Localizable.strings | 2 +- .../en.lproj/Localizable.strings | 2 +- .../es-MX.lproj/Localizable.strings | 4 +- .../es.lproj/Localizable.strings | 2 +- .../et.lproj/Localizable.strings | 4 +- .../eu.lproj/Localizable.strings | 4 +- .../fa.lproj/Localizable.strings | 4 +- .../fi.lproj/Localizable.strings | 2 +- .../fr.lproj/Localizable.strings | 4 +- .../gl.lproj/Localizable.strings | 2 +- .../he.lproj/Localizable.strings | 2 +- .../hi.lproj/Localizable.strings | 2 +- .../hu.lproj/Localizable.strings | 2 +- .../id.lproj/Localizable.strings | 2 +- .../it.lproj/Localizable.strings | 2 +- .../ja.lproj/Localizable.strings | 2 +- .../ko.lproj/Localizable.strings | 2 +- .../lt.lproj/Localizable.strings | 2 +- .../lv.lproj/Localizable.strings | 2 +- .../mr.lproj/Localizable.strings | 4 +- .../mt.lproj/Localizable.strings | 2 +- .../nb.lproj/Localizable.strings | 4 +- .../nl.lproj/Localizable.strings | 4 +- .../pl.lproj/Localizable.strings | 4 +- .../pt-BR.lproj/Localizable.strings | 4 +- .../pt.lproj/Localizable.strings | 4 +- .../ro.lproj/Localizable.strings | 2 +- .../ru.lproj/Localizable.strings | 4 +- .../sk.lproj/Localizable.strings | 2 +- .../sr.lproj/Localizable.strings | 2 +- .../sv.lproj/Localizable.strings | 2 +- .../sw.lproj/Localizable.strings | 2 +- .../th.lproj/Localizable.strings | 2 +- .../tr.lproj/Localizable.strings | 4 +- .../uk.lproj/Localizable.strings | 2 +- .../vi.lproj/Localizable.strings | 2 +- .../zh-Hans.lproj/Localizable.strings | 4 +- .../zh-Hant.lproj/Localizable.strings | 4 +- iphone/Maps/Maps.xcodeproj/project.pbxproj | 44 ++-- .../Menu/BottomMenuViewController.xib | 2 +- .../Menu/Cells/BottomMenuItemCell.xib | 2 +- .../Menu/Cells/BottomMenuLayersCell.xib | 10 +- .../TabBar/BottomTabBarViewController.xib | 14 +- .../DownloadAllView/DownloadAllView.xib | 2 +- .../AboutController/AboutController.swift | 4 +- .../AboutController/Models/AboutInfo.swift | 4 +- .../AboutController/Models/SocialMedia.swift | 10 +- .../Maps/UI/MailComposer/MailComposer.swift | 2 +- .../ElevationDetailsViewController.xib | 4 +- .../Products/ProductsViewModel.swift | 2 +- .../PlacePage/DirectionView/DirectionView.xib | 2 +- iphone/Maps/UI/PlacePage/PlacePage.storyboard | 52 ++-- .../UI/Settings/DrivingOptions.storyboard | 10 +- .../Storyboard/CarPlayStoryboard.storyboard | 2 +- iphone/Maps/UI/Storyboard/Main.storyboard | 22 +- iphone/Maps/UI/Storyboard/Settings.storyboard | 64 ++--- iphone/Maps/UI/Storyboard/Welcome.storyboard | 16 +- iphone/metadata/it/description.txt | 2 +- platform/distance.hpp | 2 +- xcode/editor/editor.xcodeproj/project.pbxproj | 8 +- xcode/fastlane/Deliverfile | 2 +- xcode/fastlane/Fastfile | 22 +- .../minizip/minizip.xcodeproj/project.pbxproj | 2 + 126 files changed, 559 insertions(+), 276 deletions(-) diff --git a/.gitignore b/.gitignore index 6b8bcc714..550688797 100644 --- a/.gitignore +++ b/.gitignore @@ -187,4 +187,3 @@ 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 324d9fcea..33a7421bc 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 CoMaps readers and writers instead +// all routines to use OMaps 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 e1f4885cc..742da8742 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 CoMapsLanguageToHarfbuzzLanguage(int8_t lang) +hb_language_t OrganicMapsLanguageToHarfbuzzLanguage(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 = CoMapsLanguageToHarfbuzzLanguage(lang); + hb_language_t const hbLanguage = OrganicMapsLanguageToHarfbuzzLanguage(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 b12c4e033..1d2fdc826 100644 --- a/iphone/Chart/Chart.xcodeproj/project.pbxproj +++ b/iphone/Chart/Chart.xcodeproj/project.pbxproj @@ -190,7 +190,7 @@ BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; LastUpgradeCheck = 1510; - ORGANIZATIONNAME = "Organic Maps"; + ORGANIZATIONNAME = CoMaps; TargetAttributes = { 47375D952420D4DB00FFCC49 = { CreatedOnToolsVersion = 11.3; @@ -359,6 +359,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.chart; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -380,6 +381,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.0; 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 6c02d082a..7a2fbde22 100644 --- a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj +++ b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj @@ -598,7 +598,7 @@ BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; LastUpgradeCheck = 1510; - ORGANIZATIONNAME = "Organic Maps"; + ORGANIZATIONNAME = "CoMaps"; TargetAttributes = { 470015EE2342509C00EBF03D = { CreatedOnToolsVersion = 10.2; diff --git a/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj b/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj index 7d44d1b5d..6a18d2d67 100644 --- a/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj +++ b/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj @@ -149,7 +149,7 @@ BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; LastUpgradeCheck = 1510; - ORGANIZATIONNAME = "Organic Maps"; + ORGANIZATIONNAME = CoMaps; TargetAttributes = { 47A13C6424B4A86000027D4F = { CreatedOnToolsVersion = 11.3; @@ -251,6 +251,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.datepicker; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -271,6 +272,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.datepicker; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; diff --git a/iphone/Maps/.gitignore b/iphone/Maps/.gitignore index cf7c1556e..d713573d2 100644 --- a/iphone/Maps/.gitignore +++ b/iphone/Maps/.gitignore @@ -1,4 +1,5 @@ Pods -app.organicmaps.debug -app.organicmaps.beta -app.organicmaps +app.comaps.debug +app.comaps.beta +app.comaps +UI/Storyboard/Welcome.storyboard \ No newline at end of file diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.xib b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.xib index aa1328358..9f4ea4b4f 100644 --- a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.xib +++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.xib @@ -8,7 +8,7 @@ - + diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.xib b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.xib index ed2639b95..e34f8b9fc 100644 --- a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.xib +++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.xib @@ -8,7 +8,7 @@ - + diff --git a/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListCell.xib b/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListCell.xib index 0ee6b2f12..7eb2a9038 100644 --- a/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListCell.xib +++ b/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListCell.xib @@ -10,7 +10,7 @@ - + diff --git a/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListSectionHeader.xib b/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListSectionHeader.xib index b8a0a7fb8..16554ab1d 100644 --- a/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListSectionHeader.xib +++ b/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListSectionHeader.xib @@ -9,7 +9,7 @@ - + diff --git a/iphone/Maps/Bookmarks/BookmarksList/Cells/SubgroupCell.xib b/iphone/Maps/Bookmarks/BookmarksList/Cells/SubgroupCell.xib index 51085de2b..d87f3c32f 100644 --- a/iphone/Maps/Bookmarks/BookmarksList/Cells/SubgroupCell.xib +++ b/iphone/Maps/Bookmarks/BookmarksList/Cells/SubgroupCell.xib @@ -10,14 +10,14 @@ - + - + diff --git a/iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCell.xib b/iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCell.xib index c0c1d5ac0..842401c9c 100644 --- a/iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCell.xib +++ b/iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCell.xib @@ -10,7 +10,7 @@ - + diff --git a/iphone/Maps/Bookmarks/Categories/BMCActionsCreateCell.xib b/iphone/Maps/Bookmarks/Categories/BMCActionsCreateCell.xib index 17f644441..c923272bf 100644 --- a/iphone/Maps/Bookmarks/Categories/BMCActionsCreateCell.xib +++ b/iphone/Maps/Bookmarks/Categories/BMCActionsCreateCell.xib @@ -12,7 +12,7 @@ - + diff --git a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.xib b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.xib index 59c44d217..159288840 100644 --- a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.xib +++ b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.xib @@ -8,7 +8,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/iphone/Maps/Bookmarks/Categories/BookmarksCategoriesBackupAndRestoreCell.xib b/iphone/Maps/Bookmarks/Categories/BookmarksCategoriesBackupAndRestoreCell.xib index eff2c286f..35932d0f3 100644 --- a/iphone/Maps/Bookmarks/Categories/BookmarksCategoriesBackupAndRestoreCell.xib +++ b/iphone/Maps/Bookmarks/Categories/BookmarksCategoriesBackupAndRestoreCell.xib @@ -12,7 +12,7 @@ - + diff --git a/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoriesHeader.xib b/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoriesHeader.xib index 7b6a9ed86..ea292959f 100644 --- a/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoriesHeader.xib +++ b/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoriesHeader.xib @@ -10,7 +10,7 @@ - + diff --git a/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoryCell.xib b/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoryCell.xib index df018f575..42a4c9918 100644 --- a/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoryCell.xib +++ b/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoryCell.xib @@ -10,14 +10,14 @@ - + - + diff --git a/iphone/Maps/Bookmarks/Categories/Notifications/BMCNotificationsCell.xib b/iphone/Maps/Bookmarks/Categories/Notifications/BMCNotificationsCell.xib index 1c2ec6004..afe2488ab 100644 --- a/iphone/Maps/Bookmarks/Categories/Notifications/BMCNotificationsCell.xib +++ b/iphone/Maps/Bookmarks/Categories/Notifications/BMCNotificationsCell.xib @@ -10,7 +10,7 @@ - + diff --git a/iphone/Maps/Categories/UIKitCategories.m b/iphone/Maps/Categories/UIKitCategories.m index 6e74f8ed3..de878a689 100644 --- a/iphone/Maps/Categories/UIKitCategories.m +++ b/iphone/Maps/Categories/UIKitCategories.m @@ -85,7 +85,7 @@ - (void)rateApp { - NSString * urlString = @"https://apps.apple.com/app/id1567437057?action=write-review"; + NSString * urlString = @"https://apps.apple.com/app/comaps/id6747180809?action=write-review"; NSURL * url = [NSURL URLWithString:urlString]; [self openURL:url options:@{} completionHandler:nil]; } diff --git a/iphone/Maps/Classes/CustomAlert/LocationAlert/LocationServicesDisabledAlert.xib b/iphone/Maps/Classes/CustomAlert/LocationAlert/LocationServicesDisabledAlert.xib index 80bc09ec8..8d6bf629b 100644 --- a/iphone/Maps/Classes/CustomAlert/LocationAlert/LocationServicesDisabledAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/LocationAlert/LocationServicesDisabledAlert.xib @@ -11,7 +11,7 @@ - + diff --git a/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.xib b/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.xib index 98ae1d19b..68b4c85ce 100644 --- a/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.xib @@ -55,7 +55,7 @@ - - - - - -