diff --git a/.gradle/7.4.1/executionHistory/executionHistory.bin b/.gradle/7.4.1/executionHistory/executionHistory.bin index ff592e5..5f338f1 100644 Binary files a/.gradle/7.4.1/executionHistory/executionHistory.bin and b/.gradle/7.4.1/executionHistory/executionHistory.bin differ diff --git a/.gradle/7.4.1/executionHistory/executionHistory.lock b/.gradle/7.4.1/executionHistory/executionHistory.lock index 7437a63..67ffb68 100644 Binary files a/.gradle/7.4.1/executionHistory/executionHistory.lock and b/.gradle/7.4.1/executionHistory/executionHistory.lock differ diff --git a/.gradle/7.4.1/fileHashes/fileHashes.bin b/.gradle/7.4.1/fileHashes/fileHashes.bin index 7de80d3..5786fcb 100644 Binary files a/.gradle/7.4.1/fileHashes/fileHashes.bin and b/.gradle/7.4.1/fileHashes/fileHashes.bin differ diff --git a/.gradle/7.4.1/fileHashes/fileHashes.lock b/.gradle/7.4.1/fileHashes/fileHashes.lock index 59454d1..39fb893 100644 Binary files a/.gradle/7.4.1/fileHashes/fileHashes.lock and b/.gradle/7.4.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/7.4.1/fileHashes/resourceHashesCache.bin b/.gradle/7.4.1/fileHashes/resourceHashesCache.bin index 1fafd93..8e0f385 100644 Binary files a/.gradle/7.4.1/fileHashes/resourceHashesCache.bin and b/.gradle/7.4.1/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 7a9db01..8e907f3 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 e061959..88bc7a9 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index e88ad82..c1468f9 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/.idea/libraries/Gradle__androidx_activity_activity_1_5_1_aar.xml b/.idea/libraries/Gradle__androidx_activity_activity_1_5_1_aar.xml index 94f7253..0c7ff69 100644 --- a/.idea/libraries/Gradle__androidx_activity_activity_1_5_1_aar.xml +++ b/.idea/libraries/Gradle__androidx_activity_activity_1_5_1_aar.xml @@ -4,9 +4,9 @@ + - diff --git a/.idea/libraries/Gradle__androidx_annotation_annotation_experimental_1_3_0_aar.xml b/.idea/libraries/Gradle__androidx_annotation_annotation_experimental_1_3_0_aar.xml index 6f850bf..c50cc99 100644 --- a/.idea/libraries/Gradle__androidx_annotation_annotation_experimental_1_3_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_annotation_annotation_experimental_1_3_0_aar.xml @@ -1,9 +1,9 @@ + - diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_5_1_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_5_1_aar.xml index 13a7344..6540cec 100644 --- a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_5_1_aar.xml +++ b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_5_1_aar.xml @@ -4,9 +4,9 @@ - - + + diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_1_0_aar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_1_0_aar.xml index 9ba5055..e96418b 100644 --- a/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_1_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_1_0_aar.xml @@ -1,9 +1,8 @@ - - + diff --git a/.idea/libraries/Gradle__androidx_browser_browser_1_4_0_aar.xml b/.idea/libraries/Gradle__androidx_browser_browser_1_4_0_aar.xml index cd2f1d8..7c9f80a 100644 --- a/.idea/libraries/Gradle__androidx_browser_browser_1_4_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_browser_browser_1_4_0_aar.xml @@ -5,8 +5,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 146083d..d7c8985 100644 --- a/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml @@ -1,9 +1,9 @@ - + diff --git a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_2_1_4_aar.xml b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_2_1_4_aar.xml index 41d1448..140c90e 100644 --- a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_2_1_4_aar.xml +++ b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_2_1_4_aar.xml @@ -1,9 +1,9 @@ - + diff --git a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_1_0_aar.xml index 9f8db5a..28a0973 100644 --- a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_1_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_1_0_aar.xml @@ -4,9 +4,9 @@ + - diff --git a/.idea/libraries/Gradle__androidx_core_core_1_9_0_aar.xml b/.idea/libraries/Gradle__androidx_core_core_1_9_0_aar.xml index 979b2b6..0d4e931 100644 --- a/.idea/libraries/Gradle__androidx_core_core_1_9_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_core_core_1_9_0_aar.xml @@ -5,8 +5,8 @@ - + diff --git a/.idea/libraries/Gradle__androidx_core_core_ktx_1_9_0_aar.xml b/.idea/libraries/Gradle__androidx_core_core_ktx_1_9_0_aar.xml index 8b4fd01..e55074c 100644 --- a/.idea/libraries/Gradle__androidx_core_core_ktx_1_9_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_core_core_ktx_1_9_0_aar.xml @@ -1,9 +1,9 @@ - + diff --git a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml index a3803ae..7a98f1f 100644 --- a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml @@ -1,7 +1,6 @@ - diff --git a/.idea/libraries/Gradle__androidx_customview_customview_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_customview_customview_1_1_0_aar.xml index c5b4c03..9ea55dc 100644 --- a/.idea/libraries/Gradle__androidx_customview_customview_1_1_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_customview_customview_1_1_0_aar.xml @@ -1,7 +1,6 @@ - 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 b681fdf..f433ab9 100644 --- a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml @@ -1,7 +1,6 @@ - diff --git a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_1_1_aar.xml b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_1_1_aar.xml index 3bd5696..da413a3 100644 --- a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_1_1_aar.xml +++ b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_1_1_aar.xml @@ -4,9 +4,9 @@ - + diff --git a/.idea/libraries/Gradle__androidx_dynamicanimation_dynamicanimation_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_dynamicanimation_dynamicanimation_1_0_0_aar.xml index 5b889f0..2c2cb08 100644 --- a/.idea/libraries/Gradle__androidx_dynamicanimation_dynamicanimation_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_dynamicanimation_dynamicanimation_1_0_0_aar.xml @@ -1,9 +1,8 @@ - - + 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 c06a0e7..310b067 100644 --- a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml @@ -1,7 +1,6 @@ - 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 8a53b7d..cb58713 100644 --- a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml @@ -1,7 +1,6 @@ - diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_5_1_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_5_1_aar.xml index 7ed1bea..8fe3ee6 100644 --- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_5_1_aar.xml +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_5_1_aar.xml @@ -1,9 +1,9 @@ + - diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_5_1_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_5_1_aar.xml index 8480342..fbb260d 100644 --- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_5_1_aar.xml +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_5_1_aar.xml @@ -1,9 +1,9 @@ + - diff --git a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml index febc2a1..7d5a511 100644 --- a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml @@ -1,9 +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 4261581..bcccfeb 100644 --- a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml @@ -1,9 +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 f050890..712b81a 100644 --- a/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml @@ -4,9 +4,8 @@ - - + diff --git a/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_2_0_aar.xml b/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_2_0_aar.xml index ad6c0ee..0a5f7c7 100644 --- a/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_2_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_2_0_aar.xml @@ -2,8 +2,8 @@ - + diff --git a/.idea/libraries/Gradle__androidx_test_core_1_4_0_aar.xml b/.idea/libraries/Gradle__androidx_test_core_1_4_0_aar.xml index da67bca..aa3ad4f 100644 --- a/.idea/libraries/Gradle__androidx_test_core_1_4_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_test_core_1_4_0_aar.xml @@ -1,9 +1,8 @@ - - + diff --git a/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_4_0_aar.xml b/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_4_0_aar.xml index 8384ae8..315bb09 100644 --- a/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_4_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_4_0_aar.xml @@ -1,9 +1,8 @@ - - + diff --git a/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_4_0_aar.xml b/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_4_0_aar.xml index b2f8363..7f604ff 100644 --- a/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_4_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_4_0_aar.xml @@ -1,9 +1,8 @@ - - + diff --git a/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_3_aar.xml b/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_3_aar.xml index 6e17287..d317950 100644 --- a/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_3_aar.xml +++ b/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_3_aar.xml @@ -1,7 +1,6 @@ - diff --git a/.idea/libraries/Gradle__androidx_test_monitor_1_4_0_aar.xml b/.idea/libraries/Gradle__androidx_test_monitor_1_4_0_aar.xml index 0acb9a6..c8a79f9 100644 --- a/.idea/libraries/Gradle__androidx_test_monitor_1_4_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_test_monitor_1_4_0_aar.xml @@ -1,9 +1,8 @@ - - + diff --git a/.idea/libraries/Gradle__androidx_test_runner_1_4_0_aar.xml b/.idea/libraries/Gradle__androidx_test_runner_1_4_0_aar.xml index 4e37f4a..cd5b8c2 100644 --- a/.idea/libraries/Gradle__androidx_test_runner_1_4_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_test_runner_1_4_0_aar.xml @@ -1,9 +1,8 @@ - - + diff --git a/.idea/libraries/Gradle__androidx_test_services_storage_1_4_0_aar.xml b/.idea/libraries/Gradle__androidx_test_services_storage_1_4_0_aar.xml index 6d25091..0b969fa 100644 --- a/.idea/libraries/Gradle__androidx_test_services_storage_1_4_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_test_services_storage_1_4_0_aar.xml @@ -1,9 +1,8 @@ - - + diff --git a/.idea/libraries/Gradle__androidx_transition_transition_1_2_0_aar.xml b/.idea/libraries/Gradle__androidx_transition_transition_1_2_0_aar.xml index f461941..6feeb03 100644 --- a/.idea/libraries/Gradle__androidx_transition_transition_1_2_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_transition_transition_1_2_0_aar.xml @@ -4,9 +4,9 @@ - + diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml index 67f3403..581b81d 100644 --- a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml @@ -1,7 +1,6 @@ - diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml index cf26e87..e5a0176 100644 --- a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml @@ -1,7 +1,6 @@ - diff --git a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_1_aar.xml b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_1_aar.xml index 5640bae..f917d5b 100644 --- a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_1_aar.xml +++ b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_1_aar.xml @@ -1,7 +1,6 @@ - diff --git a/.idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_aar.xml index 2cda02b..6e6c103 100644 --- a/.idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_aar.xml @@ -4,9 +4,9 @@ - + diff --git a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml index 0c5648a..83771cd 100644 --- a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml @@ -1,9 +1,8 @@ - - + diff --git a/.idea/libraries/Gradle__com_airbnb_android_lottie_5_2_0_aar.xml b/.idea/libraries/Gradle__com_airbnb_android_lottie_5_2_0_aar.xml index b776579..9740ef3 100644 --- a/.idea/libraries/Gradle__com_airbnb_android_lottie_5_2_0_aar.xml +++ b/.idea/libraries/Gradle__com_airbnb_android_lottie_5_2_0_aar.xml @@ -4,8 +4,8 @@ - + diff --git a/.idea/libraries/Gradle__com_firebaseui_firebase_ui_auth_7_2_0_aar.xml b/.idea/libraries/Gradle__com_firebaseui_firebase_ui_auth_7_2_0_aar.xml index c1b932a..9718a8c 100644 --- a/.idea/libraries/Gradle__com_firebaseui_firebase_ui_auth_7_2_0_aar.xml +++ b/.idea/libraries/Gradle__com_firebaseui_firebase_ui_auth_7_2_0_aar.xml @@ -5,8 +5,8 @@ - + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_18_0_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_18_0_0_aar.xml index 930fbe2..52d5446 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_18_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_18_0_0_aar.xml @@ -1,8 +1,8 @@ - + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_auth_19_0_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_auth_19_0_0_aar.xml index 4e45d82..593a216 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_auth_19_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_auth_19_0_0_aar.xml @@ -2,8 +2,8 @@ - + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_auth_api_phone_17_4_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_auth_api_phone_17_4_0_aar.xml index 7c998b0..31e93f1 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_auth_api_phone_17_4_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_auth_api_phone_17_4_0_aar.xml @@ -1,8 +1,8 @@ - + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_base_18_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_base_18_0_1_aar.xml index b4103a0..4e62fba 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_base_18_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_base_18_0_1_aar.xml @@ -2,8 +2,8 @@ - + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_18_1_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_18_1_0_aar.xml index 6efe451..20d2ecc 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_18_1_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_18_1_0_aar.xml @@ -1,8 +1,8 @@ - + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_21_1_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_21_1_1_aar.xml index 79e6710..e588e69 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_21_1_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_21_1_1_aar.xml @@ -1,8 +1,8 @@ - + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_api_21_1_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_api_21_1_1_aar.xml index 19b675b..9d843fd 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_api_21_1_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_api_21_1_1_aar.xml @@ -1,8 +1,8 @@ - + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_21_1_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_21_1_1_aar.xml index 5c96c31..f66ff03 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_21_1_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_21_1_1_aar.xml @@ -1,8 +1,8 @@ - + diff --git a/.idea/libraries/Gradle__com_google_android_material_material_1_6_1_aar.xml b/.idea/libraries/Gradle__com_google_android_material_material_1_6_1_aar.xml index e894acf..75fc806 100644 --- a/.idea/libraries/Gradle__com_google_android_material_material_1_6_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_material_material_1_6_1_aar.xml @@ -4,9 +4,9 @@ - + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_21_1_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_21_1_1_aar.xml index 937ae65..8d5a017 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_21_1_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_21_1_1_aar.xml @@ -1,8 +1,8 @@ - + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_auth_21_0_8_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_auth_21_0_8_aar.xml index f2a8183..8ffd3cc 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_auth_21_0_8_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_auth_21_0_8_aar.xml @@ -1,8 +1,8 @@ - + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_common_20_1_2_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_common_20_1_2_aar.xml index 7da3e8b..4137ad6 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_common_20_1_2_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_common_20_1_2_aar.xml @@ -1,9 +1,9 @@ - + diff --git a/.idea/modules/app/Mealer.app.iml b/.idea/modules/app/Mealer.app.iml index 2faa05c..e349365 100644 --- a/.idea/modules/app/Mealer.app.iml +++ b/.idea/modules/app/Mealer.app.iml @@ -4,7 +4,7 @@ diff --git a/.idea/modules/app/app.Mealer.app.androidTest.iml b/.idea/modules/app/app.Mealer.app.androidTest.iml index 44ca46d..70a5eca 100644 --- a/.idea/modules/app/app.Mealer.app.androidTest.iml +++ b/.idea/modules/app/app.Mealer.app.androidTest.iml @@ -121,8 +121,8 @@ $USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.9.0/74fe3b8b4f3fc84dc940d0ca4c4b270dbc902764/error_prone_annotations-2.9.0.jar $USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-annotations/16.1.0/64bf465fd5aa693067bfd6bc28efb260e1ad29ea/firebase-annotations-16.1.0.jar $USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/listenablefuture/1.0/c949a840a6acbc5268d088e47b04177bf90b3cad/listenablefuture-1.0.jar - $USER_HOME$/Library/Android/sdk/platforms/android-33/android.jar - $USER_HOME$/Library/Android/sdk/build-tools/30.0.3/core-lambda-stubs.jar + $USER_HOME$/AppData/Local/Android/Sdk/platforms/android-33/android.jar + $USER_HOME$/AppData/Local/Android/Sdk/build-tools/30.0.3/core-lambda-stubs.jar @@ -165,17 +165,11 @@ - - - + - - - + - - - + diff --git a/.idea/modules/app/app.Mealer.app.main.iml b/.idea/modules/app/app.Mealer.app.main.iml index 09bb8a4..1185782 100644 --- a/.idea/modules/app/app.Mealer.app.main.iml +++ b/.idea/modules/app/app.Mealer.app.main.iml @@ -1,22 +1,6 @@ - - - - @@ -124,8 +108,8 @@ $USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.9.0/74fe3b8b4f3fc84dc940d0ca4c4b270dbc902764/error_prone_annotations-2.9.0.jar $USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-annotations/16.1.0/64bf465fd5aa693067bfd6bc28efb260e1ad29ea/firebase-annotations-16.1.0.jar $USER_HOME$/.gradle/caches/transforms-3/d6d2f160c57162fb7416fc5aaed54668/transformed/lottie-5.2.0-api.jar - $USER_HOME$/Library/Android/sdk/platforms/android-33/android.jar - $USER_HOME$/Library/Android/sdk/build-tools/30.0.3/core-lambda-stubs.jar + $USER_HOME$/AppData/Local/Android/Sdk/platforms/android-33/android.jar + $USER_HOME$/AppData/Local/Android/Sdk/build-tools/30.0.3/core-lambda-stubs.jar @@ -142,13 +126,28 @@ + + + + - @@ -160,7 +159,6 @@ - diff --git a/.idea/modules/app/app.Mealer.app.unitTest.iml b/.idea/modules/app/app.Mealer.app.unitTest.iml index 995bd24..2e6144c 100644 --- a/.idea/modules/app/app.Mealer.app.unitTest.iml +++ b/.idea/modules/app/app.Mealer.app.unitTest.iml @@ -110,8 +110,8 @@ $USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.9.0/74fe3b8b4f3fc84dc940d0ca4c4b270dbc902764/error_prone_annotations-2.9.0.jar $USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-annotations/16.1.0/64bf465fd5aa693067bfd6bc28efb260e1ad29ea/firebase-annotations-16.1.0.jar $USER_HOME$/.gradle/caches/transforms-3/d6d2f160c57162fb7416fc5aaed54668/transformed/lottie-5.2.0-api.jar - $USER_HOME$/Library/Android/sdk/platforms/android-33/android.jar - $USER_HOME$/Library/Android/sdk/build-tools/30.0.3/core-lambda-stubs.jar + $USER_HOME$/AppData/Local/Android/Sdk/platforms/android-33/android.jar + $USER_HOME$/AppData/Local/Android/Sdk/build-tools/30.0.3/core-lambda-stubs.jar diff --git a/app/src/main/java/com/mealer/ui/LoginPage.java b/app/src/main/java/com/mealer/ui/LoginPage.java index 5d817d7..de359f3 100644 --- a/app/src/main/java/com/mealer/ui/LoginPage.java +++ b/app/src/main/java/com/mealer/ui/LoginPage.java @@ -245,6 +245,7 @@ private void updateUI(FirebaseUser currentFirebaseUser, User currentUser){ } private boolean isAdmin(String email){ + System.out.println(email.equals(adminEmail)); return email.equals(adminEmail); } diff --git a/app/src/main/res/layout/activity_user_home_page.xml b/app/src/main/res/layout/activity_user_home_page.xml index 577c46e..58474d6 100644 --- a/app/src/main/res/layout/activity_user_home_page.xml +++ b/app/src/main/res/layout/activity_user_home_page.xml @@ -5,11 +5,13 @@ android:id="@+id/container" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/Cream" android:paddingTop="?attr/actionBarSize"> @@ -20,7 +22,9 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:textColor="@color/white" - android:textSize="20sp"/> + android:textSize="20sp" + android:translationX="-175dp" + android:translationY="-250dp" /> + android:backgroundTint="@color/lightBrown" + android:text="@string/sign_out" + android:translationY="200dp" /> \ No newline at end of file diff --git a/local.properties b/local.properties index 16098b6..87d81fd 100644 --- a/local.properties +++ b/local.properties @@ -5,4 +5,4 @@ # For customization when using a Version Control System, please read the # header note. #Wed Oct 12 20:10:25 EDT 2022 -sdk.dir=/Users/eastonsmith37/Library/Android/sdk \ No newline at end of file +sdk.dir=C\:\\Users\\Fr33k\\AppData\\Local\\Android\\Sdk \ No newline at end of file