diff --git a/.gradle/4.10.1/fileHashes/fileHashes.bin b/.gradle/4.10.1/fileHashes/fileHashes.bin index cfe91202..b63de060 100644 Binary files a/.gradle/4.10.1/fileHashes/fileHashes.bin and b/.gradle/4.10.1/fileHashes/fileHashes.bin differ diff --git a/.gradle/4.10.1/fileHashes/fileHashes.lock b/.gradle/4.10.1/fileHashes/fileHashes.lock index 824405e5..3794dad4 100644 Binary files a/.gradle/4.10.1/fileHashes/fileHashes.lock and b/.gradle/4.10.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/4.10.1/javaCompile/classAnalysis.bin b/.gradle/4.10.1/javaCompile/classAnalysis.bin index af95457d..0a9142ee 100644 Binary files a/.gradle/4.10.1/javaCompile/classAnalysis.bin and b/.gradle/4.10.1/javaCompile/classAnalysis.bin differ diff --git a/.gradle/4.10.1/javaCompile/javaCompile.lock b/.gradle/4.10.1/javaCompile/javaCompile.lock index 70f6d7ef..432c7b22 100644 Binary files a/.gradle/4.10.1/javaCompile/javaCompile.lock and b/.gradle/4.10.1/javaCompile/javaCompile.lock differ diff --git a/.gradle/4.10.1/javaCompile/taskHistory.bin b/.gradle/4.10.1/javaCompile/taskHistory.bin index 81dc0b90..0f65fad6 100644 Binary files a/.gradle/4.10.1/javaCompile/taskHistory.bin and b/.gradle/4.10.1/javaCompile/taskHistory.bin differ diff --git a/.gradle/4.10.1/taskHistory/taskHistory.bin b/.gradle/4.10.1/taskHistory/taskHistory.bin index e81c2019..781706df 100644 Binary files a/.gradle/4.10.1/taskHistory/taskHistory.bin and b/.gradle/4.10.1/taskHistory/taskHistory.bin differ diff --git a/.gradle/4.10.1/taskHistory/taskHistory.lock b/.gradle/4.10.1/taskHistory/taskHistory.lock index 50a21c94..a2d69e84 100644 Binary files a/.gradle/4.10.1/taskHistory/taskHistory.lock and b/.gradle/4.10.1/taskHistory/taskHistory.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 76dc4ec6..d7c12776 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index cc9aa1e9..9398295f 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index cb63c35d..4c830d55 100644 Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 30aa626c..00000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 00000000..15a15b21 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file 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 8dee0e84..91082231 100644 --- 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,8 +1,5 @@ - - - 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 87fb6ecb..de96ef29 100644 --- 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,8 +1,5 @@ - - - diff --git a/.idea/libraries/Gradle__com_getbase_floatingactionbutton_1_6_0_aar.xml b/.idea/libraries/Gradle__com_getbase_floatingactionbutton_1_6_0_aar.xml index 23276bcb..7ee820d8 100644 --- a/.idea/libraries/Gradle__com_getbase_floatingactionbutton_1_6_0_aar.xml +++ b/.idea/libraries/Gradle__com_getbase_floatingactionbutton_1_6_0_aar.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/.idea/libraries/Gradle__com_github_ksoichiro_android_observablescrollview_1_5_0_aar.xml b/.idea/libraries/Gradle__com_github_ksoichiro_android_observablescrollview_1_5_0_aar.xml index 9e6cb3b8..9111ae0d 100644 --- a/.idea/libraries/Gradle__com_github_ksoichiro_android_observablescrollview_1_5_0_aar.xml +++ b/.idea/libraries/Gradle__com_github_ksoichiro_android_observablescrollview_1_5_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_15_0_1_aar.xml index f10b707c..352cdea3 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_15_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_15_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1_aar.xml index bf74f43c..508d15b6 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1_aar.xml index 52455443..a07d6b94 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_clearcut_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_clearcut_15_0_1_aar.xml index a2d8ff67..59a9a44b 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_clearcut_15_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_clearcut_15_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_phenotype_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_phenotype_15_0_1_aar.xml index 25df6bf4..3b1773ff 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_phenotype_15_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_phenotype_15_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_15_0_1_aar.xml index 56944125..a658df5f 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_15_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_15_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1_aar.xml index cf64499c..8e1d2674 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1_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 39672c7c..00b2ea93 100644 --- a/.idea/libraries/Gradle__com_google_android_material_material_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_material_material_1_0_0_aar.xml @@ -1,8 +1,5 @@ - - - diff --git a/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_13_aar.xml b/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_13_aar.xml index 49314e36..78ba631a 100644 --- a/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_13_aar.xml +++ b/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_13_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_dagger_dagger_android_support_2_13_aar.xml b/.idea/libraries/Gradle__com_google_dagger_dagger_android_support_2_13_aar.xml index 927edb81..9dedd47f 100644 --- a/.idea/libraries/Gradle__com_google_dagger_dagger_android_support_2_13_aar.xml +++ b/.idea/libraries/Gradle__com_google_dagger_dagger_android_support_2_13_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_0_1_aar.xml index 16bfe7b8..9f8a04ed 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_impl_16_1_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_impl_16_1_1_aar.xml index d418eaf7..ae8276eb 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_impl_16_1_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_impl_16_1_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_0_1_aar.xml index f66b7bb4..3372c99e 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_firestore_15_0_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_firestore_15_0_0_aar.xml index 6d0b1f7d..36c996c9 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_firestore_15_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_firestore_15_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_17_0_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_17_0_1_aar.xml index 25572450..c10a2c3a 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_17_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_17_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_0_aar.xml index 77bf9782..d682c385 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_17_0_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_17_0_0_aar.xml index 6db3db8d..a94b68b5 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_17_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_17_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_display_17_0_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_display_17_0_0_aar.xml index b43fc939..9d55c559 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_display_17_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_display_17_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_0_aar.xml index 7a23f81f..504b011f 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_impl_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_impl_16_0_1_aar.xml index 6f1f68ea..2cf98c33 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_impl_16_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_impl_16_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_messaging_17_3_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_messaging_17_3_1_aar.xml index d6e05578..045a40f8 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_messaging_17_3_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_messaging_17_3_1_aar.xml @@ -1,8 +1,8 @@ - - + + 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 1e4919c3..b33966fd 100644 --- 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__me_dm7_barcodescanner_core_1_9_13_aar.xml b/.idea/libraries/Gradle__me_dm7_barcodescanner_core_1_9_13_aar.xml index ba1fc69a..af39e53b 100644 --- a/.idea/libraries/Gradle__me_dm7_barcodescanner_core_1_9_13_aar.xml +++ b/.idea/libraries/Gradle__me_dm7_barcodescanner_core_1_9_13_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index fd88c60e..67e6b3e5 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -23,27 +23,12 @@ - - - - - - - - - - - - - + - - - - - - + + + @@ -53,6 +38,7 @@ + @@ -69,234 +55,100 @@ - - - - - - + + + - - - - - + + - - - - + + + + - - + + - - - - - + + + - - - + - - - + + - - - - - + + + + + + + + + - + + - - - - + + + + - - + + - - - - - + + + - - - + - - - + + - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - + + @@ -433,4367 +228,6 @@ - - - - - - - - @@ -4835,7 +269,6 @@ - @@ -4847,6 +280,7 @@