Add icon-bg and icon-fg to fix_args #2633
Conversation
Fix the icon-bg and icon-fg arguments and also create the folder mipmap-anydpi-v26 if it doesn't exists before trying to create a file inside.
| mipmap_anydpi = join(res_dir, 'mipmap-anydpi-v26') | ||
| if not exists(mipmap_anydpi): | ||
| os.mkdir(mipmap_anydpi) | ||
| with open(join(mipmap_anydpi, 'icon.xml'), "w") as fd: |
There was a problem hiding this comment.
There is already defined function for checking path existence
anydpi_dir = join(res_dir, 'mipmap-anydpi-v26')
ensure_dir(anydpi_dir)
with open(join(anydpi_dir, 'icon.xml'), "w") as fd:
There was a problem hiding this comment.
@danigm would you like to update the PR to use the ensure_dir utility function?
There was a problem hiding this comment.
I've added a new commit to use ensure_dir.
|
Also noticed that issue |
| @@ -349,7 +349,10 @@ def make_package(args): | |||
| if args.icon_fg and args.icon_bg: | |||
| shutil.copy(args.icon_fg, join(res_dir, 'mipmap/icon_foreground.png')) | |||
| shutil.copy(args.icon_bg, join(res_dir, 'mipmap/icon_background.png')) | |||
| with open(join(res_dir, 'mipmap-anydpi-v26/icon.xml'), "w") as fd: | |||
| mipmap_anydpi = join(res_dir, 'mipmap-anydpi-v26') | |||
There was a problem hiding this comment.
I agree with @interlark, anydpi_dir is a better name for this variable.
| mipmap_anydpi = join(res_dir, 'mipmap-anydpi-v26') | |
| anydpi_dir = join(res_dir, 'mipmap-anydpi-v26') |
There was a problem hiding this comment.
In the new commit I've used the anydpi_dir variable name.
| with open(join(res_dir, 'mipmap-anydpi-v26/icon.xml'), "w") as fd: | ||
| anydpi_dir = join(res_dir, 'mipmap-anydpi-v26') | ||
| ensure_dir(anydpi_dir) |
There was a problem hiding this comment.
mipmap-anydpi-v26 is already present inside our template, and should be copied.
Can you better explain why that change is needed? Isn't the template working for your use-case?
There was a problem hiding this comment.
Hi @misl6. When you specify --icon-fg and --icon-bg for --bootstrap=webview you end up with error FileNotFoundError: [Errno 2] No such file or directory: 'src/main/res/mipmap-anydpi-v26/icon.xml'
Manually creating mipmap-anydpi-v26 dir in build.py fixes this error. Could you, please, point where this dir is supposed to be created/copied?
There was a problem hiding this comment.
Exactly. This is explained in the commit message. I guess this is one of those things that work from Buildozer but not if python-for-android is used directly.
There was a problem hiding this comment.
prepare_build_dir copies the content from the templates (which are placed here: bootstraps)
for --bootstrap=webview
Ouch, that makes sense.
The mipmap-anydpi-v26 folder seems to only be available in sdl2 boostrap: https://github.com/kivy/python-for-android/tree/develop/pythonforandroid/bootstraps/sdl2/build/src/main/res, but not in the webview one: https://github.com/kivy/python-for-android/tree/develop/pythonforandroid/bootstraps/webview/build/src/main/res
The logic should be cleaned up and unified, in order to avoid this kind of issues in future 🧐
Meanwhile (unless you would like to clean up and unify the logic), would be nice to add the missing folders to webview, in order to avoid extra checks in code.
There was a problem hiding this comment.
I've added the folder to the bootstrap template and removed the check code in the last commit.
This makes available the directory in the final template so it's not needed to check the directory exists.
* Add option for copying arbitratry xml files to src/main/res/xml without touching manifest * handle the case of getting list as res_xml * Remove stray - in output file name The final component in the package name is just the extension, so prefixing it with a - means the output file ends in -.<ext>. * Resolve absolute path to local recipes (#2640) This is necessary when using patches in a local recipe since `Recipe.apply_patch` assumes the recipe directory is absolute and uses `patch -d` to change directories. It could just be fixed there, but this ensures that recipe directories are always absolute. Closes: #2623 * Fix webview Back button behaviour (#2636) * Fixes TypeError: str.join() takes exactly one argument (2 given) in hostpython3/__init__.py", line 69 (#2642) * Update __init__.py .buildozer/android/platform/python-for-android/pythonforandroid/recipes/hostpython3/__init__.py", line 69, in get_recipe_env env["PKG_CONFIG_PATH"] = os.pathsep.join( TypeError: str.join() takes exactly one argument (2 given) * according of #2642 (review) * RTSP support for ffmpeg Added UDP and TCP protocols to "--enable-procol" to supporting RTSP streams over each. Added RTSP to "--enable-demuxer" to supporting RTSP with ffmpeg. * Fixes some E275 - assert is a keyword. (#2647) * Add icon-bg and icon-fg to fix_args + adds a missing folder in webview dir template (#2633) * Add icon-bg and icon-fg to fix_args Fix the icon-bg and icon-fg arguments and also create the folder mipmap-anydpi-v26 if it doesn't exists before trying to create a file inside. * Use existing ensure_dir function to create anydpi_dir * Add mipmap-anydpi-v26 to bootstrap template This makes available the directory in the final template so it's not needed to check the directory exists. * Updates matplotlib, fixes an issue related to shared libc++ (#2645) * Updates matplotlib, fixes an issue related to shared libc++ * Cleanup * Update supported Python versions (#2656) * Remove six and enum34 dependency (#2657) * Force --platform=linux/amd64 in Dockerfile (#2660) * Use p4a_install instead of install, as a file named INSTALL is already present. (#2663) * Update CHANGELOG.md & change version for release 2022.09.04 Co-authored-by: Eero af Heurlin <[email protected]> Co-authored-by: Dan Nicholson <[email protected]> Co-authored-by: Andre Miras <[email protected]> Co-authored-by: Andy Trofimov <[email protected]> Co-authored-by: Akshay Arora <[email protected]> Co-authored-by: --=FurtiF™=-- <[email protected]> Co-authored-by: alickc <[email protected]> Co-authored-by: danigm <[email protected]>
…w dir template (kivy#2633) * Add icon-bg and icon-fg to fix_args Fix the icon-bg and icon-fg arguments and also create the folder mipmap-anydpi-v26 if it doesn't exists before trying to create a file inside. * Use existing ensure_dir function to create anydpi_dir * Add mipmap-anydpi-v26 to bootstrap template This makes available the directory in the final template so it's not needed to check the directory exists.
Fix the icon-bg and icon-fg arguments and also create the folder
mipmap-anydpi-v26 if it doesn't exists before trying to create a file
inside.