Rebranded the app for iOS

This commit is contained in:
Matheus Gomes
2025-06-09 19:26:12 +02:00
committed by Konstantin Pastbin
parent 51b669cfd1
commit d4e1d53c40
85 changed files with 506 additions and 1309 deletions

1
.gitignore vendored
View File

@@ -187,3 +187,4 @@ tools/unix/maps/settings.sh
# VS Code # VS Code
.vscode .vscode
.cache .cache
iphone/Maps/UI/Storyboard/Welcome.storyboard

View File

@@ -35,7 +35,7 @@
// 2013-04-10 - Added wrapper to apply a patch directly to files. // 2013-04-10 - Added wrapper to apply a patch directly to files.
// --Joshua Pawlicki <waffles@chromium.org> // --Joshua Pawlicki <waffles@chromium.org>
// 2017-08-14 - Moved "apply" and "create" to the header file, rewrote // 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. // of Courgette streams and files.
// --Maxim Pimenov <m@maps.me> // --Maxim Pimenov <m@maps.me>
// 2019-01-24 - Got rid of the paged array. We have enough address space // 2019-01-24 - Got rid of the paged array. We have enough address space

View File

@@ -598,7 +598,7 @@ GlyphImage GlyphManager::GetGlyphImage(GlyphFontAndId key, int pixelHeight, bool
namespace namespace
{ {
hb_language_t OrganicMapsLanguageToHarfbuzzLanguage(int8_t lang) hb_language_t CoMapsLanguageToHarfbuzzLanguage(int8_t lang)
{ {
// TODO(AB): can langs be converted faster? // TODO(AB): can langs be converted faster?
auto const svLang = StringUtf8Multilang::GetLangByCode(lang); 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); const auto [text, segments] = harfbuzz_shaping::GetTextSegments(utf8);
// TODO(AB): Optimize language conversion. // TODO(AB): Optimize language conversion.
hb_language_t const hbLanguage = OrganicMapsLanguageToHarfbuzzLanguage(lang); hb_language_t const hbLanguage = CoMapsLanguageToHarfbuzzLanguage(lang);
text::TextMetrics allGlyphs; text::TextMetrics allGlyphs;
// For SplitText it's enough to know if the last visual (first logical) segment is RTL. // For SplitText it's enough to know if the last visual (first logical) segment is RTL.

View File

@@ -359,7 +359,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@loader_path/Frameworks", "@loader_path/Frameworks",
); );
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.chart; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.chart;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
}; };
@@ -380,7 +380,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@loader_path/Frameworks", "@loader_path/Frameworks",
); );
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.chart; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.chart;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
}; };

View File

@@ -776,7 +776,7 @@
); );
MACH_O_TYPE = staticlib; MACH_O_TYPE = staticlib;
MODULEMAP_FILE = CoreApi.modulemap; MODULEMAP_FILE = CoreApi.modulemap;
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.coreapi; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.coreapi;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;

View File

@@ -58,7 +58,7 @@ static BOOL _fileLoggingEnabled = NO;
static dispatch_once_t onceToken; static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{ dispatch_once(&onceToken, ^{
dispatch_queue_attr_t attributes = dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, QOS_CLASS_UTILITY, 0); 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; return fileLoggingQueue;
} }

View File

@@ -251,7 +251,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@loader_path/Frameworks", "@loader_path/Frameworks",
); );
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.datepicker; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.datepicker;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
}; };
@@ -271,7 +271,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@loader_path/Frameworks", "@loader_path/Frameworks",
); );
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.datepicker; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.datepicker;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
}; };

View File

