diff --git a/.gradle/6.1.1/executionHistory/executionHistory.bin b/.gradle/6.1.1/executionHistory/executionHistory.bin
index b8f57ab..49da6c0 100644
Binary files a/.gradle/6.1.1/executionHistory/executionHistory.bin and b/.gradle/6.1.1/executionHistory/executionHistory.bin differ
diff --git a/.gradle/6.1.1/executionHistory/executionHistory.lock b/.gradle/6.1.1/executionHistory/executionHistory.lock
index 16cd68a..575aab0 100644
Binary files a/.gradle/6.1.1/executionHistory/executionHistory.lock and b/.gradle/6.1.1/executionHistory/executionHistory.lock differ
diff --git a/.gradle/6.1.1/fileHashes/fileHashes.bin b/.gradle/6.1.1/fileHashes/fileHashes.bin
index 16c863a..302fa15 100644
Binary files a/.gradle/6.1.1/fileHashes/fileHashes.bin and b/.gradle/6.1.1/fileHashes/fileHashes.bin differ
diff --git a/.gradle/6.1.1/fileHashes/fileHashes.lock b/.gradle/6.1.1/fileHashes/fileHashes.lock
index 1c10d02..ac09f2a 100644
Binary files a/.gradle/6.1.1/fileHashes/fileHashes.lock and b/.gradle/6.1.1/fileHashes/fileHashes.lock differ
diff --git a/.gradle/6.1.1/fileHashes/resourceHashesCache.bin b/.gradle/6.1.1/fileHashes/resourceHashesCache.bin
index 3c52ac0..fd5ab6c 100644
Binary files a/.gradle/6.1.1/fileHashes/resourceHashesCache.bin and b/.gradle/6.1.1/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/6.1.1/javaCompile/classAnalysis.bin b/.gradle/6.1.1/javaCompile/classAnalysis.bin
index 707ef0d..5b0d340 100644
Binary files a/.gradle/6.1.1/javaCompile/classAnalysis.bin and b/.gradle/6.1.1/javaCompile/classAnalysis.bin differ
diff --git a/.gradle/6.1.1/javaCompile/jarAnalysis.bin b/.gradle/6.1.1/javaCompile/jarAnalysis.bin
index b2f3d91..0a2ddea 100644
Binary files a/.gradle/6.1.1/javaCompile/jarAnalysis.bin and b/.gradle/6.1.1/javaCompile/jarAnalysis.bin differ
diff --git a/.gradle/6.1.1/javaCompile/javaCompile.lock b/.gradle/6.1.1/javaCompile/javaCompile.lock
index 4adbe9f..8217e13 100644
Binary files a/.gradle/6.1.1/javaCompile/javaCompile.lock and b/.gradle/6.1.1/javaCompile/javaCompile.lock differ
diff --git a/.gradle/6.1.1/javaCompile/taskHistory.bin b/.gradle/6.1.1/javaCompile/taskHistory.bin
index 1a1c74f..6689e4b 100644
Binary files a/.gradle/6.1.1/javaCompile/taskHistory.bin and b/.gradle/6.1.1/javaCompile/taskHistory.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 4d2ef84..9e3e8e0 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 48edab7..78cb659 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock
index b6aae94..abcf454 100644
Binary files a/.gradle/checksums/checksums.lock and b/.gradle/checksums/checksums.lock differ
diff --git a/.gradle/checksums/md5-checksums.bin b/.gradle/checksums/md5-checksums.bin
index 9da44d7..3d98d9a 100644
Binary files a/.gradle/checksums/md5-checksums.bin and b/.gradle/checksums/md5-checksums.bin differ
diff --git a/.gradle/checksums/sha1-checksums.bin b/.gradle/checksums/sha1-checksums.bin
index 1aa9c23..1397106 100644
Binary files a/.gradle/checksums/sha1-checksums.bin and b/.gradle/checksums/sha1-checksums.bin differ
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index a5f05cd..54bc1bb 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,5 +21,15 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_activity_activity_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_activity_activity_1_1_0_aar.xml
index 0acd925..f7dd6cd 100644
--- a/.idea/libraries/Gradle__androidx_activity_activity_1_1_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_activity_activity_1_1_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_aar.xml
index 641ab5a..31f1860 100644
--- a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_aar.xml
@@ -1,16 +1,12 @@
-
-
+
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_aar.xml
index 632b495..b7ab838 100644
--- a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_aar.xml
@@ -1,16 +1,12 @@
-
-
+
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_1_0_aar.xml
index 623fb99..90c233c 100644
--- a/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_1_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_1_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_1_0_aar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_1_0_aar.xml
index 38e09a8..db92ee5 100644
--- a/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_1_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_1_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_testing_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_testing_2_0_0_aar.xml
index 0ee50a6..a011fde 100644
--- a/.idea/libraries/Gradle__androidx_arch_core_core_testing_2_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_arch_core_core_testing_2_0_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml
index 93f744f..833a33d 100644
--- a/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml
index a839ac2..c8f0679 100644
--- a/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml
deleted file mode 100644
index f5ba6b2..0000000
--- a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml
index 6f15bb8..43a2dc3 100644
--- a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml
@@ -1,16 +1,12 @@
-
-
+
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_core_core_ktx_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_core_core_ktx_1_1_0_aar.xml
index c89d2b9..0f1ccfd 100644
--- a/.idea/libraries/Gradle__androidx_core_core_ktx_1_1_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_core_core_ktx_1_1_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml
index 01800b6..a397ed7 100644
--- a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml
index ac559aa..a71314a 100644
--- a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml
index 855d086..a0cb2c1 100644
--- a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml
index 68bc994..c18f092 100644
--- a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml
index 515b915..b3488bf 100644
--- a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml
deleted file mode 100644
index 5572ff5..0000000
--- a/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_extensions_2_2_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_extensions_2_2_0_rc01_aar.xml
index 441f51a..d653ee3 100644
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_extensions_2_2_0_rc01_aar.xml
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_extensions_2_2_0_rc01_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml
index 0666722..a6f5df0 100644
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_2_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_2_0_rc01_aar.xml
index b6d3333..def7dea 100644
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_2_0_rc01_aar.xml
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_2_0_rc01_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_2_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_2_0_aar.xml
index cf1bd41..d5f549c 100644
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_2_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_2_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_ktx_2_2_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_ktx_2_2_0_rc01_aar.xml
index caeac18..ef71cbb 100644
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_ktx_2_2_0_rc01_aar.xml
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_ktx_2_2_0_rc01_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_process_2_2_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_process_2_2_0_rc01_aar.xml
index 94018a3..b26216c 100644
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_process_2_2_0_rc01_aar.xml
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_process_2_2_0_rc01_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_2_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_2_0_aar.xml
index 19c8151..317dca6 100644
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_2_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_2_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_service_2_2_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_service_2_2_0_rc01_aar.xml
index 3588e8e..c804e9b 100644
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_service_2_2_0_rc01_aar.xml
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_service_2_2_0_rc01_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_2_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_2_0_aar.xml
index 4da4315..5091f35 100644
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_2_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_2_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml
index 422601e..ad940db 100644
--- a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml
index f9b98ae..066d36e 100644
--- a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml
deleted file mode 100644
index 4591484..0000000
--- a/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml
index f0fe80f..c3440c8 100644
--- a/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml
@@ -1,16 +1,12 @@
-
-
+
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_aar.xml
index 2c10405..a4c530d 100644
--- a/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_aar.xml
@@ -1,16 +1,12 @@
-
-
+
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml
index 56d7a7e..00044e9 100644
--- a/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml
index 60bf0f5..d87453c 100644
--- a/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml
index df20616..ab9f017 100644
--- a/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml
@@ -1,16 +1,12 @@
-
-
+
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_test_core_1_2_0_aar.xml b/.idea/libraries/Gradle__androidx_test_core_1_2_0_aar.xml
index 3915200..991008b 100644
--- a/.idea/libraries/Gradle__androidx_test_core_1_2_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_test_core_1_2_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_test_core_ktx_1_2_0_aar.xml b/.idea/libraries/Gradle__androidx_test_core_ktx_1_2_0_aar.xml
index da473f7..0d4a3f3 100644
--- a/.idea/libraries/Gradle__androidx_test_core_ktx_1_2_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_test_core_ktx_1_2_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_test_espresso_espresso_contrib_3_2_0_aar.xml b/.idea/libraries/Gradle__androidx_test_espresso_espresso_contrib_3_2_0_aar.xml
index 5722e46..c935361 100644
--- a/.idea/libraries/Gradle__androidx_test_espresso_espresso_contrib_3_2_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_test_espresso_espresso_contrib_3_2_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_2_0_aar.xml b/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_2_0_aar.xml
index 880144c..df78f84 100644
--- a/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_2_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_2_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_2_0_aar.xml b/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_2_0_aar.xml
index 6ae1447..f9a581c 100644
--- a/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_2_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_2_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_1_aar.xml b/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_1_aar.xml
index d3ce7c2..fce2293 100644
--- a/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_1_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_test_monitor_1_2_0_aar.xml b/.idea/libraries/Gradle__androidx_test_monitor_1_2_0_aar.xml
index e4ef323..5fe6e2f 100644
--- a/.idea/libraries/Gradle__androidx_test_monitor_1_2_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_test_monitor_1_2_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_test_rules_1_2_0_aar.xml b/.idea/libraries/Gradle__androidx_test_rules_1_2_0_aar.xml
index f803945..de53b6d 100644
--- a/.idea/libraries/Gradle__androidx_test_rules_1_2_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_test_rules_1_2_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_test_runner_1_2_0_aar.xml b/.idea/libraries/Gradle__androidx_test_runner_1_2_0_aar.xml
index beb73cb..b4c0cdc 100644
--- a/.idea/libraries/Gradle__androidx_test_runner_1_2_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_test_runner_1_2_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_aar.xml
index 50da947..b2ad5a5 100644
--- a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml
index fb7e35e..228f467 100644
--- a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml
index 73d43db..53a4ad9 100644
--- a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml
index cd787bd..46aa266 100644
--- a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_aar.xml
index d1cb364..1c8b42b 100644
--- a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml
index 06d79d5..b0a94e6 100644
--- a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__com_google_android_material_material_1_0_0_aar.xml b/.idea/libraries/Gradle__com_google_android_material_material_1_0_0_aar.xml
index f975c1f..d99eb42 100644
--- a/.idea/libraries/Gradle__com_google_android_material_material_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_material_material_1_0_0_aar.xml
@@ -1,16 +1,12 @@
-
-
+
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_28_3_aar.xml b/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_28_3_aar.xml
index 0e4e06f..83641e8 100644
--- a/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_28_3_aar.xml
+++ b/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_28_3_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__com_google_dagger_dagger_android_support_2_28_3_aar.xml b/.idea/libraries/Gradle__com_google_dagger_dagger_android_support_2_28_3_aar.xml
index 8484f10..deabd05 100644
--- a/.idea/libraries/Gradle__com_google_dagger_dagger_android_support_2_28_3_aar.xml
+++ b/.idea/libraries/Gradle__com_google_dagger_dagger_android_support_2_28_3_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__com_google_dagger_dagger_lint_aar_2_28_3_aar.xml b/.idea/libraries/Gradle__com_google_dagger_dagger_lint_aar_2_28_3_aar.xml
index 641d7d1..5334697 100644
--- a/.idea/libraries/Gradle__com_google_dagger_dagger_lint_aar_2_28_3_aar.xml
+++ b/.idea/libraries/Gradle__com_google_dagger_dagger_lint_aar_2_28_3_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__com_jraska_livedata_testing_1_1_1_aar.xml b/.idea/libraries/Gradle__com_jraska_livedata_testing_1_1_1_aar.xml
index 2ebee6b..111fb12 100644
--- a/.idea/libraries/Gradle__com_jraska_livedata_testing_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__com_jraska_livedata_testing_1_1_1_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__com_jraska_livedata_testing_ktx_1_1_1_aar.xml b/.idea/libraries/Gradle__com_jraska_livedata_testing_ktx_1_1_1_aar.xml
index 7897db3..5eb1dc8 100644
--- a/.idea/libraries/Gradle__com_jraska_livedata_testing_ktx_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__com_jraska_livedata_testing_ktx_1_1_1_aar.xml
@@ -1,12 +1,9 @@
-
-
-
-
-
-
+
+
+
diff --git a/.idea/libraries/Gradle__gradle_api_6_1_1.xml b/.idea/libraries/Gradle__gradle_api_6_1_1.xml
deleted file mode 100644
index 3da2939..0000000
--- a/.idea/libraries/Gradle__gradle_api_6_1_1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__gradle_installation_beacon_6_1_1.xml b/.idea/libraries/Gradle__gradle_installation_beacon_6_1_1.xml
deleted file mode 100644
index 6017fdb..0000000
--- a/.idea/libraries/Gradle__gradle_installation_beacon_6_1_1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__gradle_kotlin_dsl_6_1_1.xml b/.idea/libraries/Gradle__gradle_kotlin_dsl_6_1_1.xml
deleted file mode 100644
index 4359e33..0000000
--- a/.idea/libraries/Gradle__gradle_kotlin_dsl_6_1_1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__gradle_kotlin_dsl_extensions_6_1_1.xml b/.idea/libraries/Gradle__gradle_kotlin_dsl_extensions_6_1_1.xml
deleted file mode 100644
index 97be315..0000000
--- a/.idea/libraries/Gradle__gradle_kotlin_dsl_extensions_6_1_1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__gradle_kotlin_dsl_tooling_models_6_1_1.xml b/.idea/libraries/Gradle__gradle_kotlin_dsl_tooling_models_6_1_1.xml
deleted file mode 100644
index eafec80..0000000
--- a/.idea/libraries/Gradle__gradle_kotlin_dsl_tooling_models_6_1_1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__gradle_test_kit_6_1_1.xml b/.idea/libraries/Gradle__gradle_test_kit_6_1_1.xml
deleted file mode 100644
index 7a232a8..0000000
--- a/.idea/libraries/Gradle__gradle_test_kit_6_1_1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__groovy_all_1_3_2_5_8.xml b/.idea/libraries/Gradle__groovy_all_1_3_2_5_8.xml
deleted file mode 100644
index 470d7a3..0000000
--- a/.idea/libraries/Gradle__groovy_all_1_3_2_5_8.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__kotlin_reflect_1_3_61.xml b/.idea/libraries/Gradle__kotlin_reflect_1_3_61.xml
deleted file mode 100644
index d8eb35b..0000000
--- a/.idea/libraries/Gradle__kotlin_reflect_1_3_61.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__kotlin_stdlib_1_3_61.xml b/.idea/libraries/Gradle__kotlin_stdlib_1_3_61.xml
deleted file mode 100644
index fde3bb8..0000000
--- a/.idea/libraries/Gradle__kotlin_stdlib_1_3_61.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__kotlin_stdlib_common_1_3_61.xml b/.idea/libraries/Gradle__kotlin_stdlib_common_1_3_61.xml
deleted file mode 100644
index 81c428e..0000000
--- a/.idea/libraries/Gradle__kotlin_stdlib_common_1_3_61.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__kotlin_stdlib_jdk7_1_3_61.xml b/.idea/libraries/Gradle__kotlin_stdlib_jdk7_1_3_61.xml
deleted file mode 100644
index 7792241..0000000
--- a/.idea/libraries/Gradle__kotlin_stdlib_jdk7_1_3_61.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__kotlin_stdlib_jdk8_1_3_61.xml b/.idea/libraries/Gradle__kotlin_stdlib_jdk8_1_3_61.xml
deleted file mode 100644
index 3f68619..0000000
--- a/.idea/libraries/Gradle__kotlin_stdlib_jdk8_1_3_61.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/README.md b/README.md
index 365f79c..c31f285 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
[](https://developer.android.com/reference)
+[](https://app.bitrise.io/app/hvMbW5hyYuqrD5MSp89_jw)
@@ -38,7 +39,7 @@ There are four examples that could be used as start point:
# License
- Copyright 2020 Fernando Prieto Moyano
+ Copyright 2021 Fernando Prieto Moyano
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/build.gradle.kts b/build.gradle.kts
index 07c9044..b3dfc15 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,8 +1,11 @@
buildscript {
- val kotlin_version by extra("1.3.72")
+ val kotlin_version by extra("1.4.10")
repositories {
google()
jcenter()
+ maven {
+ url = uri("http://developer.huawei.com/repo/")
+ }
}
dependencies {
classpath(BuildDependencies.androidGradle)
@@ -17,6 +20,9 @@ allprojects {
repositories {
google()
jcenter()
+ maven {
+ url = uri("http://developer.huawei.com/repo/")
+ }
}
}
diff --git a/buildSrc/.gradle/6.1.1/executionHistory/executionHistory.bin b/buildSrc/.gradle/6.1.1/executionHistory/executionHistory.bin
index 2a17c0d..3dfa5e6 100644
Binary files a/buildSrc/.gradle/6.1.1/executionHistory/executionHistory.bin and b/buildSrc/.gradle/6.1.1/executionHistory/executionHistory.bin differ
diff --git a/buildSrc/.gradle/6.1.1/executionHistory/executionHistory.lock b/buildSrc/.gradle/6.1.1/executionHistory/executionHistory.lock
index 5fdb79f..02be5a0 100644
Binary files a/buildSrc/.gradle/6.1.1/executionHistory/executionHistory.lock and b/buildSrc/.gradle/6.1.1/executionHistory/executionHistory.lock differ
diff --git a/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index f5790f4..c36b5a5 100644
Binary files a/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 42f9303..ac5e216 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -2,6 +2,9 @@ repositories {
jcenter()
google()
mavenCentral()
+ maven {
+ url = uri("http://developer.huawei.com/repo/")
+ }
}
plugins {
@@ -11,7 +14,7 @@ plugins {
dependencies {
implementation(kotlin("stdlib"))
implementation("com.android.tools.build:gradle:4.0.1")
- implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
+ implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10")
implementation(gradleApi())
}
diff --git a/buildSrc/src/main/kotlin/prieto/fernando/Dependencies.kt b/buildSrc/src/main/kotlin/prieto/fernando/Dependencies.kt
index 269500b..fdd7a32 100644
--- a/buildSrc/src/main/kotlin/prieto/fernando/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/prieto/fernando/Dependencies.kt
@@ -35,7 +35,7 @@ object Versions {
const val coreTesting = "1.1.1"
const val hilt = "2.28-alpha"
const val javaGlObj = "0.3.0"
- const val arEngineSdk = "2.13.0.2"
+ const val arEngineSdk = "2.15.0.1"
}
object BuildDependencies {
diff --git a/rendering/build.gradle.kts b/rendering/build.gradle.kts
index 8fc9aed..097cadb 100644
--- a/rendering/build.gradle.kts
+++ b/rendering/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
}
dependencies {
- implementation(project(":HUAWEI_AR_SDK_v2.10.0"))
implementation(project(ProjectModules.arEngineCommon))
implementation(Dependencies.Rendering.javaGlObject)
+ implementation(Dependencies.Huawei.arEngine)
}
\ No newline at end of file