kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] Fixed fonts getting routine. Made it simple and fast.

Browse source
This commit is contained in:
vng 2014-11-11 17:53:37 +03:00 • committed by Alex Zolotarev
parent a41ef3827c
commit 098f95ab82
3 changed files with 20 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
map/framework.cpp
View file

@ -173,7 +173,7 @@ void Framework::GetMaps(vector<string> & maps) const
pl.GetFilesByExt(pl.ResourcesDir(), DATA_FILE_EXTENSION, maps);
pl.GetFilesByExt(pl.WritableDir(), DATA_FILE_EXTENSION, maps);
// Remove duplicate maps if they're both present in resources and in WritableDir.
// Remove duplicate maps if they're both present in Resources and in Writable dirs.
sort(maps.begin(), maps.end());
maps.erase(unique(maps.begin(), maps.end()), maps.end());

37
platform/platform.cpp
View file

@ -65,30 +65,23 @@ string Platform::DefaultUrlsJSON() const
void Platform::GetFontNames(FilesList & res) const
{
ASSERT(res.empty(), ());
/// @todo Actually, this list should present once in all our code.
/// We can take it from data/external_resources.txt
char const * arrDef[] = {
"00_roboto_regular.ttf",
"01_dejavusans.ttf",
"02_wqy-microhei.ttf",
"03_jomolhari-id-a3d.ttf",
"04_padauk.ttf",
"05_khmeros.ttf",
"06_code2000.ttf",
};
res.insert(res.end(), arrDef, arrDef + ARRAY_SIZE(arrDef));
GetSystemFontNames(res);
size_t n = 0;
string const * arrPaths[4];
arrPaths[n++] = &m_writableDir;
#ifdef OMIM_OS_ANDROID
for (size_t i = 0; i < m_extResFiles.size(); ++i)
arrPaths[n++] = &m_extResFiles[i];
#else
arrPaths[n++] = &m_resourcesDir;
#endif
FilesList fonts;
for (size_t i = 0; i < n; ++i)
{
LOG(LDEBUG, ("Searching for fonts in", *(arrPaths[i])));
GetFilesByExt(*(arrPaths[i]), FONT_FILE_EXTENSION, fonts);
}
sort(fonts.begin(), fonts.end());
fonts.erase(unique(fonts.begin(), fonts.end()), fonts.end());
res.insert(res.end(), fonts.begin(), fonts.end());
LOG(LINFO, ("Available font files:", (res)));
}

13
platform/platform_unix_impl.cpp
View file

@ -50,17 +50,11 @@ void Platform::GetSystemFontNames(FilesList & res) const
"DejaVuSans.ttf",
"arial.ttf",
"AbyssinicaSIL-R.ttf",
"00_roboto_regular.ttf",
"01_dejavusans.ttf",
"02_wqy-microhei.ttf",
"03_jomolhari-id-a3d.ttf",
"04_padauk.ttf",
"05_khmeros.ttf",
"06_code2000.ttf"
};
char const * systemFontsPath[] = {
"/system/fonts/",
#ifdef OMIM_OS_LINUX
"/usr/share/fonts/truetype/roboto/",
"/usr/share/fonts/truetype/droid/",
"/usr/share/fonts/truetype/ttf-dejavu/",
@ -72,9 +66,10 @@ void Platform::GetSystemFontNames(FilesList & res) const
"/usr/share/fonts/truetype/tlwg/",
"/usr/share/fonts/truetype/abyssinica/",
"/usr/share/fonts/truetype/paktype/",
"/usr/share/fonts/truetype/mapswithme/"
"/usr/share/fonts/truetype/mapswithme/",
#endif
};
const uint64_t fontSizeBlacklist[] = {
183560, // Samsung Duos DroidSans
7140172, // Serif font without Emoji