diff --git a/.gradle/4.10.1/fileHashes/fileHashes.bin b/.gradle/4.10.1/fileHashes/fileHashes.bin index fb391c4e..8b9518c6 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 29317969..16be54ab 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 95a934c4..2c7c5855 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 75fb868e..241cbbff 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 a6d74171..013adef5 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 266542bf..ccc2f22f 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 375f6488..5a3c97ae 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 74f022e0..10927561 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 e33478b0..f2abc1b9 100644 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 f001a4b5..5794d6fe 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ 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 0ca8abde..ffaeb0bd 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 3511f522..ebcb0b47 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 34def139..ba0fc78e 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 1af6ae54..01e049ba 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 664eb10c..74ed0e4b 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 59f9346d..233443da 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 238cb296..6bf2b253 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 20836294..c6ebeb7a 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 cda2b09f..081c6603 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_dagger_dagger_android_2_13_aar.xml b/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_13_aar.xml index 0bd05c29..8ee00117 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,10 +1,12 @@ - - + + - + + + 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 fd4f2b5c..745d25e7 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,10 +1,12 @@ - - + + - + + + 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 8537c33d..9387a996 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 7ad4f653..30bb005f 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 990d2937..1a7e0ef2 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 98f0d92c..3fb5b99c 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 416dbc3f..f07d26eb 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 acc98335..94cb7267 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 b9cc82ea..cf99d026 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 cc29e414..81cc5515 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 ab4541cf..8f1c9385 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 b37ea6d6..df7d1ff7 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 dad241ba..c852352e 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 c2c8baca..1417c336 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 60030af6..2a23a440 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 c01a62d9..3020b5d7 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -9,9 +9,7 @@ - - @@ -43,541 +41,92 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + + + - - - + + + + - - + + - - - - - - - + + - - + - + + - - - + + + + - + + + - - + - - + + + + - - - + + + + - - + + - - - - - - - + + - - + - + + - - - + + + + - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - + + + + - + @@ -599,10 +148,10 @@ +