diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 00000000..63d5588a
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 15a15b21..c2bae49d 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,4 +1,6 @@
-
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index fd51e56b..d553552d 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -14,7 +14,6 @@
-
diff --git a/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_aar.xml
deleted file mode 100644
index f4e646fe..00000000
--- a/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_annotation_annotation_1_1_0.xml b/.idea/libraries/Gradle__androidx_annotation_annotation_1_1_0.xml
deleted file mode 100644
index b2158ac9..00000000
--- a/.idea/libraries/Gradle__androidx_annotation_annotation_1_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_annotation_annotation_experimental_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_annotation_annotation_experimental_1_0_0_aar.xml
deleted file mode 100644
index 0eaa56cc..00000000
--- a/.idea/libraries/Gradle__androidx_annotation_annotation_experimental_1_0_0_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_2_0_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_2_0_aar.xml
deleted file mode 100644
index 25d385ef..00000000
--- a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_2_0_aar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_2_0_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_2_0_aar.xml
deleted file mode 100644
index 875d0857..00000000
--- a/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_2_0_aar.xml
+++ /dev/null
@@ -1,13 +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
index 3298e2fe..545987fb 100644
--- 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
@@ -6,6 +6,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 4b02196c..8f52ecb0 100644
--- a/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml
@@ -6,6 +6,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 eb8ff149..767e6cb9 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
@@ -4,6 +4,9 @@
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_2_0_1_aar.xml b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_2_0_1_aar.xml
deleted file mode 100644
index d6c963ed..00000000
--- a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_2_0_1_aar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_2_0_1.xml b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_2_0_1.xml
deleted file mode 100644
index 24d38041..00000000
--- a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_2_0_1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 993ed4c6..b1c06f23 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
@@ -2,11 +2,15 @@
+
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_core_core_1_3_1_aar.xml b/.idea/libraries/Gradle__androidx_core_core_1_3_1_aar.xml
deleted file mode 100644
index edd0b5ce..00000000
--- a/.idea/libraries/Gradle__androidx_core_core_1_3_1_aar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_core_core_ktx_1_3_1_aar.xml b/.idea/libraries/Gradle__androidx_core_core_ktx_1_3_1_aar.xml
deleted file mode 100644
index 26906213..00000000
--- a/.idea/libraries/Gradle__androidx_core_core_ktx_1_3_1_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
index c49bcc6b..252a093c 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
@@ -6,6 +6,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
deleted file mode 100644
index e7fc0dbc..00000000
--- a/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml
+++ /dev/null
@@ -1,15 +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
index 48695956..2d1063c3 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
@@ -6,6 +6,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
deleted file mode 100644
index 57ccf7e7..00000000
--- a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_aar.xml
deleted file mode 100644
index 4b7eb812..00000000
--- a/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_aar.xml
+++ /dev/null
@@ -1,18 +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
index 2dbcfb08..b9d1ce5f 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
@@ -6,6 +6,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 34b9d967..3f0a3b5d 100644
--- 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
@@ -6,6 +6,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 40e68506..c51a6531 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
@@ -6,6 +6,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 9ba4fb3f..5d4a23ff 100644
--- 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
@@ -6,6 +6,8 @@
+
+
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_1_0.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_1_0.xml
deleted file mode 100644
index 9354d446..00000000
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_1_0.xml
+++ /dev/null
@@ -1,11 +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
index 1450d7c8..915d3d1a 100644
--- 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
@@ -6,6 +6,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
deleted file mode 100644
index 56d922cf..00000000
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_1_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_1_0_aar.xml
deleted file mode 100644
index c842094c..00000000
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_1_0_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_1_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_1_0_aar.xml
deleted file mode 100644
index 52c94a23..00000000
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_1_0_aar.xml
+++ /dev/null
@@ -1,15 +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
index a5e24a09..c6bdb31f 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
@@ -6,6 +6,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 c8a3645d..8b4eb3c6 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
@@ -6,6 +6,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 ad84f683..47dffd27 100644
--- a/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml
@@ -2,11 +2,15 @@
+
+
+
+
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 9ee8a240..cb55b3ba 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
@@ -2,6 +2,7 @@
+
@@ -9,6 +10,8 @@
+
+
diff --git a/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_1_0_aar.xml
index d59d3e4f..33bd070a 100644
--- a/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_1_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_1_0_aar.xml
@@ -2,11 +2,15 @@
+
+
+
+
diff --git a/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml
deleted file mode 100644
index 26d41147..00000000
--- a/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml
+++ /dev/null
@@ -1,15 +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
index 6c718cb0..0e225b4d 100644
--- a/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml
@@ -6,6 +6,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 eb8d3050..e28abeda 100644
--- a/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml
@@ -2,6 +2,7 @@
+
@@ -9,6 +10,8 @@
+
+
diff --git a/.idea/libraries/Gradle__androidx_test_core_1_3_0_aar.xml b/.idea/libraries/Gradle__androidx_test_core_1_3_0_aar.xml
deleted file mode 100644
index fd8fc5cd..00000000
--- a/.idea/libraries/Gradle__androidx_test_core_1_3_0_aar.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_3_0_aar.xml b/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_3_0_aar.xml
deleted file mode 100644
index 7f593e0a..00000000
--- a/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_3_0_aar.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_3_0_aar.xml b/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_3_0_aar.xml
deleted file mode 100644
index f67c953d..00000000
--- a/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_3_0_aar.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_2_aar.xml b/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_2_aar.xml
deleted file mode 100644
index 6002a9b4..00000000
--- a/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_2_aar.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_test_monitor_1_3_0_aar.xml b/.idea/libraries/Gradle__androidx_test_monitor_1_3_0_aar.xml
deleted file mode 100644
index d58899d4..00000000
--- a/.idea/libraries/Gradle__androidx_test_monitor_1_3_0_aar.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_test_runner_1_3_0_aar.xml b/.idea/libraries/Gradle__androidx_test_runner_1_3_0_aar.xml
deleted file mode 100644
index 2aa88006..00000000
--- a/.idea/libraries/Gradle__androidx_test_runner_1_3_0_aar.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 ab3c9862..edb6f8cb 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
@@ -2,11 +2,15 @@
+
+
+
+
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 0605dda1..31691f01 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
@@ -6,6 +6,8 @@
+
+
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 8348f05f..2860f39e 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
@@ -6,6 +6,8 @@
+
+
diff --git a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_aar.xml
deleted file mode 100644
index ebf9c591..00000000
--- a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 e6cbc450..b81e8c84 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
@@ -2,11 +2,15 @@
+
+
+
+
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 92c0c93d..8ef4cce4 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
@@ -6,6 +6,8 @@
+
+
diff --git a/.idea/libraries/Gradle__com_github_PhilJay_MPAndroidChart_v3_1_0_aar.xml b/.idea/libraries/Gradle__com_github_PhilJay_MPAndroidChart_v3_1_0_aar.xml
index b21dbe9d..b74c0839 100644
--- a/.idea/libraries/Gradle__com_github_PhilJay_MPAndroidChart_v3_1_0_aar.xml
+++ b/.idea/libraries/Gradle__com_github_PhilJay_MPAndroidChart_v3_1_0_aar.xml
@@ -6,9 +6,12 @@
+
+
+
diff --git a/.idea/libraries/Gradle__com_google_android_material_material_1_2_1_aar.xml b/.idea/libraries/Gradle__com_google_android_material_material_1_2_1_aar.xml
deleted file mode 100644
index 169bd7c6..00000000
--- a/.idea/libraries/Gradle__com_google_android_material_material_1_2_1_aar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_jaredrummler_material_spinner_1_3_1_aar.xml b/.idea/libraries/Gradle__com_jaredrummler_material_spinner_1_3_1_aar.xml
index 8ee1cb12..fbaea41f 100644
--- a/.idea/libraries/Gradle__com_jaredrummler_material_spinner_1_3_1_aar.xml
+++ b/.idea/libraries/Gradle__com_jaredrummler_material_spinner_1_3_1_aar.xml
@@ -4,6 +4,9 @@
+
+
+
diff --git a/.idea/libraries/Gradle__com_ornach_nobobutton_nobobutton_1_6_aar.xml b/.idea/libraries/Gradle__com_ornach_nobobutton_nobobutton_1_6_aar.xml
index 67b6ade1..1394392b 100644
--- a/.idea/libraries/Gradle__com_ornach_nobobutton_nobobutton_1_6_aar.xml
+++ b/.idea/libraries/Gradle__com_ornach_nobobutton_nobobutton_1_6_aar.xml
@@ -7,6 +7,9 @@
+
+
+
diff --git a/.idea/libraries/Gradle__de_hdodenhof_circleimageview_3_1_0_aar.xml b/.idea/libraries/Gradle__de_hdodenhof_circleimageview_3_1_0_aar.xml
index 227d816c..34087d88 100644
--- a/.idea/libraries/Gradle__de_hdodenhof_circleimageview_3_1_0_aar.xml
+++ b/.idea/libraries/Gradle__de_hdodenhof_circleimageview_3_1_0_aar.xml
@@ -4,6 +4,9 @@
+
+
+
diff --git a/.idea/libraries/Gradle__junit_junit_4_12.xml b/.idea/libraries/Gradle__junit_junit_4_12.xml
index 6c078d62..f7d27c47 100644
--- a/.idea/libraries/Gradle__junit_junit_4_12.xml
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -1,5 +1,8 @@
+
+
+
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_72.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_72.xml
deleted file mode 100644
index 7929d635..00000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_android_extensions_runtime_1_3_72.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_72.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_72.xml
deleted file mode 100644
index cd57d89d..00000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_3_72.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_72.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_72.xml
deleted file mode 100644
index c769fecf..00000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_72.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 42c6cb61..0bf78b5c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
index d20cff7c..7d1be96c 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,6 +4,9 @@
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/app/toDonts.app.iml b/.idea/modules/app/toDonts.app.iml
index 78843551..7376bf1a 100644
--- a/.idea/modules/app/toDonts.app.iml
+++ b/.idea/modules/app/toDonts.app.iml
@@ -4,8 +4,8 @@
-
-
+
+
@@ -70,80 +70,10 @@
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules/toDonts.iml b/.idea/modules/toDonts.iml
index 8ad746a2..e8be16d1 100644
--- a/.idea/modules/toDonts.iml
+++ b/.idea/modules/toDonts.iml
@@ -1,13 +1,6 @@
-
-
-
-
-
-
-
-
+
diff --git a/app/build.gradle b/app/build.gradle
index c3198b30..87123920 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,15 +3,15 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
android {
- compileSdkVersion 30
- buildToolsVersion "30.0.2"
+ compileSdkVersion 33
+ buildToolsVersion "33.0.0"
defaultConfig {
applicationId "rocks.poopjournal.todont"
minSdkVersion 21
- targetSdkVersion 30
- versionCode 6
- versionName "1.6"
+ targetSdkVersion 33
+ versionCode 7
+ versionName "1.7"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index e7dd2b64..bad0ca25 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
- "versionCode": 5,
- "versionName": "1.5",
+ "versionCode": 6,
+ "versionName": "1.6",
"outputFile": "app-release.apk"
}
],
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1dc4bb06..7b655b8d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,11 +15,10 @@
-
+
-
-
-
+
+
diff --git a/app/src/main/java/rocks/poopjournal/todont/About.java b/app/src/main/java/rocks/poopjournal/todont/About.java
index 0f70e402..ac2a78cd 100644
--- a/app/src/main/java/rocks/poopjournal/todont/About.java
+++ b/app/src/main/java/rocks/poopjournal/todont/About.java
@@ -2,6 +2,7 @@
import androidx.appcompat.app.AppCompatActivity;
+import android.annotation.SuppressLint;
import android.content.ActivityNotFoundException;
import android.content.Intent;
import android.net.Uri;
@@ -16,6 +17,7 @@
public class About extends AppCompatActivity {
TextView version;
+ @SuppressLint("SetTextI18n")
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
diff --git a/app/src/main/java/rocks/poopjournal/todont/Settings.java b/app/src/main/java/rocks/poopjournal/todont/Settings.java
index eeb45884..fea88a81 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Settings.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Settings.java
@@ -30,13 +30,13 @@ protected void onCreate(Bundle savedInstanceState) {
Log.d("heyyyymode",""+Helper.isnightmodeon);
switch(Helper.isnightmodeon){
case "followsys":
- modetitle.setText("Follow System");
+ modetitle.setText(R.string.followsys);
break;
case "light":
- modetitle.setText("Light");
+ modetitle.setText(R.string.light);
break;
case "dark":
- modetitle.setText("Dark");
+ modetitle.setText(R.string.dark);
break;
}
// db.getNightMode();
@@ -75,21 +75,21 @@ public void onClick(View view) {
if(Helper.isnightmodeon.equals("followsys")){
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
Log.d("checkmode","f .. "+AppCompatDelegate.getDefaultNightMode());
- Toast.makeText(getApplicationContext(), " To Don't now follows your system ", Toast.LENGTH_SHORT).show();
- modetitle.setText("Follow System");
+ Toast.makeText(getApplicationContext(), (R.string.toast_system), Toast.LENGTH_SHORT).show();
+ modetitle.setText(R.string.followsys);
d.dismiss();
}
if(Helper.isnightmodeon.equals("light")){
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
Log.d("checkmode","l .. "+AppCompatDelegate.getDefaultNightMode());
- modetitle.setText("Light");
- Toast.makeText(getApplicationContext(), " To Don't is on the light side now ", Toast.LENGTH_SHORT).show();
+ modetitle.setText(R.string.dark);
+ Toast.makeText(getApplicationContext(), (R.string.toast_light), Toast.LENGTH_SHORT).show();
d.dismiss();
}
if(Helper.isnightmodeon.equals("dark")){
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
- Toast.makeText(getApplicationContext(), " To Don't is on the dark side now ", Toast.LENGTH_SHORT).show();
- modetitle.setText("Dark");
+ Toast.makeText(getApplicationContext(), R.string.toast_dark, Toast.LENGTH_SHORT).show();
+ modetitle.setText(R.string.light);
d.dismiss();
}
diff --git a/app/src/main/res/drawable/onbording.png b/app/src/main/res/drawable/onboarding.png
similarity index 100%
rename from app/src/main/res/drawable/onbording.png
rename to app/src/main/res/drawable/onboarding.png
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 56fd5d39..933deff8 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -184,7 +184,7 @@
android:layout_width="230dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:text="Crazy Marvin"
+ android:text="@string/crazymarvin"
android:textColor="@color/textcolor" />
+ android:src="@drawable/ic_add"
+ android:contentDescription="@string/contentDescription_FAB" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_on_boarding.xml b/app/src/main/res/layout/activity_on_boarding.xml
index 83515c97..550e2ba6 100644
--- a/app/src/main/res/layout/activity_on_boarding.xml
+++ b/app/src/main/res/layout/activity_on_boarding.xml
@@ -16,14 +16,14 @@
android:layout_height="300dp"
android:elevation="6dp"
android:layout_gravity="center"
- android:src="@drawable/onbording"
- />
+ android:src="@drawable/onboarding"
+ tools:ignore="ContentDescription" />
@@ -32,7 +32,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:text="Jot down your bad habits. Every day, cross"
+ android:text="@string/onboarding_bad"
android:textColor="@color/spinr"
android:textSize="14sp" />
@@ -40,7 +40,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:text="out those you gave in to. And the next"
+ android:text="@string/onboarding_gavein"
android:textColor="@color/spinr"
android:textSize="14sp" />
@@ -48,7 +48,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:text="morning start off with the fresh list."
+ android:text="@string/onboarding_freshlist"
android:textColor="@color/spinr"
android:textSize="14sp" />
@@ -60,7 +60,7 @@
android:layout_height="40dp"
android:layout_alignParentBottom="true"
android:layout_marginBottom="30dp"
- android:text=" Continue "
+ android:text="@string/onboarding_continue"
android:layout_centerInParent="true"
android:background="@drawable/continuebutton"
android:textAllCaps="false"/>
diff --git a/app/src/main/res/layout/dialogbox.xml b/app/src/main/res/layout/dialogbox.xml
index f235693d..5be60674 100644
--- a/app/src/main/res/layout/dialogbox.xml
+++ b/app/src/main/res/layout/dialogbox.xml
@@ -22,7 +22,7 @@
android:layout_marginLeft="20dp"
android:layout_marginTop="8dp"
android:gravity="left"
- android:text="Appearance"
+ android:text="@string/appearance"
android:textSize="20sp" />
@@ -39,8 +39,8 @@
android:checked="false"
android:buttonTint="@color/g1"
android:onClick="onRadioButtonClicked"
- android:text=" Follow System"
- android:textColor="@color/textcolor"
+ android:text="@string/followsys"
+ android:textColor="@color/textcolor"
android:textSize="16sp" />
@@ -63,7 +63,7 @@
android:checked="false"
android:buttonTint="@color/g1"
android:onClick="onRadioButtonClicked"
- android:text=" Dark"
+ android:text="@string/dark"
android:textColor="@color/textcolor"
android:textSize="16sp" />
@@ -76,7 +76,7 @@
android:layout_marginTop="20dp"
android:layout_marginRight="25dp"
android:layout_marginBottom="5dp"
- android:text="Done"
+ android:text="@string/done"
android:background="@drawable/roundbutton"
android:textColor="@color/textcolor"
diff --git a/app/src/main/res/layout/dialogbox_floatingbutton.xml b/app/src/main/res/layout/dialogbox_floatingbutton.xml
index 6569f851..e9b18965 100644
--- a/app/src/main/res/layout/dialogbox_floatingbutton.xml
+++ b/app/src/main/res/layout/dialogbox_floatingbutton.xml
@@ -21,7 +21,7 @@
android:id="@+id/habit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="Enter Task"
+ android:hint="@string/addtask"
android:textColorHint="@android:color/darker_gray"
android:textColor="@color/textcolor"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
@@ -31,7 +31,7 @@
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_below="@id/habit"
- android:hint="Note"
+ android:hint="@string/note"
android:textColorHint="@android:color/darker_gray"
android:textColor="@color/textcolor"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
@@ -43,7 +43,7 @@
android:layout_below="@id/detail"
android:layout_marginLeft="5dp"
android:gravity="center_vertical"
- android:text="@string/addlabl"
+ android:text="@string/addlabel"
android:textColor="@android:color/darker_gray"
android:textSize="18sp"
android:textStyle="italic" />
@@ -74,7 +74,7 @@
android:layout_gravity="right"
android:layout_marginTop="50dp"
android:background="@drawable/roundbutton"
- android:text="Save"
+ android:text="@string/save"
android:textAllCaps="false"
android:textColor="@android:color/white"
android:textSize="16sp" />
diff --git a/app/src/main/res/layout/dialogbox_labels.xml b/app/src/main/res/layout/dialogbox_labels.xml
index 75c53b2b..15133158 100644
--- a/app/src/main/res/layout/dialogbox_labels.xml
+++ b/app/src/main/res/layout/dialogbox_labels.xml
@@ -19,7 +19,7 @@
android:id="@+id/label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/addnewlabl"
+ android:hint="@string/addnewlabel"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@color/textcolor"
android:textColorHint="@android:color/darker_gray"
@@ -34,7 +34,7 @@
android:layout_alignParentEnd="true"
android:layout_marginTop="50dp"
android:background="@drawable/roundbutton"
- android:text="Save"
+ android:text="@string/save"
android:textAllCaps="false"
android:textColor="@android:color/white"
android:textSize="16sp" />
diff --git a/app/src/main/res/layout/fragment_habits.xml b/app/src/main/res/layout/fragment_habits.xml
index ce668f22..76d23736 100644
--- a/app/src/main/res/layout/fragment_habits.xml
+++ b/app/src/main/res/layout/fragment_habits.xml
@@ -49,6 +49,7 @@
android:background="@color/colorPrimary"
android:src="@drawable/ic_add"
android:layout_gravity="bottom|center"
+ android:contentDescription="@string/contentDescription_FAB"
/>
@@ -23,7 +23,7 @@
android:background="@drawable/roundbutton"
android:textSize="16sp"
android:layout_marginTop="50dp"
- android:text="Save"
+ android:text="@string/save"
android:layout_alignParentEnd="true"
android:textAllCaps="false"
android:textColor="@android:color/white" />
diff --git a/app/src/main/res/layout/labels_bottom_sheet_night.xml b/app/src/main/res/layout/labels_bottom_sheet_night.xml
index a9a00e2e..0ce8a53d 100644
--- a/app/src/main/res/layout/labels_bottom_sheet_night.xml
+++ b/app/src/main/res/layout/labels_bottom_sheet_night.xml
@@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="16sp"
- android:hint="@string/addnewlabl"
+ android:hint="@string/addnewlabel"
android:textColorHint="#7C7A72"
android:textColor="@android:color/white"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
@@ -24,7 +24,7 @@
android:background="@drawable/roundbutton"
android:textSize="16sp"
android:layout_marginTop="50dp"
- android:text="Save"
+ android:text="@string/save"
android:layout_alignParentEnd="true"
android:textAllCaps="false"
android:textColor="@android:color/white" />
diff --git a/app/src/main/res/layout/layout_bottom_sheet.xml b/app/src/main/res/layout/layout_bottom_sheet.xml
index 3427728e..1c1383aa 100644
--- a/app/src/main/res/layout/layout_bottom_sheet.xml
+++ b/app/src/main/res/layout/layout_bottom_sheet.xml
@@ -10,7 +10,7 @@
android:id="@+id/habit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="Enter Task"
+ android:hint="@string/addtask"
android:textColor="@color/textcolor"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_below="@id/habit"
- android:hint="Note"
+ android:hint="@string/note"
android:textColor="@color/textcolor"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
@@ -30,7 +30,7 @@
android:layout_below="@id/detail"
android:layout_marginLeft="5dp"
android:gravity="center_vertical"
- android:text="@string/addlabl"
+ android:text="@string/addlabel"
android:textColor="@android:color/darker_gray"
android:textSize="18sp"
android:textStyle="italic" />
@@ -61,7 +61,7 @@
android:layout_gravity="right"
android:layout_marginTop="50dp"
android:background="@drawable/roundbutton"
- android:text="Save"
+ android:text="@string/save"
android:textAllCaps="false"
android:textColor="@android:color/white"
android:textSize="16sp" />
diff --git a/app/src/main/res/layout/layout_bottom_sheet_nightmode.xml b/app/src/main/res/layout/layout_bottom_sheet_nightmode.xml
index 0f327f9b..65764c92 100644
--- a/app/src/main/res/layout/layout_bottom_sheet_nightmode.xml
+++ b/app/src/main/res/layout/layout_bottom_sheet_nightmode.xml
@@ -10,7 +10,7 @@
android:id="@+id/habit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="Enter Task"
+ android:hint="@string/addtask"
android:textColorHint="#7C7A72"
android:textColor="@android:color/white"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
@@ -19,7 +19,7 @@
android:id="@+id/detail"
android:layout_width="match_parent"
android:layout_height="100dp"
- android:hint="Note"
+ android:hint="@string/note"
android:textColorHint="#7C7A72"
android:textColor="@android:color/white"
android:layout_below="@id/habit"
@@ -37,7 +37,7 @@
android:layout_below="@id/detail"
android:layout_marginLeft="5dp"
android:gravity="center_vertical"
- android:text="@string/addlabl"
+ android:text="@string/addlabel"
android:textColor="#7C7A72"
android:textSize="18sp"
android:textStyle="italic" />
@@ -59,7 +59,7 @@
android:textSize="16sp"
android:layout_gravity="right"
android:layout_marginTop="50dp"
- android:text="Save"
+ android:text="@string/save"
android:layout_alignParentEnd="true"
android:textAllCaps="false"
android:textColor="@android:color/white" />
diff --git a/app/src/main/res/layout/recyclerview_layout.xml b/app/src/main/res/layout/recyclerview_layout.xml
index e25a614a..ac08915c 100644
--- a/app/src/main/res/layout/recyclerview_layout.xml
+++ b/app/src/main/res/layout/recyclerview_layout.xml
@@ -45,8 +45,7 @@
android:layout_height="wrap_content"
android:textColor="@android:color/darker_gray"
android:textSize="12sp"
- android:layout_marginLeft="15dp"
- android:text="Food and Drink" />
+ android:layout_marginLeft="15dp" />
+ android:layout_marginLeft="15dp" />
+ android:layout_marginLeft="15dp" />
@@ -58,7 +58,7 @@
android:layout_gravity="right"
android:layout_marginTop="50dp"
android:background="@drawable/roundbutton"
- android:text="Update"
+ android:text="@string/update"
android:textAllCaps="false"
android:textColor="@android:color/white"
android:textSize="16sp" />
diff --git a/app/src/main/res/menu/navigation.xml b/app/src/main/res/menu/navigation.xml
index 0ccc0b16..8ef632b7 100644
--- a/app/src/main/res/menu/navigation.xml
+++ b/app/src/main/res/menu/navigation.xml
@@ -4,10 +4,10 @@
+ android:title="@string/today"/>
+ android:title="@string/log"/>
\ No newline at end of file
diff --git a/app/src/main/res/menu/topmenu.xml b/app/src/main/res/menu/topmenu.xml
index c1f5e4a6..39335eb1 100644
--- a/app/src/main/res/menu/topmenu.xml
+++ b/app/src/main/res/menu/topmenu.xml
@@ -3,9 +3,9 @@
+ android:title="@string/settings"/>
+ android:title="@string/about"/>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f72c3808..9dce0418 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,7 +2,11 @@
To Don\'t
To Don\'t
- Link Hello blank fragment
+ The reverse to-do list
+ Jot down your bad habits. Every day, cross
+ out those you gave in to. And the next
+ morning start off with the fresh list.
+ Continue
Avoided
Done
Habits
@@ -13,8 +17,11 @@
Settings
Most avoided:
Least avoided:
- Please add a label first
- Add new label
+ Please add a label first
+ Add new label
+ Enter task
+ Note
+ Save
To start off, put down a bad habit
Habits will show up here
Apache License 2.0
@@ -25,6 +32,9 @@
View source
Open-source licences
Appearance
+ Dark
+ Light
+ Update
Feather Icons
MIT License
Android Jetpack
@@ -43,4 +53,14 @@
- Foods And Drinks
- Studies
+ # Toasts
+ To Don\'t now follows your system.
+ To Don\'t is on the light side now.
+ To Don\'t is on the dark side now.
+ # Here are the non-translateable strings
+ Crazy Marvin
+ Code Acquaria
+ Link Hello blank fragment
+ # Here are the contentDescription strings (for impaired users) starting with "contentDescription_"
+ Add new To Don\'t item
diff --git a/fastlane/metadata/android/he/changelogs/6.txt b/fastlane/metadata/android/he/changelogs/6.txt
index a846d29b..8afad311 100644
--- a/fastlane/metadata/android/he/changelogs/6.txt
+++ b/fastlane/metadata/android/he/changelogs/6.txt
@@ -1,4 +1,3 @@
-- שיפורים בחוויית המשתמש 🦋
-- תיקונים של תקלות מזעריות 🐛
+- עדכוני תרגומים 🗺️
אפשר לשלוח משוב בדוא״ל, לפתוח תקלות ב־GitHub או לסייע בתרגום. 💓
diff --git a/fastlane/metadata/android/he/changelogs/7.txt b/fastlane/metadata/android/he/changelogs/7.txt
new file mode 100644
index 00000000..f0bbf9e8
--- /dev/null
+++ b/fastlane/metadata/android/he/changelogs/7.txt
@@ -0,0 +1,5 @@
+- שיפורי חוויית משתמש 🦋
+- תיקונים של תקלות מזעריות 🐛
+- עדכוני תרגומים 🗺️
+
+אפשר לשלוח משוב בדוא״ל, לפתוח תקלות ב־GitHub או לסייע בתרגום. 💓
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 99ff4d97..e3bfe17c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Dec 24 20:14:30 CET 2021
+#Wed Sep 28 10:59:04 CEST 2022
distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME