diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 0c18254..1e6b3a0 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 3e5993a..6c23501 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -9,12 +9,7 @@
-
-
-
-
-
diff --git a/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_alpha08_aar.xml b/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_alpha08_aar.xml
deleted file mode 100644
index 18548b5..0000000
--- a/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_alpha08_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_rc01_jar.xml b/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_rc01_jar.xml
deleted file mode 100644
index 2087654..0000000
--- a/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_rc01_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_annotation_annotation_1_1_0_rc01_jar.xml b/.idea/libraries/Gradle__androidx_annotation_annotation_1_1_0_rc01_jar.xml
deleted file mode 100644
index a45619a..0000000
--- a/.idea/libraries/Gradle__androidx_annotation_annotation_1_1_0_rc01_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_rc01_aar.xml
deleted file mode 100644
index bd0d3ce..0000000
--- a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_alpha05_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_alpha05_aar.xml
deleted file mode 100644
index 49bc22c..0000000
--- a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_alpha05_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_1_0_alpha05_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_1_0_alpha05_aar.xml
deleted file mode 100644
index d32a4c5..0000000
--- a/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_1_0_alpha05_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_rc01_jar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_rc01_jar.xml
deleted file mode 100644
index 3a8c8be..0000000
--- a/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_rc01_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_common_2_1_0_beta01_jar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_common_2_1_0_beta01_jar.xml
deleted file mode 100644
index 6fee901..0000000
--- a/.idea/libraries/Gradle__androidx_arch_core_core_common_2_1_0_beta01_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml
deleted file mode 100644
index 72a671f..0000000
--- a/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_rc01_aar.xml
deleted file mode 100644
index fcf4ba5..0000000
--- a/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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
deleted file mode 100644
index 7a56ea3..0000000
--- a/.idea/libraries/Gradle__androidx_arch_core_core_testing_2_0_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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
deleted file mode 100644
index d016ab5..0000000
--- a/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_rc01_aar.xml
deleted file mode 100644
index 92b1c9f..0000000
--- a/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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
deleted file mode 100644
index e4024a8..0000000
--- a/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_rc01_jar.xml b/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_rc01_jar.xml
deleted file mode 100644
index 585b745..0000000
--- a/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_rc01_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_collection_collection_1_1_0_rc01_jar.xml b/.idea/libraries/Gradle__androidx_collection_collection_1_1_0_rc01_jar.xml
deleted file mode 100644
index 43b2c44..0000000
--- a/.idea/libraries/Gradle__androidx_collection_collection_1_1_0_rc01_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_concurrent_concurrent_futures_1_0_0_beta01_jar.xml b/.idea/libraries/Gradle__androidx_concurrent_concurrent_futures_1_0_0_beta01_jar.xml
deleted file mode 100644
index 713f65a..0000000
--- a/.idea/libraries/Gradle__androidx_concurrent_concurrent_futures_1_0_0_beta01_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_2_0_0_alpha2_aar.xml b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_2_0_0_alpha2_aar.xml
deleted file mode 100644
index 91dbac7..0000000
--- a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_2_0_0_alpha2_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_2_0_0_alpha2_jar.xml b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_2_0_0_alpha2_jar.xml
deleted file mode 100644
index 27e9f4d..0000000
--- a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_2_0_0_alpha2_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_rc01_aar.xml
deleted file mode 100644
index 33fa3c1..0000000
--- a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_1_0_alpha01_aar.xml b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_1_0_alpha01_aar.xml
deleted file mode 100644
index 16770e4..0000000
--- a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_1_0_alpha01_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_core_core_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_core_core_1_0_0_rc01_aar.xml
deleted file mode 100644
index 1155f31..0000000
--- a/.idea/libraries/Gradle__androidx_core_core_1_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_core_core_1_1_0_beta01_aar.xml b/.idea/libraries/Gradle__androidx_core_core_1_1_0_beta01_aar.xml
deleted file mode 100644
index 9addbfd..0000000
--- a/.idea/libraries/Gradle__androidx_core_core_1_1_0_beta01_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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
deleted file mode 100644
index 1aa5b04..0000000
--- a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_rc01_aar.xml
deleted file mode 100644
index be93e77..0000000
--- a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml
deleted file mode 100644
index 2094549..0000000
--- a/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_rc01_aar.xml
deleted file mode 100644
index c263fcd..0000000
--- a/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_databinding_databinding_adapters_3_2_0_aar.xml b/.idea/libraries/Gradle__androidx_databinding_databinding_adapters_3_2_0_aar.xml
deleted file mode 100644
index 962e4f3..0000000
--- a/.idea/libraries/Gradle__androidx_databinding_databinding_adapters_3_2_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_databinding_databinding_common_3_2_0_jar.xml b/.idea/libraries/Gradle__androidx_databinding_databinding_common_3_2_0_jar.xml
deleted file mode 100644
index e0690cd..0000000
--- a/.idea/libraries/Gradle__androidx_databinding_databinding_common_3_2_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_databinding_databinding_runtime_3_2_0_aar.xml b/.idea/libraries/Gradle__androidx_databinding_databinding_runtime_3_2_0_aar.xml
deleted file mode 100644
index e24a280..0000000
--- a/.idea/libraries/Gradle__androidx_databinding_databinding_runtime_3_2_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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
deleted file mode 100644
index 7725852..0000000
--- a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_rc01_aar.xml
deleted file mode 100644
index 1375370..0000000
--- a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml
deleted file mode 100644
index 51596c4..0000000
--- a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_rc01_aar.xml
deleted file mode 100644
index eaa42c8..0000000
--- a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_rc01_aar.xml
deleted file mode 100644
index f38ebb8..0000000
--- a/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_alpha08_aar.xml b/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_alpha08_aar.xml
deleted file mode 100644
index 88fd6e7..0000000
--- a/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_alpha08_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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
deleted file mode 100644
index 3b1bacf..0000000
--- a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_rc01_aar.xml
deleted file mode 100644
index 9354a02..0000000
--- a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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
deleted file mode 100644
index 4317cf9..0000000
--- a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_rc01_aar.xml
deleted file mode 100644
index 143da9f..0000000
--- a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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
deleted file mode 100644
index a7f0008..0000000
--- a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_rc01_aar.xml
deleted file mode 100644
index 13e77bd..0000000
--- a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_rc01_jar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_rc01_jar.xml
deleted file mode 100644
index cba5f7e..0000000
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_rc01_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_2_0_alpha01_jar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_2_0_alpha01_jar.xml
deleted file mode 100644
index 4aae958..0000000
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_2_0_alpha01_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_extensions_2_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_extensions_2_0_0_rc01_aar.xml
deleted file mode 100644
index 85b2598..0000000
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_extensions_2_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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
deleted file mode 100644
index cceb473..0000000
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml
deleted file mode 100644
index e767d41..0000000
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_rc01_aar.xml
deleted file mode 100644
index 7e7e8bf..0000000
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_process_2_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_process_2_0_0_rc01_aar.xml
deleted file mode 100644
index 2bb9c3f..0000000
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_process_2_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_rc01_aar.xml
deleted file mode 100644
index c87a65c..0000000
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_2_0_alpha01_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_2_0_alpha01_aar.xml
deleted file mode 100644
index cc5d8ef..0000000
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_2_0_alpha01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_service_2_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_service_2_0_0_rc01_aar.xml
deleted file mode 100644
index 5a509f0..0000000
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_service_2_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_rc01_aar.xml
deleted file mode 100644
index 9486048..0000000
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_2_0_alpha01_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_2_0_alpha01_aar.xml
deleted file mode 100644
index 6529a14..0000000
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_2_0_alpha01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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
deleted file mode 100644
index 3943b40..0000000
--- a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_rc01_aar.xml
deleted file mode 100644
index 96a411c..0000000
--- a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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
deleted file mode 100644
index baa6b63..0000000
--- a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_rc01_aar.xml
deleted file mode 100644
index 017cfd0..0000000
--- a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_paging_paging_common_2_1_0_jar.xml b/.idea/libraries/Gradle__androidx_paging_paging_common_2_1_0_jar.xml
deleted file mode 100644
index d67df54..0000000
--- a/.idea/libraries/Gradle__androidx_paging_paging_common_2_1_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_paging_paging_common_ktx_2_1_0_jar.xml b/.idea/libraries/Gradle__androidx_paging_paging_common_ktx_2_1_0_jar.xml
deleted file mode 100644
index ea45de1..0000000
--- a/.idea/libraries/Gradle__androidx_paging_paging_common_ktx_2_1_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_paging_paging_runtime_2_1_0_aar.xml b/.idea/libraries/Gradle__androidx_paging_paging_runtime_2_1_0_aar.xml
deleted file mode 100644
index 5d1a7ef..0000000
--- a/.idea/libraries/Gradle__androidx_paging_paging_runtime_2_1_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_paging_paging_runtime_ktx_2_1_0_aar.xml b/.idea/libraries/Gradle__androidx_paging_paging_runtime_ktx_2_1_0_aar.xml
deleted file mode 100644
index c5e064d..0000000
--- a/.idea/libraries/Gradle__androidx_paging_paging_runtime_ktx_2_1_0_aar.xml
+++ /dev/null
@@ -1,12 +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
deleted file mode 100644
index df76ccd..0000000
--- a/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_print_print_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_print_print_1_0_0_rc01_aar.xml
deleted file mode 100644
index b0b7ae2..0000000
--- a/.idea/libraries/Gradle__androidx_print_print_1_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_1_0_alpha05_aar.xml b/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_1_0_alpha05_aar.xml
deleted file mode 100644
index 63853e5..0000000
--- a/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_1_0_alpha05_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_beta01_aar.xml b/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_beta01_aar.xml
deleted file mode 100644
index d313ab8..0000000
--- a/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_beta01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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
deleted file mode 100644
index e5af9b2..0000000
--- a/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_rc01_aar.xml
deleted file mode 100644
index 762c3bb..0000000
--- a/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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
deleted file mode 100644
index 1320704..0000000
--- a/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_rc01_aar.xml
deleted file mode 100644
index 954e554..0000000
--- a/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_test_core_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_test_core_1_0_0_aar.xml
deleted file mode 100644
index a8115e4..0000000
--- a/.idea/libraries/Gradle__androidx_test_core_1_0_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_test_ext_junit_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_test_ext_junit_1_0_0_aar.xml
deleted file mode 100644
index 1670e8d..0000000
--- a/.idea/libraries/Gradle__androidx_test_ext_junit_1_0_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_test_monitor_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_test_monitor_1_1_0_aar.xml
deleted file mode 100644
index 63163b3..0000000
--- a/.idea/libraries/Gradle__androidx_test_monitor_1_1_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_test_rules_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_test_rules_1_1_0_aar.xml
deleted file mode 100644
index aea23ad..0000000
--- a/.idea/libraries/Gradle__androidx_test_rules_1_1_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_test_runner_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_test_runner_1_1_0_aar.xml
deleted file mode 100644
index da20fbe..0000000
--- a/.idea/libraries/Gradle__androidx_test_runner_1_1_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_transition_transition_1_0_1_aar.xml b/.idea/libraries/Gradle__androidx_transition_transition_1_0_1_aar.xml
deleted file mode 100644
index dc575ef..0000000
--- a/.idea/libraries/Gradle__androidx_transition_transition_1_0_1_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_rc01_aar.xml
deleted file mode 100644
index c91cc35..0000000
--- a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_beta01_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_beta01_aar.xml
deleted file mode 100644
index 8665b06..0000000
--- a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_beta01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_rc01_aar.xml
deleted file mode 100644
index e976eef..0000000
--- a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_beta01_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_beta01_aar.xml
deleted file mode 100644
index 66c51f0..0000000
--- a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_beta01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_rc01_aar.xml
deleted file mode 100644
index 4159547..0000000
--- a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_beta01_aar.xml b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_beta01_aar.xml
deleted file mode 100644
index d796681..0000000
--- a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_beta01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_alpha04_aar.xml b/.idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_alpha04_aar.xml
deleted file mode 100644
index b5f4829..0000000
--- a/.idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_alpha04_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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
deleted file mode 100644
index d5c791b..0000000
--- a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_rc01_aar.xml
deleted file mode 100644
index 24286e7..0000000
--- a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_google_android_material_material_1_1_0_alpha07_aar.xml b/.idea/libraries/Gradle__com_google_android_material_material_1_1_0_alpha07_aar.xml
deleted file mode 100644
index fb7d296..0000000
--- a/.idea/libraries/Gradle__com_google_android_material_material_1_1_0_alpha07_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_google_auto_auto_common_0_8.xml b/.idea/libraries/Gradle__com_google_auto_auto_common_0_8.xml
new file mode 100644
index 0000000..2b32615
--- /dev/null
+++ b/.idea/libraries/Gradle__com_google_auto_auto_common_0_8.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_google_auto_service_auto_service_1_0_rc4.xml b/.idea/libraries/Gradle__com_google_auto_service_auto_service_1_0_rc4.xml
new file mode 100644
index 0000000..052e0d1
--- /dev/null
+++ b/.idea/libraries/Gradle__com_google_auto_service_auto_service_1_0_rc4.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_1_3_9.xml b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_1_3_9.xml
new file mode 100644
index 0000000..63b7b35
--- /dev/null
+++ b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_1_3_9.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_2_jar.xml b/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_2_jar.xml
deleted file mode 100644
index 941626f..0000000
--- a/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_2_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_google_errorprone_error_prone_annotations_2_0_18.xml b/.idea/libraries/Gradle__com_google_errorprone_error_prone_annotations_2_0_18.xml
new file mode 100644
index 0000000..eb64dcb
--- /dev/null
+++ b/.idea/libraries/Gradle__com_google_errorprone_error_prone_annotations_2_0_18.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_google_guava_guava_23_5_jre.xml b/.idea/libraries/Gradle__com_google_guava_guava_23_5_jre.xml
new file mode 100644
index 0000000..1ddc141
--- /dev/null
+++ b/.idea/libraries/Gradle__com_google_guava_guava_23_5_jre.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_google_guava_listenablefuture_1_0_jar.xml b/.idea/libraries/Gradle__com_google_guava_listenablefuture_1_0_jar.xml
deleted file mode 100644
index b37305e..0000000
--- a/.idea/libraries/Gradle__com_google_guava_listenablefuture_1_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_google_j2objc_j2objc_annotations_1_1.xml b/.idea/libraries/Gradle__com_google_j2objc_j2objc_annotations_1_1.xml
new file mode 100644
index 0000000..ab45264
--- /dev/null
+++ b/.idea/libraries/Gradle__com_google_j2objc_j2objc_annotations_1_1.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_jakewharton_retrofit_retrofit2_kotlin_coroutines_adapter_0_9_2_jar.xml b/.idea/libraries/Gradle__com_jakewharton_retrofit_retrofit2_kotlin_coroutines_adapter_0_9_2_jar.xml
deleted file mode 100644
index 5d09e92..0000000
--- a/.idea/libraries/Gradle__com_jakewharton_retrofit_retrofit2_kotlin_coroutines_adapter_0_9_2_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_nhaarman_mockitokotlin2_mockito_kotlin_2_0_0_RC3_jar.xml b/.idea/libraries/Gradle__com_nhaarman_mockitokotlin2_mockito_kotlin_2_0_0_RC3_jar.xml
deleted file mode 100644
index b5f5c34..0000000
--- a/.idea/libraries/Gradle__com_nhaarman_mockitokotlin2_mockito_kotlin_2_0_0_RC3_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_kotlinpoet_1_0_1.xml b/.idea/libraries/Gradle__com_squareup_kotlinpoet_1_0_1.xml
new file mode 100644
index 0000000..42e6b86
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_kotlinpoet_1_0_1.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_10_0_jar.xml b/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_10_0_jar.xml
deleted file mode 100644
index 70c9278..0000000
--- a/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_10_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_10_0_jar.xml b/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_10_0_jar.xml
deleted file mode 100644
index 3bb1ed9..0000000
--- a/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_10_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_okio_okio_1_14_0_jar.xml b/.idea/libraries/Gradle__com_squareup_okio_okio_1_14_0_jar.xml
deleted file mode 100644
index 9c3a836..0000000
--- a/.idea/libraries/Gradle__com_squareup_okio_okio_1_14_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_retrofit2_adapter_rxjava2_2_4_0_jar.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_adapter_rxjava2_2_4_0_jar.xml
deleted file mode 100644
index 6743c8c..0000000
--- a/.idea/libraries/Gradle__com_squareup_retrofit2_adapter_rxjava2_2_4_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_4_0_jar.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_4_0_jar.xml
deleted file mode 100644
index 0f3d9e3..0000000
--- a/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_4_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_4_0_jar.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_4_0_jar.xml
deleted file mode 100644
index 54a35dd..0000000
--- a/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_4_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_4_0_jar.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_4_0_jar.xml
deleted file mode 100644
index f5a5812..0000000
--- a/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_4_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_0_0_jar.xml b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_0_0_jar.xml
deleted file mode 100644
index 1d49c58..0000000
--- a/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_0_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__junit_junit_4_12_jar.xml b/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
deleted file mode 100644
index f4f25a8..0000000
--- a/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_1_9_0_jar.xml b/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_1_9_0_jar.xml
deleted file mode 100644
index 9cc7eb3..0000000
--- a/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_1_9_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_agent_1_9_0_jar.xml b/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_agent_1_9_0_jar.xml
deleted file mode 100644
index 79639c0..0000000
--- a/.idea/libraries/Gradle__net_bytebuddy_byte_buddy_agent_1_9_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml b/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml
deleted file mode 100644
index 5855a29..0000000
--- a/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_checkerframework_checker_qual_2_0_0.xml b/.idea/libraries/Gradle__org_checkerframework_checker_qual_2_0_0.xml
new file mode 100644
index 0000000..6c45a0e
--- /dev/null
+++ b/.idea/libraries/Gradle__org_checkerframework_checker_qual_2_0_0.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_codehaus_mojo_animal_sniffer_annotations_1_14.xml b/.idea/libraries/Gradle__org_codehaus_mojo_animal_sniffer_annotations_1_14.xml
new file mode 100644
index 0000000..72ee118
--- /dev/null
+++ b/.idea/libraries/Gradle__org_codehaus_mojo_animal_sniffer_annotations_1_14.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
deleted file mode 100644
index 50cf2b9..0000000
--- a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml b/.idea/libraries/Gradle__org_jetbrains_annotations_13_0.xml
similarity index 88%
rename from .idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml
rename to .idea/libraries/Gradle__org_jetbrains_annotations_13_0.xml
index 93524e8..4f32fde 100644
--- a/.idea/libraries/Gradle__org_jetbrains_annotations_13_0_jar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_annotations_13_0.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_31_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_31_jar.xml
deleted file mode 100644
index 38b5585..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_31_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_3_31_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_3_11.xml
similarity index 55%
rename from .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_3_31_jar.xml
rename to .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_3_11.xml
index f096dfb..b74167b 100644
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_3_31_jar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_3_11.xml
@@ -1,11 +1,11 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_31_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_31.xml
similarity index 98%
rename from .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_31_jar.xml
rename to .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_31.xml
index ab9ced4..6996138 100644
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_31_jar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_31.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_50_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_50_jar.xml
deleted file mode 100644
index aea6e3f..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_50_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_31_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_31.xml
similarity index 94%
rename from .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_31_jar.xml
rename to .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_31.xml
index aca1863..fed9c8f 100644
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_31_jar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_31.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_50_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_50_jar.xml
deleted file mode 100644
index c33ec3e..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_50_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_31_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_31.xml
similarity index 97%
rename from .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_31_jar.xml
rename to .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_31.xml
index c5ce24b..4da425e 100644
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_31_jar.xml
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_31.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk8_1_3_31.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk8_1_3_31.xml
new file mode 100644
index 0000000..8c66453
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk8_1_3_31.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlinx_atomicfu_common_0_11_7_eap13_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlinx_atomicfu_common_0_11_7_eap13_jar.xml
deleted file mode 100644
index a9fb453..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlinx_atomicfu_common_0_11_7_eap13_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_2_1_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_2_1_jar.xml
deleted file mode 100644
index 43eea84..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_2_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_0_26_1_eap13_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_0_26_1_eap13_jar.xml
deleted file mode 100644
index b26fa7d..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_0_26_1_eap13_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_2_1_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_2_1_jar.xml
deleted file mode 100644
index 43ba7cb..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_2_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_3_1_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_3_1_jar.xml
deleted file mode 100644
index 490cbb2..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_3_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_common_0_26_1_eap13_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_common_0_26_1_eap13_jar.xml
deleted file mode 100644
index 9f384dd..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_common_0_26_1_eap13_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_debug_1_3_1_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_debug_1_3_1_jar.xml
deleted file mode 100644
index 23688bb..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_debug_1_3_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_test_1_3_1_jar.xml b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_test_1_3_1_jar.xml
deleted file mode 100644
index 9c8f77c..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_test_1_3_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_kodein_di_kodein_di_core_common_5_1_1_jar.xml b/.idea/libraries/Gradle__org_kodein_di_kodein_di_core_common_5_1_1_jar.xml
deleted file mode 100644
index 47363e2..0000000
--- a/.idea/libraries/Gradle__org_kodein_di_kodein_di_core_common_5_1_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_kodein_di_kodein_di_core_jvm_5_1_1_jar.xml b/.idea/libraries/Gradle__org_kodein_di_kodein_di_core_jvm_5_1_1_jar.xml
deleted file mode 100644
index 186690b..0000000
--- a/.idea/libraries/Gradle__org_kodein_di_kodein_di_core_jvm_5_1_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_kodein_di_kodein_di_framework_android_5_1_1_aar.xml b/.idea/libraries/Gradle__org_kodein_di_kodein_di_framework_android_5_1_1_aar.xml
deleted file mode 100644
index 802c224..0000000
--- a/.idea/libraries/Gradle__org_kodein_di_kodein_di_framework_android_5_1_1_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_kodein_di_kodein_di_generic_jvm_5_1_1_jar.xml b/.idea/libraries/Gradle__org_kodein_di_kodein_di_generic_jvm_5_1_1_jar.xml
deleted file mode 100644
index 893bb1a..0000000
--- a/.idea/libraries/Gradle__org_kodein_di_kodein_di_generic_jvm_5_1_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_mockito_mockito_core_2_23_0_jar.xml b/.idea/libraries/Gradle__org_mockito_mockito_core_2_23_0_jar.xml
deleted file mode 100644
index 3a99e44..0000000
--- a/.idea/libraries/Gradle__org_mockito_mockito_core_2_23_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_objenesis_objenesis_2_6_jar.xml b/.idea/libraries/Gradle__org_objenesis_objenesis_2_6_jar.xml
deleted file mode 100644
index c6fc69c..0000000
--- a/.idea/libraries/Gradle__org_objenesis_objenesis_2_6_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_0_jar.xml b/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_0_jar.xml
deleted file mode 100644
index f4fcefc..0000000
--- a/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 20b4c06..1acff6a 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,12 +4,7 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules/processor/processor.iml b/.idea/modules/processor/processor.iml
index 374bcf9..06b6c2a 100644
--- a/.idea/modules/processor/processor.iml
+++ b/.idea/modules/processor/processor.iml
@@ -1,5 +1,5 @@
-
+
@@ -55,6 +55,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -71,13 +89,8 @@
-
-
-
-
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/annotations/annotations.iml b/annotations/annotations.iml
index d22b90f..a49f578 100644
--- a/annotations/annotations.iml
+++ b/annotations/annotations.iml
@@ -1,5 +1,5 @@
-
+
@@ -55,6 +55,11 @@
+
+
+
+
+
diff --git a/core.iml b/core.iml
index 65c374e..b377883 100644
--- a/core.iml
+++ b/core.iml
@@ -1,5 +1,5 @@
-
+
@@ -8,7 +8,9 @@
-
+
+
+
diff --git a/gateway/.gitignore b/gateway/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/gateway/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/gateway/build.gradle b/gateway/build.gradle
deleted file mode 100644
index d74c785..0000000
--- a/gateway/build.gradle
+++ /dev/null
@@ -1,45 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
-
-android {
- compileSdkVersion sdk_compile_version
-
- defaultConfig {
- minSdkVersion sdk_min_version
- targetSdkVersion sdk_compile_version
- versionCode 1
- versionName "1.0"
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
-
- compileOptions {
- sourceCompatibility 1.8
- targetCompatibility 1.8
- }
-
- kotlinOptions {
- jvmTarget = "1.8"
- }
-
-}
-
-dependencies {
- implementation fileTree(include: ['*.jar'], dir: 'libs')
- rootProject.coreGateway.each {
- add(it.configuration, it.dependency, it.options)
- }
-
- implementation project(':networkmanager')
- implementation project(':remote')
-}
diff --git a/gateway/gateway.iml b/gateway/gateway.iml
deleted file mode 100644
index 3895f9f..0000000
--- a/gateway/gateway.iml
+++ /dev/null
@@ -1,233 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- generateDebugSources
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/gateway/proguard-rules.pro b/gateway/proguard-rules.pro
deleted file mode 100644
index f1b4245..0000000
--- a/gateway/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# 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 *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/gateway/src/androidTest/java/com/vrgsoft/coregateway/ExampleInstrumentedTest.java b/gateway/src/androidTest/java/com/vrgsoft/coregateway/ExampleInstrumentedTest.java
deleted file mode 100644
index def2525..0000000
--- a/gateway/src/androidTest/java/com/vrgsoft/coregateway/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.vrgsoft.coregateway;
-
-import android.content.Context;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see Testing documentation
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
- @Test
- public void useAppContext() {
- // Context of the app under test.
- Context appContext = InstrumentationRegistry.getTargetContext();
-
- assertEquals("com.vrgsoft.coregateway.test", appContext.getPackageName());
- }
-}
diff --git a/gateway/src/main/AndroidManifest.xml b/gateway/src/main/AndroidManifest.xml
deleted file mode 100644
index 8a0bf0b..0000000
--- a/gateway/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
diff --git a/gateway/src/main/java/com/vrgsoft/coregateway/BaseGateway.kt b/gateway/src/main/java/com/vrgsoft/coregateway/BaseGateway.kt
deleted file mode 100644
index aef0f67..0000000
--- a/gateway/src/main/java/com/vrgsoft/coregateway/BaseGateway.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.vrgsoft.coregateway
-
-import androidx.annotation.VisibleForTesting
-import com.vrgsoft.coreremote.error.BaseError
-import com.vrgsoft.coreremote.result.BaseResult
-import com.vrgsoft.coreremote.result.ErrorResult
-import com.vrgsoft.networkmanager.NetworkManager
-
-abstract class BaseGateway(override val networkManager: NetworkManager) : IBaseGateway {
-
- @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
- suspend fun executeRemote(call: suspend (() -> BaseResult)): BaseResult {
- networkManager.startProcessing()
-
- val result = call.invoke()
-
- networkManager.stopProcessing()
-
- if (result is ErrorResult) {
- val message = calculateMessage(result.error)
-
- networkManager.errors.call(Error(message))
- }
-
- return result
- }
-
- abstract fun calculateMessage(error: BaseError): String
-}
\ No newline at end of file
diff --git a/gateway/src/main/java/com/vrgsoft/coregateway/DefaultValues.kt b/gateway/src/main/java/com/vrgsoft/coregateway/DefaultValues.kt
deleted file mode 100644
index 8a58c80..0000000
--- a/gateway/src/main/java/com/vrgsoft/coregateway/DefaultValues.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.vrgsoft.coregateway
-
-fun Long?.orMinusOne(): Long {
- return this ?: -1L
-}
-
-fun Long?.orZero(): Long {
- return this ?: 0L
-}
-
-fun Int?.orMinusOne(): Int {
- return this ?: -1
-}
-
-fun Int?.orZero(): Int {
- return this ?: 0
-}
\ No newline at end of file
diff --git a/gateway/src/main/java/com/vrgsoft/coregateway/IBaseGateway.kt b/gateway/src/main/java/com/vrgsoft/coregateway/IBaseGateway.kt
deleted file mode 100644
index a6d6978..0000000
--- a/gateway/src/main/java/com/vrgsoft/coregateway/IBaseGateway.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.vrgsoft.coregateway
-
-import com.vrgsoft.networkmanager.NetworkManager
-
-interface IBaseGateway {
- val networkManager: NetworkManager
-}
\ No newline at end of file
diff --git a/gateway/src/main/java/com/vrgsoft/coregateway/boundary/BaseCallback.kt b/gateway/src/main/java/com/vrgsoft/coregateway/boundary/BaseCallback.kt
deleted file mode 100644
index b75f798..0000000
--- a/gateway/src/main/java/com/vrgsoft/coregateway/boundary/BaseCallback.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.vrgsoft.coregateway.boundary
-
-import androidx.paging.PagedList
-import com.vrgsoft.networkmanager.NetworkManager
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.launch
-
-class BaseCallback(
- private val networkManager: NetworkManager,
- private val getAllCount: (suspend () -> Int),
- private val fetch: (suspend (count: Int) -> Unit)
-) : PagedList.BoundaryCallback() {
- private var channel = Channel()
-
- private suspend fun loadMore() {
- if (networkManager.processing.value == true) {
- return
- }
-
- val count = getAllCount.invoke()
- fetch.invoke(count)
- }
-
- override fun onZeroItemsLoaded() {
- super.onZeroItemsLoaded()
-
- GlobalScope.launch {
- channel.send(1)
- }
- }
-
- override fun onItemAtEndLoaded(itemAtEnd: T) {
- super.onItemAtEndLoaded(itemAtEnd)
-
- GlobalScope.launch {
- channel.send(1)
- }
- }
-
- init {
- GlobalScope.launch {
- while (true) {
- channel.receive()
- if (networkManager.processing.value == true) {
- continue
- }
- loadMore()
- }
- }
- }
-}
\ No newline at end of file
diff --git a/gateway/src/main/java/com/vrgsoft/coregateway/boundary/Ext.kt b/gateway/src/main/java/com/vrgsoft/coregateway/boundary/Ext.kt
deleted file mode 100644
index c337e5c..0000000
--- a/gateway/src/main/java/com/vrgsoft/coregateway/boundary/Ext.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.vrgsoft.coregateway.boundary
-
-import androidx.lifecycle.LiveData
-import androidx.paging.DataSource
-import androidx.paging.PagedList
-import androidx.paging.toLiveData
-import com.vrgsoft.networkmanager.NetworkManager
-
-fun DataSource.Factory.toLiveData(
- networkManager: NetworkManager,
- pageSize: Int,
- getLocalCount: (suspend () -> Int),
- fetch: (suspend (count: Int) -> Unit)
-): LiveData> {
- return this.toLiveData(
- pageSize = pageSize,
- boundaryCallback = BaseCallback(
- networkManager = networkManager,
- getAllCount = getLocalCount,
- fetch = fetch
- )
- )
-}
\ No newline at end of file
diff --git a/gateway/src/main/res/values/strings.xml b/gateway/src/main/res/values/strings.xml
deleted file mode 100644
index 5c86e29..0000000
--- a/gateway/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
- Core Gateway
-
diff --git a/gateway/src/test/java/com/vrgsoft/coregateway/BaseGatewayTest.kt b/gateway/src/test/java/com/vrgsoft/coregateway/BaseGatewayTest.kt
deleted file mode 100644
index 1817549..0000000
--- a/gateway/src/test/java/com/vrgsoft/coregateway/BaseGatewayTest.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.vrgsoft.coregateway
-
-import com.nhaarman.mockitokotlin2.spy
-import com.nhaarman.mockitokotlin2.verify
-import com.vrgsoft.coregateway.base.LiveDataTest
-import com.vrgsoft.coreremote.error.ConnectionError
-import com.vrgsoft.coreremote.result.BaseResult
-import com.vrgsoft.coreremote.result.ErrorResult
-import com.vrgsoft.coreremote.result.SuccessResult
-import com.vrgsoft.networkmanager.NetworkManager
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.ObsoleteCoroutinesApi
-import kotlinx.coroutines.test.runBlockingTest
-import org.junit.Assert
-import org.junit.Test
-
-@ObsoleteCoroutinesApi
-@ExperimentalCoroutinesApi
-class BaseGatewayTest : LiveDataTest() {
-
- private lateinit var gateway: BaseGateway
- private lateinit var manager: NetworkManager
-
- override fun setUpDetail() {
- manager = spy(NetworkManager())
- gateway = MockedGateway(manager)
- }
-
- @Test
- fun testSuccess() {
- val testData = 1488
- runBlockingTest {
- val call: (suspend () -> BaseResult) = {
- SuccessResult(testData)
- }
- val result = gateway.executeRemote(call)
-
- verify(manager).startProcessing()
- verify(manager).stopProcessing()
- Assert.assertEquals(true, result is SuccessResult)
- Assert.assertEquals(testData, (result as SuccessResult).data)
- }
- }
-
- @Test
- fun testError() {
- runBlockingTest {
- val call: (suspend () -> BaseResult) = {
- ErrorResult(ConnectionError())
- }
- val result = gateway.executeRemote(call)
-
- verify(manager).startProcessing()
- verify(manager).stopProcessing()
- Assert.assertEquals(true, result is ErrorResult)
- Assert.assertEquals(true, (result as ErrorResult).error is ConnectionError)
- }
- }
-}
\ No newline at end of file
diff --git a/gateway/src/test/java/com/vrgsoft/coregateway/MockedGateway.kt b/gateway/src/test/java/com/vrgsoft/coregateway/MockedGateway.kt
deleted file mode 100644
index c49a16d..0000000
--- a/gateway/src/test/java/com/vrgsoft/coregateway/MockedGateway.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.vrgsoft.coregateway
-
-import com.vrgsoft.coreremote.error.BaseError
-import com.vrgsoft.networkmanager.NetworkManager
-
-class MockedGateway(manager: NetworkManager) : BaseGateway(manager) {
- override fun calculateMessage(error: BaseError): String {
- return ""
- }
-}
\ No newline at end of file
diff --git a/gateway/src/test/java/com/vrgsoft/coregateway/base/LiveDataTest.kt b/gateway/src/test/java/com/vrgsoft/coregateway/base/LiveDataTest.kt
deleted file mode 100644
index 7139c83..0000000
--- a/gateway/src/test/java/com/vrgsoft/coregateway/base/LiveDataTest.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.vrgsoft.coregateway.base
-
-import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.ObsoleteCoroutinesApi
-import kotlinx.coroutines.newSingleThreadContext
-import kotlinx.coroutines.test.resetMain
-import kotlinx.coroutines.test.setMain
-import org.junit.After
-import org.junit.Before
-import org.junit.Rule
-import org.junit.rules.TestRule
-
-@ObsoleteCoroutinesApi
-@ExperimentalCoroutinesApi
-abstract class LiveDataTest {
- @get:Rule
- var rule: TestRule = InstantTaskExecutorRule()
-
- private val mainThreadSurrogate = newSingleThreadContext("UI thread")
-
- @Before
- fun setUp() {
- Dispatchers.setMain(mainThreadSurrogate)
- setUpDetail()
- }
-
- open fun setUpDetail() {}
-
- @After
- fun tearDown() {
- Dispatchers.resetMain() // reset main dispatcher to the original Main dispatcher
- mainThreadSurrogate.close()
- }
-}
\ No newline at end of file
diff --git a/gateway/src/test/java/com/vrgsoft/coregateway/base/assert.kt b/gateway/src/test/java/com/vrgsoft/coregateway/base/assert.kt
deleted file mode 100644
index e72315b..0000000
--- a/gateway/src/test/java/com/vrgsoft/coregateway/base/assert.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.vrgsoft.coregateway.base
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.Observer
-import com.nhaarman.mockitokotlin2.argumentCaptor
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.times
-import com.nhaarman.mockitokotlin2.verify
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.runBlocking
-
-inline fun LiveData.assert(calls: Int = 2, crossinline assert: ((it: T) -> Unit)) {
- val observer: Observer = mock()
- val captor = argumentCaptor()
-
- runBlocking {
- this@assert.observeForever(observer)
-
- delay(1000)
-
- captor.run {
- verify(observer, times(calls)).onChanged(capture())
- assert.invoke(captor.lastValue)
- }
- }
-}
\ No newline at end of file
diff --git a/gateway/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/gateway/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
deleted file mode 100644
index 1f0955d..0000000
--- a/gateway/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
+++ /dev/null
@@ -1 +0,0 @@
-mock-maker-inline
diff --git a/networkmanager/.gitignore b/networkmanager/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/networkmanager/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/networkmanager/build.gradle b/networkmanager/build.gradle
deleted file mode 100644
index de2487d..0000000
--- a/networkmanager/build.gradle
+++ /dev/null
@@ -1,42 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
-
-android {
- compileSdkVersion sdk_compile_version
-
- defaultConfig {
- minSdkVersion sdk_min_version
- targetSdkVersion sdk_compile_version
- versionCode 1
- versionName "1.0"
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
-
- compileOptions {
- sourceCompatibility 1.8
- targetCompatibility 1.8
- }
-
- kotlinOptions {
- jvmTarget = "1.8"
- }
-
-}
-
-dependencies {
- implementation fileTree(include: ['*.jar'], dir: 'libs')
- rootProject.networkManager.each {
- add(it.configuration, it.dependency, it.options)
- }
-}
diff --git a/networkmanager/networkmanager.iml b/networkmanager/networkmanager.iml
deleted file mode 100644
index 4356f37..0000000
--- a/networkmanager/networkmanager.iml
+++ /dev/null
@@ -1,215 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- generateDebugSources
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/networkmanager/proguard-rules.pro b/networkmanager/proguard-rules.pro
deleted file mode 100644
index f1b4245..0000000
--- a/networkmanager/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# 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 *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/networkmanager/src/androidTest/java/com/vrgsoft/networkmanager/ExampleInstrumentedTest.java b/networkmanager/src/androidTest/java/com/vrgsoft/networkmanager/ExampleInstrumentedTest.java
deleted file mode 100644
index dc86bd7..0000000
--- a/networkmanager/src/androidTest/java/com/vrgsoft/networkmanager/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.vrgsoft.networkmanager;
-
-import android.content.Context;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see Testing documentation
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
- @Test
- public void useAppContext() {
- // Context of the app under test.
- Context appContext = InstrumentationRegistry.getTargetContext();
-
- assertEquals("com.vrgsoft.networkmanager.test", appContext.getPackageName());
- }
-}
diff --git a/networkmanager/src/main/AndroidManifest.xml b/networkmanager/src/main/AndroidManifest.xml
deleted file mode 100644
index cf21b2f..0000000
--- a/networkmanager/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
diff --git a/networkmanager/src/main/java/com/vrgsoft/networkmanager/NetworkManager.kt b/networkmanager/src/main/java/com/vrgsoft/networkmanager/NetworkManager.kt
deleted file mode 100644
index 390bedc..0000000
--- a/networkmanager/src/main/java/com/vrgsoft/networkmanager/NetworkManager.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.vrgsoft.networkmanager
-
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.MutableLiveData
-import com.vrgsoft.networkmanager.livedata.SingleLiveManager
-
-class NetworkManager {
- val errors = SingleLiveManager()
-
- val processing = MutableLiveData().apply {
- postValue(false)
- }
-
- fun startProcessing() {
- processing.postValue(true)
- }
-
- fun stopProcessing() {
- processing.postValue(false)
- }
-
- fun applyDefaultObserver(fragment: Fragment) {
- errors.observe(fragment) {
- Toast.makeText(fragment.requireActivity(), it?.message ?: return@observe, Toast.LENGTH_SHORT).show()
- }
- }
-}
\ No newline at end of file
diff --git a/networkmanager/src/main/java/com/vrgsoft/networkmanager/livedata/SingleLiveEvent.kt b/networkmanager/src/main/java/com/vrgsoft/networkmanager/livedata/SingleLiveEvent.kt
deleted file mode 100644
index 9e48858..0000000
--- a/networkmanager/src/main/java/com/vrgsoft/networkmanager/livedata/SingleLiveEvent.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.vrgsoft.networkmanager.livedata
-
-import android.util.Log
-import androidx.annotation.MainThread
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Observer
-import java.util.concurrent.atomic.AtomicBoolean
-
-class SingleLiveEvent : MutableLiveData() {
-
- private val pending = AtomicBoolean(false)
-
- @MainThread
- override fun observe(owner: LifecycleOwner, observer: Observer) {
- if (hasActiveObservers()) {
- Log.w(TAG, "Multiple observers registered but only one will be notified of changes.")
- }
-
- // Observe the internal MutableLiveData
- super.observe(owner, Observer { t ->
- if (pending.compareAndSet(true, false)) {
- observer.onChanged(t)
- }
- })
- }
-
- @MainThread
- override fun setValue(t: T?) {
- pending.set(true)
- super.setValue(t)
- }
-
- /**
- * Used for cases where T is Void, to make calls cleaner.
- */
- @MainThread
- fun call() {
- value = null
- }
-
- companion object {
- private const val TAG = "SingleLiveEvent"
- }
-}
\ No newline at end of file
diff --git a/networkmanager/src/main/java/com/vrgsoft/networkmanager/livedata/SingleLiveManager.kt b/networkmanager/src/main/java/com/vrgsoft/networkmanager/livedata/SingleLiveManager.kt
deleted file mode 100644
index a0697bb..0000000
--- a/networkmanager/src/main/java/com/vrgsoft/networkmanager/livedata/SingleLiveManager.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.vrgsoft.networkmanager.livedata
-
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.Observer
-
-class SingleLiveManager(val defValue: T? = null) {
- private val event = SingleLiveEvent()
-
- fun call(data: T) {
- event.postValue(data)
- }
-
- fun call() {
- checkNotNull(defValue) { "You must set default value for this call" }
-
- event.postValue(defValue)
- }
-
- fun observe(owner: LifecycleOwner, observer: ((item: T?) -> Unit)) {
- event.observe(owner, Observer {
- observer.invoke(it)
- })
- }
-}
\ No newline at end of file
diff --git a/networkmanager/src/main/res/values/strings.xml b/networkmanager/src/main/res/values/strings.xml
deleted file mode 100644
index f2c9ab5..0000000
--- a/networkmanager/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
- Network Manager
-
diff --git a/networkmanager/src/test/java/com/vrgsoft/networkmanager/ExampleUnitTest.java b/networkmanager/src/test/java/com/vrgsoft/networkmanager/ExampleUnitTest.java
deleted file mode 100644
index 4825483..0000000
--- a/networkmanager/src/test/java/com/vrgsoft/networkmanager/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.vrgsoft.networkmanager;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see Testing documentation
- */
-public class ExampleUnitTest {
- @Test
- public void addition_isCorrect() {
- assertEquals(4, 2 + 2);
- }
-}
\ No newline at end of file
diff --git a/presentation/.gitignore b/presentation/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/presentation/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/presentation/build.gradle b/presentation/build.gradle
deleted file mode 100644
index 3a50d33..0000000
--- a/presentation/build.gradle
+++ /dev/null
@@ -1,57 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
-
-android {
- compileSdkVersion sdk_compile_version
-
- sourceSets {
- main {
- java {
- srcDir "${buildDir.absolutePath}/generated/source/kaptKotlin/"
- }
- }
- }
-
- defaultConfig {
- minSdkVersion sdk_min_version
- targetSdkVersion sdk_compile_version
- versionCode 1
- versionName "1.0"
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
-
- dataBinding {
- enabled = true
- }
-
- compileOptions {
- sourceCompatibility 1.8
- targetCompatibility 1.8
- }
-
- kotlinOptions {
- jvmTarget = "1.8"
- }
-
-}
-
-dependencies {
- implementation fileTree(include: ['*.jar'], dir: 'libs')
- rootProject.corePresentation.each {
- add(it.configuration, it.dependency, it.options)
- }
-
- compileOnly project(path: ':annotations')
- kapt project(':processor')
-}
diff --git a/presentation/presentation.iml b/presentation/presentation.iml
deleted file mode 100644
index 5057a2a..0000000
--- a/presentation/presentation.iml
+++ /dev/null
@@ -1,231 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- generateDebugSources
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/presentation/proguard-rules.pro b/presentation/proguard-rules.pro
deleted file mode 100644
index f1b4245..0000000
--- a/presentation/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# 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 *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/presentation/src/androidTest/java/com/vrgsoft/core/ExampleInstrumentedTest.java b/presentation/src/androidTest/java/com/vrgsoft/core/ExampleInstrumentedTest.java
deleted file mode 100644
index 6fc7e79..0000000
--- a/presentation/src/androidTest/java/com/vrgsoft/core/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.vrgsoft.core;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see Testing documentation
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
- @Test
- public void useAppContext() {
- // Context of the app under test.
- Context appContext = InstrumentationRegistry.getTargetContext();
-
- assertEquals("com.vrgsoft.corepresentation.test", appContext.getPackageName());
- }
-}
diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
deleted file mode 100644
index 8b93b3d..0000000
--- a/presentation/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
diff --git a/presentation/src/main/java/com/vrgsoft/core/presentation/activity/BaseActivity.kt b/presentation/src/main/java/com/vrgsoft/core/presentation/activity/BaseActivity.kt
deleted file mode 100644
index faa66c5..0000000
--- a/presentation/src/main/java/com/vrgsoft/core/presentation/activity/BaseActivity.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.vrgsoft.core.presentation.activity
-
-import android.os.Bundle
-import android.view.View
-import androidx.annotation.Nullable
-import androidx.appcompat.app.AppCompatActivity
-import org.kodein.di.Kodein
-import org.kodein.di.KodeinAware
-import org.kodein.di.KodeinTrigger
-import org.kodein.di.android.closestKodein
-import org.kodein.di.android.retainedKodein
-
-abstract class BaseActivity : AppCompatActivity(), KodeinAware {
- private val _parentKodein by closestKodein()
- override val kodein: Kodein by retainedKodein {
- extend(_parentKodein)
- import(diModule())
- }
- override val kodeinTrigger = KodeinTrigger()
-
- override fun onCreate(@Nullable savedInstanceState: Bundle?) {
- kodeinTrigger.trigger()
- super.onCreate(savedInstanceState)
- }
-
- abstract fun diModule(): Kodein.Module
-
- protected fun View.setAsDefaultBackPressed() {
- setOnClickListener {
- onBackPressed()
- }
- }
-}
diff --git a/presentation/src/main/java/com/vrgsoft/core/presentation/activity/BindingActivity.kt b/presentation/src/main/java/com/vrgsoft/core/presentation/activity/BindingActivity.kt
deleted file mode 100644
index c299fa8..0000000
--- a/presentation/src/main/java/com/vrgsoft/core/presentation/activity/BindingActivity.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.vrgsoft.core.presentation.activity
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import androidx.annotation.LayoutRes
-import androidx.databinding.DataBindingUtil
-import androidx.databinding.ViewDataBinding
-import com.vrgsoft.core.presentation.fragment.BaseViewModel
-
-abstract class BindingActivity : BaseActivity() {
- protected lateinit var binding: B
- abstract val viewModel: BaseViewModel
-
- @LayoutRes
- abstract fun getLayoutRes(): Int
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- binding = DataBindingUtil.inflate(LayoutInflater.from(this), getLayoutRes(), null, false)
- binding.setLifecycleOwner(this)
-
- lifecycle.addObserver(viewModel)
-
- setContentView(binding.root)
- }
-}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/vrgsoft/core/presentation/activity/ContainerActivity.kt b/presentation/src/main/java/com/vrgsoft/core/presentation/activity/ContainerActivity.kt
deleted file mode 100644
index 884fdea..0000000
--- a/presentation/src/main/java/com/vrgsoft/core/presentation/activity/ContainerActivity.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.vrgsoft.core.presentation.activity
-
-import android.os.Bundle
-import com.vrgsoft.core.R
-import com.vrgsoft.core.presentation.activity.BaseActivity
-
-abstract class ContainerActivity : BaseActivity() {
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- setContentView(R.layout.activity_container)
- }
-
- fun getContainerId() = R.id.fragmentContainer
-}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/BaseFactory.kt b/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/BaseFactory.kt
deleted file mode 100644
index 0939f29..0000000
--- a/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/BaseFactory.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.vrgsoft.core.presentation.fragment
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-
-abstract class BaseFactory : ViewModelProvider.NewInstanceFactory() {
- override fun create(modelClass: Class): T {
- return createViewModel() as T
- }
-
- abstract fun createViewModel(): VM
-}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/BaseFragment.kt b/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/BaseFragment.kt
deleted file mode 100644
index f2d7002..0000000
--- a/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/BaseFragment.kt
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.vrgsoft.core.presentation.fragment
-
-import android.content.Context
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.databinding.DataBindingUtil
-import androidx.databinding.ViewDataBinding
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
-import org.kodein.di.Kodein
-import org.kodein.di.KodeinAware
-import org.kodein.di.KodeinTrigger
-import org.kodein.di.android.closestKodein
-import org.kodein.di.simpleErasedName
-import java.lang.reflect.ParameterizedType
-
-abstract class BaseFragment : Fragment(), KodeinAware {
- //region Kodein
-
- private val _parentKodein: Kodein by closestKodein()
- override val kodein: Kodein = Kodein.lazy {
- extend(_parentKodein, true)
- with(parentFragment) {
- if (this is BaseFragment<*>) {
- extend(kodein, true)
- }
- }
- import(viewModelModule, true)
- import(kodeinModule, true)
- }
-
- open val kodeinModule: Kodein.Module = Kodein.Module("default") {}
-
- open val viewModelModule: Kodein.Module = Kodein.Module("default2") {}
-
- override val kodeinTrigger = KodeinTrigger()
-
- abstract val viewModel: BaseViewModel
-
- //endregion
-
- protected lateinit var binding: B
- private var initialized = false
-
- //region lifecycle
-
- override fun onAttach(context: Context) {
- kodeinTrigger.trigger()
- super.onAttach(context)
- }
-
- override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
- setHasOptionsMenu(true)
- if (!initialized) {
- binding = DataBindingUtil.inflate(inflater, getLayoutRes(), container, false)
- initialized = true
- }
- return binding.root
- }
-
- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
- super.onViewCreated(view, savedInstanceState)
-
- binding.apply {
- setLifecycleOwner(this@BaseFragment)
- }
-
- viewCreated(savedInstanceState)
- }
-
- //endregion
-
- //region abstracts
-
- abstract fun viewCreated(savedInstanceState: Bundle?)
-
- //endregion
-
- //region private methods
-
- open fun getLayoutRes(): Int {
- var superClassGeneric = this.javaClass.genericSuperclass
- var superClass = this.javaClass.superclass
-
- while (superClassGeneric !is ParameterizedType) {
- if (superClass != null) {
- superClassGeneric = superClass.genericSuperclass
- superClass = superClass.superclass
- } else {
- throw Exception("maybe something with BaseFragment?")
- }
- }
-
- val fragmentLayoutName = superClassGeneric.actualTypeArguments[0]
- .simpleErasedName()
- .replace("Binding", "")
- .split("(?<=[a-z])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][a-z])".toRegex())
- .joinToString(separator = "_")
- .toLowerCase()
-
- val resourceName = "${context?.applicationContext?.packageName}:layout/$fragmentLayoutName"
- return resources.getIdentifier(resourceName, null, null)
- }
-
- //endregion
-
- //region utils
-
- inline fun vm(factory: ViewModelProvider.Factory): VM {
- return ViewModelProviders.of(this, factory)[VM::class.java]
- }
-
- //endregion
-}
diff --git a/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/BaseViewModel.kt b/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/BaseViewModel.kt
deleted file mode 100644
index 0dbd9c4..0000000
--- a/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/BaseViewModel.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.vrgsoft.core.presentation.fragment
-
-import androidx.lifecycle.LifecycleObserver
-
-interface BaseViewModel : LifecycleObserver
\ No newline at end of file
diff --git a/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/BaseViewModelImpl.kt b/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/BaseViewModelImpl.kt
deleted file mode 100644
index 3015a3d..0000000
--- a/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/BaseViewModelImpl.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.vrgsoft.core.presentation.fragment
-
-import androidx.lifecycle.ViewModel
-
-abstract class BaseViewModelImpl : ViewModel(), BaseViewModel
\ No newline at end of file
diff --git a/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/IBaseRouter.kt b/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/IBaseRouter.kt
deleted file mode 100644
index b9b3a76..0000000
--- a/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/IBaseRouter.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.vrgsoft.core.presentation.fragment
-
-interface IBaseRouter {
- fun clickBack(): Boolean
-}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/argumented/Argumented.kt b/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/argumented/Argumented.kt
deleted file mode 100644
index 45a8b70..0000000
--- a/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/argumented/Argumented.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.vrgsoft.core.presentation.fragment.argumented
-
-interface Argumented
\ No newline at end of file
diff --git a/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/argumented/ArgumentedFragment.kt b/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/argumented/ArgumentedFragment.kt
deleted file mode 100644
index c786467..0000000
--- a/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/argumented/ArgumentedFragment.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.vrgsoft.core.presentation.fragment.argumented
-
-import android.os.Bundle
-import android.view.View
-import androidx.databinding.ViewDataBinding
-import com.vrgsoft.core.presentation.fragment.BaseFragment
-
-abstract class ArgumentedFragment
- : BaseFragment(), Argumented {
- abstract override val viewModel: ArgumentedViewModel
-
- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
- super.onViewCreated(view, savedInstanceState)
-
- val args = arguments!!.getParcelable(KEY_ARGS)
- if (args != null) {
- viewModel.applyArguments(args)
- }
- }
-
- companion object {
- const val KEY_ARGS = "key_args"
- }
-}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/argumented/ArgumentedViewModel.kt b/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/argumented/ArgumentedViewModel.kt
deleted file mode 100644
index 3df6dc2..0000000
--- a/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/argumented/ArgumentedViewModel.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.vrgsoft.core.presentation.fragment.argumented
-
-import com.vrgsoft.core.presentation.fragment.BaseViewModel
-
-interface ArgumentedViewModel : BaseViewModel {
- fun applyArguments(args: A)
-}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/argumented/BaseArguments.kt b/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/argumented/BaseArguments.kt
deleted file mode 100644
index 80c4a67..0000000
--- a/presentation/src/main/java/com/vrgsoft/core/presentation/fragment/argumented/BaseArguments.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.vrgsoft.core.presentation.fragment.argumented
-
-import android.os.Parcelable
-
-abstract class BaseArguments : Parcelable
\ No newline at end of file
diff --git a/presentation/src/main/java/com/vrgsoft/core/presentation/liveData/SingleLiveEvent.kt b/presentation/src/main/java/com/vrgsoft/core/presentation/liveData/SingleLiveEvent.kt
deleted file mode 100644
index 537c532..0000000
--- a/presentation/src/main/java/com/vrgsoft/core/presentation/liveData/SingleLiveEvent.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.vrgsoft.core.presentation.liveData
-
-import android.util.Log
-import androidx.annotation.MainThread
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Observer
-import java.util.concurrent.atomic.AtomicBoolean
-
-class SingleLiveEvent : MutableLiveData() {
-
- private val pending = AtomicBoolean(false)
-
- @MainThread
- override fun observe(owner: LifecycleOwner, observer: Observer) {
- if (hasActiveObservers()) {
- Log.w(TAG, "Multiple observers registered but only one will be notified of changes.")
- }
-
- // Observe the internal MutableLiveData
- super.observe(owner, Observer { t ->
- if (pending.compareAndSet(true, false)) {
- observer.onChanged(t)
- }
- })
- }
-
- @MainThread
- override fun setValue(t: T?) {
- pending.set(true)
- super.setValue(t)
- }
-
- /**
- * Used for cases where T is Void, to make calls cleaner.
- */
- @MainThread
- fun call() {
- value = null
- }
-
- companion object {
- private const val TAG = "SingleLiveEvent"
- }
-}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/vrgsoft/core/presentation/liveData/SingleLiveManager.kt b/presentation/src/main/java/com/vrgsoft/core/presentation/liveData/SingleLiveManager.kt
deleted file mode 100644
index 11e6868..0000000
--- a/presentation/src/main/java/com/vrgsoft/core/presentation/liveData/SingleLiveManager.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.vrgsoft.core.presentation.liveData
-
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.Observer
-
-class SingleLiveManager(val defValue: T? = null) {
- val event = SingleLiveEvent()
-
- fun call(data: T) {
- event.postValue(data)
- }
-
- fun call() {
- if (defValue != null) {
- event.postValue(defValue)
- }
- }
-
- fun observe(owner: LifecycleOwner, observer: ((item: T?) -> Unit)) {
- event.observe(owner, Observer {
- observer.invoke(it)
- })
- }
-}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/vrgsoft/core/presentation/router/FragmentRouter.kt b/presentation/src/main/java/com/vrgsoft/core/presentation/router/FragmentRouter.kt
deleted file mode 100644
index c8eece2..0000000
--- a/presentation/src/main/java/com/vrgsoft/core/presentation/router/FragmentRouter.kt
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.vrgsoft.core.presentation.router
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
-import com.vrgsoft.core.presentation.fragment.argumented.Argumented
-import com.vrgsoft.core.presentation.fragment.argumented.ArgumentedFragment
-import com.vrgsoft.core.presentation.fragment.argumented.BaseArguments
-import com.vrgsoft.core.presentation.fragment.BaseFragment
-import com.vrgsoft.core.presentation.fragment.IBaseRouter
-
-abstract class FragmentRouter(
- protected val manager: FragmentManager
-) : IBaseRouter {
-
- protected abstract val containerId: Int
-
- fun replaceWithoutBackStack(
- fragment: androidx.fragment.app.Fragment
- ) {
- manager.beginTransaction()
- .replace(containerId, fragment, fragment::class.java.simpleName)
- .addToBackStack(null)
- .commit()
- }
-
- fun androidx.fragment.app.Fragment.replace() {
- manager.beginTransaction()
- .replace(containerId, this, this::class.java.simpleName)
- .commit()
- }
-
- fun addWithBackStack(
- fragment: androidx.fragment.app.Fragment
- ) {
- manager.beginTransaction()
- .replace(containerId, fragment, fragment::class.java.simpleName)
- .addToBackStack(fragment::class.java.simpleName)
- .commit()
- }
-
- fun androidx.fragment.app.Fragment.replaceWithBackStack() {
- manager.beginTransaction()
- .replace(containerId, this, this::class.java.simpleName)
- .addToBackStack(this::class.java.simpleName)
- .commit()
- }
-
- fun popBackStack() {
- manager.popBackStack()
- }
-
- fun currentFragment() = manager.findFragmentById(containerId)
-
- protected inline fun > createInstance(): T {
- val instance = T::class.constructors.first().call()
-
- instance.arguments = Bundle()
-
- return instance
- }
-
- protected inline fun > createArgumentedInstance(args: BaseArguments): T {
- val instance = T::class.constructors.first().call()
-
- (instance as Fragment).arguments = Bundle().apply {
- putParcelable(ArgumentedFragment.KEY_ARGS, args)
- }
-
- return instance
- }
-
- override fun clickBack(): Boolean {
- if (manager.backStackEntryCount > 1) {
- with(currentFragment()) {
- return if (this is Routable) {
- if (!this.backPressed()) {
- manager.popBackStack()
- }
- true
- } else {
- manager.popBackStack()
- true
- }
- }
- } else {
- return false
- }
- }
-}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/vrgsoft/core/presentation/router/Routable.kt b/presentation/src/main/java/com/vrgsoft/core/presentation/router/Routable.kt
deleted file mode 100644
index c8a5f2a..0000000
--- a/presentation/src/main/java/com/vrgsoft/core/presentation/router/Routable.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.vrgsoft.core.presentation.router
-
-import com.vrgsoft.core.presentation.fragment.IBaseRouter
-
-interface Routable {
- val router: IBaseRouter
- fun backPressed(): Boolean {
- return router.clickBack()
- }
-}
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/activity_container.xml b/presentation/src/main/res/layout/activity_container.xml
deleted file mode 100644
index 2ae129d..0000000
--- a/presentation/src/main/res/layout/activity_container.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
deleted file mode 100644
index 15459f9..0000000
--- a/presentation/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
- Core Presentation
-
diff --git a/presentation/src/test/java/com/vrgsoft/core/ExampleUnitTest.java b/presentation/src/test/java/com/vrgsoft/core/ExampleUnitTest.java
deleted file mode 100644
index 11882ce..0000000
--- a/presentation/src/test/java/com/vrgsoft/core/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.vrgsoft.core;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see Testing documentation
- */
-public class ExampleUnitTest {
- @Test
- public void addition_isCorrect() {
- assertEquals(4, 2 + 2);
- }
-}
\ No newline at end of file
diff --git a/processor/build.gradle b/processor/build.gradle
index 1f05b3c..c9ff9b3 100644
--- a/processor/build.gradle
+++ b/processor/build.gradle
@@ -26,8 +26,6 @@ dependencies {
}
jar {
- destinationDir = new File("$project.buildDir/outputs/jar/")
-
from {
configurations.compile.collect {
it.isDirectory() ? it : zipTree(it) }
@@ -38,4 +36,19 @@ jar {
}
sourceCompatibility = "8"
-targetCompatibility = "8"
\ No newline at end of file
+targetCompatibility = "8"
+
+task sourcesJar(type: Jar, dependsOn: classes) {
+ classifier = 'sources'
+ from sourceSets.main.allSource
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+ classifier = 'javadoc'
+ from javadoc.destinationDir
+}
+
+artifacts {
+ archives sourcesJar
+ archives javadocJar
+}
\ No newline at end of file
diff --git a/remote/.gitignore b/remote/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/remote/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/remote/build.gradle b/remote/build.gradle
deleted file mode 100644
index 35f3127..0000000
--- a/remote/build.gradle
+++ /dev/null
@@ -1,42 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
-
-android {
- compileSdkVersion sdk_compile_version
-
- defaultConfig {
- minSdkVersion sdk_min_version
- targetSdkVersion sdk_compile_version
- versionCode 1
- versionName "1.0"
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
-
- compileOptions {
- sourceCompatibility 1.8
- targetCompatibility 1.8
- }
-
- kotlinOptions {
- jvmTarget = "1.8"
- }
-
-}
-
-dependencies {
- implementation fileTree(include: ['*.jar'], dir: 'libs')
- rootProject.coreRemote.each {
- add(it.configuration, it.dependency, it.options)
- }
-}
diff --git a/remote/proguard-rules.pro b/remote/proguard-rules.pro
deleted file mode 100644
index f1b4245..0000000
--- a/remote/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# 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 *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/remote/remote.iml b/remote/remote.iml
deleted file mode 100644
index 30e552e..0000000
--- a/remote/remote.iml
+++ /dev/null
@@ -1,229 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- generateDebugSources
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/remote/src/main/AndroidManifest.xml b/remote/src/main/AndroidManifest.xml
deleted file mode 100644
index bfd789e..0000000
--- a/remote/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
diff --git a/remote/src/main/java/com/vrgsoft/coreremote/BaseRepository.kt b/remote/src/main/java/com/vrgsoft/coreremote/BaseRepository.kt
deleted file mode 100644
index 70209ce..0000000
--- a/remote/src/main/java/com/vrgsoft/coreremote/BaseRepository.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.vrgsoft.coreremote
-
-import androidx.annotation.VisibleForTesting
-import com.vrgsoft.coreremote.error.ConnectionError
-import com.vrgsoft.coreremote.error.NetworkError
-import com.vrgsoft.coreremote.result.BaseResult
-import com.vrgsoft.coreremote.result.ErrorResult
-import com.vrgsoft.coreremote.result.SuccessResult
-import kotlinx.coroutines.Deferred
-import retrofit2.Response
-
-abstract class BaseRepository {
- @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
- suspend fun execute(call: (() -> Deferred>)): BaseResult {
- try {
- val result = call.invoke().await()
-
- return if (result.isSuccessful) {
- SuccessResult(result.body()!!)
- } else {
- ErrorResult(
- NetworkError(
- result.code(),
- result.message()
- )
- )
- }
- } catch (e: Exception) {
- return ErrorResult(ConnectionError())
- }
- }
-
- @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
- fun SuccessResult.transform(mapper: ((item: T) -> M)): SuccessResult {
- return SuccessResult(
- mapper.invoke(this.data)
- )
- }
-
- @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
- fun BaseResult.transformIsSuccess(mapper: ((item: T) -> M)): BaseResult {
- return if (this is SuccessResult<*>) {
- (this as SuccessResult).transform(mapper)
- } else {
- ErrorResult(
- (this as ErrorResult).error
- )
- }
- }
-}
\ No newline at end of file
diff --git a/remote/src/main/java/com/vrgsoft/coreremote/Extentions.kt b/remote/src/main/java/com/vrgsoft/coreremote/Extentions.kt
deleted file mode 100644
index 0299667..0000000
--- a/remote/src/main/java/com/vrgsoft/coreremote/Extentions.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.vrgsoft.coreremote
-
-import com.vrgsoft.coreremote.result.BaseResult
-import com.vrgsoft.coreremote.result.SuccessResult
-
-fun BaseResult.mapDataIfSuccess(mapper: ((item: T) -> M)): M? {
- if (this !is SuccessResult) {
- return null
- }
-
- return mapper.invoke(this.data)
-}
-
-fun BaseResult.getDataIfSuccess(): T? {
- if (this !is SuccessResult) {
- return null
- }
-
- return this.data
-}
\ No newline at end of file
diff --git a/remote/src/main/java/com/vrgsoft/coreremote/error/BaseError.kt b/remote/src/main/java/com/vrgsoft/coreremote/error/BaseError.kt
deleted file mode 100644
index 3dade02..0000000
--- a/remote/src/main/java/com/vrgsoft/coreremote/error/BaseError.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.vrgsoft.coreremote.error
-
-abstract class BaseError
\ No newline at end of file
diff --git a/remote/src/main/java/com/vrgsoft/coreremote/error/ConnectionError.kt b/remote/src/main/java/com/vrgsoft/coreremote/error/ConnectionError.kt
deleted file mode 100644
index 9848b62..0000000
--- a/remote/src/main/java/com/vrgsoft/coreremote/error/ConnectionError.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.vrgsoft.coreremote.error
-
-class ConnectionError : BaseError()
\ No newline at end of file
diff --git a/remote/src/main/java/com/vrgsoft/coreremote/error/NetworkError.kt b/remote/src/main/java/com/vrgsoft/coreremote/error/NetworkError.kt
deleted file mode 100644
index 15b417b..0000000
--- a/remote/src/main/java/com/vrgsoft/coreremote/error/NetworkError.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.vrgsoft.coreremote.error
-
-class NetworkError(
- val code: Int,
- val message: String
-) : BaseError()
\ No newline at end of file
diff --git a/remote/src/main/java/com/vrgsoft/coreremote/result/BaseResult.kt b/remote/src/main/java/com/vrgsoft/coreremote/result/BaseResult.kt
deleted file mode 100644
index cd11727..0000000
--- a/remote/src/main/java/com/vrgsoft/coreremote/result/BaseResult.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.vrgsoft.coreremote.result
-
-abstract class BaseResult
\ No newline at end of file
diff --git a/remote/src/main/java/com/vrgsoft/coreremote/result/ErrorResult.kt b/remote/src/main/java/com/vrgsoft/coreremote/result/ErrorResult.kt
deleted file mode 100644
index 9a88991..0000000
--- a/remote/src/main/java/com/vrgsoft/coreremote/result/ErrorResult.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.vrgsoft.coreremote.result
-
-import com.vrgsoft.coreremote.error.BaseError
-
-class ErrorResult(
- val error: BaseError
-) : BaseResult()
\ No newline at end of file
diff --git a/remote/src/main/java/com/vrgsoft/coreremote/result/SuccessResult.kt b/remote/src/main/java/com/vrgsoft/coreremote/result/SuccessResult.kt
deleted file mode 100644
index a37f649..0000000
--- a/remote/src/main/java/com/vrgsoft/coreremote/result/SuccessResult.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.vrgsoft.coreremote.result
-
-class SuccessResult(
- val data: T
-) : BaseResult()
\ No newline at end of file
diff --git a/remote/src/main/res/values/strings.xml b/remote/src/main/res/values/strings.xml
deleted file mode 100644
index 36875bf..0000000
--- a/remote/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
- Core Remote
-
diff --git a/remote/src/test/java/com/vrgsoft/coreremote/BaseRepositoryTest.kt b/remote/src/test/java/com/vrgsoft/coreremote/BaseRepositoryTest.kt
deleted file mode 100644
index a2cd176..0000000
--- a/remote/src/test/java/com/vrgsoft/coreremote/BaseRepositoryTest.kt
+++ /dev/null
@@ -1,154 +0,0 @@
-package com.vrgsoft.coreremote
-
-import com.nhaarman.mockitokotlin2.doReturn
-import com.nhaarman.mockitokotlin2.mock
-import com.vrgsoft.coreremote.error.ConnectionError
-import com.vrgsoft.coreremote.error.NetworkError
-import com.vrgsoft.coreremote.result.ErrorResult
-import com.vrgsoft.coreremote.result.SuccessResult
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.async
-import kotlinx.coroutines.test.runBlockingTest
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import retrofit2.Response
-
-@ExperimentalCoroutinesApi
-internal class BaseRepositoryTest {
- lateinit var repository: BaseRepository
- lateinit var api: TestApi
-
- private var isSuccess = true
-
- fun setUp() {
- repository = TestRepository()
-
- val response = mock> {
- on { isSuccessful } doReturn isSuccess
- on { body() } doReturn "1"
- on { code() } doReturn 401
- on { message() } doReturn "Unauthorized"
- }
-
- api = mock {
- on { call() } doReturn response.toDeferred()
- }
- }
-
- @Test
- fun transform() {
- setUp()
- val result = SuccessResult("1")
-
- val transformed = with(repository) {
- result.transform { it.toInt() }
- }
-
- assertEquals(1, transformed.data)
- }
-
- @Test
- fun transformIsSuccess() {
- setUp()
- val result = SuccessResult("1")
-
- val transformed = with(repository) {
- result.transformIsSuccess { it.toInt() }
- }
-
- require(transformed is SuccessResult)
- assertEquals(1, transformed.data)
- }
-
- @Test
- fun transformIsConnectionError() {
- setUp()
- val result = ErrorResult(ConnectionError())
-
- val transformed = with(repository) {
- result.transformIsSuccess { it.toInt() }
- }
-
- require(transformed is ErrorResult)
- require(transformed.error is ConnectionError)
- }
-
- @Test
- fun transformIsNetworkError() {
- setUp()
- val code = 401
- val message = "Unauthorized"
- val result = ErrorResult(NetworkError(code, message))
-
- val transformed = with(repository) {
- result.transformIsSuccess { it.toInt() }
- }
-
- require(transformed is ErrorResult)
-
- with(transformed) {
- require(error is NetworkError)
- assertEquals(code, (error as NetworkError).code)
- assertEquals(message, (error as NetworkError).message)
- }
- }
-
- @Test
- fun executeSuccess() {
- isSuccess = true
- setUp()
- val data = "1"
-
- runBlockingTest {
- val transformed = with(repository) {
- execute { api.call() }
- }
-
- require(transformed is SuccessResult)
- assertEquals(data, transformed.data)
- }
- }
-
- @Test
- fun executeError() {
- isSuccess = false
- setUp()
- val code = 401
- val message = "Unauthorized"
-
- runBlockingTest {
- val transformed = with(repository) {
- execute { api.call() }
- }
-
- require(transformed is ErrorResult)
- require(transformed.error is NetworkError)
-
- with(transformed.error as NetworkError) {
- assertEquals(code, this.code)
- assertEquals(message, this.message)
- }
- }
- }
-
- @Test
- fun executeThrow() {
- isSuccess = true
- setUp()
-
- runBlockingTest {
- val transformed = with(repository) {
- execute {
- throw IllegalArgumentException()
- api.call()
- }
- }
-
- require(transformed is ErrorResult)
- require(transformed.error is ConnectionError)
- }
- }
-
- fun T.toDeferred() = GlobalScope.async { this@toDeferred }
-}
\ No newline at end of file
diff --git a/remote/src/test/java/com/vrgsoft/coreremote/TestApi.kt b/remote/src/test/java/com/vrgsoft/coreremote/TestApi.kt
deleted file mode 100644
index 7c251ea..0000000
--- a/remote/src/test/java/com/vrgsoft/coreremote/TestApi.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.vrgsoft.coreremote
-
-import kotlinx.coroutines.Deferred
-import retrofit2.Response
-
-interface TestApi {
- fun call(): Deferred>
-}
\ No newline at end of file
diff --git a/remote/src/test/java/com/vrgsoft/coreremote/TestRepository.kt b/remote/src/test/java/com/vrgsoft/coreremote/TestRepository.kt
deleted file mode 100644
index 853e40c..0000000
--- a/remote/src/test/java/com/vrgsoft/coreremote/TestRepository.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.vrgsoft.coreremote
-
-class TestRepository : BaseRepository()
\ No newline at end of file
diff --git a/remote/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/remote/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
deleted file mode 100644
index 1f0955d..0000000
--- a/remote/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
+++ /dev/null
@@ -1 +0,0 @@
-mock-maker-inline
diff --git a/retrofit/.gitignore b/retrofit/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/retrofit/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/retrofit/build.gradle b/retrofit/build.gradle
deleted file mode 100644
index d27e839..0000000
--- a/retrofit/build.gradle
+++ /dev/null
@@ -1,42 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
-
-android {
- compileSdkVersion sdk_compile_version
-
- defaultConfig {
- minSdkVersion sdk_min_version
- targetSdkVersion sdk_compile_version
- versionCode 1
- versionName "1.0"
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
-
- compileOptions {
- sourceCompatibility 1.8
- targetCompatibility 1.8
- }
-
- kotlinOptions {
- jvmTarget = "1.8"
- }
-
-}
-
-dependencies {
- implementation fileTree(include: ['*.jar'], dir: 'libs')
- rootProject.retrofitModule.each {
- add(it.configuration, it.dependency, it.options)
- }
-}
diff --git a/retrofit/proguard-rules.pro b/retrofit/proguard-rules.pro
deleted file mode 100644
index f1b4245..0000000
--- a/retrofit/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# 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 *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/retrofit/retrofit.iml b/retrofit/retrofit.iml
deleted file mode 100644
index a45d969..0000000
--- a/retrofit/retrofit.iml
+++ /dev/null
@@ -1,211 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- generateDebugSources
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/retrofit/src/main/AndroidManifest.xml b/retrofit/src/main/AndroidManifest.xml
deleted file mode 100644
index bf1669d..0000000
--- a/retrofit/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
diff --git a/retrofit/src/main/java/com/vrgsoft/retrofit/RetrofitModule.kt b/retrofit/src/main/java/com/vrgsoft/retrofit/RetrofitModule.kt
deleted file mode 100644
index 6f64d45..0000000
--- a/retrofit/src/main/java/com/vrgsoft/retrofit/RetrofitModule.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.vrgsoft.retrofit
-
-import android.content.Context
-import com.jakewharton.retrofit2.adapter.kotlin.coroutines.CoroutineCallAdapterFactory
-import com.vrgsoft.retrofit.common.AuthInterceptor
-import com.vrgsoft.retrofit.common.HeaderInterceptor
-import com.vrgsoft.retrofit.common.RetrofitConfig
-import okhttp3.Cache
-import okhttp3.OkHttpClient
-import okhttp3.logging.HttpLoggingInterceptor
-import org.kodein.di.Kodein
-import org.kodein.di.generic.bind
-import org.kodein.di.generic.instance
-import org.kodein.di.generic.provider
-import org.kodein.di.generic.singleton
-import retrofit2.Retrofit
-import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
-import retrofit2.converter.gson.GsonConverterFactory
-import retrofit2.converter.scalars.ScalarsConverterFactory
-import java.util.concurrent.TimeUnit
-
-object RetrofitModule {
- fun get() = Kodein.Module("RetrofitModule") {
- bind() with singleton {
- Retrofit.Builder()
- .baseUrl(RetrofitConfig.baseUrl)
- .addConverterFactory(ScalarsConverterFactory.create())
- .addConverterFactory(GsonConverterFactory.create())
- .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
- .addCallAdapterFactory(CoroutineCallAdapterFactory())
- .client(instance())
- .build()
- }
-
- bind() with singleton {
- val builder = OkHttpClient.Builder()
-
- builder.cache(instance())
-
- if (BuildConfig.DEBUG) {
- val loggingInterceptor = HttpLoggingInterceptor()
- loggingInterceptor.level = HttpLoggingInterceptor.Level.BODY
- builder.addInterceptor(loggingInterceptor)
- }
-
- builder.connectTimeout(100, TimeUnit.SECONDS)
- builder.retryOnConnectionFailure(true)
- builder.addInterceptor(instance())
- builder.addInterceptor(HeaderInterceptor())
- builder.build()
- }
-
- bind() from provider {
- val cacheSize = 10 * 1024 * 1024 // 10 MB
- Cache(instance().cacheDir, cacheSize.toLong())
- }
-
- bind() with singleton { AuthInterceptor(RetrofitConfig.auth) }
- }
-}
\ No newline at end of file
diff --git a/retrofit/src/main/java/com/vrgsoft/retrofit/common/Auth.kt b/retrofit/src/main/java/com/vrgsoft/retrofit/common/Auth.kt
deleted file mode 100644
index 2f93d82..0000000
--- a/retrofit/src/main/java/com/vrgsoft/retrofit/common/Auth.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.vrgsoft.retrofit.common
-
-import okhttp3.Interceptor
-import okhttp3.Response
-
-interface Auth {
- fun process(chain: Interceptor.Chain?): Response
-}
\ No newline at end of file
diff --git a/retrofit/src/main/java/com/vrgsoft/retrofit/common/AuthCustomInterceptor.kt b/retrofit/src/main/java/com/vrgsoft/retrofit/common/AuthCustomInterceptor.kt
deleted file mode 100644
index d2c0ca6..0000000
--- a/retrofit/src/main/java/com/vrgsoft/retrofit/common/AuthCustomInterceptor.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.vrgsoft.retrofit.common
-
-import android.accounts.AccountManager
-import okhttp3.Interceptor
-import okhttp3.Response
-
-class AuthCustomInterceptor(
- private val manager: AccountManager,
- private val packageName: String
-) : Auth {
-
- override fun process(chain: Interceptor.Chain?): Response {
- val accounts = manager.getAccountsByType(packageName)
- val builder = chain!!.request()!!.newBuilder()
-
- if (accounts.isNotEmpty()) {
- val account = accounts[0]
- val token = manager.blockingGetAuthToken(account, "Bearer", false)
-
- if (token?.isNotEmpty() == true) {
- builder?.addHeader(HEADER_AUTHORIZATION, "Bearer $token")
- }
- }
-
- return chain.proceed(builder.build())
- }
-
- companion object {
- private const val HEADER_AUTHORIZATION = "Authorization"
- }
-}
\ No newline at end of file
diff --git a/retrofit/src/main/java/com/vrgsoft/retrofit/common/AuthInterceptor.kt b/retrofit/src/main/java/com/vrgsoft/retrofit/common/AuthInterceptor.kt
deleted file mode 100644
index 23a40a0..0000000
--- a/retrofit/src/main/java/com/vrgsoft/retrofit/common/AuthInterceptor.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.vrgsoft.retrofit.common
-
-import okhttp3.Interceptor
-import okhttp3.Response
-
-class AuthInterceptor(
- private val auth: Auth? = null
-) : Interceptor {
- override fun intercept(chain: Interceptor.Chain?): Response {
- return auth?.process(chain) ?: chain!!.request()!!.newBuilder()?.let {
- chain.proceed(it.build())
- }!!
- }
-}
\ No newline at end of file
diff --git a/retrofit/src/main/java/com/vrgsoft/retrofit/common/HeaderInterceptor.kt b/retrofit/src/main/java/com/vrgsoft/retrofit/common/HeaderInterceptor.kt
deleted file mode 100644
index ebd0f6f..0000000
--- a/retrofit/src/main/java/com/vrgsoft/retrofit/common/HeaderInterceptor.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.vrgsoft.retrofit.common
-
-import okhttp3.Interceptor
-import okhttp3.Response
-
-class HeaderInterceptor : Interceptor {
- override fun intercept(chain: Interceptor.Chain?): Response {
- val builder = chain!!.request()!!.newBuilder()
-
- return chain.proceed(builder.build())
- }
-}
\ No newline at end of file
diff --git a/retrofit/src/main/java/com/vrgsoft/retrofit/common/RetrofitConfig.kt b/retrofit/src/main/java/com/vrgsoft/retrofit/common/RetrofitConfig.kt
deleted file mode 100644
index 5e71034..0000000
--- a/retrofit/src/main/java/com/vrgsoft/retrofit/common/RetrofitConfig.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.vrgsoft.retrofit.common
-
-object RetrofitConfig {
- lateinit var baseUrl: String
- lateinit var auth: Auth
-}
\ No newline at end of file
diff --git a/retrofit/src/main/res/values/strings.xml b/retrofit/src/main/res/values/strings.xml
deleted file mode 100644
index 183cc99..0000000
--- a/retrofit/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
- Retrofit
-
diff --git a/retrofit/src/test/java/com/vrgsoft/retrofit/ExampleUnitTest.java b/retrofit/src/test/java/com/vrgsoft/retrofit/ExampleUnitTest.java
deleted file mode 100644
index 80fc59a..0000000
--- a/retrofit/src/test/java/com/vrgsoft/retrofit/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.vrgsoft.retrofit;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see Testing documentation
- */
-public class ExampleUnitTest {
- @Test
- public void addition_isCorrect() {
- assertEquals(4, 2 + 2);
- }
-}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 11efb3a..f382273 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,2 @@
-include 'retrofit'
-include 'remote'
-include 'networkmanager'
-include 'gateway'
-include 'presentation'
include 'annotations'
include 'processor'