kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-05 18:50:09 +02:00
Code Activity

Merge branch 'xmlicons' into 'master'

Browse Source 
have fallback for XML icons also consider res/mipmap*

See merge request !307
This commit is contained in:
Hans-Christoph Steiner 2017-07-17 06:33:02 +00:00
commit be8e7830e1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fdroidserver/update.py
View File

@ -1391,9 +1391,12 @@ def extract_apk_icons(icon_filename, apk, apkzip, repo_dir):
png = os.path.basename(icon_src)[:-4] + '.png'
for f in apkzip.namelist():
if f.endswith(png):
m = re.match(r'res/drawable-(x*[hlm]dpi).*/', f)
if m and screen_resolutions[m.group(1)] == density:
m = re.match(r'res/(drawable|mipmap)-(x*[hlm]dpi).*/', f)
if m and screen_resolutions[m.group(2)] == density:
icon_src = f
if icon_src.endswith('.xml'):
empty_densities.append(density)
continue
try:
with open(icon_dest, 'wb') as f:
f.write(get_icon_bytes(apkzip, icon_src))