diff --git a/.gradle/5.6.4/fileHashes/fileHashes.bin b/.gradle/5.6.4/fileHashes/fileHashes.bin index 8fcca78..4fae8d4 100755 Binary files a/.gradle/5.6.4/fileHashes/fileHashes.bin and b/.gradle/5.6.4/fileHashes/fileHashes.bin differ diff --git a/.gradle/5.6.4/fileHashes/fileHashes.lock b/.gradle/5.6.4/fileHashes/fileHashes.lock index 42a0a6b..f42a05c 100755 Binary files a/.gradle/5.6.4/fileHashes/fileHashes.lock and b/.gradle/5.6.4/fileHashes/fileHashes.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 3ec506f..bcfc2e5 100755 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties index 3416f66..7ec939f 100755 --- a/.gradle/buildOutputCleanup/cache.properties +++ b/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Sat May 02 20:46:37 EDT 2020 -gradle.version=5.6.4 +#Sun Aug 02 10:55:03 EDT 2020 +gradle.version=6.1.1 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin old mode 100755 new mode 100644 index 11a84f7..c111bcb Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 2e3e10f..f78e1cb 100755 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..a5f05cd --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_rc01_aar.xml index 64f96e5..e950a69 100755 --- a/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_rc01_aar.xml +++ b/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_rc01_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_rc01_aar.xml index b26967d..3fe2832 100755 --- a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_rc01_aar.xml +++ b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_rc01_aar.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_1_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_1_0_rc01_aar.xml index 0a9b70a..3240488 100755 --- a/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_1_0_rc01_aar.xml +++ b/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_1_0_rc01_aar.xml @@ -1,8 +1,8 @@ - - + + 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 index c739a33..db58fc8 100755 --- 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 @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml index ce54257..9e22adf 100755 --- a/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml index 4dfff1f..a4bc697 100755 --- a/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml index 840aab3..e9507da 100755 --- a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml +++ b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml index 419afea..ce74822 100755 --- a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/.idea/libraries/Gradle__androidx_core_core_1_1_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_core_core_1_1_0_rc01_aar.xml index ddc527e..9e0330f 100755 --- a/.idea/libraries/Gradle__androidx_core_core_1_1_0_rc01_aar.xml +++ b/.idea/libraries/Gradle__androidx_core_core_1_1_0_rc01_aar.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml index 140f0fe..ab10048 100755 --- a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + 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 index 9637bf4..e03dd57 100755 --- a/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml index be99576..ffe2d09 100755 --- a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + 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 index b502073..e247236 100755 --- a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/.idea/libraries/Gradle__androidx_exifinterface_exifinterface_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_exifinterface_exifinterface_1_0_0_aar.xml index be2f198..0607a85 100755 --- a/.idea/libraries/Gradle__androidx_exifinterface_exifinterface_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_exifinterface_exifinterface_1_0_0_aar.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_rc01_aar.xml index 86af433..67db40d 100755 --- a/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_rc01_aar.xml +++ b/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_rc01_aar.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml index d2e9f99..50d1f03 100755 --- a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml index a9d39ee..9bbf016 100755 --- a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml index e1332bd..eb4c954 100755 --- a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml index 6e43052..409ee13 100755 --- a/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_extensions_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_extensions_2_0_0_aar.xml index 49b833b..e2ad444 100755 --- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_extensions_2_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_extensions_2_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml index 4d646bc..888ebd8 100755 --- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + 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 index b3c4b1b..33bc09a 100755 --- 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 @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_process_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_process_2_0_0_aar.xml index 129289e..461aa19 100755 --- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_process_2_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_process_2_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_1_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_1_0_rc01_aar.xml index da140dc..b3a922f 100755 --- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_1_0_rc01_aar.xml +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_1_0_rc01_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_service_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_service_2_0_0_aar.xml index a78b2e1..b5b4ffa 100755 --- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_service_2_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_service_2_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_1_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_1_0_rc01_aar.xml index b0923c3..84c44f5 100755 --- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_1_0_rc01_aar.xml +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_1_0_rc01_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml index ba22c04..c5b13bf 100755 --- a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml index 742d6e6..64d8be0 100755 --- a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml index 9e3848d..2d93a5a 100755 --- a/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/.idea/libraries/Gradle__androidx_navigation_navigation_common_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_navigation_navigation_common_2_0_0_aar.xml index b7d3aba..cc819ff 100755 --- a/.idea/libraries/Gradle__androidx_navigation_navigation_common_2_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_navigation_navigation_common_2_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_navigation_navigation_fragment_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_navigation_navigation_fragment_2_0_0_aar.xml index 0ee7988..373ebe9 100755 --- a/.idea/libraries/Gradle__androidx_navigation_navigation_fragment_2_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_navigation_navigation_fragment_2_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_navigation_navigation_runtime_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_navigation_navigation_runtime_2_0_0_aar.xml index fbf63c9..40f6b17 100755 --- a/.idea/libraries/Gradle__androidx_navigation_navigation_runtime_2_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_navigation_navigation_runtime_2_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_navigation_navigation_ui_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_navigation_navigation_ui_2_0_0_aar.xml index 47b11ae..6620061 100755 --- a/.idea/libraries/Gradle__androidx_navigation_navigation_ui_2_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_navigation_navigation_ui_2_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_preference_preference_1_1_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_preference_preference_1_1_0_rc01_aar.xml index 8e7656e..91ca56f 100755 --- a/.idea/libraries/Gradle__androidx_preference_preference_1_1_0_rc01_aar.xml +++ b/.idea/libraries/Gradle__androidx_preference_preference_1_1_0_rc01_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml index 03c0b9f..65d4bd5 100755 --- a/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_aar.xml index 9f8ce59..449b330 100755 --- a/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_aar.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/.idea/libraries/Gradle__androidx_room_room_runtime_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_room_room_runtime_2_0_0_aar.xml index 01a1d25..905a799 100755 --- a/.idea/libraries/Gradle__androidx_room_room_runtime_2_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_room_room_runtime_2_0_0_aar.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_rc01_aar.xml index 4d57d6b..01041df 100755 --- a/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_rc01_aar.xml +++ b/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_rc01_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml index 6f211b3..4fd4493 100755 --- a/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_sqlite_sqlite_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_sqlite_sqlite_2_0_0_aar.xml index 0f3fbd7..41beb4d 100755 --- a/.idea/libraries/Gradle__androidx_sqlite_sqlite_2_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_sqlite_sqlite_2_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_sqlite_sqlite_framework_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_sqlite_sqlite_framework_2_0_0_aar.xml index 61b2249..80e1f1c 100755 --- a/.idea/libraries/Gradle__androidx_sqlite_sqlite_framework_2_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_sqlite_sqlite_framework_2_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml index 2cf0db6..cf00138 100755 --- a/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/.idea/libraries/Gradle__androidx_test_core_1_2_0_aar.xml b/.idea/libraries/Gradle__androidx_test_core_1_2_0_aar.xml index 83434f6..645f726 100755 --- a/.idea/libraries/Gradle__androidx_test_core_1_2_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_test_core_1_2_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_2_0_aar.xml b/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_2_0_aar.xml index bc66406..83462ca 100755 --- a/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_2_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_2_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_2_0_aar.xml b/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_2_0_aar.xml index 1478f11..68fa3a1 100755 --- a/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_2_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_2_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_1_aar.xml b/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_1_aar.xml index e8917a5..5cb2342 100755 --- a/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_1_aar.xml +++ b/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_test_monitor_1_2_0_aar.xml b/.idea/libraries/Gradle__androidx_test_monitor_1_2_0_aar.xml index d93a544..ba5da0e 100755 --- a/.idea/libraries/Gradle__androidx_test_monitor_1_2_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_test_monitor_1_2_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_test_rules_1_2_0_aar.xml b/.idea/libraries/Gradle__androidx_test_rules_1_2_0_aar.xml index dbcc5c2..90c1cc6 100755 --- a/.idea/libraries/Gradle__androidx_test_rules_1_2_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_test_rules_1_2_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_test_runner_1_2_0_aar.xml b/.idea/libraries/Gradle__androidx_test_runner_1_2_0_aar.xml index 9103d3d..7dabae3 100755 --- a/.idea/libraries/Gradle__androidx_test_runner_1_2_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_test_runner_1_2_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_transition_transition_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_transition_transition_1_0_0_aar.xml index 7f0eb67..d1c0514 100755 --- a/.idea/libraries/Gradle__androidx_transition_transition_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_transition_transition_1_0_0_aar.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_rc01_aar.xml index 101b026..d6dcd0f 100755 --- a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_rc01_aar.xml +++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_rc01_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_rc01_aar.xml index 6adc1c5..9416015 100755 --- a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_rc01_aar.xml +++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_rc01_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_rc01_aar.xml index e57733a..29e9aff 100755 --- a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_rc01_aar.xml +++ b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_rc01_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml index edfcbb5..8d3bcbf 100755 --- a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_evrencoskun_library_tableview_0_8_8_aar.xml b/.idea/libraries/Gradle__com_evrencoskun_library_tableview_0_8_8_aar.xml index b0af088..e331a18 100755 --- a/.idea/libraries/Gradle__com_evrencoskun_library_tableview_0_8_8_aar.xml +++ b/.idea/libraries/Gradle__com_evrencoskun_library_tableview_0_8_8_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_material_material_1_0_0_aar.xml b/.idea/libraries/Gradle__com_google_android_material_material_1_0_0_aar.xml index bd251ed..de93b3d 100755 --- a/.idea/libraries/Gradle__com_google_android_material_material_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_material_material_1_0_0_aar.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml b/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml index 0bb3dc8..21065c4 100755 --- a/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml +++ b/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_1_aar.xml b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_1_aar.xml index 8ac4f6f..f206221 100755 --- a/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_1_aar.xml +++ b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__org_fabiomsr_moneytextview_1_1_0_aar.xml b/.idea/libraries/Gradle__org_fabiomsr_moneytextview_1_1_0_aar.xml index 798ee85..b6148b1 100755 --- a/.idea/libraries/Gradle__org_fabiomsr_moneytextview_1_1_0_aar.xml +++ b/.idea/libraries/Gradle__org_fabiomsr_moneytextview_1_1_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/TrackCovid19.iml b/TrackCovid19.iml index c804e04..2a80db9 100755 --- a/TrackCovid19.iml +++ b/TrackCovid19.iml @@ -1,5 +1,5 @@ - + diff --git a/app/app.iml b/app/app.iml index 7980f6d..0f6f1b3 100755 --- a/app/app.iml +++ b/app/app.iml @@ -1,11 +1,11 @@ - + @@ -19,8 +19,8 @@ @@ -30,15 +30,15 @@ - + - - + + diff --git a/app/src/main/java/com/josh/trackcovid19v2/data/network/NetworkUtils.java b/app/src/main/java/com/josh/trackcovid19v2/data/network/NetworkUtils.java index d853fde..9e268b7 100755 --- a/app/src/main/java/com/josh/trackcovid19v2/data/network/NetworkUtils.java +++ b/app/src/main/java/com/josh/trackcovid19v2/data/network/NetworkUtils.java @@ -23,7 +23,7 @@ import retrofit2.converter.gson.GsonConverterFactory; public class NetworkUtils { private static final String LOG_TAG = NetworkUtils.class.getSimpleName(); - private static final String BASE_URL = "https://corona.lmao.ninja/"; + private static final String BASE_URL = "https://disease.sh/"; private static Retrofit getRetrofit() { return new Retrofit.Builder().baseUrl(BASE_URL).addConverterFactory(GsonConverterFactory diff --git a/app/src/main/java/com/josh/trackcovid19v2/data/network/RestApi.java b/app/src/main/java/com/josh/trackcovid19v2/data/network/RestApi.java index ce2e665..87b2666 100755 --- a/app/src/main/java/com/josh/trackcovid19v2/data/network/RestApi.java +++ b/app/src/main/java/com/josh/trackcovid19v2/data/network/RestApi.java @@ -18,25 +18,25 @@ import retrofit2.http.Query; public interface RestApi { @Headers("Content-Type: application/json") - @GET("v2/states") + @GET("v3/covid-19/states") Call> getStatess(); - @GET("v2/states") + @GET("v3/covid-19/states") Call> getStates(@Query("yesterday") int y); - @GET("v2/states") + @GET("v3/covid-19/states") Call> getYesStates(@Query("yesterday") int y); - @GET("/v2/countries") + @GET("/v3/covid-19/countries") Call> getCountries(@Query("yesterday") int y); - @GET("/v2/countries") + @GET("/v3/covid-19/countries") Call> getYesCountries(@Query("yesterday") int y); - @GET("v2/all") + @GET("v3/covid-19/all") Call getWorld(); - @GET("v2/all?yesterday=true") + @GET("v3/covid-19/all?yesterday=true") Call getYesWorld(); //countries/USA diff --git a/build.gradle b/build.gradle index 17243a5..51f35a4 100755 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.6.3' + classpath 'com.android.tools.build:gradle:4.0.0' classpath 'com.evrencoskun.library:tableview:0.8.9' diff --git a/gradle.properties b/gradle.properties index 7287f53..34f507e 100755 --- a/gradle.properties +++ b/gradle.properties @@ -17,7 +17,6 @@ org.gradle.jvmargs=-Xmx1536m android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true -android.enableSeparateAnnotationProcessing=true org.gradle.daemon=true org.gradle.parallel=true org.gradle.configureondemand=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 44f92e8..aef5058 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Mar 25 19:38:52 EDT 2020 +#Sun Aug 02 10:54:39 EDT 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/local.properties b/local.properties index 7a5623b..f53430f 100755 --- a/local.properties +++ b/local.properties @@ -4,5 +4,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Sat Apr 25 19:51:47 EDT 2020 -sdk.dir=/Users/admin/Library/Android/sdk +#Sun Aug 02 10:44:55 EDT 2020 +sdk.dir=/Users/joshp/Library/Android/sdk