Merge branch 'release/1.6.0'

haniot · Jun 13, 2019 · c8f8d99 · c8f8d99
2 parents 626618f + eaa4a28
commit c8f8d99
Show file tree

Hide file tree

Showing 286 changed files with 10,192 additions and 11,477 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,24 +37,7 @@ com_crashlytics_export_strings.xml
 
 # IntelliJ
 *.iml
-.idea/.name
-.idea/compiler.xml
-.idea/encodings.xml
-.idea/misc.xml
-.idea/modules.xml
-.idea/scopes/scope_settings.xml
-.idea/vcs.xml
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/gradle.xml
-.idea/assetWizardSettings.xml
-.idea/copyright/profiles_settings.xml
-.idea/codeStyles/codeStyleConfig.xml
-.idea/dictionaries/
-.idea/libraries/
-.idea/caches/
-.idea/sonarlint/
-.idea/caches/**
+.idea
 
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/app/.idea/caches/build_file_checksums.ser b/app/.idea/caches/build_file_checksums.ser
diff --git a/app/.idea/codeStyles/Project.xml b/app/.idea/codeStyles/Project.xml
diff --git a/app/.idea/gradle.xml b/app/.idea/gradle.xml
diff --git a/app/.idea/libraries/Gradle__android_arch_core_common_1_1_0_jar.xml b/app/.idea/libraries/Gradle__android_arch_core_common_1_1_0_jar.xml
diff --git a/app/.idea/libraries/Gradle__android_arch_core_runtime_1_1_0.xml b/app/.idea/libraries/Gradle__android_arch_core_runtime_1_1_0.xml
diff --git a/app/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_0_jar.xml b/app/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_0_jar.xml
diff --git a/app/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_0.xml b/app/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_0.xml
diff --git a/app/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_0.xml b/app/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_0.xml
diff --git a/app/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_0.xml b/app/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_0.xml
diff --git a/app/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_27_1_1.xml b/app/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_27_1_1.xml
diff --git a/app/.idea/libraries/Gradle__com_android_support_appcompat_v7_27_1_1.xml b/app/.idea/libraries/Gradle__com_android_support_appcompat_v7_27_1_1.xml
diff --git a/app/.idea/libraries/Gradle__com_android_support_cardview_v7_27_1_1.xml b/app/.idea/libraries/Gradle__com_android_support_cardview_v7_27_1_1.xml
diff --git a/app/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_2.xml b/app/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_2.xml
diff --git a/...a/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_2_jar.xml b/...a/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_2_jar.xml
diff --git a/app/.idea/libraries/Gradle__com_android_support_design_27_1_1.xml b/app/.idea/libraries/Gradle__com_android_support_design_27_1_1.xml
diff --git a/app/.idea/libraries/Gradle__com_android_support_recyclerview_v7_27_1_1.xml b/app/.idea/libraries/Gradle__com_android_support_recyclerview_v7_27_1_1.xml
diff --git a/app/.idea/libraries/Gradle__com_android_support_support_annotations_27_1_1_jar.xml b/app/.idea/libraries/Gradle__com_android_support_support_annotations_27_1_1_jar.xml
diff --git a/app/.idea/libraries/Gradle__com_android_support_support_compat_27_1_1.xml b/app/.idea/libraries/Gradle__com_android_support_support_compat_27_1_1.xml
diff --git a/app/.idea/libraries/Gradle__com_android_support_support_core_ui_27_1_1.xml b/app/.idea/libraries/Gradle__com_android_support_support_core_ui_27_1_1.xml
diff --git a/app/.idea/libraries/Gradle__com_android_support_support_core_utils_27_1_1.xml b/app/.idea/libraries/Gradle__com_android_support_support_core_utils_27_1_1.xml
diff --git a/app/.idea/libraries/Gradle__com_android_support_support_fragment_27_1_1.xml b/app/.idea/libraries/Gradle__com_android_support_support_fragment_27_1_1.xml
diff --git a/app/.idea/libraries/Gradle__com_android_support_support_media_compat_27_1_1.xml b/app/.idea/libraries/Gradle__com_android_support_support_media_compat_27_1_1.xml
diff --git a/app/.idea/libraries/Gradle__com_android_support_support_v4_27_1_1.xml b/app/.idea/libraries/Gradle__com_android_support_support_v4_27_1_1.xml