Merge branch 'master' of https://github.com/HeYongRui/FireworkAnim

# Conflicts: # .gitignore
HeYongRui · Jun 25, 2018 · b578715 · b578715
2 parents 5d8f8a1 + b3a6b48
commit b578715
Show file tree

Hide file tree

Showing 90 changed files with 656 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/.gradle/4.1/fileChanges/last-build.bin b/.gradle/4.1/fileChanges/last-build.bin
diff --git a/.gradle/4.1/fileContent/fileContent.lock b/.gradle/4.1/fileContent/fileContent.lock
diff --git a/.gradle/4.1/fileHashes/fileHashes.bin b/.gradle/4.1/fileHashes/fileHashes.bin
diff --git a/.gradle/4.1/fileHashes/fileHashes.lock b/.gradle/4.1/fileHashes/fileHashes.lock
diff --git a/.gradle/4.1/fileHashes/resourceHashesCache.bin b/.gradle/4.1/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/4.1/javaCompile/classAnalysis.bin b/.gradle/4.1/javaCompile/classAnalysis.bin
diff --git a/.gradle/4.1/javaCompile/jarAnalysis.bin b/.gradle/4.1/javaCompile/jarAnalysis.bin
diff --git a/.gradle/4.1/javaCompile/javaCompile.lock b/.gradle/4.1/javaCompile/javaCompile.lock
diff --git a/.gradle/4.1/javaCompile/taskHistory.bin b/.gradle/4.1/javaCompile/taskHistory.bin
diff --git a/.gradle/4.1/javaCompile/taskJars.bin b/.gradle/4.1/javaCompile/taskJars.bin
diff --git a/.gradle/4.1/taskHistory/fileSnapshots.bin b/.gradle/4.1/taskHistory/fileSnapshots.bin
diff --git a/.gradle/4.1/taskHistory/taskHistory.bin b/.gradle/4.1/taskHistory/taskHistory.bin
diff --git a/.gradle/4.1/taskHistory/taskHistory.lock b/.gradle/4.1/taskHistory/taskHistory.lock
diff --git a/.gradle/buildOutputCleanup/built.bin b/.gradle/buildOutputCleanup/built.bin
diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties
@@ -0,0 +1,2 @@
+#Mon Jun 25 10:20:15 CST 2018
+gradle.version=4.1
diff --git a/.gradle/buildOutputCleanup/cache.properties.lock b/.gradle/buildOutputCleanup/cache.properties.lock
@@ -0,0 +1 @@
+
diff --git a/.idea/libraries/android_android_27.xml b/.idea/libraries/android_android_27.xml
diff --git a/.idea/libraries/android_arch_core_common_1_1_0_jar.xml b/.idea/libraries/android_arch_core_common_1_1_0_jar.xml
diff --git a/.idea/libraries/android_arch_core_runtime_1_1_0.xml b/.idea/libraries/android_arch_core_runtime_1_1_0.xml
diff --git a/.idea/libraries/android_arch_lifecycle_common_1_1_0_jar.xml b/.idea/libraries/android_arch_lifecycle_common_1_1_0_jar.xml
diff --git a/.idea/libraries/android_arch_lifecycle_livedata_core_1_1_0.xml b/.idea/libraries/android_arch_lifecycle_livedata_core_1_1_0.xml
diff --git a/.idea/libraries/android_arch_lifecycle_runtime_1_1_0.xml b/.idea/libraries/android_arch_lifecycle_runtime_1_1_0.xml
diff --git a/.idea/libraries/android_arch_lifecycle_viewmodel_1_1_0.xml b/.idea/libraries/android_arch_lifecycle_viewmodel_1_1_0.xml
diff --git a/.idea/libraries/com_android_support_animated_vector_drawable_27_1_1.xml b/.idea/libraries/com_android_support_animated_vector_drawable_27_1_1.xml
diff --git a/.idea/libraries/com_android_support_appcompat_v7_27_1_1.xml b/.idea/libraries/com_android_support_appcompat_v7_27_1_1.xml
diff --git a/.idea/libraries/com_android_support_constraint_constraint_layout_1_1_2.xml b/.idea/libraries/com_android_support_constraint_constraint_layout_1_1_2.xml
diff --git a/.idea/libraries/com_android_support_constraint_constraint_layout_solver_1_1_2_jar.xml b/.idea/libraries/com_android_support_constraint_constraint_layout_solver_1_1_2_jar.xml
diff --git a/.idea/libraries/com_android_support_support_annotations_27_1_1_jar.xml b/.idea/libraries/com_android_support_support_annotations_27_1_1_jar.xml
diff --git a/.idea/libraries/com_android_support_support_compat_27_1_1.xml b/.idea/libraries/com_android_support_support_compat_27_1_1.xml
diff --git a/.idea/libraries/com_android_support_support_core_ui_27_1_1.xml b/.idea/libraries/com_android_support_support_core_ui_27_1_1.xml
diff --git a/.idea/libraries/com_android_support_support_core_utils_27_1_1.xml b/.idea/libraries/com_android_support_support_core_utils_27_1_1.xml
diff --git a/.idea/libraries/com_android_support_support_fragment_27_1_1.xml b/.idea/libraries/com_android_support_support_fragment_27_1_1.xml
diff --git a/.idea/libraries/com_android_support_support_vector_drawable_27_1_1.xml b/.idea/libraries/com_android_support_support_vector_drawable_27_1_1.xml
diff --git a/.idea/libraries/com_android_support_test_espresso_espresso_core_3_0_2.xml b/.idea/libraries/com_android_support_test_espresso_espresso_core_3_0_2.xml
diff --git a/.idea/libraries/com_android_support_test_espresso_espresso_idling_resource_3_0_2.xml b/.idea/libraries/com_android_support_test_espresso_espresso_idling_resource_3_0_2.xml
diff --git a/.idea/libraries/com_android_support_test_monitor_1_0_2.xml b/.idea/libraries/com_android_support_test_monitor_1_0_2.xml
diff --git a/.idea/libraries/com_android_support_test_runner_1_0_2.xml b/.idea/libraries/com_android_support_test_runner_1_0_2.xml
diff --git a/.idea/libraries/com_google_code_findbugs_jsr305_2_0_1_jar.xml b/.idea/libraries/com_google_code_findbugs_jsr305_2_0_1_jar.xml
diff --git a/.idea/libraries/com_squareup_javawriter_2_1_1_jar.xml b/.idea/libraries/com_squareup_javawriter_2_1_1_jar.xml
diff --git a/.idea/libraries/javax_inject_javax_inject_1_jar.xml b/.idea/libraries/javax_inject_javax_inject_1_jar.xml
diff --git a/.idea/libraries/junit_junit_4_12_jar.xml b/.idea/libraries/junit_junit_4_12_jar.xml
diff --git a/.idea/libraries/net_sf_kxml_kxml2_2_3_0_jar.xml b/.idea/libraries/net_sf_kxml_kxml2_2_3_0_jar.xml
diff --git a/.idea/libraries/org_hamcrest_hamcrest_core_1_3_jar.xml b/.idea/libraries/org_hamcrest_hamcrest_core_1_3_jar.xml
diff --git a/.idea/libraries/org_hamcrest_hamcrest_integration_1_3_jar.xml b/.idea/libraries/org_hamcrest_hamcrest_integration_1_3_jar.xml
diff --git a/.idea/libraries/org_hamcrest_hamcrest_library_1_3_jar.xml b/.idea/libraries/org_hamcrest_hamcrest_library_1_3_jar.xml