Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
l---------android/flavors/mwm-ttf-assets/07_roboto_medium.ttf1
-rw-r--r--android/script/replace_links.bat1
-rw-r--r--data/00_roboto_regular.ttfbin0 -> 158604 bytes
-rw-r--r--data/07_roboto_medium.ttf (renamed from data/00_roboto_medium.ttf)bin162588 -> 162588 bytes
-rw-r--r--data/external_resources.txt1
-rw-r--r--data/fonts_whitelist.txt10
-rw-r--r--platform/platform.cpp4
-rw-r--r--platform/platform_unix_impl.cpp1
-rw-r--r--qt/qt.pro6
-rw-r--r--xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj8
10 files changed, 17 insertions, 15 deletions
diff --git a/android/flavors/mwm-ttf-assets/07_roboto_medium.ttf b/android/flavors/mwm-ttf-assets/07_roboto_medium.ttf
new file mode 120000
index 0000000000..b7e9ac4a1d
--- /dev/null
+++ b/android/flavors/mwm-ttf-assets/07_roboto_medium.ttf
@@ -0,0 +1 @@
+../../../data/07_roboto_medium.ttf \ No newline at end of file
diff --git a/android/script/replace_links.bat b/android/script/replace_links.bat
index 430c44ea95..b475cf2835 100644
--- a/android/script/replace_links.bat
+++ b/android/script/replace_links.bat
@@ -44,6 +44,7 @@ cp ../data/03_jomolhari-id-a3d.ttf flavors/mwm-ttf-assets/
cp ../data/04_padauk.ttf flavors/mwm-ttf-assets/
cp ../data/05_khmeros.ttf flavors/mwm-ttf-assets/
cp ../data/06_code2000.ttf flavors/mwm-ttf-assets/
+cp ../data/07_roboto_medium.ttf flavors/mwm-ttf-assets/
cp ../data/World.mwm flavors/mwm-ttf-assets/
cp ../data/WorldCoasts.mwm flavors/mwm-ttf-assets/
diff --git a/data/00_roboto_regular.ttf b/data/00_roboto_regular.ttf
new file mode 100644
index 0000000000..7d9a6c4c32
--- /dev/null
+++ b/data/00_roboto_regular.ttf
Binary files differ
diff --git a/data/00_roboto_medium.ttf b/data/07_roboto_medium.ttf
index 39c63d7461..39c63d7461 100644
--- a/data/00_roboto_medium.ttf
+++ b/data/07_roboto_medium.ttf
Binary files differ
diff --git a/data/external_resources.txt b/data/external_resources.txt
index 1c88b35eb9..0349721d46 100644
--- a/data/external_resources.txt
+++ b/data/external_resources.txt
@@ -6,3 +6,4 @@ World.mwm 28413569
04_padauk.ttf 248076
05_khmeros.ttf 265552
06_code2000.ttf 3155104
+07_roboto_medium.ttf 162588
diff --git a/data/fonts_whitelist.txt b/data/fonts_whitelist.txt
index 06dd08e887..f09a4813e2 100644
--- a/data/fonts_whitelist.txt
+++ b/data/fonts_whitelist.txt
@@ -1,17 +1,17 @@
Basic_Latin /usr/share/fonts/truetype/roboto/Roboto-Medium.ttf
Basic_Latin /system/fonts/Roboto-Medium.ttf
-Basic_Latin 00_roboto_medium.ttf
+Basic_Latin 07_roboto_medium.ttf
Latin-1_Supplement /usr/share/fonts/truetype/roboto/Roboto-Medium.ttf
Latin-1_Supplement /system/fonts/Roboto-Medium.ttf
-Latin-1_Supplement 00_roboto_medium.ttf
+Latin-1_Supplement 07_roboto_medium.ttf
Cyrillic /usr/share/fonts/truetype/roboto/Roboto-Medium.ttf
Cyrillic /system/fonts/Roboto-Medium.ttf
-Cyrillic 00_roboto_medium.ttf
+Cyrillic 07_roboto_medium.ttf
Latin_Extended-A /usr/share/fonts/truetype/roboto/Roboto-Medium.ttf
Latin_Extended-A /system/fonts/Roboto-Medium.ttf
-Latin_Extended-A 00_roboto_medium.ttf
+Latin_Extended-A 07_roboto_medium.ttf
Latin_Extended-B /usr/share/fonts/truetype/roboto/Roboto-Medium.ttf
Latin_Extended-B 01_dejavusans.ttf
Latin_Extended-B /system/fonts/Roboto-Medium.ttf
-Latin_Extended-B 00_roboto_medium.ttf
+Latin_Extended-B 07_roboto_medium.ttf
CJK_Compatibility 02_droidsans-fallback.ttf
diff --git a/platform/platform.cpp b/platform/platform.cpp
index 76f8537bd5..5eeb043ff3 100644
--- a/platform/platform.cpp
+++ b/platform/platform.cpp
@@ -93,15 +93,13 @@ void Platform::GetFontNames(FilesList & res) const
/// @todo Actually, this list should present once in all our code.
/// We can take it from data/external_resources.txt
char const * arrDef[] = {
-#ifndef OMIM_OS_ANDROID
- "00_roboto_medium.ttf",
-#endif
"01_dejavusans.ttf",
"02_droidsans-fallback.ttf",
"03_jomolhari-id-a3d.ttf",
"04_padauk.ttf",
"05_khmeros.ttf",
"06_code2000.ttf",
+ "07_roboto_medium.ttf"
};
res.insert(res.end(), arrDef, arrDef + ARRAY_SIZE(arrDef));
diff --git a/platform/platform_unix_impl.cpp b/platform/platform_unix_impl.cpp
index 25644674fa..e7236d2280 100644
--- a/platform/platform_unix_impl.cpp
+++ b/platform/platform_unix_impl.cpp
@@ -40,6 +40,7 @@ void Platform::GetSystemFontNames(FilesList & res) const
#else
char const * fontsWhitelist[] = {
"Roboto-Medium.ttf",
+ "Roboto-Regular.ttf",
"DroidSansFallback.ttf",
"DroidSansFallbackFull.ttf",
"DroidSans.ttf",
diff --git a/qt/qt.pro b/qt/qt.pro
index 88b7c2367e..c1ee0d8a89 100644
--- a/qt/qt.pro
+++ b/qt/qt.pro
@@ -72,13 +72,13 @@ XHDPI_SKIN_RES.path = $$DATADIR/resources-xhdpi
XHDPI_SKIN_RES.files = ../data/resources-xhdpi/symbols.sdf ../data/resources-xhdpi/symbols.png
FONT_RES.path = $$FONTSDIR
-FONT_RES.files = ../data/00_roboto_medium.ttf \
- ../data/01_dejavusans.ttf \
+FONT_RES.files = ../data/01_dejavusans.ttf \
../data/02_droidsans-fallback.ttf \
../data/03_jomolhari-id-a3d.ttf \
../data/04_padauk.ttf \
../data/05_khmeros.ttf \
- ../data/06_code2000.ttf
+ ../data/06_code2000.ttf \
+ ../data/07_roboto_medium.ttf
OTHER_RES.files += ../data/fonts_blacklist.txt \
../data/fonts_whitelist.txt \
diff --git a/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj b/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj
index 269e99bd09..7f7f8a209e 100644
--- a/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj
+++ b/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj
@@ -98,7 +98,7 @@
67534C421A4097D000A0A8C3 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67534C411A4097D000A0A8C3 /* OpenGL.framework */; };
67534D271A40AA4300A0A8C3 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67534D261A40AA4300A0A8C3 /* CoreLocation.framework */; };
677A2DEB1C0DDDBE00635A00 /* resources-default in Resources */ = {isa = PBXBuildFile; fileRef = 677A2DE71C0DDD7C00635A00 /* resources-default */; };
- 67A461A71C2172C400B18739 /* 00_roboto_medium.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 67A461A61C2172C400B18739 /* 00_roboto_medium.ttf */; };
+ 67A461A71C2172C400B18739 /* 07_roboto_medium.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 67A461A61C2172C400B18739 /* 07_roboto_medium.ttf */; };
67E8DC931BBC1D3F0053C5BA /* libagg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67E8DC911BBC1D3F0053C5BA /* libagg.a */; };
67E8DC941BBC1D3F0053C5BA /* liblodepng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67E8DC921BBC1D3F0053C5BA /* liblodepng.a */; };
9D4AD1DD1B7388CD00EBDD27 /* 02_droidsans-fallback.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9DF792621B73884F00AF2D19 /* 02_droidsans-fallback.ttf */; };
@@ -136,7 +136,7 @@
dstPath = "";
dstSubfolderSpec = 7;
files = (
- 67A461A71C2172C400B18739 /* 00_roboto_medium.ttf in CopyFiles */,
+ 67A461A71C2172C400B18739 /* 07_roboto_medium.ttf in CopyFiles */,
6714E5E41BD13F67008AB603 /* drules_proto_clear.bin in CopyFiles */,
6714E5E51BD13F67008AB603 /* drules_proto_clear.txt in CopyFiles */,
6714E5E61BD13F67008AB603 /* drules_proto_dark.bin in CopyFiles */,
@@ -275,7 +275,7 @@
67534C411A4097D000A0A8C3 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
67534D261A40AA4300A0A8C3 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
677A2DE71C0DDD7C00635A00 /* resources-default */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-default"; sourceTree = "<group>"; };
- 67A461A61C2172C400B18739 /* 00_roboto_medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = 00_roboto_medium.ttf; sourceTree = "<group>"; };
+ 67A461A61C2172C400B18739 /* 07_roboto_medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = 07_roboto_medium.ttf; sourceTree = "<group>"; };
67E8DC911BBC1D3F0053C5BA /* libagg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libagg.a; path = "/Volumes/AltHD/mapsme/omim/xcode/agg/../../../omim-xcode-build/Debug/libagg.a"; sourceTree = "<absolute>"; };
67E8DC921BBC1D3F0053C5BA /* liblodepng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblodepng.a; path = "/Volumes/AltHD/mapsme/omim/xcode/lodepng/../../../omim-xcode-build/Debug/liblodepng.a"; sourceTree = "<absolute>"; };
9DF792621B73884F00AF2D19 /* 02_droidsans-fallback.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "02_droidsans-fallback.ttf"; sourceTree = "<group>"; };
@@ -398,13 +398,13 @@
6729A66C1A695C70007D5872 /* welcome.html */,
6729A5E61A69321A007D5872 /* World.mwm */,
6729A5E71A69321A007D5872 /* WorldCoasts.mwm */,
- 67A461A61C2172C400B18739 /* 00_roboto_medium.ttf */,
6729A5D91A6931CD007D5872 /* 01_dejavusans.ttf */,
9DF792621B73884F00AF2D19 /* 02_droidsans-fallback.ttf */,
6729A5DB1A6931CD007D5872 /* 03_jomolhari-id-a3d.ttf */,
6729A5DC1A6931CE007D5872 /* 04_padauk.ttf */,
6729A5DD1A6931CE007D5872 /* 05_khmeros.ttf */,
6729A5DE1A6931CE007D5872 /* 06_code2000.ttf */,
+ 67A461A61C2172C400B18739 /* 07_roboto_medium.ttf */,
6729A5D41A69319F007D5872 /* fonts_blacklist.txt */,
6729A5D51A69319F007D5872 /* fonts_whitelist.txt */,
6729A5D21A69316A007D5872 /* unicode_blocks.txt */,
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-06 22:51:49 +0300