diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..52e43ab --- /dev/null +++ b/.editorconfig @@ -0,0 +1,98 @@ +root = true + +[*] +# charset = utf-8 +# end_of_line = lf +# indent_size = 4 +# indent_style = space +insert_final_newline = true +# max_line_length = 100 +# tab_width = 4 +ij_continuation_indent_size=8 +# ij_formatter_off_tag = @formatter:off +# ij_formatter_on_tag = @formatter:on +# ij_formatter_tags_enabled = false +# ij_smart_tabs = false +# ij_wrap_on_typing = false + +[*.xml] +ij_continuation_indent_size=4 + +[{*.kt,*.kts}] +max_line_length=140 +disabled_rules=no-wildcard-imports,import-ordering +ij_continuation_indent_size=4 +ij_kotlin_align_in_columns_case_branch = false +ij_kotlin_align_multiline_binary_operation = false +ij_kotlin_align_multiline_extends_list = false +ij_kotlin_align_multiline_method_parentheses = false +ij_kotlin_align_multiline_parameters = false +ij_kotlin_align_multiline_parameters_in_calls = false +ij_kotlin_assignment_wrap = off +ij_kotlin_blank_lines_after_class_header = 0 +ij_kotlin_blank_lines_around_block_when_branches = 0 +ij_kotlin_block_comment_at_first_column = true +ij_kotlin_call_parameters_new_line_after_left_paren = false +ij_kotlin_call_parameters_right_paren_on_new_line = false +ij_kotlin_call_parameters_wrap = off +ij_kotlin_catch_on_new_line = false +ij_kotlin_class_annotation_wrap = split_into_lines +ij_kotlin_continuation_indent_for_chained_calls = true +ij_kotlin_continuation_indent_for_expression_bodies = true +ij_kotlin_continuation_indent_in_argument_lists = true +ij_kotlin_continuation_indent_in_elvis = true +ij_kotlin_continuation_indent_in_if_conditions = true +ij_kotlin_continuation_indent_in_parameter_lists = true +ij_kotlin_continuation_indent_in_supertype_lists = true +ij_kotlin_else_on_new_line = false +ij_kotlin_enum_constants_wrap = off +ij_kotlin_extends_list_wrap = off +ij_kotlin_field_annotation_wrap = off +ij_kotlin_finally_on_new_line = false +ij_kotlin_if_rparen_on_new_line = false +ij_kotlin_import_nested_classes = false +ij_kotlin_insert_whitespaces_in_simple_one_line_method = true +ij_kotlin_keep_blank_lines_before_right_brace = 2 +ij_kotlin_keep_blank_lines_in_code = 2 +ij_kotlin_keep_blank_lines_in_declarations = 2 +ij_kotlin_keep_first_column_comment = true +ij_kotlin_keep_indents_on_empty_lines = false +ij_kotlin_keep_line_breaks = true +ij_kotlin_lbrace_on_next_line = false +ij_kotlin_line_comment_add_space = false +ij_kotlin_line_comment_at_first_column = true +ij_kotlin_method_annotation_wrap = off +ij_kotlin_method_call_chain_wrap = off +ij_kotlin_method_parameters_new_line_after_left_paren = false +ij_kotlin_method_parameters_right_paren_on_new_line = false +ij_kotlin_method_parameters_wrap = off +ij_kotlin_name_count_to_use_star_import = 5 +ij_kotlin_name_count_to_use_star_import_for_members = 3 +ij_kotlin_parameter_annotation_wrap = off +ij_kotlin_space_after_comma = true +ij_kotlin_space_after_extend_colon = true +ij_kotlin_space_after_type_colon = true +ij_kotlin_space_before_catch_parentheses = true +ij_kotlin_space_before_comma = false +ij_kotlin_space_before_extend_colon = true +ij_kotlin_space_before_for_parentheses = true +ij_kotlin_space_before_if_parentheses = true +ij_kotlin_space_before_lambda_arrow = true +ij_kotlin_space_before_type_colon = false +ij_kotlin_space_before_when_parentheses = true +ij_kotlin_space_before_while_parentheses = true +ij_kotlin_spaces_around_additive_operators = true +ij_kotlin_spaces_around_assignment_operators = true +ij_kotlin_spaces_around_equality_operators = true +ij_kotlin_spaces_around_function_type_arrow = true +ij_kotlin_spaces_around_logical_operators = true +ij_kotlin_spaces_around_multiplicative_operators = true +ij_kotlin_spaces_around_range = false +ij_kotlin_spaces_around_relational_operators = true +ij_kotlin_spaces_around_unary_operator = false +ij_kotlin_spaces_around_when_arrow = true +ij_kotlin_variable_annotation_wrap = off +ij_kotlin_while_on_new_line = false +ij_kotlin_wrap_elvis_expressions = 1 +ij_kotlin_wrap_expression_body_functions = 0 +ij_kotlin_wrap_first_method_in_call_chain = false diff --git a/.gitignore b/.gitignore index 7d30069..4b53fed 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,11 @@ -build/ -.idea/ -.gradle/ *.iml +.gradle +/local.properties +.idea/* +.DS_Store +/build +/buildSrc/build +/captures +.externalNativeBuild +.cxx local.properties -.signing/ diff --git a/build.gradle b/build.gradle index 1ea7a53..54e0e84 100644 --- a/build.gradle +++ b/build.gradle @@ -2,33 +2,30 @@ buildscript { repositories { google() - jcenter() maven { url "https://plugins.gradle.org/m2/" } } dependencies { - classpath 'com.android.tools.build:gradle:4.0.2' - - // Code checks - classpath 'com.noveogroup.android:check:1.2.2' - - // used to generate a POM file - classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } allprojects { repositories { google() - jcenter() + mavenCentral() } } -task clean(type: Delete) { - delete rootProject.buildDir +subprojects { + project.ext { + compileSdkVersion = 31 + targetSdkVersion = 31 + minSdkVersion = 21 + } } -subprojects { - tasks.withType(Javadoc).all { enabled = false } +task clean(type: Delete) { + delete rootProject.buildDir } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 05506ee..19aa1d6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip + diff --git a/jitpack.yml b/jitpack.yml new file mode 100644 index 0000000..adb3fe1 --- /dev/null +++ b/jitpack.yml @@ -0,0 +1,2 @@ +jdk: + - openjdk11 diff --git a/library/build.gradle b/library/build.gradle index d466bd5..47f59f3 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,16 +1,12 @@ apply plugin: 'com.android.library' +apply plugin: 'maven-publish' -buildscript { - repositories { - jcenter() - } -} android { - compileSdkVersion 29 + compileSdkVersion 31 defaultConfig { - minSdkVersion 11 - targetSdkVersion 29 + minSdkVersion project.ext.minSdkVersion + targetSdkVersion project.ext.targetSdkVersion versionCode 7 versionName "1.1.3" } @@ -28,4 +24,27 @@ dependencies { implementation 'androidx.annotation:annotation:1.1.0' } -apply from: "${rootProject.projectDir}/mavencentral_publish.gradle" +task sourceJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + classifier "sources" +} + +afterEvaluate { + publishing { + publications { + release(MavenPublication) { + // Applies the component for the release build variant. + from components.release + + groupId = GROUP + artifactId = ARTIFACT_ID + version = VERSION_NAME + + // Adds javadocs and sources as separate jars. + artifact sourceJar + } + } + } +} + +//apply from: "${rootProject.projectDir}/mavencentral_publish.gradle" diff --git a/library/build/.transforms/1cde49b563f2f310d364b18f6bff3e1c.bin b/library/build/.transforms/1cde49b563f2f310d364b18f6bff3e1c.bin new file mode 100644 index 0000000..0d259dd --- /dev/null +++ b/library/build/.transforms/1cde49b563f2f310d364b18f6bff3e1c.bin @@ -0,0 +1 @@ +o/classes diff --git a/library/build/.transforms/1cde49b563f2f310d364b18f6bff3e1c/classes/classes.dex b/library/build/.transforms/1cde49b563f2f310d364b18f6bff3e1c/classes/classes.dex new file mode 100644 index 0000000..bb6e3d3 Binary files /dev/null and b/library/build/.transforms/1cde49b563f2f310d364b18f6bff3e1c/classes/classes.dex differ diff --git a/library/build/.transforms/714241fcb2244fdc320b7faa90437909/results.bin b/library/build/.transforms/714241fcb2244fdc320b7faa90437909/results.bin new file mode 100644 index 0000000..1ed65e0 --- /dev/null +++ b/library/build/.transforms/714241fcb2244fdc320b7faa90437909/results.bin @@ -0,0 +1 @@ +i/ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/results.bin b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/results.bin new file mode 100644 index 0000000..5ff383e --- /dev/null +++ b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/results.bin @@ -0,0 +1 @@ +o/debug diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/larvalabs/svgandroid/BuildConfig.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/larvalabs/svgandroid/BuildConfig.dex new file mode 100644 index 0000000..aac0338 Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/larvalabs/svgandroid/BuildConfig.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/OnSvgElementListener.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/OnSvgElementListener.dex new file mode 100644 index 0000000..f344963 Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/OnSvgElementListener.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$1.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$1.dex new file mode 100644 index 0000000..8fe1137 Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$1.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$10.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$10.dex new file mode 100644 index 0000000..29ff9a0 Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$10.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$2.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$2.dex new file mode 100644 index 0000000..19d4ddd Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$2.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$3.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$3.dex new file mode 100644 index 0000000..dbaf723 Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$3.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$4.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$4.dex new file mode 100644 index 0000000..4f57a13 Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$4.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$5.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$5.dex new file mode 100644 index 0000000..d22feb8 Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$5.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$6.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$6.dex new file mode 100644 index 0000000..2658c42 Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$6.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$7.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$7.dex new file mode 100644 index 0000000..49461c5 Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$7.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$8.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$8.dex new file mode 100644 index 0000000..fa4a3f7 Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$8.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$9.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$9.dex new file mode 100644 index 0000000..a7054c3 Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$9.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$DrawableCallback.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$DrawableCallback.dex new file mode 100644 index 0000000..d6f1677 Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$DrawableCallback.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$Gradient.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$Gradient.dex new file mode 100644 index 0000000..2c761fd Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$Gradient.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$LogLevel.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$LogLevel.dex new file mode 100644 index 0000000..8095014 Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$LogLevel.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$PictureCallback.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$PictureCallback.dex new file mode 100644 index 0000000..97d5716 Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$PictureCallback.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$Properties.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$Properties.dex new file mode 100644 index 0000000..d33cd57 Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$Properties.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$StyleSet.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$StyleSet.dex new file mode 100644 index 0000000..f163f27 Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$StyleSet.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$SvgHandler$SvgGroup.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$SvgHandler$SvgGroup.dex new file mode 100644 index 0000000..6902aca Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$SvgHandler$SvgGroup.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$SvgHandler$SvgText.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$SvgHandler$SvgText.dex new file mode 100644 index 0000000..16cf07a Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$SvgHandler$SvgText.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$SvgHandler.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$SvgHandler.dex new file mode 100644 index 0000000..e66fa4c Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$SvgHandler.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$Unit.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$Unit.dex new file mode 100644 index 0000000..c0cd95f Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp$Unit.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp.dex new file mode 100644 index 0000000..5176f92 Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/Sharp.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/SharpDrawable$1.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/SharpDrawable$1.dex new file mode 100644 index 0000000..813b5e4 Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/SharpDrawable$1.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/SharpDrawable.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/SharpDrawable.dex new file mode 100644 index 0000000..44c7a2a Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/SharpDrawable.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/SharpPicture.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/SharpPicture.dex new file mode 100644 index 0000000..7859f29 Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/SharpPicture.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/SvgColors.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/SvgColors.dex new file mode 100644 index 0000000..30aa7a7 Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/SvgColors.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/SvgParseException.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/SvgParseException.dex new file mode 100644 index 0000000..8893f3d Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/SvgParseException.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/SvgParserHelper.dex b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/SvgParserHelper.dex new file mode 100644 index 0000000..70a99e3 Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/debug/com/pixplicity/sharp/SvgParserHelper.dex differ diff --git a/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/desugar_graph.bin b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/desugar_graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/library/build/.transforms/e7e0720807456abc9655922f250e4ee1/transformed/desugar_graph.bin differ diff --git a/library/build/generated/source/buildConfig/debug/com/larvalabs/svgandroid/BuildConfig.java b/library/build/generated/source/buildConfig/debug/com/larvalabs/svgandroid/BuildConfig.java new file mode 100644 index 0000000..08f27c8 --- /dev/null +++ b/library/build/generated/source/buildConfig/debug/com/larvalabs/svgandroid/BuildConfig.java @@ -0,0 +1,10 @@ +/** + * Automatically generated file. DO NOT MODIFY + */ +package com.larvalabs.svgandroid; + +public final class BuildConfig { + public static final boolean DEBUG = Boolean.parseBoolean("true"); + public static final String LIBRARY_PACKAGE_NAME = "com.larvalabs.svgandroid"; + public static final String BUILD_TYPE = "debug"; +} diff --git a/library/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml b/library/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml new file mode 100644 index 0000000..3b61707 --- /dev/null +++ b/library/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/library/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output-metadata.json b/library/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output-metadata.json new file mode 100644 index 0000000..568a450 --- /dev/null +++ b/library/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output-metadata.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "artifactType": { + "type": "AAPT_FRIENDLY_MERGED_MANIFESTS", + "kind": "Directory" + }, + "applicationId": "com.larvalabs.svgandroid", + "variantName": "debug", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "outputFile": "AndroidManifest.xml" + } + ] +} \ No newline at end of file diff --git a/library/build/intermediates/aar_main_jar/debug/classes.jar b/library/build/intermediates/aar_main_jar/debug/classes.jar new file mode 100644 index 0000000..05c099f Binary files /dev/null and b/library/build/intermediates/aar_main_jar/debug/classes.jar differ diff --git a/library/build/intermediates/aar_metadata/debug/aar-metadata.properties b/library/build/intermediates/aar_metadata/debug/aar-metadata.properties new file mode 100644 index 0000000..d8560bd --- /dev/null +++ b/library/build/intermediates/aar_metadata/debug/aar-metadata.properties @@ -0,0 +1,2 @@ +aarFormatVersion=1.0 +aarMetadataVersion=1.0 diff --git a/library/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/library/build/intermediates/annotation_processor_list/debug/annotationProcessors.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/library/build/intermediates/annotation_processor_list/debug/annotationProcessors.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/library/build/intermediates/annotations_typedef_file/debug/typedefs.txt b/library/build/intermediates/annotations_typedef_file/debug/typedefs.txt new file mode 100644 index 0000000..e69de29 diff --git a/library/build/intermediates/annotations_zip/debug/annotations.zip b/library/build/intermediates/annotations_zip/debug/annotations.zip new file mode 100644 index 0000000..cf3bb94 Binary files /dev/null and b/library/build/intermediates/annotations_zip/debug/annotations.zip differ diff --git a/library/build/intermediates/compile_library_classes_jar/debug/classes.jar b/library/build/intermediates/compile_library_classes_jar/debug/classes.jar new file mode 100644 index 0000000..71f35f4 Binary files /dev/null and b/library/build/intermediates/compile_library_classes_jar/debug/classes.jar differ diff --git a/library/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar b/library/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar new file mode 100644 index 0000000..6b2a1da Binary files /dev/null and b/library/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/library/build/intermediates/compile_r_class_jar/debug/R.jar b/library/build/intermediates/compile_r_class_jar/debug/R.jar new file mode 100644 index 0000000..9f24d71 Binary files /dev/null and b/library/build/intermediates/compile_r_class_jar/debug/R.jar differ diff --git a/library/build/intermediates/compile_symbol_list/debug/R.txt b/library/build/intermediates/compile_symbol_list/debug/R.txt new file mode 100644 index 0000000..e69de29 diff --git a/library/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/library/build/intermediates/incremental/debug-mergeJavaRes/merge-state new file mode 100644 index 0000000..d5ff387 Binary files /dev/null and b/library/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ diff --git a/library/build/intermediates/incremental/debug-mergeNativeLibs/merge-state b/library/build/intermediates/incremental/debug-mergeNativeLibs/merge-state new file mode 100644 index 0000000..0f9bb95 Binary files /dev/null and b/library/build/intermediates/incremental/debug-mergeNativeLibs/merge-state differ diff --git a/library/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/library/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml new file mode 100644 index 0000000..b79c84e --- /dev/null +++ b/library/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/library/build/intermediates/incremental/mergeDebugShaders/merger.xml b/library/build/intermediates/incremental/mergeDebugShaders/merger.xml new file mode 100644 index 0000000..f342b21 --- /dev/null +++ b/library/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/library/build/intermediates/incremental/packageDebugAssets/merger.xml b/library/build/intermediates/incremental/packageDebugAssets/merger.xml new file mode 100644 index 0000000..c6fb19a --- /dev/null +++ b/library/build/intermediates/incremental/packageDebugAssets/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties new file mode 100644 index 0000000..c9640aa --- /dev/null +++ b/library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties @@ -0,0 +1 @@ +#Tue Mar 01 11:21:58 CET 2022 diff --git a/library/build/intermediates/incremental/packageDebugResources/merger.xml b/library/build/intermediates/incremental/packageDebugResources/merger.xml new file mode 100644 index 0000000..3387191 --- /dev/null +++ b/library/build/intermediates/incremental/packageDebugResources/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/library/build/intermediates/javac/debug/classes/com/larvalabs/svgandroid/BuildConfig.class b/library/build/intermediates/javac/debug/classes/com/larvalabs/svgandroid/BuildConfig.class new file mode 100644 index 0000000..8390c09 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/larvalabs/svgandroid/BuildConfig.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/OnSvgElementListener.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/OnSvgElementListener.class new file mode 100644 index 0000000..034a4a4 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/OnSvgElementListener.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$1.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$1.class new file mode 100644 index 0000000..005a110 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$1.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$10.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$10.class new file mode 100644 index 0000000..6c54c65 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$10.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$2.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$2.class new file mode 100644 index 0000000..315bdad Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$2.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$3.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$3.class new file mode 100644 index 0000000..1b6910c Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$3.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$4.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$4.class new file mode 100644 index 0000000..84ea066 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$4.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$5.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$5.class new file mode 100644 index 0000000..d4f2bfb Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$5.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$6.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$6.class new file mode 100644 index 0000000..9d1ef6a Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$6.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$7.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$7.class new file mode 100644 index 0000000..3a9331c Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$7.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$8.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$8.class new file mode 100644 index 0000000..a3aae2f Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$8.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$9.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$9.class new file mode 100644 index 0000000..1485ce0 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$9.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$DrawableCallback.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$DrawableCallback.class new file mode 100644 index 0000000..566f7fe Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$DrawableCallback.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$Gradient.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$Gradient.class new file mode 100644 index 0000000..792d5a2 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$Gradient.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$LogLevel.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$LogLevel.class new file mode 100644 index 0000000..dc55f08 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$LogLevel.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$PictureCallback.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$PictureCallback.class new file mode 100644 index 0000000..c629357 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$PictureCallback.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$Properties.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$Properties.class new file mode 100644 index 0000000..0c20ed8 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$Properties.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$StyleSet.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$StyleSet.class new file mode 100644 index 0000000..a95ed43 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$StyleSet.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$SvgHandler$SvgGroup.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$SvgHandler$SvgGroup.class new file mode 100644 index 0000000..7f1d05f Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$SvgHandler$SvgGroup.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$SvgHandler$SvgText.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$SvgHandler$SvgText.class new file mode 100644 index 0000000..2b21312 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$SvgHandler$SvgText.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$SvgHandler.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$SvgHandler.class new file mode 100644 index 0000000..1351d9a Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$SvgHandler.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$Unit.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$Unit.class new file mode 100644 index 0000000..826f1e1 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp$Unit.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp.class new file mode 100644 index 0000000..fe7eda7 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/Sharp.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/SharpDrawable$1.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/SharpDrawable$1.class new file mode 100644 index 0000000..f8f2243 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/SharpDrawable$1.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/SharpDrawable.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/SharpDrawable.class new file mode 100644 index 0000000..bbfa7da Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/SharpDrawable.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/SharpPicture.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/SharpPicture.class new file mode 100644 index 0000000..3521223 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/SharpPicture.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/SvgColors.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/SvgColors.class new file mode 100644 index 0000000..3ee87c2 Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/SvgColors.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/SvgParseException.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/SvgParseException.class new file mode 100644 index 0000000..449feac Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/SvgParseException.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/SvgParserHelper.class b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/SvgParserHelper.class new file mode 100644 index 0000000..c54fd9c Binary files /dev/null and b/library/build/intermediates/javac/debug/classes/com/pixplicity/sharp/SvgParserHelper.class differ diff --git a/library/build/intermediates/library_manifest/debug/AndroidManifest.xml b/library/build/intermediates/library_manifest/debug/AndroidManifest.xml new file mode 100644 index 0000000..b59a5aa --- /dev/null +++ b/library/build/intermediates/library_manifest/debug/AndroidManifest.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/library/build/intermediates/local_only_symbol_list/debug/R-def.txt b/library/build/intermediates/local_only_symbol_list/debug/R-def.txt new file mode 100644 index 0000000..78ac5b8 --- /dev/null +++ b/library/build/intermediates/local_only_symbol_list/debug/R-def.txt @@ -0,0 +1,2 @@ +R_DEF: Internal format may change without notice +local diff --git a/library/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/library/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt new file mode 100644 index 0000000..f2e6745 --- /dev/null +++ b/library/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -0,0 +1,13 @@ +1 +2 +6 +7 /Users/Homez/Workspace/blubblub/sharp/library/src/main/AndroidManifest.xml +9 android:targetSdkVersion="31" /> +9-->/Users/Homez/Workspace/blubblub/sharp/library/src/main/AndroidManifest.xml +10 +11 diff --git a/library/build/intermediates/merged_java_res/debug/out.jar b/library/build/intermediates/merged_java_res/debug/out.jar new file mode 100644 index 0000000..15cb0ec Binary files /dev/null and b/library/build/intermediates/merged_java_res/debug/out.jar differ diff --git a/library/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/library/build/intermediates/merged_manifest/debug/AndroidManifest.xml new file mode 100644 index 0000000..3b61707 --- /dev/null +++ b/library/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/library/build/intermediates/merged_manifests/debug/output.json b/library/build/intermediates/merged_manifests/debug/output.json new file mode 100644 index 0000000..9a97704 --- /dev/null +++ b/library/build/intermediates/merged_manifests/debug/output.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "applicationId": "com.larvalabs.svgandroid", + "variantType": "LIBRARY", + "elements": [ + { + "outputType": { + "type": "MERGED_MANIFESTS" + }, + "apkData": { + "type": "MAIN", + "splits": [], + "versionCode": 7, + "versionName": "1.1.3", + "outputFile": "library-debug.aar", + "fullName": "debug", + "baseName": "debug", + "dirName": "" + }, + "path": "../../library_manifest/debug/AndroidManifest.xml", + "properties": { + "packageId": "com.larvalabs.svgandroid", + "split": "" + } + } + ] +} \ No newline at end of file diff --git a/library/build/intermediates/navigation_json/debug/navigation.json b/library/build/intermediates/navigation_json/debug/navigation.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/library/build/intermediates/navigation_json/debug/navigation.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/library/build/intermediates/packaged_manifests/debug/output-metadata.json b/library/build/intermediates/packaged_manifests/debug/output-metadata.json new file mode 100644 index 0000000..8e18a48 --- /dev/null +++ b/library/build/intermediates/packaged_manifests/debug/output-metadata.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "artifactType": { + "type": "PACKAGED_MANIFESTS", + "kind": "Directory" + }, + "applicationId": "com.larvalabs.svgandroid", + "variantName": "debug", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "outputFile": "../../merged_manifest/debug/AndroidManifest.xml" + } + ] +} \ No newline at end of file diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/larvalabs/svgandroid/BuildConfig.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/larvalabs/svgandroid/BuildConfig.class new file mode 100644 index 0000000..8390c09 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/larvalabs/svgandroid/BuildConfig.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/OnSvgElementListener.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/OnSvgElementListener.class new file mode 100644 index 0000000..ccad9bf Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/OnSvgElementListener.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$1.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$1.class new file mode 100644 index 0000000..005a110 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$1.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$10.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$10.class new file mode 100644 index 0000000..6c54c65 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$10.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$2.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$2.class new file mode 100644 index 0000000..315bdad Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$2.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$3.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$3.class new file mode 100644 index 0000000..1b6910c Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$3.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$4.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$4.class new file mode 100644 index 0000000..84ea066 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$4.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$5.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$5.class new file mode 100644 index 0000000..d4f2bfb Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$5.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$6.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$6.class new file mode 100644 index 0000000..9d1ef6a Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$6.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$7.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$7.class new file mode 100644 index 0000000..3a9331c Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$7.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$8.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$8.class new file mode 100644 index 0000000..a3aae2f Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$8.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$9.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$9.class new file mode 100644 index 0000000..1485ce0 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$9.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$DrawableCallback.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$DrawableCallback.class new file mode 100644 index 0000000..566f7fe Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$DrawableCallback.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$Gradient.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$Gradient.class new file mode 100644 index 0000000..47562dc Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$Gradient.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$LogLevel.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$LogLevel.class new file mode 100644 index 0000000..dc55f08 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$LogLevel.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$PictureCallback.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$PictureCallback.class new file mode 100644 index 0000000..c629357 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$PictureCallback.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$Properties.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$Properties.class new file mode 100644 index 0000000..ed0208a Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$Properties.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$StyleSet.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$StyleSet.class new file mode 100644 index 0000000..0ecf8d9 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$StyleSet.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$SvgHandler$SvgGroup.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$SvgHandler$SvgGroup.class new file mode 100644 index 0000000..c9f3c4f Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$SvgHandler$SvgGroup.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$SvgHandler$SvgText.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$SvgHandler$SvgText.class new file mode 100644 index 0000000..2152471 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$SvgHandler$SvgText.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$SvgHandler.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$SvgHandler.class new file mode 100644 index 0000000..4b2a017 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$SvgHandler.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$Unit.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$Unit.class new file mode 100644 index 0000000..826f1e1 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp$Unit.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp.class new file mode 100644 index 0000000..8408f5d Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/Sharp.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/SharpDrawable$1.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/SharpDrawable$1.class new file mode 100644 index 0000000..f8f2243 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/SharpDrawable$1.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/SharpDrawable.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/SharpDrawable.class new file mode 100644 index 0000000..bbfa7da Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/SharpDrawable.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/SharpPicture.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/SharpPicture.class new file mode 100644 index 0000000..3521223 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/SharpPicture.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/SvgColors.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/SvgColors.class new file mode 100644 index 0000000..3ee87c2 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/SvgColors.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/SvgParseException.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/SvgParseException.class new file mode 100644 index 0000000..449feac Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/SvgParseException.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/SvgParserHelper.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/SvgParserHelper.class new file mode 100644 index 0000000..c54fd9c Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_dir/debug/com/pixplicity/sharp/SvgParserHelper.class differ diff --git a/library/build/intermediates/runtime_library_classes_jar/debug/classes.jar b/library/build/intermediates/runtime_library_classes_jar/debug/classes.jar new file mode 100644 index 0000000..be74e72 Binary files /dev/null and b/library/build/intermediates/runtime_library_classes_jar/debug/classes.jar differ diff --git a/library/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt b/library/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt new file mode 100644 index 0000000..50b6417 --- /dev/null +++ b/library/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt @@ -0,0 +1 @@ +com.larvalabs.svgandroid diff --git a/library/build/outputs/aar/library-debug.aar b/library/build/outputs/aar/library-debug.aar new file mode 100644 index 0000000..4d5ca78 Binary files /dev/null and b/library/build/outputs/aar/library-debug.aar differ diff --git a/library/build/outputs/logs/manifest-merger-debug-report.txt b/library/build/outputs/logs/manifest-merger-debug-report.txt new file mode 100644 index 0000000..07541fc --- /dev/null +++ b/library/build/outputs/logs/manifest-merger-debug-report.txt @@ -0,0 +1,29 @@ +-- Merging decision tree log --- +manifest +ADDED from /Users/Homez/Workspace/blubblub/sharp/library/src/main/AndroidManifest.xml:2:1-5:38 +INJECTED from /Users/Homez/Workspace/blubblub/sharp/library/src/main/AndroidManifest.xml:2:1-5:38 +INJECTED from /Users/Homez/Workspace/blubblub/sharp/library/src/main/AndroidManifest.xml:2:1-5:38 + package + ADDED from /Users/Homez/Workspace/blubblub/sharp/library/src/main/AndroidManifest.xml:2:11-45 + INJECTED from /Users/Homez/Workspace/blubblub/sharp/library/src/main/AndroidManifest.xml + INJECTED from /Users/Homez/Workspace/blubblub/sharp/library/src/main/AndroidManifest.xml + android:versionName + ADDED from /Users/Homez/Workspace/blubblub/sharp/library/src/main/AndroidManifest.xml:5:11-36 + xmlns:android + ADDED from /Users/Homez/Workspace/blubblub/sharp/library/src/main/AndroidManifest.xml:3:11-69 + android:versionCode + ADDED from /Users/Homez/Workspace/blubblub/sharp/library/src/main/AndroidManifest.xml:4:11-34 +uses-sdk +INJECTED from /Users/Homez/Workspace/blubblub/sharp/library/src/main/AndroidManifest.xml reason: use-sdk injection requested +INJECTED from /Users/Homez/Workspace/blubblub/sharp/library/src/main/AndroidManifest.xml +INJECTED from /Users/Homez/Workspace/blubblub/sharp/library/src/main/AndroidManifest.xml +INJECTED from /Users/Homez/Workspace/blubblub/sharp/library/src/main/AndroidManifest.xml +INJECTED from /Users/Homez/Workspace/blubblub/sharp/library/src/main/AndroidManifest.xml + android:targetSdkVersion + INJECTED from /Users/Homez/Workspace/blubblub/sharp/library/src/main/AndroidManifest.xml + ADDED from /Users/Homez/Workspace/blubblub/sharp/library/src/main/AndroidManifest.xml + INJECTED from /Users/Homez/Workspace/blubblub/sharp/library/src/main/AndroidManifest.xml + android:minSdkVersion + INJECTED from /Users/Homez/Workspace/blubblub/sharp/library/src/main/AndroidManifest.xml + ADDED from /Users/Homez/Workspace/blubblub/sharp/library/src/main/AndroidManifest.xml + INJECTED from /Users/Homez/Workspace/blubblub/sharp/library/src/main/AndroidManifest.xml diff --git a/library/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/library/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin new file mode 100644 index 0000000..05e91d2 Binary files /dev/null and b/library/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/library/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt b/library/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt new file mode 100644 index 0000000..31d5e62 --- /dev/null +++ b/library/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt @@ -0,0 +1,37 @@ +com/pixplicity/sharp/SvgParseException.java + com.pixplicity.sharp.SvgParseException +com/pixplicity/sharp/SvgParserHelper.java + com.pixplicity.sharp.SvgParserHelper +com/pixplicity/sharp/SharpDrawable.java + com.pixplicity.sharp.SharpDrawable + com.pixplicity.sharp.SharpDrawable$1 +com/pixplicity/sharp/Sharp.java + com.pixplicity.sharp.Sharp + com.pixplicity.sharp.Sharp$1 + com.pixplicity.sharp.Sharp$10 + com.pixplicity.sharp.Sharp$2 + com.pixplicity.sharp.Sharp$3 + com.pixplicity.sharp.Sharp$4 + com.pixplicity.sharp.Sharp$5 + com.pixplicity.sharp.Sharp$6 + com.pixplicity.sharp.Sharp$7 + com.pixplicity.sharp.Sharp$8 + com.pixplicity.sharp.Sharp$9 + com.pixplicity.sharp.Sharp$DrawableCallback + com.pixplicity.sharp.Sharp$Gradient + com.pixplicity.sharp.Sharp$LogLevel + com.pixplicity.sharp.Sharp$PictureCallback + com.pixplicity.sharp.Sharp$Properties + com.pixplicity.sharp.Sharp$StyleSet + com.pixplicity.sharp.Sharp$SvgHandler + com.pixplicity.sharp.Sharp$SvgHandler$SvgGroup + com.pixplicity.sharp.Sharp$SvgHandler$SvgText + com.pixplicity.sharp.Sharp$Unit +com/pixplicity/sharp/SvgColors.java + com.pixplicity.sharp.SvgColors +com/larvalabs/svgandroid/BuildConfig.java + com.larvalabs.svgandroid.BuildConfig +com/pixplicity/sharp/OnSvgElementListener.java + com.pixplicity.sharp.OnSvgElementListener +com/pixplicity/sharp/SharpPicture.java + com.pixplicity.sharp.SharpPicture diff --git a/library/src/main/java/com/pixplicity/sharp/OnSvgElementListener.java b/library/src/main/java/com/pixplicity/sharp/OnSvgElementListener.java index 6dfc180..0cc1671 100644 --- a/library/src/main/java/com/pixplicity/sharp/OnSvgElementListener.java +++ b/library/src/main/java/com/pixplicity/sharp/OnSvgElementListener.java @@ -40,6 +40,7 @@ void onSvgEnd(@NonNull Canvas canvas, @Nullable RectF bounds); T onSvgElement(@Nullable String id, + @NonNull String localName, @NonNull T element, @Nullable RectF elementBounds, @NonNull Canvas canvas, diff --git a/library/src/main/java/com/pixplicity/sharp/Sharp.java b/library/src/main/java/com/pixplicity/sharp/Sharp.java index 223fdc3..c8bae0c 100644 --- a/library/src/main/java/com/pixplicity/sharp/Sharp.java +++ b/library/src/main/java/com/pixplicity/sharp/Sharp.java @@ -44,16 +44,15 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Looper; - -import androidx.annotation.IntDef; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - import android.text.TextPaint; import android.util.Log; import android.view.View; import android.widget.ImageView; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -101,7 +100,8 @@ public abstract class Sharp { static int LOG_LEVEL = LOG_LEVEL_ERROR; @IntDef({LOG_LEVEL_ERROR, LOG_LEVEL_WARN, LOG_LEVEL_INFO}) - public @interface LogLevel {} + public @interface LogLevel { + } private static String sAssumedUnit; private static HashMap sTextDynamic = null; @@ -1077,6 +1077,7 @@ private void onSvgEnd(@NonNull Canvas canvas, } private T onSvgElement(@Nullable String id, + @NonNull String localName, @NonNull T element, @Nullable RectF elementBounds, @NonNull Canvas canvas, @@ -1084,7 +1085,7 @@ private T onSvgElement(@Nullable String id, @Nullable Paint paint) { if (mOnElementListener != null) { return mOnElementListener.onSvgElement( - id, element, elementBounds, canvas, canvasBounds, paint); + id, localName, element, elementBounds, canvas, canvasBounds, paint); } return element; } @@ -1292,10 +1293,11 @@ private void onSvgEnd() { } private T onSvgElement(@Nullable String id, + @NonNull String localName, @NonNull T element, @Nullable RectF elementBounds, @Nullable Paint paint) { - return mSharp.onSvgElement(id, element, elementBounds, mCanvas, mBounds, paint); + return mSharp.onSvgElement(id, localName, element, elementBounds, mCanvas, mBounds, paint); } private void onSvgElementDrawn(@Nullable String id, @@ -1845,7 +1847,7 @@ public void startElement(String namespaceURI, String localName, String qName, At SvgGroup group = new SvgGroup(id); mGroupStack.push(group); // FIXME compute bounds before drawing? - onSvgElement(id, group, null, null); + onSvgElement(id, localName, group, null, null); } else if (!hidden && localName.equals("rect")) { Float x = getFloatAttr("x", atts, 0f); Float y = getFloatAttr("y", atts, 0f); @@ -1876,7 +1878,7 @@ public void startElement(String namespaceURI, String localName, String qName, At Properties props = new Properties(atts); mRect.set(x, y, x + width, y + height); if (doFill(props, mRect)) { - mRect = onSvgElement(id, mRect, mRect, mFillPaint); + mRect = onSvgElement(id, localName, mRect, mRect, mFillPaint); if (mRect != null) { mCanvas.drawRoundRect(mRect, rx, ry, mFillPaint); onSvgElementDrawn(id, mRect, mFillPaint); @@ -1884,7 +1886,7 @@ public void startElement(String namespaceURI, String localName, String qName, At doLimits(mRect); } if (doStroke(props, mRect)) { - mRect = onSvgElement(id, mRect, mRect, mStrokePaint); + mRect = onSvgElement(id, localName, mRect, mRect, mStrokePaint); if (mRect != null) { mCanvas.drawRoundRect(mRect, rx, ry, mStrokePaint); onSvgElementDrawn(id, mRect, mStrokePaint); @@ -1902,7 +1904,7 @@ public void startElement(String namespaceURI, String localName, String qName, At pushTransform(atts); mLine.set(x1, y1, x2, y2); mRect.set(mLine); - mLine = onSvgElement(id, mLine, mRect, mStrokePaint); + mLine = onSvgElement(id, localName, mLine, mRect, mStrokePaint); if (mLine != null) { mCanvas.drawLine(mLine.left, mLine.top, mLine.right, mLine.bottom, mStrokePaint); onSvgElementDrawn(id, mLine, mStrokePaint); @@ -1926,7 +1928,7 @@ public void startElement(String namespaceURI, String localName, String qName, At Properties props = new Properties(atts); mRect.set(centerX - radiusX, centerY - radiusY, centerX + radiusX, centerY + radiusY); if (doFill(props, mRect)) { - mRect = onSvgElement(id, mRect, mRect, mFillPaint); + mRect = onSvgElement(id, localName, mRect, mRect, mFillPaint); if (mRect != null) { mCanvas.drawOval(mRect, mFillPaint); onSvgElementDrawn(id, mRect, mFillPaint); @@ -1934,7 +1936,7 @@ public void startElement(String namespaceURI, String localName, String qName, At doLimits(mRect); } if (doStroke(props, mRect)) { - mRect = onSvgElement(id, mRect, mRect, mStrokePaint); + mRect = onSvgElement(id, localName, mRect, mRect, mStrokePaint); if (mRect != null) { mCanvas.drawOval(mRect, mStrokePaint); onSvgElementDrawn(id, mRect, mStrokePaint); @@ -1962,7 +1964,7 @@ public void startElement(String namespaceURI, String localName, String qName, At } p.computeBounds(mRect, false); if (doFill(props, mRect)) { - p = onSvgElement(id, p, mRect, mFillPaint); + p = onSvgElement(id, localName, p, mRect, mFillPaint); if (p != null) { mCanvas.drawPath(p, mFillPaint); onSvgElementDrawn(id, p, mFillPaint); @@ -1970,7 +1972,7 @@ public void startElement(String namespaceURI, String localName, String qName, At doLimits(mRect); } if (doStroke(props, mRect)) { - p = onSvgElement(id, p, mRect, mStrokePaint); + p = onSvgElement(id, localName, p, mRect, mStrokePaint); if (p != null) { mCanvas.drawPath(p, mStrokePaint); onSvgElementDrawn(id, p, mStrokePaint); @@ -2003,7 +2005,7 @@ public void startElement(String namespaceURI, String localName, String qName, At Properties props = new Properties(atts); p.computeBounds(mRect, false); if (doFill(props, mRect)) { - p = onSvgElement(id, p, mRect, mFillPaint); + p = onSvgElement(id, localName, p, mRect, mFillPaint); if (p != null) { mCanvas.drawPath(p, mFillPaint); onSvgElementDrawn(id, p, mFillPaint); @@ -2011,7 +2013,7 @@ public void startElement(String namespaceURI, String localName, String qName, At doLimits(mRect); } if (doStroke(props, mRect)) { - p = onSvgElement(id, p, mRect, mStrokePaint); + p = onSvgElement(id, localName, p, mRect, mStrokePaint); if (p != null) { mCanvas.drawPath(p, mStrokePaint); onSvgElementDrawn(id, p, mStrokePaint); @@ -2287,7 +2289,7 @@ public void render(Canvas canvas) { private void drawText(Canvas canvas, SvgText text, boolean fill) { TextPaint paint = fill ? text.fill : text.stroke; - text = onSvgElement(id, text, text.bounds, paint); + text = onSvgElement(id, "text", text, text.bounds, paint); if (text != null) { if (text.xCoords != null && text.xCoords.length > 0) { // Draw each glyph separately according to their x coordinates diff --git a/sample-imageview/.gitignore b/sample-imageview/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/sample-imageview/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/sample-imageview/build.gradle b/sample-imageview/build.gradle deleted file mode 100644 index 27fa813..0000000 --- a/sample-imageview/build.gradle +++ /dev/null @@ -1,27 +0,0 @@ -apply plugin: 'com.android.application' - -android { - compileSdkVersion 29 - - defaultConfig { - applicationId "com.pixplicity.sharp.imageviewdemo" - minSdkVersion 18 - targetSdkVersion 29 - versionCode 3 - versionName "1.0.2" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.1.0' - - implementation 'com.jsibbold:zoomage:1.3.0' - implementation project(':library') -} diff --git a/sample-imageview/proguard-rules.pro b/sample-imageview/proguard-rules.pro deleted file mode 100644 index ca1c0d7..0000000 --- a/sample-imageview/proguard-rules.pro +++ /dev/null @@ -1,17 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /home/paul/android/sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/sample-imageview/screenshots/cartman1.png b/sample-imageview/screenshots/cartman1.png deleted file mode 100644 index 30a3676..0000000 Binary files a/sample-imageview/screenshots/cartman1.png and /dev/null differ diff --git a/sample-imageview/screenshots/cartman2.png b/sample-imageview/screenshots/cartman2.png deleted file mode 100644 index 90a3866..0000000 Binary files a/sample-imageview/screenshots/cartman2.png and /dev/null differ diff --git a/sample-imageview/screenshots/cartman3.png b/sample-imageview/screenshots/cartman3.png deleted file mode 100644 index 20ce671..0000000 Binary files a/sample-imageview/screenshots/cartman3.png and /dev/null differ diff --git a/sample-imageview/src/androidTest/java/com/pixplicity/sharp/imageviewdemo/ApplicationTest.java b/sample-imageview/src/androidTest/java/com/pixplicity/sharp/imageviewdemo/ApplicationTest.java deleted file mode 100644 index 21e7a24..0000000 --- a/sample-imageview/src/androidTest/java/com/pixplicity/sharp/imageviewdemo/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.pixplicity.sharp.imageviewdemo; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file diff --git a/sample-imageview/src/main/AndroidManifest.xml b/sample-imageview/src/main/AndroidManifest.xml deleted file mode 100644 index fc0b470..0000000 --- a/sample-imageview/src/main/AndroidManifest.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - diff --git a/sample-imageview/src/main/assets/blueprint.svg b/sample-imageview/src/main/assets/blueprint.svg deleted file mode 100644 index 9430b18..0000000 --- a/sample-imageview/src/main/assets/blueprint.svg +++ /dev/null @@ -1,797 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100PX - - - - 100PX - - - - 400PX - - - - - 300PX - - - - - - 400PX - - - - - - - - - - - - - - - RED - - - - - - BLUE - - - - - - YELLOW - - - - - - GREEN - - - - - - - - - - - - - 112 - - - - - - - 120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - - - 4 - - - 2 - - - P - - - X - - - 3 - - - 9 - - - 5 - - - P - - - X - - - - - - - - - - - - - - - - - - - - - - - - - - - - Start creating - GDG DevFest The Netherlands 2015 - - - - - - - diff --git a/sample-imageview/src/main/ic_launcher-playstore.png b/sample-imageview/src/main/ic_launcher-playstore.png deleted file mode 100644 index bbb7d7d..0000000 Binary files a/sample-imageview/src/main/ic_launcher-playstore.png and /dev/null differ diff --git a/sample-imageview/src/main/java/com/pixplicity/sharp/imageviewdemo/SvgDemoActivity.java b/sample-imageview/src/main/java/com/pixplicity/sharp/imageviewdemo/SvgDemoActivity.java deleted file mode 100644 index 5f263bb..0000000 --- a/sample-imageview/src/main/java/com/pixplicity/sharp/imageviewdemo/SvgDemoActivity.java +++ /dev/null @@ -1,182 +0,0 @@ -/* - Copyright 2011, 2015 Pixplicity, Larva Labs LLC and Google, Inc. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - Sharp is heavily based on prior work. It was originally forked from - https://github.com/pents90/svg-android - And changes from other forks have been consolidated: - https://github.com/b2renger/svg-android - https://github.com/mindon/svg-android - https://github.com/josefpavlik/svg-android - */ - -package com.pixplicity.sharp.imageviewdemo; - -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.RectF; -import android.graphics.drawable.BitmapDrawable; -import android.graphics.drawable.Drawable; -import android.os.Bundle; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; -import android.view.View; -import android.widget.Button; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; - -import com.jsibbold.zoomage.ZoomageView; -import com.pixplicity.sharp.OnSvgElementListener; -import com.pixplicity.sharp.Sharp; -import com.pixplicity.sharp.SharpDrawable; -import com.pixplicity.sharp.SharpPicture; - -import java.util.Random; - -public class SvgDemoActivity extends AppCompatActivity { - - private ZoomageView mImageView; - private Button mButton; - - private Sharp mSvg; - - private boolean mRenderBitmap = false; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_svg_demo); - - Toolbar toolbar = findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - - mImageView = findViewById(R.id.iv_image); - mButton = findViewById(R.id.bt_button); - - Sharp.setLogLevel(Sharp.LOG_LEVEL_INFO); - - mSvg = Sharp.loadResource(getResources(), R.raw.cartman); - // If you want to load typefaces from assets: - // .withAssets(getAssets()); - - // If you want to load an SVG from assets: - //mSvg = Sharp.loadAsset(getAssets(), "cartman.svg"); - - mButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - reloadSvg(true); - } - }); - - reloadSvg(false); - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - new MenuInflater(this).inflate(R.menu.main, menu); - menu.findItem(R.id.action_render_bitmap).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { - @Override - public boolean onMenuItemClick(MenuItem menuItem) { - mRenderBitmap = !menuItem.isChecked(); - menuItem.setChecked(mRenderBitmap); - reloadSvg(false); - return true; - } - }); - return true; - } - - private void reloadSvg(final boolean changeColor) { - mSvg.setOnElementListener(new OnSvgElementListener() { - - @Override - public void onSvgStart(@NonNull Canvas canvas, - @Nullable RectF bounds) { - } - - @Override - public void onSvgEnd(@NonNull Canvas canvas, - @Nullable RectF bounds) { - } - - @Override - public T onSvgElement(@Nullable String id, - @NonNull T element, - @Nullable RectF elementBounds, - @NonNull Canvas canvas, - @Nullable RectF canvasBounds, - @Nullable Paint paint) { - if (changeColor && paint != null && paint.getStyle() == Paint.Style.FILL && - ("shirt".equals(id) || "hat".equals(id) || "pants".equals(id))) { - Random random = new Random(); - paint.setColor(Color.argb(255, random.nextInt(256), - random.nextInt(256), random.nextInt(256))); - } - return element; - } - - @Override - public void onSvgElementDrawn(@Nullable String id, - @NonNull T element, - @NonNull Canvas canvas, - @Nullable Paint paint) { - } - - }); - mSvg.getSharpPicture(new Sharp.PictureCallback() { - @Override - public void onPictureReady(SharpPicture picture) { - Drawable drawable = picture.getDrawable(); - if (mRenderBitmap) { - // Create a bitmap with a size that is somewhat arbitrarily determined by SharpDrawable - // This will no doubt look bad when scaled up, so perhaps a different dimension would be used in practice - int width = Math.max(1, drawable.getIntrinsicWidth()); - int height = Math.max(1, drawable.getIntrinsicHeight()); - Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888); - // Draw SharpDrawable onto this bitmap - Canvas canvas = new Canvas(bitmap); - drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight()); - drawable.draw(canvas); - - BitmapDrawable bitmapDrawable = new BitmapDrawable(getResources(), bitmap); - - // You could do some bitmap operations here that aren't supported by Picture - //bitmapDrawable.setColorFilter(Color.RED, PorterDuff.Mode.MULTIPLY); - //bitmapDrawable.setAlpha(100); - - // Use the BitmapDrawable instead of the SharpDrawable - drawable = bitmapDrawable; - } else { - SharpDrawable.prepareView(mImageView); - } - mImageView.setImageDrawable(drawable); - - // We don't want to use the same drawable, as we're specifying a custom size; therefore - // we call createDrawable() instead of getDrawable() - int iconSize = getResources().getDimensionPixelSize(R.dimen.icon_size); - mButton.setCompoundDrawables( - picture.createDrawable(mButton, iconSize), - null, null, null); - } - }); - } - -} diff --git a/sample-imageview/src/main/res/drawable/ic_launcher_background.xml b/sample-imageview/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 27863d2..0000000 --- a/sample-imageview/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - diff --git a/sample-imageview/src/main/res/drawable/ic_launcher_foreground.xml b/sample-imageview/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 4e11a40..0000000 --- a/sample-imageview/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - diff --git a/sample-imageview/src/main/res/layout/activity_svg_demo.xml b/sample-imageview/src/main/res/layout/activity_svg_demo.xml deleted file mode 100644 index 15f8deb..0000000 --- a/sample-imageview/src/main/res/layout/activity_svg_demo.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - -