Provider generics interface to handle non-png icons #32
+588
−54
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jmatsu
force-pushed
the
jmatsu/correct_xml_icon_handling
branch
from
161d70f
to
e168af5
Compare
jmatsu
commented
Oct 20, 2022
| @@ -168,3 +168,6 @@ Style/TrailingCommaInArrayLiteral: | |||
|
|
|||
| Style/TrailingCommaInHashLiteral: | |||
| Enabled: false | |||
|
|
|||
| Style/AccessModifierDeclarations: | |||
There was a problem hiding this comment.
jmatsu
commented
Oct 20, 2022
| end | ||
|
|
||
| # Check whether or not this apk's icon is an adaptive icon | ||
| # @return [Boolean] Return true if this apk has an *correct* adaptive icon, otherwise false. |
There was a problem hiding this comment.
*correct* means Technically correct.
jmatsu
commented
Oct 20, 2022
| # invalid xml file may throw an error | ||
| Zip::File.open(filepath) do |zip_file| | ||
| apk.adaptive_icon = zip_file.find_entry(adaptive_icon_path)&.get_input_stream do |entry| | ||
| !!entry.read.include?("adaptive-icon") |
There was a problem hiding this comment.
this logic worked even if the xml is decoded but the result included false-positives. That's why I delegate the content look-up to aapt dump xmltree.
jmatsu
commented
Oct 20, 2022
| @@ -16,7 +16,6 @@ Gem::Specification.new do |spec| | |||
| spec.required_ruby_version = ">= 2.6.0" | |||
|
|
|||
| spec.files = `git ls-files | grep -v 'spec/fixture'`.split($/) | |||
| spec.test_files = spec.files.grep(%r{^(test|spec)/}) | |||
There was a problem hiding this comment.
jmatsu
commented
Oct 20, 2022
| self.verified = false | ||
| self.test_only = false | ||
| end | ||
|
|
||
| # @return [Array<AndroidApk::AppIcon>] | ||
| def app_icons |
There was a problem hiding this comment.
We will check this array from 0 to last to look up icons.
jmatsu
commented
Oct 20, 2022
| content&.split(/\n/) do |line| | ||
| line.strip! | ||
|
|
||
| if line.start_with?("E: ") |
There was a problem hiding this comment.
The first E: -prefixed line indicates the root element of the XML.
jmatsu
commented
Oct 20, 2022
| @root_element = nil | ||
|
|
||
| line_num = 1 | ||
| content&.split(/\n/) do |line| |
There was a problem hiding this comment.
tip: split with block requires Ruby 2.6
|
Thank you so much~~~! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Waiting for
Breaking changes
backward_compatible_adaptive_icon?now returns true whenever it's configured properly.icon,adaptive_icon,backward_compatible_adaptive_icon`New itnerface