@@ -670,11 +670,11 @@ NSString *const kSettingsSegue = @"Map2Settings";
[self.navigationController popToRootViewControllerAnimated:NO]; [self.navigationController popToRootViewControllerAnimated:NO];
if (self.isViewLoaded) { if (self.isViewLoaded) {
[MWMRouter stopRouting]; [MWMRouter stopRouting];
if ([action isEqualToString:@"app.organicmaps.3daction.bookmarks"]) if ([action isEqualToString:@"app.comaps.3daction.bookmarks"])
[self.bookmarksCoordinator open]; [self.bookmarksCoordinator open];
else if ([action isEqualToString:@"app.organicmaps.3daction.search"]) else if ([action isEqualToString:@"app.comaps.3daction.search"])
[self.searchManager startSearchingWithIsRouting:NO]; [self.searchManager startSearchingWithIsRouting:NO];
else if ([action isEqualToString:@"app.organicmaps.3daction.route"]) else if ([action isEqualToString:@"app.comaps.3daction.route"])
[self.controlsManager onRoutePrepare]; [self.controlsManager onRoutePrepare];
} else { } else {
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{

View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>aps-environment</key>
<string>development</string>
<key>com.apple.developer.associated-domains</key>
<array>
<string>applinks:comaps.app</string>
</array>
<key>com.apple.developer.ubiquity-container-identifiers</key>
<array/>
</dict>
</plist>

View File

@@ -6,25 +6,14 @@
<string>development</string> <string>development</string>
<key>com.apple.developer.associated-domains</key> <key>com.apple.developer.associated-domains</key>
<array> <array>
<string>applinks:omaps.app</string> <string>applinks:comaps.app</string>
<string>applinks:omaps.at</string> <string>applinks:comaps.at</string>
</array> </array>
<key>com.apple.developer.carplay-maps</key> <key>com.apple.developer.carplay-maps</key>
<true/> <true/>
<key>com.apple.developer.icloud-container-identifiers</key> <key>com.apple.developer.icloud-container-identifiers</key>
<array> <array/>
<string>iCloud.app.organicmaps</string>
</array>
<key>com.apple.developer.icloud-services</key> <key>com.apple.developer.icloud-services</key>
<array> <array/>
<string>CloudDocuments</string>
<string>CloudKit</string>
</array>
<key>com.apple.developer.ubiquity-container-identifiers</key>
<array>
<string>iCloud.app.organicmaps</string>
</array>
<key>com.apple.developer.ubiquity-kvstore-identifier</key>
<string>$(TeamIdentifierPrefix)$(CFBundleIdentifier)</string>
</dict> </dict>
</plist> </plist>

5
iphone/Maps/CoMaps.plist Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict/>
</plist>

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

View File

@@ -2,7 +2,7 @@ import WidgetKit
import SwiftUI import SwiftUI
@main @main
struct OMapsWidgetExtensionBundle: WidgetBundle { struct CoMapsWidgetExtensionBundle: WidgetBundle {
var body: some Widget { var body: some Widget {
TrackRecordingLiveActivityConfiguration() TrackRecordingLiveActivityConfiguration()
} }

View File

@@ -33,7 +33,7 @@
osm::Editor::Instance().UploadChanges( osm::Editor::Instance().UploadChanges(
oauthToken, oauthToken,
{{"created_by", {{"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}}, {"bundle_id", NSBundle.mainBundle.bundleIdentifier.UTF8String}},
lambda); lambda);
} }

View File

@@ -150,7 +150,7 @@
} else { } else {
if (errorPtr) { if (errorPtr) {
if (pointsCount == 0) { if (pointsCount == 0) {
*errorPtr = [NSError errorWithDomain:@"omaps.app.routing" *errorPtr = [NSError errorWithDomain:@"comaps.app.routing"
code:MWMRouterResultCodeStartPointNotFound code:MWMRouterResultCodeStartPointNotFound
userInfo:nil]; userInfo:nil];
} else { } else {
@@ -161,7 +161,7 @@
} else { } else {
code = MWMRouterResultCodeStartPointNotFound; code = MWMRouterResultCodeStartPointNotFound;
} }
*errorPtr = [NSError errorWithDomain:@"omaps.app.routing" *errorPtr = [NSError errorWithDomain:@"comaps.app.routing"
code:code code:code
userInfo:nil]; userInfo:nil];
} }

View File

@@ -49,7 +49,7 @@
CSSearchableItem * item = CSSearchableItem * item =
[[CSSearchableItem alloc] initWithUniqueIdentifier:categoryKeyString [[CSSearchableItem alloc] initWithUniqueIdentifier:categoryKeyString
domainIdentifier:@"omaps.app.categories" domainIdentifier:@"comaps.app.categories"
attributeSet:attrSet]; attributeSet:attrSet];
[items addObject:item]; [items addObject:item];
} }

View File

@@ -1,10 +1,10 @@
class DayColors: IColors { class DayColors: IColors {
var clear = UIColor.clear var clear = UIColor.clear
var primaryDark = UIColor(24, 128, 68, alpha100) var primaryDark = UIColor(24, 128, 68, alpha100)
var primary = UIColor(0, 108, 53, alpha100) var primary = UIColor(88, 129, 87, alpha100)
var secondary = UIColor(45, 137, 83, alpha100) var secondary = UIColor(55, 101, 63, alpha100)
// Light green color // 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 menuBackground = UIColor(255, 255, 255, alpha90)
var tabBarButtonBackground = UIColor(255, 255, 255, alpha70) var tabBarButtonBackground = UIColor(255, 255, 255, alpha70)
var downloadBadgeBackground = UIColor(255, 55, 35, alpha100) var downloadBadgeBackground = UIColor(255, 55, 35, alpha100)

View File

@@ -17,7 +17,7 @@ private let kDocumentsDirectoryName = "Documents"
final class iCloudDocumentsMonitor: NSObject, CloudDirectoryMonitor { final class iCloudDocumentsMonitor: NSObject, CloudDirectoryMonitor {
private static let sharedContainerIdentifier: String = { private static let sharedContainerIdentifier: String = {
var identifier = "iCloud.app.organicmaps" var identifier = "iCloud.app.comaps"
#if DEBUG #if DEBUG
identifier.append(".debug") identifier.append(".debug")
#endif #endif

View File

@@ -1,6 +1,6 @@
final class SynchronizationFileWriter { final class SynchronizationFileWriter {
private let fileManager: FileManager 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 fileCoordinator: NSFileCoordinator
private let localDirectoryUrl: URL private let localDirectoryUrl: URL
private let cloudDirectoryUrl: URL private let cloudDirectoryUrl: URL

View File

@@ -1,7 +1,7 @@
{ {
"images" : [ "images" : [
{ {
"filename" : "ic_social_media_github.pdf", "filename" : "ic_social_media_bluesky.svg",
"idiom" : "universal" "idiom" : "universal"
} }
], ],
@@ -10,6 +10,6 @@
"version" : 1 "version" : 1
}, },
"properties" : { "properties" : {
"template-rendering-intent" : "template" "template-rendering-intent" : "original"
} }
} }

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="600" height="530" version="1.1" xmlns="http://www.w3.org/2000/svg">
<path d="m135.72 44.03c66.496 49.921 138.02 151.14 164.28 205.46 26.262-54.316 97.782-155.54 164.28-205.46 47.98-36.021 125.72-63.892 125.72 24.795 0 17.712-10.155 148.79-16.111 170.07-20.703 73.984-96.144 92.854-163.25 81.433 117.3 19.964 147.14 86.092 82.697 152.22-122.39 125.59-175.91-31.511-189.63-71.766-2.514-7.3797-3.6904-10.832-3.7077-7.8964-0.0174-2.9357-1.1937 0.51669-3.7077 7.8964-13.714 40.255-67.233 197.36-189.63 71.766-64.444-66.128-34.605-132.26 82.697-152.22-67.108 11.421-142.55-7.4491-163.25-81.433-5.9562-21.282-16.111-152.36-16.111-170.07 0-88.687 77.742-60.816 125.72-24.795z" fill="#1185fe"/>
</svg>

After

Width:  |  Height:  |  Size: 745 B

View File

@@ -1,7 +1,7 @@
{ {
"images" : [ "images" : [
{ {
"filename" : "ic_social_media_x.pdf", "filename" : "ic_social_media_codeberg.svg",
"idiom" : "universal" "idiom" : "universal"
} }
], ],
@@ -10,6 +10,6 @@
"version" : 1 "version" : 1
}, },
"properties" : { "properties" : {
"template-rendering-intent" : "template" "template-rendering-intent" : "original"
} }
} }

View File

@@ -0,0 +1,164 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="16"
height="16"
viewBox="0 0 4.2333332 4.2333335"
version="1.1"
id="svg1468"
sodipodi:docname="codeberg-logo_icon_blue.svg"
inkscape:version="1.2-alpha1 (b6a15bb, 2022-02-23)"
inkscape:export-filename="/home/mray/Projects/Codeberg/logo/icon/png/codeberg-logo_icon_blue.png"
inkscape:export-xdpi="384"
inkscape:export-ydpi="384"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<title
id="title16">Codeberg logo</title>
<defs
id="defs1462">
<linearGradient
xlink:href="#linearGradient6924"
id="linearGradient6918"
x1="42519.285"
y1="-7078.7891"
x2="42575.336"
y2="-6966.9307"
gradientUnits="userSpaceOnUse" />
<linearGradient
id="linearGradient6924">
<stop
style="stop-color:#2185d0;stop-opacity:0"
offset="0"
id="stop6920" />
<stop
id="stop6926"
offset="0.49517274"
style="stop-color:#2185d0;stop-opacity:0.48923996" />
<stop
style="stop-color:#2185d0;stop-opacity:0.63279623"
offset="1"
id="stop6922" />
</linearGradient>
<linearGradient
xlink:href="#linearGradient6924-6"
id="linearGradient6918-3"
x1="42519.285"
y1="-7078.7891"
x2="42575.336"
y2="-6966.9307"
gradientUnits="userSpaceOnUse" />
<linearGradient
id="linearGradient6924-6">
<stop
style="stop-color:#2185d0;stop-opacity:0;"
offset="0"
id="stop6920-7" />
<stop
id="stop6926-5"
offset="0.49517274"
style="stop-color:#2185d0;stop-opacity:0.30000001;" />
<stop
style="stop-color:#2185d0;stop-opacity:0.30000001;"
offset="1"
id="stop6922-3" />
</linearGradient>
</defs>
<sodipodi:namedview
showborder="false"
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="22.627417"
inkscape:cx="12.948893"
inkscape:cy="12.661631"
inkscape:document-units="px"
inkscape:current-layer="svg1468"
inkscape:document-rotation="0"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
units="px"
inkscape:snap-global="false"
inkscape:snap-page="true"
showguides="false"
inkscape:window-width="1531"
inkscape:window-height="873"
inkscape:window-x="69"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1">
<inkscape:grid
type="xygrid"
id="grid2067" />
</sodipodi:namedview>
<metadata
id="metadata1465">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>Codeberg logo</dc:title>
<cc:license
rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
<dc:creator>
<cc:Agent>
<dc:title>Robert Martinez</dc:title>
</cc:Agent>
</dc:creator>
<dc:rights>
<cc:Agent>
<dc:title>Codeberg and the Codeberg Logo are trademarks of Codeberg e.V.</dc:title>
</cc:Agent>
</dc:rights>
<dc:date>2020-04-09</dc:date>
<dc:publisher>
<cc:Agent>
<dc:title>Codeberg e.V.</dc:title>
</cc:Agent>
</dc:publisher>
<dc:source>codeberg.org</dc:source>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
</cc:License>
</rdf:RDF>
</metadata>
<g
id="g370484"
inkscape:label="logo"
transform="matrix(0.06551432,0,0,0.06551432,-2.232417,-1.431776)">
<path
id="path6733-5"
style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6918-3);fill-opacity:1;stroke:none;stroke-width:3.67846;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke markers fill;stop-color:#000000;stop-opacity:1"
d="m 42519.285,-7078.7891 a 0.76086879,0.56791688 0 0 0 -0.738,0.6739 l 33.586,125.8886 a 87.182358,87.182358 0 0 0 39.381,-33.7636 l -71.565,-92.5196 a 0.76086879,0.56791688 0 0 0 -0.664,-0.2793 z"
transform="matrix(0.37058478,0,0,0.37058478,-15690.065,2662.0533)"
inkscape:label="berg" />
<path
id="path360787"
style="opacity:1;fill:#2185d0;fill-opacity:1;stroke-width:17.0055;paint-order:markers fill stroke;stop-color:#000000"
d="m 11249.461,-1883.6961 c -12.74,0 -23.067,10.3275 -23.067,23.0671 0,4.3335 1.22,8.5795 3.522,12.2514 l 19.232,-24.8636 c 0.138,-0.1796 0.486,-0.1796 0.624,0 l 19.233,24.8646 c 2.302,-3.6721 3.523,-7.9185 3.523,-12.2524 0,-12.7396 -10.327,-23.0671 -23.067,-23.0671 z"
sodipodi:nodetypes="sccccccs"
inkscape:label="sky"
transform="matrix(1.4006354,0,0,1.4006354,-15690.065,2662.0533)" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 5.8 KiB

View File

@@ -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

View File

@@ -1,7 +1,7 @@
{ {
"images" : [ "images" : [
{ {
"filename" : "ic_social_media_reddit.pdf", "filename" : "ic_social_media_lemmy.svg",
"idiom" : "universal" "idiom" : "universal"
} }
], ],

View File

@@ -0,0 +1,75 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="62.920513mm"
height="41.44083mm"
viewBox="0 0 951.2393 626.50705"
version="1.1"
id="svg8"
inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
inkscape:export-xdpi="300"
inkscape:export-ydpi="300"
enable-background="new">
<defs
id="defs2" />
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-36.380379,-256.78621)"
style="display:inline">
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:28;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 167.03908,270.78735 c -0.94784,-0.002 -1.8939,0.004 -2.83789,0.0215 -4.31538,0.0778 -8.58934,0.3593 -12.8125,0.8457 -33.78522,3.89116 -64.215716,21.86394 -82.871086,53.27344 -18.27982,30.77718 -22.77749,64.66635 -13.46094,96.06837 9.31655,31.40203 31.88488,59.93174 65.296886,82.5332 0.20163,0.13618 0.40678,0.26709 0.61523,0.39258 28.65434,17.27768 57.18167,28.93179 87.74218,34.95508 -0.74566,12.61339 -0.72532,25.5717 0.082,38.84375 2.43989,40.10943 16.60718,77.03742 38.0957,109.67187 l -77.00781,31.4375 c -8.30605,3.25932 -12.34178,12.68234 -8.96967,20.94324 3.37211,8.2609 12.84919,12.16798 21.06342,8.68371 l 84.69727,-34.57617 c 15.70675,18.72702 33.75346,35.68305 53.12109,50.57032 0.74013,0.56891 1.4904,1.12236 2.23437,1.68554 l -49.61132,65.69141 c -5.45446,7.0474 -4.10058,17.19288 3.01098,22.5634 7.11156,5.37052 17.24028,3.89649 22.52612,-3.27824 l 50.38672,-66.71876 c 27.68572,17.53469 57.07524,31.20388 86.07227,40.25196 14.88153,27.28008 43.96965,44.64648 77.58789,44.64648 33.93762,0 63.04252,-18.68693 77.80082,-45.4375 28.7072,-9.21295 57.7527,-22.93196 85.1484,-40.40234 l 51.0977,67.66016 c 5.2858,7.17473 15.4145,8.64876 22.5261,3.27824 7.1115,-5.37052 8.4654,-15.516 3.011,-22.5634 l -50.3614,-66.68555 c 0.334,-0.25394 0.6727,-0.50077 1.0059,-0.75586 19.1376,-14.64919 37.0259,-31.28581 52.7031,-49.63476 l 82.5625,33.70507 c 8.2143,3.48427 17.6913,-0.42281 21.0634,-8.68371 3.3722,-8.2609 -0.6636,-17.68392 -8.9696,-20.94324 l -74.5391,-30.42773 c 22.1722,-32.82971 37.0383,-70.03397 40.1426,-110.46094 1.0253,-13.35251 1.2292,-26.42535 0.6387,-39.17578 30.3557,-6.05408 58.7164,-17.66833 87.2011,-34.84375 0.2085,-0.12549 0.4136,-0.2564 0.6153,-0.39258 33.412,-22.60147 55.9803,-51.13117 65.2968,-82.5332 9.3166,-31.40202 4.8189,-65.29118 -13.4609,-96.06837 -18.6553,-31.40951 -49.0859,-49.38228 -82.8711,-53.27344 -4.2231,-0.4864 -8.4971,-0.76791 -12.8125,-0.8457 -30.2077,-0.54448 -62.4407,8.82427 -93.4316,26.71484 -22.7976,13.16063 -43.3521,33.31423 -59.4375,55.30469 -44.9968,-25.75094 -103.5444,-40.25065 -175.4785,-41.43945 -6.4522,-0.10663 -13.0125,-0.10696 -19.67974,0.002 -80.18875,1.30929 -144.38284,16.5086 -192.87109,43.9922 -0.11914,-0.19111 -0.24287,-0.37932 -0.37109,-0.56446 -16.29,-22.764 -37.41085,-43.73706 -60.89649,-57.29493 -30.02247,-17.33149 -61.21051,-26.66489 -90.59375,-26.73633 z"
id="path817-3"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccssccccccscccccscccscccscccccsccscccssccscscccscc"
inkscape:label="white-border"
sodipodi:insensitive="true" />
<path
id="path1087"
style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:28;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 716.85595,362.96478 c 15.29075,-21.36763 35.36198,-41.10921 56.50979,-53.31749 66.66377,-38.48393 137.02617,-33.22172 170.08018,22.43043 33.09493,55.72093 14.98656,117.48866 -47.64399,159.85496 -31.95554,19.26819 -62.93318,30.92309 -97.22892,35.54473 M 307.14407,362.96478 C 291.85332,341.59715 271.78209,321.85557 250.63429,309.64729 183.97051,271.16336 113.60811,276.42557 80.554051,332.07772 47.459131,387.79865 65.56752,449.56638 128.19809,491.93268 c 31.95554,19.26819 62.93319,30.92309 97.22893,35.54473"
inkscape:connector-curvature="0"
inkscape:label="ears"
sodipodi:insensitive="true" />
<path
style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:28;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 801.23205,576.8699 C 812.73478,427.06971 720.58431,321.98291 511.99999,325.38859 303.41568,328.79426 213.71393,428.0311 222.76794,576.8699 c 8.64289,142.08048 176.80223,246.40388 288.12038,246.40388 111.31815,0 279.45076,-104.5447 290.34373,-246.40388 z"
id="path969"
inkscape:connector-curvature="0"
sodipodi:nodetypes="szszs"
inkscape:label="head"
sodipodi:insensitive="true" />
<path
id="path1084"
style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 610.4991,644.28932 c 0,23.11198 18.70595,41.84795 41.78091,41.84795 23.07495,0 41.7809,-18.73597 41.7809,-41.84795 0,-23.112 -18.70594,-41.84796 -41.7809,-41.84796 -23.07496,0 -41.78091,18.73596 -41.78091,41.84796 z m -280.56002,0 c 0,23.32492 18.87829,42.23352 42.16586,42.23352 23.28755,0 42.16585,-18.9086 42.16585,-42.23352 0,-23.32494 -18.87829,-42.23353 -42.16585,-42.23353 -23.28757,0 -42.16586,18.90859 -42.16586,42.23353 z"
inkscape:connector-curvature="0"
inkscape:label="eyes"
sodipodi:nodetypes="ssssssssss"
sodipodi:insensitive="true" />
<path
id="path1008"
style="display:inline;opacity:1;fill:none;stroke:#000000;stroke-width:32;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 339.72919,769.2467 -54.54422,72.22481 m 399.08582,-72.22481 54.54423,72.22481 M 263.68341,697.82002 175.92752,733.64353 m 579.85765,-35.82351 87.7559,35.82351"
inkscape:connector-curvature="0"
inkscape:label="whiskers"
sodipodi:nodetypes="cccccccc"
sodipodi:insensitive="true" />
<path
style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:28;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 512.00082,713.08977 c -45.86417,0 -75.13006,31.84485 -74.14159,71.10084 1.07048,42.51275 32.46865,71.10323 74.14159,71.10323 41.67296,0 74.05118,-32.99608 74.14161,-71.10323 0.0932,-39.26839 -28.27742,-71.10084 -74.14161,-71.10084 z"
id="path1115"
inkscape:connector-curvature="0"
inkscape:label="nose"
sodipodi:nodetypes="zszsz"
sodipodi:insensitive="true" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 8.0 KiB

View File

@@ -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

View File

@@ -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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 150 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 973 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View File

@@ -1 +1,24 @@
<svg id="vector" xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 135.47 135.47"><path fill="#006c35" d="M128.27,22.42C131.43,31.02 114.54,51.94 98.44,57.31 69.31,46.97 68.36,64.34 44.52,80.84 72.7,100.81 102.23,85.26 101.67,65.6c-22.18,13.03 -36.07,14.45 -44.05,14.05 26.84,-5.45 55.81,-22.34 61.88,-29.45 0.01,0.32 0.01,0.63 0.01,0.95 0,33.95 -51.15,84.31 -51.15,84.31 0,0 -26.78,-26.28 -41.58,-53.73 -2.07,-0.03 -14.53,4.61 -19.12,-1.61C2.53,73.18 21.55,49.89 38.05,42.94 67.57,56.68 83.75,21.08 92.99,19.1 65.44,2.37 38.21,9.24 35.13,34.1 50.44,25.18 69.23,20.13 77.91,20.53 53.52,25.63 25.58,44.13 17.21,51.16c0,-28.25 22.9,-51.16 51.15,-51.16 16.71,0 31.54,8.01 40.88,20.4 0,-0 16.67,-5.56 19.04,2.02zM122.43,24.95c-2.19,-3.06 -9.83,0.51 -9.83,0.51 1.07,1.84 2.03,3.75 2.87,5.72 0.85,2 1.57,4.07 2.17,6.19 0,0 7.8,-8.24 4.8,-12.42zM13.33,77.24c2.37,3.31 10.63,-0.56 10.63,-0.56 -1.16,-1.99 -2.19,-4.05 -3.1,-6.18 -0.92,-2.16 -1.7,-4.4 -2.34,-6.69 0,0 -8.43,8.91 -5.19,13.43z" stroke-width="0.43" id="path_0"/></svg> <?xml version="1.0" encoding="UTF-8"?>
<svg id="Camada_1" data-name="Camada 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000">
<defs>
<style>
.cls-1, .cls-2 {
fill: #fff;
}
.cls-3 {
fill: #588157;
}
.cls-2 {
font-family: HelveticaNeue-Bold, 'Helvetica Neue';
font-size: 200px;
font-weight: 700;
}
</style>
</defs>
<rect class="cls-1" x="101.09" y="104.19" width="208.98" height="395.81"/>
<rect class="cls-1" x="196.45" y="355.78" width="208.98" height="395.81"/>
<rect class="cls-3" width="1000" height="1000"/>
<text class="cls-2" transform="translate(101.9 537.6)"><tspan x="0" y="0">CoMaps</tspan></text>
</svg>

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 725 B

View File

@@ -465,7 +465,7 @@
ED2D743E2D14337500660FBF /* TrackRecordingLiveActivityAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D74302D14337500660FBF /* TrackRecordingLiveActivityAttributes.swift */; }; ED2D743E2D14337500660FBF /* TrackRecordingLiveActivityAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D74302D14337500660FBF /* TrackRecordingLiveActivityAttributes.swift */; };
ED2D743F2D14337500660FBF /* TrackRecordingLiveActivityConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D74312D14337500660FBF /* TrackRecordingLiveActivityConfiguration.swift */; }; ED2D743F2D14337500660FBF /* TrackRecordingLiveActivityConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D74312D14337500660FBF /* TrackRecordingLiveActivityConfiguration.swift */; };
ED2D74402D14337500660FBF /* TrackRecordingLiveActivityView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D74322D14337500660FBF /* TrackRecordingLiveActivityView.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 */; }; ED2D745E2D1433DE00660FBF /* TrackRecordingActivityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D745D2D1433DE00660FBF /* TrackRecordingActivityManager.swift */; };
ED2D74652D14357F00660FBF /* TrackRecordingLiveActivityAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D74302D14337500660FBF /* TrackRecordingLiveActivityAttributes.swift */; }; ED2D74652D14357F00660FBF /* TrackRecordingLiveActivityAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D74302D14337500660FBF /* TrackRecordingLiveActivityAttributes.swift */; };
ED2D74662D1435A600660FBF /* LiveActivityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D742D2D14337500660FBF /* LiveActivityManager.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 */; }; ED43B8BD2C12063500D07BAA /* DocumentPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED43B8BC2C12063500D07BAA /* DocumentPicker.swift */; };
ED46DDCE2D098A0B007CACD6 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED46DDCD2D098A0B007CACD6 /* WidgetKit.framework */; }; ED46DDCE2D098A0B007CACD6 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED46DDCD2D098A0B007CACD6 /* WidgetKit.framework */; };
ED46DDD02D098A0B007CACD6 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED46DDCF2D098A0B007CACD6 /* SwiftUI.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 */; }; ED4DC7772CAEDECC0029B338 /* ProductsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED4DC7752CAEDECC0029B338 /* ProductsViewModel.swift */; };
ED4DC7782CAEDECC0029B338 /* ProductButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED4DC7732CAEDECC0029B338 /* ProductButton.swift */; }; ED4DC7782CAEDECC0029B338 /* ProductButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED4DC7732CAEDECC0029B338 /* ProductButton.swift */; };
ED4DC7792CAEDECC0029B338 /* ProductsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED4DC7742CAEDECC0029B338 /* ProductsViewController.swift */; }; ED4DC7792CAEDECC0029B338 /* ProductsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED4DC7742CAEDECC0029B338 /* ProductsViewController.swift */; };
@@ -752,7 +752,7 @@
dstPath = ""; dstPath = "";
dstSubfolderSpec = 13; dstSubfolderSpec = 13;
files = ( files = (
ED46DDE12D098A0C007CACD6 /* OMapsWidgetExtension.appex in Embed Foundation Extensions */, ED46DDE12D098A0C007CACD6 /* CoMapsWidgetExtension.appex in Embed Foundation Extensions */,
); );
name = "Embed Foundation Extensions"; name = "Embed Foundation Extensions";
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
@@ -1223,11 +1223,11 @@
4B83AE482C2E59F800B0C3BC /* TTSTester.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = TTSTester.mm; sourceTree = "<group>"; }; 4B83AE482C2E59F800B0C3BC /* TTSTester.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = TTSTester.mm; sourceTree = "<group>"; };
4B83AE4A2C2E642100B0C3BC /* TTSTesterTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TTSTesterTest.m; sourceTree = "<group>"; }; 4B83AE4A2C2E642100B0C3BC /* TTSTesterTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TTSTesterTest.m; sourceTree = "<group>"; };
5605022E1B6211E100169CAD /* sound-strings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "sound-strings"; path = "../../data/sound-strings"; sourceTree = "<group>"; }; 5605022E1B6211E100169CAD /* sound-strings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "sound-strings"; path = "../../data/sound-strings"; sourceTree = "<group>"; };
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 = "<group>"; }; 6B9978341C89A316003B8AA0 /* editor.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = editor.config; path = ../../data/editor.config; sourceTree = "<group>"; };
8C4FB9C62BEFEFF400D44877 /* CarPlayWindowScaleAdjuster.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarPlayWindowScaleAdjuster.swift; sourceTree = "<group>"; }; 8C4FB9C62BEFEFF400D44877 /* CarPlayWindowScaleAdjuster.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarPlayWindowScaleAdjuster.swift; sourceTree = "<group>"; };
8CB13C3A2BF1276A004288F2 /* CarplayPlaceholderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarplayPlaceholderView.swift; sourceTree = "<group>"; }; 8CB13C3A2BF1276A004288F2 /* CarplayPlaceholderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarplayPlaceholderView.swift; sourceTree = "<group>"; };
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 = "<group>"; }; 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 = "<group>"; };
978D4A30199A11E600D72CA7 /* faq.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = faq.html; path = ../../data/faq.html; sourceTree = "<group>"; }; 978D4A30199A11E600D72CA7 /* faq.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = faq.html; path = ../../data/faq.html; sourceTree = "<group>"; };
97A5967E19B9CD47007A963F /* copyright.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = copyright.html; path = ../../data/copyright.html; sourceTree = "<group>"; }; 97A5967E19B9CD47007A963F /* copyright.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = copyright.html; path = ../../data/copyright.html; sourceTree = "<group>"; };
99012846243F0D6900C72B10 /* UIViewController+alternative.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+alternative.swift"; sourceTree = "<group>"; }; 99012846243F0D6900C72B10 /* UIViewController+alternative.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+alternative.swift"; sourceTree = "<group>"; };
@@ -1418,7 +1418,7 @@
CDCA278C2248F34C00167D87 /* MWMRouterResultCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRouterResultCode.h; sourceTree = "<group>"; }; CDCA278C2248F34C00167D87 /* MWMRouterResultCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRouterResultCode.h; sourceTree = "<group>"; };
CDCA278F2248F3B800167D87 /* MWMLocationModeListener.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMLocationModeListener.h; sourceTree = "<group>"; }; CDCA278F2248F3B800167D87 /* MWMLocationModeListener.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMLocationModeListener.h; sourceTree = "<group>"; };
CDE0F3AD225B8D45008BA5C3 /* MWMSpeedCameraManagerMode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSpeedCameraManagerMode.h; sourceTree = "<group>"; }; CDE0F3AD225B8D45008BA5C3 /* MWMSpeedCameraManagerMode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSpeedCameraManagerMode.h; sourceTree = "<group>"; };
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 = "<group>"; }; ED0B1C302BC2951F00FB8EDD /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
ED0B1FEE2CAA9A25006E31A4 /* UIView+Highlight.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Highlight.swift"; sourceTree = "<group>"; }; ED0B1FEE2CAA9A25006E31A4 /* UIView+Highlight.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Highlight.swift"; sourceTree = "<group>"; };
ED0C54972C6E14E800253A5F /* TrackRecordingManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackRecordingManager.swift; sourceTree = "<group>"; }; ED0C54972C6E14E800253A5F /* TrackRecordingManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackRecordingManager.swift; sourceTree = "<group>"; };
@@ -1434,12 +1434,12 @@
ED2D74322D14337500660FBF /* TrackRecordingLiveActivityView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackRecordingLiveActivityView.swift; sourceTree = "<group>"; }; ED2D74322D14337500660FBF /* TrackRecordingLiveActivityView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackRecordingLiveActivityView.swift; sourceTree = "<group>"; };
ED2D74342D14337500660FBF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; }; ED2D74342D14337500660FBF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
ED2D74352D14337500660FBF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; ED2D74352D14337500660FBF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
ED2D74362D14337500660FBF /* OMapsWidgetExtensionBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OMapsWidgetExtensionBundle.swift; sourceTree = "<group>"; }; ED2D74362D14337500660FBF /* CoMapsWidgetExtensionBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoMapsWidgetExtensionBundle.swift; sourceTree = "<group>"; };
ED2D745D2D1433DE00660FBF /* TrackRecordingActivityManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackRecordingActivityManager.swift; sourceTree = "<group>"; }; ED2D745D2D1433DE00660FBF /* TrackRecordingActivityManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackRecordingActivityManager.swift; sourceTree = "<group>"; };
ED3EAC1F2B03C88100220A4A /* BottomTabBarButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomTabBarButton.swift; sourceTree = "<group>"; }; ED3EAC1F2B03C88100220A4A /* BottomTabBarButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomTabBarButton.swift; sourceTree = "<group>"; };
ED43B8BC2C12063500D07BAA /* DocumentPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentPicker.swift; sourceTree = "<group>"; }; ED43B8BC2C12063500D07BAA /* DocumentPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentPicker.swift; sourceTree = "<group>"; };
ED46DD922D06F804007CACD6 /* TrackRecordingButtonArea.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackRecordingButtonArea.swift; sourceTree = "<group>"; }; ED46DD922D06F804007CACD6 /* TrackRecordingButtonArea.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackRecordingButtonArea.swift; sourceTree = "<group>"; };
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; }; 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; }; 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 = "<group>"; }; ED48BBB817C2B1E2003E7E92 /* CircleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircleView.h; sourceTree = "<group>"; };
@@ -1937,9 +1937,9 @@
19C28FACFE9D520D11CA2CBB /* Products */ = { 19C28FACFE9D520D11CA2CBB /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
6741AA5D1BF340DE002C974C /* Organic Maps (Debug).app */, 6741AA5D1BF340DE002C974C /* CoMaps (Debug).app */,
ED097E762BB80C320006ED01 /* OMapsTests.xctest */, ED097E762BB80C320006ED01 /* CoMapsTests.xctest */,
ED46DDCC2D098A0B007CACD6 /* OMapsWidgetExtension.appex */, ED46DDCC2D098A0B007CACD6 /* CoMapsWidgetExtension.appex */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
@@ -1959,14 +1959,14 @@
29B97323FDCFA39411CA2CEA /* Frameworks */, 29B97323FDCFA39411CA2CEA /* Frameworks */,
34F73FA11E08300E00AC1FD6 /* Images.xcassets */, 34F73FA11E08300E00AC1FD6 /* Images.xcassets */,
34F73F5E1E082FF700AC1FD6 /* LocalizedStrings */, 34F73F5E1E082FF700AC1FD6 /* LocalizedStrings */,
8D1107310486CEB800E47090 /* OMaps.plist */, 8D1107310486CEB800E47090 /* CoMaps.plist */,
ED0B1C302BC2951F00FB8EDD /* PrivacyInfo.xcprivacy */, ED0B1C302BC2951F00FB8EDD /* PrivacyInfo.xcprivacy */,
29B97315FDCFA39411CA2CEA /* Other Sources */, 29B97315FDCFA39411CA2CEA /* Other Sources */,
19C28FACFE9D520D11CA2CBB /* Products */, 19C28FACFE9D520D11CA2CBB /* Products */,
29B97317FDCFA39411CA2CEA /* Resources */, 29B97317FDCFA39411CA2CEA /* Resources */,
F6E2FBFB1E097B9F0083EBEC /* UI */, F6E2FBFB1E097B9F0083EBEC /* UI */,
ED1ADA312BC6B19E0029209F /* Tests */, ED1ADA312BC6B19E0029209F /* Tests */,
ED2D74372D14337500660FBF /* OMapsWidgetExtension */, ED2D74372D14337500660FBF /* CoMapsWidgetExtension */,
); );
indentWidth = 2; indentWidth = 2;
name = Maps; name = Maps;
@@ -3227,15 +3227,15 @@
path = LiveActivity; path = LiveActivity;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
ED2D74372D14337500660FBF /* OMapsWidgetExtension */ = { ED2D74372D14337500660FBF /* CoMapsWidgetExtension */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
ED2D74332D14337500660FBF /* LiveActivity */, ED2D74332D14337500660FBF /* LiveActivity */,
ED2D74342D14337500660FBF /* Assets.xcassets */, ED2D74342D14337500660FBF /* Assets.xcassets */,
ED2D74352D14337500660FBF /* Info.plist */, ED2D74352D14337500660FBF /* Info.plist */,
ED2D74362D14337500660FBF /* OMapsWidgetExtensionBundle.swift */, ED2D74362D14337500660FBF /* CoMapsWidgetExtensionBundle.swift */,
); );
path = OMapsWidgetExtension; path = CoMapsWidgetExtension;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
ED43B8B92C12061600D07BAA /* DocumentPicker */ = { ED43B8B92C12061600D07BAA /* DocumentPicker */ = {
@@ -4070,9 +4070,9 @@
/* End PBXGroup section */ /* End PBXGroup section */
/* Begin PBXNativeTarget section */ /* Begin PBXNativeTarget section */
6741A93D1BF340DE002C974C /* OMaps */ = { 6741A93D1BF340DE002C974C /* CoMaps */ = {
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 6741AA541BF340DE002C974C /* Build configuration list for PBXNativeTarget "OMaps" */; buildConfigurationList = 6741AA541BF340DE002C974C /* Build configuration list for PBXNativeTarget "CoMaps" */;
buildPhases = ( buildPhases = (
FA456C4E26BDCCC300B83C20 /* CopyFiles */, FA456C4E26BDCCC300B83C20 /* CopyFiles */,
6741A9411BF340DE002C974C /* Resources */, 6741A9411BF340DE002C974C /* Resources */,
@@ -4087,14 +4087,14 @@
FA456C4D26BDCC9400B83C20 /* PBXTargetDependency */, FA456C4D26BDCC9400B83C20 /* PBXTargetDependency */,
ED46DDE02D098A0C007CACD6 /* PBXTargetDependency */, ED46DDE02D098A0C007CACD6 /* PBXTargetDependency */,
); );
name = OMaps; name = CoMaps;
productName = Maps; productName = Maps;
productReference = 6741AA5D1BF340DE002C974C /* Organic Maps (Debug).app */; productReference = 6741AA5D1BF340DE002C974C /* CoMaps (Debug).app */;
productType = "com.apple.product-type.application"; productType = "com.apple.product-type.application";
}; };
ED097E752BB80C320006ED01 /* OMapsTests */ = { ED097E752BB80C320006ED01 /* CoMapsTests */ = {
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = ED097E802BB80C330006ED01 /* Build configuration list for PBXNativeTarget "OMapsTests" */; buildConfigurationList = ED097E802BB80C330006ED01 /* Build configuration list for PBXNativeTarget "CoMapsTests" */;
buildPhases = ( buildPhases = (
ED097E722BB80C320006ED01 /* Sources */, ED097E722BB80C320006ED01 /* Sources */,
ED097E732BB80C320006ED01 /* Frameworks */, ED097E732BB80C320006ED01 /* Frameworks */,
@@ -4105,14 +4105,14 @@
dependencies = ( dependencies = (
ED097E7B2BB80C320006ED01 /* PBXTargetDependency */, ED097E7B2BB80C320006ED01 /* PBXTargetDependency */,
); );
name = OMapsTests; name = CoMapsTests;
productName = OMapsTests; productName = OMapsTests;
productReference = ED097E762BB80C320006ED01 /* OMapsTests.xctest */; productReference = ED097E762BB80C320006ED01 /* CoMapsTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test"; productType = "com.apple.product-type.bundle.unit-test";
}; };
ED46DDCB2D098A0B007CACD6 /* OMapsWidgetExtension */ = { ED46DDCB2D098A0B007CACD6 /* CoMapsWidgetExtension */ = {
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = ED46DDE62D098A0C007CACD6 /* Build configuration list for PBXNativeTarget "OMapsWidgetExtension" */; buildConfigurationList = ED46DDE62D098A0C007CACD6 /* Build configuration list for PBXNativeTarget "CoMapsWidgetExtension" */;
buildPhases = ( buildPhases = (
ED46DDC82D098A0B007CACD6 /* Sources */, ED46DDC82D098A0B007CACD6 /* Sources */,
ED46DDC92D098A0B007CACD6 /* Frameworks */, ED46DDC92D098A0B007CACD6 /* Frameworks */,
@@ -4122,11 +4122,11 @@
); );
dependencies = ( dependencies = (
); );
name = OMapsWidgetExtension; name = CoMapsWidgetExtension;
packageProductDependencies = ( packageProductDependencies = (
); );
productName = OMapsWidgetExtension; productName = OMapsWidgetExtension;
productReference = ED46DDCC2D098A0B007CACD6 /* OMapsWidgetExtension.appex */; productReference = ED46DDCC2D098A0B007CACD6 /* CoMapsWidgetExtension.appex */;
productType = "com.apple.product-type.app-extension"; productType = "com.apple.product-type.app-extension";
}; };
/* End PBXNativeTarget section */ /* End PBXNativeTarget section */
@@ -4137,8 +4137,8 @@
attributes = { attributes = {
BuildIndependentTargetsInParallel = YES; BuildIndependentTargetsInParallel = YES;
DefaultBuildSystemTypeForWorkspace = Latest; DefaultBuildSystemTypeForWorkspace = Latest;
LastUpgradeCheck = 1620; LastUpgradeCheck = 1640;
ORGANIZATIONNAME = "Organic Maps"; ORGANIZATIONNAME = CoMaps;
TargetAttributes = { TargetAttributes = {
6741A93D1BF340DE002C974C = { 6741A93D1BF340DE002C974C = {
LastSwiftMigration = 1110; LastSwiftMigration = 1110;
@@ -4221,9 +4221,9 @@
); );
projectRoot = ""; projectRoot = "";
targets = ( targets = (
6741A93D1BF340DE002C974C /* OMaps */, 6741A93D1BF340DE002C974C /* CoMaps */,
ED097E752BB80C320006ED01 /* OMapsTests */, ED097E752BB80C320006ED01 /* CoMapsTests */,
ED46DDCB2D098A0B007CACD6 /* OMapsWidgetExtension */, ED46DDCB2D098A0B007CACD6 /* CoMapsWidgetExtension */,
); );
}; };
/* End PBXProject section */ /* End PBXProject section */
@@ -4926,7 +4926,7 @@
ED2D743E2D14337500660FBF /* TrackRecordingLiveActivityAttributes.swift in Sources */, ED2D743E2D14337500660FBF /* TrackRecordingLiveActivityAttributes.swift in Sources */,
ED2D743F2D14337500660FBF /* TrackRecordingLiveActivityConfiguration.swift in Sources */, ED2D743F2D14337500660FBF /* TrackRecordingLiveActivityConfiguration.swift in Sources */,
ED2D74402D14337500660FBF /* TrackRecordingLiveActivityView.swift in Sources */, ED2D74402D14337500660FBF /* TrackRecordingLiveActivityView.swift in Sources */,
ED2D74412D14337500660FBF /* OMapsWidgetExtensionBundle.swift in Sources */, ED2D74412D14337500660FBF /* CoMapsWidgetExtensionBundle.swift in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@@ -4935,12 +4935,12 @@
/* Begin PBXTargetDependency section */ /* Begin PBXTargetDependency section */
ED097E7B2BB80C320006ED01 /* PBXTargetDependency */ = { ED097E7B2BB80C320006ED01 /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
target = 6741A93D1BF340DE002C974C /* OMaps */; target = 6741A93D1BF340DE002C974C /* CoMaps */;
targetProxy = ED097E7A2BB80C320006ED01 /* PBXContainerItemProxy */; targetProxy = ED097E7A2BB80C320006ED01 /* PBXContainerItemProxy */;
}; };
ED46DDE02D098A0C007CACD6 /* PBXTargetDependency */ = { ED46DDE02D098A0C007CACD6 /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
target = ED46DDCB2D098A0B007CACD6 /* OMapsWidgetExtension */; target = ED46DDCB2D098A0B007CACD6 /* CoMapsWidgetExtension */;
targetProxy = ED46DDDF2D098A0C007CACD6 /* PBXContainerItemProxy */; targetProxy = ED46DDDF2D098A0C007CACD6 /* PBXContainerItemProxy */;
}; };
FA456C4D26BDCC9400B83C20 /* PBXTargetDependency */ = { FA456C4D26BDCC9400B83C20 /* PBXTargetDependency */ = {
@@ -5174,19 +5174,31 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDebug; ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDebug;
CODE_SIGN_ENTITLEMENTS = "OMaps-Debug.entitlements"; CODE_SIGN_ENTITLEMENTS = "CoMaps-Debug.entitlements";
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 0; CURRENT_PROJECT_VERSION = 0;
DEVELOPMENT_TEAM = 9Z6432XD7L; DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = "$(inherited)"; 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 = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 2022.11.17; MACOSX_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 2025.06.09;
OTHER_SWIFT_FLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.debug; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.debug;
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
}; };
name = Debug; name = Debug;
@@ -5195,20 +5207,32 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = "OMaps-Release.entitlements"; CODE_SIGN_ENTITLEMENTS = "CoMaps-Release.entitlements";
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 0; CURRENT_PROJECT_VERSION = 0;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Z6432XD7L; DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = "$(inherited)"; 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 = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 2022.11.17; MACOSX_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 2025.06.09;
OTHER_SWIFT_FLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps; PRODUCT_BUNDLE_IDENTIFIER = app.comaps;
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
}; };
name = Release; name = Release;
@@ -5222,9 +5246,10 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 9Z6432XD7L; DEVELOPMENT_TEAM = 9Z6432XD7L;
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.tests; MACOSX_DEPLOYMENT_TARGET = 11.0;
PRODUCT_BUNDLE_IDENTIFIER = app.comaps.tests;
PROVISIONING_PROFILE_SPECIFIER = ""; 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; name = Debug;
}; };
@@ -5237,9 +5262,10 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 9Z6432XD7L; DEVELOPMENT_TEAM = 9Z6432XD7L;
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.tests; MACOSX_DEPLOYMENT_TARGET = 11.0;
PRODUCT_BUNDLE_IDENTIFIER = app.comaps.tests;
PROVISIONING_PROFILE_SPECIFIER = ""; 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; name = Release;
}; };
@@ -5255,18 +5281,19 @@
"$(inherited)", "$(inherited)",
); );
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = OMapsWidgetExtension/Info.plist; INFOPLIST_FILE = CoMapsWidgetExtension/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = OMapsWidgetExtension; INFOPLIST_KEY_CFBundleDisplayName = CoMapsWidgetExtension;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2024 Organic Maps. All rights reserved."; INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 CoMaps. All rights reserved.";
IPHONEOS_DEPLOYMENT_TARGET = 16.2; IPHONEOS_DEPLOYMENT_TARGET = 16.2;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MACOSX_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 2022.11.17; MARKETING_VERSION = 2022.11.17;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.debug.widgetextension; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.debug.widgetextension;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
@@ -5285,17 +5312,18 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Z6432XD7L; DEVELOPMENT_TEAM = 9Z6432XD7L;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = OMapsWidgetExtension/Info.plist; INFOPLIST_FILE = CoMapsWidgetExtension/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = OMapsWidgetExtension; INFOPLIST_KEY_CFBundleDisplayName = CoMapsWidgetExtension;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2024 Organic Maps. All rights reserved."; INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 CoMaps. All rights reserved.";
IPHONEOS_DEPLOYMENT_TARGET = 16.2; IPHONEOS_DEPLOYMENT_TARGET = 16.2;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MACOSX_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 2022.11.17; MARKETING_VERSION = 2022.11.17;
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.widgetextension; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.widgetextension;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
@@ -5311,7 +5339,7 @@
baseConfigurationReference = 347526FA1DC0B00F00918CF5 /* common-debug.xcconfig */; baseConfigurationReference = 347526FA1DC0B00F00918CF5 /* common-debug.xcconfig */;
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
BUNDLE_IDENTIFIER = app.organicmaps.debug; BUNDLE_IDENTIFIER = app.comaps.debug;
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = Maps_Prefix.pch; GCC_PREFIX_HEADER = Maps_Prefix.pch;
@@ -5320,7 +5348,7 @@
"$(OMIM_ROOT)/3party/glm", "$(OMIM_ROOT)/3party/glm",
"$(OMIM_ROOT)/3party/pugixml/pugixml/src", "$(OMIM_ROOT)/3party/pugixml/pugixml/src",
); );
INFOPLIST_FILE = OMaps.plist; INFOPLIST_FILE = CoMaps.plist;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"$(inherited)", "$(inherited)",
"-Wall", "-Wall",
@@ -5334,7 +5362,7 @@
); );
OTHER_SWIFT_FLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_IDENTIFIER}"; PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_IDENTIFIER}";
PRODUCT_NAME = "Organic Maps (Debug)"; PRODUCT_NAME = "CoMaps (Debug)";
SDKROOT = iphoneos; SDKROOT = iphoneos;
SKIP_INSTALL = NO; SKIP_INSTALL = NO;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
@@ -5350,7 +5378,7 @@
baseConfigurationReference = 347526FB1DC0B00F00918CF5 /* common-release.xcconfig */; baseConfigurationReference = 347526FB1DC0B00F00918CF5 /* common-release.xcconfig */;
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
BUNDLE_IDENTIFIER = app.organicmaps; BUNDLE_IDENTIFIER = app.comaps;
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = Maps_Prefix.pch; GCC_PREFIX_HEADER = Maps_Prefix.pch;
@@ -5359,7 +5387,7 @@
"$(OMIM_ROOT)/3party/glm", "$(OMIM_ROOT)/3party/glm",
"$(OMIM_ROOT)/3party/pugixml/pugixml/src", "$(OMIM_ROOT)/3party/pugixml/pugixml/src",
); );
INFOPLIST_FILE = OMaps.plist; INFOPLIST_FILE = CoMaps.plist;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"$(inherited)", "$(inherited)",
"-Wall", "-Wall",
@@ -5373,7 +5401,7 @@
); );
OTHER_SWIFT_FLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_IDENTIFIER}"; PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_IDENTIFIER}";
PRODUCT_NAME = "Organic Maps"; PRODUCT_NAME = CoMaps;
SDKROOT = iphoneos; SDKROOT = iphoneos;
SKIP_INSTALL = NO; SKIP_INSTALL = NO;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
@@ -5387,7 +5415,7 @@
/* End XCBuildConfiguration section */ /* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */ /* Begin XCConfigurationList section */
6741AA541BF340DE002C974C /* Build configuration list for PBXNativeTarget "OMaps" */ = { 6741AA541BF340DE002C974C /* Build configuration list for PBXNativeTarget "CoMaps" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
6741AA571BF340DE002C974C /* Debug */, 6741AA571BF340DE002C974C /* Debug */,
@@ -5405,7 +5433,7 @@
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug; defaultConfigurationName = Debug;
}; };
ED097E802BB80C330006ED01 /* Build configuration list for PBXNativeTarget "OMapsTests" */ = { ED097E802BB80C330006ED01 /* Build configuration list for PBXNativeTarget "CoMapsTests" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
ED097E7C2BB80C330006ED01 /* Debug */, ED097E7C2BB80C330006ED01 /* Debug */,
@@ -5414,7 +5442,7 @@
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug; defaultConfigurationName = Debug;
}; };
ED46DDE62D098A0C007CACD6 /* Build configuration list for PBXNativeTarget "OMapsWidgetExtension" */ = { ED46DDE62D098A0C007CACD6 /* Build configuration list for PBXNativeTarget "CoMapsWidgetExtension" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
ED46DDE32D098A0C007CACD6 /* Debug */, ED46DDE32D098A0C007CACD6 /* Debug */,

View File

@@ -1,103 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1620"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6741A93D1BF340DE002C974C"
BuildableName = "Organic Maps (Debug).app"
BlueprintName = "OMaps"
ReferencedContainer = "container:Maps.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "NO">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "ED097E752BB80C320006ED01"
BuildableName = "OMapsTests.xctest"
BlueprintName = "OMapsTests"
ReferencedContainer = "container:Maps.xcodeproj">
</BuildableReference>
</MacroExpansion>
<CommandLineArguments>
<CommandLineArgument
argument = "-IsTests"
isEnabled = "YES">
</CommandLineArgument>
</CommandLineArguments>
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "ED097E752BB80C320006ED01"
BuildableName = "OMapsTests.xctest"
BlueprintName = "OMapsTests"
ReferencedContainer = "container:Maps.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6741A93D1BF340DE002C974C"
BuildableName = "Organic Maps (Debug).app"
BlueprintName = "OMaps"
ReferencedContainer = "container:Maps.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6741A93D1BF340DE002C974C"
BuildableName = "Organic Maps (Debug).app"
BlueprintName = "OMaps"
ReferencedContainer = "container:Maps.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

View File

@@ -1,30 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>aps-environment</key>
<string>development</string>
<key>com.apple.developer.associated-domains</key>
<array>
<string>applinks:omaps.app</string>
<string>applinks:omaps.at</string>
</array>
<key>com.apple.developer.carplay-maps</key>
<true/>
<key>com.apple.developer.icloud-container-identifiers</key>
<array>
<string>iCloud.app.organicmaps.debug</string>
</array>
<key>com.apple.developer.icloud-services</key>
<array>
<string>CloudDocuments</string>
<string>CloudKit</string>
</array>
<key>com.apple.developer.ubiquity-container-identifiers</key>
<array>
<string>iCloud.app.organicmaps.debug</string>
</array>
<key>com.apple.developer.ubiquity-kvstore-identifier</key>
<string>$(TeamIdentifierPrefix)$(CFBundleIdentifier)</string>
</dict>
</plist>

View File

@@ -1,288 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
<key>CFBundleTypeIconFiles</key>
<array/>
<key>CFBundleTypeName</key>
<string>GPS Exchange Format (GPX)</string>
<key>LSHandlerRank</key>
<string>Default</string>
<key>LSItemContentTypes</key>
<array>
<string>com.topografix.gpx</string>
</array>
</dict>
<dict>
<key>CFBundleTypeIconFiles</key>
<array>
<string>320-pro.png</string>
<string>64-pro.png</string>
<string>44x58-pro.png</string>
<string>22x29-pro.png</string>
</array>
<key>CFBundleTypeName</key>
<string>Google Earth KML Document</string>
<key>LSHandlerRank</key>
<string>Default</string>
<key>LSItemContentTypes</key>
<array>
<string>com.google.earth.kml</string>
</array>
</dict>
<dict>
<key>CFBundleTypeIconFiles</key>
<array>
<string>320-pro.png</string>
<string>64-pro.png</string>
<string>44x58-pro.png</string>
<string>22x29-pro.png</string>
</array>
<key>CFBundleTypeName</key>
<string>Google Earth KMZ Document</string>
<key>LSHandlerRank</key>
<string>Default</string>
<key>LSItemContentTypes</key>
<array>
<string>com.google.earth.kmz</string>
</array>
</dict>
</array>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>CFBundleURLSchemes</key>
<array>
<string>mapswithme</string>
<string>mapsme</string>
<string>ge0</string>
<string>geo</string>
<string>om</string>
<string>mapswithmepro</string>
</array>
</dict>
</array>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>mailto</string>
<string>comgooglemaps</string>
<string>osmandmaps</string>
<string>yandexmaps</string>
<string>dgis</string>
<string>citymapper</string>
<string>moovit</string>
<string>uber</string>
<string>waze</string>
<string>gomaposm</string>
</array>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>LSSupportsOpeningDocumentsInPlace</key>
<false/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
<key>NSExceptionDomains</key>
<dict>
<key>omaps.app</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
<key>NSThirdPartyExceptionRequiresForwardSecrecy</key>
<false/>
</dict>
<key>organicmaps.app</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
<key>NSIncludesSubdomains</key>
<true/>
<key>NSThirdPartyExceptionRequiresForwardSecrecy</key>
<false/>
</dict>
</dict>
</dict>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Determining your location is necessary for navigation and for saving your recently travelled track.</string>
<key>UIAppFonts</key>
<array>
<string>FredokaOne-Regular.ttf</string>
</array>
<key>UIApplicationShortcutItems</key>
<array>
<dict>
<key>UIApplicationShortcutItemIconFile</key>
<string>ic_3dtouch_search</string>
<key>UIApplicationShortcutItemTitle</key>
<string>search</string>
<key>UIApplicationShortcutItemType</key>
<string>app.organicmaps.3daction.search</string>
</dict>
<dict>
<key>UIApplicationShortcutItemIconFile</key>
<string>ic_3dtouch_bookmarks</string>
<key>UIApplicationShortcutItemTitle</key>
<string>bookmarks_and_tracks</string>
<key>UIApplicationShortcutItemType</key>
<string>app.organicmaps.3daction.bookmarks</string>
</dict>
<dict>
<key>UIApplicationShortcutItemIconFile</key>
<string>ic_3dtouch_planing_route</string>
<key>UIApplicationShortcutItemTitle</key>
<string>route</string>
<key>UIApplicationShortcutItemType</key>
<string>app.organicmaps.3daction.route</string>
</dict>
</array>
<key>UIBackgroundModes</key>
<array>
<string>audio</string>
<string>fetch</string>
<string>location</string>
</array>
<key>UIFileSharingEnabled</key>
<true/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UIPrerenderedIcon</key>
<true/>
<key>UIStatusBarHidden</key>
<false/>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UTImportedTypeDeclarations</key>
<array>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.xml</string>
</array>
<key>UTTypeDescription</key>
<string>Google Earth KML Document</string>
<key>UTTypeIdentifier</key>
<string>com.google.earth.kml</string>
<key>UTTypeReferenceURL</key>
<string>http://earth.google.com/kml/</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>com.apple.ostype</key>
<string>GKml</string>
<key>public.filename-extension</key>
<array>
<string>kml</string>
</array>
<key>public.mime-type</key>
<string>application/vnd.google-earth.kml+xml</string>
</dict>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>com.pkware.zip-archive</string>
</array>
<key>UTTypeDescription</key>
<string>Google Earth KMZ Document</string>
<key>UTTypeIdentifier</key>
<string>com.google.earth.kmz</string>
<key>UTTypeReferenceURL</key>
<string>http://earth.google.com/kmz/</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>com.apple.ostype</key>
<string>GKmz</string>
<key>public.filename-extension</key>
<array>
<string>kmz</string>
</array>
<key>public.mime-type</key>
<string>application/vnd.google-earth.kmz+xml</string>
</dict>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.xml</string>
</array>
<key>UTTypeDescription</key>
<string>GPS Exchange Format (GPX)</string>
<key>UTTypeIdentifier</key>
<string>com.topografix.gpx</string>
<key>UTTypeReferenceURL</key>
<string>http://www.topografix.com/GPX/1/</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<array>
<string>gpx</string>
<string>GPX</string>
</array>
<key>public.mime-type</key>
<array>
<string>application/gpx+xml</string>
</array>
</dict>
</dict>
</array>
<key>NSUbiquitousContainers</key>
<dict>
<key>iCloud.app.organicmaps</key>
<dict>
<key>NSUbiquitousContainerIsDocumentScopePublic</key>
<true/>
<key>NSUbiquitousContainerSupportedFolderLevels</key>
<string>ANY</string>
<key>NSUbiquitousContainerName</key>
<string>OrganicMaps</string>
</dict>
<key>iCloud.app.organicmaps.debug</key>
<dict>
<key>NSUbiquitousContainerIsDocumentScopePublic</key>
<true/>
<key>NSUbiquitousContainerSupportedFolderLevels</key>
<string>ANY</string>
<key>NSUbiquitousContainerName</key>
<string>OrganicMapsDEBUG</string>
</dict>
</dict>
<key>NSSupportsLiveActivities</key>
<true/>
</dict>
</plist>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

View File

@@ -1,5 +1,5 @@
import XCTest import XCTest
@testable import Organic_Maps__Debug_ @testable import CoMaps__Debug_
final class RecentlyDeletedCategoriesViewModelTests: XCTestCase { final class RecentlyDeletedCategoriesViewModelTests: XCTestCase {
var viewModel: RecentlyDeletedCategoriesViewModel! var viewModel: RecentlyDeletedCategoriesViewModel!

View File

@@ -1,5 +1,5 @@
import XCTest import XCTest
@testable import Organic_Maps__Debug_ @testable import CoMaps__Debug_
final class CarPlayServiceTests: XCTestCase { final class CarPlayServiceTests: XCTestCase {

View File

@@ -1,5 +1,5 @@
import XCTest import XCTest
@testable import Organic_Maps__Debug_ @testable import CoMaps__Debug_
final class DefaultLocalDirectoryMonitorTests: XCTestCase { final class DefaultLocalDirectoryMonitorTests: XCTestCase {

View File

@@ -1,5 +1,5 @@
import XCTest import XCTest
@testable import Organic_Maps__Debug_ @testable import CoMaps__Debug_
class LocalDirectoryMonitorDelegateMock: LocalDirectoryMonitorDelegate { class LocalDirectoryMonitorDelegateMock: LocalDirectoryMonitorDelegate {
var contents = LocalContents() var contents = LocalContents()

View File

@@ -1,4 +1,4 @@
@testable import Organic_Maps__Debug_ @testable import CoMaps__Debug_
extension LocalMetadataItem { extension LocalMetadataItem {
static func stub(fileName: String, static func stub(fileName: String,

View File

@@ -1,5 +1,5 @@
import XCTest import XCTest
@testable import Organic_Maps__Debug_ @testable import CoMaps__Debug_
final class SynchronizationtateManagerTests: XCTestCase { final class SynchronizationtateManagerTests: XCTestCase {

View File

@@ -1,5 +1,5 @@
import XCTest import XCTest
@testable import Organic_Maps__Debug_ @testable import CoMaps__Debug_
class UbiquitousDirectoryMonitorDelegateMock: CloudDirectoryMonitorDelegate { class UbiquitousDirectoryMonitorDelegateMock: CloudDirectoryMonitorDelegate {
var didFinishGatheringCalled = false var didFinishGatheringCalled = false

View File

@@ -1,5 +1,5 @@
import XCTest import XCTest
@testable import Organic_Maps__Debug_ @testable import CoMaps__Debug_
typealias UbiquityIdentityToken = NSCoding & NSCopying & NSObjectProtocol typealias UbiquityIdentityToken = NSCoding & NSCopying & NSObjectProtocol
@@ -8,7 +8,7 @@ class iCloudDirectoryMonitorTests: XCTestCase {
var cloudMonitor: iCloudDocumentsMonitor! var cloudMonitor: iCloudDocumentsMonitor!
var mockFileManager: FileManagerMock! var mockFileManager: FileManagerMock!
var mockDelegate: UbiquitousDirectoryMonitorDelegateMock! var mockDelegate: UbiquitousDirectoryMonitorDelegateMock!
var cloudContainerIdentifier: String = "iCloud.app.organicmaps.debug" var cloudContainerIdentifier: String = "iCloud.app.comaps.debug"
override func setUp() { override func setUp() {
super.setUp() super.setUp()

View File

@@ -1,5 +1,5 @@
import XCTest import XCTest
@testable import Organic_Maps__Debug_ @testable import CoMaps__Debug_
final class SearchOnMapTests: XCTestCase { final class SearchOnMapTests: XCTestCase {

View File

@@ -49,7 +49,7 @@ extension BottomMenuInteractor: BottomMenuInteractorProtocol {
func donate() { func donate() {
close() close()
guard var url = Settings.donateUrl() else { return } 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/" url = L("translated_om_site_url") + "donate/"
} }
viewController?.openUrl(url, externally: true) viewController?.openUrl(url, externally: true)

View File

@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23727" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/> <device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23721"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<objects> <objects>
@@ -21,7 +20,7 @@
<constraints> <constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="21" id="q02-z4-K9S"/> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="21" id="q02-z4-K9S"/>
</constraints> </constraints>
<string key="text">Предложенные вами изменения на карте будут отправлены в OpenStreetMap. Если у вас есть дополнительные сведения об объекте, которые OMaps не может позволить отредактировать, напишите о них.</string> <string key="text">Предложенные вами изменения на карте будут отправлены в OpenStreetMap. Если у вас есть дополнительные сведения об объекте, которые CoMaps не может позволить отредактировать, напишите о них.</string>
<fontDescription key="fontDescription" type="system" pointSize="17"/> <fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
@@ -30,7 +29,7 @@
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_detailed_description"/> <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_detailed_description"/>
</userDefinedRuntimeAttributes> </userDefinedRuntimeAttributes>
</label> </label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="60F-c7-enR"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="60F-c7-enR">
<rect key="frame" x="16" y="151" width="288" height="16"/> <rect key="frame" x="16" y="151" width="288" height="16"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="16" id="lB5-ya-sBr"/> <constraint firstAttribute="height" constant="16" id="lB5-ya-sBr"/>

View File

@@ -277,7 +277,7 @@ private extension AboutController {
case .faq: case .faq:
self?.navigationController?.pushViewController(FaqController(), animated: true) self?.navigationController?.pushViewController(FaqController(), animated: true)
case .reportABug: case .reportABug:
MailComposer.sendBugReportWith(title:"Organic Maps Bug Report") MailComposer.sendBugReportWith(title:"CoMaps Bug Report")
case .reportMapDataProblem, .volunteer, .news: case .reportMapDataProblem, .volunteer, .news:
self?.openUrl(aboutInfo.link) self?.openUrl(aboutInfo.link)
case .rateTheApp: case .rateTheApp:
@@ -291,21 +291,21 @@ private extension AboutController {
} }
func buildSocialMediaCollectionViewData() -> [SocialMediaCollectionViewCellModel] { func buildSocialMediaCollectionViewData() -> [SocialMediaCollectionViewCellModel] {
let socialMediaContent: [SocialMedia] = [.telegram, .github, .instagram, .twitter, .linkedin, .organicMapsEmail, .reddit, .matrix, .facebook, .fosstodon] let socialMediaContent: [SocialMedia] = [.telegram, .codeberg, .instagram, .bluesky, .linkedin, .CoMapsEmail, .lemmy, .matrix, .facebook, .fosstodon]
let data = socialMediaContent.map { [weak self] socialMedia in let data = socialMediaContent.map { [weak self] socialMedia in
return SocialMediaCollectionViewCellModel(image: socialMedia.image, didTapHandler: { return SocialMediaCollectionViewCellModel(image: socialMedia.image, didTapHandler: {
switch socialMedia { switch socialMedia {
case .telegram: fallthrough case .telegram: fallthrough
case .github: fallthrough case .codeberg: fallthrough
case .reddit: fallthrough case .lemmy: fallthrough
case .matrix: fallthrough case .matrix: fallthrough
case .fosstodon: fallthrough case .fosstodon: fallthrough
case .facebook: fallthrough case .facebook: fallthrough
case .twitter: fallthrough case .bluesky: fallthrough
case .instagram: fallthrough case .instagram: fallthrough
case .linkedin: case .linkedin:
self?.openUrl(socialMedia.link, externally: true) self?.openUrl(socialMedia.link, externally: true)
case .organicMapsEmail: case .CoMapsEmail:
MailComposer.sendEmail(toRecipients: [socialMedia.link]) MailComposer.sendEmail(toRecipients: [socialMedia.link])
} }
}) })

View File

@@ -59,7 +59,7 @@ enum AboutInfo {
// These cases don't provide redirection to the web // These cases don't provide redirection to the web
return nil return nil
case .reportABug: case .reportABug:
return "ios@organicmaps.app" return "hello@comaps.app"
case .reportMapDataProblem: case .reportMapDataProblem:
return "https://www.openstreetmap.org/fixthemap" return "https://www.openstreetmap.org/fixthemap"
case .volunteer: case .volunteer:

View File

@@ -1,37 +1,37 @@
enum SocialMedia { enum SocialMedia {
case telegram case telegram
case twitter case bluesky
case instagram case instagram
case facebook case facebook
case reddit case lemmy
case matrix case matrix
case fosstodon case fosstodon
case linkedin case linkedin
case organicMapsEmail case CoMapsEmail
case github case codeberg
var link: String { var link: String {
switch self { switch self {
case .telegram: case .telegram:
return L("telegram_url") return L("telegram_url")
case .github: case .codeberg:
return "https://github.com/organicmaps/organicmaps/" return "https://codeberg.org/comaps/comaps/"
case .linkedin: case .linkedin:
return "https://www.linkedin.com/company/organic-maps/" return "https://www.linkedin.com/company/comaps-community/"
case .organicMapsEmail: case .CoMapsEmail:
return "ios@organicmaps.app" return "hello@comaps.app"
case .matrix: case .matrix:
return "https://matrix.to/#/#organicmaps:matrix.org" return "https://matrix.to/#/%23comaps:matrix.org"
case .fosstodon: case .fosstodon:
return "https://fosstodon.org/@organicmaps" return "https://floss.social/@CoMaps"
case .facebook: case .facebook:
return "https://facebook.com/OrganicMaps" return "https://www.facebook.com/CoMapsCommunity/"
case .twitter: case .bluesky:
return "https://twitter.com/OrganicMapsApp" return "https://bsky.app/profile/comaps.app"
case .instagram: case .instagram:
return L("instagram_url") return L("instagram_url")
case .reddit: case .lemmy:
return "https://www.reddit.com/r/organicmaps/" return "https://sopuli.xyz/c/CoMaps/"
} }
} }
@@ -39,11 +39,11 @@ enum SocialMedia {
switch self { switch self {
case .telegram: case .telegram:
return UIImage(named: "ic_social_media_telegram")! return UIImage(named: "ic_social_media_telegram")!
case .github: case .codeberg:
return UIImage(named: "ic_social_media_github")! return UIImage(named: "ic_social_media_codeberg")!
case .linkedin: case .linkedin:
return UIImage(named: "ic_social_media_linkedin")! return UIImage(named: "ic_social_media_linkedin")!
case .organicMapsEmail: case .CoMapsEmail:
return UIImage(named: "ic_social_media_mail")! return UIImage(named: "ic_social_media_mail")!
case .matrix: case .matrix:
return UIImage(named: "ic_social_media_matrix")! return UIImage(named: "ic_social_media_matrix")!
@@ -51,12 +51,12 @@ enum SocialMedia {
return UIImage(named: "ic_social_media_fosstodon")! return UIImage(named: "ic_social_media_fosstodon")!
case .facebook: case .facebook:
return UIImage(named: "ic_social_media_facebook")! return UIImage(named: "ic_social_media_facebook")!
case .twitter: case .bluesky:
return UIImage(named: "ic_social_media_x")! return UIImage(named: "ic_social_media_bluesky")!
case .instagram: case .instagram:
return UIImage(named: "ic_social_media_instagram")! return UIImage(named: "ic_social_media_instagram")!
case .reddit: case .lemmy:
return UIImage(named: "ic_social_media_reddit")! return UIImage(named: "ic_social_media_lemmy")!
} }
} }
} }

View File

@@ -23,7 +23,7 @@ final class MailComposer: NSObject {
func body() -> String { func body() -> String {
let appInfo = AppInfo.shared() let appInfo = AppInfo.shared()
return String(format: "\n\n\n\n- %@ (%@)\n- Organic Maps %@-%@\n- %@-%@\n- %@\n", return String(format: "\n\n\n\n- %@ (%@)\n- CoMaps %@-%@\n- %@-%@\n- %@\n",
appInfo.deviceModel, UIDevice.current.systemVersion, appInfo.deviceModel, UIDevice.current.systemVersion,
appInfo.bundleVersion, appInfo.buildNumber, appInfo.bundleVersion, appInfo.buildNumber,
Locale.current.languageCode ?? "", Locale.current.languageCode ?? "",
@@ -35,7 +35,7 @@ final class MailComposer: NSObject {
UIApplication.shared.hideLoadingOverlay { UIApplication.shared.hideLoadingOverlay {
sendEmailWith(subject: subject(), sendEmailWith(subject: subject(),
body: body(), body: body(),
toRecipients: [SocialMedia.organicMapsEmail.link], toRecipients: [SocialMedia.CoMapsEmail.link],
attachmentFileURL: logFileURL) attachmentFileURL: logFileURL)
} }
} }

View File

@@ -1038,7 +1038,7 @@ void KmlParser::Pop(std::string_view tag)
{ {
// This code assumes that <Style> is stored inside <Placemark>. // This code assumes that <Style> is stored inside <Placemark>.
// It is a violation of KML format, but it must be here to support // It is a violation of KML format, but it must be here to support
// loading of KML files which were stored by older versions of OMaps. // loading of KML files which were stored by older versions of CoMaps.
TrackLayer layer; TrackLayer layer;
layer.m_lineWidth = m_trackWidth; layer.m_lineWidth = m_trackWidth;
// Fix wrongly parsed transparent color, see https://github.com/organicmaps/organicmaps/issues/5800 // Fix wrongly parsed transparent color, see https://github.com/organicmaps/organicmaps/issues/5800

View File

@@ -9,7 +9,7 @@
namespace style namespace style
{ {
// Fixes icons which are not supported by Organic Maps. // Fixes icons which are not supported by CoMaps.
std::string GetSupportedStyle(std::string const & style); std::string GetSupportedStyle(std::string const & style);
} // style } // style

View File

@@ -12,7 +12,7 @@ public:
/*! /*!
* \warning The order of values below shall not be changed. * \warning The order of values below shall not be changed.
* \warning The values of Units shall be synchronized with values of Distance.Units enum in * \warning The values of Units shall be synchronized with values of Distance.Units enum in
* java (see app.organicmaps.util.Distance for details). * java (see app.comaps.util.Distance for details).
* \warning The values of Units shall be synchronized with values of unitLength func in * \warning The values of Units shall be synchronized with values of unitLength func in
* swift (see iphone/Maps/Classes/CarPlay/Templates Data/RouteInfo.swift for details). * swift (see iphone/Maps/Classes/CarPlay/Templates Data/RouteInfo.swift for details).
*/ */

View File

@@ -26,9 +26,9 @@
Platform::Platform() Platform::Platform()
{ {
// OMaps.app/Content/Resources or omim-build-debug for tests. // CoMaps.app/Content/Resources or omim-build-debug for tests.
std::string const resourcesPath = NSBundle.mainBundle.resourcePath.UTF8String; std::string const resourcesPath = NSBundle.mainBundle.resourcePath.UTF8String;
// Omaps.app or omim-build-debug for tests. // CoMaps.app or omim-build-debug for tests.
std::string const bundlePath = NSBundle.mainBundle.bundlePath.UTF8String; std::string const bundlePath = NSBundle.mainBundle.bundlePath.UTF8String;
// Current working directory, can be overrided for Xcode projects in the scheme's settings. // Current working directory, can be overrided for Xcode projects in the scheme's settings.
std::string const currentDir = [NSFileManager.defaultManager currentDirectoryPath].UTF8String; std::string const currentDir = [NSFileManager.defaultManager currentDirectoryPath].UTF8String;
@@ -109,9 +109,9 @@ Platform::Platform()
NSString * supportDir = [dirPaths objectAtIndex:0]; NSString * supportDir = [dirPaths objectAtIndex:0];
m_writableDir = supportDir.UTF8String; m_writableDir = supportDir.UTF8String;
#ifdef BUILD_DESIGNER #ifdef BUILD_DESIGNER
m_writableDir += "/OMapsData.Designer/"; m_writableDir += "/CoMapsData.Designer/";
#else // BUILD_DESIGNER #else // BUILD_DESIGNER
m_writableDir += "/OMapsData/"; m_writableDir += "/CoMapsData/";
#endif // BUILD_DESIGNER #endif // BUILD_DESIGNER
::mkdir(m_writableDir.c_str(), 0755); ::mkdir(m_writableDir.c_str(), 0755);
} }

View File

@@ -3,5 +3,5 @@
namespace storage namespace storage
{ {
std::string const kMapTestDir = "map-tests"; std::string const kMapTestDir = "map-tests";
std::string const kTestWebServer = "https://planet.organicmaps.app/"; std::string const kTestWebServer = "https://cdn.comaps.app";
} // namespace storage } // namespace storage

View File

@@ -772,7 +772,7 @@
"$(inherited)", "$(inherited)",
"OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT=1", "OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT=1",
); );
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.base_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.base_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Debug; name = Debug;
@@ -785,7 +785,7 @@
"$(inherited)", "$(inherited)",
"OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT=1", "OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT=1",
); );
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.base_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.base_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Release; name = Release;

View File

@@ -785,7 +785,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.coding_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.coding_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Debug; name = Debug;
@@ -794,7 +794,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.coding_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.coding_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Release; name = Release;

View File

@@ -546,12 +546,12 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.editor_tests;
PRODUCT_NAME = "$(TARGET_NAME)";
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(OMIM_ROOT)/3party/pugixml/pugixml/src", "$(OMIM_ROOT)/3party/pugixml/pugixml/src",
); );
PRODUCT_BUNDLE_IDENTIFIER = app.comaps.editor_tests;
PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Debug; name = Debug;
}; };
@@ -559,12 +559,12 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.editor_tests;
PRODUCT_NAME = "$(TARGET_NAME)";
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(OMIM_ROOT)/3party/pugixml/pugixml/src", "$(OMIM_ROOT)/3party/pugixml/pugixml/src",
); );
PRODUCT_BUNDLE_IDENTIFIER = app.comaps.editor_tests;
PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Release; name = Release;
}; };

View File

@@ -244,7 +244,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = apps.organicmaps.ge0_tests; PRODUCT_BUNDLE_IDENTIFIER = apps.comaps.ge0_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Debug; name = Debug;
@@ -253,7 +253,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = apps.organicmaps.ge0_tests; PRODUCT_BUNDLE_IDENTIFIER = apps.comaps.ge0_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Release; name = Release;

View File

@@ -638,7 +638,7 @@
"$(inherited)", "$(inherited)",
"OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT=1", "OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT=1",
); );
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.geometry_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.geometry_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Debug; name = Debug;
@@ -651,7 +651,7 @@
"$(inherited)", "$(inherited)",
"OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT=1", "OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT=1",
); );
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.geometry_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.geometry_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Release; name = Release;

View File

@@ -1059,7 +1059,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.indexer_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.indexer_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Debug; name = Debug;
@@ -1068,7 +1068,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.indexer_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.indexer_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Release; name = Release;

View File

@@ -749,7 +749,7 @@
"$(inherited)", "$(inherited)",
"OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1",
); );
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.map_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.map_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Debug; name = Debug;
@@ -762,7 +762,7 @@
"$(inherited)", "$(inherited)",
"OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1",
); );
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.map_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.map_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Release; name = Release;

View File

@@ -920,7 +920,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.platform_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.platform_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Debug; name = Debug;
@@ -929,7 +929,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.platform_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.platform_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Release; name = Release;

View File

@@ -1321,7 +1321,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.routing_benchmarks; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.routing_benchmarks;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Debug; name = Debug;
@@ -1330,7 +1330,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.routing_benchmarks; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.routing_benchmarks;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Release; name = Release;
@@ -1339,7 +1339,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.routing_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.routing_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Debug; name = Debug;
@@ -1348,7 +1348,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.routing_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.routing_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Release; name = Release;
@@ -1387,7 +1387,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.routing_integration_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.routing_integration_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Debug; name = Debug;
@@ -1396,7 +1396,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.routing_integration_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.routing_integration_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Release; name = Release;

View File

@@ -288,7 +288,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.routing_common_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.routing_common_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Debug; name = Debug;
@@ -297,7 +297,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.routing_common_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.routing_common_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Release; name = Release;

View File

@@ -1293,7 +1293,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.search_integration_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.search_integration_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Debug; name = Debug;
@@ -1302,7 +1302,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.search_integration_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.search_integration_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Release; name = Release;
@@ -1311,7 +1311,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.search_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.search_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Debug; name = Debug;
@@ -1320,7 +1320,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.search_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.search_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Release; name = Release;

View File

@@ -713,7 +713,7 @@
"$(inherited)", "$(inherited)",
"OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1",
); );
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.storage_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.storage_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Debug; name = Debug;
@@ -726,7 +726,7 @@
"$(inherited)", "$(inherited)",
"OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1",
); );
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.storage_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.storage_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Release; name = Release;
@@ -739,7 +739,7 @@
"$(inherited)", "$(inherited)",
"OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1",
); );
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.storage_integration_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.storage_integration_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Debug; name = Debug;
@@ -752,7 +752,7 @@
"$(inherited)", "$(inherited)",
"OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1",
); );
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.storage_integration_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.storage_integration_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Release; name = Release;

View File

@@ -343,7 +343,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.tracking_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.tracking_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Debug; name = Debug;
@@ -352,7 +352,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.tracking_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.tracking_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Release; name = Release;

View File

@@ -315,7 +315,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.traffic_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.traffic_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Debug; name = Debug;
@@ -324,7 +324,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "-"; CODE_SIGN_IDENTITY = "-";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.traffic_tests; PRODUCT_BUNDLE_IDENTIFIER = app.comaps.traffic_tests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Release; name = Release;