diff --git a/.gitignore b/.gitignore
index 97e0bf45..23de6e20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,88 +1,88 @@
-# Built application files
-*.apk
-*.aar
-*.ap_
-*.aab
-
-# Files for the ART/Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
-# Generated files
-bin/
-gen/
-out/
-#  Uncomment the following line in case you need and you don't have the release build type files in your app
-# release/
-
-# Gradle files
-.gradle/
-build/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
-*.log
-
-# Android Studio Navigation editor temp files
-.navigation/
-
-# Android Studio captures folder
-captures/
-
-# IntelliJ
-*.iml
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/gradle.xml
-.idea/assetWizardSettings.xml
-.idea/dictionaries
-.idea/libraries
-# Android Studio 3 in .gitignore file.
-.idea/caches
-.idea/modules.xml
-# Comment next line if keeping position of elements in Navigation Editor is relevant for you
-.idea/navEditor.xml
-
-# Keystore files
-# Uncomment the following lines if you do not want to check your keystore files in.
-#*.jks
-#*.keystore
-
-# External native build folder generated in Android Studio 2.2 and later
-.externalNativeBuild
-.cxx/
-
-# Google Services (e.g. APIs or Firebase)
-# google-services.json
-
-# Freeline
-freeline.py
-freeline/
-freeline_project_description.json
-
-# fastlane
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots
-fastlane/test_output
-fastlane/readme.md
-
-# Version control
-vcs.xml
-
-# lint
-lint/intermediates/
-lint/generated/
-lint/outputs/
-lint/tmp/
-# lint/reports/
-
-# Android Profiling
-*.hprof
+# Built application files
+*.apk
+*.aar
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+#  Uncomment the following line in case you need and you don't have the release build type files in your app
+# release/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+# Android Studio 3 in .gitignore file.
+.idea/caches
+.idea/modules.xml
+# Comment next line if keeping position of elements in Navigation Editor is relevant for you
+.idea/navEditor.xml
+
+# Keystore files
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+.cxx/
+
+# Google Services (e.g. APIs or Firebase)
+# google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+
+# Version control
+vcs.xml
+
+# lint
+lint/intermediates/
+lint/generated/
+lint/outputs/
+lint/tmp/
+# lint/reports/
+
+# Android Profiling
+*.hprof
diff --git a/.idea/.gitignore b/.idea/.gitignore
index 81d39d34..5c98b428 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,2 +1,2 @@
-# Default ignored files
+# Default ignored files
 /workspace.xml
\ No newline at end of file
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index d8d8b32a..00000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-toDonts
\ No newline at end of file
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
index 3dae9d49..0176fe21 100644
--- a/.idea/assetWizardSettings.xml
+++ b/.idea/assetWizardSettings.xml
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="WizardSettings">
-    <option name="children">
-      <map>
-        <entry key="vectorWizard">
-          <value>
-            <PersistentState>
-              <option name="children">
-                <map>
-                  <entry key="vectorAssetStep">
-                    <value>
-                      <PersistentState>
-                        <option name="children">
-                          <map>
-                            <entry key="clipartAsset">
-                              <value>
-                                <PersistentState>
-                                  <option name="values">
-                                    <map>
-                                      <entry key="url" value="jar:file:/C:/Program%20Files/Android/Android%20Studio/plugins/android/lib/android.jar!/images/material/icons/materialicons/account_circle/baseline_account_circle_24.xml" />
-                                    </map>
-                                  </option>
-                                </PersistentState>
-                              </value>
-                            </entry>
-                          </map>
-                        </option>
-                        <option name="values">
-                          <map>
-                            <entry key="assetSourceType" value="FILE" />
-                            <entry key="outputName" value="ic_label_dark_labels" />
-                            <entry key="sourceFile" value="C:\Users\shaista barkaat\Desktop\tttt.svg" />
-                          </map>
-                        </option>
-                      </PersistentState>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </PersistentState>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="WizardSettings">
+    <option name="children">
+      <map>
+        <entry key="vectorWizard">
+          <value>
+            <PersistentState>
+              <option name="children">
+                <map>
+                  <entry key="vectorAssetStep">
+                    <value>
+                      <PersistentState>
+                        <option name="children">
+                          <map>
+                            <entry key="clipartAsset">
+                              <value>
+                                <PersistentState>
+                                  <option name="values">
+                                    <map>
+                                      <entry key="url" value="jar:file:/C:/Program%20Files/Android/Android%20Studio/plugins/android/lib/android.jar!/images/material/icons/materialicons/account_circle/baseline_account_circle_24.xml" />
+                                    </map>
+                                  </option>
+                                </PersistentState>
+                              </value>
+                            </entry>
+                          </map>
+                        </option>
+                        <option name="values">
+                          <map>
+                            <entry key="assetSourceType" value="FILE" />
+                            <entry key="outputName" value="ic_label_dark_labels" />
+                            <entry key="sourceFile" value="C:\Users\shaista barkaat\Desktop\tttt.svg" />
+                          </map>
+                        </option>
+                      </PersistentState>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </PersistentState>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 3619b676..462a1cc7 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index a8fce2b1..88ea3aa1 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,122 +1,122 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <JetCodeStyleSettings>
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </JetCodeStyleSettings>
-    <codeStyleSettings language="XML">
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </codeStyleSettings>
-  </code_scheme>
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
+  </code_scheme>
 </component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index 307554b7..79ee123c 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +1,5 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
 </component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8a..61a9130c 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="1.8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index cb41453d..23a89bbb 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
-      </GradleProjectSettings>
-    </option>
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="testRunner" value="PLATFORM" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="1.8" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
+        <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
+      </GradleProjectSettings>
+    </option>
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index f1b63f42..23704740 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="BintrayJCenter" />
-      <option name="name" value="BintrayJCenter" />
-      <option name="url" value="https://jcenter.bintray.com/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="Google" />
-      <option name="name" value="Google" />
-      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven" />
-      <option name="name" value="maven" />
-      <option name="url" value="https://jitpack.io" />
-    </remote-repository>
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+  </component>
 </project>
\ No newline at end of file
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
index 56cf0003..93640df0 100644
--- a/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_aar.xml
@@ -1,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.activity:activity:1.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cb7465d23e93e74bedcba12369934f8a/jetified-activity-1.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e7b5ad21264fade60efe6d71aecdd89c/jetified-activity-1.0.0/AndroidManifest.xml" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e7b5ad21264fade60efe6d71aecdd89c/jetified-activity-1.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e7b5ad21264fade60efe6d71aecdd89c/jetified-activity-1.0.0/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.activity/activity/1.0.0/28eb83e6a29ac3fbb87aa632cfa0e644a313f491/activity-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.activity:activity:1.0.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/80e607da6ef6181c0f645be273e0011b/jetified-activity-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/80e607da6ef6181c0f645be273e0011b/jetified-activity-1.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/80e607da6ef6181c0f645be273e0011b/jetified-activity-1.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.activity/activity/1.0.0/28eb83e6a29ac3fbb87aa632cfa0e644a313f491/activity-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ 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
index 3e64eb6a..773f5473 100644
--- 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
@@ -1,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.annotation:annotation-experimental:1.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b3c1a67109d75b4d0ef1905bc4a4da6d/jetified-annotation-experimental-1.0.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ccdffb566716068309d636fd7dba6a92/jetified-annotation-experimental-1.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ccdffb566716068309d636fd7dba6a92/jetified-annotation-experimental-1.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ccdffb566716068309d636fd7dba6a92/jetified-annotation-experimental-1.0.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation-experimental/1.0.0/2408f6cb8f31ffabdd88e1365f82914c251e44dc/annotation-experimental-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.annotation:annotation-experimental:1.0.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/884bef37d7feb21d2cbd89c110bdf287/jetified-annotation-experimental-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/884bef37d7feb21d2cbd89c110bdf287/jetified-annotation-experimental-1.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/884bef37d7feb21d2cbd89c110bdf287/jetified-annotation-experimental-1.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation-experimental/1.0.0/2408f6cb8f31ffabdd88e1365f82914c251e44dc/annotation-experimental-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ 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
index 75d6163b..f6c043bb 100644
--- a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_2_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_2_0_aar.xml
@@ -1,16 +1,16 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.appcompat:appcompat:1.2.0@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/182c6f7fa206fcf9dfa64f742b56b7ac/appcompat-1.2.0/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/182c6f7fa206fcf9dfa64f742b56b7ac/appcompat-1.2.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/182c6f7fa206fcf9dfa64f742b56b7ac/appcompat-1.2.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/182c6f7fa206fcf9dfa64f742b56b7ac/appcompat-1.2.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.appcompat/appcompat/1.2.0/13e8ff89631c2e101eb6bddd12c2fb4bbd74b15d/appcompat-1.2.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.appcompat:appcompat:1.2.0@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a251c537f9d7976aaa3d43fa8532e691/appcompat-1.2.0/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a251c537f9d7976aaa3d43fa8532e691/appcompat-1.2.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a251c537f9d7976aaa3d43fa8532e691/appcompat-1.2.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a251c537f9d7976aaa3d43fa8532e691/appcompat-1.2.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.appcompat/appcompat/1.2.0/13e8ff89631c2e101eb6bddd12c2fb4bbd74b15d/appcompat-1.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ 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
index e24a23da..dae65640 100644
--- 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
@@ -1,13 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.appcompat:appcompat-resources:1.2.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d5bdf2f2fd65b8fcff42e983a0850526/jetified-appcompat-resources-1.2.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d5bdf2f2fd65b8fcff42e983a0850526/jetified-appcompat-resources-1.2.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d5bdf2f2fd65b8fcff42e983a0850526/jetified-appcompat-resources-1.2.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.appcompat/appcompat-resources/1.2.0/9c8b428f65a329eeff4f6abe14a44931b12ef3f2/appcompat-resources-1.2.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.appcompat:appcompat-resources:1.2.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a4abc3eec782a4b0c4e756f17dbb8e1b/jetified-appcompat-resources-1.2.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a4abc3eec782a4b0c4e756f17dbb8e1b/jetified-appcompat-resources-1.2.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a4abc3eec782a4b0c4e756f17dbb8e1b/jetified-appcompat-resources-1.2.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.appcompat/appcompat-resources/1.2.0/9c8b428f65a329eeff4f6abe14a44931b12ef3f2/appcompat-resources-1.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ 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 3e74a17d..16dd94ca 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
@@ -1,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/24d5b49fe2b36ef44f901a0f8118cef3/core-runtime-2.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4b9f6a902f7ab0a6f5bf355e3954413c/core-runtime-2.0.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4b9f6a902f7ab0a6f5bf355e3954413c/core-runtime-2.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4b9f6a902f7ab0a6f5bf355e3954413c/core-runtime-2.0.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-runtime/2.0.0/bc41b287c95bc50a3cd27cb1b7cfb301805ba7f1/core-runtime-2.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dfab4816bb1773a6fac2d5241f505f62/core-runtime-2.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dfab4816bb1773a6fac2d5241f505f62/core-runtime-2.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dfab4816bb1773a6fac2d5241f505f62/core-runtime-2.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-runtime/2.0.0/bc41b287c95bc50a3cd27cb1b7cfb301805ba7f1/core-runtime-2.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
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 aacc3f18..3ffe1b1c 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
@@ -1,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/abef6da21d1c57f9122d146255360cc7/asynclayoutinflater-1.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d39cb4be3dabea1dae1d4f6dc4e7ca27/asynclayoutinflater-1.0.0/AndroidManifest.xml" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d39cb4be3dabea1dae1d4f6dc4e7ca27/asynclayoutinflater-1.0.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d39cb4be3dabea1dae1d4f6dc4e7ca27/asynclayoutinflater-1.0.0/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.asynclayoutinflater/asynclayoutinflater/1.0.0/ac4d50701fce5c88dcc514f58e695cd32f05134c/asynclayoutinflater-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/30a6e2e311374aa7e8e2cefce94646d6/asynclayoutinflater-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/30a6e2e311374aa7e8e2cefce94646d6/asynclayoutinflater-1.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/30a6e2e311374aa7e8e2cefce94646d6/asynclayoutinflater-1.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.asynclayoutinflater/asynclayoutinflater/1.0.0/ac4d50701fce5c88dcc514f58e695cd32f05134c/asynclayoutinflater-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
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 b3384551..97d12ac8 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,13 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.cardview:cardview:1.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/036e7ee8aa9548d79b7d25c6ad0be62d/cardview-1.0.0/AndroidManifest.xml" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/036e7ee8aa9548d79b7d25c6ad0be62d/cardview-1.0.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/036e7ee8aa9548d79b7d25c6ad0be62d/cardview-1.0.0/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.cardview/cardview/1.0.0/c9f3ce7ca74ad2c978230f4094ba6804c5166f9c/cardview-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.cardview:cardview:1.0.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/08812e5898b3ea22d5b23520ce741670/cardview-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/08812e5898b3ea22d5b23520ce741670/cardview-1.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/08812e5898b3ea22d5b23520ce741670/cardview-1.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.cardview/cardview/1.0.0/c9f3ce7ca74ad2c978230f4094ba6804c5166f9c/cardview-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
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
index f45f826a..0dba5a4e 100644
--- a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_2_0_1_aar.xml
+++ b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_2_0_1_aar.xml
@@ -1,11 +1,11 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.constraintlayout:constraintlayout:2.0.1@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/df694ef467d5772229092ae6cf8dd8a8/constraintlayout-2.0.1/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/df694ef467d5772229092ae6cf8dd8a8/constraintlayout-2.0.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/df694ef467d5772229092ae6cf8dd8a8/constraintlayout-2.0.1/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.constraintlayout:constraintlayout:2.0.1@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/428ed25c8a163c2fdcba4add5c6e5102/constraintlayout-2.0.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/428ed25c8a163c2fdcba4add5c6e5102/constraintlayout-2.0.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/428ed25c8a163c2fdcba4add5c6e5102/constraintlayout-2.0.1/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
 </component>
\ 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 583e964d..3cbc84d2 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
@@ -1,16 +1,16 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/af6faebdfaee8ede67ca356f9981a994/coordinatorlayout-1.1.0/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/af6faebdfaee8ede67ca356f9981a994/coordinatorlayout-1.1.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/af6faebdfaee8ede67ca356f9981a994/coordinatorlayout-1.1.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/af6faebdfaee8ede67ca356f9981a994/coordinatorlayout-1.1.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.coordinatorlayout/coordinatorlayout/1.1.0/a15529ac349d76a872ae5ef42b84c320c456cd7f/coordinatorlayout-1.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0b8fd385c00a23bab58f05d4f848f6d1/coordinatorlayout-1.1.0/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0b8fd385c00a23bab58f05d4f848f6d1/coordinatorlayout-1.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0b8fd385c00a23bab58f05d4f848f6d1/coordinatorlayout-1.1.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0b8fd385c00a23bab58f05d4f848f6d1/coordinatorlayout-1.1.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.coordinatorlayout/coordinatorlayout/1.1.0/a15529ac349d76a872ae5ef42b84c320c456cd7f/coordinatorlayout-1.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
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
index 6ddb5f0b..3ed3503d 100644
--- a/.idea/libraries/Gradle__androidx_core_core_1_3_1_aar.xml
+++ b/.idea/libraries/Gradle__androidx_core_core_1_3_1_aar.xml
@@ -1,16 +1,16 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.core:core:1.3.1@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ec30a36e070c07324751972f5fbca049/core-1.3.1/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ec30a36e070c07324751972f5fbca049/core-1.3.1/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ec30a36e070c07324751972f5fbca049/core-1.3.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ec30a36e070c07324751972f5fbca049/core-1.3.1/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.core/core/1.3.1/d70edd6d800903a31efea1a28ae531bd91e1a926/core-1.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.core:core:1.3.1@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0ab0679112bf21a2917cc6aceb669780/core-1.3.1/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0ab0679112bf21a2917cc6aceb669780/core-1.3.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0ab0679112bf21a2917cc6aceb669780/core-1.3.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0ab0679112bf21a2917cc6aceb669780/core-1.3.1/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.core/core/1.3.1/d70edd6d800903a31efea1a28ae531bd91e1a926/core-1.3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ 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
index 59247c4a..0f2e47e7 100644
--- 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
@@ -1,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.core:core-ktx:1.3.1@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7e7c08114c1329e03c36452e60a142c/jetified-core-ktx-1.3.1/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e93118671924ff2fb4470469447a7e50/jetified-core-ktx-1.3.1/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e93118671924ff2fb4470469447a7e50/jetified-core-ktx-1.3.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e93118671924ff2fb4470469447a7e50/jetified-core-ktx-1.3.1/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.core/core-ktx/1.3.1/98b0507bcf3cd12d671bf6dac09262757b60351d/core-ktx-1.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.core:core-ktx:1.3.1@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bca74b752449bf156afd73549dca0d32/jetified-core-ktx-1.3.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bca74b752449bf156afd73549dca0d32/jetified-core-ktx-1.3.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bca74b752449bf156afd73549dca0d32/jetified-core-ktx-1.3.1/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.core/core-ktx/1.3.1/98b0507bcf3cd12d671bf6dac09262757b60351d/core-ktx-1.3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ 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 dd76f9d2..a4f5f919 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,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b37b2aeed146cfc3b1274c4cf21d4028/cursoradapter-1.0.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6e169f0fffbca92a5aa037f21ef6507d/cursoradapter-1.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6e169f0fffbca92a5aa037f21ef6507d/cursoradapter-1.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6e169f0fffbca92a5aa037f21ef6507d/cursoradapter-1.0.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.cursoradapter/cursoradapter/1.0.0/1e323083b41c31fd4d45510dfce50614963c3c6c/cursoradapter-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/32d8a5c8ead7d1fc5aa32a65e24349c3/cursoradapter-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/32d8a5c8ead7d1fc5aa32a65e24349c3/cursoradapter-1.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/32d8a5c8ead7d1fc5aa32a65e24349c3/cursoradapter-1.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.cursoradapter/cursoradapter/1.0.0/1e323083b41c31fd4d45510dfce50614963c3c6c/cursoradapter-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml
index 511e0457..b1fb5a31 100644
--- a/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml
@@ -1,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.customview:customview:1.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4bf5efb9c6ca1cc1042b4ed281aac9d8/customview-1.0.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c3573009bfe2f3959f59564cb09bec83/customview-1.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c3573009bfe2f3959f59564cb09bec83/customview-1.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c3573009bfe2f3959f59564cb09bec83/customview-1.0.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.customview/customview/1.0.0/61f6a717d144dff3a6bda413d9abeeb2bca71581/customview-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.customview:customview:1.0.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4e2e13a9fb6e9dde4f2a836a4f50eacb/customview-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4e2e13a9fb6e9dde4f2a836a4f50eacb/customview-1.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4e2e13a9fb6e9dde4f2a836a4f50eacb/customview-1.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.customview/customview/1.0.0/61f6a717d144dff3a6bda413d9abeeb2bca71581/customview-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ 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 031e771c..709ad1a0 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,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.documentfile:documentfile:1.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/abca430f327a1ba4137054854d25dfd3/documentfile-1.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b8a526d91d1433f80bc255868b7dd72f/documentfile-1.0.0/AndroidManifest.xml" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b8a526d91d1433f80bc255868b7dd72f/documentfile-1.0.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b8a526d91d1433f80bc255868b7dd72f/documentfile-1.0.0/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.documentfile/documentfile/1.0.0/a1bed5cf96db96bd06a2feade98fe55653811dc8/documentfile-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.documentfile:documentfile:1.0.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0d232dc6f853d8f8c37e876f72c8eb78/documentfile-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0d232dc6f853d8f8c37e876f72c8eb78/documentfile-1.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0d232dc6f853d8f8c37e876f72c8eb78/documentfile-1.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.documentfile/documentfile/1.0.0/a1bed5cf96db96bd06a2feade98fe55653811dc8/documentfile-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml
index 8aa6d127..2bef7936 100644
--- a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml
@@ -1,17 +1,16 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cbe165716a1da158b27c45f9619521d6/drawerlayout-1.0.0/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f66fa33308b0619d349f33f29e1b9234/drawerlayout-1.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cbe165716a1da158b27c45f9619521d6/drawerlayout-1.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cbe165716a1da158b27c45f9619521d6/drawerlayout-1.0.0/AndroidManifest.xml" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cbe165716a1da158b27c45f9619521d6/drawerlayout-1.0.0/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.drawerlayout/drawerlayout/1.0.0/9ecd4ecb7da215ba4c5c3e00bf8d290dad6f2bc5/drawerlayout-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/92618d18cf37b03105ad2b4a84352107/drawerlayout-1.0.0/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/92618d18cf37b03105ad2b4a84352107/drawerlayout-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/92618d18cf37b03105ad2b4a84352107/drawerlayout-1.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/92618d18cf37b03105ad2b4a84352107/drawerlayout-1.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.drawerlayout/drawerlayout/1.0.0/9ecd4ecb7da215ba4c5c3e00bf8d290dad6f2bc5/drawerlayout-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ 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
index eeda7142..98216777 100644
--- a/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_aar.xml
@@ -1,17 +1,16 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.fragment:fragment:1.1.0@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e4258d45b95ac429e5da10964a5469fd/fragment-1.1.0/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7619667f73099691456e81e3fedf8086/fragment-1.1.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e4258d45b95ac429e5da10964a5469fd/fragment-1.1.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e4258d45b95ac429e5da10964a5469fd/fragment-1.1.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e4258d45b95ac429e5da10964a5469fd/fragment-1.1.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.fragment/fragment/1.1.0/b9ebb04df2cb0cad4419af3c658690bc82aa5706/fragment-1.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.fragment:fragment:1.1.0@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9f4ee7d29ce29e03d3fe8d0d02c8d78e/fragment-1.1.0/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9f4ee7d29ce29e03d3fe8d0d02c8d78e/fragment-1.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9f4ee7d29ce29e03d3fe8d0d02c8d78e/fragment-1.1.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9f4ee7d29ce29e03d3fe8d0d02c8d78e/fragment-1.1.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.fragment/fragment/1.1.0/b9ebb04df2cb0cad4419af3c658690bc82aa5706/fragment-1.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ 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 7048ee46..64bf4595 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,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.interpolator:interpolator:1.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/32691ed1dd96a709bdd6754d66b7ebfd/interpolator-1.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/34bb78b8cebf54a661c5dc71920c2928/interpolator-1.0.0/AndroidManifest.xml" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/34bb78b8cebf54a661c5dc71920c2928/interpolator-1.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/34bb78b8cebf54a661c5dc71920c2928/interpolator-1.0.0/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.interpolator/interpolator/1.0.0/fefd5e3cbc479b6b4a9532d05688a1e659e8d3d2/interpolator-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.interpolator:interpolator:1.0.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2b9fc592ed0fe784981bfa3a28b62424/interpolator-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2b9fc592ed0fe784981bfa3a28b62424/interpolator-1.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2b9fc592ed0fe784981bfa3a28b62424/interpolator-1.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.interpolator/interpolator/1.0.0/fefd5e3cbc479b6b4a9532d05688a1e659e8d3d2/interpolator-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
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 286c7c8c..deae9bbd 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
@@ -1,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8d8538b270dedbd719c054e5cb3c4560/legacy-support-core-ui-1.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/38270b9a16d8adef8037c8827b44ac8a/legacy-support-core-ui-1.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/38270b9a16d8adef8037c8827b44ac8a/legacy-support-core-ui-1.0.0/AndroidManifest.xml" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/38270b9a16d8adef8037c8827b44ac8a/legacy-support-core-ui-1.0.0/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.legacy/legacy-support-core-ui/1.0.0/f6044eaebe354c778f1f147ddb9e92a3f1e22fc7/legacy-support-core-ui-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2beca9c43502859db3fc8c701af8032a/legacy-support-core-ui-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2beca9c43502859db3fc8c701af8032a/legacy-support-core-ui-1.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2beca9c43502859db3fc8c701af8032a/legacy-support-core-ui-1.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.legacy/legacy-support-core-ui/1.0.0/f6044eaebe354c778f1f147ddb9e92a3f1e22fc7/legacy-support-core-ui-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
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 e9e2724a..0e6e3305 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,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7d485c838bde573a9b774202fc501e14/legacy-support-core-utils-1.0.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4766ec18f97cab2ef017ece40ecc56c8/legacy-support-core-utils-1.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4766ec18f97cab2ef017ece40ecc56c8/legacy-support-core-utils-1.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4766ec18f97cab2ef017ece40ecc56c8/legacy-support-core-utils-1.0.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.legacy/legacy-support-core-utils/1.0.0/46c37f178088153618cfb0afef08ec96c48f93cb/legacy-support-core-utils-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8f82a1e1fe94a419aba8b4dd53a6c995/legacy-support-core-utils-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8f82a1e1fe94a419aba8b4dd53a6c995/legacy-support-core-utils-1.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8f82a1e1fe94a419aba8b4dd53a6c995/legacy-support-core-utils-1.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.legacy/legacy-support-core-utils/1.0.0/46c37f178088153618cfb0afef08ec96c48f93cb/legacy-support-core-utils-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
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 5276f54c..ba386851 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
@@ -1,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9360cf1367a704ccd74509b9c6640d83/legacy-support-v4-1.0.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/64768d234efee278aa173595dd0fab6b/legacy-support-v4-1.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/64768d234efee278aa173595dd0fab6b/legacy-support-v4-1.0.0/AndroidManifest.xml" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/64768d234efee278aa173595dd0fab6b/legacy-support-v4-1.0.0/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.legacy/legacy-support-v4/1.0.0/5b8f86fea035328fc9e8c660773037a3401ce25f/legacy-support-v4-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3df3161fc4bbb8598027909e2f8b386c/legacy-support-v4-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3df3161fc4bbb8598027909e2f8b386c/legacy-support-v4-1.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3df3161fc4bbb8598027909e2f8b386c/legacy-support-v4-1.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.legacy/legacy-support-v4/1.0.0/5b8f86fea035328fc9e8c660773037a3401ce25f/legacy-support-v4-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ 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 d25dec49..7a4306b4 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
@@ -1,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c20b3a9c01fac1c58487516ff423d6b0/lifecycle-livedata-2.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/aad614d97ae7fbea1f0f8cb617937cc2/lifecycle-livedata-2.0.0/AndroidManifest.xml" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/aad614d97ae7fbea1f0f8cb617937cc2/lifecycle-livedata-2.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/aad614d97ae7fbea1f0f8cb617937cc2/lifecycle-livedata-2.0.0/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-livedata/2.0.0/740ce61935bd789380c01178bd8ce402402ebd2f/lifecycle-livedata-2.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fab52ad3be12286968019768b2b230bd/lifecycle-livedata-2.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fab52ad3be12286968019768b2b230bd/lifecycle-livedata-2.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fab52ad3be12286968019768b2b230bd/lifecycle-livedata-2.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-livedata/2.0.0/740ce61935bd789380c01178bd8ce402402ebd2f/lifecycle-livedata-2.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml
index cce8c945..23f9be9f 100644
--- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml
@@ -1,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/68a64a089b7f098f26bb791f76de8be0/lifecycle-livedata-core-2.0.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc76fd0795a9297accd6592943790706/lifecycle-livedata-core-2.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc76fd0795a9297accd6592943790706/lifecycle-livedata-core-2.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc76fd0795a9297accd6592943790706/lifecycle-livedata-core-2.0.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-livedata-core/2.0.0/c158207594782b42f3a2e08a5a029eb3319e4404/lifecycle-livedata-core-2.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5105ad587e387d834f1806811aedcd85/lifecycle-livedata-core-2.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5105ad587e387d834f1806811aedcd85/lifecycle-livedata-core-2.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5105ad587e387d834f1806811aedcd85/lifecycle-livedata-core-2.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-livedata-core/2.0.0/c158207594782b42f3a2e08a5a029eb3319e4404/lifecycle-livedata-core-2.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ 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
index dc2a4d1a..acd3c32f 100644
--- 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
@@ -1,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.lifecycle:lifecycle-runtime:2.1.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8164904e8dbba255593df041e8bd30ea/lifecycle-runtime-2.1.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/59a4a24ec8c1e779c2844f1a8c4af000/lifecycle-runtime-2.1.0/AndroidManifest.xml" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/59a4a24ec8c1e779c2844f1a8c4af000/lifecycle-runtime-2.1.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/59a4a24ec8c1e779c2844f1a8c4af000/lifecycle-runtime-2.1.0/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-runtime/2.1.0/533a0cd1a095abbdfd08a49c4d34bd0713977034/lifecycle-runtime-2.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.lifecycle:lifecycle-runtime:2.1.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4c010db371848747acb1fe545399b083/lifecycle-runtime-2.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4c010db371848747acb1fe545399b083/lifecycle-runtime-2.1.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4c010db371848747acb1fe545399b083/lifecycle-runtime-2.1.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-runtime/2.1.0/533a0cd1a095abbdfd08a49c4d34bd0713977034/lifecycle-runtime-2.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ 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
index 59296979..79fa4cc1 100644
--- 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
@@ -1,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.1.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/59c8a6e28f96474652a981d6333afcdf/lifecycle-viewmodel-2.1.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a8fbf1b9afd1303b193699773955965b/lifecycle-viewmodel-2.1.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a8fbf1b9afd1303b193699773955965b/lifecycle-viewmodel-2.1.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a8fbf1b9afd1303b193699773955965b/lifecycle-viewmodel-2.1.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-viewmodel/2.1.0/bfd86b9887c2343516f82bed91acbab34a45841d/lifecycle-viewmodel-2.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.1.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e6dcd9251da26e8691477328e123f5dd/lifecycle-viewmodel-2.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e6dcd9251da26e8691477328e123f5dd/lifecycle-viewmodel-2.1.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e6dcd9251da26e8691477328e123f5dd/lifecycle-viewmodel-2.1.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-viewmodel/2.1.0/bfd86b9887c2343516f82bed91acbab34a45841d/lifecycle-viewmodel-2.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ 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 99e484d8..8ea85db9 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,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.loader:loader:1.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c38deefe61a4b29c2fedadb5cb828cb9/loader-1.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c8b5df6ac502237992eb101dc66d4842/loader-1.0.0/AndroidManifest.xml" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c8b5df6ac502237992eb101dc66d4842/loader-1.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c8b5df6ac502237992eb101dc66d4842/loader-1.0.0/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.loader/loader/1.0.0/b9ef587f3e46c7fe5b00264989764e43ff45cada/loader-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.loader:loader:1.0.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fc9be6601040df3879c055002514fca5/loader-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fc9be6601040df3879c055002514fca5/loader-1.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fc9be6601040df3879c055002514fca5/loader-1.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.loader/loader/1.0.0/b9ef587f3e46c7fe5b00264989764e43ff45cada/loader-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
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 0a852a40..8dd4d55a 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,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/836e9858d101fce50deef7223d87d0d6/localbroadcastmanager-1.0.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4dfd89864b23f573304fc4d6326895a2/localbroadcastmanager-1.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4dfd89864b23f573304fc4d6326895a2/localbroadcastmanager-1.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4dfd89864b23f573304fc4d6326895a2/localbroadcastmanager-1.0.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.localbroadcastmanager/localbroadcastmanager/1.0.0/3930e99159fd6b7f1d2e7d5fe9af0924ca1faf9/localbroadcastmanager-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3fa7a9f21601a97425222dd02036c40c/localbroadcastmanager-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3fa7a9f21601a97425222dd02036c40c/localbroadcastmanager-1.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3fa7a9f21601a97425222dd02036c40c/localbroadcastmanager-1.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.localbroadcastmanager/localbroadcastmanager/1.0.0/3930e99159fd6b7f1d2e7d5fe9af0924ca1faf9/localbroadcastmanager-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
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 27b6175c..542f49b0 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
@@ -1,16 +1,16 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.media:media:1.0.0@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6902c015d8dc6cc66eb6dd3d5c644b46/media-1.0.0/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6902c015d8dc6cc66eb6dd3d5c644b46/media-1.0.0/AndroidManifest.xml" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6902c015d8dc6cc66eb6dd3d5c644b46/media-1.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6902c015d8dc6cc66eb6dd3d5c644b46/media-1.0.0/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.media/media/1.0.0/5faf25be15e16e27275f5c7e04e15e944ebccea0/media-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.media:media:1.0.0@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/35fcceeaf2d154634432abdee25de95d/media-1.0.0/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/35fcceeaf2d154634432abdee25de95d/media-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/35fcceeaf2d154634432abdee25de95d/media-1.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/35fcceeaf2d154634432abdee25de95d/media-1.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.media/media/1.0.0/5faf25be15e16e27275f5c7e04e15e944ebccea0/media-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
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 7153f531..59890a18 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
@@ -1,17 +1,16 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.print:print:1.0.0@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/206106f115d834f1282b530daecf9d84/print-1.0.0/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6083e5aff4a41b4b352509ce72ef01fb/print-1.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/206106f115d834f1282b530daecf9d84/print-1.0.0/AndroidManifest.xml" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/206106f115d834f1282b530daecf9d84/print-1.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/206106f115d834f1282b530daecf9d84/print-1.0.0/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.print/print/1.0.0/71fc2d9acf7cce6b96230c5af263268b1664914a/print-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.print:print:1.0.0@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/15f67130f8b8a6448fbe1a114f2b879e/print-1.0.0/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/15f67130f8b8a6448fbe1a114f2b879e/print-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/15f67130f8b8a6448fbe1a114f2b879e/print-1.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/15f67130f8b8a6448fbe1a114f2b879e/print-1.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.print/print/1.0.0/71fc2d9acf7cce6b96230c5af263268b1664914a/print-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
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 9bf0b5c3..3b8dcb88 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
@@ -1,16 +1,16 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a6504399b3add68ab1d1cfa33877b7b9/recyclerview-1.1.0/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a6504399b3add68ab1d1cfa33877b7b9/recyclerview-1.1.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a6504399b3add68ab1d1cfa33877b7b9/recyclerview-1.1.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a6504399b3add68ab1d1cfa33877b7b9/recyclerview-1.1.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.1.0/f2bdf79e1977939817f54a9d3e2f6bc52b63bdd0/recyclerview-1.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2fd8a5c98c5c078f0a7d8ae172689a9d/recyclerview-1.1.0/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2fd8a5c98c5c078f0a7d8ae172689a9d/recyclerview-1.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2fd8a5c98c5c078f0a7d8ae172689a9d/recyclerview-1.1.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2fd8a5c98c5c078f0a7d8ae172689a9d/recyclerview-1.1.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.1.0/f2bdf79e1977939817f54a9d3e2f6bc52b63bdd0/recyclerview-1.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
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
index 663c5da6..9932faf0 100644
--- a/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml
@@ -1,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.savedstate:savedstate:1.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3a332f7b3ba12f0d97b1eff5486f8fcf/jetified-savedstate-1.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9efe22cf0082936d2f93e4b2c28bc880/jetified-savedstate-1.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9efe22cf0082936d2f93e4b2c28bc880/jetified-savedstate-1.0.0/AndroidManifest.xml" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9efe22cf0082936d2f93e4b2c28bc880/jetified-savedstate-1.0.0/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.savedstate/savedstate/1.0.0/e6daf87ed227a6f80bb8accb466755a5ee01a652/savedstate-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.savedstate:savedstate:1.0.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/aad405d92925b2ad5de9c0814a1c2881/jetified-savedstate-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/aad405d92925b2ad5de9c0814a1c2881/jetified-savedstate-1.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/aad405d92925b2ad5de9c0814a1c2881/jetified-savedstate-1.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.savedstate/savedstate/1.0.0/e6daf87ed227a6f80bb8accb466755a5ee01a652/savedstate-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ 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 f42a518a..dc9361b9 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
@@ -1,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0fcb8293f1ad8a72968cee415eb0b621/slidingpanelayout-1.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6cf5383366181dedb173eec5f05cedc7/slidingpanelayout-1.0.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6cf5383366181dedb173eec5f05cedc7/slidingpanelayout-1.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6cf5383366181dedb173eec5f05cedc7/slidingpanelayout-1.0.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.slidingpanelayout/slidingpanelayout/1.0.0/f3f2e4fded24d5969a86e1974ad7e96975d970a0/slidingpanelayout-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.0.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3e8a593d645a6563e82de36ffe2c9a11/slidingpanelayout-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3e8a593d645a6563e82de36ffe2c9a11/slidingpanelayout-1.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3e8a593d645a6563e82de36ffe2c9a11/slidingpanelayout-1.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.slidingpanelayout/slidingpanelayout/1.0.0/f3f2e4fded24d5969a86e1974ad7e96975d970a0/slidingpanelayout-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
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 d3fca79a..b1d636a6 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
@@ -1,17 +1,16 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/78d66685df6be811d5c0970d9f8f8d22/swiperefreshlayout-1.0.0/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/47969dd378bd395d9c130e31d38327f3/swiperefreshlayout-1.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/78d66685df6be811d5c0970d9f8f8d22/swiperefreshlayout-1.0.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/78d66685df6be811d5c0970d9f8f8d22/swiperefreshlayout-1.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/78d66685df6be811d5c0970d9f8f8d22/swiperefreshlayout-1.0.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.swiperefreshlayout/swiperefreshlayout/1.0.0/ab92d86c004eb1d48e45f311b02ca53d6c86b607/swiperefreshlayout-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5c823e408dd1b8f7efc6792a9cd5c614/swiperefreshlayout-1.0.0/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5c823e408dd1b8f7efc6792a9cd5c614/swiperefreshlayout-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5c823e408dd1b8f7efc6792a9cd5c614/swiperefreshlayout-1.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5c823e408dd1b8f7efc6792a9cd5c614/swiperefreshlayout-1.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.swiperefreshlayout/swiperefreshlayout/1.0.0/ab92d86c004eb1d48e45f311b02ca53d6c86b607/swiperefreshlayout-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
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
index 2a46905c..1718e6d2 100644
--- a/.idea/libraries/Gradle__androidx_test_core_1_3_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_test_core_1_3_0_aar.xml
@@ -1,16 +1,15 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.test:core:1.3.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e3ccdd114e154e1d0d5429690329c9f1/jetified-core-1.3.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b55c66b485ceb821e3da5070cbd91e08/jetified-core-1.3.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b55c66b485ceb821e3da5070cbd91e08/jetified-core-1.3.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b55c66b485ceb821e3da5070cbd91e08/jetified-core-1.3.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test/core/1.3.0/3d046283a0729cb2d5dacdd9b3f8b62203052da5/core-1.3.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test/core/1.3.0/cab982e254e02674aa7a46e3086986cddd50ca06/core-1.3.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.test:core:1.3.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/489c879f96d8fe11197ccfe582c0e562/jetified-core-1.3.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/489c879f96d8fe11197ccfe582c0e562/jetified-core-1.3.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/489c879f96d8fe11197ccfe582c0e562/jetified-core-1.3.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test/core/1.3.0/3d046283a0729cb2d5dacdd9b3f8b62203052da5/core-1.3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test/core/1.3.0/cab982e254e02674aa7a46e3086986cddd50ca06/core-1.3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ 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
index 2cdc65ce..80f631d3 100644
--- 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
@@ -1,16 +1,15 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.test.espresso:espresso-core:3.3.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/17c09e1fc1a7165afeb6735eb8907503/espresso-core-3.3.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/12fb6d2da499c8621e95d9d5e41cdf34/espresso-core-3.3.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/12fb6d2da499c8621e95d9d5e41cdf34/espresso-core-3.3.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/12fb6d2da499c8621e95d9d5e41cdf34/espresso-core-3.3.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test.espresso/espresso-core/3.3.0/8da4ff80a40b70b852341a5ad99c943811400eec/espresso-core-3.3.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test.espresso/espresso-core/3.3.0/1b378d81de64c2e4740b0856c4ed65c1b76ea1b2/espresso-core-3.3.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.test.espresso:espresso-core:3.3.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c925ff403d9df2f45efc80ab114b3344/espresso-core-3.3.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c925ff403d9df2f45efc80ab114b3344/espresso-core-3.3.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c925ff403d9df2f45efc80ab114b3344/espresso-core-3.3.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test.espresso/espresso-core/3.3.0/8da4ff80a40b70b852341a5ad99c943811400eec/espresso-core-3.3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test.espresso/espresso-core/3.3.0/1b378d81de64c2e4740b0856c4ed65c1b76ea1b2/espresso-core-3.3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ 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
index 4871d6f4..91461697 100644
--- 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
@@ -1,16 +1,15 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.test.espresso:espresso-idling-resource:3.3.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e7ed2bb31c8994a45e5d070362589fc6/espresso-idling-resource-3.3.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/42cf4bc42380b77d9df976ad59a3c598/espresso-idling-resource-3.3.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/42cf4bc42380b77d9df976ad59a3c598/espresso-idling-resource-3.3.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/42cf4bc42380b77d9df976ad59a3c598/espresso-idling-resource-3.3.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test.espresso/espresso-idling-resource/3.3.0/ac774bb29e6171578dc7508bf390a4a3ccbedfea/espresso-idling-resource-3.3.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test.espresso/espresso-idling-resource/3.3.0/ee0f3ffdd7782d68dbe1eafa9337872817cb299e/espresso-idling-resource-3.3.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.test.espresso:espresso-idling-resource:3.3.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/856082b5c5fb87f263f0280e567210dc/espresso-idling-resource-3.3.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/856082b5c5fb87f263f0280e567210dc/espresso-idling-resource-3.3.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/856082b5c5fb87f263f0280e567210dc/espresso-idling-resource-3.3.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test.espresso/espresso-idling-resource/3.3.0/ac774bb29e6171578dc7508bf390a4a3ccbedfea/espresso-idling-resource-3.3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test.espresso/espresso-idling-resource/3.3.0/ee0f3ffdd7782d68dbe1eafa9337872817cb299e/espresso-idling-resource-3.3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ 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
index e3c05e1e..1ddf6efc 100644
--- 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
@@ -1,16 +1,15 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.test.ext:junit:1.1.2@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/861795307edace5299b6bea876c3d98d/jetified-junit-1.1.2/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/80c9e304a9ff10e70332a6b5a142aae9/jetified-junit-1.1.2/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/80c9e304a9ff10e70332a6b5a142aae9/jetified-junit-1.1.2/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/80c9e304a9ff10e70332a6b5a142aae9/jetified-junit-1.1.2/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test.ext/junit/1.1.2/c69cad63303f01767122a49e379c6121d6721a0b/junit-1.1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test.ext/junit/1.1.2/d8ceef67c64321bbf484dc5997a1d2efa319bed7/junit-1.1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.test.ext:junit:1.1.2@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/94068b11c5214b3bdbc3014d073285b4/jetified-junit-1.1.2/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/94068b11c5214b3bdbc3014d073285b4/jetified-junit-1.1.2/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/94068b11c5214b3bdbc3014d073285b4/jetified-junit-1.1.2/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test.ext/junit/1.1.2/c69cad63303f01767122a49e379c6121d6721a0b/junit-1.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test.ext/junit/1.1.2/d8ceef67c64321bbf484dc5997a1d2efa319bed7/junit-1.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ 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
index 2a401d6e..9ddee06c 100644
--- a/.idea/libraries/Gradle__androidx_test_monitor_1_3_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_test_monitor_1_3_0_aar.xml
@@ -1,16 +1,15 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.test:monitor:1.3.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4617060c831939dbbd1bd554f4fee29c/monitor-1.3.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/453a6ee2f33d0aa9abc6ab1fec916292/monitor-1.3.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/453a6ee2f33d0aa9abc6ab1fec916292/monitor-1.3.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/453a6ee2f33d0aa9abc6ab1fec916292/monitor-1.3.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test/monitor/1.3.0/3a80466a460e22ec785a9c0ad1a1cbaf6a08c0ee/monitor-1.3.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test/monitor/1.3.0/42fd8fe34ba94b2e75f5df0b3184887af6f98670/monitor-1.3.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.test:monitor:1.3.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c2249b3829b168991d47418ff333188c/monitor-1.3.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c2249b3829b168991d47418ff333188c/monitor-1.3.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c2249b3829b168991d47418ff333188c/monitor-1.3.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test/monitor/1.3.0/3a80466a460e22ec785a9c0ad1a1cbaf6a08c0ee/monitor-1.3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test/monitor/1.3.0/42fd8fe34ba94b2e75f5df0b3184887af6f98670/monitor-1.3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ 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
index 9fe437c2..787cde66 100644
--- a/.idea/libraries/Gradle__androidx_test_runner_1_3_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_test_runner_1_3_0_aar.xml
@@ -1,16 +1,15 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.test:runner:1.3.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/96ddc6990c4f1af8287b82b2c51d39ee/runner-1.3.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/286bc4f1333c8c9ed5910a5b6e834a1b/runner-1.3.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/286bc4f1333c8c9ed5910a5b6e834a1b/runner-1.3.0/AndroidManifest.xml" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/286bc4f1333c8c9ed5910a5b6e834a1b/runner-1.3.0/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test/runner/1.3.0/c0fd1f1e715bfa4777ae6a679444f7471205ee7c/runner-1.3.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test/runner/1.3.0/506c97f735db13fda1943c4eb95f2ccfc7b457e0/runner-1.3.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.test:runner:1.3.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b708a9e1150b41752402cf0c1b1ae52d/runner-1.3.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b708a9e1150b41752402cf0c1b1ae52d/runner-1.3.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b708a9e1150b41752402cf0c1b1ae52d/runner-1.3.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test/runner/1.3.0/c0fd1f1e715bfa4777ae6a679444f7471205ee7c/runner-1.3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.test/runner/1.3.0/506c97f735db13fda1943c4eb95f2ccfc7b457e0/runner-1.3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ 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 d7a25072..5376ab82 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
@@ -1,16 +1,16 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.transition:transition:1.2.0@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/79b2779e8fbf8fbcb063f9f9e4e67056/transition-1.2.0/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/79b2779e8fbf8fbcb063f9f9e4e67056/transition-1.2.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/79b2779e8fbf8fbcb063f9f9e4e67056/transition-1.2.0/AndroidManifest.xml" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/79b2779e8fbf8fbcb063f9f9e4e67056/transition-1.2.0/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.transition/transition/1.2.0/65d2a5dab39f120d3f584fdead252ce81ec7dbee/transition-1.2.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.transition:transition:1.2.0@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f3c4eac95e062505591f3e81c7ea71f4/transition-1.2.0/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f3c4eac95e062505591f3e81c7ea71f4/transition-1.2.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f3c4eac95e062505591f3e81c7ea71f4/transition-1.2.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f3c4eac95e062505591f3e81c7ea71f4/transition-1.2.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.transition/transition/1.2.0/65d2a5dab39f120d3f584fdead252ce81ec7dbee/transition-1.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
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 fe03554f..6c6cc516 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,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5449d447cecb7a5b7105df425966ce92/vectordrawable-1.1.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7ae13ed11f3404e11a0bb746492733b/vectordrawable-1.1.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7ae13ed11f3404e11a0bb746492733b/vectordrawable-1.1.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7ae13ed11f3404e11a0bb746492733b/vectordrawable-1.1.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.vectordrawable/vectordrawable/1.1.0/1e0694477eed874c50c54b547cc3e5a62a57a62b/vectordrawable-1.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/af7caa13e989a2d7429d5cbee5760ae4/vectordrawable-1.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/af7caa13e989a2d7429d5cbee5760ae4/vectordrawable-1.1.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/af7caa13e989a2d7429d5cbee5760ae4/vectordrawable-1.1.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.vectordrawable/vectordrawable/1.1.0/1e0694477eed874c50c54b547cc3e5a62a57a62b/vectordrawable-1.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
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 8069f64a..6059392e 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,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/721dcdb357351f758b5df456f00974d6/vectordrawable-animated-1.1.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9a01dfeb8289247486dbf03ddd941979/vectordrawable-animated-1.1.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9a01dfeb8289247486dbf03ddd941979/vectordrawable-animated-1.1.0/AndroidManifest.xml" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9a01dfeb8289247486dbf03ddd941979/vectordrawable-animated-1.1.0/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.vectordrawable/vectordrawable-animated/1.1.0/871a7705cd03bc246947638c712cdd11378233ff/vectordrawable-animated-1.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e0904d157a1ec0edacfee0432b5d1447/vectordrawable-animated-1.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e0904d157a1ec0edacfee0432b5d1447/vectordrawable-animated-1.1.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e0904d157a1ec0edacfee0432b5d1447/vectordrawable-animated-1.1.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.vectordrawable/vectordrawable-animated/1.1.0/871a7705cd03bc246947638c712cdd11378233ff/vectordrawable-animated-1.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
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
index bdce5451..86966b6f 100644
--- a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_aar.xml
+++ b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_0_aar.xml
@@ -1,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b741faf0c0e978004788a3922a8a438d/versionedparcelable-1.1.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/35aa15676b15e71d7eeb4ddfa208956d/versionedparcelable-1.1.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/35aa15676b15e71d7eeb4ddfa208956d/versionedparcelable-1.1.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/35aa15676b15e71d7eeb4ddfa208956d/versionedparcelable-1.1.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.versionedparcelable/versionedparcelable/1.1.0/d9085927216387af679d18b6f472bc0fc5c7cc81/versionedparcelable-1.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4d21427a2f79d2e6a32cbe38425123a0/versionedparcelable-1.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4d21427a2f79d2e6a32cbe38425123a0/versionedparcelable-1.1.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4d21427a2f79d2e6a32cbe38425123a0/versionedparcelable-1.1.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.versionedparcelable/versionedparcelable/1.1.0/d9085927216387af679d18b6f472bc0fc5c7cc81/versionedparcelable-1.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ 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 f337f6b1..fd25e513 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
@@ -1,16 +1,16 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0b87ab1084a68f31fe387bc7a6868a5f/jetified-viewpager2-1.0.0/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0b87ab1084a68f31fe387bc7a6868a5f/jetified-viewpager2-1.0.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0b87ab1084a68f31fe387bc7a6868a5f/jetified-viewpager2-1.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0b87ab1084a68f31fe387bc7a6868a5f/jetified-viewpager2-1.0.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.viewpager2/viewpager2/1.0.0/3c3569044e6969f1ee5c3aa03b08e6717a2d782f/viewpager2-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ce1bdf40954d007dd6169216a0498c14/jetified-viewpager2-1.0.0/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ce1bdf40954d007dd6169216a0498c14/jetified-viewpager2-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ce1bdf40954d007dd6169216a0498c14/jetified-viewpager2-1.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ce1bdf40954d007dd6169216a0498c14/jetified-viewpager2-1.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.viewpager2/viewpager2/1.0.0/3c3569044e6969f1ee5c3aa03b08e6717a2d782f/viewpager2-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
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 c63b2411..08d3de95 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,14 +1,13 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.viewpager:viewpager:1.0.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1570490a9aefa8bf7c72c2091e5007e6/viewpager-1.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3b05e92a0b4e3112ba851c915a140a05/viewpager-1.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3b05e92a0b4e3112ba851c915a140a05/viewpager-1.0.0/AndroidManifest.xml" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3b05e92a0b4e3112ba851c915a140a05/viewpager-1.0.0/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.viewpager/viewpager/1.0.0/db045f92188b9d247d5f556866f8861ab68528f0/viewpager-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: androidx.viewpager:viewpager:1.0.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9c5531a133a72eb6884d97fbee2a55f4/viewpager-1.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9c5531a133a72eb6884d97fbee2a55f4/viewpager-1.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9c5531a133a72eb6884d97fbee2a55f4/viewpager-1.0.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.viewpager/viewpager/1.0.0/db045f92188b9d247d5f556866f8861ab68528f0/viewpager-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
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 f072f6ec..a4b4445e 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
@@ -1,17 +1,15 @@
-<component name="libraryTable">
-  <library name="Gradle: com.github.PhilJay:MPAndroidChart:v3.1.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/49e70dbacc79d7c255e125380d59a1fd/jetified-MPAndroidChart-v3.1.0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/89e7804c10079074adbb49a266acf374/jetified-MPAndroidChart-v3.1.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/89e7804c10079074adbb49a266acf374/jetified-MPAndroidChart-v3.1.0/AndroidManifest.xml" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/89e7804c10079074adbb49a266acf374/jetified-MPAndroidChart-v3.1.0/res" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.PhilJay/MPAndroidChart/v3.1.0/4c8733ccf3f0a9d50357193b03fe2853fc73ff31/MPAndroidChart-v3.1.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.PhilJay/MPAndroidChart/v3.1.0/45d3ce505f744a595313d5eb84efd3ca3c8d2d04/MPAndroidChart-v3.1.0-sources.jar!/" />
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.PhilJay/MPAndroidChart/v3.1.0/d397442db532e8e2471cd0e063e64894c70794aa/MPAndroidChart-v3.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: com.github.PhilJay:MPAndroidChart:v3.1.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/54c73b0bbecba2df93d381ca5b3e4d67/jetified-MPAndroidChart-v3.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/54c73b0bbecba2df93d381ca5b3e4d67/jetified-MPAndroidChart-v3.1.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/54c73b0bbecba2df93d381ca5b3e4d67/jetified-MPAndroidChart-v3.1.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.PhilJay/MPAndroidChart/v3.1.0/4c8733ccf3f0a9d50357193b03fe2853fc73ff31/MPAndroidChart-v3.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.PhilJay/MPAndroidChart/v3.1.0/a93f278fa885a682f8d89d82ffd259d5a9635f7b/MPAndroidChart-v3.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
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
index eaba2e4d..6c94e8df 100644
--- 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
@@ -1,16 +1,16 @@
-<component name="libraryTable">
-  <library name="Gradle: com.google.android.material:material:1.2.1@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f57eb26735bbaf9e1ef6d467bf3dc2cb/material-1.2.1/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f57eb26735bbaf9e1ef6d467bf3dc2cb/material-1.2.1/AndroidManifest.xml" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f57eb26735bbaf9e1ef6d467bf3dc2cb/material-1.2.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f57eb26735bbaf9e1ef6d467bf3dc2cb/material-1.2.1/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.material/material/1.2.1/37d55d5141066b3d118d24232fa7025b65eb3a74/material-1.2.1-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: com.google.android.material:material:1.2.1@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8a1fa311c049999cd0de3e59706fb2b3/material-1.2.1/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8a1fa311c049999cd0de3e59706fb2b3/material-1.2.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8a1fa311c049999cd0de3e59706fb2b3/material-1.2.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8a1fa311c049999cd0de3e59706fb2b3/material-1.2.1/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.material/material/1.2.1/37d55d5141066b3d118d24232fa7025b65eb3a74/material-1.2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ 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 a33b1e89..01351db5 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
@@ -1,15 +1,15 @@
-<component name="libraryTable">
-  <library name="Gradle: com.jaredrummler:material-spinner:1.3.1@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/52c560d27e82cfbb881221e616ed68dc/jetified-material-spinner-1.3.1/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/52c560d27e82cfbb881221e616ed68dc/jetified-material-spinner-1.3.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/52c560d27e82cfbb881221e616ed68dc/jetified-material-spinner-1.3.1/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jaredrummler/material-spinner/1.3.1/ba40fe8844e61d621039959de90238701daa648a/material-spinner-1.3.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jaredrummler/material-spinner/1.3.1/acecb10c397308590ee41aade8c63c1d101272a/material-spinner-1.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: com.jaredrummler:material-spinner:1.3.1@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5744acd13b1dee4a24c0d841f2971091/jetified-material-spinner-1.3.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5744acd13b1dee4a24c0d841f2971091/jetified-material-spinner-1.3.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5744acd13b1dee4a24c0d841f2971091/jetified-material-spinner-1.3.1/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jaredrummler/material-spinner/1.3.1/ba40fe8844e61d621039959de90238701daa648a/material-spinner-1.3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jaredrummler/material-spinner/1.3.1/acecb10c397308590ee41aade8c63c1d101272a/material-spinner-1.3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
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 060b1064..73c742fb 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
@@ -1,20 +1,15 @@
-<component name="libraryTable">
-  <library name="Gradle: com.ornach.nobobutton:nobobutton:1.6@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/132e36214847a3361a625578a0aaa25e/jetified-nobobutton-1.6/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/132e36214847a3361a625578a0aaa25e/jetified-nobobutton-1.6/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9c3ed76f18cba03b94324483326415e5/jetified-nobobutton-1.6/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9c3ed76f18cba03b94324483326415e5/jetified-nobobutton-1.6/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9c3ed76f18cba03b94324483326415e5/jetified-nobobutton-1.6/AndroidManifest.xml" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2b98412735e249fa9afa3993c41033a1/jetified-nobobutton-1.6/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2b98412735e249fa9afa3993c41033a1/jetified-nobobutton-1.6/AndroidManifest.xml" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2b98412735e249fa9afa3993c41033a1/jetified-nobobutton-1.6/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.ornach.nobobutton/nobobutton/1.6/911b15d3f7fbb294cf0ddb682bf1c90da2cffa01/nobobutton-1.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.ornach.nobobutton/nobobutton/1.6/4d36f5426938c8854d3d3df30144a025a05d3bcd/nobobutton-1.6-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: com.ornach.nobobutton:nobobutton:1.6@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/47b357674517c0da759794a558500f01/jetified-nobobutton-1.6/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/47b357674517c0da759794a558500f01/jetified-nobobutton-1.6/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/47b357674517c0da759794a558500f01/jetified-nobobutton-1.6/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.ornach.nobobutton/nobobutton/1.6/911b15d3f7fbb294cf0ddb682bf1c90da2cffa01/nobobutton-1.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.ornach.nobobutton/nobobutton/1.6/4d36f5426938c8854d3d3df30144a025a05d3bcd/nobobutton-1.6-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
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 fc5093c4..982d0a18 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
@@ -1,15 +1,15 @@
-<component name="libraryTable">
-  <library name="Gradle: de.hdodenhof:circleimageview:3.1.0@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cfde25ffb842c0fce00d8f9a9553ac99/jetified-circleimageview-3.1.0/AndroidManifest.xml" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cfde25ffb842c0fce00d8f9a9553ac99/jetified-circleimageview-3.1.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cfde25ffb842c0fce00d8f9a9553ac99/jetified-circleimageview-3.1.0/res" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/de.hdodenhof/circleimageview/3.1.0/e33964c462b854162fee2bd3cd52889ef878df77/circleimageview-3.1.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/de.hdodenhof/circleimageview/3.1.0/e5635e59d66b172f3e99c6a7044dc9535c95d180/circleimageview-3.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Gradle: de.hdodenhof:circleimageview:3.1.0@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3882e14306f66994f2872821b1924216/jetified-circleimageview-3.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3882e14306f66994f2872821b1924216/jetified-circleimageview-3.1.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3882e14306f66994f2872821b1924216/jetified-circleimageview-3.1.0/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/de.hdodenhof/circleimageview/3.1.0/e33964c462b854162fee2bd3cd52889ef878df77/circleimageview-3.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/de.hdodenhof/circleimageview/3.1.0/e5635e59d66b172f3e99c6a7044dc9535c95d180/circleimageview-3.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 98de6fa1..33782299 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
       <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
     </configurations>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 3d62ff30..d20cff7c 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/toDonts.iml" filepath="$PROJECT_DIR$/.idea/modules/toDonts.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/toDonts.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/toDonts.app.iml" />
-    </modules>
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/toDonts.iml" filepath="$PROJECT_DIR$/.idea/modules/toDonts.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/toDonts.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/toDonts.app.iml" />
+    </modules>
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/app/toDonts.app.iml b/.idea/modules/app/toDonts.app.iml
index 2b7bfd0e..760cfc75 100644
--- a/.idea/modules/app/toDonts.app.iml
+++ b/.idea/modules/app/toDonts.app.iml
@@ -4,8 +4,8 @@
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":app" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="4.1.3" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="4.1.3" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="4.0.0" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="4.0.0" />
       </configuration>
     </facet>
     <facet type="android" name="Android">
@@ -19,8 +19,8 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
@@ -31,11 +31,10 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../../app/build/tmp/kotlin-classes/debug" />
-          <option name="classpath" value="$MODULE_DIR$/../../../app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/eaa5539686697d24db3feb03e00625d2/jetified-kotlin-android-extensions-runtime-1.3.72.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/5f9638c853daf023e1c2ce121d64b132/jetified-core-ktx-1.3.1-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/096a5f06a8af0196169a6b345758e8ea/jetified-kotlin-stdlib-1.3.72.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/26280b2c42aaa80a572d007002478038/jetified-kotlin-stdlib-common-1.3.72.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/749a935869b74128cc05c55e7ecad714/jetified-annotations-13.0.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/5aa47788849f3c18d7e795536c86f308/material-1.2.1-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/42d030b73160de90b4b88e4c2b5b7511/cardview-1.0.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/781be14ddfc94bf4521bac97f4f9bc84/constraintlayout-2.0.1-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/d567ba3a09f7ac5b5a76520ec1491610/jetified-nobobutton-1.6-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/1bc1e7c3e684d9681b98dcbd9aa251b3/appcompat-1.2.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/5a1f3cb1a3c43e496cd201406f37f022/jetified-material-spinner-1.3.1-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/16064a8be8a72749b0aa56c25b15f9f1/legacy-support-v4-1.0.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/a3d1333449be57e825bd76f245d816ea/legacy-support-core-ui-1.0.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/add46a35c1b31b0325459deed60f64c8/coordinatorlayout-1.1.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/8f963829c79eff4434800193c2bd038d/jetified-viewpager2-1.0.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/74c67f36dec34b1f8d0882724df5d44e/fragment-1.1.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/446f9a7603c64cd3335093d50b175db6/recyclerview-1.1.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/60b057bfc519c0a10bcab44c67884ee4/transition-1.2.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/599f540aaa022cbe46134ea633025bfd/jetified-appcompat-resources-1.2.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/765f0a6d2d0adf82e8ed90fc1a499ad5/vectordrawable-animated-1.1.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/a988f2057d18770308135f5fa50f73fe/vectordrawable-1.1.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/dfe8ba742ff065333dcc1017c8462c4a/drawerlayout-1.0.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/41f9ea5ab1ded19280e7bb8022b23f89/media-1.0.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/b35bd9a85912aa457b965f1328856cab/legacy-support-core-utils-1.0.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/d4e19991bc33705b248398e194af32ed/viewpager-1.0.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/07ea83f9b51107ece085572c6eebd38a/slidingpanelayout-1.0.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/19c9853deac49f2c2c9d60ee46747665/customview-1.0.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/ca9a79ee5ecdaf5e7f3e6f16ecfd46f3/loader-1.0.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/3c554a21bd14fb9102fec7cd172e46cf/jetified-activity-1.0.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/94797a3e156e338c1eed12aa59c9615c/swiperefreshlayout-1.0.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/a0b4fbeaab891d2ad96fcc7d5848d179/asynclayoutinflater-1.0.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/fc9402d91e285bd6f23ebbff33cd0c7b/core-1.3.1-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/c80f3c822c86e08db27cad10acfc1315/lifecycle-runtime-2.1.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/7a23329cb81a907f8ca3aafa984c5874/cursoradapter-1.0.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/792b3ffe31f6dcf6b4ef36129369c30d/versionedparcelable-1.1.0-api.jar:/home/marvin/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/0a317e6cfaef90b7ede5aeb594ff438c/lifecycle-viewmodel-2.1.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/8328ec25cb6c6946925d575437168d0a/jetified-savedstate-1.0.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/4e19c831e6d211d1cc82f35a7212525f/lifecycle-livedata-2.0.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/76fed33a2b4e791614db8effe51aeb88/lifecycle-livedata-core-2.0.0-api.jar:/home/marvin/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.1.0/c67e7807d9cd6c329b9d0218b2ec4e505dd340b7/lifecycle-common-2.1.0.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/febdff3527ec0b42dd8150b3950c416e/core-runtime-2.0.0-api.jar:/home/marvin/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/2816b5c5f91b30c4fb84d2cbdc47fc32/documentfile-1.0.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/addc4329916654f5abc808cbc3c9a117/localbroadcastmanager-1.0.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/cd802325499decf6b77c8b1c1f173ee4/print-1.0.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/d0862390be96da7493e7e84049c8bb05/interpolator-1.0.0-api.jar:/home/marvin/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8/annotation-1.1.0.jar:/home/marvin/.gradle/caches/modules-2/files-2.1/androidx.constraintlayout/constraintlayout-solver/2.0.1/30988fe2d77f3fe3bf7551bb8a8b795fad7e7226/constraintlayout-solver-2.0.1.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/9a507edbc067d769a99d387e295ae387/jetified-annotation-experimental-1.0.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/34b1a70ce0c0b8570c28612de0ed757a/jetified-circleimageview-3.1.0-api.jar:/home/marvin/.gradle/caches/transforms-2/files-2.1/d9e81c3a4a67f1c1d361f81dcbf4e802/jetified-MPAndroidChart-v3.1.0-api.jar:/home/marvin/Android/Sdk/platforms/android-30/android.jar" />
+          <option name="classpath" value="$MODULE_DIR$/../../../app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/4ea369ecd6f9a271f5a05c3ada6dcf2c/jetified-nobobutton-1.6-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/c431eadfe82f357c529102239d5fad6e/material-1.2.1-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/14669f1500de117698413229e9f60c18/constraintlayout-2.0.1-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/6356b82305099e7173775199bbcfd592/appcompat-1.2.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/0c8eef31ef98a5b35fd566a0197b226f/cardview-1.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/b0e4bfad972bc5cf247f852e4fb8712a/jetified-core-ktx-1.3.1-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/d6ee95fd736e43c3c8eebe6b4b99cb84/jetified-material-spinner-1.3.1-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/01a00f0769d955ef10a2b741732041e3/legacy-support-v4-1.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/71c9aff9e3e509a0fec1550fbd9e2853/legacy-support-core-ui-1.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/c32d8a389e29c96e320d6cdbe933a117/coordinatorlayout-1.1.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/7223cd81fb9b40cf679441abed60c92e/jetified-viewpager2-1.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/9fb8afe92522f11d5d4654230146ce47/fragment-1.1.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/c53ae32642a4eddca5e2cb1ebff05134/recyclerview-1.1.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/19fa698c9a99737e261447dbecd2717d/transition-1.2.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/3a3d50ab934850956ba60fab4e102f62/jetified-appcompat-resources-1.2.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/843a8a64d9121d82599a539512364601/vectordrawable-animated-1.1.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/68e23874e429eec7cbfeffe501e388e9/vectordrawable-1.1.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/5557e95daab0ba04b49b194bf329fc69/drawerlayout-1.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/dfd303e206f380969eadca55bd67cfbe/media-1.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/69816ad7e0b0757a17ffc92c5b19054a/legacy-support-core-utils-1.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/de570732292a5d04284361a3ab63c849/viewpager-1.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/5a9faac12dbfbe56a7b44fcdbd870e44/slidingpanelayout-1.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/a96c41f17cfc6cde298bd6f6cd0473c1/customview-1.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/a59c1d6d47f4c6001500e84aaf3b77f4/loader-1.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/9df97083bf0ee79236f0dd91e18d3bba/jetified-activity-1.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/0fcf202f86d78e0d6782990a388dcda0/swiperefreshlayout-1.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/65f85ef87ebb0d6330651f2cf822ea5a/asynclayoutinflater-1.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/0b3ed089c4db69554a3c6b290460efb1/core-1.3.1-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/089e1f6709588f3906afe17028081061/lifecycle-runtime-2.1.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/b0b6f3632871713740221bcf80e103b4/cursoradapter-1.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/23b091c951d4e60dfd835ee62dd8fd51/versionedparcelable-1.1.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/3475501dee6d3cafe15eb37f89a6663a/lifecycle-viewmodel-2.1.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/96b4c6638de790dfd6b7956eade45da9/jetified-savedstate-1.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/60d15bdc09bcdce811bfae3b23dd3263/lifecycle-livedata-2.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/0ab63c011d1eae263eb569de92d53751/lifecycle-livedata-core-2.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.1.0/c67e7807d9cd6c329b9d0218b2ec4e505dd340b7/lifecycle-common-2.1.0.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/c72bbda37e61816107e7fc401cb6718a/core-runtime-2.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/c4b3ecd32e02f5c57529904d8ab0dea5/documentfile-1.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/2ca4f4a79d233a4738cf41148e6c47e7/localbroadcastmanager-1.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/62f2ab1be808940cd2d67066487b17d0/print-1.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/006aa2cf300e663e714afd1a67f34017/interpolator-1.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8/annotation-1.1.0.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/2a1fad04da9a060727e1d8afb50b4b12/jetified-kotlin-android-extensions-runtime-1.3.72.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/a0343ce87ca68024d667b033a5319b68/jetified-kotlin-stdlib-1.3.72.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/f3be8c1d318e0277f9db3120bbd943b0/jetified-kotlin-stdlib-common-1.3.72.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/a17255a51de37b4c4f2bc2feff1bd659/jetified-annotations-13.0.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/modules-2/files-2.1/androidx.constraintlayout/constraintlayout-solver/2.0.1/30988fe2d77f3fe3bf7551bb8a8b795fad7e7226/constraintlayout-solver-2.0.1.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/2d4ec00d059554d3b225b0366c89d6e6/jetified-annotation-experimental-1.0.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/4d426e84b4c3629fa7254b15f2844df3/jetified-circleimageview-3.1.0-api.jar;C:/Users/Hasnaat Ahmed/.gradle/caches/transforms-2/files-2.1/b803ab5c072ae644a16611d812c7061d/jetified-MPAndroidChart-v3.1.0-api.jar;C:/Users/Hasnaat Ahmed/AppData/Local/Android/AndroidSt/sdk/platforms/android-30/android.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="app_debug" />
-          <option name="jvmTarget" value="1.6" />
           <option name="languageVersion" value="1.3" />
           <option name="apiVersion" value="1.3" />
           <option name="pluginOptions">
@@ -72,20 +71,18 @@
     <content url="file://$MODULE_DIR$/../../../app">
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/build" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 30 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1" level="project" />
@@ -95,21 +92,21 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:core:1.3.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:monitor:1.3.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-idling-resource:3.3.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.3.72" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.72" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.1.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.3.72" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.72" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout-solver:2.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.3.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.ornach.nobobutton:nobobutton:1.6@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.material:material:1.2.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout:2.0.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.ornach.nobobutton:nobobutton:1.6@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.3.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.jaredrummler:material-spinner:1.3.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
diff --git a/.idea/modules/toDonts.iml b/.idea/modules/toDonts.iml
index b46cdfef..745cf001 100644
--- a/.idea/modules/toDonts.iml
+++ b/.idea/modules/toDonts.iml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="toDonts" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="java-gradle" name="Java-Gradle">
-      <configuration>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/../../build" />
-        <option name="BUILDABLE" value="false" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../..">
-      <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/../../build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="toDonts" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/../../build" />
+        <option name="BUILDABLE" value="false" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../..">
+      <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/../../build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
 </module>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index b7451c9e..7f68460d 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
+      </set>
+    </option>
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 9661ac71..94a25f7f 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/app/.gitignore b/app/.gitignore
index 67e07b8f..42afabfd 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1,2 +1 @@
-/build
-/release
+/build
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 00cea147..9f4c8e6a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,50 +1,50 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-
-android {
-    compileSdkVersion 30
-    buildToolsVersion "29.0.3"
-
-    defaultConfig {
-        applicationId "rocks.poopjournal.todont"
-        minSdkVersion 21
-        targetSdkVersion 30
-        versionCode 4
-        versionName "1.3"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-dependencies {
-    implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.1'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.2.1'
-    implementation 'androidx.cardview:cardview:1.0.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    //noinspection GradleCompatible
-    implementation 'com.android.support:design:27.0.2'
-    implementation 'com.jaredrummler:material-spinner:1.3.1'
-    implementation 'com.google.android.material:material:1.0.0-rc01'
-    compile 'com.ornach.nobobutton:nobobutton:1.6'
-    implementation 'de.hdodenhof:circleimageview:2.2.0'
-    implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
-    implementation 'de.hdodenhof:circleimageview:3.1.0'
-    //noinspection GradleCompatible
-    implementation 'com.android.support:cardview-v7:28.0.0'
-
-}
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+
+android {
+    compileSdkVersion 30
+    buildToolsVersion "29.0.3"
+
+    defaultConfig {
+        applicationId "rocks.poopjournal.todont"
+        minSdkVersion 21
+        targetSdkVersion 30
+        versionCode 3
+        versionName "1.2"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation 'androidx.core:core-ktx:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    //noinspection GradleCompatible
+    implementation 'com.android.support:design:27.0.2'
+    implementation 'com.jaredrummler:material-spinner:1.3.1'
+    implementation 'com.google.android.material:material:1.0.0-rc01'
+    compile 'com.ornach.nobobutton:nobobutton:1.6'
+    implementation 'de.hdodenhof:circleimageview:2.2.0'
+    implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
+    implementation 'de.hdodenhof:circleimageview:3.1.0'
+    //noinspection GradleCompatible
+    implementation 'com.android.support:cardview-v7:28.0.0'
+
+}
\ No newline at end of file
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 64b4a059..481bb434 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,21 +1,21 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
 #-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/app/release/output.json b/app/release/output.json
new file mode 100644
index 00000000..02f38ff5
--- /dev/null
+++ b/app/release/output.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "rocks.poopjournal.todont",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "properties": [],
+      "versionCode": 1,
+      "versionName": "1",
+      "enabled": true,
+      "outputFile": "app-release.apk"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/rocks/poopjournal/todont/ExampleInstrumentedTest.kt b/app/src/androidTest/java/rocks/poopjournal/todont/ExampleInstrumentedTest.kt
index 173f17ac..b76ae017 100644
--- a/app/src/androidTest/java/rocks/poopjournal/todont/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/rocks/poopjournal/todont/ExampleInstrumentedTest.kt
@@ -1,24 +1,24 @@
-package rocks.poopjournal.todont
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("rocks.poopjournal.todont", appContext.packageName)
-    }
+package rocks.poopjournal.todont
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("rocks.poopjournal.todont", appContext.packageName)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4ebef278..1dc4bb06 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,25 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="rocks.poopjournal.todont">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_store"
-        android:roundIcon="@mipmap/ic_store"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".About"></activity>
-        <activity android:name=".Settings" />
-        <activity android:name=".OnBoardingActivity" />
-        <activity android:name=".Labels" />
-        <activity android:name=".MainActivity" />
-        <activity android:name=".Splash_Screen">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="rocks.poopjournal.todont">
+
+    <application
+        tools:replace="android:allowBackup"
+        android:allowBackup="false"
+        android:icon="@mipmap/ic_store"
+        android:roundIcon="@mipmap/ic_store"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity android:name=".About"></activity>
+        <activity android:name=".Settings" />
+        <activity android:name=".OnBoardingActivity" />
+        <activity android:name=".Labels" />
+        <activity android:name=".MainActivity" />
+        <activity android:name=".Splash_Screen">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/rocks/poopjournal/todont/About.java b/app/src/main/java/rocks/poopjournal/todont/About.java
index ca583f7e..0f70e402 100644
--- a/app/src/main/java/rocks/poopjournal/todont/About.java
+++ b/app/src/main/java/rocks/poopjournal/todont/About.java
@@ -1,198 +1,168 @@
-package rocks.poopjournal.todont;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.content.ActivityNotFoundException;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.text.Html;
-import android.text.method.LinkMovementMethod;
-import android.view.Gravity;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
-
-public class About extends AppCompatActivity {
-    TextView version;
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_about);
-        version=findViewById(R.id.versiontext);
-        version.setText( BuildConfig.VERSION_NAME +" Beta ");
-}
-
-
-//    public void contact_patriyk(View view) {
-//        switch(view.getId()){
-//            case R.id.btngit_patriyk:
-//                Uri uri = Uri.parse("https://github.com/patrykmichalik"); // missing 'http://' will cause crashed
-//                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-//                startActivity(intent);
-//                break;
-//            case R.id.btntwitter_patriyk:
-//                Uri u = Uri.parse("https://twitter.com/patrykmichalik_\n");
-//                Intent i = new Intent(Intent.ACTION_VIEW, u);
-//                startActivity(i);
-//                break;
-//            case R.id.btnweb_patriyk:
-//                Uri ur = Uri.parse("https://patrykmichalik.com/"); // missing 'http://' will cause crashed
-//                Intent in = new Intent(Intent.ACTION_VIEW, ur);
-//                startActivity(in);
-//                break;
-//
-//        }
-//
-//    }
-
-    public void contact_codeaquaria(View view) {
-        switch(view.getId()){
-            case R.id.btnmail_codeaquaria:
-                String mailto = "mailto:codeaquaria20@gmail.com";
-                Intent emailIntent = new Intent(Intent.ACTION_SENDTO);
-                emailIntent.setData(Uri.parse(mailto));
-                try {
-                    startActivity(emailIntent);
-                } catch (ActivityNotFoundException e) {
-                    Toast toast = Toast.makeText(this, "    Error to open Email    ", Toast.LENGTH_SHORT);
-                    View v = toast.getView();
-                    v.setBackground(this.getResources().getDrawable(R.drawable.roundbutton));
-                    toast.setGravity(Gravity.CENTER, 0, 0);
-                    toast.show();
-                }
-                break;
-            case R.id.btngit_codeaquaria:
-                Uri uri = Uri.parse("https://github.com/arafaatqureshi"); // missing 'http://' will cause crashed
-                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                startActivity(intent);
-                break;
-            case R.id.btntwitter_codeaquaria:
-                Uri ui = Uri.parse("https://www.facebook.com/Code-Aquaria-109834144196326"); // missing 'http://' will cause crashed
-                Intent it = new Intent(Intent.ACTION_VIEW, ui);
-                startActivity(it);
-                break;
-
-        }
-    }
-
-    public void contact_marvin(View view) {
-        switch(view.getId()){
-            case R.id.btnmail_crazymarvin:
-                String mailto = "mailto:marvin@poopjournal.rocks";
-                Intent emailIntent = new Intent(Intent.ACTION_SENDTO);
-                emailIntent.setData(Uri.parse(mailto));
-                try {
-                    startActivity(emailIntent);
-                } catch (ActivityNotFoundException e) {
-                    Toast toast = Toast.makeText(this, "    Error to open Email    ", Toast.LENGTH_SHORT);
-                    View v = toast.getView();
-                    v.setBackground(this.getResources().getDrawable(R.drawable.roundbutton));
-                    toast.setGravity(Gravity.CENTER, 0, 0);
-                    toast.show();
-                }
-                break;
-            case R.id.btngit_crazymarvin:
-                Uri uri = Uri.parse("https://github.com/Crazy-Marvin"); // missing 'http://' will cause crashed
-                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                startActivity(intent);
-                break;
-            case R.id.btntwitter_crazymarvin:
-                Uri u = Uri.parse("https://twitter.com/CrazyMarvinApps"); // missing 'http://' will cause crashed
-                Intent i = new Intent(Intent.ACTION_VIEW, u);
-                startActivity(i);
-                break;
-
-        }
-    }
-
-    public void translate(View view) {
-        Uri u = Uri.parse("https://hosted.weblate.org/projects/todont/");
-        Intent i = new Intent(Intent.ACTION_VIEW, u);
-        startActivity(i);
-    }
-
-    public void report(View view) {
-        Uri u = Uri.parse("https://github.com/Crazy-Marvin/ToDont/issues");
-        Intent i = new Intent(Intent.ACTION_VIEW, u);
-        startActivity(i);
-    }
-
-    public void viewsource(View view) {
-        Uri u = Uri.parse("https://github.com/Crazy-Marvin/ToDont");
-        Intent i = new Intent(Intent.ACTION_VIEW, u);
-        startActivity(i);
-    }
-
-    public void back(View view) {
-        Intent i = new Intent(About.this, Settings.class);
-        finishAffinity();
-        startActivity(i);
-        overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
-
-    }
-
-    public void jetpack(View view) {
-        Uri u = Uri.parse("https://developer.android.com/jetpack");
-        Intent i = new Intent(Intent.ACTION_VIEW, u);
-        startActivity(i);
-    }
-
-    public void logoclicked(View view) {
-        Uri u = Uri.parse("https://crazymarvin.com/todont");
-        Intent i = new Intent(Intent.ACTION_VIEW, u);
-        startActivity(i);
-    }
-
-    public void feather(View view) {
-        Uri u = Uri.parse("https://feathericons.com/");
-        Intent i = new Intent(Intent.ACTION_VIEW, u);
-        startActivity(i);
-    }
-
-    public void apacheee(View view) {
-        Uri u = Uri.parse("https://github.com/Crazy-Marvin/ToDont/blob/development/LICENSE");
-        Intent i = new Intent(Intent.ACTION_VIEW, u);
-        startActivity(i);
-    }
-    public void spinner(View view) {
-        Uri u = Uri.parse("https://github.com/jaredrummler/MaterialSpinner/blob/master/LICENSE");
-        Intent i = new Intent(Intent.ACTION_VIEW, u);
-        startActivity(i);
-    }
-
-    public void nobobutton(View view) {
-        Uri u = Uri.parse("https://github.com/alex31n/NoboButton/blob/master/LICENSE");
-        Intent i = new Intent(Intent.ACTION_VIEW, u);
-        startActivity(i);
-    }
-    public void cImgButton(View view) {
-        Uri u = Uri.parse("https://github.com/hdodenhof/CircleImageView/blob/master/LICENSE.txt");
-        Intent i = new Intent(Intent.ACTION_VIEW, u);
-        startActivity(i);
-    }
-    public void MPAndroidChart(View view) {
-        Uri u = Uri.parse("https://github.com/PhilJay/MPAndroidChart/blob/master/LICENSE");
-        Intent i = new Intent(Intent.ACTION_VIEW, u);
-        startActivity(i);
-    }
-    public void JUnit(View view) {
-        Uri u = Uri.parse("https://junit.org/junit4/license.html");
-        Intent i = new Intent(Intent.ACTION_VIEW, u);
-        startActivity(i);
-    }
-
-    public void Kotlin(View view) {
-        Uri u = Uri.parse("https://github.com/JetBrains/kotlin/blob/master/license/LICENSE.txt");
-        Intent i = new Intent(Intent.ACTION_VIEW, u);
-        startActivity(i);
-    }
-    public void Java(View view) {
-        Uri u = Uri.parse("http://openjdk.java.net/legal/gplv2+ce.html");
-        Intent i = new Intent(Intent.ACTION_VIEW, u);
-        startActivity(i);
-    }
-
-
+package rocks.poopjournal.todont;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.ActivityNotFoundException;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.Html;
+import android.text.method.LinkMovementMethod;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class About extends AppCompatActivity {
+    TextView version;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_about);
+        version=findViewById(R.id.versiontext);
+        version.setText( BuildConfig.VERSION_NAME +" Beta ");
+        //tabdeeli aa gai hai
+}
+
+    public void contact_codeaquaria(View view) {
+        switch(view.getId()){
+            case R.id.btnmail_codeaquaria:
+                String mailto = "mailto:codeaquaria20@gmail.com";
+                Intent emailIntent = new Intent(Intent.ACTION_SENDTO);
+                emailIntent.setData(Uri.parse(mailto));
+                try {
+                    startActivity(emailIntent);
+                } catch (ActivityNotFoundException e) {
+                    Toast.makeText(this, "    Error to open Email    ", Toast.LENGTH_SHORT).show();
+                }
+                break;
+            case R.id.btngit_codeaquaria:
+                Uri uri = Uri.parse("https://github.com/arafaatqureshi"); // missing 'http://' will cause crashed
+                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+                startActivity(intent);
+                break;
+            case R.id.btntwitter_codeaquaria:
+                Uri ui = Uri.parse("https://www.facebook.com/Code-Aquaria-109834144196326"); // missing 'http://' will cause crashed
+                Intent it = new Intent(Intent.ACTION_VIEW, ui);
+                startActivity(it);
+                break;
+
+        }
+    }
+
+    public void contact_marvin(View view) {
+        switch(view.getId()){
+            case R.id.btnmail_crazymarvin:
+                String mailto = "mailto:marvin@poopjournal.rocks";
+                Intent emailIntent = new Intent(Intent.ACTION_SENDTO);
+                emailIntent.setData(Uri.parse(mailto));
+                try {
+                    startActivity(emailIntent);
+                } catch (ActivityNotFoundException e) {
+                    Toast.makeText(this, "    Error to open Email    ", Toast.LENGTH_SHORT).show();
+                }
+                break;
+            case R.id.btngit_crazymarvin:
+                Uri uri = Uri.parse("https://github.com/Crazy-Marvin"); // missing 'http://' will cause crashed
+                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+                startActivity(intent);
+                break;
+            case R.id.btntwitter_crazymarvin:
+                Uri u = Uri.parse("https://twitter.com/CrazyMarvinApps"); // missing 'http://' will cause crashed
+                Intent i = new Intent(Intent.ACTION_VIEW, u);
+                startActivity(i);
+                break;
+
+        }
+    }
+
+    public void translate(View view) {
+        Uri u = Uri.parse("https://hosted.weblate.org/projects/todont/");
+        Intent i = new Intent(Intent.ACTION_VIEW, u);
+        startActivity(i);
+    }
+
+    public void report(View view) {
+        Uri u = Uri.parse("https://github.com/Crazy-Marvin/ToDont/issues");
+        Intent i = new Intent(Intent.ACTION_VIEW, u);
+        startActivity(i);
+    }
+
+    public void viewsource(View view) {
+        Uri u = Uri.parse("https://github.com/Crazy-Marvin/ToDont");
+        Intent i = new Intent(Intent.ACTION_VIEW, u);
+        startActivity(i);
+    }
+
+    public void back(View view) {
+        Intent i = new Intent(About.this, Settings.class);
+        finishAffinity();
+        startActivity(i);
+        overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
+
+    }
+
+    public void jetpack(View view) {
+        Uri u = Uri.parse("https://developer.android.com/jetpack");
+        Intent i = new Intent(Intent.ACTION_VIEW, u);
+        startActivity(i);
+    }
+
+    public void logoclicked(View view) {
+        Uri u = Uri.parse("https://crazymarvin.com/todont");
+        Intent i = new Intent(Intent.ACTION_VIEW, u);
+        startActivity(i);
+    }
+
+    public void feather(View view) {
+        Uri u = Uri.parse("https://feathericons.com/");
+        Intent i = new Intent(Intent.ACTION_VIEW, u);
+        startActivity(i);
+    }
+
+    public void apacheee(View view) {
+        Uri u = Uri.parse("https://github.com/Crazy-Marvin/ToDont/blob/development/LICENSE");
+        Intent i = new Intent(Intent.ACTION_VIEW, u);
+        startActivity(i);
+    }
+    public void spinner(View view) {
+        Uri u = Uri.parse("https://github.com/jaredrummler/MaterialSpinner/blob/master/LICENSE");
+        Intent i = new Intent(Intent.ACTION_VIEW, u);
+        startActivity(i);
+    }
+
+    public void nobobutton(View view) {
+        Uri u = Uri.parse("https://github.com/alex31n/NoboButton/blob/master/LICENSE");
+        Intent i = new Intent(Intent.ACTION_VIEW, u);
+        startActivity(i);
+    }
+    public void cImgButton(View view) {
+        Uri u = Uri.parse("https://github.com/hdodenhof/CircleImageView/blob/master/LICENSE.txt");
+        Intent i = new Intent(Intent.ACTION_VIEW, u);
+        startActivity(i);
+    }
+    public void MPAndroidChart(View view) {
+        Uri u = Uri.parse("https://github.com/PhilJay/MPAndroidChart/blob/master/LICENSE");
+        Intent i = new Intent(Intent.ACTION_VIEW, u);
+        startActivity(i);
+    }
+    public void JUnit(View view) {
+        Uri u = Uri.parse("https://junit.org/junit4/license.html");
+        Intent i = new Intent(Intent.ACTION_VIEW, u);
+        startActivity(i);
+    }
+
+    public void Kotlin(View view) {
+        Uri u = Uri.parse("https://github.com/JetBrains/kotlin/blob/master/license/LICENSE.txt");
+        Intent i = new Intent(Intent.ACTION_VIEW, u);
+        startActivity(i);
+    }
+    public void Java(View view) {
+        Uri u = Uri.parse("http://openjdk.java.net/legal/gplv2+ce.html");
+        Intent i = new Intent(Intent.ACTION_VIEW, u);
+        startActivity(i);
+    }
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/rocks/poopjournal/todont/Adapters/AvoidedAdapter.java b/app/src/main/java/rocks/poopjournal/todont/Adapters/AvoidedAdapter.java
index fdb78a15..12d66484 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Adapters/AvoidedAdapter.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Adapters/AvoidedAdapter.java
@@ -1,176 +1,176 @@
-package rocks.poopjournal.todont.Adapters;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.database.sqlite.SQLiteException;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Adapter;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.RelativeLayout;
-import android.widget.Spinner;
-import android.widget.SpinnerAdapter;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.bottomsheet.BottomSheetDialog;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-
-import rocks.poopjournal.todont.Fragments.AvoidedFragment;
-import rocks.poopjournal.todont.Db_Controller;
-import rocks.poopjournal.todont.Helper;
-import rocks.poopjournal.todont.MainActivity;
-import rocks.poopjournal.todont.R;
-
-
-public class AvoidedAdapter extends RecyclerView.Adapter<AvoidedAdapter.RecyclerViewHolder> {
-    private ArrayList<String> donotTask = new ArrayList<>();
-    private ArrayList<String> donotCatagory = new ArrayList<>();
-    private ArrayList<String> updateddonotCatagory = new ArrayList<>();
-    AvoidedFragment ft;
-    Context con;
-    Date c = Calendar.getInstance().getTime();
-    String[] catagories;
-    String catagoryselected = "";
-    Db_Controller db;
-    final SimpleDateFormat df = new SimpleDateFormat("dd-MMM-yyyy", Locale.getDefault());
-    String formattedDate = df.format(c);
-
-    public AvoidedAdapter(Context con, AvoidedFragment ft, Db_Controller db, ArrayList<String> donotTask, ArrayList<String> donotCatagory) {
-        this.donotTask = donotTask;
-        this.donotCatagory = donotCatagory;
-        this.con = con;
-        this.ft = ft;
-        this.db = db;
-
-    }
-
-    @NonNull
-    @Override
-    public AvoidedAdapter.RecyclerViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int viewType) {
-        LayoutInflater inflater = LayoutInflater.from(viewGroup.getContext());
-        View view = inflater.inflate(R.layout.recyclerview_layout, viewGroup, false);
-        return new RecyclerViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull AvoidedAdapter.RecyclerViewHolder holder, final int position) {
-        db.show_data();
-        String dTask = donotTask.get(position);
-        String date = Helper.data.get(position)[1];
-        holder.task.setText(dTask);
-        holder.dateoftask.setText(date);
-        holder.task.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(con,
-                        R.style.BottomSheetDialogTheme);
-                final View bottomsheetview = LayoutInflater.from(con.getApplicationContext()).
-                        inflate(R.layout.update_layout_bottom_sheet,
-                                (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
-                final Spinner spinner = bottomsheetview.findViewById(R.id.updatespinner);
-                Button saveTaskButton = bottomsheetview.findViewById(R.id.updateTaskButton);
-                final EditText habit = bottomsheetview.findViewById(R.id.updatehabit);
-                final EditText detail = bottomsheetview.findViewById(R.id.updatedetail);
-                TextView txt=bottomsheetview.findViewById(R.id.txt);
-                if (Helper.labels_array.size() == 0) {
-                    txt.setVisibility(View.VISIBLE);
-                    spinner.setVisibility(View.INVISIBLE);
-                } else {
-                    txt.setVisibility(View.INVISIBLE);
-                    spinner.setVisibility(View.VISIBLE);
-                }
-                habit.setText("" + Helper.data.get(position)[2]);
-                detail.setText("" + Helper.data.get(position)[3]);
-                final Adapter adapter = new ArrayAdapter<String>(con, android.R.layout.simple_list_item_1,
-                      Helper.labels_array) {
-                    @Override
-                    public boolean isEnabled(int position) {
-                        if (position == 0) {
-                            return false;
-                        } else {
-                            return true;
-                        }
-                    }
-                };
-                spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-                    @Override
-                    public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
-                        catagoryselected = adapterView.getItemAtPosition(i).toString();
-                        TextView selectedText = (TextView) adapterView.getChildAt(i);
-                        if (selectedText != null) {
-                            selectedText.setTextColor(ContextCompat.getColor(con,R.color.g2));
-                        }
-                    }
-
-                    @Override
-                    public void onNothingSelected(AdapterView<?> adapterView) {
-
-                    }
-                });
-
-
-                saveTaskButton.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        String habit_text = Helper.data.get(position)[2];
-                        String detail_text = detail.getText().toString();
-                        String formattedDate = df.format(c);
-                        try {
-
-                        } catch (SQLiteException e) {
-                        }
-                        Log.d("checkingz",""+habit.getText().toString());
-                        db.update_data(position, formattedDate,habit.getText().toString(), detail.getText().toString(), catagoryselected);
-                        db.show_data();
-                        Helper.SelectedButtonOfTodayTab = 1;
-                        Intent intent = new Intent(con, MainActivity.class);
-                        con.startActivity(intent);
-                        ((Activity) con).overridePendingTransition(0, 0);
-                        bottomSheetDialog.dismiss();
-                    }
-
-                });
-                  spinner.setAdapter((SpinnerAdapter) adapter);
-                bottomSheetDialog.setContentView(bottomsheetview);
-                bottomSheetDialog.show();
-            }
-        });
-
-    }
-
-    @Override
-    public int getItemCount() {
-        return donotTask.size();
-    }
-
-    public class RecyclerViewHolder extends RecyclerView.ViewHolder {
-        Button rbtn;
-        TextView task;
-        TextView dateoftask;
-
-        public RecyclerViewHolder(@NonNull View itemView) {
-            super(itemView);
-            rbtn = itemView.findViewById(R.id.addToAvoided);
-            task = itemView.findViewById(R.id.task);
-            dateoftask = itemView.findViewById(R.id.dateoftask);
-            rbtn.setBackgroundResource(R.drawable.ic_avoided);
-
-        }
-
-    }
-}
+package rocks.poopjournal.todont.Adapters;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.database.sqlite.SQLiteException;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Adapter;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.RelativeLayout;
+import android.widget.Spinner;
+import android.widget.SpinnerAdapter;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+import rocks.poopjournal.todont.Fragments.AvoidedFragment;
+import rocks.poopjournal.todont.Db_Controller;
+import rocks.poopjournal.todont.Helper;
+import rocks.poopjournal.todont.MainActivity;
+import rocks.poopjournal.todont.R;
+
+
+public class AvoidedAdapter extends RecyclerView.Adapter<AvoidedAdapter.RecyclerViewHolder> {
+    private ArrayList<String> donotTask = new ArrayList<>();
+    private ArrayList<String> donotCatagory = new ArrayList<>();
+    private ArrayList<String> updateddonotCatagory = new ArrayList<>();
+    AvoidedFragment ft;
+    Context con;
+    Date c = Calendar.getInstance().getTime();
+    String[] catagories;
+    String catagoryselected = "";
+    Db_Controller db;
+    final SimpleDateFormat df = new SimpleDateFormat("dd-MMM-yyyy", Locale.getDefault());
+    String formattedDate = df.format(c);
+
+    public AvoidedAdapter(Context con, AvoidedFragment ft, Db_Controller db, ArrayList<String> donotTask, ArrayList<String> donotCatagory) {
+        this.donotTask = donotTask;
+        this.donotCatagory = donotCatagory;
+        this.con = con;
+        this.ft = ft;
+        this.db = db;
+
+    }
+
+    @NonNull
+    @Override
+    public AvoidedAdapter.RecyclerViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int viewType) {
+        LayoutInflater inflater = LayoutInflater.from(viewGroup.getContext());
+        View view = inflater.inflate(R.layout.recyclerview_layout, viewGroup, false);
+        return new RecyclerViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull AvoidedAdapter.RecyclerViewHolder holder, final int position) {
+        db.show_data();
+        String dTask = donotTask.get(position);
+        String date = Helper.data.get(position)[1];
+        holder.task.setText(dTask);
+        holder.dateoftask.setText(date);
+        holder.task.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(con,
+                        R.style.BottomSheetDialogTheme);
+                final View bottomsheetview = LayoutInflater.from(con.getApplicationContext()).
+                        inflate(R.layout.update_layout_bottom_sheet,
+                                (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
+                final Spinner spinner = bottomsheetview.findViewById(R.id.updatespinner);
+                Button saveTaskButton = bottomsheetview.findViewById(R.id.updateTaskButton);
+                final EditText habit = bottomsheetview.findViewById(R.id.updatehabit);
+                final EditText detail = bottomsheetview.findViewById(R.id.updatedetail);
+                TextView txt=bottomsheetview.findViewById(R.id.txt);
+                if (Helper.labels_array.size() == 0) {
+                    txt.setVisibility(View.VISIBLE);
+                    spinner.setVisibility(View.INVISIBLE);
+                } else {
+                    txt.setVisibility(View.INVISIBLE);
+                    spinner.setVisibility(View.VISIBLE);
+                }
+                habit.setText("" + Helper.data.get(position)[2]);
+                detail.setText("" + Helper.data.get(position)[3]);
+                final Adapter adapter = new ArrayAdapter<String>(con, android.R.layout.simple_list_item_1,
+                      Helper.labels_array) {
+                    @Override
+                    public boolean isEnabled(int position) {
+                        if (position == 0) {
+                            return false;
+                        } else {
+                            return true;
+                        }
+                    }
+                };
+                spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+                    @Override
+                    public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+                        catagoryselected = adapterView.getItemAtPosition(i).toString();
+                        TextView selectedText = (TextView) adapterView.getChildAt(i);
+                        if (selectedText != null) {
+                            selectedText.setTextColor(ContextCompat.getColor(con,R.color.g2));
+                        }
+                    }
+
+                    @Override
+                    public void onNothingSelected(AdapterView<?> adapterView) {
+
+                    }
+                });
+
+
+                saveTaskButton.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        String habit_text = Helper.data.get(position)[2];
+                        String detail_text = detail.getText().toString();
+                        String formattedDate = df.format(c);
+                        try {
+
+                        } catch (SQLiteException e) {
+                        }
+                        Log.d("checkingz",""+habit.getText().toString());
+                        db.update_data(position, formattedDate,habit.getText().toString(), detail.getText().toString(), catagoryselected);
+                        db.show_data();
+                        Helper.SelectedButtonOfTodayTab = 1;
+                        Intent intent = new Intent(con, MainActivity.class);
+                        con.startActivity(intent);
+                        ((Activity) con).overridePendingTransition(0, 0);
+                        bottomSheetDialog.dismiss();
+                    }
+
+                });
+                  spinner.setAdapter((SpinnerAdapter) adapter);
+                bottomSheetDialog.setContentView(bottomsheetview);
+                bottomSheetDialog.show();
+            }
+        });
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return donotTask.size();
+    }
+
+    public class RecyclerViewHolder extends RecyclerView.ViewHolder {
+        Button rbtn;
+        TextView task;
+        TextView dateoftask;
+
+        public RecyclerViewHolder(@NonNull View itemView) {
+            super(itemView);
+            rbtn = itemView.findViewById(R.id.addToAvoided);
+            task = itemView.findViewById(R.id.task);
+            dateoftask = itemView.findViewById(R.id.dateoftask);
+            rbtn.setBackgroundResource(R.drawable.ic_avoided);
+
+        }
+
+    }
+}
diff --git a/app/src/main/java/rocks/poopjournal/todont/Adapters/AvoidedLogAdapter.java b/app/src/main/java/rocks/poopjournal/todont/Adapters/AvoidedLogAdapter.java
index 6d55f746..11e50ca5 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Adapters/AvoidedLogAdapter.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Adapters/AvoidedLogAdapter.java
@@ -1,178 +1,178 @@
-package rocks.poopjournal.todont.Adapters;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.database.sqlite.SQLiteException;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Adapter;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.RelativeLayout;
-import android.widget.Spinner;
-import android.widget.SpinnerAdapter;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.bottomsheet.BottomSheetDialog;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-
-import rocks.poopjournal.todont.Db_Controller;
-import rocks.poopjournal.todont.Fragments.AvoidedFragment;
-import rocks.poopjournal.todont.Fragments.AvoidedLogFragment;
-import rocks.poopjournal.todont.Helper;
-import rocks.poopjournal.todont.MainActivity;
-import rocks.poopjournal.todont.R;
-
-
-public class AvoidedLogAdapter extends RecyclerView.Adapter<AvoidedLogAdapter.RecyclerViewHolder> {
-    private ArrayList<String> donotTask = new ArrayList<>();
-    private ArrayList<String> donotCatagory = new ArrayList<>();
-    private ArrayList<String> updateddonotCatagory = new ArrayList<>();
-    AvoidedLogFragment ft;
-    Context con;
-    Date c = Calendar.getInstance().getTime();
-    String[] catagories;
-    String catagoryselected = "";
-    Db_Controller db;
-    final SimpleDateFormat df = new SimpleDateFormat("dd-MMM-yyyy", Locale.getDefault());
-    String formattedDate = df.format(c);
-
-    public AvoidedLogAdapter(Context con, AvoidedLogFragment ft, Db_Controller db, ArrayList<String> donotTask, ArrayList<String> donotCatagory) {
-        this.donotTask = donotTask;
-        this.donotCatagory = donotCatagory;
-        this.con = con;
-        this.ft = ft;
-        this.db = db;
-
-    }
-
-    @NonNull
-    @Override
-    public AvoidedLogAdapter.RecyclerViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int viewType) {
-        LayoutInflater inflater = LayoutInflater.from(viewGroup.getContext());
-        View view = inflater.inflate(R.layout.recyclerview_layout, viewGroup, false);
-        return new RecyclerViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull AvoidedLogAdapter.RecyclerViewHolder holder, final int position) {
-        db.show_data();
-        String dTask = donotTask.get(position);
-        String date = Helper.data.get(position)[1];
-        holder.task.setText(dTask);
-        holder.dateoftask.setText(date);
-        holder.task.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(con,
-                        R.style.BottomSheetDialogTheme);
-                final View bottomsheetview = LayoutInflater.from(con.getApplicationContext()).
-                        inflate(R.layout.update_layout_bottom_sheet,
-                                (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
-                final Spinner spinner = bottomsheetview.findViewById(R.id.updatespinner);
-                Button saveTaskButton = bottomsheetview.findViewById(R.id.updateTaskButton);
-                final EditText habit = bottomsheetview.findViewById(R.id.updatehabit);
-                final EditText detail = bottomsheetview.findViewById(R.id.updatedetail);
-                TextView txt=bottomsheetview.findViewById(R.id.txt);
-                if (Helper.labels_array.size() == 0) {
-                    txt.setVisibility(View.VISIBLE);
-                    spinner.setVisibility(View.INVISIBLE);
-                } else {
-                    txt.setVisibility(View.INVISIBLE);
-                    spinner.setVisibility(View.VISIBLE);
-                }
-                habit.setText("" + Helper.data.get(position)[2]);
-                detail.setText("" + Helper.data.get(position)[3]);
-                final Adapter adapter = new ArrayAdapter<String>(con, android.R.layout.simple_list_item_1,
-                      Helper.labels_array) {
-                    @Override
-                    public boolean isEnabled(int position) {
-                        if (position == 0) {
-                            return false;
-                        } else {
-                            return true;
-                        }
-                    }
-                };
-                spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-                    @Override
-                    public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
-                        catagoryselected = adapterView.getItemAtPosition(i).toString();
-                        TextView selectedText = (TextView) adapterView.getChildAt(i);
-                        if (selectedText != null) {
-                            selectedText.setTextColor(ContextCompat.getColor(con,R.color.g2));
-                        }
-                    }
-
-                    @Override
-                    public void onNothingSelected(AdapterView<?> adapterView) {
-
-                    }
-                });
-
-
-                saveTaskButton.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        String habit_text = Helper.data.get(position)[2];
-                        String detail_text = detail.getText().toString();
-                        String formattedDate = df.format(c);
-                        try {
-
-                        } catch (SQLiteException e) {
-                        }
-                        Log.d("checkingz",""+habit.getText().toString());
-                        db.update_data(position, formattedDate,habit.getText().toString(), detail.getText().toString(), catagoryselected);
-                        db.show_data();
-                        Helper.SelectedButtonOfTodayTab = 1;
-                        Intent intent = new Intent(con, MainActivity.class);
-                        con.startActivity(intent);
-                        ((Activity) con).overridePendingTransition(0, 0);
-                        bottomSheetDialog.dismiss();
-                    }
-
-                });
-                  spinner.setAdapter((SpinnerAdapter) adapter);
-                bottomSheetDialog.setContentView(bottomsheetview);
-                bottomSheetDialog.show();
-            }
-        });
-
-    }
-
-    @Override
-    public int getItemCount() {
-        return donotTask.size();
-    }
-
-    public class RecyclerViewHolder extends RecyclerView.ViewHolder {
-        Button rbtn;
-        TextView task;
-        TextView dateoftask;
-
-        public RecyclerViewHolder(@NonNull View itemView) {
-            super(itemView);
-            rbtn = itemView.findViewById(R.id.addToAvoided);
-            task = itemView.findViewById(R.id.task);
-            dateoftask = itemView.findViewById(R.id.dateoftask);
-            dateoftask.setVisibility(View.INVISIBLE);
-            rbtn.setBackgroundResource(R.drawable.ic_avoided);
-
-        }
-
-    }
-}
+package rocks.poopjournal.todont.Adapters;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.database.sqlite.SQLiteException;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Adapter;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.RelativeLayout;
+import android.widget.Spinner;
+import android.widget.SpinnerAdapter;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+import rocks.poopjournal.todont.Db_Controller;
+import rocks.poopjournal.todont.Fragments.AvoidedFragment;
+import rocks.poopjournal.todont.Fragments.AvoidedLogFragment;
+import rocks.poopjournal.todont.Helper;
+import rocks.poopjournal.todont.MainActivity;
+import rocks.poopjournal.todont.R;
+
+
+public class AvoidedLogAdapter extends RecyclerView.Adapter<AvoidedLogAdapter.RecyclerViewHolder> {
+    private ArrayList<String> donotTask = new ArrayList<>();
+    private ArrayList<String> donotCatagory = new ArrayList<>();
+    private ArrayList<String> updateddonotCatagory = new ArrayList<>();
+    AvoidedLogFragment ft;
+    Context con;
+    Date c = Calendar.getInstance().getTime();
+    String[] catagories;
+    String catagoryselected = "";
+    Db_Controller db;
+    final SimpleDateFormat df = new SimpleDateFormat("dd-MMM-yyyy", Locale.getDefault());
+    String formattedDate = df.format(c);
+
+    public AvoidedLogAdapter(Context con, AvoidedLogFragment ft, Db_Controller db, ArrayList<String> donotTask, ArrayList<String> donotCatagory) {
+        this.donotTask = donotTask;
+        this.donotCatagory = donotCatagory;
+        this.con = con;
+        this.ft = ft;
+        this.db = db;
+
+    }
+
+    @NonNull
+    @Override
+    public AvoidedLogAdapter.RecyclerViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int viewType) {
+        LayoutInflater inflater = LayoutInflater.from(viewGroup.getContext());
+        View view = inflater.inflate(R.layout.recyclerview_layout, viewGroup, false);
+        return new RecyclerViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull AvoidedLogAdapter.RecyclerViewHolder holder, final int position) {
+        db.show_data();
+        String dTask = donotTask.get(position);
+        String date = Helper.data.get(position)[1];
+        holder.task.setText(dTask);
+        holder.dateoftask.setText(date);
+        holder.task.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(con,
+                        R.style.BottomSheetDialogTheme);
+                final View bottomsheetview = LayoutInflater.from(con.getApplicationContext()).
+                        inflate(R.layout.update_layout_bottom_sheet,
+                                (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
+                final Spinner spinner = bottomsheetview.findViewById(R.id.updatespinner);
+                Button saveTaskButton = bottomsheetview.findViewById(R.id.updateTaskButton);
+                final EditText habit = bottomsheetview.findViewById(R.id.updatehabit);
+                final EditText detail = bottomsheetview.findViewById(R.id.updatedetail);
+                TextView txt=bottomsheetview.findViewById(R.id.txt);
+                if (Helper.labels_array.size() == 0) {
+                    txt.setVisibility(View.VISIBLE);
+                    spinner.setVisibility(View.INVISIBLE);
+                } else {
+                    txt.setVisibility(View.INVISIBLE);
+                    spinner.setVisibility(View.VISIBLE);
+                }
+                habit.setText("" + Helper.data.get(position)[2]);
+                detail.setText("" + Helper.data.get(position)[3]);
+                final Adapter adapter = new ArrayAdapter<String>(con, android.R.layout.simple_list_item_1,
+                      Helper.labels_array) {
+                    @Override
+                    public boolean isEnabled(int position) {
+                        if (position == 0) {
+                            return false;
+                        } else {
+                            return true;
+                        }
+                    }
+                };
+                spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+                    @Override
+                    public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+                        catagoryselected = adapterView.getItemAtPosition(i).toString();
+                        TextView selectedText = (TextView) adapterView.getChildAt(i);
+                        if (selectedText != null) {
+                            selectedText.setTextColor(ContextCompat.getColor(con,R.color.g2));
+                        }
+                    }
+
+                    @Override
+                    public void onNothingSelected(AdapterView<?> adapterView) {
+
+                    }
+                });
+
+
+                saveTaskButton.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        String habit_text = Helper.data.get(position)[2];
+                        String detail_text = detail.getText().toString();
+                        String formattedDate = df.format(c);
+                        try {
+
+                        } catch (SQLiteException e) {
+                        }
+                        Log.d("checkingz",""+habit.getText().toString());
+                        db.update_data(position, formattedDate,habit.getText().toString(), detail.getText().toString(), catagoryselected);
+                        db.show_data();
+                        Helper.SelectedButtonOfTodayTab = 1;
+                        Intent intent = new Intent(con, MainActivity.class);
+                        con.startActivity(intent);
+                        ((Activity) con).overridePendingTransition(0, 0);
+                        bottomSheetDialog.dismiss();
+                    }
+
+                });
+                  spinner.setAdapter((SpinnerAdapter) adapter);
+                bottomSheetDialog.setContentView(bottomsheetview);
+                bottomSheetDialog.show();
+            }
+        });
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return donotTask.size();
+    }
+
+    public class RecyclerViewHolder extends RecyclerView.ViewHolder {
+        Button rbtn;
+        TextView task;
+        TextView dateoftask;
+
+        public RecyclerViewHolder(@NonNull View itemView) {
+            super(itemView);
+            rbtn = itemView.findViewById(R.id.addToAvoided);
+            task = itemView.findViewById(R.id.task);
+            dateoftask = itemView.findViewById(R.id.dateoftask);
+            dateoftask.setVisibility(View.INVISIBLE);
+            rbtn.setBackgroundResource(R.drawable.ic_avoided);
+
+        }
+
+    }
+}
diff --git a/app/src/main/java/rocks/poopjournal/todont/Adapters/DoneAdapter.java b/app/src/main/java/rocks/poopjournal/todont/Adapters/DoneAdapter.java
index 3c3c47f5..141a0249 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Adapters/DoneAdapter.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Adapters/DoneAdapter.java
@@ -1,169 +1,169 @@
-package rocks.poopjournal.todont.Adapters;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.database.sqlite.SQLiteException;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Adapter;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.RelativeLayout;
-import android.widget.Spinner;
-import android.widget.SpinnerAdapter;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.bottomsheet.BottomSheetDialog;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-
-import rocks.poopjournal.todont.Db_Controller;
-import rocks.poopjournal.todont.Fragments.DoneFragment;
-import rocks.poopjournal.todont.Helper;
-import rocks.poopjournal.todont.MainActivity;
-import rocks.poopjournal.todont.R;
-
-
-public class DoneAdapter extends RecyclerView.Adapter<DoneAdapter.RecyclerViewHolder> {
-    private ArrayList<String> donotTask=new ArrayList<>();
-    private ArrayList<String> donotCatagory=new ArrayList<>();
-    DoneFragment ft;
-    Context con;
-    Date c = Calendar.getInstance().getTime();
-    String[] catagories;
-    String catagoryselected;
-    Db_Controller db;
-    final SimpleDateFormat df = new SimpleDateFormat("dd-MMM-yyyy", Locale.getDefault());
-    String formattedDate = df.format(c);
-
-    public DoneAdapter(Context con, DoneFragment ft, Db_Controller db, ArrayList<String> donotTask, ArrayList<String> donotCatagory) {
-        this.donotTask = donotTask;
-        this.donotCatagory = donotCatagory;
-        this.con = con;
-        this.ft=ft;
-        this.db=db;
-
-    }
-
-    @NonNull
-    @Override
-    public DoneAdapter.RecyclerViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int viewType) {
-        LayoutInflater inflater = LayoutInflater.from(viewGroup.getContext());
-        View view = inflater.inflate(R.layout.recyclerview_layout, viewGroup, false);
-        return new RecyclerViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull DoneAdapter.RecyclerViewHolder holder, final int position) {
-        db.show_done_data();
-        String dTask=donotTask.get(position);
-        String date= Helper.donedata.get(position)[1];
-        holder.task.setText(dTask);
-        holder.dateoftask.setText(date);
-        holder.task.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(con,
-                        R.style.BottomSheetDialogTheme);
-                final View bottomsheetview = LayoutInflater.from(con.getApplicationContext()).
-                        inflate(R.layout.update_layout_bottom_sheet,
-                                (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
-                final Spinner spinner = bottomsheetview.findViewById(R.id.updatespinner);
-                Button saveTaskButton = bottomsheetview.findViewById(R.id.updateTaskButton);
-                final EditText habit = bottomsheetview.findViewById(R.id.updatehabit);
-                final EditText detail = bottomsheetview.findViewById(R.id.updatedetail);
-                TextView txt=bottomsheetview.findViewById(R.id.txt);
-                if (Helper.labels_array.size() == 0) {
-                    txt.setVisibility(View.VISIBLE);
-                    spinner.setVisibility(View.INVISIBLE);
-                } else {
-                    txt.setVisibility(View.INVISIBLE);
-                    spinner.setVisibility(View.VISIBLE);
-                }
-                habit.setText("" + Helper.donedata.get(position)[2]);
-                detail.setText("" + Helper.donedata.get(position)[3]);
-                final Adapter adapter = new ArrayAdapter<String>(con, android.R.layout.simple_list_item_1,
-                        Helper.labels_array) {
-                    @Override
-                    public boolean isEnabled(int position) {
-                        if (position == 0) {
-                            return false;
-                        } else {
-                            return true;
-                        }
-                    }
-
-                };
-                spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-                    @Override
-                    public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
-                        catagoryselected = adapterView.getItemAtPosition(i).toString();
-                        TextView selectedText = (TextView) adapterView.getChildAt(i);
-                        if (selectedText != null) {
-                            selectedText.setTextColor(ContextCompat.getColor(con,R.color.g2));
-                        }
-                    }
-
-                    @Override
-                    public void onNothingSelected(AdapterView<?> adapterView) {
-
-                    }
-                });
-                saveTaskButton.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        String habit_text = Helper.donedata.get(position)[2];
-                        String detail_text = detail.getText().toString();
-                        String formattedDate = df.format(c);
-                        try {
-
-                        } catch (SQLiteException e) {
-                        }
-                        db.update_done_data(position,formattedDate, habit_text, detail_text, catagoryselected);
-                        db.show_data();
-                        Intent intent = new Intent(con, MainActivity.class);
-                        con.startActivity(intent);
-                        ((Activity)con).overridePendingTransition(0,0);
-                        bottomSheetDialog.dismiss();
-                    }
-
-                });
-                spinner.setAdapter((SpinnerAdapter) adapter);
-                bottomSheetDialog.setContentView(bottomsheetview);
-                bottomSheetDialog.show();
-            }
-        });
-        //ft.setDataInList();
-
-    }
-
-    @Override
-    public int getItemCount() {
-        return donotTask.size();
-    }
-
-    public class RecyclerViewHolder extends RecyclerView.ViewHolder {
-        Button rbtn;
-        TextView task;
-        TextView dateoftask;
-        public RecyclerViewHolder(@NonNull View itemView) {
-            super(itemView);
-            rbtn =  itemView.findViewById(R.id.addToAvoided);
-            task = itemView.findViewById(R.id.task);
-            dateoftask = itemView.findViewById(R.id.dateoftask);
-            rbtn.setBackgroundResource(R.drawable.ic_done);
-        }
-    }
-}
+package rocks.poopjournal.todont.Adapters;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.database.sqlite.SQLiteException;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Adapter;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.RelativeLayout;
+import android.widget.Spinner;
+import android.widget.SpinnerAdapter;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+import rocks.poopjournal.todont.Db_Controller;
+import rocks.poopjournal.todont.Fragments.DoneFragment;
+import rocks.poopjournal.todont.Helper;
+import rocks.poopjournal.todont.MainActivity;
+import rocks.poopjournal.todont.R;
+
+
+public class DoneAdapter extends RecyclerView.Adapter<DoneAdapter.RecyclerViewHolder> {
+    private ArrayList<String> donotTask=new ArrayList<>();
+    private ArrayList<String> donotCatagory=new ArrayList<>();
+    DoneFragment ft;
+    Context con;
+    Date c = Calendar.getInstance().getTime();
+    String[] catagories;
+    String catagoryselected;
+    Db_Controller db;
+    final SimpleDateFormat df = new SimpleDateFormat("dd-MMM-yyyy", Locale.getDefault());
+    String formattedDate = df.format(c);
+
+    public DoneAdapter(Context con, DoneFragment ft, Db_Controller db, ArrayList<String> donotTask, ArrayList<String> donotCatagory) {
+        this.donotTask = donotTask;
+        this.donotCatagory = donotCatagory;
+        this.con = con;
+        this.ft=ft;
+        this.db=db;
+
+    }
+
+    @NonNull
+    @Override
+    public DoneAdapter.RecyclerViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int viewType) {
+        LayoutInflater inflater = LayoutInflater.from(viewGroup.getContext());
+        View view = inflater.inflate(R.layout.recyclerview_layout, viewGroup, false);
+        return new RecyclerViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull DoneAdapter.RecyclerViewHolder holder, final int position) {
+        db.show_done_data();
+        String dTask=donotTask.get(position);
+        String date= Helper.donedata.get(position)[1];
+        holder.task.setText(dTask);
+        holder.dateoftask.setText(date);
+        holder.task.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(con,
+                        R.style.BottomSheetDialogTheme);
+                final View bottomsheetview = LayoutInflater.from(con.getApplicationContext()).
+                        inflate(R.layout.update_layout_bottom_sheet,
+                                (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
+                final Spinner spinner = bottomsheetview.findViewById(R.id.updatespinner);
+                Button saveTaskButton = bottomsheetview.findViewById(R.id.updateTaskButton);
+                final EditText habit = bottomsheetview.findViewById(R.id.updatehabit);
+                final EditText detail = bottomsheetview.findViewById(R.id.updatedetail);
+                TextView txt=bottomsheetview.findViewById(R.id.txt);
+                if (Helper.labels_array.size() == 0) {
+                    txt.setVisibility(View.VISIBLE);
+                    spinner.setVisibility(View.INVISIBLE);
+                } else {
+                    txt.setVisibility(View.INVISIBLE);
+                    spinner.setVisibility(View.VISIBLE);
+                }
+                habit.setText("" + Helper.donedata.get(position)[2]);
+                detail.setText("" + Helper.donedata.get(position)[3]);
+                final Adapter adapter = new ArrayAdapter<String>(con, android.R.layout.simple_list_item_1,
+                        Helper.labels_array) {
+                    @Override
+                    public boolean isEnabled(int position) {
+                        if (position == 0) {
+                            return false;
+                        } else {
+                            return true;
+                        }
+                    }
+
+                };
+                spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+                    @Override
+                    public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+                        catagoryselected = adapterView.getItemAtPosition(i).toString();
+                        TextView selectedText = (TextView) adapterView.getChildAt(i);
+                        if (selectedText != null) {
+                            selectedText.setTextColor(ContextCompat.getColor(con,R.color.g2));
+                        }
+                    }
+
+                    @Override
+                    public void onNothingSelected(AdapterView<?> adapterView) {
+
+                    }
+                });
+                saveTaskButton.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        String habit_text = Helper.donedata.get(position)[2];
+                        String detail_text = detail.getText().toString();
+                        String formattedDate = df.format(c);
+                        try {
+
+                        } catch (SQLiteException e) {
+                        }
+                        db.update_done_data(position,formattedDate, habit_text, detail_text, catagoryselected);
+                        db.show_data();
+                        Intent intent = new Intent(con, MainActivity.class);
+                        con.startActivity(intent);
+                        ((Activity)con).overridePendingTransition(0,0);
+                        bottomSheetDialog.dismiss();
+                    }
+
+                });
+                spinner.setAdapter((SpinnerAdapter) adapter);
+                bottomSheetDialog.setContentView(bottomsheetview);
+                bottomSheetDialog.show();
+            }
+        });
+        //ft.setDataInList();
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return donotTask.size();
+    }
+
+    public class RecyclerViewHolder extends RecyclerView.ViewHolder {
+        Button rbtn;
+        TextView task;
+        TextView dateoftask;
+        public RecyclerViewHolder(@NonNull View itemView) {
+            super(itemView);
+            rbtn =  itemView.findViewById(R.id.addToAvoided);
+            task = itemView.findViewById(R.id.task);
+            dateoftask = itemView.findViewById(R.id.dateoftask);
+            rbtn.setBackgroundResource(R.drawable.ic_done);
+        }
+    }
+}
diff --git a/app/src/main/java/rocks/poopjournal/todont/Adapters/DoneLogAdapter.java b/app/src/main/java/rocks/poopjournal/todont/Adapters/DoneLogAdapter.java
index 2fd370fd..7b5df307 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Adapters/DoneLogAdapter.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Adapters/DoneLogAdapter.java
@@ -1,171 +1,171 @@
-package rocks.poopjournal.todont.Adapters;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.database.sqlite.SQLiteException;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Adapter;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.RelativeLayout;
-import android.widget.Spinner;
-import android.widget.SpinnerAdapter;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.bottomsheet.BottomSheetDialog;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-
-import rocks.poopjournal.todont.Db_Controller;
-import rocks.poopjournal.todont.Fragments.DoneFragment;
-import rocks.poopjournal.todont.Fragments.DoneLogFragment;
-import rocks.poopjournal.todont.Helper;
-import rocks.poopjournal.todont.MainActivity;
-import rocks.poopjournal.todont.R;
-
-
-public class DoneLogAdapter extends RecyclerView.Adapter<DoneLogAdapter.RecyclerViewHolder> {
-    private ArrayList<String> donotTask=new ArrayList<>();
-    private ArrayList<String> donotCatagory=new ArrayList<>();
-    DoneLogFragment ft;
-    Context con;
-    Date c = Calendar.getInstance().getTime();
-    String[] catagories;
-    String catagoryselected;
-    Db_Controller db;
-    final SimpleDateFormat df = new SimpleDateFormat("dd-MMM-yyyy", Locale.getDefault());
-    String formattedDate = df.format(c);
-
-    public DoneLogAdapter(Context con, DoneLogFragment ft, Db_Controller db, ArrayList<String> donotTask, ArrayList<String> donotCatagory) {
-        this.donotTask = donotTask;
-        this.donotCatagory = donotCatagory;
-        this.con = con;
-        this.ft=ft;
-        this.db=db;
-
-    }
-
-    @NonNull
-    @Override
-    public DoneLogAdapter.RecyclerViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int viewType) {
-        LayoutInflater inflater = LayoutInflater.from(viewGroup.getContext());
-        View view = inflater.inflate(R.layout.recyclerview_layout, viewGroup, false);
-        return new RecyclerViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull DoneLogAdapter.RecyclerViewHolder holder, final int position) {
-        db.show_done_data();
-        String dTask=donotTask.get(position);
-        String date= Helper.donedata.get(position)[1];
-        holder.task.setText(dTask);
-        holder.dateoftask.setText(date);
-        holder.task.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(con,
-                        R.style.BottomSheetDialogTheme);
-                final View bottomsheetview = LayoutInflater.from(con.getApplicationContext()).
-                        inflate(R.layout.update_layout_bottom_sheet,
-                                (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
-                final Spinner spinner = bottomsheetview.findViewById(R.id.updatespinner);
-                Button saveTaskButton = bottomsheetview.findViewById(R.id.updateTaskButton);
-                final EditText habit = bottomsheetview.findViewById(R.id.updatehabit);
-                final EditText detail = bottomsheetview.findViewById(R.id.updatedetail);
-                TextView txt=bottomsheetview.findViewById(R.id.txt);
-                if (Helper.labels_array.size() == 0) {
-                    txt.setVisibility(View.VISIBLE);
-                    spinner.setVisibility(View.INVISIBLE);
-                } else {
-                    txt.setVisibility(View.INVISIBLE);
-                    spinner.setVisibility(View.VISIBLE);
-                }
-                habit.setText("" + Helper.donedata.get(position)[2]);
-                detail.setText("" + Helper.donedata.get(position)[3]);
-                final Adapter adapter = new ArrayAdapter<String>(con, android.R.layout.simple_list_item_1,
-                        Helper.labels_array) {
-                    @Override
-                    public boolean isEnabled(int position) {
-                        if (position == 0) {
-                            return false;
-                        } else {
-                            return true;
-                        }
-                    }
-
-                };
-                spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-                    @Override
-                    public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
-                        catagoryselected = adapterView.getItemAtPosition(i).toString();
-                        TextView selectedText = (TextView) adapterView.getChildAt(i);
-                        if (selectedText != null) {
-                            selectedText.setTextColor(ContextCompat.getColor(con,R.color.g2));
-                        }
-                    }
-
-                    @Override
-                    public void onNothingSelected(AdapterView<?> adapterView) {
-
-                    }
-                });
-                saveTaskButton.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        String habit_text = Helper.donedata.get(position)[2];
-                        String detail_text = detail.getText().toString();
-                        String formattedDate = df.format(c);
-                        try {
-
-                        } catch (SQLiteException e) {
-                        }
-                        db.update_done_data(position,formattedDate, habit_text, detail_text, catagoryselected);
-                        db.show_data();
-                        Intent intent = new Intent(con, MainActivity.class);
-                        con.startActivity(intent);
-                        ((Activity)con).overridePendingTransition(0,0);
-                        bottomSheetDialog.dismiss();
-                    }
-
-                });
-                spinner.setAdapter((SpinnerAdapter) adapter);
-                bottomSheetDialog.setContentView(bottomsheetview);
-                bottomSheetDialog.show();
-            }
-        });
-        //ft.setDataInList();
-
-    }
-
-    @Override
-    public int getItemCount() {
-        return donotTask.size();
-    }
-
-    public class RecyclerViewHolder extends RecyclerView.ViewHolder {
-        Button rbtn;
-        TextView task;
-        TextView dateoftask;
-        public RecyclerViewHolder(@NonNull View itemView) {
-            super(itemView);
-            rbtn =  itemView.findViewById(R.id.addToAvoided);
-            task = itemView.findViewById(R.id.task);
-            dateoftask = itemView.findViewById(R.id.dateoftask);
-            dateoftask.setVisibility(View.INVISIBLE);
-            rbtn.setBackgroundResource(R.drawable.ic_done);
-        }
-    }
-}
+package rocks.poopjournal.todont.Adapters;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.database.sqlite.SQLiteException;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Adapter;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.RelativeLayout;
+import android.widget.Spinner;
+import android.widget.SpinnerAdapter;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+import rocks.poopjournal.todont.Db_Controller;
+import rocks.poopjournal.todont.Fragments.DoneFragment;
+import rocks.poopjournal.todont.Fragments.DoneLogFragment;
+import rocks.poopjournal.todont.Helper;
+import rocks.poopjournal.todont.MainActivity;
+import rocks.poopjournal.todont.R;
+
+
+public class DoneLogAdapter extends RecyclerView.Adapter<DoneLogAdapter.RecyclerViewHolder> {
+    private ArrayList<String> donotTask=new ArrayList<>();
+    private ArrayList<String> donotCatagory=new ArrayList<>();
+    DoneLogFragment ft;
+    Context con;
+    Date c = Calendar.getInstance().getTime();
+    String[] catagories;
+    String catagoryselected;
+    Db_Controller db;
+    final SimpleDateFormat df = new SimpleDateFormat("dd-MMM-yyyy", Locale.getDefault());
+    String formattedDate = df.format(c);
+
+    public DoneLogAdapter(Context con, DoneLogFragment ft, Db_Controller db, ArrayList<String> donotTask, ArrayList<String> donotCatagory) {
+        this.donotTask = donotTask;
+        this.donotCatagory = donotCatagory;
+        this.con = con;
+        this.ft=ft;
+        this.db=db;
+
+    }
+
+    @NonNull
+    @Override
+    public DoneLogAdapter.RecyclerViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int viewType) {
+        LayoutInflater inflater = LayoutInflater.from(viewGroup.getContext());
+        View view = inflater.inflate(R.layout.recyclerview_layout, viewGroup, false);
+        return new RecyclerViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull DoneLogAdapter.RecyclerViewHolder holder, final int position) {
+        db.show_done_data();
+        String dTask=donotTask.get(position);
+        String date= Helper.donedata.get(position)[1];
+        holder.task.setText(dTask);
+        holder.dateoftask.setText(date);
+        holder.task.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(con,
+                        R.style.BottomSheetDialogTheme);
+                final View bottomsheetview = LayoutInflater.from(con.getApplicationContext()).
+                        inflate(R.layout.update_layout_bottom_sheet,
+                                (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
+                final Spinner spinner = bottomsheetview.findViewById(R.id.updatespinner);
+                Button saveTaskButton = bottomsheetview.findViewById(R.id.updateTaskButton);
+                final EditText habit = bottomsheetview.findViewById(R.id.updatehabit);
+                final EditText detail = bottomsheetview.findViewById(R.id.updatedetail);
+                TextView txt=bottomsheetview.findViewById(R.id.txt);
+                if (Helper.labels_array.size() == 0) {
+                    txt.setVisibility(View.VISIBLE);
+                    spinner.setVisibility(View.INVISIBLE);
+                } else {
+                    txt.setVisibility(View.INVISIBLE);
+                    spinner.setVisibility(View.VISIBLE);
+                }
+                habit.setText("" + Helper.donedata.get(position)[2]);
+                detail.setText("" + Helper.donedata.get(position)[3]);
+                final Adapter adapter = new ArrayAdapter<String>(con, android.R.layout.simple_list_item_1,
+                        Helper.labels_array) {
+                    @Override
+                    public boolean isEnabled(int position) {
+                        if (position == 0) {
+                            return false;
+                        } else {
+                            return true;
+                        }
+                    }
+
+                };
+                spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+                    @Override
+                    public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+                        catagoryselected = adapterView.getItemAtPosition(i).toString();
+                        TextView selectedText = (TextView) adapterView.getChildAt(i);
+                        if (selectedText != null) {
+                            selectedText.setTextColor(ContextCompat.getColor(con,R.color.g2));
+                        }
+                    }
+
+                    @Override
+                    public void onNothingSelected(AdapterView<?> adapterView) {
+
+                    }
+                });
+                saveTaskButton.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        String habit_text = Helper.donedata.get(position)[2];
+                        String detail_text = detail.getText().toString();
+                        String formattedDate = df.format(c);
+                        try {
+
+                        } catch (SQLiteException e) {
+                        }
+                        db.update_done_data(position,formattedDate, habit_text, detail_text, catagoryselected);
+                        db.show_data();
+                        Intent intent = new Intent(con, MainActivity.class);
+                        con.startActivity(intent);
+                        ((Activity)con).overridePendingTransition(0,0);
+                        bottomSheetDialog.dismiss();
+                    }
+
+                });
+                spinner.setAdapter((SpinnerAdapter) adapter);
+                bottomSheetDialog.setContentView(bottomsheetview);
+                bottomSheetDialog.show();
+            }
+        });
+        //ft.setDataInList();
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return donotTask.size();
+    }
+
+    public class RecyclerViewHolder extends RecyclerView.ViewHolder {
+        Button rbtn;
+        TextView task;
+        TextView dateoftask;
+        public RecyclerViewHolder(@NonNull View itemView) {
+            super(itemView);
+            rbtn =  itemView.findViewById(R.id.addToAvoided);
+            task = itemView.findViewById(R.id.task);
+            dateoftask = itemView.findViewById(R.id.dateoftask);
+            dateoftask.setVisibility(View.INVISIBLE);
+            rbtn.setBackgroundResource(R.drawable.ic_done);
+        }
+    }
+}
diff --git a/app/src/main/java/rocks/poopjournal/todont/Adapters/HabitsAdapter.java b/app/src/main/java/rocks/poopjournal/todont/Adapters/HabitsAdapter.java
index 7a3f6e15..265f1cd1 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Adapters/HabitsAdapter.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Adapters/HabitsAdapter.java
@@ -1,265 +1,244 @@
-package rocks.poopjournal.todont.Adapters;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.database.sqlite.SQLiteException;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Adapter;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.RelativeLayout;
-import android.widget.Spinner;
-import android.widget.SpinnerAdapter;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.bottomsheet.BottomSheetDialog;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-
-import rocks.poopjournal.todont.Db_Controller;
-import rocks.poopjournal.todont.Fragments.HabitsFragment;
-import rocks.poopjournal.todont.Fragments.HabitsLogFragment;
-import rocks.poopjournal.todont.Helper;
-import rocks.poopjournal.todont.MainActivity;
-import rocks.poopjournal.todont.R;
-
-
-public class HabitsAdapter extends RecyclerView.Adapter<HabitsAdapter.RecyclerViewHolder> {
-    private ArrayList<String> donotTask = new ArrayList<>();
-    private ArrayList<String> donotCatagory = new ArrayList<>();
-    HabitsFragment ft;
-    Context con;
-    Date c = Calendar.getInstance().getTime();
-    String[] catagories;
-    String catagoryselected;
-    Db_Controller db;
-    final SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
-    String formattedDate = df.format(c);
-
-    public HabitsAdapter(Context con, HabitsFragment ft, Db_Controller db, ArrayList<String> donotTask, ArrayList<String> donotCatagory) {
-        this.donotTask = donotTask;
-        this.donotCatagory = donotCatagory;
-        this.con = con;
-        this.ft = ft;
-        this.db = db;
-
-    }
-
-    @NonNull
-    @Override
-    public HabitsAdapter.RecyclerViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int viewType) {
-        LayoutInflater inflater = LayoutInflater.from(viewGroup.getContext());
-        View view = inflater.inflate(R.layout.recyclerview_layout_habits, viewGroup, false);
-        return new RecyclerViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull final HabitsAdapter.RecyclerViewHolder holder, final int position) {
-        String dTask = donotTask.get(position);
-        String dCatagory = donotCatagory.get(position);
-        holder.task.setText(dTask);
-        holder.catagoryoftask.setText(dCatagory);
-        holder.task.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(con,
-                        R.style.BottomSheetDialogTheme);
-                final View bottomsheetview = LayoutInflater.from(con.getApplicationContext()).
-                        inflate(R.layout.update_layout_bottom_sheet,
-                                (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
-                final Spinner spinner = bottomsheetview.findViewById(R.id.updatespinner);
-                Button saveTaskButton = bottomsheetview.findViewById(R.id.updateTaskButton);
-                final EditText habit = bottomsheetview.findViewById(R.id.updatehabit);
-                final EditText detail = bottomsheetview.findViewById(R.id.updatedetail);
-                TextView txt = bottomsheetview.findViewById(R.id.txt);
-                if (Helper.labels_array.size() == 0) {
-                    txt.setVisibility(View.VISIBLE);
-                    spinner.setVisibility(View.INVISIBLE);
-                } else {
-                    txt.setVisibility(View.INVISIBLE);
-                    spinner.setVisibility(View.VISIBLE);
-                }
-                habit.setText("" + Helper.habitsdata.get(position)[2]);
-                detail.setText("" + Helper.habitsdata.get(position)[3]);
-                final Adapter adapter = new ArrayAdapter<String>(con, android.R.layout.simple_list_item_1,
-                        Helper.labels_array) {
-                    @Override
-                    public boolean isEnabled(int position) {
-                        if (position == 0) {
-                            return false;
-                        } else {
-                            return true;
-                        }
-                    }
-
-                };
-                spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-                    @Override
-                    public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
-                        catagoryselected = adapterView.getItemAtPosition(i).toString();
-                        TextView selectedText = (TextView) adapterView.getChildAt(i);
-                        if (selectedText != null) {
-                            selectedText.setTextColor(ContextCompat.getColor(con, R.color.g2));
-                        }
-                    }
-
-                    @Override
-                    public void onNothingSelected(AdapterView<?> adapterView) {
-
-                    }
-                });
-                saveTaskButton.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        String formattedDate = df.format(c);
-                        try {
-
-                        } catch (SQLiteException e) {
-                        }
-                        String str=habit.getText().toString();
-                        if(str.contains("'")){
-                            str=str.replace("'","geodhola");
-                            Log.d("kuttistring",""+str);
-                        }
-                        db.update_habitsdata(position, formattedDate,str
-                                , detail.getText().toString(), catagoryselected);
-                        db.show_habits_data();
-                        Intent intent = new Intent(con, MainActivity.class);
-                        con.startActivity(intent);
-                        ((Activity) con).overridePendingTransition(0, 0);
-                        bottomSheetDialog.dismiss();
-                    }
-
-                });
-
-                spinner.setAdapter((SpinnerAdapter) adapter);
-                bottomSheetDialog.setContentView(bottomsheetview);
-                bottomSheetDialog.show();
-            }
-        });
-        holder.btn1.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if (Helper.isTodaySelected == true) {
-                    db.show_data();
-                    db.show_habits_data();
-                    Log.d("asize", "" + Helper.data.size());
-                    int count = 0;
-                    if (Helper.data.size() != 0) {
-                        for (int i = 0; i < Helper.data.size(); i++) {
-                            String getdate = Helper.data.get(i)[1];
-                            String gethabit = Helper.data.get(i)[2];
-                            if ((Helper.habitsdata.get(position)[2].equals(gethabit)) && (getdate.equals(df.format(c)))) {
-                                Toast toast = Toast.makeText(con, "    Already Added    ", Toast.LENGTH_SHORT);
-                                View v = toast.getView();
-                                v.setBackground(con.getResources().getDrawable(R.drawable.roundbutton));
-                                toast.setGravity(Gravity.CENTER, 0, 0);
-                                toast.show();
-                                count++;
-                            }
-
-                        }
-                        if (count == 0) {
-                            db.insert_data(Helper.data.size(), df.format(c), Helper.habitsdata.get(position)[2],
-                                    Helper.habitsdata.get(position)[3], catagoryselected);
-                            Toast toast = Toast.makeText(con, "    Added To Avoided    ", Toast.LENGTH_SHORT);
-                            View v = toast.getView();
-                            v.setBackground(con.getResources().getDrawable(R.drawable.roundbutton));
-                            toast.setGravity(Gravity.CENTER, 0, 0);
-                            toast.show();
-                        }
-                    } else {
-                        db.insert_data(Helper.data.size(), df.format(c), Helper.habitsdata.get(position)[2],
-                                Helper.habitsdata.get(position)[3], catagoryselected);
-                        Toast toast = Toast.makeText(con, "    Added To Avoided    ", Toast.LENGTH_SHORT);
-                        View v = toast.getView();
-                        v.setBackground(con.getResources().getDrawable(R.drawable.roundbutton));
-                        toast.setGravity(Gravity.CENTER, 0, 0);
-                        toast.show();
-                    }
-                }
-            }
-        });
-        holder.btn2.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if (Helper.isTodaySelected == true) {
-                    db.show_done_data();
-                    db.show_habits_data();
-                    int count = 0;
-                    if (Helper.donedata.size() != 0) {
-                        for (int i = 0; i < Helper.donedata.size(); i++) {
-                            String getdate = Helper.donedata.get(i)[1];
-                            String gethabit = Helper.donedata.get(i)[2];
-                            if ((Helper.habitsdata.get(position)[2].equals(gethabit)) && (getdate.equals(df.format(c)))) {
-                                Toast toast = Toast.makeText(con, "    Already Added    ", Toast.LENGTH_SHORT);
-                                View v = toast.getView();
-                                v.setBackground(con.getResources().getDrawable(R.drawable.roundbutton));
-                                toast.setGravity(Gravity.CENTER, 0, 0);
-                                toast.show();
-                                count++;
-                            }
-
-                        }
-                        if (count == 0) {
-                            Log.d("id", "" + Helper.donedata.size());
-                            db.insert_done_data(Helper.donedata.size(), df.format(c), Helper.habitsdata.get(position)[2],
-                                    Helper.habitsdata.get(position)[3], catagoryselected);
-                            Toast toast = Toast.makeText(con, "    Added To Done    ", Toast.LENGTH_SHORT);
-                            View v = toast.getView();
-                            v.setBackground(con.getResources().getDrawable(R.drawable.roundbutton));
-                            toast.setGravity(Gravity.CENTER, 0, 0);
-                            toast.show();
-                        }
-                    } else {
-                        Log.d("id", "" + Helper.donedata.size());
-                        db.insert_done_data(Helper.donedata.size(), df.format(c), Helper.habitsdata.get(position)[2],
-                                Helper.habitsdata.get(position)[3], catagoryselected);
-                        Toast toast = Toast.makeText(con, "    Added To Done    ", Toast.LENGTH_SHORT);
-                        View v = toast.getView();
-                        v.setBackground(con.getResources().getDrawable(R.drawable.roundbutton));
-                        toast.setGravity(Gravity.CENTER, 0, 0);
-                        toast.show();
-                    }
-                }
-            }
-        });
-    }
-
-    @Override
-    public int getItemCount() {
-        return donotTask.size();
-    }
-
-    public class RecyclerViewHolder extends RecyclerView.ViewHolder {
-        Button btn1, btn2;
-        TextView task;
-        TextView catagoryoftask;
-
-        public RecyclerViewHolder(@NonNull View itemView) {
-            super(itemView);
-            btn1 = itemView.findViewById(R.id.addToAvoided);
-            btn2 = itemView.findViewById(R.id.addToDone);
-            task = itemView.findViewById(R.id.task);
-            catagoryoftask = itemView.findViewById(R.id.catagoryoftask);
-            btn1.setBackgroundResource(R.drawable.ic_avoided);
-            btn2.setBackgroundResource(R.drawable.ic_done);
-        }
-    }
-}
+package rocks.poopjournal.todont.Adapters;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.database.sqlite.SQLiteException;
+import android.graphics.Color;
+import android.os.Build;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Adapter;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.RelativeLayout;
+import android.widget.Spinner;
+import android.widget.SpinnerAdapter;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+import rocks.poopjournal.todont.Db_Controller;
+import rocks.poopjournal.todont.Fragments.HabitsFragment;
+import rocks.poopjournal.todont.Fragments.HabitsLogFragment;
+import rocks.poopjournal.todont.Helper;
+import rocks.poopjournal.todont.MainActivity;
+import rocks.poopjournal.todont.R;
+
+
+public class HabitsAdapter extends RecyclerView.Adapter<HabitsAdapter.RecyclerViewHolder> {
+    private ArrayList<String> donotTask = new ArrayList<>();
+    private ArrayList<String> donotCatagory = new ArrayList<>();
+    HabitsFragment ft;
+    Context con;
+    Date c = Calendar.getInstance().getTime();
+    String[] catagories;
+    String catagoryselected;
+    Db_Controller db;
+    final SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
+    String formattedDate = df.format(c);
+
+    public HabitsAdapter(Context con, HabitsFragment ft, Db_Controller db, ArrayList<String> donotTask, ArrayList<String> donotCatagory) {
+        this.donotTask = donotTask;
+        this.donotCatagory = donotCatagory;
+        this.con = con;
+        this.ft = ft;
+        this.db = db;
+
+    }
+
+    @NonNull
+    @Override
+    public HabitsAdapter.RecyclerViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int viewType) {
+        LayoutInflater inflater = LayoutInflater.from(viewGroup.getContext());
+        View view = inflater.inflate(R.layout.recyclerview_layout_habits, viewGroup, false);
+        return new RecyclerViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull final HabitsAdapter.RecyclerViewHolder holder, final int position) {
+        String dTask = donotTask.get(position);
+        String dCatagory = donotCatagory.get(position);
+        holder.task.setText(dTask);
+        holder.catagoryoftask.setText(dCatagory);
+        holder.task.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(con,
+                        R.style.BottomSheetDialogTheme);
+                final View bottomsheetview = LayoutInflater.from(con.getApplicationContext()).
+                        inflate(R.layout.update_layout_bottom_sheet,
+                                (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
+                final Spinner spinner = bottomsheetview.findViewById(R.id.updatespinner);
+                Button saveTaskButton = bottomsheetview.findViewById(R.id.updateTaskButton);
+                final EditText habit = bottomsheetview.findViewById(R.id.updatehabit);
+                final EditText detail = bottomsheetview.findViewById(R.id.updatedetail);
+                TextView txt = bottomsheetview.findViewById(R.id.txt);
+                if (Helper.labels_array.size() == 0) {
+                    txt.setVisibility(View.VISIBLE);
+                    spinner.setVisibility(View.INVISIBLE);
+                } else {
+                    txt.setVisibility(View.INVISIBLE);
+                    spinner.setVisibility(View.VISIBLE);
+                }
+                habit.setText("" + Helper.habitsdata.get(position)[2]);
+                detail.setText("" + Helper.habitsdata.get(position)[3]);
+                final Adapter adapter = new ArrayAdapter<String>(con, android.R.layout.simple_list_item_1,
+                        Helper.labels_array) {
+                    @Override
+                    public boolean isEnabled(int position) {
+                        if (position == 0) {
+                            return false;
+                        } else {
+                            return true;
+                        }
+                    }
+
+                };
+                spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+                    @Override
+                    public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+                        catagoryselected = adapterView.getItemAtPosition(i).toString();
+                        TextView selectedText = (TextView) adapterView.getChildAt(i);
+                        if (selectedText != null) {
+                            selectedText.setTextColor(ContextCompat.getColor(con, R.color.g2));
+                        }
+                    }
+
+                    @Override
+                    public void onNothingSelected(AdapterView<?> adapterView) {
+
+                    }
+                });
+                saveTaskButton.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        String formattedDate = df.format(c);
+                        try {
+
+                        } catch (SQLiteException e) {
+                        }
+                        String str=habit.getText().toString();
+                        if(str.contains("'")){
+                            str=str.replace("'","geodhola");
+                            Log.d("kuttistring",""+str);
+                        }
+                        db.update_habitsdata(position, formattedDate,str
+                                , detail.getText().toString(), catagoryselected);
+                        db.show_habits_data();
+                        Intent intent = new Intent(con, MainActivity.class);
+                        con.startActivity(intent);
+                        ((Activity) con).overridePendingTransition(0, 0);
+                        bottomSheetDialog.dismiss();
+                    }
+
+                });
+
+                spinner.setAdapter((SpinnerAdapter) adapter);
+                bottomSheetDialog.setContentView(bottomsheetview);
+                bottomSheetDialog.show();
+            }
+        });
+        holder.btn1.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Helper.isTodaySelected == true) {
+                    db.show_data();
+                    db.show_habits_data();
+                    Log.d("asize", "" + Helper.data.size());
+                    int count = 0;
+                    if (Helper.data.size() != 0) {
+                        for (int i = 0; i < Helper.data.size(); i++) {
+                            String getdate = Helper.data.get(i)[1];
+                            String gethabit = Helper.data.get(i)[2];
+                            if ((Helper.habitsdata.get(position)[2].equals(gethabit)) && (getdate.equals(df.format(c)))) {
+                                Toast.makeText(con, "    Already Added    ", Toast.LENGTH_SHORT).show();
+                                count++;
+                            }
+
+                        }
+                        if (count == 0) {
+                            db.insert_data(Helper.data.size(), df.format(c), Helper.habitsdata.get(position)[2],
+                                    Helper.habitsdata.get(position)[3], catagoryselected);
+                            Toast.makeText(con, "    Added To Avoided    ", Toast.LENGTH_SHORT).show();
+                        }
+                    } else {
+                        db.insert_data(Helper.data.size(), df.format(c), Helper.habitsdata.get(position)[2],
+                                Helper.habitsdata.get(position)[3], catagoryselected);
+                        Toast.makeText(con, "    Added To Avoided    ", Toast.LENGTH_SHORT).show();
+                    }
+                }
+            }
+        });
+        holder.btn2.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Helper.isTodaySelected == true) {
+                    db.show_done_data();
+                    db.show_habits_data();
+                    int count = 0;
+                    if (Helper.donedata.size() != 0) {
+                        for (int i = 0; i < Helper.donedata.size(); i++) {
+                            String getdate = Helper.donedata.get(i)[1];
+                            String gethabit = Helper.donedata.get(i)[2];
+                            if ((Helper.habitsdata.get(position)[2].equals(gethabit)) && (getdate.equals(df.format(c)))) {
+                                Toast.makeText(con, "    Already Added    ", Toast.LENGTH_SHORT).show();
+
+                                count++;
+                            }
+
+                        }
+                        if (count == 0) {
+                            Log.d("id", "" + Helper.donedata.size());
+                            db.insert_done_data(Helper.donedata.size(), df.format(c), Helper.habitsdata.get(position)[2],
+                                    Helper.habitsdata.get(position)[3], catagoryselected);
+                            Toast.makeText(con, "    Added To Done    ", Toast.LENGTH_SHORT).show();
+                        }
+                    } else {
+                        Log.d("id", "" + Helper.donedata.size());
+                        db.insert_done_data(Helper.donedata.size(), df.format(c), Helper.habitsdata.get(position)[2],
+                                Helper.habitsdata.get(position)[3], catagoryselected);
+                        Toast.makeText(con, "    Added To Done    ", Toast.LENGTH_SHORT).show();
+                    }
+                }
+            }
+        });
+    }
+
+    @Override
+    public int getItemCount() {
+        return donotTask.size();
+    }
+
+    public class RecyclerViewHolder extends RecyclerView.ViewHolder {
+        Button btn1, btn2;
+        TextView task;
+        TextView catagoryoftask;
+
+        public RecyclerViewHolder(@NonNull View itemView) {
+            super(itemView);
+            btn1 = itemView.findViewById(R.id.addToAvoided);
+            btn2 = itemView.findViewById(R.id.addToDone);
+            task = itemView.findViewById(R.id.task);
+            catagoryoftask = itemView.findViewById(R.id.catagoryoftask);
+            btn1.setBackgroundResource(R.drawable.ic_avoided);
+            btn2.setBackgroundResource(R.drawable.ic_done);
+        }
+    }
+}
diff --git a/app/src/main/java/rocks/poopjournal/todont/Adapters/HabitsLogAdapter.java b/app/src/main/java/rocks/poopjournal/todont/Adapters/HabitsLogAdapter.java
index 94155712..d6b474fb 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Adapters/HabitsLogAdapter.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Adapters/HabitsLogAdapter.java
@@ -1,170 +1,170 @@
-package rocks.poopjournal.todont.Adapters;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.database.sqlite.SQLiteException;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Adapter;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.RelativeLayout;
-import android.widget.Spinner;
-import android.widget.SpinnerAdapter;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.bottomsheet.BottomSheetDialog;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-
-import rocks.poopjournal.todont.Db_Controller;
-import rocks.poopjournal.todont.Fragments.HabitsLogFragment;
-import rocks.poopjournal.todont.Helper;
-import rocks.poopjournal.todont.MainActivity;
-import rocks.poopjournal.todont.R;
-
-
-public class HabitsLogAdapter extends RecyclerView.Adapter<HabitsLogAdapter.RecyclerViewHolder> {
-    private ArrayList<String> donotTask = new ArrayList<>();
-    private ArrayList<String> donotCatagory = new ArrayList<>();
-    HabitsLogFragment ft;
-    Context con;
-    Date c = Calendar.getInstance().getTime();
-    String[] catagories;
-    String catagoryselected;
-    Db_Controller db;
-    final SimpleDateFormat df = new SimpleDateFormat("dd-MMM-yyyy", Locale.getDefault());
-    String formattedDate = df.format(c);
-
-    public HabitsLogAdapter(Context con, HabitsLogFragment ft, Db_Controller db, ArrayList<String> donotTask, ArrayList<String> donotCatagory) {
-        this.donotTask = donotTask;
-        this.donotCatagory = donotCatagory;
-        this.con = con;
-        this.ft = ft;
-        this.db = db;
-
-    }
-
-    @NonNull
-    @Override
-    public HabitsLogAdapter.RecyclerViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int viewType) {
-        LayoutInflater inflater = LayoutInflater.from(viewGroup.getContext());
-        View view = inflater.inflate(R.layout.recyclerview_layout_log_habits, viewGroup, false);
-        return new RecyclerViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull final HabitsLogAdapter.RecyclerViewHolder holder, final int position) {
-        String dTask = donotTask.get(position);
-        String dCatagory = donotCatagory.get(position);
-        Log.d("dCat",""+dCatagory);
-        holder.task.setText(dTask);
-        holder.catagoryoftask.setText(dCatagory);
-        holder.task.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(con,
-                        R.style.BottomSheetDialogTheme);
-                final View bottomsheetview = LayoutInflater.from(con.getApplicationContext()).
-                        inflate(R.layout.update_layout_bottom_sheet,
-                                (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
-                final Spinner spinner = bottomsheetview.findViewById(R.id.updatespinner);
-                Button saveTaskButton = bottomsheetview.findViewById(R.id.updateTaskButton);
-                final EditText habit = bottomsheetview.findViewById(R.id.updatehabit);
-                final EditText detail = bottomsheetview.findViewById(R.id.updatedetail);
-                TextView txt = bottomsheetview.findViewById(R.id.txt);
-                if (Helper.labels_array.size() == 0) {
-                    txt.setVisibility(View.VISIBLE);
-                    spinner.setVisibility(View.INVISIBLE);
-                } else {
-                    txt.setVisibility(View.INVISIBLE);
-                    spinner.setVisibility(View.VISIBLE);
-                }
-                habit.setText("" + Helper.habitsdata.get(position)[2]);
-                detail.setText("" + Helper.habitsdata.get(position)[3]);
-                final Adapter adapter = new ArrayAdapter<String>(con, android.R.layout.simple_list_item_1,
-                        Helper.labels_array) {
-                    @Override
-                    public boolean isEnabled(int position) {
-                        if (position == 0) {
-                            return false;
-                        } else {
-                            return true;
-                        }
-                    }
-
-                };
-                spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-                    @Override
-                    public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
-                        catagoryselected = adapterView.getItemAtPosition(i).toString();
-                        TextView selectedText = (TextView) adapterView.getChildAt(i);
-                        if (selectedText != null) {
-                            selectedText.setTextColor(ContextCompat.getColor(con, R.color.g2));
-                        }
-                    }
-
-                    @Override
-                    public void onNothingSelected(AdapterView<?> adapterView) {
-
-                    }
-                });
-                saveTaskButton.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        String formattedDate = df.format(c);
-                        try {
-
-                        } catch (SQLiteException e) {
-                        }
-                        db.update_habitsdata(position, formattedDate, habit.getText().toString()
-                                , detail.getText().toString(), catagoryselected);
-                        db.show_habits_data();
-                        Intent intent = new Intent(con, MainActivity.class);
-                        con.startActivity(intent);
-                        ((Activity) con).overridePendingTransition(0, 0);
-                        bottomSheetDialog.dismiss();
-                    }
-
-                });
-
-                spinner.setAdapter((SpinnerAdapter) adapter);
-                bottomSheetDialog.setContentView(bottomsheetview);
-                bottomSheetDialog.show();
-            }
-        });
-
-    }
-
-    @Override
-    public int getItemCount() {
-        return donotTask.size();
-    }
-
-    public class RecyclerViewHolder extends RecyclerView.ViewHolder {
-        TextView task;
-        TextView catagoryoftask;
-        Button btn;
-
-        public RecyclerViewHolder(@NonNull View itemView) {
-            super(itemView);
-            task = itemView.findViewById(R.id.task);
-            catagoryoftask = itemView.findViewById(R.id.catagoryoftask);
-            btn = itemView.findViewById(R.id.habitsbutton);
-            btn.setBackgroundResource(R.drawable.ic_habitscircle);
-        }
-    }
-}
+package rocks.poopjournal.todont.Adapters;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.database.sqlite.SQLiteException;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Adapter;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.RelativeLayout;
+import android.widget.Spinner;
+import android.widget.SpinnerAdapter;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+import rocks.poopjournal.todont.Db_Controller;
+import rocks.poopjournal.todont.Fragments.HabitsLogFragment;
+import rocks.poopjournal.todont.Helper;
+import rocks.poopjournal.todont.MainActivity;
+import rocks.poopjournal.todont.R;
+
+
+public class HabitsLogAdapter extends RecyclerView.Adapter<HabitsLogAdapter.RecyclerViewHolder> {
+    private ArrayList<String> donotTask = new ArrayList<>();
+    private ArrayList<String> donotCatagory = new ArrayList<>();
+    HabitsLogFragment ft;
+    Context con;
+    Date c = Calendar.getInstance().getTime();
+    String[] catagories;
+    String catagoryselected;
+    Db_Controller db;
+    final SimpleDateFormat df = new SimpleDateFormat("dd-MMM-yyyy", Locale.getDefault());
+    String formattedDate = df.format(c);
+
+    public HabitsLogAdapter(Context con, HabitsLogFragment ft, Db_Controller db, ArrayList<String> donotTask, ArrayList<String> donotCatagory) {
+        this.donotTask = donotTask;
+        this.donotCatagory = donotCatagory;
+        this.con = con;
+        this.ft = ft;
+        this.db = db;
+
+    }
+
+    @NonNull
+    @Override
+    public HabitsLogAdapter.RecyclerViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int viewType) {
+        LayoutInflater inflater = LayoutInflater.from(viewGroup.getContext());
+        View view = inflater.inflate(R.layout.recyclerview_layout_log_habits, viewGroup, false);
+        return new RecyclerViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull final HabitsLogAdapter.RecyclerViewHolder holder, final int position) {
+        String dTask = donotTask.get(position);
+        String dCatagory = donotCatagory.get(position);
+        Log.d("dCat",""+dCatagory);
+        holder.task.setText(dTask);
+        holder.catagoryoftask.setText(dCatagory);
+        holder.task.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(con,
+                        R.style.BottomSheetDialogTheme);
+                final View bottomsheetview = LayoutInflater.from(con.getApplicationContext()).
+                        inflate(R.layout.update_layout_bottom_sheet,
+                                (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
+                final Spinner spinner = bottomsheetview.findViewById(R.id.updatespinner);
+                Button saveTaskButton = bottomsheetview.findViewById(R.id.updateTaskButton);
+                final EditText habit = bottomsheetview.findViewById(R.id.updatehabit);
+                final EditText detail = bottomsheetview.findViewById(R.id.updatedetail);
+                TextView txt = bottomsheetview.findViewById(R.id.txt);
+                if (Helper.labels_array.size() == 0) {
+                    txt.setVisibility(View.VISIBLE);
+                    spinner.setVisibility(View.INVISIBLE);
+                } else {
+                    txt.setVisibility(View.INVISIBLE);
+                    spinner.setVisibility(View.VISIBLE);
+                }
+                habit.setText("" + Helper.habitsdata.get(position)[2]);
+                detail.setText("" + Helper.habitsdata.get(position)[3]);
+                final Adapter adapter = new ArrayAdapter<String>(con, android.R.layout.simple_list_item_1,
+                        Helper.labels_array) {
+                    @Override
+                    public boolean isEnabled(int position) {
+                        if (position == 0) {
+                            return false;
+                        } else {
+                            return true;
+                        }
+                    }
+
+                };
+                spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+                    @Override
+                    public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+                        catagoryselected = adapterView.getItemAtPosition(i).toString();
+                        TextView selectedText = (TextView) adapterView.getChildAt(i);
+                        if (selectedText != null) {
+                            selectedText.setTextColor(ContextCompat.getColor(con, R.color.g2));
+                        }
+                    }
+
+                    @Override
+                    public void onNothingSelected(AdapterView<?> adapterView) {
+
+                    }
+                });
+                saveTaskButton.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        String formattedDate = df.format(c);
+                        try {
+
+                        } catch (SQLiteException e) {
+                        }
+                        db.update_habitsdata(position, formattedDate, habit.getText().toString()
+                                , detail.getText().toString(), catagoryselected);
+                        db.show_habits_data();
+                        Intent intent = new Intent(con, MainActivity.class);
+                        con.startActivity(intent);
+                        ((Activity) con).overridePendingTransition(0, 0);
+                        bottomSheetDialog.dismiss();
+                    }
+
+                });
+
+                spinner.setAdapter((SpinnerAdapter) adapter);
+                bottomSheetDialog.setContentView(bottomsheetview);
+                bottomSheetDialog.show();
+            }
+        });
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return donotTask.size();
+    }
+
+    public class RecyclerViewHolder extends RecyclerView.ViewHolder {
+        TextView task;
+        TextView catagoryoftask;
+        Button btn;
+
+        public RecyclerViewHolder(@NonNull View itemView) {
+            super(itemView);
+            task = itemView.findViewById(R.id.task);
+            catagoryoftask = itemView.findViewById(R.id.catagoryoftask);
+            btn = itemView.findViewById(R.id.habitsbutton);
+            btn.setBackgroundResource(R.drawable.ic_habitscircle);
+        }
+    }
+}
diff --git a/app/src/main/java/rocks/poopjournal/todont/Db_Controller.java b/app/src/main/java/rocks/poopjournal/todont/Db_Controller.java
index e51d2f8c..07d04e75 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Db_Controller.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Db_Controller.java
@@ -1,452 +1,451 @@
-package rocks.poopjournal.todont;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.util.Log;
-
-import java.util.ArrayList;
-
-public class Db_Controller extends SQLiteOpenHelper {
-    public Db_Controller(Context context, String name, SQLiteDatabase.CursorFactory factory, int version) {
-        super(context, "e.db", factory, version);
-    }
-
-    @Override
-    public void onCreate(SQLiteDatabase db) {
-        //ID INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-        db.execSQL("CREATE TABLE HABITS(ID INTEGER,DATE TEXT,HABIT TEXT,DETAIL TEXT,CATAGORY TEXT);");
-        db.execSQL("CREATE TABLE AVOIDED(ID INTEGER,DATE TEXT,HABIT TEXT,DETAIL TEXT,CATAGORY TEXT);");
-        db.execSQL("CREATE TABLE DONE(ID INTEGER,DATE TEXT,HABIT TEXT,DETAIL TEXT,CATAGORY TEXT);");
-        db.execSQL("CREATE TABLE LABELS(LABEL TEXT);");
-        db.execSQL("CREATE TABLE CHECKNIGHTMODE(NIGHTMODE TEXT);");
-    }
-
-    @Override
-    public void onUpgrade(SQLiteDatabase db, int i, int i1) {
-        db.execSQL("DROP TABLE IF EXISTS AVOIDED;");
-        db.execSQL("DROP TABLE IF EXISTS HABITS;");
-        db.execSQL("DROP TABLE IF EXISTS DONE;");
-        db.execSQL("DROP TABLE IF EXISTS LABELS;");
-        db.execSQL("DROP TABLE IF EXISTS CHECKNIGHTMODE;");
-        onCreate(db);
-    }
-
-    public void insert_label(String label) {
-        Log.d("insert_label...", "" + label);
-        ContentValues con = new ContentValues();
-        con.put("LABEL", label);
-        this.getWritableDatabase().insertOrThrow("LABELS", "", con);
-
-    }
-    public void setNightMode(String a) {
-        ContentValues con = new ContentValues();
-        con.put("NIGHTMODE", a);
-        this.getWritableDatabase().insertOrThrow("CHECKNIGHTMODE", "", con);
-    }
-    public void getNightMode(){
-        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM CHECKNIGHTMODE", null);
-        while (cursor.moveToNext()){
-            Helper.isnightmodeon=cursor.getString(0);
-        }
-        Log.d("ttttt", " " +cursor.getCount());
-
-    }
-    public void update_nightmode(String a) {
-        this.getWritableDatabase().execSQL("UPDATE CHECKNIGHTMODE SET NIGHTMODE='" + a + "'");
-        Helper.isnightmodeon=a;
-    }
-
-    public void insert_data(int id, String date, String habit, String detail, String catagory) {
-        ContentValues con = new ContentValues();
-        con.put("ID", id);
-        con.put("DATE", date);
-        con.put("HABIT", habit);
-        con.put("DETAIL", detail);
-        con.put("CATAGORY", catagory);
-        this.getWritableDatabase().insertOrThrow("AVOIDED", "", con);
-
-    }
-
-    public void insert_habits(int id, String date, String habit, String detail, String catagory) {
-        ContentValues con = new ContentValues();
-        con.put("ID", id);
-        con.put("DATE", date);
-        con.put("HABIT", habit);
-        con.put("DETAIL", detail);
-        con.put("CATAGORY", catagory);
-        this.getWritableDatabase().insertOrThrow("HABITS", "", con);
-
-    }
-
-    public void insert_done_data(int id, String date, String habit, String detail, String catagory) {
-        ContentValues con = new ContentValues();
-        con.put("ID", id);
-        con.put("DATE", date);
-        con.put("HABIT", habit);
-        con.put("DETAIL", detail);
-        con.put("CATAGORY", catagory);
-        this.getWritableDatabase().insertOrThrow("DONE", "", con);
-    }
-
-    public void show_habits_data() {
-        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM HABITS", null);
-        Helper.habitsdata = new ArrayList<>();
-        while (cursor.moveToNext()) {
-            String[] temp = new String[5];
-            temp[0] = (cursor.getString(0));
-            temp[1] = (cursor.getString(1));
-            String str=(cursor.getString(2));
-            if(str.contains("geodhola")){
-                str=str.replace("geodhola","'");
-            }
-            temp[2] = str;
-            temp[3] = (cursor.getString(3));
-            temp[4] = (cursor.getString(4));
-            Helper.habitsdata.add(temp);
-        }
-
-    }
-
-    public void show_data() {
-
-        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM AVOIDED", null);
-        Helper.data = new ArrayList<>();
-
-        while (cursor.moveToNext()) {
-            String[] temp = new String[5];
-            temp[0] = (cursor.getString(0));
-            temp[1] = (cursor.getString(1));
-            temp[2] = (cursor.getString(2));
-            temp[3] = (cursor.getString(3));
-            temp[4] = (cursor.getString(4));
-
-            Helper.data.add(temp);
-        }
-
-    }
-
-    public void show_done_data() {
-
-        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM DONE", null);
-        Helper.donedata = new ArrayList<>();
-
-        while (cursor.moveToNext()) {
-            String[] temp = new String[5];
-            temp[0] = (cursor.getString(0));
-            temp[1] = (cursor.getString(1));
-            temp[2] = (cursor.getString(2));
-            temp[3] = (cursor.getString(3));
-            temp[4] = (cursor.getString(4));
-
-            Helper.donedata.add(temp);
-        }
-    }
-
-
-    public void show_labels() {
-        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM LABELS", null);
-        Helper.labels_array = new ArrayList<>();
-        while (cursor.moveToNext()) {
-            Helper.labels_array.add(cursor.getString(0));
-        }
-    }
-
-    public void update_habitsdata(int id, String date, String habit, String detail, String catagory) {
-
-        this.getWritableDatabase().execSQL("UPDATE HABITS SET DATE='" + date + "',HABIT='" + habit + "',DETAIL='" + detail + "',CATAGORY='" + catagory + "' WHERE ID='" + id + "'");
-
-    }
-
-    public void update_data(int id, String date, String habit, String detail, String catagory) {
-
-        this.getWritableDatabase().execSQL("UPDATE AVOIDED SET DATE='" + date + "',HABIT='" + habit + "',DETAIL='" + detail + "',CATAGORY='" + catagory + "' WHERE ID='" + id + "'");
-
-    }
-
-    public void update_done_data(int id, String date, String habit, String detail, String catagory) {
-
-        this.getWritableDatabase().execSQL("UPDATE DONE SET DATE='" + date + "',HABIT='" + habit + "',DETAIL='" + detail + "',CATAGORY='" + catagory + "' WHERE ID='" + id + "'");
-
-    }
-
-    public void delete_habits(int id) {
-        Log.d("dfadelete", "" + id);
-
-        String getHabitName="";
-        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM HABITS WHERE id ='"+id+"'", null);
-        if (cursor.moveToFirst()) {
-            getHabitName=(cursor.getString(2));
-        }
-        Log.d("dfaaaaaaaadelete", "hi"+getHabitName);
-        this.getWritableDatabase().delete("HABITS", "ID='" + id + "'", null);
-        this.getWritableDatabase().delete("AVOIDED", "HABIT='" + getHabitName + "'", null);
-        this.getWritableDatabase().delete("DONE", "HABIT='" + getHabitName+ "'", null);
-
-    }
-
-    public void delete_avoided(int id) {
-        Log.d("aaaadelete", "" + id);
-        this.getWritableDatabase().delete("AVOIDED", "ID='" + id + "'", null);
-
-    }
-
-    public void delete_done(int id) {
-        this.getWritableDatabase().delete("DONE", "ID='" + id + "'", null);
-
-    }
-
-    public void updateHabitsIdsAfterDeletion(int i) {
-        int j = i - 1;
-        this.getWritableDatabase().execSQL("UPDATE HABITS SET ID='" + j + "' WHERE ID='" + i + "'");
-
-
-    }
-
-    public void updateIdsAfterDeletion(int i) {
-        int j = i - 1;
-        Log.d("aaaaupdate", "" + i);
-        this.getWritableDatabase().execSQL("UPDATE AVOIDED SET ID='" + j + "' WHERE ID='" + i + "'");
-
-
-    }
-
-    public void updateDoneIdsAfterDeletion(int i) {
-        int j = i - 1;
-        this.getWritableDatabase().execSQL("UPDATE DONE SET ID='" + j + "' WHERE ID='" + i + "'");
-
-
-    }
-
-    public void delete_label(String label) {
-        this.getWritableDatabase().delete("LABELS", "LABEL='" + label + "'", null);
-
-    }
-
-    public void checkifAlreadyExists(String date) {
-        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM AVOIDED WHERE DATE='" + date + "'", null);
-    }
-
-    public void getDailyDoneRecord(String date) {
-        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM DONE WHERE DATE ='"+date+"'", null);
-        Helper.donelogdata = new ArrayList<>();
-
-        while (cursor.moveToNext()) {
-            String[] temp = new String[5];
-            temp[0] = (cursor.getString(0));
-            temp[1] = (cursor.getString(1));
-            temp[2] = (cursor.getString(2));
-            temp[3] = (cursor.getString(3));
-            temp[4] = (cursor.getString(4));
-
-            Helper.donelogdata.add(temp);
-        }
-    }
-    public void getDailyAvoidedRecord(String date) {
-        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM AVOIDED WHERE DATE ='"+date+"'", null);
-        Helper.avoidedlogdata = new ArrayList<>();
-
-        while (cursor.moveToNext()) {
-            String[] temp = new String[5];
-            temp[0] = (cursor.getString(0));
-            temp[1] = (cursor.getString(1));
-            temp[2] = (cursor.getString(2));
-            temp[3] = (cursor.getString(3));
-            temp[4] = (cursor.getString(4));
-
-            Helper.avoidedlogdata.add(temp);
-        }
-    }
-
-
-    public String getWeeklyAvoidedRecord(String date,String date2) {
-        Helper.avoidedweeklydata = new ArrayList<>();
-        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM AVOIDED WHERE DATE BETWEEN '"+date+"' AND '"+date2+"'", null);
-        while (cursor.moveToNext()) {
-            Helper.avoidedweeklydata.add(cursor.getString(2));
-        }
-        int mostFre=0,val=0;
-        for(int i=0;i<Helper.avoidedweeklydata.size();i++){
-                    int count=0;
-                    for(int j=i+1;j<Helper.avoidedweeklydata.size();j++){
-                        if((Helper.avoidedweeklydata.get(i)).equals(Helper.avoidedweeklydata.get(j))){
-                            count++;
-                            if(count>mostFre){
-                                mostFre=count;
-                                val=j;
-                            }
-                            Log.d("aaaCount: ",""+count+ " i:"+i+" j:"+j);
-                        }
-                    }
-                }
-        if(Helper.avoidedweeklydata.size()==0){
-            return "";
-        }
-        else{
-            return Helper.avoidedweeklydata.get(val);
-        }
-    }
-    public String getWeeklyDoneRecord(String date,String date2) {
-        Helper.doneweeklydata = new ArrayList<>();
-        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM DONE WHERE DATE BETWEEN '"+date+"' AND '"+date2+"'", null);
-        while (cursor.moveToNext()) {
-            Helper.doneweeklydata.add(cursor.getString(2));
-        }
-        int mostFre=0,val=0;
-        for(int i=0;i<Helper.doneweeklydata.size();i++){
-            int count=0;
-            for(int j=i+1;j<Helper.doneweeklydata.size();j++){
-                if((Helper.doneweeklydata.get(i)).equals(Helper.doneweeklydata.get(j))){
-                    count++;
-                    if(count>mostFre){
-                        mostFre=count;
-                        val=j;
-                    }
-                    Log.d("aaaCount: ",""+count+ " i:"+i+" j:"+j);
-                }
-            }
-        }
-        if(Helper.doneweeklydata.size()==0){
-            return "";
-        }
-        else{
-            return Helper.doneweeklydata.get(val);
-        }
-    }
-    public String getMonthlyAvoidedData(String date, String date2) {
-        Log.d("splitteddate444 ",""+date+" * "+date2);
-        Helper.avoidedmonthlydata = new ArrayList<>();
-        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM AVOIDED WHERE DATE BETWEEN '" + date + "' AND '" + date2 + "'", null);
-        while (cursor.moveToNext()) {
-            Log.d("date",""+cursor.getString(2));
-            Helper.avoidedmonthlydata.add(cursor.getString(2));
-        }
-        Log.d("split", "" + Helper.avoidedmonthlydata.size());
-
-        int mostFre = 0, val = 0;
-        for (int i = 0; i < Helper.avoidedmonthlydata.size(); i++) {
-            int count = 0;
-            for (int j = i + 1; j < Helper.avoidedmonthlydata.size(); j++) {
-                if ((Helper.avoidedmonthlydata.get(i)).equals(Helper.avoidedmonthlydata.get(j))) {
-                    count++;
-                    if (count > mostFre) {
-                        mostFre = count;
-                        val = j;
-                    }
-                    Log.d("aaaCount: ", "" + count + " i:" + i + " j:" + j);
-                }
-            }
-        }
-        Log.d("checkkrnaplz", "" + Helper.avoidedmonthlydata.size());
-        if (Helper.avoidedmonthlydata.size() == 0) {
-            return "";
-        } else {
-            return Helper.avoidedmonthlydata.get(val);
-        }
-    }
-    public String getMonthlyDoneData(String date, String date2) {
-        Log.d("splitteddate444 ",""+date+" * "+date2);
-        Helper.donemonthlydata = new ArrayList<>();
-        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM DONE WHERE DATE BETWEEN '" + date + "' AND '" + date2 + "'", null);
-        while (cursor.moveToNext()) {
-            Log.d("date",""+cursor.getString(2));
-            Helper.donemonthlydata.add(cursor.getString(2));
-        }
-        Log.d("split", "" + Helper.donemonthlydata.size());
-
-        int mostFre = 0, val = 0;
-        for (int i = 0; i < Helper.donemonthlydata.size(); i++) {
-            int count = 0;
-            for (int j = i + 1; j < Helper.donemonthlydata.size(); j++) {
-                if ((Helper.donemonthlydata.get(i)).equals(Helper.donemonthlydata.get(j))) {
-                    count++;
-                    if (count > mostFre) {
-                        mostFre = count;
-                        val = j;
-                    }
-                    Log.d("aaaCount: ", "" + count + " i:" + i + " j:" + j);
-                }
-            }
-        }
-        Log.d("checkkrnaplz", "" + Helper.donemonthlydata.size());
-        if (Helper.donemonthlydata.size() == 0) {
-            return "";
-        } else {
-            return Helper.donemonthlydata.get(val);
-        }
-    }
-
-    public String getYearlyAvoidedData(String date, String date2) {
-        Log.d("splitteddate444 ",""+date+" * "+date2);
-        Helper.avoidedyearlydata = new ArrayList<>();
-        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM AVOIDED WHERE DATE BETWEEN '" + date + "' AND '" + date2 + "'", null);
-        while (cursor.moveToNext()) {
-            Log.d("date",""+cursor.getString(2));
-            Helper.avoidedyearlydata.add(cursor.getString(2));
-        }
-        Log.d("split", "" + Helper.avoidedyearlydata.size());
-
-        int mostFre = 0, val = 0;
-        for (int i = 0; i < Helper.avoidedyearlydata.size(); i++) {
-            int count = 0;
-            for (int j = i + 1; j < Helper.avoidedyearlydata.size(); j++) {
-                if ((Helper.avoidedyearlydata.get(i)).equals(Helper.avoidedyearlydata.get(j))) {
-                    count++;
-                    if (count > mostFre) {
-                        mostFre = count;
-                        val = j;
-                    }
-                    Log.d("aaaCount: ", "" + count + " i:" + i + " j:" + j);
-                }
-            }
-        }
-        Log.d("checkkrnaplz", "" + Helper.avoidedyearlydata.size());
-        if (Helper.avoidedyearlydata.size() == 0) {
-            return "";
-        } else {
-            return Helper.avoidedyearlydata.get(val);
-        }
-    }
-
-    public String getYearlyDoneData(String date, String date2) {
-        Log.d("splitteddate444 ",""+date+" * "+date2);
-        Helper.doneyearlydata = new ArrayList<>();
-        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM DONE WHERE DATE BETWEEN '" + date + "' AND '" + date2 + "'", null);
-        while (cursor.moveToNext()) {
-            Log.d("date",""+cursor.getString(2));
-            Helper.doneyearlydata.add(cursor.getString(2));
-        }
-        Log.d("split", "" + Helper.doneyearlydata.size());
-
-        int mostFre = 0, val = 0;
-        for (int i = 0; i < Helper.doneyearlydata.size(); i++) {
-            int count = 0;
-            for (int j = i + 1; j < Helper.doneyearlydata.size(); j++) {
-                if ((Helper.doneyearlydata.get(i)).equals(Helper.doneyearlydata.get(j))) {
-                    count++;
-                    if (count > mostFre) {
-                        mostFre = count;
-                        val = j;
-                    }
-                    Log.d("aaaCount: ", "" + count + " i:" + i + " j:" + j);
-                }
-            }
-        }
-        Log.d("checkkrnaplz", "" + Helper.doneyearlydata.size());
-        if (Helper.doneyearlydata.size() == 0) {
-            return "";
-        } else {
-            return Helper.doneyearlydata.get(val);
-        }
-    }
-
-    public int countLabels(String catagory){
-        int count=0;
-        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM HABITS WHERE CATAGORY='" + catagory + "'", null);
-        count= cursor.getCount();
-        cursor.close();
-        return  count;
-    }
+package rocks.poopjournal.todont;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
+
+import java.util.ArrayList;
+
+public class Db_Controller extends SQLiteOpenHelper {
+    public Db_Controller(Context context, String name, SQLiteDatabase.CursorFactory factory, int version) {
+        super(context, "e.db", factory, version);
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        //ID INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+        db.execSQL("CREATE TABLE HABITS(ID INTEGER,DATE TEXT,HABIT TEXT,DETAIL TEXT,CATAGORY TEXT);");
+        db.execSQL("CREATE TABLE AVOIDED(ID INTEGER,DATE TEXT,HABIT TEXT,DETAIL TEXT,CATAGORY TEXT);");
+        db.execSQL("CREATE TABLE DONE(ID INTEGER,DATE TEXT,HABIT TEXT,DETAIL TEXT,CATAGORY TEXT);");
+        db.execSQL("CREATE TABLE LABELS(LABEL TEXT);");
+        db.execSQL("CREATE TABLE CHECKNIGHTMODE(NIGHTMODE TEXT);");
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int i, int i1) {
+        db.execSQL("DROP TABLE IF EXISTS AVOIDED;");
+        db.execSQL("DROP TABLE IF EXISTS HABITS;");
+        db.execSQL("DROP TABLE IF EXISTS DONE;");
+        db.execSQL("DROP TABLE IF EXISTS LABELS;");
+        db.execSQL("DROP TABLE IF EXISTS CHECKNIGHTMODE;");
+        onCreate(db);
+    }
+
+    public void insert_label(String label) {
+        Log.d("insert_label...", "" + label);
+        ContentValues con = new ContentValues();
+        con.put("LABEL", label);
+        this.getWritableDatabase().insertOrThrow("LABELS", "", con);
+
+    }
+    public void setNightMode(String a) {
+        ContentValues con = new ContentValues();
+        con.put("NIGHTMODE", a);
+        this.getWritableDatabase().insertOrThrow("CHECKNIGHTMODE", "", con);
+    }
+    public void getNightMode(){
+        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM CHECKNIGHTMODE", null);
+        while (cursor.moveToNext()){
+            Helper.isnightmodeon=cursor.getString(0);
+        }
+
+    }
+    public void update_nightmode(String a) {
+        this.getWritableDatabase().execSQL("UPDATE CHECKNIGHTMODE SET NIGHTMODE='" + a + "'");
+        Helper.isnightmodeon=a;
+    }
+
+    public void insert_data(int id, String date, String habit, String detail, String catagory) {
+        ContentValues con = new ContentValues();
+        con.put("ID", id);
+        con.put("DATE", date);
+        con.put("HABIT", habit);
+        con.put("DETAIL", detail);
+        con.put("CATAGORY", catagory);
+        this.getWritableDatabase().insertOrThrow("AVOIDED", "", con);
+
+    }
+
+    public void insert_habits(int id, String date, String habit, String detail, String catagory) {
+        ContentValues con = new ContentValues();
+        con.put("ID", id);
+        con.put("DATE", date);
+        con.put("HABIT", habit);
+        con.put("DETAIL", detail);
+        con.put("CATAGORY", catagory);
+        this.getWritableDatabase().insertOrThrow("HABITS", "", con);
+
+    }
+
+    public void insert_done_data(int id, String date, String habit, String detail, String catagory) {
+        ContentValues con = new ContentValues();
+        con.put("ID", id);
+        con.put("DATE", date);
+        con.put("HABIT", habit);
+        con.put("DETAIL", detail);
+        con.put("CATAGORY", catagory);
+        this.getWritableDatabase().insertOrThrow("DONE", "", con);
+    }
+
+    public void show_habits_data() {
+        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM HABITS", null);
+        Helper.habitsdata = new ArrayList<>();
+        while (cursor.moveToNext()) {
+            String[] temp = new String[5];
+            temp[0] = (cursor.getString(0));
+            temp[1] = (cursor.getString(1));
+            String str=(cursor.getString(2));
+            if(str.contains("geodhola")){
+                str=str.replace("geodhola","'");
+            }
+            temp[2] = str;
+            temp[3] = (cursor.getString(3));
+            temp[4] = (cursor.getString(4));
+            Helper.habitsdata.add(temp);
+        }
+
+    }
+
+    public void show_data() {
+
+        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM AVOIDED", null);
+        Helper.data = new ArrayList<>();
+
+        while (cursor.moveToNext()) {
+            String[] temp = new String[5];
+            temp[0] = (cursor.getString(0));
+            temp[1] = (cursor.getString(1));
+            temp[2] = (cursor.getString(2));
+            temp[3] = (cursor.getString(3));
+            temp[4] = (cursor.getString(4));
+
+            Helper.data.add(temp);
+        }
+
+    }
+
+    public void show_done_data() {
+
+        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM DONE", null);
+        Helper.donedata = new ArrayList<>();
+
+        while (cursor.moveToNext()) {
+            String[] temp = new String[5];
+            temp[0] = (cursor.getString(0));
+            temp[1] = (cursor.getString(1));
+            temp[2] = (cursor.getString(2));
+            temp[3] = (cursor.getString(3));
+            temp[4] = (cursor.getString(4));
+
+            Helper.donedata.add(temp);
+        }
+    }
+
+
+    public void show_labels() {
+        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM LABELS", null);
+        Helper.labels_array = new ArrayList<>();
+        while (cursor.moveToNext()) {
+            Helper.labels_array.add(cursor.getString(0));
+        }
+    }
+
+    public void update_habitsdata(int id, String date, String habit, String detail, String catagory) {
+
+        this.getWritableDatabase().execSQL("UPDATE HABITS SET DATE='" + date + "',HABIT='" + habit + "',DETAIL='" + detail + "',CATAGORY='" + catagory + "' WHERE ID='" + id + "'");
+
+    }
+
+    public void update_data(int id, String date, String habit, String detail, String catagory) {
+
+        this.getWritableDatabase().execSQL("UPDATE AVOIDED SET DATE='" + date + "',HABIT='" + habit + "',DETAIL='" + detail + "',CATAGORY='" + catagory + "' WHERE ID='" + id + "'");
+
+    }
+
+    public void update_done_data(int id, String date, String habit, String detail, String catagory) {
+
+        this.getWritableDatabase().execSQL("UPDATE DONE SET DATE='" + date + "',HABIT='" + habit + "',DETAIL='" + detail + "',CATAGORY='" + catagory + "' WHERE ID='" + id + "'");
+
+    }
+
+    public void delete_habits(int id) {
+        Log.d("dfadelete", "" + id);
+
+        String getHabitName="";
+        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM HABITS WHERE id ='"+id+"'", null);
+        if (cursor.moveToFirst()) {
+            getHabitName=(cursor.getString(2));
+        }
+        Log.d("dfaaaaaaaadelete", "hi"+getHabitName);
+        this.getWritableDatabase().delete("HABITS", "ID='" + id + "'", null);
+        this.getWritableDatabase().delete("AVOIDED", "HABIT='" + getHabitName + "'", null);
+        this.getWritableDatabase().delete("DONE", "HABIT='" + getHabitName+ "'", null);
+
+    }
+
+    public void delete_avoided(int id) {
+        Log.d("aaaadelete", "" + id);
+        this.getWritableDatabase().delete("AVOIDED", "ID='" + id + "'", null);
+
+    }
+
+    public void delete_done(int id) {
+        this.getWritableDatabase().delete("DONE", "ID='" + id + "'", null);
+
+    }
+
+    public void updateHabitsIdsAfterDeletion(int i) {
+        int j = i - 1;
+        this.getWritableDatabase().execSQL("UPDATE HABITS SET ID='" + j + "' WHERE ID='" + i + "'");
+
+
+    }
+
+    public void updateIdsAfterDeletion(int i) {
+        int j = i - 1;
+        Log.d("aaaaupdate", "" + i);
+        this.getWritableDatabase().execSQL("UPDATE AVOIDED SET ID='" + j + "' WHERE ID='" + i + "'");
+
+
+    }
+
+    public void updateDoneIdsAfterDeletion(int i) {
+        int j = i - 1;
+        this.getWritableDatabase().execSQL("UPDATE DONE SET ID='" + j + "' WHERE ID='" + i + "'");
+
+
+    }
+
+    public void delete_label(String label) {
+        this.getWritableDatabase().delete("LABELS", "LABEL='" + label + "'", null);
+
+    }
+
+    public void checkifAlreadyExists(String date) {
+        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM AVOIDED WHERE DATE='" + date + "'", null);
+    }
+
+    public void getDailyDoneRecord(String date) {
+        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM DONE WHERE DATE ='"+date+"'", null);
+        Helper.donelogdata = new ArrayList<>();
+
+        while (cursor.moveToNext()) {
+            String[] temp = new String[5];
+            temp[0] = (cursor.getString(0));
+            temp[1] = (cursor.getString(1));
+            temp[2] = (cursor.getString(2));
+            temp[3] = (cursor.getString(3));
+            temp[4] = (cursor.getString(4));
+
+            Helper.donelogdata.add(temp);
+        }
+    }
+    public void getDailyAvoidedRecord(String date) {
+        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM AVOIDED WHERE DATE ='"+date+"'", null);
+        Helper.avoidedlogdata = new ArrayList<>();
+
+        while (cursor.moveToNext()) {
+            String[] temp = new String[5];
+            temp[0] = (cursor.getString(0));
+            temp[1] = (cursor.getString(1));
+            temp[2] = (cursor.getString(2));
+            temp[3] = (cursor.getString(3));
+            temp[4] = (cursor.getString(4));
+
+            Helper.avoidedlogdata.add(temp);
+        }
+    }
+
+
+    public String getWeeklyAvoidedRecord(String date,String date2) {
+        Helper.avoidedweeklydata = new ArrayList<>();
+        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM AVOIDED WHERE DATE BETWEEN '"+date+"' AND '"+date2+"'", null);
+        while (cursor.moveToNext()) {
+            Helper.avoidedweeklydata.add(cursor.getString(2));
+        }
+        int mostFre=0,val=0;
+        for(int i=0;i<Helper.avoidedweeklydata.size();i++){
+                    int count=0;
+                    for(int j=i+1;j<Helper.avoidedweeklydata.size();j++){
+                        if((Helper.avoidedweeklydata.get(i)).equals(Helper.avoidedweeklydata.get(j))){
+                            count++;
+                            if(count>mostFre){
+                                mostFre=count;
+                                val=j;
+                            }
+                            Log.d("aaaCount: ",""+count+ " i:"+i+" j:"+j);
+                        }
+                    }
+                }
+        if(Helper.avoidedweeklydata.size()==0){
+            return "";
+        }
+        else{
+            return Helper.avoidedweeklydata.get(val);
+        }
+    }
+    public String getWeeklyDoneRecord(String date,String date2) {
+        Helper.doneweeklydata = new ArrayList<>();
+        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM DONE WHERE DATE BETWEEN '"+date+"' AND '"+date2+"'", null);
+        while (cursor.moveToNext()) {
+            Helper.doneweeklydata.add(cursor.getString(2));
+        }
+        int mostFre=0,val=0;
+        for(int i=0;i<Helper.doneweeklydata.size();i++){
+            int count=0;
+            for(int j=i+1;j<Helper.doneweeklydata.size();j++){
+                if((Helper.doneweeklydata.get(i)).equals(Helper.doneweeklydata.get(j))){
+                    count++;
+                    if(count>mostFre){
+                        mostFre=count;
+                        val=j;
+                    }
+                    Log.d("aaaCount: ",""+count+ " i:"+i+" j:"+j);
+                }
+            }
+        }
+        if(Helper.doneweeklydata.size()==0){
+            return "";
+        }
+        else{
+            return Helper.doneweeklydata.get(val);
+        }
+    }
+    public String getMonthlyAvoidedData(String date, String date2) {
+        Log.d("splitteddate444 ",""+date+" * "+date2);
+        Helper.avoidedmonthlydata = new ArrayList<>();
+        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM AVOIDED WHERE DATE BETWEEN '" + date + "' AND '" + date2 + "'", null);
+        while (cursor.moveToNext()) {
+            Log.d("date",""+cursor.getString(2));
+            Helper.avoidedmonthlydata.add(cursor.getString(2));
+        }
+        Log.d("split", "" + Helper.avoidedmonthlydata.size());
+
+        int mostFre = 0, val = 0;
+        for (int i = 0; i < Helper.avoidedmonthlydata.size(); i++) {
+            int count = 0;
+            for (int j = i + 1; j < Helper.avoidedmonthlydata.size(); j++) {
+                if ((Helper.avoidedmonthlydata.get(i)).equals(Helper.avoidedmonthlydata.get(j))) {
+                    count++;
+                    if (count > mostFre) {
+                        mostFre = count;
+                        val = j;
+                    }
+                    Log.d("aaaCount: ", "" + count + " i:" + i + " j:" + j);
+                }
+            }
+        }
+        Log.d("checkkrnaplz", "" + Helper.avoidedmonthlydata.size());
+        if (Helper.avoidedmonthlydata.size() == 0) {
+            return "";
+        } else {
+            return Helper.avoidedmonthlydata.get(val);
+        }
+    }
+    public String getMonthlyDoneData(String date, String date2) {
+        Log.d("splitteddate444 ",""+date+" * "+date2);
+        Helper.donemonthlydata = new ArrayList<>();
+        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM DONE WHERE DATE BETWEEN '" + date + "' AND '" + date2 + "'", null);
+        while (cursor.moveToNext()) {
+            Log.d("date",""+cursor.getString(2));
+            Helper.donemonthlydata.add(cursor.getString(2));
+        }
+        Log.d("split", "" + Helper.donemonthlydata.size());
+
+        int mostFre = 0, val = 0;
+        for (int i = 0; i < Helper.donemonthlydata.size(); i++) {
+            int count = 0;
+            for (int j = i + 1; j < Helper.donemonthlydata.size(); j++) {
+                if ((Helper.donemonthlydata.get(i)).equals(Helper.donemonthlydata.get(j))) {
+                    count++;
+                    if (count > mostFre) {
+                        mostFre = count;
+                        val = j;
+                    }
+                    Log.d("aaaCount: ", "" + count + " i:" + i + " j:" + j);
+                }
+            }
+        }
+        Log.d("checkkrnaplz", "" + Helper.donemonthlydata.size());
+        if (Helper.donemonthlydata.size() == 0) {
+            return "";
+        } else {
+            return Helper.donemonthlydata.get(val);
+        }
+    }
+
+    public String getYearlyAvoidedData(String date, String date2) {
+        Log.d("splitteddate444 ",""+date+" * "+date2);
+        Helper.avoidedyearlydata = new ArrayList<>();
+        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM AVOIDED WHERE DATE BETWEEN '" + date + "' AND '" + date2 + "'", null);
+        while (cursor.moveToNext()) {
+            Log.d("date",""+cursor.getString(2));
+            Helper.avoidedyearlydata.add(cursor.getString(2));
+        }
+        Log.d("split", "" + Helper.avoidedyearlydata.size());
+
+        int mostFre = 0, val = 0;
+        for (int i = 0; i < Helper.avoidedyearlydata.size(); i++) {
+            int count = 0;
+            for (int j = i + 1; j < Helper.avoidedyearlydata.size(); j++) {
+                if ((Helper.avoidedyearlydata.get(i)).equals(Helper.avoidedyearlydata.get(j))) {
+                    count++;
+                    if (count > mostFre) {
+                        mostFre = count;
+                        val = j;
+                    }
+                    Log.d("aaaCount: ", "" + count + " i:" + i + " j:" + j);
+                }
+            }
+        }
+        Log.d("checkkrnaplz", "" + Helper.avoidedyearlydata.size());
+        if (Helper.avoidedyearlydata.size() == 0) {
+            return "";
+        } else {
+            return Helper.avoidedyearlydata.get(val);
+        }
+    }
+
+    public String getYearlyDoneData(String date, String date2) {
+        Log.d("splitteddate444 ",""+date+" * "+date2);
+        Helper.doneyearlydata = new ArrayList<>();
+        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM DONE WHERE DATE BETWEEN '" + date + "' AND '" + date2 + "'", null);
+        while (cursor.moveToNext()) {
+            Log.d("date",""+cursor.getString(2));
+            Helper.doneyearlydata.add(cursor.getString(2));
+        }
+        Log.d("split", "" + Helper.doneyearlydata.size());
+
+        int mostFre = 0, val = 0;
+        for (int i = 0; i < Helper.doneyearlydata.size(); i++) {
+            int count = 0;
+            for (int j = i + 1; j < Helper.doneyearlydata.size(); j++) {
+                if ((Helper.doneyearlydata.get(i)).equals(Helper.doneyearlydata.get(j))) {
+                    count++;
+                    if (count > mostFre) {
+                        mostFre = count;
+                        val = j;
+                    }
+                    Log.d("aaaCount: ", "" + count + " i:" + i + " j:" + j);
+                }
+            }
+        }
+        Log.d("checkkrnaplz", "" + Helper.doneyearlydata.size());
+        if (Helper.doneyearlydata.size() == 0) {
+            return "";
+        } else {
+            return Helper.doneyearlydata.get(val);
+        }
+    }
+
+    public int countLabels(String catagory){
+        int count=0;
+        Cursor cursor = this.getReadableDatabase().rawQuery("SELECT * FROM HABITS WHERE CATAGORY='" + catagory + "'", null);
+        count= cursor.getCount();
+        cursor.close();
+        return  count;
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/rocks/poopjournal/todont/Fragments/AvoidedFragment.java b/app/src/main/java/rocks/poopjournal/todont/Fragments/AvoidedFragment.java
index d01c0451..a2325703 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Fragments/AvoidedFragment.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Fragments/AvoidedFragment.java
@@ -1,121 +1,121 @@
-package rocks.poopjournal.todont.Fragments;
-
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-
-import rocks.poopjournal.todont.Adapters.AvoidedAdapter;
-import rocks.poopjournal.todont.Db_Controller;
-import rocks.poopjournal.todont.Helper;
-import rocks.poopjournal.todont.MainActivity;
-import rocks.poopjournal.todont.R;
-
-public class AvoidedFragment extends Fragment {
-    RecyclerView rv;
-    ArrayList<String> gettingtasks = new ArrayList<>();
-    ArrayList<String> gettingcatagory = new ArrayList<>();
-    Date c = Calendar.getInstance().getTime();
-    String catagoryselected = "";
-    Db_Controller db;
-    AvoidedAdapter adapter;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        View view = inflater.inflate(R.layout.fragment_avoided, container, false);
-        //Helper.SelectedButtonOfTodayTab=true;
-        rv = view.findViewById(R.id.rv);
-        db = new Db_Controller(getActivity(), "", null, 2);
-        db.show_labels();
-        db.show_data();
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
-        setDataInList();
-        return view;
-    }
-
-    public void setDataInList() {
-        for (int i = 0; i < Helper.data.size(); i++) {
-            gettingtasks.add(Helper.data.get(i)[2]);
-            gettingcatagory.add(Helper.data.get(i)[4]);
-        }
-        rv.setLayoutManager(new LinearLayoutManager(getActivity()));
-        new ItemTouchHelper(itemtouchhelper).attachToRecyclerView(rv);
-        adapter = new AvoidedAdapter(getActivity(), AvoidedFragment.this, db, gettingtasks, gettingcatagory);
-        rv.setAdapter(adapter);
-        rv.setLayoutManager(new LinearLayoutManager(getActivity()));
-        //rv.setAdapter(new AvoidedAdapter(getActivity(), AvoidedFragment.this, db, gettingtasks, gettingcatagory));
-
-    }
-
-    ItemTouchHelper.SimpleCallback itemtouchhelper = new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.RIGHT) {
-        @Override
-        public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
-            return false;
-        }
-
-        @Override
-        public void onSwiped(@NonNull final RecyclerView.ViewHolder viewHolder, int direction) {
-            if (direction == 8) {
-                AlertDialog.Builder builder1 = new AlertDialog.Builder(getContext());
-                builder1.setMessage("Do you really want to delete this?");
-                builder1.setCancelable(true);
-
-                builder1.setPositiveButton(
-                        "Yes",
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int id) {
-                                int i = viewHolder.getAdapterPosition();
-                                Log.d("aaaasize",""+Helper.data.size());
-                                db.delete_avoided(i);
-                                for (int j = i + 1; j < Helper.data.size(); j++) {
-                                    Log.d("aaaaforloop",""+Integer.parseInt(Helper.data.get(j)[0]));
-                                    db.updateIdsAfterDeletion(Integer.parseInt(Helper.data.get(j)[0]));
-                                }
-                                Helper.SelectedButtonOfTodayTab = 1;
-                                Intent intent = new Intent(getActivity(), MainActivity.class);
-                                startActivity(intent);
-                                getActivity().overridePendingTransition(0, 0);
-                                dialog.cancel();
-                            }
-                        });
-
-                builder1.setNegativeButton(
-                        "No",
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int id) {
-                                Intent i = new Intent(getActivity(), MainActivity.class);
-                                startActivity(i);
-                                getActivity().overridePendingTransition(0, 0);
-                                dialog.cancel();
-                            }
-                        });
-
-                AlertDialog alert11 = builder1.create();
-                alert11.show();
-
-            }
-
-        }
-    };
-}
-
-
-
+package rocks.poopjournal.todont.Fragments;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+import rocks.poopjournal.todont.Adapters.AvoidedAdapter;
+import rocks.poopjournal.todont.Db_Controller;
+import rocks.poopjournal.todont.Helper;
+import rocks.poopjournal.todont.MainActivity;
+import rocks.poopjournal.todont.R;
+
+public class AvoidedFragment extends Fragment {
+    RecyclerView rv;
+    ArrayList<String> gettingtasks = new ArrayList<>();
+    ArrayList<String> gettingcatagory = new ArrayList<>();
+    Date c = Calendar.getInstance().getTime();
+    String catagoryselected = "";
+    Db_Controller db;
+    AvoidedAdapter adapter;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        View view = inflater.inflate(R.layout.fragment_avoided, container, false);
+        //Helper.SelectedButtonOfTodayTab=true;
+        rv = view.findViewById(R.id.rv);
+        db = new Db_Controller(getActivity(), "", null, 2);
+        db.show_labels();
+        db.show_data();
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
+        setDataInList();
+        return view;
+    }
+
+    public void setDataInList() {
+        for (int i = 0; i < Helper.data.size(); i++) {
+            gettingtasks.add(Helper.data.get(i)[2]);
+            gettingcatagory.add(Helper.data.get(i)[4]);
+        }
+        rv.setLayoutManager(new LinearLayoutManager(getActivity()));
+        new ItemTouchHelper(itemtouchhelper).attachToRecyclerView(rv);
+        adapter = new AvoidedAdapter(getActivity(), AvoidedFragment.this, db, gettingtasks, gettingcatagory);
+        rv.setAdapter(adapter);
+        rv.setLayoutManager(new LinearLayoutManager(getActivity()));
+        //rv.setAdapter(new AvoidedAdapter(getActivity(), AvoidedFragment.this, db, gettingtasks, gettingcatagory));
+
+    }
+
+    ItemTouchHelper.SimpleCallback itemtouchhelper = new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.RIGHT) {
+        @Override
+        public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
+            return false;
+        }
+
+        @Override
+        public void onSwiped(@NonNull final RecyclerView.ViewHolder viewHolder, int direction) {
+            if (direction == 8) {
+                AlertDialog.Builder builder1 = new AlertDialog.Builder(getContext());
+                builder1.setMessage("Do you really want to delete this?");
+                builder1.setCancelable(true);
+
+                builder1.setPositiveButton(
+                        "Yes",
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int id) {
+                                int i = viewHolder.getAdapterPosition();
+                                Log.d("aaaasize",""+Helper.data.size());
+                                db.delete_avoided(i);
+                                for (int j = i + 1; j < Helper.data.size(); j++) {
+                                    Log.d("aaaaforloop",""+Integer.parseInt(Helper.data.get(j)[0]));
+                                    db.updateIdsAfterDeletion(Integer.parseInt(Helper.data.get(j)[0]));
+                                }
+                                Helper.SelectedButtonOfTodayTab = 1;
+                                Intent intent = new Intent(getActivity(), MainActivity.class);
+                                startActivity(intent);
+                                getActivity().overridePendingTransition(0, 0);
+                                dialog.cancel();
+                            }
+                        });
+
+                builder1.setNegativeButton(
+                        "No",
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int id) {
+                                Intent i = new Intent(getActivity(), MainActivity.class);
+                                startActivity(i);
+                                getActivity().overridePendingTransition(0, 0);
+                                dialog.cancel();
+                            }
+                        });
+
+                AlertDialog alert11 = builder1.create();
+                alert11.show();
+
+            }
+
+        }
+    };
+}
+
+
+
diff --git a/app/src/main/java/rocks/poopjournal/todont/Fragments/AvoidedLogFragment.java b/app/src/main/java/rocks/poopjournal/todont/Fragments/AvoidedLogFragment.java
index e8627333..c1ee45ef 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Fragments/AvoidedLogFragment.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Fragments/AvoidedLogFragment.java
@@ -1,62 +1,62 @@
-package rocks.poopjournal.todont.Fragments;
-
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Locale;
-
-import rocks.poopjournal.todont.Adapters.AvoidedLogAdapter;
-import rocks.poopjournal.todont.Db_Controller;
-import rocks.poopjournal.todont.Helper;
-import rocks.poopjournal.todont.MainActivity;
-import rocks.poopjournal.todont.R;
-
-public class AvoidedLogFragment extends Fragment {
-    RecyclerView rv;
-    ArrayList<String> gettingtasks = new ArrayList<>();
-    ArrayList<String> gettingcatagory = new ArrayList<>();
-    Db_Controller db;
-    AvoidedLogAdapter adapter;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_avoided, container, false);
-        rv = view.findViewById(R.id.rv);
-        db = new Db_Controller(getActivity(), "", null, 2);
-        db.getDailyAvoidedRecord(Helper.getSelecteddate);
-        db.getDailyDoneRecord(Helper.getSelecteddate);
-        setDataInList();
-        return view;
-    }
-
-    public void setDataInList() {
-        for (int i = 0; i < Helper.avoidedlogdata.size(); i++) {
-            gettingtasks.add(Helper.avoidedlogdata.get(i)[2]);
-            gettingcatagory.add(Helper.avoidedlogdata.get(i)[4]);
-        }
-        rv.setLayoutManager(new LinearLayoutManager(getActivity()));
-        adapter = new AvoidedLogAdapter(getActivity(), AvoidedLogFragment.this, db, gettingtasks, gettingcatagory);
-        rv.setAdapter(adapter);
-        rv.setLayoutManager(new LinearLayoutManager(getActivity()));
-
-    }
-
-}
-
-
-
+package rocks.poopjournal.todont.Fragments;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Locale;
+
+import rocks.poopjournal.todont.Adapters.AvoidedLogAdapter;
+import rocks.poopjournal.todont.Db_Controller;
+import rocks.poopjournal.todont.Helper;
+import rocks.poopjournal.todont.MainActivity;
+import rocks.poopjournal.todont.R;
+
+public class AvoidedLogFragment extends Fragment {
+    RecyclerView rv;
+    ArrayList<String> gettingtasks = new ArrayList<>();
+    ArrayList<String> gettingcatagory = new ArrayList<>();
+    Db_Controller db;
+    AvoidedLogAdapter adapter;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_avoided, container, false);
+        rv = view.findViewById(R.id.rv);
+        db = new Db_Controller(getActivity(), "", null, 2);
+        db.getDailyAvoidedRecord(Helper.getSelecteddate);
+        db.getDailyDoneRecord(Helper.getSelecteddate);
+        setDataInList();
+        return view;
+    }
+
+    public void setDataInList() {
+        for (int i = 0; i < Helper.avoidedlogdata.size(); i++) {
+            gettingtasks.add(Helper.avoidedlogdata.get(i)[2]);
+            gettingcatagory.add(Helper.avoidedlogdata.get(i)[4]);
+        }
+        rv.setLayoutManager(new LinearLayoutManager(getActivity()));
+        adapter = new AvoidedLogAdapter(getActivity(), AvoidedLogFragment.this, db, gettingtasks, gettingcatagory);
+        rv.setAdapter(adapter);
+        rv.setLayoutManager(new LinearLayoutManager(getActivity()));
+
+    }
+
+}
+
+
+
diff --git a/app/src/main/java/rocks/poopjournal/todont/Fragments/DailyFragment.java b/app/src/main/java/rocks/poopjournal/todont/Fragments/DailyFragment.java
index 57acc0f5..e2de9b9f 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Fragments/DailyFragment.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Fragments/DailyFragment.java
@@ -1,262 +1,262 @@
-package rocks.poopjournal.todont.Fragments;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.os.Handler;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentTransaction;
-
-import com.github.mikephil.charting.charts.PieChart;
-import com.github.mikephil.charting.components.Description;
-import com.github.mikephil.charting.components.Legend;
-import com.github.mikephil.charting.data.PieData;
-import com.github.mikephil.charting.data.PieDataSet;
-import com.github.mikephil.charting.data.PieEntry;
-import com.ornach.nobobutton.NoboButton;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-import java.util.Locale;
-
-import rocks.poopjournal.todont.Db_Controller;
-import rocks.poopjournal.todont.Helper;
-import rocks.poopjournal.todont.R;
-
-import static java.util.Calendar.getInstance;
-
-public class DailyFragment extends Fragment {
-    TextView date, progressText, percentage;
-    Button btnbefore, btnafter;
-    NoboButton habits, avoided, done;
-    ProgressBar progressBar;
-    Calendar c = getInstance();
-    Calendar d = getInstance();
-    String formattedDate;
-    Db_Controller db;
-    double habitsSize, avoidedSize, doneSize;
-    PieChart pieChart;
-    int avoidedPercentage, donePercentage;
-    SharedPreferences prefs;
-    String checkDate;
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_daily, container, false);
-        prefs = getContext().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE);
-        checkDate = prefs.getString("InitialDate", "");
-        Helper.SelectedButtonOfLogTab = 1;
-        db = new Db_Controller(getActivity(), "", null, 2);
-        db.show_habits_data();
-        final SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
-        date = view.findViewById(R.id.date);
-        progressText = view.findViewById(R.id.progressText);
-        percentage = view.findViewById(R.id.percentage);
-        btnbefore = view.findViewById(R.id.before);
-        btnafter = view.findViewById(R.id.after);
-        habits = view.findViewById(R.id.dhabits);
-        avoided = view.findViewById(R.id.davoided);
-        done = view.findViewById(R.id.ddone);
-        date.setText("" + df.format(c.getTime()));
-        pieChart = view.findViewById(R.id.pieChart);
-        formattedDate = df.format(c.getTime());
-        Helper.getSelecteddate = formattedDate;
-        db.getDailyAvoidedRecord(Helper.getSelecteddate);
-        db.getDailyDoneRecord(Helper.getSelecteddate);
-        habitsSize = Helper.habitsdata.size();
-        avoidedSize = Helper.avoidedlogdata.size();
-        doneSize = Helper.donelogdata.size();
-        avoidedPercentage = (int) ((avoidedSize / habitsSize) * 100);
-        percentage.setText(avoidedPercentage + "% Avoided");
-        Log.d("qqqqqq",""+avoidedPercentage);
-        if(avoidedPercentage==100){
-            progressText.setText((int) avoidedSize + " out of " + (int) habitsSize + " habits are avoided");
-        }
-        else{
-            progressText.setText((int) avoidedSize + " out of " + (int) habitsSize + " habits are avoided, way to go!");
-        }
-        percentage.setText(avoidedPercentage + "% Avoided");
-        btnbefore.setBackgroundResource(R.drawable.ic_backarrow);
-        btnafter.setBackgroundResource(R.drawable.ic_nextarrow);
-        if (Helper.SelectedButtonOfLogDailyTab == 0) {
-            FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-            ft.replace(R.id.containerLogDailyFragment, new HabitsLogFragment());
-            ft.commit();
-        }
-        funcPieChart(avoidedPercentage);
-        if(date.getText().toString().equals(checkDate)){
-            btnbefore.setEnabled(false);
-            btnafter.setEnabled(false);
-        }
-//
-        btnbefore.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                btnbefore.setBackgroundResource(R.drawable.ic_backarrowpressed);
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        btnbefore.setBackgroundResource(R.drawable.ic_backarrow);
-                    }
-                }, 100);
-                btnafter.setEnabled(true);
-                c.add(Calendar.DATE, -1);
-                formattedDate = df.format(c.getTime());
-                if(date.getText().toString().equals(checkDate)){
-                    btnbefore.setEnabled(false);
-                }
-                else{
-                    Helper.getSelecteddate = formattedDate;
-                    date.setText("" + formattedDate);
-                    db.getDailyAvoidedRecord(Helper.getSelecteddate);
-                    db.getDailyDoneRecord(Helper.getSelecteddate);
-                    habitsSize = Helper.habitsdata.size();
-                    avoidedSize = Helper.avoidedlogdata.size();
-                    avoidedPercentage = (int) ((avoidedSize / habitsSize) * 100);
-                    if(avoidedPercentage==100){
-                        progressText.setText((int) avoidedSize + " out of " + (int) habitsSize + " habits are avoided");
-                    }
-                    else{
-                        progressText.setText((int) avoidedSize + " out of " + (int) habitsSize + " habits are avoided, way to go!");
-                    }
-                    percentage.setText(avoidedPercentage + "% Avoided");
-                    funcPieChart(avoidedPercentage);
-                }
-
-
-                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-                if (Helper.SelectedButtonOfLogDailyTab == 0) {
-                    ft.replace(R.id.containerLogDailyFragment, new HabitsLogFragment());
-
-                } else if (Helper.SelectedButtonOfLogDailyTab == 1) {
-                    ft.replace(R.id.containerLogDailyFragment, new AvoidedLogFragment());
-
-                } else if (Helper.SelectedButtonOfLogDailyTab == 2) {
-                    ft.replace(R.id.containerLogDailyFragment, new DoneLogFragment());
-                }
-                ft.commit();
-            }
-        });
-        btnafter.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                btnafter.setBackgroundResource(R.drawable.ic_nextpressed);
-                new
-                        Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        btnafter.setBackgroundResource(R.drawable.ic_nextarrow);
-                    }
-                }, 100);
-                btnbefore.setEnabled(true);
-                String currdate=df.format(d.getTime());
-                c.add(Calendar.DATE, +1);
-                formattedDate = df.format(c.getTime());
-                if(date.getText().toString().equals(currdate)){
-                    btnafter.setEnabled(false);
-                }
-               else{
-                    Helper.getSelecteddate = formattedDate;
-                    date.setText("" + formattedDate);
-                    db.getDailyAvoidedRecord(Helper.getSelecteddate);
-                    db.getDailyDoneRecord(Helper.getSelecteddate);
-                    habitsSize = Helper.habitsdata.size();
-                    avoidedSize = Helper.avoidedlogdata.size();
-                    avoidedPercentage = (int) ((avoidedSize / habitsSize) * 100);
-                    Log.d("qqqqqq",""+avoidedPercentage);
-                    if(avoidedPercentage==100){
-                        progressText.setText((int) avoidedSize + " out of " + (int) habitsSize + " habits are avoided");
-                    }
-                    else{
-                        progressText.setText((int) avoidedSize + " out of " + (int) habitsSize + " habits are avoided, way to go!");
-                    }
-                    percentage.setText(avoidedPercentage + "% Avoided");
-                    funcPieChart(avoidedPercentage);
-                }
-
-                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-                if (Helper.SelectedButtonOfLogDailyTab == 0) {
-                    ft.replace(R.id.containerLogDailyFragment, new HabitsLogFragment());
-
-                } else if (Helper.SelectedButtonOfLogDailyTab == 1) {
-                    ft.replace(R.id.containerLogDailyFragment, new AvoidedLogFragment());
-
-                } else if (Helper.SelectedButtonOfLogDailyTab == 2) {
-                    ft.replace(R.id.containerLogDailyFragment, new DoneLogFragment());
-
-                }
-                ft.commit();
-            }
-        });
-        habits.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                habits.setBackgroundColor(getResources().getColor(R.color.spinnercolor));
-                avoided.setBackgroundColor(Color.TRANSPARENT);
-                done.setBackgroundColor(Color.TRANSPARENT);
-                Helper.SelectedButtonOfLogDailyTab = 0;
-                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-                ft.replace(R.id.containerLogDailyFragment, new HabitsLogFragment());
-                ft.commit();
-            }
-        });
-        avoided.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                habits.setBackgroundColor(Color.TRANSPARENT);
-                avoided.setBackgroundColor(getResources().getColor(R.color.spinnercolor));
-                done.setBackgroundColor(Color.TRANSPARENT);
-                Helper.SelectedButtonOfLogDailyTab = 1;
-                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-                ft.replace(R.id.containerLogDailyFragment, new AvoidedLogFragment());
-                ft.commit();
-            }
-        });
-        done.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                habits.setBackgroundColor(Color.TRANSPARENT);
-                avoided.setBackgroundColor(Color.TRANSPARENT);
-                done.setBackgroundColor(getResources().getColor(R.color.spinnercolor));
-                Helper.SelectedButtonOfLogDailyTab = 2;
-                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-                ft.replace(R.id.containerLogDailyFragment, new DoneLogFragment());
-                ft.commit();
-            }
-        });
-        return view;
-    }
-
-    public void funcPieChart(int avoidedPer) {
-        pieChart.setUsePercentValues(true);
-        List<PieEntry> value = new ArrayList<>();
-        value.add(new PieEntry((float) avoidedPer, "Avoided"));
-        value.add(new PieEntry((float) (100.0 - avoidedPer), "Habits"));
-        PieDataSet pieDataSet = new PieDataSet(value, "");
-        pieDataSet.setValueTextColor(Color.WHITE);
-        PieData pieData = new PieData(pieDataSet);
-        pieChart.setData(pieData);
-        pieDataSet.setColors(new int[]{Color.parseColor("#FFAF01"), Color.parseColor("#26272c")});
-        Legend legend = pieChart.getLegend();
-        legend.setEnabled(false);
-        Description description = new Description();
-        description.setText("");
-        pieChart.setDescription(description);
-        pieChart.setHoleRadius(50f);
-        pieChart.setHoleColor(getResources().getColor(R.color.backgroundcolor));
-        pieChart.setTransparentCircleRadius(50f);
-        pieChart.animateXY(1000, 1000);
-    }
-//#ed8709
-
+package rocks.poopjournal.todont.Fragments;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
+import com.github.mikephil.charting.charts.PieChart;
+import com.github.mikephil.charting.components.Description;
+import com.github.mikephil.charting.components.Legend;
+import com.github.mikephil.charting.data.PieData;
+import com.github.mikephil.charting.data.PieDataSet;
+import com.github.mikephil.charting.data.PieEntry;
+import com.ornach.nobobutton.NoboButton;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Locale;
+
+import rocks.poopjournal.todont.Db_Controller;
+import rocks.poopjournal.todont.Helper;
+import rocks.poopjournal.todont.R;
+
+import static java.util.Calendar.getInstance;
+
+public class DailyFragment extends Fragment {
+    TextView date, progressText, percentage;
+    Button btnbefore, btnafter;
+    NoboButton habits, avoided, done;
+    ProgressBar progressBar;
+    Calendar c = getInstance();
+    Calendar d = getInstance();
+    String formattedDate;
+    Db_Controller db;
+    double habitsSize, avoidedSize, doneSize;
+    PieChart pieChart;
+    int avoidedPercentage, donePercentage;
+    SharedPreferences prefs;
+    String checkDate;
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_daily, container, false);
+        prefs = getContext().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE);
+        checkDate = prefs.getString("InitialDate", "");
+        Helper.SelectedButtonOfLogTab = 1;
+        db = new Db_Controller(getActivity(), "", null, 2);
+        db.show_habits_data();
+        final SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
+        date = view.findViewById(R.id.date);
+        progressText = view.findViewById(R.id.progressText);
+        percentage = view.findViewById(R.id.percentage);
+        btnbefore = view.findViewById(R.id.before);
+        btnafter = view.findViewById(R.id.after);
+        habits = view.findViewById(R.id.dhabits);
+        avoided = view.findViewById(R.id.davoided);
+        done = view.findViewById(R.id.ddone);
+        date.setText("" + df.format(c.getTime()));
+        pieChart = view.findViewById(R.id.pieChart);
+        formattedDate = df.format(c.getTime());
+        Helper.getSelecteddate = formattedDate;
+        db.getDailyAvoidedRecord(Helper.getSelecteddate);
+        db.getDailyDoneRecord(Helper.getSelecteddate);
+        habitsSize = Helper.habitsdata.size();
+        avoidedSize = Helper.avoidedlogdata.size();
+        doneSize = Helper.donelogdata.size();
+        avoidedPercentage = (int) ((avoidedSize / habitsSize) * 100);
+        percentage.setText(avoidedPercentage + "% Avoided");
+        Log.d("qqqqqq",""+avoidedPercentage);
+        if(avoidedPercentage==100){
+            progressText.setText((int) avoidedSize + " out of " + (int) habitsSize + " habits are avoided");
+        }
+        else{
+            progressText.setText((int) avoidedSize + " out of " + (int) habitsSize + " habits are avoided, way to go!");
+        }
+        percentage.setText(avoidedPercentage + "% Avoided");
+        btnbefore.setBackgroundResource(R.drawable.ic_backarrow);
+        btnafter.setBackgroundResource(R.drawable.ic_nextarrow);
+        if (Helper.SelectedButtonOfLogDailyTab == 0) {
+            FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
+            ft.replace(R.id.containerLogDailyFragment, new HabitsLogFragment());
+            ft.commit();
+        }
+        funcPieChart(avoidedPercentage);
+        if(date.getText().toString().equals(checkDate)){
+            btnbefore.setEnabled(false);
+            btnafter.setEnabled(false);
+        }
+//
+        btnbefore.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                btnbefore.setBackgroundResource(R.drawable.ic_backarrowpressed);
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        btnbefore.setBackgroundResource(R.drawable.ic_backarrow);
+                    }
+                }, 100);
+                btnafter.setEnabled(true);
+                c.add(Calendar.DATE, -1);
+                formattedDate = df.format(c.getTime());
+                if(date.getText().toString().equals(checkDate)){
+                    btnbefore.setEnabled(false);
+                }
+                else{
+                    Helper.getSelecteddate = formattedDate;
+                    date.setText("" + formattedDate);
+                    db.getDailyAvoidedRecord(Helper.getSelecteddate);
+                    db.getDailyDoneRecord(Helper.getSelecteddate);
+                    habitsSize = Helper.habitsdata.size();
+                    avoidedSize = Helper.avoidedlogdata.size();
+                    avoidedPercentage = (int) ((avoidedSize / habitsSize) * 100);
+                    if(avoidedPercentage==100){
+                        progressText.setText((int) avoidedSize + " out of " + (int) habitsSize + " habits are avoided");
+                    }
+                    else{
+                        progressText.setText((int) avoidedSize + " out of " + (int) habitsSize + " habits are avoided, way to go!");
+                    }
+                    percentage.setText(avoidedPercentage + "% Avoided");
+                    funcPieChart(avoidedPercentage);
+                }
+
+
+                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
+                if (Helper.SelectedButtonOfLogDailyTab == 0) {
+                    ft.replace(R.id.containerLogDailyFragment, new HabitsLogFragment());
+
+                } else if (Helper.SelectedButtonOfLogDailyTab == 1) {
+                    ft.replace(R.id.containerLogDailyFragment, new AvoidedLogFragment());
+
+                } else if (Helper.SelectedButtonOfLogDailyTab == 2) {
+                    ft.replace(R.id.containerLogDailyFragment, new DoneLogFragment());
+                }
+                ft.commit();
+            }
+        });
+        btnafter.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                btnafter.setBackgroundResource(R.drawable.ic_nextpressed);
+                new
+                        Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        btnafter.setBackgroundResource(R.drawable.ic_nextarrow);
+                    }
+                }, 100);
+                btnbefore.setEnabled(true);
+                String currdate=df.format(d.getTime());
+                c.add(Calendar.DATE, +1);
+                formattedDate = df.format(c.getTime());
+                if(date.getText().toString().equals(currdate)){
+                    btnafter.setEnabled(false);
+                }
+               else{
+                    Helper.getSelecteddate = formattedDate;
+                    date.setText("" + formattedDate);
+                    db.getDailyAvoidedRecord(Helper.getSelecteddate);
+                    db.getDailyDoneRecord(Helper.getSelecteddate);
+                    habitsSize = Helper.habitsdata.size();
+                    avoidedSize = Helper.avoidedlogdata.size();
+                    avoidedPercentage = (int) ((avoidedSize / habitsSize) * 100);
+                    Log.d("qqqqqq",""+avoidedPercentage);
+                    if(avoidedPercentage==100){
+                        progressText.setText((int) avoidedSize + " out of " + (int) habitsSize + " habits are avoided");
+                    }
+                    else{
+                        progressText.setText((int) avoidedSize + " out of " + (int) habitsSize + " habits are avoided, way to go!");
+                    }
+                    percentage.setText(avoidedPercentage + "% Avoided");
+                    funcPieChart(avoidedPercentage);
+                }
+
+                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
+                if (Helper.SelectedButtonOfLogDailyTab == 0) {
+                    ft.replace(R.id.containerLogDailyFragment, new HabitsLogFragment());
+
+                } else if (Helper.SelectedButtonOfLogDailyTab == 1) {
+                    ft.replace(R.id.containerLogDailyFragment, new AvoidedLogFragment());
+
+                } else if (Helper.SelectedButtonOfLogDailyTab == 2) {
+                    ft.replace(R.id.containerLogDailyFragment, new DoneLogFragment());
+
+                }
+                ft.commit();
+            }
+        });
+        habits.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                habits.setBackgroundColor(getResources().getColor(R.color.spinnercolor));
+                avoided.setBackgroundColor(Color.TRANSPARENT);
+                done.setBackgroundColor(Color.TRANSPARENT);
+                Helper.SelectedButtonOfLogDailyTab = 0;
+                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
+                ft.replace(R.id.containerLogDailyFragment, new HabitsLogFragment());
+                ft.commit();
+            }
+        });
+        avoided.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                habits.setBackgroundColor(Color.TRANSPARENT);
+                avoided.setBackgroundColor(getResources().getColor(R.color.spinnercolor));
+                done.setBackgroundColor(Color.TRANSPARENT);
+                Helper.SelectedButtonOfLogDailyTab = 1;
+                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
+                ft.replace(R.id.containerLogDailyFragment, new AvoidedLogFragment());
+                ft.commit();
+            }
+        });
+        done.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                habits.setBackgroundColor(Color.TRANSPARENT);
+                avoided.setBackgroundColor(Color.TRANSPARENT);
+                done.setBackgroundColor(getResources().getColor(R.color.spinnercolor));
+                Helper.SelectedButtonOfLogDailyTab = 2;
+                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
+                ft.replace(R.id.containerLogDailyFragment, new DoneLogFragment());
+                ft.commit();
+            }
+        });
+        return view;
+    }
+
+    public void funcPieChart(int avoidedPer) {
+        pieChart.setUsePercentValues(true);
+        List<PieEntry> value = new ArrayList<>();
+        value.add(new PieEntry((float) avoidedPer, "Avoided"));
+        value.add(new PieEntry((float) (100.0 - avoidedPer), "Habits"));
+        PieDataSet pieDataSet = new PieDataSet(value, "");
+        pieDataSet.setValueTextColor(Color.WHITE);
+        PieData pieData = new PieData(pieDataSet);
+        pieChart.setData(pieData);
+        pieDataSet.setColors(new int[]{Color.parseColor("#FFAF01"), Color.parseColor("#26272c")});
+        Legend legend = pieChart.getLegend();
+        legend.setEnabled(false);
+        Description description = new Description();
+        description.setText("");
+        pieChart.setDescription(description);
+        pieChart.setHoleRadius(50f);
+        pieChart.setHoleColor(getResources().getColor(R.color.backgroundcolor));
+        pieChart.setTransparentCircleRadius(50f);
+        pieChart.animateXY(1000, 1000);
+    }
+//#ed8709
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/rocks/poopjournal/todont/Fragments/DoneFragment.java b/app/src/main/java/rocks/poopjournal/todont/Fragments/DoneFragment.java
index eb7c614a..c15930f4 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Fragments/DoneFragment.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Fragments/DoneFragment.java
@@ -1,198 +1,198 @@
-package rocks.poopjournal.todont.Fragments;
-
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-
-import rocks.poopjournal.todont.Db_Controller;
-import rocks.poopjournal.todont.Adapters.DoneAdapter;
-import rocks.poopjournal.todont.Helper;
-import rocks.poopjournal.todont.MainActivity;
-import rocks.poopjournal.todont.R;
-
-
-public class DoneFragment extends Fragment {
-    RecyclerView rv;
-    ArrayList<String> gettingtasks = new ArrayList<>();
-    ArrayList<String> gettinglabels = new ArrayList<>();
-    ArrayList<String> gettingcatagory = new ArrayList<>();
-    Date c = Calendar.getInstance().getTime();
-    String catagoryselected;
-    Db_Controller db;
-    DoneAdapter adapter;
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        View view= inflater.inflate(R.layout.fragment_done, container, false);
-        rv = view.findViewById(R.id.rv);
-        db = new Db_Controller(getActivity(), "", null, 2);
-        db.show_done_data();
-
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
-
-//        floatingActionButton.setOnClickListener(new View.OnClickListener() {
-//            @SuppressLint("ResourceAsColor")
-//            @Override
-//            public void onClick(View view) {
-//                final SimpleDateFormat df = new SimpleDateFormat("dd-MMM-yyyy", Locale.getDefault());
-//                String formattedDate = df.format(c);
-//                final View bottomsheetview ;
-//                final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(getActivity(),
-//                        R.style.BottomSheetDialogTheme);
-//                if(Helper.isnightmodeon==true){
-//                    bottomsheetview= LayoutInflater.from(getActivity().getApplicationContext()).
-//                            inflate(R.layout.layout_bottom_sheet_nightmode,
-//                                    (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
-//                }
-//                else{
-//                    bottomsheetview = LayoutInflater.from(getActivity().getApplicationContext()).
-//                            inflate(R.layout.layout_bottom_sheet,
-//                                    (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
-//                }
-//
-//                final Spinner spinner = bottomsheetview.findViewById(R.id.spinner);
-//                final TextView txt=bottomsheetview.findViewById(R.id.txt);
-//                if(Helper.labels_array.size()==0){
-//                    txt.setVisibility(View.VISIBLE);
-//                    spinner.setVisibility(View.INVISIBLE);
-//                }
-//                else{
-//                    txt.setVisibility(View.INVISIBLE);
-//                    spinner.setVisibility(View.VISIBLE);
-//                }
-//
-//
-//                ArrayAdapter<String> arrayAdapter = new ArrayAdapter<String>(getActivity(),android.R.layout.simple_spinner_item,Helper.labels_array);
-//                arrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-//                spinner.setAdapter(arrayAdapter);
-//
-//
-//                spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-//                    @Override
-//                    public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
-//                        catagoryselected = adapterView.getItemAtPosition(i).toString();
-//
-//                    }
-//
-//                    @Override
-//                    public void onNothingSelected(AdapterView<?> adapterView) {
-//
-//                    }
-//                });
-//
-//                Button saveTaskButton = bottomsheetview.findViewById(R.id.saveTaskButton);
-//                final EditText habit = bottomsheetview.findViewById(R.id.habit);
-//                final EditText detail = bottomsheetview.findViewById(R.id.detail);
-//
-//                saveTaskButton.setOnClickListener(new View.OnClickListener() {
-//                    @Override
-//                    public void onClick(View view) {
-//
-//                        String habit_text = habit.getText().toString();
-//                        String detail_text = detail.getText().toString();
-//                        String formattedDate = df.format(c);
-//                        try {
-//
-//                        } catch (SQLiteException e) {
-//                        }
-//
-//                        db.insert_done_data(Helper.donedata.size(),formattedDate, habit_text, detail_text, catagoryselected);
-//                        db.show_done_data();
-//                        Helper.SelectedButtonOfTodayTab=2;
-//                        Intent i=new Intent(getActivity(),MainActivity.class);
-//                        startActivity(i);
-//                        getActivity().overridePendingTransition(0,0);
-//                        bottomSheetDialog.dismiss();
-//                    }
-//
-//                });
-//                spinner.setAdapter((SpinnerAdapter) arrayAdapter);
-//                bottomSheetDialog.setContentView(bottomsheetview);
-//                bottomSheetDialog.show();
-//
-//
-//            }
-//        });
-        setDataInList();
-        return view;
-
-    }
-    public void setDataInList() {
-        for (int i = 0; i < Helper.donedata.size(); i++) {
-            gettingtasks.add(Helper.donedata.get(i)[2]);
-            gettingcatagory.add(Helper.donedata.get(i)[4]);
-        }
-       rv.setLayoutManager(new LinearLayoutManager(getActivity()));
-        new ItemTouchHelper(itemtouchhelper).attachToRecyclerView(rv);
-        adapter= new DoneAdapter(getActivity(),DoneFragment.this,db,gettingtasks,gettingcatagory);
-        rv.setAdapter(adapter);
-        rv.setLayoutManager(new LinearLayoutManager(getActivity()));
-    }
-    ItemTouchHelper.SimpleCallback itemtouchhelper = new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.RIGHT) {
-        @Override
-        public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
-            return false;
-        }
-
-        @Override
-        public void onSwiped(@NonNull final RecyclerView.ViewHolder viewHolder, int direction) {
-            if (direction == 8) {
-                AlertDialog.Builder builder1 = new AlertDialog.Builder(getContext());
-                builder1.setMessage("Do you really want to delete this?");
-                builder1.setCancelable(true);
-
-                builder1.setPositiveButton(
-                        "Yes",
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int id) {
-                                int i = viewHolder.getAdapterPosition();
-                                db.delete_done(i);
-                                for (int j = i + 1; j < Helper.donedata.size(); j++) {
-                                    db.updateDoneIdsAfterDeletion(Integer.parseInt(Helper.donedata.get(j)[0]));
-                                }
-                                Helper.SelectedButtonOfTodayTab=2;
-                                Intent intent = new Intent(getActivity(), MainActivity.class);
-                                startActivity(intent);
-                                getActivity().overridePendingTransition(0, 0);
-                                dialog.cancel();
-                            }
-                        });
-
-                builder1.setNegativeButton(
-                        "No",
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int id) {
-                                Helper.SelectedButtonOfTodayTab=2;
-                                Intent i = new Intent(getActivity(), MainActivity.class);
-                                startActivity(i);
-                                getActivity().overridePendingTransition(0, 0);
-                                dialog.cancel();
-                            }
-                        });
-
-                AlertDialog alert11 = builder1.create();
-                alert11.show();
-
-            }
-
-        }
-    };
+package rocks.poopjournal.todont.Fragments;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+import rocks.poopjournal.todont.Db_Controller;
+import rocks.poopjournal.todont.Adapters.DoneAdapter;
+import rocks.poopjournal.todont.Helper;
+import rocks.poopjournal.todont.MainActivity;
+import rocks.poopjournal.todont.R;
+
+
+public class DoneFragment extends Fragment {
+    RecyclerView rv;
+    ArrayList<String> gettingtasks = new ArrayList<>();
+    ArrayList<String> gettinglabels = new ArrayList<>();
+    ArrayList<String> gettingcatagory = new ArrayList<>();
+    Date c = Calendar.getInstance().getTime();
+    String catagoryselected;
+    Db_Controller db;
+    DoneAdapter adapter;
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        View view= inflater.inflate(R.layout.fragment_done, container, false);
+        rv = view.findViewById(R.id.rv);
+        db = new Db_Controller(getActivity(), "", null, 2);
+        db.show_done_data();
+
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
+
+//        floatingActionButton.setOnClickListener(new View.OnClickListener() {
+//            @SuppressLint("ResourceAsColor")
+//            @Override
+//            public void onClick(View view) {
+//                final SimpleDateFormat df = new SimpleDateFormat("dd-MMM-yyyy", Locale.getDefault());
+//                String formattedDate = df.format(c);
+//                final View bottomsheetview ;
+//                final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(getActivity(),
+//                        R.style.BottomSheetDialogTheme);
+//                if(Helper.isnightmodeon==true){
+//                    bottomsheetview= LayoutInflater.from(getActivity().getApplicationContext()).
+//                            inflate(R.layout.layout_bottom_sheet_nightmode,
+//                                    (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
+//                }
+//                else{
+//                    bottomsheetview = LayoutInflater.from(getActivity().getApplicationContext()).
+//                            inflate(R.layout.layout_bottom_sheet,
+//                                    (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
+//                }
+//
+//                final Spinner spinner = bottomsheetview.findViewById(R.id.spinner);
+//                final TextView txt=bottomsheetview.findViewById(R.id.txt);
+//                if(Helper.labels_array.size()==0){
+//                    txt.setVisibility(View.VISIBLE);
+//                    spinner.setVisibility(View.INVISIBLE);
+//                }
+//                else{
+//                    txt.setVisibility(View.INVISIBLE);
+//                    spinner.setVisibility(View.VISIBLE);
+//                }
+//
+//
+//                ArrayAdapter<String> arrayAdapter = new ArrayAdapter<String>(getActivity(),android.R.layout.simple_spinner_item,Helper.labels_array);
+//                arrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+//                spinner.setAdapter(arrayAdapter);
+//
+//
+//                spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+//                    @Override
+//                    public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+//                        catagoryselected = adapterView.getItemAtPosition(i).toString();
+//
+//                    }
+//
+//                    @Override
+//                    public void onNothingSelected(AdapterView<?> adapterView) {
+//
+//                    }
+//                });
+//
+//                Button saveTaskButton = bottomsheetview.findViewById(R.id.saveTaskButton);
+//                final EditText habit = bottomsheetview.findViewById(R.id.habit);
+//                final EditText detail = bottomsheetview.findViewById(R.id.detail);
+//
+//                saveTaskButton.setOnClickListener(new View.OnClickListener() {
+//                    @Override
+//                    public void onClick(View view) {
+//
+//                        String habit_text = habit.getText().toString();
+//                        String detail_text = detail.getText().toString();
+//                        String formattedDate = df.format(c);
+//                        try {
+//
+//                        } catch (SQLiteException e) {
+//                        }
+//
+//                        db.insert_done_data(Helper.donedata.size(),formattedDate, habit_text, detail_text, catagoryselected);
+//                        db.show_done_data();
+//                        Helper.SelectedButtonOfTodayTab=2;
+//                        Intent i=new Intent(getActivity(),MainActivity.class);
+//                        startActivity(i);
+//                        getActivity().overridePendingTransition(0,0);
+//                        bottomSheetDialog.dismiss();
+//                    }
+//
+//                });
+//                spinner.setAdapter((SpinnerAdapter) arrayAdapter);
+//                bottomSheetDialog.setContentView(bottomsheetview);
+//                bottomSheetDialog.show();
+//
+//
+//            }
+//        });
+        setDataInList();
+        return view;
+
+    }
+    public void setDataInList() {
+        for (int i = 0; i < Helper.donedata.size(); i++) {
+            gettingtasks.add(Helper.donedata.get(i)[2]);
+            gettingcatagory.add(Helper.donedata.get(i)[4]);
+        }
+       rv.setLayoutManager(new LinearLayoutManager(getActivity()));
+        new ItemTouchHelper(itemtouchhelper).attachToRecyclerView(rv);
+        adapter= new DoneAdapter(getActivity(),DoneFragment.this,db,gettingtasks,gettingcatagory);
+        rv.setAdapter(adapter);
+        rv.setLayoutManager(new LinearLayoutManager(getActivity()));
+    }
+    ItemTouchHelper.SimpleCallback itemtouchhelper = new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.RIGHT) {
+        @Override
+        public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
+            return false;
+        }
+
+        @Override
+        public void onSwiped(@NonNull final RecyclerView.ViewHolder viewHolder, int direction) {
+            if (direction == 8) {
+                AlertDialog.Builder builder1 = new AlertDialog.Builder(getContext());
+                builder1.setMessage("Do you really want to delete this?");
+                builder1.setCancelable(true);
+
+                builder1.setPositiveButton(
+                        "Yes",
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int id) {
+                                int i = viewHolder.getAdapterPosition();
+                                db.delete_done(i);
+                                for (int j = i + 1; j < Helper.donedata.size(); j++) {
+                                    db.updateDoneIdsAfterDeletion(Integer.parseInt(Helper.donedata.get(j)[0]));
+                                }
+                                Helper.SelectedButtonOfTodayTab=2;
+                                Intent intent = new Intent(getActivity(), MainActivity.class);
+                                startActivity(intent);
+                                getActivity().overridePendingTransition(0, 0);
+                                dialog.cancel();
+                            }
+                        });
+
+                builder1.setNegativeButton(
+                        "No",
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int id) {
+                                Helper.SelectedButtonOfTodayTab=2;
+                                Intent i = new Intent(getActivity(), MainActivity.class);
+                                startActivity(i);
+                                getActivity().overridePendingTransition(0, 0);
+                                dialog.cancel();
+                            }
+                        });
+
+                AlertDialog alert11 = builder1.create();
+                alert11.show();
+
+            }
+
+        }
+    };
 }
\ No newline at end of file
diff --git a/app/src/main/java/rocks/poopjournal/todont/Fragments/DoneLogFragment.java b/app/src/main/java/rocks/poopjournal/todont/Fragments/DoneLogFragment.java
index bea2f46e..5db61293 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Fragments/DoneLogFragment.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Fragments/DoneLogFragment.java
@@ -1,56 +1,56 @@
-package rocks.poopjournal.todont.Fragments;
-
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.ArrayList;
-
-import rocks.poopjournal.todont.Adapters.DoneLogAdapter;
-import rocks.poopjournal.todont.Db_Controller;
-import rocks.poopjournal.todont.Helper;
-import rocks.poopjournal.todont.R;
-
-
-public class DoneLogFragment extends Fragment {
-    RecyclerView rv;
-    ArrayList<String> gettingtasks = new ArrayList<>();
-    ArrayList<String> gettingcatagory = new ArrayList<>();
-    Db_Controller db;
-    DoneLogAdapter adapter;
-    TextView tv;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_done, container, false);
-        rv = view.findViewById(R.id.rv);
-        db = new Db_Controller(getActivity(), "", null, 2);
-        db.getDailyAvoidedRecord(Helper.getSelecteddate);
-        db.getDailyDoneRecord(Helper.getSelecteddate);
-        Log.d("yeraha2","habit "+Helper.habitsdata.size()+" avoided "+Helper.avoidedlogdata.size()
-                + " done "+Helper.donelogdata.size());
-        setDataInList();
-        return view;
-
-    }
-
-    public void setDataInList() {
-        for (int i = 0; i < Helper.donelogdata.size(); i++) {
-            gettingtasks.add(Helper.donelogdata.get(i)[2]);
-            gettingcatagory.add(Helper.donelogdata.get(i)[4]);
-        }
-        rv.setLayoutManager(new LinearLayoutManager(getActivity()));
-        adapter = new DoneLogAdapter(getActivity(), DoneLogFragment.this, db, gettingtasks, gettingcatagory);
-        rv.setAdapter(adapter);
-        rv.setLayoutManager(new LinearLayoutManager(getActivity()));
-    }
-
+package rocks.poopjournal.todont.Fragments;
+
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.ArrayList;
+
+import rocks.poopjournal.todont.Adapters.DoneLogAdapter;
+import rocks.poopjournal.todont.Db_Controller;
+import rocks.poopjournal.todont.Helper;
+import rocks.poopjournal.todont.R;
+
+
+public class DoneLogFragment extends Fragment {
+    RecyclerView rv;
+    ArrayList<String> gettingtasks = new ArrayList<>();
+    ArrayList<String> gettingcatagory = new ArrayList<>();
+    Db_Controller db;
+    DoneLogAdapter adapter;
+    TextView tv;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_done, container, false);
+        rv = view.findViewById(R.id.rv);
+        db = new Db_Controller(getActivity(), "", null, 2);
+        db.getDailyAvoidedRecord(Helper.getSelecteddate);
+        db.getDailyDoneRecord(Helper.getSelecteddate);
+        Log.d("yeraha2","habit "+Helper.habitsdata.size()+" avoided "+Helper.avoidedlogdata.size()
+                + " done "+Helper.donelogdata.size());
+        setDataInList();
+        return view;
+
+    }
+
+    public void setDataInList() {
+        for (int i = 0; i < Helper.donelogdata.size(); i++) {
+            gettingtasks.add(Helper.donelogdata.get(i)[2]);
+            gettingcatagory.add(Helper.donelogdata.get(i)[4]);
+        }
+        rv.setLayoutManager(new LinearLayoutManager(getActivity()));
+        adapter = new DoneLogAdapter(getActivity(), DoneLogFragment.this, db, gettingtasks, gettingcatagory);
+        rv.setAdapter(adapter);
+        rv.setLayoutManager(new LinearLayoutManager(getActivity()));
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/rocks/poopjournal/todont/Fragments/FragmentLog.java b/app/src/main/java/rocks/poopjournal/todont/Fragments/FragmentLog.java
index 5a19f322..35a3ea8e 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Fragments/FragmentLog.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Fragments/FragmentLog.java
@@ -1,120 +1,120 @@
-package rocks.poopjournal.todont.Fragments;
-
-import android.graphics.Color;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentTransaction;
-
-import com.ornach.nobobutton.NoboButton;
-
-import rocks.poopjournal.todont.Db_Controller;
-import rocks.poopjournal.todont.Helper;
-import rocks.poopjournal.todont.R;
-
-public class FragmentLog extends Fragment {
-    NoboButton btnday, btnweek, btnmonth, btnyear;
-    Db_Controller db;
-
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        View view = inflater.inflate(R.layout.fragment_log2, container, false);
-        db = new Db_Controller(getContext(), "", null, 2);
-        Helper.isTodaySelected = false;
-        Helper.SelectedButtonOfLogTab = 0;
-        btnday = view.findViewById(R.id.day);
-        btnmonth = view.findViewById(R.id.month);
-        btnweek = view.findViewById(R.id.week);
-        btnyear = view.findViewById(R.id.year);
-        btnday.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                btnday.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
-                btnweek.setBackgroundColor(Color.TRANSPARENT);
-                btnmonth.setBackgroundColor(Color.TRANSPARENT);
-                btnyear.setBackgroundColor(Color.TRANSPARENT);
-                Helper.SelectedButtonOfLogTab = 0;
-                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-                ft.replace(R.id.containerLogFragment, new DailyFragment());
-                ft.commit();
-            }
-        });
-        btnweek.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                btnday.setBackgroundColor(Color.TRANSPARENT);
-                btnweek.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
-                btnmonth.setBackgroundColor(Color.TRANSPARENT);
-                btnyear.setBackgroundColor(Color.TRANSPARENT);
-                Helper.SelectedButtonOfLogTab = 1;
-                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-                ft.replace(R.id.containerLogFragment, new WeeklyFragment());
-                ft.commit();
-            }
-        });
-        btnmonth.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                btnday.setBackgroundColor(Color.TRANSPARENT);
-                btnweek.setBackgroundColor(Color.TRANSPARENT);
-                btnmonth.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
-                btnyear.setBackgroundColor(Color.TRANSPARENT);
-                Helper.SelectedButtonOfLogTab = 2;
-                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-                ft.replace(R.id.containerLogFragment, new MonthlyFragment());
-                ft.commit();
-            }
-        });
-        btnyear.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                btnday.setBackgroundColor(Color.TRANSPARENT);
-                btnweek.setBackgroundColor(Color.TRANSPARENT);
-                btnmonth.setBackgroundColor(Color.TRANSPARENT);
-                btnyear.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
-                Helper.SelectedButtonOfLogTab = 3;
-                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-                ft.replace(R.id.containerLogFragment, new YearlyFragment());
-                ft.commit();
-            }
-        });
-
-        if (Helper.SelectedButtonOfLogTab == 0) {
-            btnday.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
-            btnweek.setBackgroundColor(Color.TRANSPARENT);
-            btnmonth.setBackgroundColor(Color.TRANSPARENT);
-            btnyear.setBackgroundColor(Color.TRANSPARENT);
-            FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-            ft.replace(R.id.containerLogFragment, new DailyFragment());
-            ft.commit();
-        } else if (Helper.SelectedButtonOfLogTab == 1) {
-            btnday.setBackgroundColor(Color.TRANSPARENT);
-            btnweek.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
-            btnmonth.setBackgroundColor(Color.TRANSPARENT);
-            btnyear.setBackgroundColor(Color.TRANSPARENT);
-            FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-            ft.replace(R.id.containerLogFragment, new WeeklyFragment());
-            ft.commit();
-        } else if (Helper.SelectedButtonOfLogTab == 2) {
-            btnday.setBackgroundColor(Color.TRANSPARENT);
-            btnweek.setBackgroundColor(Color.TRANSPARENT);
-            btnmonth.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
-            btnyear.setBackgroundColor(Color.TRANSPARENT);
-            FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-            ft.replace(R.id.containerLogFragment, new MonthlyFragment());
-            ft.commit();
-        } else if (Helper.SelectedButtonOfLogTab == 3) {
-            btnday.setBackgroundColor(Color.TRANSPARENT);
-            btnweek.setBackgroundColor(Color.TRANSPARENT);
-            btnmonth.setBackgroundColor(Color.TRANSPARENT);
-            btnyear.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
-        }
-        return view;
-    }
+package rocks.poopjournal.todont.Fragments;
+
+import android.graphics.Color;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
+import com.ornach.nobobutton.NoboButton;
+
+import rocks.poopjournal.todont.Db_Controller;
+import rocks.poopjournal.todont.Helper;
+import rocks.poopjournal.todont.R;
+
+public class FragmentLog extends Fragment {
+    NoboButton btnday, btnweek, btnmonth, btnyear;
+    Db_Controller db;
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        View view = inflater.inflate(R.layout.fragment_log2, container, false);
+        db = new Db_Controller(getContext(), "", null, 2);
+        Helper.isTodaySelected = false;
+        Helper.SelectedButtonOfLogTab = 0;
+        btnday = view.findViewById(R.id.day);
+        btnmonth = view.findViewById(R.id.month);
+        btnweek = view.findViewById(R.id.week);
+        btnyear = view.findViewById(R.id.year);
+        btnday.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                btnday.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
+                btnweek.setBackgroundColor(Color.TRANSPARENT);
+                btnmonth.setBackgroundColor(Color.TRANSPARENT);
+                btnyear.setBackgroundColor(Color.TRANSPARENT);
+                Helper.SelectedButtonOfLogTab = 0;
+                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
+                ft.replace(R.id.containerLogFragment, new DailyFragment());
+                ft.commit();
+            }
+        });
+        btnweek.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                btnday.setBackgroundColor(Color.TRANSPARENT);
+                btnweek.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
+                btnmonth.setBackgroundColor(Color.TRANSPARENT);
+                btnyear.setBackgroundColor(Color.TRANSPARENT);
+                Helper.SelectedButtonOfLogTab = 1;
+                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
+                ft.replace(R.id.containerLogFragment, new WeeklyFragment());
+                ft.commit();
+            }
+        });
+        btnmonth.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                btnday.setBackgroundColor(Color.TRANSPARENT);
+                btnweek.setBackgroundColor(Color.TRANSPARENT);
+                btnmonth.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
+                btnyear.setBackgroundColor(Color.TRANSPARENT);
+                Helper.SelectedButtonOfLogTab = 2;
+                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
+                ft.replace(R.id.containerLogFragment, new MonthlyFragment());
+                ft.commit();
+            }
+        });
+        btnyear.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                btnday.setBackgroundColor(Color.TRANSPARENT);
+                btnweek.setBackgroundColor(Color.TRANSPARENT);
+                btnmonth.setBackgroundColor(Color.TRANSPARENT);
+                btnyear.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
+                Helper.SelectedButtonOfLogTab = 3;
+                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
+                ft.replace(R.id.containerLogFragment, new YearlyFragment());
+                ft.commit();
+            }
+        });
+
+        if (Helper.SelectedButtonOfLogTab == 0) {
+            btnday.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
+            btnweek.setBackgroundColor(Color.TRANSPARENT);
+            btnmonth.setBackgroundColor(Color.TRANSPARENT);
+            btnyear.setBackgroundColor(Color.TRANSPARENT);
+            FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
+            ft.replace(R.id.containerLogFragment, new DailyFragment());
+            ft.commit();
+        } else if (Helper.SelectedButtonOfLogTab == 1) {
+            btnday.setBackgroundColor(Color.TRANSPARENT);
+            btnweek.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
+            btnmonth.setBackgroundColor(Color.TRANSPARENT);
+            btnyear.setBackgroundColor(Color.TRANSPARENT);
+            FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
+            ft.replace(R.id.containerLogFragment, new WeeklyFragment());
+            ft.commit();
+        } else if (Helper.SelectedButtonOfLogTab == 2) {
+            btnday.setBackgroundColor(Color.TRANSPARENT);
+            btnweek.setBackgroundColor(Color.TRANSPARENT);
+            btnmonth.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
+            btnyear.setBackgroundColor(Color.TRANSPARENT);
+            FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
+            ft.replace(R.id.containerLogFragment, new MonthlyFragment());
+            ft.commit();
+        } else if (Helper.SelectedButtonOfLogTab == 3) {
+            btnday.setBackgroundColor(Color.TRANSPARENT);
+            btnweek.setBackgroundColor(Color.TRANSPARENT);
+            btnmonth.setBackgroundColor(Color.TRANSPARENT);
+            btnyear.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
+        }
+        return view;
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/rocks/poopjournal/todont/Fragments/FragmentToday.java b/app/src/main/java/rocks/poopjournal/todont/Fragments/FragmentToday.java
index bfdd0d2b..58eb55b8 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Fragments/FragmentToday.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Fragments/FragmentToday.java
@@ -1,100 +1,100 @@
-package rocks.poopjournal.todont.Fragments;
-
-import android.graphics.Color;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentTransaction;
-
-import com.ornach.nobobutton.NoboButton;
-
-import java.util.Collection;
-
-import rocks.poopjournal.todont.Helper;
-import rocks.poopjournal.todont.R;
-
-public class FragmentToday extends Fragment {
-    NoboButton avoided,done,habits;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             final Bundle savedInstanceState) {
-
-        View view = inflater.inflate(R.layout.fragment_today2, container, false);
-        Helper.isTodaySelected=true;
-        avoided=view.findViewById(R.id.avoided);
-        done=view.findViewById(R.id.done);
-        habits=view.findViewById(R.id.habits);
-        if(Helper.SelectedButtonOfTodayTab==0){
-            habits.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
-            avoided.setBackgroundColor(Color.TRANSPARENT);
-            done.setBackgroundColor(Color.TRANSPARENT);
-            FragmentTransaction ft= getActivity().getSupportFragmentManager().beginTransaction();
-            ft.replace(R.id.containerTodayFragment,new HabitsFragment());
-            ft.commit();
-        }
-        else if(Helper.SelectedButtonOfTodayTab==1){
-            habits.setBackgroundColor(Color.TRANSPARENT);
-            avoided.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
-            done.setBackgroundColor(Color.TRANSPARENT);
-            FragmentTransaction ft= getActivity().getSupportFragmentManager().beginTransaction();
-            ft.replace(R.id.containerTodayFragment,new AvoidedFragment());
-            ft.commit();
-        }
-        else if(Helper.SelectedButtonOfTodayTab==2){
-            habits.setBackgroundColor(Color.TRANSPARENT);
-            avoided.setBackgroundColor(Color.TRANSPARENT);
-            done.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
-            FragmentTransaction ft= getActivity().getSupportFragmentManager().beginTransaction();
-            ft.replace(R.id.containerTodayFragment,new DoneFragment());
-            ft.commit();
-        }
-
-
-        habits.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                habits.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
-                avoided.setBackgroundColor(Color.TRANSPARENT);
-                done.setBackgroundColor(Color.TRANSPARENT);
-                FragmentTransaction ft= getActivity().getSupportFragmentManager().beginTransaction();
-                ft.replace(R.id.containerTodayFragment,new HabitsFragment());
-                ft.commit();
-
-
-            }
-        });
-        avoided.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                habits.setBackgroundColor(Color.TRANSPARENT);
-                avoided.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
-                done.setBackgroundColor(Color.TRANSPARENT);
-                FragmentTransaction ft= getActivity().getSupportFragmentManager().beginTransaction();
-                ft.replace(R.id.containerTodayFragment,new AvoidedFragment());
-                ft.commit();
-
-
-            }
-        });
-        done.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                habits.setBackgroundColor(Color.TRANSPARENT);
-                avoided.setBackgroundColor(Color.TRANSPARENT);
-                done.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
-                FragmentTransaction ft= getActivity().getSupportFragmentManager().beginTransaction();
-                ft.replace(R.id.containerTodayFragment,new DoneFragment());
-                ft.commit();
-
-            }
-        });
-        return view;
-    }
-
-
-
+package rocks.poopjournal.todont.Fragments;
+
+import android.graphics.Color;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
+import com.ornach.nobobutton.NoboButton;
+
+import java.util.Collection;
+
+import rocks.poopjournal.todont.Helper;
+import rocks.poopjournal.todont.R;
+
+public class FragmentToday extends Fragment {
+    NoboButton avoided,done,habits;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             final Bundle savedInstanceState) {
+
+        View view = inflater.inflate(R.layout.fragment_today2, container, false);
+        Helper.isTodaySelected=true;
+        avoided=view.findViewById(R.id.avoided);
+        done=view.findViewById(R.id.done);
+        habits=view.findViewById(R.id.habits);
+        if(Helper.SelectedButtonOfTodayTab==0){
+            habits.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
+            avoided.setBackgroundColor(Color.TRANSPARENT);
+            done.setBackgroundColor(Color.TRANSPARENT);
+            FragmentTransaction ft= getActivity().getSupportFragmentManager().beginTransaction();
+            ft.replace(R.id.containerTodayFragment,new HabitsFragment());
+            ft.commit();
+        }
+        else if(Helper.SelectedButtonOfTodayTab==1){
+            habits.setBackgroundColor(Color.TRANSPARENT);
+            avoided.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
+            done.setBackgroundColor(Color.TRANSPARENT);
+            FragmentTransaction ft= getActivity().getSupportFragmentManager().beginTransaction();
+            ft.replace(R.id.containerTodayFragment,new AvoidedFragment());
+            ft.commit();
+        }
+        else if(Helper.SelectedButtonOfTodayTab==2){
+            habits.setBackgroundColor(Color.TRANSPARENT);
+            avoided.setBackgroundColor(Color.TRANSPARENT);
+            done.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
+            FragmentTransaction ft= getActivity().getSupportFragmentManager().beginTransaction();
+            ft.replace(R.id.containerTodayFragment,new DoneFragment());
+            ft.commit();
+        }
+
+
+        habits.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                habits.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
+                avoided.setBackgroundColor(Color.TRANSPARENT);
+                done.setBackgroundColor(Color.TRANSPARENT);
+                FragmentTransaction ft= getActivity().getSupportFragmentManager().beginTransaction();
+                ft.replace(R.id.containerTodayFragment,new HabitsFragment());
+                ft.commit();
+
+
+            }
+        });
+        avoided.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                habits.setBackgroundColor(Color.TRANSPARENT);
+                avoided.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
+                done.setBackgroundColor(Color.TRANSPARENT);
+                FragmentTransaction ft= getActivity().getSupportFragmentManager().beginTransaction();
+                ft.replace(R.id.containerTodayFragment,new AvoidedFragment());
+                ft.commit();
+
+
+            }
+        });
+        done.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                habits.setBackgroundColor(Color.TRANSPARENT);
+                avoided.setBackgroundColor(Color.TRANSPARENT);
+                done.setBackgroundColor(getResources().getColor(R.color.bottom_sheet_background));
+                FragmentTransaction ft= getActivity().getSupportFragmentManager().beginTransaction();
+                ft.replace(R.id.containerTodayFragment,new DoneFragment());
+                ft.commit();
+
+            }
+        });
+        return view;
+    }
+
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/rocks/poopjournal/todont/Fragments/HabitsFragment.java b/app/src/main/java/rocks/poopjournal/todont/Fragments/HabitsFragment.java
index 9d1ba285..e05cec93 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Fragments/HabitsFragment.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Fragments/HabitsFragment.java
@@ -2,6 +2,7 @@
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -9,9 +10,13 @@
 import android.database.sqlite.SQLiteException;
 import android.graphics.Color;
 import android.os.Bundle;
+import android.util.Log;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
@@ -20,7 +25,10 @@
 import android.widget.Spinner;
 import android.widget.SpinnerAdapter;
 import android.widget.TextView;
+import android.widget.Toast;
+
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -78,26 +86,24 @@ else if(Helper.habitsdata.size()==0){
         }
 
         floatingActionButton.setOnClickListener(new View.OnClickListener() {
-            @SuppressLint("ResourceAsColor")
             @Override
             public void onClick(View view) {
                 final SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
                 final String formattedDate = df.format(c);
-                View bottomsheetview = null;
-                final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(getActivity(),
-                        R.style.BottomSheetDialogTheme);
-                if(Helper.isnightmodeon.equals("no")){
-                    bottomsheetview = LayoutInflater.from(getActivity().getApplicationContext()).
-                            inflate(R.layout.layout_bottom_sheet,
-                                    (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
-                }
-                else if(Helper.isnightmodeon.equals("yes")){
-                    bottomsheetview = LayoutInflater.from(getActivity().getApplicationContext()).
-                            inflate(R.layout.layout_bottom_sheet_nightmode,
-                                    (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
-                }
-                final Spinner spinner = bottomsheetview.findViewById(R.id.spinner);
-                final TextView txt=bottomsheetview.findViewById(R.id.txt);
+                final Dialog d = new Dialog(getActivity());
+                d.requestWindowFeature(Window.FEATURE_NO_TITLE);
+                d.setContentView(R.layout.dialogbox_floatingbutton);
+                Button btndone=d.findViewById(R.id.btndone);
+                WindowManager.LayoutParams lp = d.getWindow().getAttributes();
+                lp.dimAmount=0.9f;
+                lp.gravity = Gravity.BOTTOM;
+                Window window = d.getWindow();
+                window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT);
+                d.getWindow().setAttributes(lp);
+                d.getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND);
+
+                final Spinner spinner = d.findViewById(R.id.spinner);
+                final TextView txt=d.findViewById(R.id.txt);
                 if(Helper.labels_array.size()==0){
                     txt.setVisibility(View.VISIBLE);
                     spinner.setVisibility(View.INVISIBLE);
@@ -117,14 +123,14 @@ else if(Helper.isnightmodeon.equals("yes")){
                     @Override
                     public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
                         catagoryselected = adapterView.getItemAtPosition(i).toString();
-                        if(Helper.isnightmodeon.equals("no")){
-                            ((TextView) adapterView.getChildAt(0)).setTextColor(Color.BLACK);
-
-                        }
-                        else if(Helper.isnightmodeon.equals("yes")){
-                            ((TextView) adapterView.getChildAt(0)).setTextColor(Color.WHITE);
-
-                        }
+//                        if(Helper.isnightmodeon.equals("no")){
+                            ((TextView) adapterView.getChildAt(0)).setTextColor(getResources().getColor(R.color.textcolor));
+//
+//                        }
+//                        else if(Helper.isnightmodeon.equals("yes")){
+//                            ((TextView) adapterView.getChildAt(0)).setTextColor(Color.WHITE);
+//
+//                        }
                     }
 
                     @Override
@@ -133,9 +139,9 @@ public void onNothingSelected(AdapterView<?> adapterView) {
                     }
                 });
 
-                Button saveTaskButton = bottomsheetview.findViewById(R.id.saveTaskButton);
-                final EditText habit = bottomsheetview.findViewById(R.id.habit);
-                final EditText detail = bottomsheetview.findViewById(R.id.detail);
+                Button saveTaskButton = d.findViewById(R.id.saveTaskButton);
+                final EditText habit = d.findViewById(R.id.habit);
+                final EditText detail = d.findViewById(R.id.detail);
 
                 saveTaskButton.setOnClickListener(new View.OnClickListener() {
                     @Override
@@ -158,17 +164,113 @@ public void onClick(View view) {
                         Intent i=new Intent(getActivity(), MainActivity.class);
                         startActivity(i);
                         getActivity().overridePendingTransition(0,0);
-                        bottomSheetDialog.dismiss();
+                        d.dismiss();
                     }
 
                 });
                 spinner.setAdapter((SpinnerAdapter) arrayAdapter);
-                bottomSheetDialog.setContentView(bottomsheetview);
-                bottomSheetDialog.show();
+                d.show();
 
 
             }
         });
+
+
+//        floatingActionButton.setOnClickListener(new View.OnClickListener() {
+//            @SuppressLint("ResourceAsColor")
+//            @Override
+//            public void onClick(View view) {
+//                final SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
+//                final String formattedDate = df.format(c);
+//                View bottomsheetview = null;
+//                final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(getActivity(),
+//                        R.style.BottomSheetDialogTheme);
+//                bottomsheetview = LayoutInflater.from(getActivity().getApplicationContext()).
+//                            inflate(R.layout.layout_bottom_sheet,
+//                                    (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
+////                if(Helper.isnightmodeon.equals("no")){
+////                    bottomsheetview = LayoutInflater.from(getActivity().getApplicationContext()).
+////                            inflate(R.layout.layout_bottom_sheet,
+////                                    (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
+////                }
+////                else if(Helper.isnightmodeon.equals("yes")){
+////                    bottomsheetview = LayoutInflater.from(getActivity().getApplicationContext()).
+////                            inflate(R.layout.layout_bottom_sheet_nightmode,
+////                                    (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
+////                }
+//                final Spinner spinner = bottomsheetview.findViewById(R.id.spinner);
+//                final TextView txt=bottomsheetview.findViewById(R.id.txt);
+//                if(Helper.labels_array.size()==0){
+//                    txt.setVisibility(View.VISIBLE);
+//                    spinner.setVisibility(View.INVISIBLE);
+//                }
+//                else{
+//                    txt.setVisibility(View.INVISIBLE);
+//                    spinner.setVisibility(View.VISIBLE);
+//                }
+//
+//
+//                ArrayAdapter<String> arrayAdapter = new ArrayAdapter<String>(getActivity(),android.R.layout.simple_spinner_item,Helper.labels_array);
+//                arrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+//                spinner.setAdapter(arrayAdapter);
+//
+//
+//                spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+//                    @Override
+//                    public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+//                        catagoryselected = adapterView.getItemAtPosition(i).toString();
+//                        if(Helper.isnightmodeon.equals("no")){
+//                            ((TextView) adapterView.getChildAt(0)).setTextColor(Color.BLACK);
+//
+//                        }
+//                        else if(Helper.isnightmodeon.equals("yes")){
+//                            ((TextView) adapterView.getChildAt(0)).setTextColor(Color.WHITE);
+//
+//                        }
+//                    }
+//
+//                    @Override
+//                    public void onNothingSelected(AdapterView<?> adapterView) {
+//
+//                    }
+//                });
+//
+//                Button saveTaskButton = bottomsheetview.findViewById(R.id.saveTaskButton);
+//                final EditText habit = bottomsheetview.findViewById(R.id.habit);
+//                final EditText detail = bottomsheetview.findViewById(R.id.detail);
+//
+//                saveTaskButton.setOnClickListener(new View.OnClickListener() {
+//                    @Override
+//                    public void onClick(View view) {
+//
+//                        String habit_text = habit.getText().toString();
+//                        String detail_text = detail.getText().toString();
+//                        //String formattedDate = df.format(c);
+//                        try {
+//
+//                        } catch (SQLiteException e) {
+//                        }
+//                        if(habit_text.equals("")){
+//
+//                        }
+//                        db.insert_habits(Helper.habitsdata.size(),formattedDate, habit_text, detail_text, catagoryselected);
+//                        db.show_habits_data();
+//
+//                        Helper.SelectedButtonOfTodayTab=0;
+//                        Intent i=new Intent(getActivity(), MainActivity.class);
+//                        startActivity(i);
+//                        getActivity().overridePendingTransition(0,0);
+//                        bottomSheetDialog.dismiss();
+//                    }
+//
+//                });
+//                spinner.setAdapter((SpinnerAdapter) arrayAdapter);
+//                bottomSheetDialog.setContentView(bottomsheetview);
+//                bottomSheetDialog.show();
+//
+//
+//            }
+//        });
         setDataInList();
         return view;
 
diff --git a/app/src/main/java/rocks/poopjournal/todont/Fragments/LabelsAdapter.java b/app/src/main/java/rocks/poopjournal/todont/Fragments/LabelsAdapter.java
index f725ff2c..6d9e1941 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Fragments/LabelsAdapter.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Fragments/LabelsAdapter.java
@@ -1,113 +1,113 @@
-package rocks.poopjournal.todont.Fragments;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.ArrayList;
-
-import rocks.poopjournal.todont.Db_Controller;
-import rocks.poopjournal.todont.Helper;
-import rocks.poopjournal.todont.Labels;
-import rocks.poopjournal.todont.R;
-
-
-public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.RecyclerViewHolder> {
-    private ArrayList<String> labels_list=new ArrayList<>();
-    Context con;
-    Db_Controller db;
-
-    public LabelsAdapter(Context con, Db_Controller db, ArrayList<String> labels_list) {
-        this.labels_list = labels_list;
-        this.con = con;
-        this.db=db;
-
-    }
-
-    @NonNull
-    @Override
-    public LabelsAdapter.RecyclerViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int viewType) {
-        LayoutInflater inflater = LayoutInflater.from(viewGroup.getContext());
-        View view = inflater.inflate(R.layout.labels_recyclerview_layout, viewGroup, false);
-        return new RecyclerViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull LabelsAdapter.RecyclerViewHolder holder, final int position) {
-        final String dTask=labels_list.get(position);
-        holder.tv_label.setText(dTask);
-        db.getNightMode();
-        int count=db.countLabels(dTask);
-        if(count>1){
-            holder.tv_sum.setText(""+count+ " habits");
-        }
-        else{
-            holder.tv_sum.setText(""+count+ " habit");
-        }
-        if(Helper.isnightmodeon.equals("no")){
-            holder.btnlabel.setBackgroundResource(R.drawable.ic_label_light_labels);
-        }
-        else if(Helper.isnightmodeon.equals("yes")){
-            holder.btnlabel.setBackgroundResource(R.drawable.ic_label_dark_labels);
-        }
-//        holder.btndelete.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View view) {
-//                AlertDialog.Builder builder1 = new AlertDialog.Builder(con);
-//                builder1.setMessage("Do you really want to delete this?");
-//                builder1.setCancelable(true);
-//                builder1.setPositiveButton(
-//                        "Yes",
-//                        new DialogInterface.OnClickListener() {
-//                            public void onClick(DialogInterface dialog, int id) {
-//                                db.delete_label(dTask);
-//                                Intent intent = new Intent(con, Labels.class);
-//                                con.startActivity(intent);
-//                                ((Activity) con).overridePendingTransition(0, 0);
-//                                dialog.cancel();
-//                            }
-//                        });
-//
-//                builder1.setNegativeButton(
-//                        "No",
-//                        new DialogInterface.OnClickListener() {
-//                            public void onClick(DialogInterface dialog, int id) {
-//                                dialog.cancel();
-//                            }
-//                        });
-//
-//                AlertDialog alert11 = builder1.create();
-//                alert11.show();
-//
-//            }
-//        });
-
-    }
-
-    @Override
-    public int getItemCount() {
-        return labels_list.size();
-    }
-
-    public class RecyclerViewHolder extends RecyclerView.ViewHolder {
-        TextView tv_label,tv_sum;
-        Button  btnlabel;
-        public RecyclerViewHolder(@NonNull View itemView) {
-            super(itemView);
-            tv_label = itemView.findViewById(R.id.tv_label);
-            tv_sum = itemView.findViewById(R.id.tv_sum);
-            btnlabel=itemView.findViewById(R.id.labelsbtn);
-
-        }
-    }
-}
+package rocks.poopjournal.todont.Fragments;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.ArrayList;
+
+import rocks.poopjournal.todont.Db_Controller;
+import rocks.poopjournal.todont.Helper;
+import rocks.poopjournal.todont.Labels;
+import rocks.poopjournal.todont.R;
+
+
+public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.RecyclerViewHolder> {
+    private ArrayList<String> labels_list=new ArrayList<>();
+    Context con;
+    Db_Controller db;
+
+    public LabelsAdapter(Context con, Db_Controller db, ArrayList<String> labels_list) {
+        this.labels_list = labels_list;
+        this.con = con;
+        this.db=db;
+
+    }
+
+    @NonNull
+    @Override
+    public LabelsAdapter.RecyclerViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int viewType) {
+        LayoutInflater inflater = LayoutInflater.from(viewGroup.getContext());
+        View view = inflater.inflate(R.layout.labels_recyclerview_layout, viewGroup, false);
+        return new RecyclerViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull LabelsAdapter.RecyclerViewHolder holder, final int position) {
+        final String dTask=labels_list.get(position);
+        holder.tv_label.setText(dTask);
+        db.getNightMode();
+        int count=db.countLabels(dTask);
+        if(count>1){
+            holder.tv_sum.setText(""+count+ " habits");
+        }
+        else{
+            holder.tv_sum.setText(""+count+ " habit");
+        }
+//        if(Helper.isnightmodeon.equals("no")){
+            holder.btnlabel.setBackgroundResource(R.drawable.ic_label_light_labels);
+//        }
+//        else if(Helper.isnightmodeon.equals("yes")){
+//            holder.btnlabel.setBackgroundResource(R.drawable.ic_label_dark_labels);
+//        }
+//        holder.btndelete.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                AlertDialog.Builder builder1 = new AlertDialog.Builder(con);
+//                builder1.setMessage("Do you really want to delete this?");
+//                builder1.setCancelable(true);
+//                builder1.setPositiveButton(
+//                        "Yes",
+//                        new DialogInterface.OnClickListener() {
+//                            public void onClick(DialogInterface dialog, int id) {
+//                                db.delete_label(dTask);
+//                                Intent intent = new Intent(con, Labels.class);
+//                                con.startActivity(intent);
+//                                ((Activity) con).overridePendingTransition(0, 0);
+//                                dialog.cancel();
+//                            }
+//                        });
+//
+//                builder1.setNegativeButton(
+//                        "No",
+//                        new DialogInterface.OnClickListener() {
+//                            public void onClick(DialogInterface dialog, int id) {
+//                                dialog.cancel();
+//                            }
+//                        });
+//
+//                AlertDialog alert11 = builder1.create();
+//                alert11.show();
+//
+//            }
+//        });
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return labels_list.size();
+    }
+
+    public class RecyclerViewHolder extends RecyclerView.ViewHolder {
+        TextView tv_label,tv_sum;
+        Button  btnlabel;
+        public RecyclerViewHolder(@NonNull View itemView) {
+            super(itemView);
+            tv_label = itemView.findViewById(R.id.tv_label);
+            tv_sum = itemView.findViewById(R.id.tv_sum);
+            btnlabel=itemView.findViewById(R.id.labelsbtn);
+
+        }
+    }
+}
diff --git a/app/src/main/java/rocks/poopjournal/todont/Fragments/MonthlyFragment.java b/app/src/main/java/rocks/poopjournal/todont/Fragments/MonthlyFragment.java
index cca0ded3..e176fdad 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Fragments/MonthlyFragment.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Fragments/MonthlyFragment.java
@@ -1,379 +1,379 @@
-package rocks.poopjournal.todont.Fragments;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.os.Handler;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-import androidx.fragment.app.Fragment;
-
-import com.github.mikephil.charting.charts.PieChart;
-import com.github.mikephil.charting.components.Description;
-import com.github.mikephil.charting.components.Legend;
-import com.github.mikephil.charting.data.PieData;
-import com.github.mikephil.charting.data.PieDataSet;
-import com.github.mikephil.charting.data.PieEntry;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-import java.util.Locale;
-
-import rocks.poopjournal.todont.Db_Controller;
-import rocks.poopjournal.todont.Helper;
-import rocks.poopjournal.todont.R;
-
-import static java.util.Calendar.getInstance;
-
-public class MonthlyFragment extends Fragment {
-    Calendar c = getInstance();
-    Calendar d = getInstance();
-    Calendar e = getInstance();
-    SimpleDateFormat df;
-    Db_Controller db;
-    TextView date, year, mostavoided, leastavoided, daterange;
-    Button btnbefore, btnafter;
-    String formattedDate;
-    String getmostAvoidedHabit;
-    SharedPreferences prefs;
-    String checkDate;
-    PieChart pieChart;
-    String curmonth;
-    String[] splitteddate;
-    String b_month;
-    int b_year;
-    double habitsSize, avoidedSize;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_monthly, container, false);
-        db = new Db_Controller(getActivity(), "", null, 2);
-        df = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
-        prefs = getContext().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE);
-        pieChart = view.findViewById(R.id.pieChart);
-        checkDate = prefs.getString("InitialDate", "");
-        Helper.SelectedButtonOfLogTab = 2;
-        date = view.findViewById(R.id.date);
-        year = view.findViewById(R.id.year);
-        pieChart = view.findViewById(R.id.pieChart);
-        btnbefore = view.findViewById(R.id.before);
-        btnafter = view.findViewById(R.id.after);
-        btnbefore.setBackgroundResource(R.drawable.ic_backarrow);
-        btnafter.setBackgroundResource(R.drawable.ic_nextarrow);
-        daterange = view.findViewById(R.id.daterange);
-        mostavoided = view.findViewById(R.id.mostavoided);
-        leastavoided = view.findViewById(R.id.leastavoided);
-        db.show_habits_data();
-        final String cur_date = df.format(c.getTime());
-        splitteddate = cur_date.split("-");
-        setMonth(splitteddate[1]);
-        b_year = Integer.parseInt(splitteddate[0]);
-        date.setText("" + curmonth);
-        year.setText("" + splitteddate[0]);
-        String newDate = splitteddate[0] + "-" + splitteddate[1] + "-01";
-        String newDate1 = splitteddate[0] + "-" + splitteddate[1] + "-31";
-        Log.d("splitteddate333 ", "" + newDate + " * " + newDate1);
-        String avoided = db.getMonthlyAvoidedData(newDate, newDate1);
-        String done = db.getMonthlyDoneData(newDate, newDate1);
-        mostavoided.setText("" + avoided);
-        leastavoided.setText("" + done);
-        habitsSize = Helper.habitsdata.size() * 30;
-        avoidedSize = Helper.avoidedmonthlydata.size();
-        double per = (avoidedSize / habitsSize) * 100;
-        Log.d("percentage", "per : " + per + " monthly" + Helper.avoidedmonthlydata.size() + "total" + Helper.habitsdata.size());
-        funcPieChart((int) per);
-        String[] checkdatea = checkDate.split("-");
-        setMonth(checkdatea[1]);
-        if (year.getText().toString().equals(checkdatea[0]) && date.getText().toString().equals(curmonth)) {
-            btnbefore.setEnabled(false);
-        }
-        else{
-            btnbefore.setEnabled(true);
-            btnafter.setEnabled(true);
-        }
-        if(year.getText().toString().equals(splitteddate[0]) && date.getText().toString().equals(curmonth)){
-            btnafter.setEnabled(false);
-        }
-        else{
-            btnafter.setEnabled(true);
-        }
-
-        btnbefore.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                btnafter.setEnabled(true);
-                btnbefore.setBackgroundResource(R.drawable.ic_backarrowpressed);
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        btnbefore.setBackgroundResource(R.drawable.ic_backarrow);
-                    }
-                }, 100);
-                String[] checkdatearray = checkDate.split("-");
-                b_year = Integer.parseInt(year.getText().toString());
-                setBeforeMonth(date.getText().toString());
-                Log.d("hehehe", "" + checkdatearray[0]);
-                Log.d("hehehe2", "" + checkdatearray[1]);
-                if ((year.getText().toString()).equals(checkdatearray[0])) {
-                    if ((b_month.equals("-" + checkdatearray[1] + "-"))) {
-                        btnbefore.setEnabled(false);
-                    }
-                }
-                if (curmonth.equals("December")) {
-                    b_year--;
-                }
-                date.setText("" + curmonth);
-                year.setText("" + b_year);
-                String newDate = b_year + b_month + "01";
-                String newDate1 = b_year + b_month + "31";
-                Log.d("sssssssss", "" + newDate + " * " + newDate1);
-                String avoided = db.getMonthlyAvoidedData(newDate, newDate1);
-                String done = db.getMonthlyDoneData(newDate, newDate1);
-                mostavoided.setText("" + avoided);
-                leastavoided.setText("" + done);
-                habitsSize = Helper.habitsdata.size() * 30;
-                avoidedSize = Helper.avoidedmonthlydata.size();
-                double per = (avoidedSize / habitsSize) * 100;
-                Log.d("percentage", "per : " + per + " monthly" + Helper.avoidedmonthlydata.size() + "total" + Helper.habitsdata.size());
-                funcPieChart((int) per);
-            }
-        });
-        btnafter.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Log.d("currenttttClick", "" + curmonth);
-                btnbefore.setEnabled(true);
-                btnafter.setBackgroundResource(R.drawable.ic_nextpressed);
-                new
-                        Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        btnafter.setBackgroundResource(R.drawable.ic_nextarrow);
-                    }
-                }, 100);
-                String currdate = df.format(d.getTime());
-                String[] currdatearray = currdate.split("-");
-                b_year = Integer.parseInt(year.getText().toString());
-                Log.d("currenttttdate", "" + date.getText().toString());
-                setAfterMonth(date.getText().toString());
-                Log.d("currenttttAfterMethod", "" + curmonth);
-                Log.d("hehehe", "" + currdatearray[0]);
-                Log.d("hehehe2", "" + currdatearray[1]);
-                if ((year.getText().toString()).equals(currdatearray[0])) {
-                    Log.d("nnn", "curr : " + currdatearray[0] + " year : " + year.getText().toString());
-                    if ((b_month.equals("-" + currdatearray[1] + "-"))) {
-                        btnafter.setEnabled(false);
-                    }
-                }
-                if (curmonth.equals("January")) {
-                    b_year++;
-                }
-                date.setText("" + curmonth);
-                year.setText("" + b_year);
-                String newDate = b_year + b_month + "01";
-                String newDate1 = b_year + b_month + "31";
-                Log.d("sssssssss", "" + newDate + " * " + newDate1);
-                String avoided = db.getMonthlyAvoidedData(newDate, newDate1);
-                String done = db.getMonthlyDoneData(newDate, newDate1);
-                mostavoided.setText("" + avoided);
-                leastavoided.setText("" +done);
-                habitsSize = Helper.habitsdata.size() * 30;
-                avoidedSize = Helper.avoidedmonthlydata.size();
-                double per = (avoidedSize / habitsSize) * 100;
-                Log.d("percentage", "per : " + per + " monthly" + Helper.avoidedmonthlydata.size() + "total" + Helper.habitsdata.size());
-                funcPieChart((int) per);
-            }
-        });
-
-        return view;
-    }
-
-    public void setMonth(String s) {
-        switch (s) {
-            case "01":
-                curmonth = "January";
-                break;
-            case "02":
-                curmonth = "February";
-                break;
-            case "03":
-                curmonth = "March";
-                break;
-            case "04":
-                curmonth = "April";
-                break;
-            case "05":
-                curmonth = "May";
-                break;
-            case "06":
-                curmonth = "June";
-                break;
-            case "07":
-                curmonth = "July";
-                break;
-            case "08":
-                curmonth = "August";
-                break;
-            case "09":
-                curmonth = "September";
-                break;
-            case "10":
-                curmonth = "October";
-                break;
-            case "11":
-                curmonth = "November";
-                break;
-            case "12":
-                curmonth = "December";
-                break;
-            default:
-                curmonth = "";
-                break;
-
-
-        }
-    }
-
-    public void setBeforeMonth(String s) {
-        switch (s) {
-            case "January":
-                curmonth = "December";
-                b_month = "-12-";
-                break;
-            case "February":
-                curmonth = "January";
-                b_month = "-01-";
-                break;
-            case "March":
-                curmonth = "February";
-                b_month = "-02-";
-                break;
-            case "April":
-                curmonth = "March";
-                b_month = "-03-";
-                break;
-            case "May":
-                curmonth = "April";
-                b_month = "-04-";
-                break;
-            case "June":
-                curmonth = "May";
-                b_month = "-05-";
-                break;
-            case "July":
-                curmonth = "June";
-                b_month = "-06-";
-                break;
-            case "August":
-                curmonth = "July";
-                b_month = "-07-";
-                break;
-            case "September":
-                curmonth = "August";
-                b_month = "-08-";
-                break;
-            case "October":
-                curmonth = "September";
-                b_month = "-09-";
-                break;
-            case "November":
-                curmonth = "October";
-                b_month = "-10-";
-                break;
-            case "December":
-                curmonth = "November";
-                b_month = "-11-";
-                break;
-            default:
-                curmonth = "";
-                break;
-        }
-
-    }
-
-    public void setAfterMonth(String s) {
-        switch (s) {
-            case "December":
-                curmonth = "January";
-                b_month = "-01-";
-                break;
-            case "January":
-                curmonth = "February";
-                b_month = "-02-";
-                break;
-            case "February":
-                curmonth = "March";
-                b_month = "-03-";
-                break;
-            case "March":
-                curmonth = "April";
-                b_month = "-04-";
-                break;
-            case "April":
-                curmonth = "May";
-                b_month = "-05-";
-                break;
-            case "May":
-                curmonth = "June";
-                b_month = "-06-";
-                break;
-            case "June":
-                curmonth = "July";
-                b_month = "-07-";
-                break;
-            case "July":
-                curmonth = "August";
-                b_month = "-08-";
-                break;
-            case "August":
-                curmonth = "September";
-                b_month = "-09-";
-                break;
-            case "September":
-                curmonth = "October";
-                b_month = "-10-";
-                break;
-            case "October":
-                curmonth = "November";
-                b_month = "-11-";
-                break;
-            case "November":
-                curmonth = "December";
-                b_month = "-12-";
-                break;
-            default:
-                curmonth = "";
-                break;
-        }
-
-    }
-
-    public void funcPieChart(int avoidedPer) {
-        pieChart.setUsePercentValues(true);
-        List<PieEntry> value = new ArrayList<>();
-        value.add(new PieEntry((float) avoidedPer, "Avoided"));
-        value.add(new PieEntry((float) (100.0 - avoidedPer), "Habits"));
-        PieDataSet pieDataSet = new PieDataSet(value, "");
-        pieDataSet.setValueTextColor(Color.WHITE);
-        PieData pieData = new PieData(pieDataSet);
-        pieChart.setData(pieData);
-        pieDataSet.setColors(new int[]{Color.parseColor("#FFAF01"), Color.parseColor("#26272c")});
-        Legend legend = pieChart.getLegend();
-        legend.setEnabled(false);
-        Description description = new Description();
-        description.setText("");
-        pieChart.setDescription(description);
-        pieChart.setHoleRadius(50f);
-        pieChart.setHoleColor(getResources().getColor(R.color.backgroundcolor));
-        pieChart.setTransparentCircleRadius(50f);
-        pieChart.animateXY(1000, 1000);
-    }
+package rocks.poopjournal.todont.Fragments;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+import androidx.fragment.app.Fragment;
+
+import com.github.mikephil.charting.charts.PieChart;
+import com.github.mikephil.charting.components.Description;
+import com.github.mikephil.charting.components.Legend;
+import com.github.mikephil.charting.data.PieData;
+import com.github.mikephil.charting.data.PieDataSet;
+import com.github.mikephil.charting.data.PieEntry;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Locale;
+
+import rocks.poopjournal.todont.Db_Controller;
+import rocks.poopjournal.todont.Helper;
+import rocks.poopjournal.todont.R;
+
+import static java.util.Calendar.getInstance;
+
+public class MonthlyFragment extends Fragment {
+    Calendar c = getInstance();
+    Calendar d = getInstance();
+    Calendar e = getInstance();
+    SimpleDateFormat df;
+    Db_Controller db;
+    TextView date, year, mostavoided, leastavoided, daterange;
+    Button btnbefore, btnafter;
+    String formattedDate;
+    String getmostAvoidedHabit;
+    SharedPreferences prefs;
+    String checkDate;
+    PieChart pieChart;
+    String curmonth;
+    String[] splitteddate;
+    String b_month;
+    int b_year;
+    double habitsSize, avoidedSize;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_monthly, container, false);
+        db = new Db_Controller(getActivity(), "", null, 2);
+        df = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
+        prefs = getContext().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE);
+        pieChart = view.findViewById(R.id.pieChart);
+        checkDate = prefs.getString("InitialDate", "");
+        Helper.SelectedButtonOfLogTab = 2;
+        date = view.findViewById(R.id.date);
+        year = view.findViewById(R.id.year);
+        pieChart = view.findViewById(R.id.pieChart);
+        btnbefore = view.findViewById(R.id.before);
+        btnafter = view.findViewById(R.id.after);
+        btnbefore.setBackgroundResource(R.drawable.ic_backarrow);
+        btnafter.setBackgroundResource(R.drawable.ic_nextarrow);
+        daterange = view.findViewById(R.id.daterange);
+        mostavoided = view.findViewById(R.id.mostavoided);
+        leastavoided = view.findViewById(R.id.leastavoided);
+        db.show_habits_data();
+        final String cur_date = df.format(c.getTime());
+        splitteddate = cur_date.split("-");
+        setMonth(splitteddate[1]);
+        b_year = Integer.parseInt(splitteddate[0]);
+        date.setText("" + curmonth);
+        year.setText("" + splitteddate[0]);
+        String newDate = splitteddate[0] + "-" + splitteddate[1] + "-01";
+        String newDate1 = splitteddate[0] + "-" + splitteddate[1] + "-31";
+        Log.d("splitteddate333 ", "" + newDate + " * " + newDate1);
+        String avoided = db.getMonthlyAvoidedData(newDate, newDate1);
+        String done = db.getMonthlyDoneData(newDate, newDate1);
+        mostavoided.setText("" + avoided);
+        leastavoided.setText("" + done);
+        habitsSize = Helper.habitsdata.size() * 30;
+        avoidedSize = Helper.avoidedmonthlydata.size();
+        double per = (avoidedSize / habitsSize) * 100;
+        Log.d("percentage", "per : " + per + " monthly" + Helper.avoidedmonthlydata.size() + "total" + Helper.habitsdata.size());
+        funcPieChart((int) per);
+        String[] checkdatea = checkDate.split("-");
+        setMonth(checkdatea[1]);
+        if (year.getText().toString().equals(checkdatea[0]) && date.getText().toString().equals(curmonth)) {
+            btnbefore.setEnabled(false);
+        }
+        else{
+            btnbefore.setEnabled(true);
+            btnafter.setEnabled(true);
+        }
+        if(year.getText().toString().equals(splitteddate[0]) && date.getText().toString().equals(curmonth)){
+            btnafter.setEnabled(false);
+        }
+        else{
+            btnafter.setEnabled(true);
+        }
+
+        btnbefore.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                btnafter.setEnabled(true);
+                btnbefore.setBackgroundResource(R.drawable.ic_backarrowpressed);
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        btnbefore.setBackgroundResource(R.drawable.ic_backarrow);
+                    }
+                }, 100);
+                String[] checkdatearray = checkDate.split("-");
+                b_year = Integer.parseInt(year.getText().toString());
+                setBeforeMonth(date.getText().toString());
+                Log.d("hehehe", "" + checkdatearray[0]);
+                Log.d("hehehe2", "" + checkdatearray[1]);
+                if ((year.getText().toString()).equals(checkdatearray[0])) {
+                    if ((b_month.equals("-" + checkdatearray[1] + "-"))) {
+                        btnbefore.setEnabled(false);
+                    }
+                }
+                if (curmonth.equals("December")) {
+                    b_year--;
+                }
+                date.setText("" + curmonth);
+                year.setText("" + b_year);
+                String newDate = b_year + b_month + "01";
+                String newDate1 = b_year + b_month + "31";
+                Log.d("sssssssss", "" + newDate + " * " + newDate1);
+                String avoided = db.getMonthlyAvoidedData(newDate, newDate1);
+                String done = db.getMonthlyDoneData(newDate, newDate1);
+                mostavoided.setText("" + avoided);
+                leastavoided.setText("" + done);
+                habitsSize = Helper.habitsdata.size() * 30;
+                avoidedSize = Helper.avoidedmonthlydata.size();
+                double per = (avoidedSize / habitsSize) * 100;
+                Log.d("percentage", "per : " + per + " monthly" + Helper.avoidedmonthlydata.size() + "total" + Helper.habitsdata.size());
+                funcPieChart((int) per);
+            }
+        });
+        btnafter.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Log.d("currenttttClick", "" + curmonth);
+                btnbefore.setEnabled(true);
+                btnafter.setBackgroundResource(R.drawable.ic_nextpressed);
+                new
+                        Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        btnafter.setBackgroundResource(R.drawable.ic_nextarrow);
+                    }
+                }, 100);
+                String currdate = df.format(d.getTime());
+                String[] currdatearray = currdate.split("-");
+                b_year = Integer.parseInt(year.getText().toString());
+                Log.d("currenttttdate", "" + date.getText().toString());
+                setAfterMonth(date.getText().toString());
+                Log.d("currenttttAfterMethod", "" + curmonth);
+                Log.d("hehehe", "" + currdatearray[0]);
+                Log.d("hehehe2", "" + currdatearray[1]);
+                if ((year.getText().toString()).equals(currdatearray[0])) {
+                    Log.d("nnn", "curr : " + currdatearray[0] + " year : " + year.getText().toString());
+                    if ((b_month.equals("-" + currdatearray[1] + "-"))) {
+                        btnafter.setEnabled(false);
+                    }
+                }
+                if (curmonth.equals("January")) {
+                    b_year++;
+                }
+                date.setText("" + curmonth);
+                year.setText("" + b_year);
+                String newDate = b_year + b_month + "01";
+                String newDate1 = b_year + b_month + "31";
+                Log.d("sssssssss", "" + newDate + " * " + newDate1);
+                String avoided = db.getMonthlyAvoidedData(newDate, newDate1);
+                String done = db.getMonthlyDoneData(newDate, newDate1);
+                mostavoided.setText("" + avoided);
+                leastavoided.setText("" +done);
+                habitsSize = Helper.habitsdata.size() * 30;
+                avoidedSize = Helper.avoidedmonthlydata.size();
+                double per = (avoidedSize / habitsSize) * 100;
+                Log.d("percentage", "per : " + per + " monthly" + Helper.avoidedmonthlydata.size() + "total" + Helper.habitsdata.size());
+                funcPieChart((int) per);
+            }
+        });
+
+        return view;
+    }
+
+    public void setMonth(String s) {
+        switch (s) {
+            case "01":
+                curmonth = "January";
+                break;
+            case "02":
+                curmonth = "February";
+                break;
+            case "03":
+                curmonth = "March";
+                break;
+            case "04":
+                curmonth = "April";
+                break;
+            case "05":
+                curmonth = "May";
+                break;
+            case "06":
+                curmonth = "June";
+                break;
+            case "07":
+                curmonth = "July";
+                break;
+            case "08":
+                curmonth = "August";
+                break;
+            case "09":
+                curmonth = "September";
+                break;
+            case "10":
+                curmonth = "October";
+                break;
+            case "11":
+                curmonth = "November";
+                break;
+            case "12":
+                curmonth = "December";
+                break;
+            default:
+                curmonth = "";
+                break;
+
+
+        }
+    }
+
+    public void setBeforeMonth(String s) {
+        switch (s) {
+            case "January":
+                curmonth = "December";
+                b_month = "-12-";
+                break;
+            case "February":
+                curmonth = "January";
+                b_month = "-01-";
+                break;
+            case "March":
+                curmonth = "February";
+                b_month = "-02-";
+                break;
+            case "April":
+                curmonth = "March";
+                b_month = "-03-";
+                break;
+            case "May":
+                curmonth = "April";
+                b_month = "-04-";
+                break;
+            case "June":
+                curmonth = "May";
+                b_month = "-05-";
+                break;
+            case "July":
+                curmonth = "June";
+                b_month = "-06-";
+                break;
+            case "August":
+                curmonth = "July";
+                b_month = "-07-";
+                break;
+            case "September":
+                curmonth = "August";
+                b_month = "-08-";
+                break;
+            case "October":
+                curmonth = "September";
+                b_month = "-09-";
+                break;
+            case "November":
+                curmonth = "October";
+                b_month = "-10-";
+                break;
+            case "December":
+                curmonth = "November";
+                b_month = "-11-";
+                break;
+            default:
+                curmonth = "";
+                break;
+        }
+
+    }
+
+    public void setAfterMonth(String s) {
+        switch (s) {
+            case "December":
+                curmonth = "January";
+                b_month = "-01-";
+                break;
+            case "January":
+                curmonth = "February";
+                b_month = "-02-";
+                break;
+            case "February":
+                curmonth = "March";
+                b_month = "-03-";
+                break;
+            case "March":
+                curmonth = "April";
+                b_month = "-04-";
+                break;
+            case "April":
+                curmonth = "May";
+                b_month = "-05-";
+                break;
+            case "May":
+                curmonth = "June";
+                b_month = "-06-";
+                break;
+            case "June":
+                curmonth = "July";
+                b_month = "-07-";
+                break;
+            case "July":
+                curmonth = "August";
+                b_month = "-08-";
+                break;
+            case "August":
+                curmonth = "September";
+                b_month = "-09-";
+                break;
+            case "September":
+                curmonth = "October";
+                b_month = "-10-";
+                break;
+            case "October":
+                curmonth = "November";
+                b_month = "-11-";
+                break;
+            case "November":
+                curmonth = "December";
+                b_month = "-12-";
+                break;
+            default:
+                curmonth = "";
+                break;
+        }
+
+    }
+
+    public void funcPieChart(int avoidedPer) {
+        pieChart.setUsePercentValues(true);
+        List<PieEntry> value = new ArrayList<>();
+        value.add(new PieEntry((float) avoidedPer, "Avoided"));
+        value.add(new PieEntry((float) (100.0 - avoidedPer), "Habits"));
+        PieDataSet pieDataSet = new PieDataSet(value, "");
+        pieDataSet.setValueTextColor(Color.WHITE);
+        PieData pieData = new PieData(pieDataSet);
+        pieChart.setData(pieData);
+        pieDataSet.setColors(new int[]{Color.parseColor("#FFAF01"), Color.parseColor("#26272c")});
+        Legend legend = pieChart.getLegend();
+        legend.setEnabled(false);
+        Description description = new Description();
+        description.setText("");
+        pieChart.setDescription(description);
+        pieChart.setHoleRadius(50f);
+        pieChart.setHoleColor(getResources().getColor(R.color.backgroundcolor));
+        pieChart.setTransparentCircleRadius(50f);
+        pieChart.animateXY(1000, 1000);
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/rocks/poopjournal/todont/Fragments/WeeklyFragment.java b/app/src/main/java/rocks/poopjournal/todont/Fragments/WeeklyFragment.java
index bbcbe1ed..1c47eb4e 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Fragments/WeeklyFragment.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Fragments/WeeklyFragment.java
@@ -1,194 +1,194 @@
-package rocks.poopjournal.todont.Fragments;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.os.Handler;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.fragment.app.Fragment;
-
-import com.github.mikephil.charting.charts.PieChart;
-import com.github.mikephil.charting.components.Description;
-import com.github.mikephil.charting.components.Legend;
-import com.github.mikephil.charting.data.PieData;
-import com.github.mikephil.charting.data.PieDataSet;
-import com.github.mikephil.charting.data.PieEntry;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-import java.util.Locale;
-
-import rocks.poopjournal.todont.Db_Controller;
-import rocks.poopjournal.todont.Helper;
-import rocks.poopjournal.todont.R;
-
-import static java.util.Calendar.getInstance;
-
-public class WeeklyFragment extends Fragment {
-    Calendar c = getInstance();
-    Calendar d = getInstance();
-    SimpleDateFormat df;
-    Db_Controller db;
-    TextView date, mostavoided, leastavoided, daterange;
-    Button btnbefore, btnafter;
-    SharedPreferences prefs;
-    String checkDate;
-    PieChart pieChart;
-    int count = 0;
-    double habitsSize, avoidedSize;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_weekly, container, false);
-        db = new Db_Controller(getActivity(), "", null, 2);
-        df = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
-        prefs = getContext().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE);
-        pieChart = view.findViewById(R.id.pieChart);
-        checkDate = prefs.getString("InitialDate", "");
-        Helper.SelectedButtonOfLogTab = 1;
-        date = view.findViewById(R.id.date);
-        btnbefore = view.findViewById(R.id.before);
-        btnafter = view.findViewById(R.id.after);
-        btnbefore.setBackgroundResource(R.drawable.ic_backarrow);
-        btnafter.setBackgroundResource(R.drawable.ic_nextarrow);
-        daterange = view.findViewById(R.id.daterange);
-        date.setText("" + df.format(c.getTime()));
-        mostavoided = view.findViewById(R.id.mostavoided);
-        leastavoided = view.findViewById(R.id.leastavoided);
-        db.show_habits_data();
-
-        for (int i = 0; i < 7; i++) {
-            if (df.format(c.getTime()).equals(checkDate)) {
-
-                break;
-            } else {
-                c.add(Calendar.DATE, -1);
-            }
-        }
-        String get = db.getWeeklyAvoidedRecord(df.format(c.getTime()), date.getText().toString());
-        String getdone = db.getWeeklyDoneRecord(df.format(c.getTime()), date.getText().toString());
-        daterange.setText(df.format(c.getTime()) + " To " + date.getText().toString());
-
-        mostavoided.setText("" + get);
-        leastavoided.setText("" + getdone);
-
-        habitsSize = Helper.habitsdata.size() * 7;
-        avoidedSize = Helper.avoidedweeklydata.size();
-        double per = (avoidedSize / habitsSize) * 100;
-        Log.d("percentage", "per : " + per + " weekly" + Helper.avoidedweeklydata.size() + "total" + Helper.habitsdata.size());
-        funcPieChart((int) per);
-
-        btnbefore.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if(count!=0){
-                    count=0;
-                }
-                btnafter.setEnabled(true);
-                btnbefore.setBackgroundResource(R.drawable.ic_backarrowpressed);
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        btnbefore.setBackgroundResource(R.drawable.ic_backarrow);
-                    }
-                }, 100);
-                btnafter.setEnabled(true);
-                date.setText("" + df.format(c.getTime()));
-
-                for (int i = 0; i < 7; i++) {
-                    if (df.format(c.getTime()).equals(checkDate)) {
-                       //nothing
-                        break;
-                    } else {
-                        c.add(Calendar.DATE, -1);
-                        count++;
-                    }
-                }
-                String get = db.getWeeklyAvoidedRecord(df.format(c.getTime()), date.getText().toString());
-                String getdone = db.getWeeklyDoneRecord(df.format(c.getTime()), date.getText().toString());
-                daterange.setText(df.format(c.getTime()) + " To " + date.getText().toString());
-                mostavoided.setText("" + get);
-                leastavoided.setText("" + getdone);
-                habitsSize = Helper.habitsdata.size() * 7;
-                avoidedSize = Helper.avoidedweeklydata.size();
-                double per = (avoidedSize / habitsSize) * 100;
-                Log.d("percentage", "per : " + per + " weekly" + Helper.avoidedweeklydata.size() + "total" + Helper.habitsdata.size());
-                funcPieChart((int) per);
-//
-
-            }
-        });
-        btnafter.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                String abhikidate=date.getText().toString();
-                c.add(Calendar.DATE,count);
-                String currdate = df.format(d.getTime());
-                btnbefore.setEnabled(true);
-                btnafter.setBackgroundResource(R.drawable.ic_nextpressed);
-                new
-                        Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        btnafter.setBackgroundResource(R.drawable.ic_nextarrow);
-                    }
-                }, 100);
-                for (int i = 0; i < 7; i++) {
-                    if (df.format(c.getTime()).equals(currdate)) {
-                     //nothing
-                        break;
-                    } else {
-                        c.add(Calendar.DATE, +1);
-                    }
-                }
-                date.setText("" + df.format(c.getTime()));
-
-                String get = db.getWeeklyAvoidedRecord(abhikidate, df.format(c.getTime()));
-                String getdone = db.getWeeklyDoneRecord(abhikidate, df.format(c.getTime()));
-                daterange.setText( abhikidate+ " To " + df.format(c.getTime()));
-                mostavoided.setText("" + get);
-                leastavoided.setText("" + getdone);
-                habitsSize = Helper.habitsdata.size() * 7;
-                avoidedSize = Helper.avoidedweeklydata.size();
-                double per = (avoidedSize / habitsSize) * 100;
-                Log.d("percentage", "per : " + per + " weekly" + Helper.avoidedweeklydata.size() + "total" + Helper.habitsdata.size());
-                funcPieChart((int) per);
-                count=0;
-            }
-        });
-        return view;
-    }
-
-    public void funcPieChart(int avoidedPer) {
-        pieChart.setUsePercentValues(true);
-        List<PieEntry> value = new ArrayList<>();
-        value.add(new PieEntry((float) avoidedPer, "Avoided"));
-        value.add(new PieEntry((float) (100.0 - avoidedPer), "Habits"));
-        PieDataSet pieDataSet = new PieDataSet(value, "");
-        pieDataSet.setValueTextColor(Color.WHITE);
-        PieData pieData = new PieData(pieDataSet);
-        pieChart.setData(pieData);
-        pieDataSet.setColors(new int[]{Color.parseColor("#FFAF01"), Color.parseColor("#26272c")});
-        Legend legend = pieChart.getLegend();
-        legend.setEnabled(false);
-        Description description = new Description();
-        description.setText("");
-        pieChart.setDescription(description);
-        pieChart.setHoleRadius(50f);
-        pieChart.setHoleColor(getResources().getColor(R.color.backgroundcolor));
-        pieChart.setTransparentCircleRadius(50f);
-        pieChart.animateXY(1000, 1000);
-    }
+package rocks.poopjournal.todont.Fragments;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.fragment.app.Fragment;
+
+import com.github.mikephil.charting.charts.PieChart;
+import com.github.mikephil.charting.components.Description;
+import com.github.mikephil.charting.components.Legend;
+import com.github.mikephil.charting.data.PieData;
+import com.github.mikephil.charting.data.PieDataSet;
+import com.github.mikephil.charting.data.PieEntry;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Locale;
+
+import rocks.poopjournal.todont.Db_Controller;
+import rocks.poopjournal.todont.Helper;
+import rocks.poopjournal.todont.R;
+
+import static java.util.Calendar.getInstance;
+
+public class WeeklyFragment extends Fragment {
+    Calendar c = getInstance();
+    Calendar d = getInstance();
+    SimpleDateFormat df;
+    Db_Controller db;
+    TextView date, mostavoided, leastavoided, daterange;
+    Button btnbefore, btnafter;
+    SharedPreferences prefs;
+    String checkDate;
+    PieChart pieChart;
+    int count = 0;
+    double habitsSize, avoidedSize;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_weekly, container, false);
+        db = new Db_Controller(getActivity(), "", null, 2);
+        df = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
+        prefs = getContext().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE);
+        pieChart = view.findViewById(R.id.pieChart);
+        checkDate = prefs.getString("InitialDate", "");
+        Helper.SelectedButtonOfLogTab = 1;
+        date = view.findViewById(R.id.date);
+        btnbefore = view.findViewById(R.id.before);
+        btnafter = view.findViewById(R.id.after);
+        btnbefore.setBackgroundResource(R.drawable.ic_backarrow);
+        btnafter.setBackgroundResource(R.drawable.ic_nextarrow);
+        daterange = view.findViewById(R.id.daterange);
+        date.setText("" + df.format(c.getTime()));
+        mostavoided = view.findViewById(R.id.mostavoided);
+        leastavoided = view.findViewById(R.id.leastavoided);
+        db.show_habits_data();
+
+        for (int i = 0; i < 7; i++) {
+            if (df.format(c.getTime()).equals(checkDate)) {
+
+                break;
+            } else {
+                c.add(Calendar.DATE, -1);
+            }
+        }
+        String get = db.getWeeklyAvoidedRecord(df.format(c.getTime()), date.getText().toString());
+        String getdone = db.getWeeklyDoneRecord(df.format(c.getTime()), date.getText().toString());
+        daterange.setText(df.format(c.getTime()) + " To " + date.getText().toString());
+
+        mostavoided.setText("" + get);
+        leastavoided.setText("" + getdone);
+
+        habitsSize = Helper.habitsdata.size() * 7;
+        avoidedSize = Helper.avoidedweeklydata.size();
+        double per = (avoidedSize / habitsSize) * 100;
+        Log.d("percentage", "per : " + per + " weekly" + Helper.avoidedweeklydata.size() + "total" + Helper.habitsdata.size());
+        funcPieChart((int) per);
+
+        btnbefore.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if(count!=0){
+                    count=0;
+                }
+                btnafter.setEnabled(true);
+                btnbefore.setBackgroundResource(R.drawable.ic_backarrowpressed);
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        btnbefore.setBackgroundResource(R.drawable.ic_backarrow);
+                    }
+                }, 100);
+                btnafter.setEnabled(true);
+                date.setText("" + df.format(c.getTime()));
+
+                for (int i = 0; i < 7; i++) {
+                    if (df.format(c.getTime()).equals(checkDate)) {
+                       //nothing
+                        break;
+                    } else {
+                        c.add(Calendar.DATE, -1);
+                        count++;
+                    }
+                }
+                String get = db.getWeeklyAvoidedRecord(df.format(c.getTime()), date.getText().toString());
+                String getdone = db.getWeeklyDoneRecord(df.format(c.getTime()), date.getText().toString());
+                daterange.setText(df.format(c.getTime()) + " To " + date.getText().toString());
+                mostavoided.setText("" + get);
+                leastavoided.setText("" + getdone);
+                habitsSize = Helper.habitsdata.size() * 7;
+                avoidedSize = Helper.avoidedweeklydata.size();
+                double per = (avoidedSize / habitsSize) * 100;
+                Log.d("percentage", "per : " + per + " weekly" + Helper.avoidedweeklydata.size() + "total" + Helper.habitsdata.size());
+                funcPieChart((int) per);
+//
+
+            }
+        });
+        btnafter.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                String abhikidate=date.getText().toString();
+                c.add(Calendar.DATE,count);
+                String currdate = df.format(d.getTime());
+                btnbefore.setEnabled(true);
+                btnafter.setBackgroundResource(R.drawable.ic_nextpressed);
+                new
+                        Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        btnafter.setBackgroundResource(R.drawable.ic_nextarrow);
+                    }
+                }, 100);
+                for (int i = 0; i < 7; i++) {
+                    if (df.format(c.getTime()).equals(currdate)) {
+                     //nothing
+                        break;
+                    } else {
+                        c.add(Calendar.DATE, +1);
+                    }
+                }
+                date.setText("" + df.format(c.getTime()));
+
+                String get = db.getWeeklyAvoidedRecord(abhikidate, df.format(c.getTime()));
+                String getdone = db.getWeeklyDoneRecord(abhikidate, df.format(c.getTime()));
+                daterange.setText( abhikidate+ " To " + df.format(c.getTime()));
+                mostavoided.setText("" + get);
+                leastavoided.setText("" + getdone);
+                habitsSize = Helper.habitsdata.size() * 7;
+                avoidedSize = Helper.avoidedweeklydata.size();
+                double per = (avoidedSize / habitsSize) * 100;
+                Log.d("percentage", "per : " + per + " weekly" + Helper.avoidedweeklydata.size() + "total" + Helper.habitsdata.size());
+                funcPieChart((int) per);
+                count=0;
+            }
+        });
+        return view;
+    }
+
+    public void funcPieChart(int avoidedPer) {
+        pieChart.setUsePercentValues(true);
+        List<PieEntry> value = new ArrayList<>();
+        value.add(new PieEntry((float) avoidedPer, "Avoided"));
+        value.add(new PieEntry((float) (100.0 - avoidedPer), "Habits"));
+        PieDataSet pieDataSet = new PieDataSet(value, "");
+        pieDataSet.setValueTextColor(Color.WHITE);
+        PieData pieData = new PieData(pieDataSet);
+        pieChart.setData(pieData);
+        pieDataSet.setColors(new int[]{Color.parseColor("#FFAF01"), Color.parseColor("#26272c")});
+        Legend legend = pieChart.getLegend();
+        legend.setEnabled(false);
+        Description description = new Description();
+        description.setText("");
+        pieChart.setDescription(description);
+        pieChart.setHoleRadius(50f);
+        pieChart.setHoleColor(getResources().getColor(R.color.backgroundcolor));
+        pieChart.setTransparentCircleRadius(50f);
+        pieChart.animateXY(1000, 1000);
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/rocks/poopjournal/todont/Fragments/YearlyFragment.java b/app/src/main/java/rocks/poopjournal/todont/Fragments/YearlyFragment.java
index 4d7dc734..7c67da8a 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Fragments/YearlyFragment.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Fragments/YearlyFragment.java
@@ -1,195 +1,195 @@
-package rocks.poopjournal.todont.Fragments;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.os.Handler;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-import androidx.fragment.app.Fragment;
-import com.github.mikephil.charting.charts.PieChart;
-import com.github.mikephil.charting.components.Description;
-import com.github.mikephil.charting.components.Legend;
-import com.github.mikephil.charting.data.PieData;
-import com.github.mikephil.charting.data.PieDataSet;
-import com.github.mikephil.charting.data.PieEntry;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-import java.util.Locale;
-
-import rocks.poopjournal.todont.Db_Controller;
-import rocks.poopjournal.todont.Helper;
-import rocks.poopjournal.todont.R;
-
-import static java.util.Calendar.getInstance;
-
-public class YearlyFragment extends Fragment {
-    Calendar c = getInstance();
-    Calendar d = getInstance();
-    Calendar e = getInstance();
-    SimpleDateFormat df;
-    Db_Controller db;
-    TextView year, mostavoided, leastavoided, daterange;
-    Button btnbefore, btnafter;
-    String formattedDate;
-    String getmostAvoidedHabit;
-    SharedPreferences prefs;
-    String checkDate;
-    PieChart pieChart;
-    String curmonth;
-    String[] splitteddate;
-    String b_month;
-    int b_year;
-    double habitsSize, avoidedSize;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_yearly, container, false);
-        db = new Db_Controller(getActivity(), "", null, 2);
-        df = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
-        prefs = getContext().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE);
-        pieChart = view.findViewById(R.id.pieChart);
-        checkDate = prefs.getString("InitialDate", "");
-        Helper.SelectedButtonOfLogTab = 3;
-        year = view.findViewById(R.id.year);
-        pieChart = view.findViewById(R.id.pieChart);
-        btnbefore = view.findViewById(R.id.before);
-        btnafter = view.findViewById(R.id.after);
-        btnbefore.setBackgroundResource(R.drawable.ic_backarrow);
-        btnafter.setBackgroundResource(R.drawable.ic_nextarrow);
-        daterange = view.findViewById(R.id.daterange);
-        mostavoided = view.findViewById(R.id.mostavoided);
-        leastavoided = view.findViewById(R.id.leastavoided);
-        db.show_habits_data();
-        final String cur_date = df.format(c.getTime());
-        splitteddate = cur_date.split("-");
-        b_year = Integer.parseInt(splitteddate[0]);
-        year.setText("" + splitteddate[0]);
-        String newDate = splitteddate[0] + "-01-" + "-01";
-        String newDate1 = splitteddate[0] + "-12-" + "-31";
-        Log.d("splitteddate333 ", "" + newDate + " * " + newDate1);
-        String avoided = db.getYearlyAvoidedData(newDate, newDate1);
-        String done = db.getYearlyDoneData(newDate, newDate1);
-        mostavoided.setText("" + avoided);
-        leastavoided.setText("" + done);
-        habitsSize = Helper.habitsdata.size() * 365;
-        avoidedSize = Helper.avoidedyearlydata.size();
-        double per = (avoidedSize / habitsSize) * 100;
-        Log.d("percentage", "per : " + per + " yearly" + Helper.avoidedyearlydata.size() + "total" + Helper.habitsdata.size());
-        funcPieChart((int) per);
-        String[] checkdatea = checkDate.split("-");
-        if (year.getText().toString().equals(checkdatea[0])) {
-            btnbefore.setEnabled(false);
-        }
-        else{
-            btnbefore.setEnabled(true);
-            btnafter.setEnabled(true);
-        }
-        if(year.getText().toString().equals(splitteddate[0])){
-            btnafter.setEnabled(false);
-        }
-        else{
-            btnafter.setEnabled(true);
-        }
-
-        btnbefore.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                btnafter.setEnabled(true);
-                b_year = b_year - 1;
-
-                year.setText("" + b_year);
-                btnbefore.setBackgroundResource(R.drawable.ic_backarrowpressed);
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        btnbefore.setBackgroundResource(R.drawable.ic_backarrow);
-                    }
-                }, 100);
-                String[] checkdatearray = checkDate.split("-");
-                b_year = Integer.parseInt(year.getText().toString());
-                Log.d("fff", "" + year.getText().toString() + " ggg  " + checkdatearray[0]);
-                if ((year.getText().toString()).equals(checkdatearray[0])) {
-                    btnbefore.setEnabled(false);
-                }
-                String newDate = b_year + "-01" + "-01-";
-                String newDate1 = b_year + "-12" + "-31-";
-                Log.d("sssssssss", "" + newDate + " * " + newDate1);
-                String avoided = db.getYearlyAvoidedData(newDate, newDate1);
-                String done = db.getYearlyDoneData(newDate, newDate1);
-                mostavoided.setText("" + avoided);
-                leastavoided.setText("" + done);
-                habitsSize = Helper.habitsdata.size() * 365;
-                avoidedSize = Helper.avoidedyearlydata.size();
-                double per = (avoidedSize / habitsSize) * 100;
-                Log.d("percentage", "per : " + per + " monthly" + Helper.avoidedyearlydata.size() + "total" + Helper.habitsdata.size());
-                funcPieChart((int) per);
-            }
-        });
-        btnafter.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                btnbefore.setEnabled(true);
-                b_year = b_year + 1;
-                year.setText("" + b_year);
-                btnbefore.setBackgroundResource(R.drawable.ic_backarrowpressed);
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        btnbefore.setBackgroundResource(R.drawable.ic_backarrow);
-                    }
-                }, 100);
-                String[] checkdatearray = checkDate.split("-");
-                b_year = Integer.parseInt(year.getText().toString());
-                final String cur_date = df.format(c.getTime());
-                splitteddate = cur_date.split("-");
-                if ((year.getText().toString()).equals(splitteddate[0])) {
-                    btnafter.setEnabled(false);
-                }
-                String newDate = b_year + "-01" + "-01-";
-                String newDate1 = b_year + "-12" + "-31-";
-                String avoided = db.getYearlyAvoidedData(newDate, newDate1);
-                String done = db.getYearlyDoneData(newDate, newDate1);
-                mostavoided.setText("" + avoided);
-                leastavoided.setText("" + done);
-                habitsSize = Helper.habitsdata.size() * 365;
-                avoidedSize = Helper.avoidedyearlydata.size();
-                double per = (avoidedSize / habitsSize) * 100;
-                Log.d("percentage", "per : " + per + " monthly" + Helper.avoidedyearlydata.size() + "total" + Helper.habitsdata.size());
-                funcPieChart((int) per);
-            }
-        });
-
-        return view;
-    }
-
-
-    public void funcPieChart(int avoidedPer) {
-        pieChart.setUsePercentValues(true);
-        List<PieEntry> value = new ArrayList<>();
-        value.add(new PieEntry((float) avoidedPer, "Avoided"));
-        value.add(new PieEntry((float) (100.0 - avoidedPer), "Habits"));
-        PieDataSet pieDataSet = new PieDataSet(value, "");
-        pieDataSet.setValueTextColor(Color.WHITE);
-        PieData pieData = new PieData(pieDataSet);
-        pieChart.setData(pieData);
-        pieDataSet.setColors(new int[]{Color.parseColor("#FFAF01"), Color.parseColor("#26272c")});
-        Legend legend = pieChart.getLegend();
-        legend.setEnabled(false);
-        Description description = new Description();
-        description.setText("");
-        pieChart.setDescription(description);
-        pieChart.setHoleRadius(50f);
-        pieChart.setTransparentCircleRadius(50f);
-        pieChart.setHoleColor(getResources().getColor(R.color.backgroundcolor));
-        pieChart.animateXY(1000, 1000);
-    }
+package rocks.poopjournal.todont.Fragments;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+import androidx.fragment.app.Fragment;
+import com.github.mikephil.charting.charts.PieChart;
+import com.github.mikephil.charting.components.Description;
+import com.github.mikephil.charting.components.Legend;
+import com.github.mikephil.charting.data.PieData;
+import com.github.mikephil.charting.data.PieDataSet;
+import com.github.mikephil.charting.data.PieEntry;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Locale;
+
+import rocks.poopjournal.todont.Db_Controller;
+import rocks.poopjournal.todont.Helper;
+import rocks.poopjournal.todont.R;
+
+import static java.util.Calendar.getInstance;
+
+public class YearlyFragment extends Fragment {
+    Calendar c = getInstance();
+    Calendar d = getInstance();
+    Calendar e = getInstance();
+    SimpleDateFormat df;
+    Db_Controller db;
+    TextView year, mostavoided, leastavoided, daterange;
+    Button btnbefore, btnafter;
+    String formattedDate;
+    String getmostAvoidedHabit;
+    SharedPreferences prefs;
+    String checkDate;
+    PieChart pieChart;
+    String curmonth;
+    String[] splitteddate;
+    String b_month;
+    int b_year;
+    double habitsSize, avoidedSize;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_yearly, container, false);
+        db = new Db_Controller(getActivity(), "", null, 2);
+        df = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
+        prefs = getContext().getSharedPreferences("MyPrefs", Context.MODE_PRIVATE);
+        pieChart = view.findViewById(R.id.pieChart);
+        checkDate = prefs.getString("InitialDate", "");
+        Helper.SelectedButtonOfLogTab = 3;
+        year = view.findViewById(R.id.year);
+        pieChart = view.findViewById(R.id.pieChart);
+        btnbefore = view.findViewById(R.id.before);
+        btnafter = view.findViewById(R.id.after);
+        btnbefore.setBackgroundResource(R.drawable.ic_backarrow);
+        btnafter.setBackgroundResource(R.drawable.ic_nextarrow);
+        daterange = view.findViewById(R.id.daterange);
+        mostavoided = view.findViewById(R.id.mostavoided);
+        leastavoided = view.findViewById(R.id.leastavoided);
+        db.show_habits_data();
+        final String cur_date = df.format(c.getTime());
+        splitteddate = cur_date.split("-");
+        b_year = Integer.parseInt(splitteddate[0]);
+        year.setText("" + splitteddate[0]);
+        String newDate = splitteddate[0] + "-01-" + "-01";
+        String newDate1 = splitteddate[0] + "-12-" + "-31";
+        Log.d("splitteddate333 ", "" + newDate + " * " + newDate1);
+        String avoided = db.getYearlyAvoidedData(newDate, newDate1);
+        String done = db.getYearlyDoneData(newDate, newDate1);
+        mostavoided.setText("" + avoided);
+        leastavoided.setText("" + done);
+        habitsSize = Helper.habitsdata.size() * 365;
+        avoidedSize = Helper.avoidedyearlydata.size();
+        double per = (avoidedSize / habitsSize) * 100;
+        Log.d("percentage", "per : " + per + " yearly" + Helper.avoidedyearlydata.size() + "total" + Helper.habitsdata.size());
+        funcPieChart((int) per);
+        String[] checkdatea = checkDate.split("-");
+        if (year.getText().toString().equals(checkdatea[0])) {
+            btnbefore.setEnabled(false);
+        }
+        else{
+            btnbefore.setEnabled(true);
+            btnafter.setEnabled(true);
+        }
+        if(year.getText().toString().equals(splitteddate[0])){
+            btnafter.setEnabled(false);
+        }
+        else{
+            btnafter.setEnabled(true);
+        }
+
+        btnbefore.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                btnafter.setEnabled(true);
+                b_year = b_year - 1;
+
+                year.setText("" + b_year);
+                btnbefore.setBackgroundResource(R.drawable.ic_backarrowpressed);
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        btnbefore.setBackgroundResource(R.drawable.ic_backarrow);
+                    }
+                }, 100);
+                String[] checkdatearray = checkDate.split("-");
+                b_year = Integer.parseInt(year.getText().toString());
+                Log.d("fff", "" + year.getText().toString() + " ggg  " + checkdatearray[0]);
+                if ((year.getText().toString()).equals(checkdatearray[0])) {
+                    btnbefore.setEnabled(false);
+                }
+                String newDate = b_year + "-01" + "-01-";
+                String newDate1 = b_year + "-12" + "-31-";
+                Log.d("sssssssss", "" + newDate + " * " + newDate1);
+                String avoided = db.getYearlyAvoidedData(newDate, newDate1);
+                String done = db.getYearlyDoneData(newDate, newDate1);
+                mostavoided.setText("" + avoided);
+                leastavoided.setText("" + done);
+                habitsSize = Helper.habitsdata.size() * 365;
+                avoidedSize = Helper.avoidedyearlydata.size();
+                double per = (avoidedSize / habitsSize) * 100;
+                Log.d("percentage", "per : " + per + " monthly" + Helper.avoidedyearlydata.size() + "total" + Helper.habitsdata.size());
+                funcPieChart((int) per);
+            }
+        });
+        btnafter.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                btnbefore.setEnabled(true);
+                b_year = b_year + 1;
+                year.setText("" + b_year);
+                btnbefore.setBackgroundResource(R.drawable.ic_backarrowpressed);
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        btnbefore.setBackgroundResource(R.drawable.ic_backarrow);
+                    }
+                }, 100);
+                String[] checkdatearray = checkDate.split("-");
+                b_year = Integer.parseInt(year.getText().toString());
+                final String cur_date = df.format(c.getTime());
+                splitteddate = cur_date.split("-");
+                if ((year.getText().toString()).equals(splitteddate[0])) {
+                    btnafter.setEnabled(false);
+                }
+                String newDate = b_year + "-01" + "-01-";
+                String newDate1 = b_year + "-12" + "-31-";
+                String avoided = db.getYearlyAvoidedData(newDate, newDate1);
+                String done = db.getYearlyDoneData(newDate, newDate1);
+                mostavoided.setText("" + avoided);
+                leastavoided.setText("" + done);
+                habitsSize = Helper.habitsdata.size() * 365;
+                avoidedSize = Helper.avoidedyearlydata.size();
+                double per = (avoidedSize / habitsSize) * 100;
+                Log.d("percentage", "per : " + per + " monthly" + Helper.avoidedyearlydata.size() + "total" + Helper.habitsdata.size());
+                funcPieChart((int) per);
+            }
+        });
+
+        return view;
+    }
+
+
+    public void funcPieChart(int avoidedPer) {
+        pieChart.setUsePercentValues(true);
+        List<PieEntry> value = new ArrayList<>();
+        value.add(new PieEntry((float) avoidedPer, "Avoided"));
+        value.add(new PieEntry((float) (100.0 - avoidedPer), "Habits"));
+        PieDataSet pieDataSet = new PieDataSet(value, "");
+        pieDataSet.setValueTextColor(Color.WHITE);
+        PieData pieData = new PieData(pieDataSet);
+        pieChart.setData(pieData);
+        pieDataSet.setColors(new int[]{Color.parseColor("#FFAF01"), Color.parseColor("#26272c")});
+        Legend legend = pieChart.getLegend();
+        legend.setEnabled(false);
+        Description description = new Description();
+        description.setText("");
+        pieChart.setDescription(description);
+        pieChart.setHoleRadius(50f);
+        pieChart.setTransparentCircleRadius(50f);
+        pieChart.setHoleColor(getResources().getColor(R.color.backgroundcolor));
+        pieChart.animateXY(1000, 1000);
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/rocks/poopjournal/todont/Fragments/menuFragment.java b/app/src/main/java/rocks/poopjournal/todont/Fragments/menuFragment.java
index 09abe529..4bbe5a8e 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Fragments/menuFragment.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Fragments/menuFragment.java
@@ -1,44 +1,44 @@
-package rocks.poopjournal.todont.Fragments;
-
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-
-import rocks.poopjournal.todont.Adapters.AvoidedAdapter;
-import rocks.poopjournal.todont.Db_Controller;
-import rocks.poopjournal.todont.Helper;
-import rocks.poopjournal.todont.MainActivity;
-import rocks.poopjournal.todont.R;
-
-public class menuFragment extends Fragment {
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.menu_fragment, container, false);
-
-        return view;
-    }
-
-
-}
-
-
-
+package rocks.poopjournal.todont.Fragments;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+import rocks.poopjournal.todont.Adapters.AvoidedAdapter;
+import rocks.poopjournal.todont.Db_Controller;
+import rocks.poopjournal.todont.Helper;
+import rocks.poopjournal.todont.MainActivity;
+import rocks.poopjournal.todont.R;
+
+public class menuFragment extends Fragment {
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.menu_fragment, container, false);
+
+        return view;
+    }
+
+
+}
+
+
+
diff --git a/app/src/main/java/rocks/poopjournal/todont/Helper.java b/app/src/main/java/rocks/poopjournal/todont/Helper.java
index a905ae43..d057ae15 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Helper.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Helper.java
@@ -1,27 +1,27 @@
-package rocks.poopjournal.todont;
-
-import android.content.Context;
-
-import java.util.ArrayList;
-
-public class Helper {
-    public static ArrayList<String> labels_array = new ArrayList<String>();
-    public static ArrayList<String[]> data=new ArrayList<>();
-    public static ArrayList<String[]> avoidedlogdata=new ArrayList<>();
-    public static ArrayList<String[]> donedata=new ArrayList<>();
-    public static ArrayList<String[]> donelogdata=new ArrayList<>();
-    public static ArrayList<String[]> habitsdata=new ArrayList<>();
-    public static ArrayList<String> avoidedweeklydata=new ArrayList<String>();
-    public static ArrayList<String> avoidedmonthlydata=new ArrayList<String>();
-    public static ArrayList<String> donemonthlydata=new ArrayList<String>();
-    public static ArrayList<String> doneweeklydata=new ArrayList<String>();
-    public static ArrayList<String> doneyearlydata=new ArrayList<String>();
-    public static ArrayList<String> avoidedyearlydata=new ArrayList<String>();
-    public static int SelectedButtonOfTodayTab=0;
-    public static int SelectedButtonOfLogTab=0;
-    public static int SelectedButtonOfLogDailyTab=0;
-    public static Boolean isTodaySelected=true;
-    public static String isnightmodeon;
-    public static String getSelecteddate="";
-
-}
+package rocks.poopjournal.todont;
+
+import android.content.Context;
+
+import java.util.ArrayList;
+
+public class Helper {
+    public static ArrayList<String> labels_array = new ArrayList<String>();
+    public static ArrayList<String[]> data=new ArrayList<>();
+    public static ArrayList<String[]> avoidedlogdata=new ArrayList<>();
+    public static ArrayList<String[]> donedata=new ArrayList<>();
+    public static ArrayList<String[]> donelogdata=new ArrayList<>();
+    public static ArrayList<String[]> habitsdata=new ArrayList<>();
+    public static ArrayList<String> avoidedweeklydata=new ArrayList<String>();
+    public static ArrayList<String> avoidedmonthlydata=new ArrayList<String>();
+    public static ArrayList<String> donemonthlydata=new ArrayList<String>();
+    public static ArrayList<String> doneweeklydata=new ArrayList<String>();
+    public static ArrayList<String> doneyearlydata=new ArrayList<String>();
+    public static ArrayList<String> avoidedyearlydata=new ArrayList<String>();
+    public static int SelectedButtonOfTodayTab=0;
+    public static int SelectedButtonOfLogTab=0;
+    public static int SelectedButtonOfLogDailyTab=0;
+    public static Boolean isTodaySelected=true;
+    public static String isnightmodeon="light";
+    public static String getSelecteddate="";
+
+}
diff --git a/app/src/main/java/rocks/poopjournal/todont/Labels.java b/app/src/main/java/rocks/poopjournal/todont/Labels.java
index 185d5631..d452b145 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Labels.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Labels.java
@@ -1,147 +1,171 @@
-package rocks.poopjournal.todont;
-
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.bottomsheet.BottomSheetDialog;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-
-import java.util.ArrayList;
-
-import rocks.poopjournal.todont.Adapters.HabitsAdapter;
-import rocks.poopjournal.todont.Fragments.HabitsFragment;
-import rocks.poopjournal.todont.Fragments.LabelsAdapter;
-
-public class Labels extends AppCompatActivity {
-    RecyclerView rv_labels;
-    TextView tv_label;
-    Db_Controller db;
-    LabelsAdapter adapter;
-    ArrayList<String> gettinglabels = new ArrayList<>();
-    FloatingActionButton labels_floatingbutton;
-    SharedPreferences sharedPreferences;
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_labels);
-        rv_labels = findViewById(R.id.rv_labels);
-        tv_label = findViewById(R.id.tv_label);
-
-        sharedPreferences=getSharedPreferences("MyPrefs", Context.MODE_PRIVATE);
-
-        db = new Db_Controller(getApplicationContext(), "", null, 2);
-        db.show_labels();
-        labels_floatingbutton = findViewById(R.id.label_floatingbtn);
-
-        for (int i = 0; i < Helper.labels_array.size(); i++) {
-            gettinglabels.add(Helper.labels_array.get(i));
-        }
-        rv_labels.setLayoutManager(new LinearLayoutManager(this));
-        new ItemTouchHelper(itemtouchhelper).attachToRecyclerView(rv_labels);
-        adapter= new LabelsAdapter(this,db,gettinglabels);
-        rv_labels.setAdapter(adapter);
-        rv_labels.setLayoutManager(new LinearLayoutManager(this));
-
-        labels_floatingbutton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                View bottomsheetview=null;
-                final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(Labels.this,
-                        R.style.BottomSheetDialogTheme);
-                if(Helper.isnightmodeon.equals("no")){
-                    bottomsheetview = LayoutInflater.from(getApplicationContext()).
-                            inflate(R.layout.labels_bottom_sheet,
-                                    (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
-                }
-                else if(Helper.isnightmodeon.equals("yes")){
-                    bottomsheetview = LayoutInflater.from(getApplicationContext()).
-                            inflate(R.layout.labels_bottom_sheet_night,
-                                    (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
-                }
-                final EditText editText = bottomsheetview.findViewById(R.id.label);
-                Button saveLabelButton = bottomsheetview.findViewById(R.id.saveLabelButton);
-                saveLabelButton.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        db.insert_label(editText.getText().toString());
-                        Helper.labels_array.add(editText.getText().toString());
-                        db.show_labels();
-                        Intent i = new Intent(getApplicationContext(), Labels.class);
-                        startActivity(i);
-                        overridePendingTransition(0, 0);
-                        bottomSheetDialog.dismiss();
-                    }
-                });
-                bottomSheetDialog.setContentView(bottomsheetview);
-                bottomSheetDialog.show();
-            }
-
-        });
-    }
-    ItemTouchHelper.SimpleCallback itemtouchhelper = new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.RIGHT) {
-        @Override
-        public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
-            return false;
-        }
-
-        @Override
-        public void onSwiped(@NonNull final RecyclerView.ViewHolder viewHolder, int direction) {
-            if (direction == 8) {
-                AlertDialog.Builder builder1 = new AlertDialog.Builder(Labels.this);
-                builder1.setMessage("Do you really want to delete this?");
-                builder1.setCancelable(true);
-
-                builder1.setPositiveButton(
-                        "Yes",
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int id) {
-                                int i = viewHolder.getAdapterPosition();
-                                db.delete_label(gettinglabels.get(i));
-                                Intent intent = new Intent(getApplicationContext(), Labels.class);
-                                startActivity(intent);
-                                overridePendingTransition(0, 0);
-                                dialog.cancel();
-                            }
-                        });
-
-                builder1.setNegativeButton(
-                        "No",
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int id) {
-                                Intent intent = new Intent(getApplicationContext(), Labels.class);
-                                startActivity(intent);
-                                overridePendingTransition(0, 0);
-                                dialog.dismiss();
-                            }
-                        });
-                AlertDialog alert11 = builder1.create();
-                alert11.show();
-
-            }
-
-        }
-    };
-    public void backbtnclicked(View view) {
-        Intent i = new Intent(this, MainActivity.class);
-        startActivity(i);
-    }
+package rocks.poopjournal.todont;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import java.util.ArrayList;
+
+import rocks.poopjournal.todont.Adapters.HabitsAdapter;
+import rocks.poopjournal.todont.Fragments.HabitsFragment;
+import rocks.poopjournal.todont.Fragments.LabelsAdapter;
+
+public class Labels extends AppCompatActivity {
+    RecyclerView rv_labels;
+    TextView tv_label;
+    Db_Controller db;
+    LabelsAdapter adapter;
+    ArrayList<String> gettinglabels = new ArrayList<>();
+    FloatingActionButton labels_floatingbutton;
+    SharedPreferences sharedPreferences;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_labels);
+        rv_labels = findViewById(R.id.rv_labels);
+        tv_label = findViewById(R.id.tv_label);
+
+        sharedPreferences=getSharedPreferences("MyPrefs", Context.MODE_PRIVATE);
+
+        db = new Db_Controller(getApplicationContext(), "", null, 2);
+        db.show_labels();
+        labels_floatingbutton = findViewById(R.id.label_floatingbtn);
+
+        for (int i = 0; i < Helper.labels_array.size(); i++) {
+            gettinglabels.add(Helper.labels_array.get(i));
+        }
+        rv_labels.setLayoutManager(new LinearLayoutManager(this));
+        new ItemTouchHelper(itemtouchhelper).attachToRecyclerView(rv_labels);
+        adapter= new LabelsAdapter(this,db,gettinglabels);
+        rv_labels.setAdapter(adapter);
+        rv_labels.setLayoutManager(new LinearLayoutManager(this));
+
+        labels_floatingbutton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                final Dialog d = new Dialog(Labels.this);
+                d.requestWindowFeature(Window.FEATURE_NO_TITLE);
+                d.setContentView(R.layout.dialogbox_labels);
+                Button btnsave=d.findViewById(R.id.saveLabelButton);
+                final EditText editText = d.findViewById(R.id.label);
+                WindowManager.LayoutParams lp = d.getWindow().getAttributes();
+                lp.dimAmount=0.9f;
+                d.getWindow().setAttributes(lp);
+                d.getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND);
+                btnsave.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        db.insert_label(editText.getText().toString());
+                        Helper.labels_array.add(editText.getText().toString());
+                        db.show_labels();
+                        Intent i = new Intent(getApplicationContext(), Labels.class);
+                        startActivity(i);
+                        overridePendingTransition(0, 0);
+
+                    }
+                });d.show();
+//                View bottomsheetview=null;
+//                final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(Labels.this,
+//                        R.style.BottomSheetDialogTheme);
+//                if(Helper.isnightmodeon.equals("no")){
+//                    bottomsheetview = LayoutInflater.from(getApplicationContext()).
+//                            inflate(R.layout.labels_bottom_sheet,
+//                                    (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
+//                }
+//                else if(Helper.isnightmodeon.equals("yes")){
+//                    bottomsheetview = LayoutInflater.from(getApplicationContext()).
+//                            inflate(R.layout.labels_bottom_sheet_night,
+//                                    (RelativeLayout) view.findViewById(R.id.bottomsheetContainer));
+//                }
+//                final EditText editText = bottomsheetview.findViewById(R.id.label);
+//                Button saveLabelButton = bottomsheetview.findViewById(R.id.saveLabelButton);
+//                saveLabelButton.setOnClickListener(new View.OnClickListener() {
+//                    @Override
+//                    public void onClick(View view) {
+//                        db.insert_label(editText.getText().toString());
+//                        Helper.labels_array.add(editText.getText().toString());
+//                        db.show_labels();
+//                        Intent i = new Intent(getApplicationContext(), Labels.class);
+//                        startActivity(i);
+//                        overridePendingTransition(0, 0);
+//                        bottomSheetDialog.dismiss();
+//                    }
+//                });
+//                bottomSheetDialog.setContentView(bottomsheetview);
+//                bottomSheetDialog.show();
+            }
+
+        });
+    }
+    ItemTouchHelper.SimpleCallback itemtouchhelper = new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.RIGHT) {
+        @Override
+        public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
+            return false;
+        }
+
+        @Override
+        public void onSwiped(@NonNull final RecyclerView.ViewHolder viewHolder, int direction) {
+            if (direction == 8) {
+                AlertDialog.Builder builder1 = new AlertDialog.Builder(Labels.this);
+                builder1.setMessage("Do you really want to delete this?");
+                builder1.setCancelable(true);
+
+                builder1.setPositiveButton(
+                        "Yes",
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int id) {
+                                int i = viewHolder.getAdapterPosition();
+                                db.delete_label(gettinglabels.get(i));
+                                Intent intent = new Intent(getApplicationContext(), Labels.class);
+                                startActivity(intent);
+                                overridePendingTransition(0, 0);
+                                dialog.cancel();
+                            }
+                        });
+
+                builder1.setNegativeButton(
+                        "No",
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int id) {
+                                Intent intent = new Intent(getApplicationContext(), Labels.class);
+                                startActivity(intent);
+                                overridePendingTransition(0, 0);
+                                dialog.dismiss();
+                            }
+                        });
+                AlertDialog alert11 = builder1.create();
+                alert11.show();
+
+            }
+
+        }
+    };
+    public void backbtnclicked(View view) {
+        Intent i = new Intent(this, MainActivity.class);
+        startActivity(i);
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/rocks/poopjournal/todont/MainActivity.kt b/app/src/main/java/rocks/poopjournal/todont/MainActivity.kt
index ceb4523c..3fef083b 100644
--- a/app/src/main/java/rocks/poopjournal/todont/MainActivity.kt
+++ b/app/src/main/java/rocks/poopjournal/todont/MainActivity.kt
@@ -1,90 +1,90 @@
-package rocks.poopjournal.todont
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.View
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.app.AppCompatDelegate
-import com.google.android.material.bottomnavigation.BottomNavigationView
-import kotlinx.android.synthetic.main.activity_main.*
-import rocks.poopjournal.todont.Fragments.FragmentLog
-import rocks.poopjournal.todont.Fragments.FragmentToday
-
-
-class MainActivity : AppCompatActivity() {
-    var db: Db_Controller? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-        val fragment = FragmentToday();
-        db = Db_Controller(applicationContext, "", null, 2)
-
-
-        supportFragmentManager.beginTransaction()
-            .replace(R.id.container, fragment, fragment.javaClass.getSimpleName())
-            .commit()
-        toolbartext.setText(R.string.today)
-        label.visibility = View.VISIBLE
-        settings.visibility = View.VISIBLE
-        db?.getNightMode()
-        if (Helper.isnightmodeon == "no") {
-            label.setBackgroundResource(R.drawable.ic_label_light)
-        }
-        else if (Helper.isnightmodeon == "yes") {
-            label.setBackgroundResource(R.drawable.ic_label_dark)
-
-        }
-
-        val actionBar: android.app.ActionBar? = actionBar
-        actionBar?.setBackgroundDrawable(resources.getDrawable(R.drawable.mygradient))
-        val mOnNavigationItemSelectedListener =
-            BottomNavigationView.OnNavigationItemSelectedListener { item ->
-                when (item.itemId) {
-                    R.id.navigation_today -> {
-                        val fragment =
-                            FragmentToday();
-                        supportFragmentManager.beginTransaction()
-                            .replace(R.id.container, fragment, fragment.javaClass.getSimpleName())
-                            .commit()
-                        toolbartext.setText(R.string.today)
-                        label.visibility = View.VISIBLE
-                        settings.visibility = View.VISIBLE
-
-                        return@OnNavigationItemSelectedListener true
-                    }
-                    R.id.navigation_log -> {
-                        val fragment =
-                            FragmentLog()
-                        supportFragmentManager.beginTransaction()
-                            .replace(R.id.container, fragment, fragment.javaClass.getSimpleName())
-                            .commit()
-                        toolbartext.setText(R.string.log)
-                        label.visibility = View.INVISIBLE
-                        settings.visibility = View.INVISIBLE
-                        return@OnNavigationItemSelectedListener true
-                    }
-                }
-                false
-            }
-
-        navigationView.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener)
-        label.setOnClickListener {
-            val intennt = Intent(this, Labels::class.java)
-            startActivity(intennt)
-            finish()
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////
-    fun mysettings(view: View) {
-
-        val intennt = Intent(this, Settings::class.java)
-            startActivity(intennt)
-            overridePendingTransition(0, 0)
-            finish()
-
-    }
-
-}
-
+package rocks.poopjournal.todont
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import kotlinx.android.synthetic.main.activity_main.*
+import rocks.poopjournal.todont.Fragments.FragmentLog
+import rocks.poopjournal.todont.Fragments.FragmentToday
+
+
+class MainActivity : AppCompatActivity() {
+    var db: Db_Controller? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+        val fragment = FragmentToday();
+        db = Db_Controller(applicationContext, "", null, 2)
+
+
+        supportFragmentManager.beginTransaction()
+            .replace(R.id.container, fragment, fragment.javaClass.getSimpleName())
+            .commit()
+        toolbartext.setText(R.string.today)
+        label.visibility = View.VISIBLE
+        settings.visibility = View.VISIBLE
+        db?.getNightMode()
+//        if (Helper.isnightmodeon == "no") {
+            label.setBackgroundResource(R.drawable.ic_label_light)
+//        }
+//        else if (Helper.isnightmodeon == "yes") {
+//            label.setBackgroundResource(R.drawable.ic_label_dark)
+//
+//        }
+
+        val actionBar: android.app.ActionBar? = actionBar
+        actionBar?.setBackgroundDrawable(resources.getDrawable(R.drawable.mygradient))
+        val mOnNavigationItemSelectedListener =
+            BottomNavigationView.OnNavigationItemSelectedListener { item ->
+                when (item.itemId) {
+                    R.id.navigation_today -> {
+                        val fragment =
+                            FragmentToday();
+                        supportFragmentManager.beginTransaction()
+                            .replace(R.id.container, fragment, fragment.javaClass.getSimpleName())
+                            .commit()
+                        toolbartext.setText(R.string.today)
+                        label.visibility = View.VISIBLE
+                        settings.visibility = View.VISIBLE
+
+                        return@OnNavigationItemSelectedListener true
+                    }
+                    R.id.navigation_log -> {
+                        val fragment =
+                            FragmentLog()
+                        supportFragmentManager.beginTransaction()
+                            .replace(R.id.container, fragment, fragment.javaClass.getSimpleName())
+                            .commit()
+                        toolbartext.setText(R.string.log)
+                        label.visibility = View.INVISIBLE
+                        settings.visibility = View.INVISIBLE
+                        return@OnNavigationItemSelectedListener true
+                    }
+                }
+                false
+            }
+
+        navigationView.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener)
+        label.setOnClickListener {
+            val intennt = Intent(this, Labels::class.java)
+            startActivity(intennt)
+            finish()
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////
+    fun mysettings(view: View) {
+
+        val intennt = Intent(this, Settings::class.java)
+            startActivity(intennt)
+            overridePendingTransition(0, 0)
+            finish()
+
+    }
+
+}
+
diff --git a/app/src/main/java/rocks/poopjournal/todont/OnBoardingActivity.java b/app/src/main/java/rocks/poopjournal/todont/OnBoardingActivity.java
index b58da8c4..60899cee 100644
--- a/app/src/main/java/rocks/poopjournal/todont/OnBoardingActivity.java
+++ b/app/src/main/java/rocks/poopjournal/todont/OnBoardingActivity.java
@@ -1,46 +1,46 @@
-package rocks.poopjournal.todont;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Locale;
-
-import static java.util.Calendar.getInstance;
-
-public class OnBoardingActivity extends AppCompatActivity {
-Button btn;
-SharedPreferences sharedPreferences;
-    Calendar c = getInstance();
-    SimpleDateFormat df;
-    Db_Controller db_controller;
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_on_boarding);
-        db_controller = new Db_Controller(getApplicationContext(), "", null, 2);
-        df = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
-        sharedPreferences=getSharedPreferences("MyPrefs", Context.MODE_PRIVATE);
-        btn=findViewById(R.id.btncontinue);
-        btn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                db_controller.setNightMode("no");
-                db_controller.getNightMode();
-                SharedPreferences.Editor editor = sharedPreferences.edit();
-                editor.putString("FirstTime","no");
-                editor.putString("InitialDate",df.format(c.getTime()));
-                editor.apply();
-                Intent i=new Intent(OnBoardingActivity.this,MainActivity.class);
-                startActivity(i);
-            }
-        });
-    }
+package rocks.poopjournal.todont;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Locale;
+
+import static java.util.Calendar.getInstance;
+
+public class OnBoardingActivity extends AppCompatActivity {
+Button btn;
+SharedPreferences sharedPreferences;
+    Calendar c = getInstance();
+    SimpleDateFormat df;
+    Db_Controller db_controller;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_on_boarding);
+        db_controller = new Db_Controller(getApplicationContext(), "", null, 2);
+        df = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
+        sharedPreferences=getSharedPreferences("MyPrefs", Context.MODE_PRIVATE);
+        btn=findViewById(R.id.btncontinue);
+        btn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                db_controller.setNightMode("light");
+                db_controller.getNightMode();
+                SharedPreferences.Editor editor = sharedPreferences.edit();
+                editor.putString("FirstTime","no");
+                editor.putString("InitialDate",df.format(c.getTime()));
+                editor.apply();
+                Intent i=new Intent(OnBoardingActivity.this,MainActivity.class);
+                startActivity(i);
+            }
+        });
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/rocks/poopjournal/todont/Settings.java b/app/src/main/java/rocks/poopjournal/todont/Settings.java
index c6ce4967..eeb45884 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Settings.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Settings.java
@@ -1,69 +1,173 @@
-package rocks.poopjournal.todont;
-
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.app.AppCompatDelegate;
-
-import android.content.Intent;
-import android.media.audiofx.EnvironmentalReverb;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.Toast;
-
-public class Settings extends AppCompatActivity {
-    Db_Controller db;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_settings);
-        db = new Db_Controller(getApplicationContext(), "", null, 2);
-        db.getNightMode();
-
-    }
-    public void changeMode(View view) {
-                db.getNightMode();
-        Log.d("qqq","infunc : "+Helper.isnightmodeon );
-        if (Helper.isnightmodeon.equals("no")) {
-            Log.d("qqq","inif");
-
-            db.update_nightmode("yes");
-            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-            Intent intennt = new Intent(Settings.this,Settings.class);
-            startActivity(intennt);
-            overridePendingTransition(0, 0);
-            finish();
-        } else if (Helper.isnightmodeon.equals("yes")) {
-            Log.d("qqq","inelse");
-
-            db.update_nightmode("no");
-            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-            Intent intennt = new Intent(Settings.this,Settings.class);
-            startActivity(intennt);
-            overridePendingTransition(0, 0);
-            finish();
-
-        }
-//        if(Helper.isnightmodeon.equals("no")){
-//            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-//        }
-//        else if(Helper.isnightmodeon.equals("yes")){
-//            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-//        }
-    }
-
-    public void backbtn(View view) {
-        Intent i = new Intent(Settings.this, MainActivity.class);
-        finishAffinity();
-        startActivity(i);
-        overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
-
-    }
-
-    public void aboutus(View view) {
-        Intent i = new Intent(Settings.this, About.class);
-        finishAffinity();
-        startActivity(i);
-        overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
-    }
+package rocks.poopjournal.todont;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
+
+import android.app.Dialog;
+import android.content.Intent;
+import android.media.audiofx.EnvironmentalReverb;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.RadioButton;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class Settings extends AppCompatActivity {
+    Db_Controller db;
+    TextView modetitle;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_settings);
+        db = new Db_Controller(getApplicationContext(), "", null, 2);
+        modetitle=findViewById(R.id.modetitle);
+        Log.d("heyyyymode",""+Helper.isnightmodeon);
+        switch(Helper.isnightmodeon){
+            case "followsys":
+                modetitle.setText("Follow System");
+                break;
+            case "light":
+                modetitle.setText("Light");
+                break;
+            case "dark":
+                modetitle.setText("Dark");
+                break;
+        }
+//        db.getNightMode();
+
+    }
+    public void changeMode(View view) {
+        final Dialog d = new Dialog(this);
+        d.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        d.setContentView(R.layout.dialogbox);
+        Button btndone=d.findViewById(R.id.btndone);
+        RadioButton light,dark,fsys;
+        light=d.findViewById(R.id.light);
+        dark=d.findViewById(R.id.dark);
+        fsys=d.findViewById(R.id.followsys);
+        String getmodetitle= modetitle.getText().toString();
+        if(getmodetitle.equals("Follow System")){
+            fsys.setChecked(true);
+        }
+        if(getmodetitle.equals("Light")){
+            light.setChecked(true);
+        }
+        if(getmodetitle.equals("Dark")){
+            dark.setChecked(true);
+        }
+
+        WindowManager.LayoutParams lp = d.getWindow().getAttributes();
+        lp.dimAmount=0.9f;
+        d.getWindow().setAttributes(lp);
+        d.getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND);
+
+        btndone.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                db.getNightMode();
+                Log.d("modeisbuttondone:",""+Helper.isnightmodeon);
+                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");
+                    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();
+                    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");
+                    d.dismiss();
+                }
+
+            }
+        });d.show();
+//                db.getNightMode();
+//        Log.d("qqq","infunc : "+Helper.isnightmodeon );
+//        if (Helper.isnightmodeon.equals("no")) {
+//            Log.d("qqq","inif");
+//
+//            db.update_nightmode("yes");
+//            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+//            Intent intennt = new Intent(Settings.this,Settings.class);
+//            startActivity(intennt);
+//            overridePendingTransition(0, 0);
+//            finish();
+//        } else if (Helper.isnightmodeon.equals("yes")) {
+//            Log.d("qqq","inelse");
+//
+//            db.update_nightmode("no");
+//            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+//            Intent intennt = new Intent(Settings.this,Settings.class);
+//            startActivity(intennt);
+//            overridePendingTransition(0, 0);
+//            finish();
+//
+//        }
+////        if(Helper.isnightmodeon.equals("no")){
+////            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+////        }
+////        else if(Helper.isnightmodeon.equals("yes")){
+////            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+////        }
+    }
+
+    public void onRadioButtonClicked(View view) {
+        // Is the button now checked?
+        boolean checked = ((RadioButton) view).isChecked();
+        // Check which radio button was clicked
+        switch(view.getId()) {
+            case R.id.followsys:
+                if (checked)
+                {
+                    modetitle.setText("Follow System");
+                    db.update_nightmode("followsys");
+                    Log.d("modeisf:",""+Helper.isnightmodeon);
+                    break;
+                }
+            case R.id.light:
+                if (checked)
+                {
+                    modetitle.setText("Light");
+                    db.update_nightmode("light");
+                    Log.d("modeisl:",""+Helper.isnightmodeon);
+                    break;
+                }
+            case R.id.dark:
+                if (checked)
+                {
+                    modetitle.setText("Dark");
+                    db.update_nightmode("dark");
+                    Log.d("modeisd:",""+Helper.isnightmodeon);
+                    break;
+                }
+        }
+    }
+    public void backbtn(View view) {
+        Intent i = new Intent(Settings.this, MainActivity.class);
+        finishAffinity();
+        startActivity(i);
+        overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
+
+    }
+
+    public void aboutus(View view) {
+        Intent i = new Intent(Settings.this, About.class);
+        finishAffinity();
+        startActivity(i);
+        overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/rocks/poopjournal/todont/Splash_Screen.java b/app/src/main/java/rocks/poopjournal/todont/Splash_Screen.java
index 4e11807b..887cda4f 100644
--- a/app/src/main/java/rocks/poopjournal/todont/Splash_Screen.java
+++ b/app/src/main/java/rocks/poopjournal/todont/Splash_Screen.java
@@ -1,59 +1,59 @@
-package rocks.poopjournal.todont;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.os.Handler;
-import android.util.Log;
-
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.app.AppCompatDelegate;
-
-public class Splash_Screen extends AppCompatActivity {
-    SharedPreferences prefs;
-    String checkFirstTime;
-    Db_Controller db;
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_splash__screen);
-        db = new Db_Controller(getApplicationContext(), "", null, 2);
-        prefs = getSharedPreferences("MyPrefs", Context.MODE_PRIVATE);
-        checkFirstTime = prefs.getString("FirstTime", "");
-        db.getNightMode();
-        if(checkFirstTime.equals("no")){
-            if(Helper.isnightmodeon.equals("no")){
-                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-            }
-            else if(Helper.isnightmodeon.equals("yes")){
-                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-            }
-        }
-
-        checkStatus();
-    }
-
-    public void checkStatus() {
-        new Handler().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                if(checkFirstTime.equals("no")){
-                    Intent i = new Intent(Splash_Screen.this, MainActivity.class);
-                    finishAffinity();
-                    startActivity(i);
-                    overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
-
-                }
-                else{
-                    Intent i = new Intent(Splash_Screen.this, OnBoardingActivity.class);
-                    finishAffinity();
-                    startActivity(i);
-                    overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
-
-                }
-            }
-        }, 2000);
-    }
-}
-
+package rocks.poopjournal.todont;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
+
+public class Splash_Screen extends AppCompatActivity {
+    SharedPreferences prefs;
+    String checkFirstTime;
+    Db_Controller db;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_splash__screen);
+        db = new Db_Controller(getApplicationContext(), "", null, 2);
+        prefs = getSharedPreferences("MyPrefs", Context.MODE_PRIVATE);
+        checkFirstTime = prefs.getString("FirstTime", "");
+        db.getNightMode();
+        if(checkFirstTime.equals("no")){
+            if(Helper.isnightmodeon.equals("light")){
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+            }
+            else if(Helper.isnightmodeon.equals("dark")){
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+            }
+        }
+
+        checkStatus();
+    }
+
+    public void checkStatus() {
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                if(checkFirstTime.equals("no")){
+                    Intent i = new Intent(Splash_Screen.this, MainActivity.class);
+                    finishAffinity();
+                    startActivity(i);
+                    overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
+
+                }
+                else{
+                    Intent i = new Intent(Splash_Screen.this, OnBoardingActivity.class);
+                    finishAffinity();
+                    startActivity(i);
+                    overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
+
+                }
+            }
+        }, 2000);
+    }
+}
+
diff --git a/app/src/main/res/anim/fade_in.xml b/app/src/main/res/anim/fade_in.xml
index 42303034..fa69bacd 100644
--- a/app/src/main/res/anim/fade_in.xml
+++ b/app/src/main/res/anim/fade_in.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="500"
-    android:interpolator="@android:anim/accelerate_interpolator"
-    android:fromAlpha="0.0"
-
-    android:toAlpha="1.0"
-    >
+<?xml version="1.0" encoding="utf-8"?>
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="500"
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:fromAlpha="0.0"
+
+    android:toAlpha="1.0"
+    >
 </alpha>
\ No newline at end of file
diff --git a/app/src/main/res/anim/fade_out.xml b/app/src/main/res/anim/fade_out.xml
index d56b946a..019585f4 100644
--- a/app/src/main/res/anim/fade_out.xml
+++ b/app/src/main/res/anim/fade_out.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="500"
-    android:interpolator="@android:anim/accelerate_interpolator"
-    android:fromAlpha="1.0"
-    android:fillAfter="true"
-    android:toAlpha="0.0"
-    >
-
+<?xml version="1.0" encoding="utf-8"?>
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="500"
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:fromAlpha="1.0"
+    android:fillAfter="true"
+    android:toAlpha="0.0"
+    >
+
 </alpha>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bottom_nav_color.xml b/app/src/main/res/drawable/bottom_nav_color.xml
index 766b9e15..e11ff311 100644
--- a/app/src/main/res/drawable/bottom_nav_color.xml
+++ b/app/src/main/res/drawable/bottom_nav_color.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:color="#FFAF01" />
-    <item android:state_checked="false" android:color="#DF26272C" />
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="#FFAF01" />
+    <item android:state_checked="false" android:color="#717379" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bottom_sheet.xml b/app/src/main/res/drawable/bottom_sheet.xml
index 7dec13c6..04df7ac9 100644
--- a/app/src/main/res/drawable/bottom_sheet.xml
+++ b/app/src/main/res/drawable/bottom_sheet.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#ffffff"/>
-    <corners
-        android:topLeftRadius="20dp"
-        android:topRightRadius="20dp"
-        />
-
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#ffffff"/>
+    <corners
+        android:topLeftRadius="20dp"
+        android:topRightRadius="20dp"
+        />
+
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bottom_sheet_nightmode.xml b/app/src/main/res/drawable/bottom_sheet_nightmode.xml
index 098df3f3..4bda15fa 100644
--- a/app/src/main/res/drawable/bottom_sheet_nightmode.xml
+++ b/app/src/main/res/drawable/bottom_sheet_nightmode.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#26272c"/>
-    <corners
-        android:topLeftRadius="20dp"
-        android:topRightRadius="20dp"
-        />
-
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#26272c"/>
+    <corners
+        android:topLeftRadius="20dp"
+        android:topRightRadius="20dp"
+        />
+
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/codeaquaria.png b/app/src/main/res/drawable/codeaquaria.png
index 2e89baa1..269c9ef4 100644
Binary files a/app/src/main/res/drawable/codeaquaria.png and b/app/src/main/res/drawable/codeaquaria.png differ
diff --git a/app/src/main/res/drawable/continuebutton.xml b/app/src/main/res/drawable/continuebutton.xml
index 25b42907..47af9d81 100644
--- a/app/src/main/res/drawable/continuebutton.xml
+++ b/app/src/main/res/drawable/continuebutton.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#ff8c00" />
-    <corners android:bottomRightRadius="10dp"
-        android:bottomLeftRadius="10dp"
-        android:topRightRadius="10dp"
-        android:topLeftRadius="10dp"/>
-    <gradient
-        android:startColor="#fac401"
-        android:endColor="#ff8c00"
-        android:angle="360" />
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#ff8c00" />
+    <corners android:bottomRightRadius="10dp"
+        android:bottomLeftRadius="10dp"
+        android:topRightRadius="10dp"
+        android:topLeftRadius="10dp"/>
+    <gradient
+        android:startColor="#fac401"
+        android:endColor="#ff8c00"
+        android:angle="360" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/crazymarvin.png b/app/src/main/res/drawable/crazymarvin.png
index 3926cfb1..1b1a4d63 100644
Binary files a/app/src/main/res/drawable/crazymarvin.png and b/app/src/main/res/drawable/crazymarvin.png differ
diff --git a/app/src/main/res/drawable/designerlogo.png b/app/src/main/res/drawable/designerlogo.png
index fb6784dd..ee5c921d 100644
Binary files a/app/src/main/res/drawable/designerlogo.png and b/app/src/main/res/drawable/designerlogo.png differ
diff --git a/app/src/main/res/drawable/drop.jpeg b/app/src/main/res/drawable/drop.jpeg
new file mode 100644
index 00000000..00aa78c6
Binary files /dev/null and b/app/src/main/res/drawable/drop.jpeg differ
diff --git a/app/src/main/res/drawable/drop.png b/app/src/main/res/drawable/drop.png
deleted file mode 100644
index 2d231853..00000000
Binary files a/app/src/main/res/drawable/drop.png and /dev/null differ
diff --git a/app/src/main/res/drawable/git.png b/app/src/main/res/drawable/git.png
index 1e9d0e9c..e7c7651b 100644
Binary files a/app/src/main/res/drawable/git.png and b/app/src/main/res/drawable/git.png differ
diff --git a/app/src/main/res/drawable/i.jpg b/app/src/main/res/drawable/i.jpg
new file mode 100644
index 00000000..48378420
Binary files /dev/null and b/app/src/main/res/drawable/i.jpg differ
diff --git a/app/src/main/res/drawable/ic_facebook.xml b/app/src/main/res/drawable/ic_facebook.xml
index 19e7d82f..584f64c6 100644
--- a/app/src/main/res/drawable/ic_facebook.xml
+++ b/app/src/main/res/drawable/ic_facebook.xml
@@ -1,13 +1,13 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="20dp"
-    android:viewportWidth="26"
-    android:viewportHeight="26">
-  <path
-      android:pathData="M18,2h-3a5,5 0,0 0,-5 5v3H7v4h3v8h4v-8h3l1,-4h-4V7a1,1 0,0 1,1 -1h3z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#B3717684"
-      android:strokeLineCap="round"/>
-</vector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="20dp"
+    android:viewportWidth="26"
+    android:viewportHeight="26">
+  <path
+      android:pathData="M18,2h-3a5,5 0,0 0,-5 5v3H7v4h3v8h4v-8h3l1,-4h-4V7a1,1 0,0 1,1 -1h3z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#B3717684"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_label_dark.xml b/app/src/main/res/drawable/ic_label_dark.xml
index 216d2a64..ab43dfe5 100644
--- a/app/src/main/res/drawable/ic_label_dark.xml
+++ b/app/src/main/res/drawable/ic_label_dark.xml
@@ -1,20 +1,20 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M20.59,13.41l-7.17,7.17a2,2 0,0 1,-2.83 0L2,12V2h10l8.59,8.59a2,2 0,0 1,0 2.82z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M7,7L7.01,7"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"
-      android:strokeLineCap="round"/>
-</vector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20.59,13.41l-7.17,7.17a2,2 0,0 1,-2.83 0L2,12V2h10l8.59,8.59a2,2 0,0 1,0 2.82z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#ffffff"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M7,7L7.01,7"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#ffffff"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_label_dark_labels.xml b/app/src/main/res/drawable/ic_label_dark_labels.xml
index 216d2a64..ab43dfe5 100644
--- a/app/src/main/res/drawable/ic_label_dark_labels.xml
+++ b/app/src/main/res/drawable/ic_label_dark_labels.xml
@@ -1,20 +1,20 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M20.59,13.41l-7.17,7.17a2,2 0,0 1,-2.83 0L2,12V2h10l8.59,8.59a2,2 0,0 1,0 2.82z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M7,7L7.01,7"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"
-      android:strokeLineCap="round"/>
-</vector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20.59,13.41l-7.17,7.17a2,2 0,0 1,-2.83 0L2,12V2h10l8.59,8.59a2,2 0,0 1,0 2.82z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#ffffff"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M7,7L7.01,7"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#ffffff"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_label_light.xml b/app/src/main/res/drawable/ic_label_light.xml
index eb38d00b..86724139 100644
--- a/app/src/main/res/drawable/ic_label_light.xml
+++ b/app/src/main/res/drawable/ic_label_light.xml
@@ -1,20 +1,20 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M20.59,13.41l-7.17,7.17a2,2 0,0 1,-2.83 0L2,12V2h10l8.59,8.59a2,2 0,0 1,0 2.82z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/iconcolor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M7,7L7.01,7"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/iconcolor"
-      android:strokeLineCap="round"/>
-</vector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20.59,13.41l-7.17,7.17a2,2 0,0 1,-2.83 0L2,12V2h10l8.59,8.59a2,2 0,0 1,0 2.82z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@color/iconcolor"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M7,7L7.01,7"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@color/iconcolor"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_label_light_labels.xml b/app/src/main/res/drawable/ic_label_light_labels.xml
index eb38d00b..86724139 100644
--- a/app/src/main/res/drawable/ic_label_light_labels.xml
+++ b/app/src/main/res/drawable/ic_label_light_labels.xml
@@ -1,20 +1,20 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M20.59,13.41l-7.17,7.17a2,2 0,0 1,-2.83 0L2,12V2h10l8.59,8.59a2,2 0,0 1,0 2.82z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/iconcolor"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M7,7L7.01,7"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/iconcolor"
-      android:strokeLineCap="round"/>
-</vector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20.59,13.41l-7.17,7.17a2,2 0,0 1,-2.83 0L2,12V2h10l8.59,8.59a2,2 0,0 1,0 2.82z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@color/iconcolor"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M7,7L7.01,7"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="@color/iconcolor"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/mygradient.xml b/app/src/main/res/drawable/mygradient.xml
index 69071cf0..27f97ac7 100644
--- a/app/src/main/res/drawable/mygradient.xml
+++ b/app/src/main/res/drawable/mygradient.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle"
-    android:useLevel="false">
-    <gradient
-        android:angle="360"
-        android:type="linear"
-        android:startColor="@color/g1"
-        android:endColor="@color/g2"
-        />
-
-
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    android:useLevel="false">
+    <gradient
+        android:angle="360"
+        android:type="linear"
+        android:startColor="@color/g1"
+        android:endColor="@color/g2"
+        />
+
+
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/mygradient1.xml b/app/src/main/res/drawable/mygradient1.xml
index c4f639fd..76b9861d 100644
--- a/app/src/main/res/drawable/mygradient1.xml
+++ b/app/src/main/res/drawable/mygradient1.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle"
-    android:useLevel="false">
-    <gradient
-        android:angle="360"
-        android:type="linear"
-        android:startColor="@android:color/transparent"
-        android:endColor="@android:color/transparent"
-        />
-    <corners android:radius="10dip"/>
-
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    android:useLevel="false">
+    <gradient
+        android:angle="360"
+        android:type="linear"
+        android:startColor="@android:color/transparent"
+        android:endColor="@android:color/transparent"
+        />
+    <corners android:radius="10dip"/>
+
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/myinnergradient.xml b/app/src/main/res/drawable/myinnergradient.xml
index 1826362f..f44bbb05 100644
--- a/app/src/main/res/drawable/myinnergradient.xml
+++ b/app/src/main/res/drawable/myinnergradient.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle"
-    android:useLevel="false">
-    <gradient
-        android:angle="360"
-        android:type="linear"
-        android:startColor="@color/fragmentsColor"
-        android:endColor="@color/fragmentsColor2"
-        />
-    <corners android:radius="12dip" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    android:useLevel="false">
+    <gradient
+        android:angle="360"
+        android:type="linear"
+        android:startColor="@color/fragmentsColor"
+        android:endColor="@color/fragmentsColor2"
+        />
+    <corners android:radius="12dip" />
+
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/myinnergradientlog.xml b/app/src/main/res/drawable/myinnergradientlog.xml
index 0bf631c5..26417ce4 100644
--- a/app/src/main/res/drawable/myinnergradientlog.xml
+++ b/app/src/main/res/drawable/myinnergradientlog.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:shape="rectangle"
-    android:useLevel="false"
-    tools:ignore="MissingDefaultResource">
-    <gradient
-        android:angle="360"
-        android:type="linear"
-        android:startColor="@color/innerfragmentsColor1"
-        android:endColor="@color/innerfragmentsColor1"
-        />
-    <corners android:radius="10dip" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:shape="rectangle"
+    android:useLevel="false"
+    tools:ignore="MissingDefaultResource">
+    <gradient
+        android:angle="360"
+        android:type="linear"
+        android:startColor="@color/innerfragmentsColor1"
+        android:endColor="@color/innerfragmentsColor1"
+        />
+    <corners android:radius="10dip" />
+
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/onbording.png b/app/src/main/res/drawable/onbording.png
index 219eda82..f3862263 100644
Binary files a/app/src/main/res/drawable/onbording.png and b/app/src/main/res/drawable/onbording.png differ
diff --git a/app/src/main/res/drawable/reportproblem.png b/app/src/main/res/drawable/reportproblem.png
index 281730b8..f39ec793 100644
Binary files a/app/src/main/res/drawable/reportproblem.png and b/app/src/main/res/drawable/reportproblem.png differ
diff --git a/app/src/main/res/drawable/roundbutton.xml b/app/src/main/res/drawable/roundbutton.xml
index 71164845..4ecd4e2f 100644
--- a/app/src/main/res/drawable/roundbutton.xml
+++ b/app/src/main/res/drawable/roundbutton.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#ff8c00" />
-    <corners android:bottomRightRadius="30dp"
-        android:bottomLeftRadius="30dp"
-        android:topRightRadius="30dp"
-        android:topLeftRadius="30dp"/>
-    <gradient
-        android:startColor="#fac401"
-        android:endColor="#ff8c00"
-        android:angle="360" />
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#ff8c00" />
+    <corners android:bottomRightRadius="30dp"
+        android:bottomLeftRadius="30dp"
+        android:topRightRadius="30dp"
+        android:topLeftRadius="30dp"/>
+    <gradient
+        android:startColor="#fac401"
+        android:endColor="#ff8c00"
+        android:angle="360" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selectedround.xml b/app/src/main/res/drawable/selectedround.xml
index c212bd29..7abd547d 100644
--- a/app/src/main/res/drawable/selectedround.xml
+++ b/app/src/main/res/drawable/selectedround.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:bottomRightRadius="20dp"
-        android:bottomLeftRadius="20dp"
-        android:topRightRadius="20dp"
-        android:topLeftRadius="20dp"/>
-    <gradient
-        android:startColor="#000000"
-        android:endColor="#ffffff"
-        android:angle="360" />
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:bottomRightRadius="20dp"
+        android:bottomLeftRadius="20dp"
+        android:topRightRadius="20dp"
+        android:topLeftRadius="20dp"/>
+    <gradient
+        android:startColor="#000000"
+        android:endColor="#ffffff"
+        android:angle="360" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/spinner_background.xml b/app/src/main/res/drawable/spinner_background.xml
index 97b5d4dd..f533a979 100644
--- a/app/src/main/res/drawable/spinner_background.xml
+++ b/app/src/main/res/drawable/spinner_background.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item><layer-list>
-        <item>
-            <shape>
-                <solid
-                    android:color="@color/g2">
-                </solid>
-
-                <corners android:radius="12dp" />
-
-<!--                <padding-->
-<!--                    android:bottom="10dp"-->
-<!--                    android:left="10dp"-->
-<!--                    android:right="10dp"-->
-<!--                    android:top="10dp" />-->
-                <stroke
-                    android:width="2dp"
-                    android:color="#ff8c00"/>
-            </shape>
-        </item>
-
-    </layer-list></item>
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item><layer-list>
+        <item>
+            <shape>
+                <solid
+                    android:color="@color/g2">
+                </solid>
+
+                <corners android:radius="12dp" />
+
+<!--                <padding-->
+<!--                    android:bottom="10dp"-->
+<!--                    android:left="10dp"-->
+<!--                    android:right="10dp"-->
+<!--                    android:top="10dp" />-->
+                <stroke
+                    android:width="2dp"
+                    android:color="#ff8c00"/>
+            </shape>
+        </item>
+
+    </layer-list></item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tabcolor.xml b/app/src/main/res/drawable/tabcolor.xml
index 814129ee..e5754960 100644
--- a/app/src/main/res/drawable/tabcolor.xml
+++ b/app/src/main/res/drawable/tabcolor.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/g1" android:state_selected="true"/>
-    <item android:drawable="@color/colorPrimary" android:state_checked="false"/>
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/g1" android:state_selected="true"/>
+    <item android:drawable="@color/colorPrimary" android:state_checked="false"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/translate.png b/app/src/main/res/drawable/translate.png
index 683692f9..fd7758a1 100644
Binary files a/app/src/main/res/drawable/translate.png and b/app/src/main/res/drawable/translate.png differ
diff --git a/app/src/main/res/drawable/twitter.png b/app/src/main/res/drawable/twitter.png
index 84818358..25887982 100644
Binary files a/app/src/main/res/drawable/twitter.png and b/app/src/main/res/drawable/twitter.png differ
diff --git a/app/src/main/res/drawable/web.png b/app/src/main/res/drawable/web.png
index 944f6733..83a0474c 100644
Binary files a/app/src/main/res/drawable/web.png and b/app/src/main/res/drawable/web.png differ
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index fe67f147..56fd5d39 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,864 +1,863 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/backgroundcolor"
-    tools:context=".About">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbar"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:background="@drawable/mygradient"
-        android:gravity="bottom"
-        app:elevation="0dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:layout_marginLeft="20dp"
-            android:background="@android:color/transparent">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@android:color/transparent"
-                android:gravity="center"
-                android:orientation="horizontal">
-
-                <Button
-                    android:id="@+id/btnback"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_weight="0.01"
-                    android:background="@drawable/ic_back"
-                    android:onClick="back"
-
-                    />
-
-                <TextView
-                    android:id="@+id/toolbartext"
-                    android:layout_width="match_parent"
-                    android:layout_height="30dp"
-                    android:layout_weight="1"
-                    android:text="@string/about"
-                    android:textColor="@color/textcolor"
-                    android:textSize="18sp" />
-
-
-            </LinearLayout>
-        </androidx.appcompat.widget.Toolbar>
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:layout_marginTop="50dp"
-        android:background="@drawable/mygradient" />
-
-
-    <LinearLayout
-        android:id="@+id/l"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_marginTop="55dp"
-        android:orientation="vertical"
-
-        >
-
-        <de.hdodenhof.circleimageview.CircleImageView
-            android:id="@+id/z"
-            android:layout_width="120dp"
-            android:layout_height="130dp"
-            android:layout_centerInParent="true"
-            android:layout_gravity="center"
-            android:src="@drawable/gol"
-            android:onClick="logoclicked"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/textcolor"
-
-            />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/versiontext"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:textColor="@color/spinr" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/apachelicense"
-                android:textColor="@color/colorPrimary"
-                android:onClick="apacheee"/>
-        </LinearLayout>
-    </LinearLayout>
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/l"
-        android:fillViewport="true"
-        android:scrollbars="vertical"
-        android:background="@color/backgroundcolor"
->
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:background="@color/backgroundcolor">
-
-            <androidx.cardview.widget.CardView
-                android:layout_width="match_parent"
-                android:layout_height="80dp"
-                android:layout_gravity="center"
-                android:layout_marginTop="15dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                app:cardBackgroundColor="@color/a"
-                app:cardCornerRadius="10dp"
-
-                >
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="80dp"
-                    android:layout_gravity="center"
-                    android:layout_marginTop="10dp"
-                    android:orientation="vertical"
-                    android:background="@color/a"
-                    >
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:orientation="horizontal">
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:orientation="horizontal">
-
-                            <de.hdodenhof.circleimageview.CircleImageView
-                                android:layout_width="40dp"
-                                android:layout_height="40dp"
-                                android:layout_centerInParent="true"
-                                android:layout_marginLeft="10dp"
-                                android:src="@drawable/crazymarvin"
-                                />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:layout_marginLeft="10dp"
-                            android:orientation="vertical"
-
-                            >
-
-                            <TextView
-                                android:layout_width="230dp"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center"
-                                android:text="Crazy Marvin"
-                                android:textColor="@color/textcolor" />
-
-                            <TextView
-                                android:layout_width="230dp"
-                                android:layout_height="wrap_content"
-                                android:text="@string/developer"
-                                android:textColor="@color/spinr" />
-                        </LinearLayout>
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="right"
-                        android:layout_marginRight="10dp"
-                        android:orientation="horizontal">
-
-                        <Button
-                            android:id="@+id/btnmail_crazymarvin"
-                            android:layout_width="20dp"
-                            android:layout_height="20dp"
-                            android:layout_marginRight="10dp"
-                            android:layout_weight="0.01"
-                            android:background="@drawable/email"
-                            android:onClick="contact_marvin"
-                            />
-
-                        <Button
-                            android:id="@+id/btngit_crazymarvin"
-                            android:layout_width="20dp"
-                            android:layout_height="20dp"
-                            android:layout_marginRight="10dp"
-                            android:layout_weight="0.01"
-                            android:background="@drawable/git"
-                            android:onClick="contact_marvin"
-                            />
-
-                        <Button
-                            android:id="@+id/btntwitter_crazymarvin"
-                            android:layout_width="20dp"
-                            android:layout_height="20dp"
-                            android:layout_marginRight="10dp"
-                            android:layout_weight="0.01"
-                            android:background="@drawable/twitter"
-                            android:onClick="contact_marvin"
-                            />
-                    </LinearLayout>
-                </LinearLayout>
-            </androidx.cardview.widget.CardView>
-
-            <androidx.cardview.widget.CardView
-                android:layout_width="match_parent"
-                android:layout_height="80dp"
-                android:layout_gravity="center"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:layout_marginTop="15dp"
-                app:cardBackgroundColor="@color/a"
-                app:cardCornerRadius="10dp"
-                >
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="80dp"
-                    android:layout_gravity="center"
-                    android:layout_marginTop="10dp"
-                    android:orientation="vertical"
-                    android:background="@color/a"
-                    >
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:orientation="horizontal">
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:orientation="horizontal">
-
-                            <de.hdodenhof.circleimageview.CircleImageView
-                                android:layout_width="40dp"
-                                android:layout_height="40dp"
-                                android:layout_centerInParent="true"
-                                android:layout_marginLeft="10dp"
-                                android:src="@drawable/codeaquaria" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:layout_marginLeft="10dp"
-                            android:orientation="vertical"
-
-                            >
-
-                            <TextView
-                                android:layout_width="230dp"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center"
-                                android:text="Code Acquaria"
-                                android:textColor="@color/textcolor" />
-
-                            <TextView
-                                android:layout_width="230dp"
-                                android:layout_height="wrap_content"
-                                android:text="@string/developer"
-                                android:textColor="@color/spinr" />
-                        </LinearLayout>
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="right"
-                        android:layout_marginRight="10dp"
-                        android:orientation="horizontal">
-
-                        <Button
-                            android:id="@+id/btnmail_codeaquaria"
-                            android:layout_width="20dp"
-                            android:layout_height="20dp"
-                            android:layout_marginRight="10dp"
-                            android:layout_weight="0.01"
-                            android:background="@drawable/email"
-                            android:onClick="contact_codeaquaria"
-                            />
-
-                        <Button
-                            android:id="@+id/btngit_codeaquaria"
-                            android:layout_width="20dp"
-                            android:layout_height="20dp"
-                            android:layout_marginRight="10dp"
-                            android:layout_weight="0.01"
-                            android:background="@drawable/git"
-                            android:onClick="contact_codeaquaria"
-                            />
-
-                        <Button
-                            android:id="@+id/btntwitter_codeaquaria"
-                            android:layout_width="20dp"
-                            android:layout_height="18dp"
-                            android:layout_marginRight="10dp"
-                            android:layout_weight="0.01"
-                            android:background="@drawable/ic_facebook"
-                            android:onClick="contact_codeaquaria"
-                            />
-                    </LinearLayout>
-                </LinearLayout>
-            </androidx.cardview.widget.CardView>
-
-<!--            <androidx.cardview.widget.CardView-->
-<!--                android:layout_width="match_parent"-->
-<!--                android:layout_height="80dp"-->
-<!--                android:layout_gravity="center"-->
-<!--                android:layout_marginTop="15dp"-->
-<!--                app:cardBackgroundColor="@color/a"-->
-<!--                app:cardCornerRadius="10dp"-->
-<!--                android:layout_marginLeft="20dp"-->
-<!--                android:layout_marginRight="20dp"-->
-<!--                >-->
-
-<!--                <LinearLayout-->
-<!--                    android:layout_width="match_parent"-->
-<!--                    android:layout_height="80dp"-->
-<!--                    android:layout_gravity="center"-->
-<!--                    android:layout_marginTop="10dp"-->
-<!--                    android:background="@color/a"-->
-<!--                    android:orientation="vertical">-->
-
-<!--                    <LinearLayout-->
-<!--                        android:layout_width="match_parent"-->
-<!--                        android:layout_height="wrap_content"-->
-<!--                        android:layout_gravity="center"-->
-<!--                        android:orientation="horizontal">-->
-
-<!--                        <LinearLayout-->
-<!--                            android:layout_width="wrap_content"-->
-<!--                            android:layout_height="wrap_content"-->
-<!--                            android:layout_gravity="center"-->
-<!--                            android:orientation="horizontal">-->
-
-<!--                            <de.hdodenhof.circleimageview.CircleImageView-->
-<!--                                android:layout_width="40dp"-->
-<!--                                android:layout_height="40dp"-->
-<!--                                android:layout_centerInParent="true"-->
-<!--                                android:layout_marginLeft="10dp"-->
-<!--                                android:src="@drawable/designerlogo" />-->
-<!--                        </LinearLayout>-->
-
-<!--                        <LinearLayout-->
-<!--                            android:layout_width="wrap_content"-->
-<!--                            android:layout_height="wrap_content"-->
-<!--                            android:layout_gravity="center"-->
-<!--                            android:layout_marginLeft="10dp"-->
-<!--                            android:orientation="vertical"-->
-
-<!--                            >-->
-
-<!--                            <TextView-->
-<!--                                android:layout_width="230dp"-->
-<!--                                android:layout_height="wrap_content"-->
-<!--                                android:layout_gravity="center"-->
-<!--                                android:text="Patryk Michalik"-->
-<!--                                android:textColor="@color/textcolor" />-->
-
-<!--                            <TextView-->
-<!--                                android:layout_width="230dp"-->
-<!--                                android:layout_height="wrap_content"-->
-<!--                                android:text="Designer"-->
-<!--                                android:textColor="@color/spinr" />-->
-<!--                        </LinearLayout>-->
-<!--                    </LinearLayout>-->
-
-<!--                    <LinearLayout-->
-<!--                        android:layout_width="wrap_content"-->
-<!--                        android:layout_height="wrap_content"-->
-<!--                        android:layout_gravity="right"-->
-<!--                        android:layout_marginRight="10dp"-->
-<!--                        android:orientation="horizontal">-->
-
-<!--                        <Button-->
-<!--                            android:id="@+id/btnweb_patriyk"-->
-<!--                            android:layout_width="20dp"-->
-<!--                            android:layout_height="20dp"-->
-<!--                            android:layout_marginRight="10dp"-->
-<!--                            android:layout_weight="0.01"-->
-<!--                            android:background="@drawable/web"-->
-<!--                            android:onClick="contact_patriyk" />-->
-
-<!--                        <Button-->
-<!--                            android:id="@+id/btngit_patriyk"-->
-<!--                            android:layout_width="20dp"-->
-<!--                            android:layout_height="20dp"-->
-<!--                            android:layout_marginRight="10dp"-->
-<!--                            android:layout_weight="0.01"-->
-<!--                            android:background="@drawable/git"-->
-<!--                            android:onClick="contact_patriyk" />-->
-
-<!--                        <Button-->
-<!--                            android:id="@+id/btntwitter_patriyk"-->
-<!--                            android:layout_width="20dp"-->
-<!--                            android:layout_height="20dp"-->
-<!--                            android:layout_marginRight="10dp"-->
-<!--                            android:layout_weight="0.01"-->
-<!--                            android:background="@drawable/twitter"-->
-<!--                            android:onClick="contact_patriyk" />-->
-<!--                    </LinearLayout>-->
-<!--                </LinearLayout>-->
-<!--            </androidx.cardview.widget.CardView>-->
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="30dp"
-                android:layout_marginLeft="25dp"
-                android:layout_marginTop="25dp"
-                android:text="@string/contribute"
-                android:textColor="@color/colorPrimary"
-                android:textSize="18sp" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="13dp"
-                android:background="@color/innerfragmentsColor2" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginLeft="25dp"
-                android:background="@android:color/transparent"
-                android:gravity="center"
-                android:orientation="horizontal">
-
-                <Button
-                    android:id="@+id/btntranslate"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_marginLeft="10dp"
-                    android:background="@drawable/translate"
-                    android:onClick="translate"/>
-
-                <TextView
-                    android:id="@+id/texttranslate"
-                    android:layout_width="match_parent"
-                    android:layout_height="30dp"
-                    android:layout_marginLeft="10dp"
-                    android:text="@string/translate"
-                    android:onClick="translate"
-                    android:gravity = "center_vertical"
-                    android:textColor="@color/textcolor" />
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="13dp"
-                android:background="@color/innerfragmentsColor2" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginLeft="25dp"
-                android:background="@android:color/transparent"
-                android:gravity="center"
-                android:orientation="horizontal">
-
-                <Button
-                    android:id="@+id/btnreport"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_marginLeft="10dp"
-                    android:background="@drawable/reportproblem"
-                    android:onClick="report"
-                    />
-
-                <TextView
-                    android:id="@+id/textreport"
-                    android:layout_width="match_parent"
-                    android:layout_height="30dp"
-                    android:layout_marginLeft="10dp"
-                    android:text="@string/report"
-                    android:gravity = "center_vertical"
-                    android:textColor="@color/textcolor"
-                    android:onClick="report"
-                    />
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="13dp"
-                android:background="@color/innerfragmentsColor2" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginLeft="25dp"
-                android:background="@android:color/transparent"
-                android:gravity="center"
-                android:orientation="horizontal">
-
-                <Button
-                    android:id="@+id/btnsource"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_marginLeft="10dp"
-                    android:background="@drawable/viewsrc"
-                    android:onClick="viewsource"
-                    />
-
-                <TextView
-                    android:id="@+id/textsource"
-                    android:layout_width="match_parent"
-                    android:layout_height="30dp"
-                    android:layout_marginLeft="10dp"
-                    android:text="@string/source"
-                    android:gravity = "center_vertical"
-                    android:onClick="viewsource"
-                    android:textColor="@color/textcolor"/>
-            </LinearLayout>
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="30dp"
-                android:layout_marginLeft="25dp"
-                android:layout_marginTop="25dp"
-                android:text="@string/opensourcelicense"
-                android:textColor="@color/colorPrimary"
-                android:textSize="18sp" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="13dp"
-                android:background="@color/innerfragmentsColor2" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:layout_marginLeft="25dp"
-                    android:background="@android:color/transparent"
-                    android:gravity="center"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:id="@+id/texticons"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
-                        android:text="@string/feather"
-                        android:onClick="feather"
-                        android:textColor="@color/textcolor"/>
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
-                        android:text="@string/mitlicence"
-                        android:onClick="feather"
-                        android:textColor="@color/spinr" />
-                </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="13dp"
-                android:background="@color/innerfragmentsColor2" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:layout_marginLeft="25dp"
-                    android:background="@android:color/transparent"
-                    android:gravity="center"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:id="@+id/textjetpack"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
-                        android:text="@string/jetpack"
-                        android:onClick="jetpack"
-                        android:textColor="@color/textcolor"/>
-                    <TextView
-                        android:id="@+id/textjetpack1"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
-                        android:text="@string/apachelicense"
-                        android:onClick="jetpack"
-                        android:textColor="@color/spinr" />
-                </LinearLayout>
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="13dp"
-                android:background="@color/innerfragmentsColor2" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginLeft="25dp"
-                android:background="@android:color/transparent"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/spinner"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:text="@string/materialspinner"
-                    android:onClick="spinner"
-                    android:textColor="@color/textcolor"/>
-                <TextView
-                    android:id="@+id/spinner1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:text="@string/apachelicense"
-                    android:onClick="spinner"
-                    android:textColor="@color/spinr" />
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="13dp"
-                android:background="@color/innerfragmentsColor2" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginLeft="25dp"
-                android:background="@android:color/transparent"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/nobobutton"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:text="@string/nobobutton"
-                    android:onClick="nobobutton"
-                    android:textColor="@color/textcolor"/>
-                <TextView
-                    android:id="@+id/nobobutton1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:text="@string/apachelicense"
-                    android:onClick="nobobutton"
-                    android:textColor="@color/spinr" />
-            </LinearLayout>
-
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="13dp"
-                android:background="@color/innerfragmentsColor2" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginLeft="25dp"
-                android:background="@android:color/transparent"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/CircleImageView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:text="@string/circleimg"
-                    android:onClick="cImgButton"
-                    android:textColor="@color/textcolor"/>
-                <TextView
-                    android:id="@+id/CircleImageView1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:text="@string/apachelicense"
-                    android:onClick="cImgButton"
-                    android:textColor="@color/spinr" />
-            </LinearLayout>
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="13dp"
-                android:background="@color/innerfragmentsColor2" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginLeft="25dp"
-                android:background="@android:color/transparent"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/MPAndroidChart"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:text="@string/mpandroidchart"
-                    android:onClick="MPAndroidChart"
-                    android:textColor="@color/textcolor"/>
-                <TextView
-                    android:id="@+id/MPAndroidChart1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:text="@string/apachelicense"
-                    android:onClick="MPAndroidChart"
-                    android:textColor="@color/spinr" />
-            </LinearLayout>
-
-
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="13dp"
-                android:background="@color/innerfragmentsColor2" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginLeft="25dp"
-                android:background="@android:color/transparent"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/JUnit"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:text="@string/junit"
-                    android:onClick="JUnit"
-                    android:textColor="@color/textcolor"/>
-                <TextView
-                    android:id="@+id/JUnit1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:text="@string/eclipse"
-                    android:onClick="JUnit"
-                    android:textColor="@color/spinr" />
-            </LinearLayout>
-
-
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="13dp"
-                android:background="@color/innerfragmentsColor2" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginLeft="25dp"
-                android:background="@android:color/transparent"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/Kotlin"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:text="@string/kotlin"
-                    android:onClick="Kotlin"
-                    android:textColor="@color/textcolor"/>
-                <TextView
-                    android:id="@+id/Kotlin1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:text="@string/apachelicense"
-                    android:onClick="Kotlin"
-                    android:textColor="@color/spinr" />
-            </LinearLayout>
-
-
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="13dp"
-                android:background="@color/innerfragmentsColor2" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginLeft="25dp"
-                android:background="@android:color/transparent"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/Java"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:text="@string/java"
-                    android:onClick="Java"
-                    android:textColor="@color/textcolor"/>
-                <TextView
-                    android:id="@+id/Java1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:text="@string/gnu"
-                    android:onClick="Java"
-                    android:textColor="@color/spinr" />
-            </LinearLayout>
-            <View
-                android:layout_width="match_parent"
-
-                android:layout_height="5dp"
-                android:layout_marginTop="13dp"
-                android:background="@android:color/transparent" />
-
-        </LinearLayout>
-    </ScrollView>
-
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/backgroundcolor"
+    tools:context=".About">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@drawable/mygradient"
+        android:gravity="bottom"
+        app:elevation="0dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:layout_marginLeft="20dp"
+            android:background="@android:color/transparent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@android:color/transparent"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/btnback"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_marginRight="10dp"
+                    android:layout_weight="0.01"
+                    android:background="@drawable/ic_back"
+                    android:onClick="back"
+
+                    />
+
+                <TextView
+                    android:id="@+id/toolbartext"
+                    android:layout_width="match_parent"
+                    android:layout_height="30dp"
+                    android:layout_weight="1"
+                    android:text="@string/about"
+                    android:textColor="@color/textcolor"
+                    android:textSize="18sp" />
+
+
+            </LinearLayout>
+        </androidx.appcompat.widget.Toolbar>
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:layout_marginTop="50dp"
+        android:background="@drawable/mygradient" />
+
+
+    <LinearLayout
+        android:id="@+id/l"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_marginTop="55dp"
+        android:orientation="vertical"
+
+        >
+
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/z"
+            android:layout_width="120dp"
+            android:layout_height="130dp"
+            android:layout_centerInParent="true"
+            android:layout_gravity="center"
+            android:src="@drawable/gol"
+            android:onClick="logoclicked"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/app_name"
+            android:textColor="@color/textcolor"
+
+            />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/versiontext"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:textColor="@color/spinr" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/apachelicense"
+                android:textColor="@color/colorPrimary"
+                android:onClick="apacheee"/>
+        </LinearLayout>
+    </LinearLayout>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/l"
+        android:fillViewport="true"
+        android:scrollbars="vertical"
+        android:background="@color/backgroundcolor"
+>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:background="@color/backgroundcolor">
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
+                android:layout_gravity="center"
+                android:layout_marginTop="15dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                app:cardBackgroundColor="@color/a"
+                app:cardCornerRadius="10dp"
+
+                >
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="80dp"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="10dp"
+                    android:orientation="vertical"
+                    android:background="@color/a"
+                    >
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:orientation="horizontal">
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:orientation="horizontal">
+
+                            <de.hdodenhof.circleimageview.CircleImageView
+                                android:layout_width="40dp"
+                                android:layout_height="40dp"
+                                android:layout_centerInParent="true"
+                                android:layout_marginLeft="10dp"
+                                android:src="@drawable/crazymarvin"
+                                />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:layout_marginLeft="10dp"
+                            android:orientation="vertical"
+
+                            >
+
+                            <TextView
+                                android:layout_width="230dp"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:text="Crazy Marvin"
+                                android:textColor="@color/textcolor" />
+
+                            <TextView
+                                android:layout_width="230dp"
+                                android:layout_height="wrap_content"
+                                android:text="@string/developer"
+                                android:textColor="@color/spinr" />
+                        </LinearLayout>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="right"
+                        android:layout_marginRight="10dp"
+                        android:orientation="horizontal">
+
+                        <Button
+                            android:id="@+id/btnmail_crazymarvin"
+                            android:layout_width="20dp"
+                            android:layout_height="20dp"
+                            android:layout_marginRight="10dp"
+                            android:layout_weight="0.01"
+                            android:background="@drawable/email"
+                            android:onClick="contact_marvin"
+                            />
+
+                        <Button
+                            android:id="@+id/btngit_crazymarvin"
+                            android:layout_width="20dp"
+                            android:layout_height="20dp"
+                            android:layout_marginRight="10dp"
+                            android:layout_weight="0.01"
+                            android:background="@drawable/git"
+                            android:onClick="contact_marvin"
+                            />
+
+                        <Button
+                            android:id="@+id/btntwitter_crazymarvin"
+                            android:layout_width="20dp"
+                            android:layout_height="20dp"
+                            android:layout_marginRight="10dp"
+                            android:layout_weight="0.01"
+                            android:background="@drawable/twitter"
+                            android:onClick="contact_marvin"
+                            />
+                    </LinearLayout>
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
+                android:layout_gravity="center"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="15dp"
+                app:cardBackgroundColor="@color/a"
+                app:cardCornerRadius="10dp"
+                >
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="80dp"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="10dp"
+                    android:orientation="vertical"
+                    android:background="@color/a"
+                    >
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:orientation="horizontal">
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:orientation="horizontal">
+
+                            <de.hdodenhof.circleimageview.CircleImageView
+                                android:layout_width="40dp"
+                                android:layout_height="40dp"
+                                android:layout_centerInParent="true"
+                                android:layout_marginLeft="10dp"
+                                android:src="@drawable/codeaquaria" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:layout_marginLeft="10dp"
+                            android:orientation="vertical"
+
+                            >
+
+                            <TextView
+                                android:layout_width="230dp"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:text="Code Acquaria"
+                                android:textColor="@color/textcolor" />
+
+                            <TextView
+                                android:layout_width="230dp"
+                                android:layout_height="wrap_content"
+                                android:text="@string/developer"
+                                android:textColor="@color/spinr" />
+                        </LinearLayout>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="right"
+                        android:layout_marginRight="10dp"
+                        android:orientation="horizontal">
+
+                        <Button
+                            android:id="@+id/btnmail_codeaquaria"
+                            android:layout_width="20dp"
+                            android:layout_height="20dp"
+                            android:layout_marginRight="10dp"
+                            android:layout_weight="0.01"
+                            android:background="@drawable/email"
+                            android:onClick="contact_codeaquaria"
+                            />
+
+                        <Button
+                            android:id="@+id/btngit_codeaquaria"
+                            android:layout_width="20dp"
+                            android:layout_height="20dp"
+                            android:layout_marginRight="10dp"
+                            android:layout_weight="0.01"
+                            android:background="@drawable/git"
+                            android:onClick="contact_codeaquaria"
+                            />
+
+                        <Button
+                            android:id="@+id/btntwitter_codeaquaria"
+                            android:layout_width="20dp"
+                            android:layout_height="18dp"
+                            android:layout_marginRight="10dp"
+                            android:layout_weight="0.01"
+                            android:background="@drawable/ic_facebook"
+                            android:onClick="contact_codeaquaria"
+                            />
+                    </LinearLayout>
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
+
+<!--            <androidx.cardview.widget.CardView-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="80dp"-->
+<!--                android:layout_gravity="center"-->
+<!--                android:layout_marginTop="15dp"-->
+<!--                app:cardBackgroundColor="@color/a"-->
+<!--                app:cardCornerRadius="10dp"-->
+<!--                android:layout_marginLeft="20dp"-->
+<!--                android:layout_marginRight="20dp"-->
+<!--                >-->
+
+<!--                <LinearLayout-->
+<!--                    android:layout_width="match_parent"-->
+<!--                    android:layout_height="80dp"-->
+<!--                    android:layout_gravity="center"-->
+<!--                    android:layout_marginTop="10dp"-->
+<!--                    android:background="@color/a"-->
+<!--                    android:orientation="vertical">-->
+
+<!--                    <LinearLayout-->
+<!--                        android:layout_width="match_parent"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:layout_gravity="center"-->
+<!--                        android:orientation="horizontal">-->
+
+<!--                        <LinearLayout-->
+<!--                            android:layout_width="wrap_content"-->
+<!--                            android:layout_height="wrap_content"-->
+<!--                            android:layout_gravity="center"-->
+<!--                            android:orientation="horizontal">-->
+
+<!--                            <de.hdodenhof.circleimageview.CircleImageView-->
+<!--                                android:layout_width="40dp"-->
+<!--                                android:layout_height="40dp"-->
+<!--                                android:layout_centerInParent="true"-->
+<!--                                android:layout_marginLeft="10dp"-->
+<!--                                android:src="@drawable/designerlogo" />-->
+<!--                        </LinearLayout>-->
+
+<!--                        <LinearLayout-->
+<!--                            android:layout_width="wrap_content"-->
+<!--                            android:layout_height="wrap_content"-->
+<!--                            android:layout_gravity="center"-->
+<!--                            android:layout_marginLeft="10dp"-->
+<!--                            android:orientation="vertical"-->
+
+<!--                            >-->
+
+<!--                            <TextView-->
+<!--                                android:layout_width="230dp"-->
+<!--                                android:layout_height="wrap_content"-->
+<!--                                android:layout_gravity="center"-->
+<!--                                android:text="Patryk Michalik"-->
+<!--                                android:textColor="@color/textcolor" />-->
+
+<!--                            <TextView-->
+<!--                                android:layout_width="230dp"-->
+<!--                                android:layout_height="wrap_content"-->
+<!--                                android:text="Designer"-->
+<!--                                android:textColor="@color/spinr" />-->
+<!--                        </LinearLayout>-->
+<!--                    </LinearLayout>-->
+
+<!--                    <LinearLayout-->
+<!--                        android:layout_width="wrap_content"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:layout_gravity="right"-->
+<!--                        android:layout_marginRight="10dp"-->
+<!--                        android:orientation="horizontal">-->
+
+<!--                        <Button-->
+<!--                            android:id="@+id/btnweb_patriyk"-->
+<!--                            android:layout_width="20dp"-->
+<!--                            android:layout_height="20dp"-->
+<!--                            android:layout_marginRight="10dp"-->
+<!--                            android:layout_weight="0.01"-->
+<!--                            android:background="@drawable/web"-->
+<!--                            android:onClick="contact_patriyk" />-->
+
+<!--                        <Button-->
+<!--                            android:id="@+id/btngit_patriyk"-->
+<!--                            android:layout_width="20dp"-->
+<!--                            android:layout_height="20dp"-->
+<!--                            android:layout_marginRight="10dp"-->
+<!--                            android:layout_weight="0.01"-->
+<!--                            android:background="@drawable/git"-->
+<!--                            android:onClick="contact_patriyk" />-->
+
+<!--                        <Button-->
+<!--                            android:id="@+id/btntwitter_patriyk"-->
+<!--                            android:layout_width="20dp"-->
+<!--                            android:layout_height="20dp"-->
+<!--                            android:layout_marginRight="10dp"-->
+<!--                            android:layout_weight="0.01"-->
+<!--                            android:background="@drawable/twitter"-->
+<!--                            android:onClick="contact_patriyk" />-->
+<!--                    </LinearLayout>-->
+<!--                </LinearLayout>-->
+<!--            </androidx.cardview.widget.CardView>-->
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_marginLeft="25dp"
+                android:layout_marginTop="25dp"
+                android:text="@string/contribute"
+                android:textColor="@color/colorPrimary"
+                android:textSize="18sp" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="13dp"
+                android:background="@color/innerfragmentsColor2" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_marginLeft="25dp"
+                android:background="@android:color/transparent"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/btntranslate"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_marginLeft="10dp"
+                    android:background="@drawable/translate"
+                    android:onClick="translate"/>
+
+                <TextView
+                    android:id="@+id/texttranslate"
+                    android:layout_width="match_parent"
+                    android:layout_height="30dp"
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/translate"
+                    android:onClick="translate"
+                    android:gravity = "center_vertical"
+                    android:textColor="@color/textcolor" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="13dp"
+                android:background="@color/innerfragmentsColor2" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_marginLeft="25dp"
+                android:background="@android:color/transparent"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/btnreport"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_marginLeft="10dp"
+                    android:background="@drawable/reportproblem"
+                    android:onClick="report"
+                    />
+
+                <TextView
+                    android:id="@+id/textreport"
+                    android:layout_width="match_parent"
+                    android:layout_height="30dp"
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/report"
+                    android:gravity = "center_vertical"
+                    android:textColor="@color/textcolor"
+                    android:onClick="report"
+                    />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="13dp"
+                android:background="@color/innerfragmentsColor2" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_marginLeft="25dp"
+                android:background="@android:color/transparent"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/btnsource"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_marginLeft="10dp"
+                    android:background="@drawable/viewsrc"
+                    android:onClick="viewsource"
+                    />
+
+                <TextView
+                    android:id="@+id/textsource"
+                    android:layout_width="match_parent"
+                    android:layout_height="30dp"
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/source"
+                    android:gravity = "center_vertical"
+                    android:onClick="viewsource"
+                    android:textColor="@color/textcolor"/>
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_marginLeft="25dp"
+                android:layout_marginTop="25dp"
+                android:text="@string/opensourcelicense"
+                android:textColor="@color/colorPrimary"
+                android:textSize="18sp" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="13dp"
+                android:background="@color/innerfragmentsColor2" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:layout_marginLeft="25dp"
+                    android:background="@android:color/transparent"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/texticons"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dp"
+                        android:text="@string/feather"
+                        android:onClick="feather"
+                        android:textColor="@color/textcolor"/>
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dp"
+                        android:text="@string/mitlicence"
+                        android:onClick="feather"
+                        android:textColor="@color/spinr" />
+                </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="13dp"
+                android:background="@color/innerfragmentsColor2" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:layout_marginLeft="25dp"
+                    android:background="@android:color/transparent"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/textjetpack"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dp"
+                        android:text="@string/jetpack"
+                        android:onClick="jetpack"
+                        android:textColor="@color/textcolor"/>
+                    <TextView
+                        android:id="@+id/textjetpack1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dp"
+                        android:text="@string/apachelicense"
+                        android:onClick="jetpack"
+                        android:textColor="@color/spinr" />
+                </LinearLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="13dp"
+                android:background="@color/innerfragmentsColor2" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_marginLeft="25dp"
+                android:background="@android:color/transparent"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/materialspinner"
+                    android:onClick="spinner"
+                    android:textColor="@color/textcolor"/>
+                <TextView
+                    android:id="@+id/spinner1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/apachelicense"
+                    android:onClick="spinner"
+                    android:textColor="@color/spinr" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="13dp"
+                android:background="@color/innerfragmentsColor2" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_marginLeft="25dp"
+                android:background="@android:color/transparent"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/nobobutton"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/nobobutton"
+                    android:onClick="nobobutton"
+                    android:textColor="@color/textcolor"/>
+                <TextView
+                    android:id="@+id/nobobutton1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/apachelicense"
+                    android:onClick="nobobutton"
+                    android:textColor="@color/spinr" />
+            </LinearLayout>
+
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="13dp"
+                android:background="@color/innerfragmentsColor2" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_marginLeft="25dp"
+                android:background="@android:color/transparent"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/CircleImageView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/circleimg"
+                    android:onClick="cImgButton"
+                    android:textColor="@color/textcolor"/>
+                <TextView
+                    android:id="@+id/CircleImageView1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/apachelicense"
+                    android:onClick="cImgButton"
+                    android:textColor="@color/spinr" />
+            </LinearLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="13dp"
+                android:background="@color/innerfragmentsColor2" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_marginLeft="25dp"
+                android:background="@android:color/transparent"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/MPAndroidChart"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/mpandroidchart"
+                    android:onClick="MPAndroidChart"
+                    android:textColor="@color/textcolor"/>
+                <TextView
+                    android:id="@+id/MPAndroidChart1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/apachelicense"
+                    android:onClick="MPAndroidChart"
+                    android:textColor="@color/spinr" />
+            </LinearLayout>
+
+
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="13dp"
+                android:background="@color/innerfragmentsColor2" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_marginLeft="25dp"
+                android:background="@android:color/transparent"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/JUnit"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/junit"
+                    android:onClick="JUnit"
+                    android:textColor="@color/textcolor"/>
+                <TextView
+                    android:id="@+id/JUnit1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/eclipse"
+                    android:onClick="JUnit"
+                    android:textColor="@color/spinr" />
+            </LinearLayout>
+
+
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="13dp"
+                android:background="@color/innerfragmentsColor2" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_marginLeft="25dp"
+                android:background="@android:color/transparent"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/Kotlin"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/kotlin"
+                    android:onClick="Kotlin"
+                    android:textColor="@color/textcolor"/>
+                <TextView
+                    android:id="@+id/Kotlin1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/apachelicense"
+                    android:onClick="Kotlin"
+                    android:textColor="@color/spinr" />
+            </LinearLayout>
+
+
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="13dp"
+                android:background="@color/innerfragmentsColor2" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_marginLeft="25dp"
+                android:background="@android:color/transparent"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/Java"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/java"
+                    android:onClick="Java"
+                    android:textColor="@color/textcolor"/>
+                <TextView
+                    android:id="@+id/Java1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/gnu"
+                    android:onClick="Java"
+                    android:textColor="@color/spinr" />
+            </LinearLayout>
+            <View
+                android:layout_width="match_parent"
+
+                android:layout_height="5dp"
+                android:layout_marginTop="13dp"
+                android:background="@android:color/transparent" />
+
+        </LinearLayout>
+    </ScrollView>
+
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_labels.xml b/app/src/main/res/layout/activity_labels.xml
index d2495fb7..c0dca7ef 100644
--- a/app/src/main/res/layout/activity_labels.xml
+++ b/app/src/main/res/layout/activity_labels.xml
@@ -1,75 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/backgroundcolor"
-    android:orientation="vertical"
-    tools:context=".Labels">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        tools:ignore="MissingConstraints">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/backbtn"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_marginRight="5dp"
-                android:layout_weight="0.01"
-                android:background="@drawable/ic_back"
-                android:onClick="backbtnclicked" />
-            <TextView
-                android:id="@+id/toolbartext"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="15dp"
-                android:layout_weight="1"
-                android:text="@string/labels"
-                android:textColor="@color/textcolor"
-                android:textSize="18sp"
-                android:textStyle="bold" />
-        </LinearLayout>
-
-    </androidx.appcompat.widget.Toolbar>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginBottom="55dp"
-        android:layout_marginTop="10dp"
-        android:layout_below="@id/toolbar"
-        >
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rv_labels"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            />
-
-    </LinearLayout>
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/label_floatingbtn"
-        android:layout_width="55dp"
-        android:layout_height="55dp"
-        android:layout_gravity="bottom|end"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="20dp"
-        android:layout_marginRight="10dp"
-        android:background="@color/colorPrimary"
-        backgroundTint="@color/colorPrimary"
-        android:src="@drawable/ic_add" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/backgroundcolor"
+    android:orientation="vertical"
+    tools:context=".Labels">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        tools:ignore="MissingConstraints">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/backbtn"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_marginRight="5dp"
+                android:layout_weight="0.01"
+                android:background="@drawable/ic_back"
+                android:onClick="backbtnclicked" />
+            <TextView
+                android:id="@+id/toolbartext"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="15dp"
+                android:layout_weight="1"
+                android:text="@string/labels"
+                android:textColor="@color/textcolor"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+        </LinearLayout>
+
+    </androidx.appcompat.widget.Toolbar>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_marginBottom="55dp"
+        android:layout_marginTop="10dp"
+        android:layout_below="@id/toolbar"
+        >
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_labels"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            />
+
+    </LinearLayout>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/label_floatingbtn"
+        android:layout_width="55dp"
+        android:layout_height="55dp"
+        android:layout_gravity="bottom|end"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="20dp"
+        android:layout_marginRight="10dp"
+        android:background="@color/colorPrimary"
+        backgroundTint="@color/colorPrimary"
+        android:src="@drawable/ic_add" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9d4fa271..1cac85da 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,96 +1,97 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/backgroundcolor"
-    android:orientation="vertical"
-    tools:context=".MainActivity"
-    android:layout_marginTop="10dp"
-    >
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbar"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:background="@drawable/mygradient"
-        android:gravity="bottom"
-        app:elevation="0dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:layout_marginLeft="20dp"
-            android:background="@android:color/transparent">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@android:color/transparent"
-                android:gravity="center"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/toolbartext"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:textColor="@color/textcolor"
-                    android:textSize="18sp"
-                    android:textStyle="bold" />
-
-                <Button
-                    android:id="@+id/label"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_weight="0.01"
-                    />
-
-                <Button
-                    android:id="@+id/settings"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_weight="0.01"
-                    android:background="@drawable/ic_menu"
-                    android:onClick="mysettings"
-                    />
-            </LinearLayout>
-
-        </androidx.appcompat.widget.Toolbar>
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-
-    <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/navigationView"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="2dp"
-        android:background="@color/backgroundcolor"
-        app:elevation="1dp"
-        app:itemIconSize="@dimen/design_bottom_navigation_icon"
-        app:itemIconTint="@drawable/bottom_nav_color"
-        app:itemTextAppearanceActive="@style/BottomNavigationView.Active"
-        app:itemTextAppearanceInactive="@style/BottomNavigationView"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:menu="@menu/navigation" />
-
-    <FrameLayout
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="50dp"
-        android:layout_marginBottom="30dp"
-        android:layout_weight="1"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/backgroundcolor"
+    android:orientation="vertical"
+    tools:context=".MainActivity"
+    android:layout_marginTop="10dp"
+    >
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@drawable/mygradient"
+        android:gravity="bottom"
+        app:elevation="0dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:layout_marginLeft="20dp"
+            android:background="@android:color/transparent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@android:color/transparent"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/toolbartext"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:textColor="@color/textcolor"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
+
+                <Button
+                    android:id="@+id/label"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_marginRight="10dp"
+                    android:layout_weight="0.01"
+                    android:background="@drawable/ic_label_light"
+                    />
+
+                <Button
+                    android:id="@+id/settings"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_marginRight="10dp"
+                    android:layout_weight="0.01"
+                    android:background="@drawable/ic_menu"
+                    android:onClick="mysettings"
+                    />
+            </LinearLayout>
+
+        </androidx.appcompat.widget.Toolbar>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/navigationView"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="2dp"
+        android:background="@color/backgroundcolor"
+        app:elevation="1dp"
+        app:itemIconSize="@dimen/design_bottom_navigation_icon"
+        app:itemIconTint="@drawable/bottom_nav_color"
+        app:itemTextAppearanceActive="@style/BottomNavigationView.Active"
+        app:itemTextAppearanceInactive="@style/BottomNavigationView"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:menu="@menu/navigation" />
+
+    <FrameLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="50dp"
+        android:layout_marginBottom="30dp"
+        android:layout_weight="1"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
 </RelativeLayout>
\ 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 5d303d37..83515c97 100644
--- a/app/src/main/res/layout/activity_on_boarding.xml
+++ b/app/src/main/res/layout/activity_on_boarding.xml
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/backgroundcolor"
-    tools:context=".OnBoardingActivity">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-        <ImageView
-            android:layout_marginTop="60dp"
-            android:layout_width="300dp"
-            android:layout_height="300dp"
-            android:elevation="6dp"
-            android:layout_gravity="center"
-            android:src="@drawable/onbording"
-            />
-        <TextView
-            android:layout_marginTop="40dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="The reverse to-do list"
-            android:textColor="@color/textcolor"
-            android:textSize="22sp"
-            android:textStyle="bold" />
-
-        <TextView
-            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:textColor="@color/spinr"
-            android:textSize="14sp" />
-
-        <TextView
-            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:textColor="@color/spinr"
-            android:textSize="14sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="morning start off with the fresh list."
-            android:textColor="@color/spinr"
-            android:textSize="14sp" />
-    </LinearLayout>
-
-
-    <Button
-        android:id="@+id/btncontinue"
-        android:layout_width="wrap_content"
-        android:layout_height="40dp"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="30dp"
-        android:text="  Continue  "
-        android:layout_centerInParent="true"
-        android:background="@drawable/continuebutton"
-        android:textAllCaps="false"/>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/backgroundcolor"
+    tools:context=".OnBoardingActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+        <ImageView
+            android:layout_marginTop="60dp"
+            android:layout_width="300dp"
+            android:layout_height="300dp"
+            android:elevation="6dp"
+            android:layout_gravity="center"
+            android:src="@drawable/onbording"
+            />
+        <TextView
+            android:layout_marginTop="40dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="The reverse to-do list"
+            android:textColor="@color/textcolor"
+            android:textSize="22sp"
+            android:textStyle="bold" />
+
+        <TextView
+            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:textColor="@color/spinr"
+            android:textSize="14sp" />
+
+        <TextView
+            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:textColor="@color/spinr"
+            android:textSize="14sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="morning start off with the fresh list."
+            android:textColor="@color/spinr"
+            android:textSize="14sp" />
+    </LinearLayout>
+
+
+    <Button
+        android:id="@+id/btncontinue"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="30dp"
+        android:text="  Continue  "
+        android:layout_centerInParent="true"
+        android:background="@drawable/continuebutton"
+        android:textAllCaps="false"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 2b180842..d110ac10 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -1,123 +1,123 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".Settings"
-    android:orientation="vertical"
-    android:background="@color/backgroundcolor"
-    android:layout_marginTop="10dp"
-    >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
-        android:orientation="horizontal"
-        android:background="@drawable/mygradient">
-
-        <Button
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_gravity="center"
-            android:elevation="6dp"
-            android:layout_marginLeft="20dp"
-            android:gravity="bottom"
-            android:background="@drawable/ic_back"
-            android:onClick="backbtn"
-            />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="20dp"
-            android:textSize="18sp"
-            android:layout_marginLeft="20dp"
-            android:text="@string/settings"
-            android:textColor="@color/textcolor"
-            android:layout_gravity="center"
-            android:gravity="bottom"
-            />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
-        android:orientation="horizontal">
-
-        <Button
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_gravity="center"
-            android:elevation="6dp"
-            android:layout_marginLeft="20dp"
-            android:gravity="bottom"
-            android:background="@drawable/ic_settings"
-            android:onClick="changeMode"
-            />
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="20dp"
-                android:elevation="6dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginTop="10dp"
-                android:gravity="bottom"
-                android:textSize="16sp"
-                android:textColor="@color/textcolor"
-                android:text="@string/appearance"
-                android:onClick="changeMode"
-
-                />
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="14sp"
-                android:text="@string/followsys"
-                android:textColor="@color/textcolor"
-                android:layout_marginLeft="20dp"
-                android:onClick="changeMode"
-
-                />
-        </LinearLayout>
-
-    </LinearLayout>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="13dp"
-        android:background="@color/innerfragmentsColor2" />
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
-        android:orientation="horizontal">
-
-        <Button
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_gravity="center"
-            android:elevation="6dp"
-            android:layout_marginLeft="20dp"
-            android:gravity="bottom"
-            android:background="@drawable/ic_about"
-            android:onClick="aboutus"
-            />
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="30dp"
-                android:elevation="6dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginTop="10dp"
-                android:gravity="bottom"
-                android:textSize="16sp"
-                android:textColor="@color/textcolor"
-                android:text="@string/about"
-                android:onClick="aboutus"
-
-                />
-
-    </LinearLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Settings"
+    android:orientation="vertical"
+    android:background="@color/backgroundcolor"
+    android:layout_marginTop="10dp"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:orientation="horizontal"
+        android:background="@drawable/mygradient">
+
+        <Button
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_gravity="center"
+            android:elevation="6dp"
+            android:layout_marginLeft="20dp"
+            android:gravity="bottom"
+            android:background="@drawable/ic_back"
+            android:onClick="backbtn"
+            />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="20dp"
+            android:textSize="18sp"
+            android:layout_marginLeft="20dp"
+            android:text="@string/settings"
+            android:textColor="@color/textcolor"
+            android:layout_gravity="center"
+            android:gravity="bottom"
+            />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:orientation="horizontal">
+
+        <Button
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_gravity="center"
+            android:elevation="6dp"
+            android:layout_marginLeft="20dp"
+            android:gravity="bottom"
+            android:background="@drawable/ic_settings"
+            android:onClick="changeMode"
+            />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="20dp"
+                android:elevation="6dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="10dp"
+                android:gravity="bottom"
+                android:textSize="16sp"
+                android:textColor="@color/textcolor"
+                android:text="@string/appearance"
+                android:onClick="changeMode"
+
+                />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:id="@+id/modetitle"
+                android:textColor="@color/textcolor"
+                android:layout_marginLeft="20dp"
+                android:onClick="changeMode"
+
+                />
+        </LinearLayout>
+
+    </LinearLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="13dp"
+        android:background="@color/innerfragmentsColor2" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:orientation="horizontal">
+
+        <Button
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_gravity="center"
+            android:elevation="6dp"
+            android:layout_marginLeft="20dp"
+            android:gravity="bottom"
+            android:background="@drawable/ic_about"
+            android:onClick="aboutus"
+            />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:elevation="6dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="10dp"
+                android:gravity="bottom"
+                android:textSize="16sp"
+                android:textColor="@color/textcolor"
+                android:text="@string/about"
+                android:onClick="aboutus"
+
+                />
+
+    </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_splash__screen.xml b/app/src/main/res/layout/activity_splash__screen.xml
index 8efef3db..da0c1712 100644
--- a/app/src/main/res/layout/activity_splash__screen.xml
+++ b/app/src/main/res/layout/activity_splash__screen.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/backgroundcolor"
-    android:orientation="vertical"
-    >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <de.hdodenhof.circleimageview.CircleImageView
-            android:layout_width="150dp"
-            android:layout_height="150dp"
-            android:src="@mipmap/ic_store"
-            ></de.hdodenhof.circleimageview.CircleImageView>
-
-    </LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/backgroundcolor"
+    android:orientation="vertical"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:layout_width="150dp"
+            android:layout_height="150dp"
+            android:src="@mipmap/ic_store"
+            ></de.hdodenhof.circleimageview.CircleImageView>
+
+    </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialogbox.xml b/app/src/main/res/layout/dialogbox.xml
new file mode 100644
index 00000000..f235693d
--- /dev/null
+++ b/app/src/main/res/layout/dialogbox.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="300dp"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="@android:color/white"
+
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="2dp"
+        android:background="@color/backgroundcolor"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/heading"
+            android:layout_width="270dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="8dp"
+            android:gravity="left"
+            android:text="Appearance"
+            android:textSize="20sp" />
+
+
+        <RadioGroup
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp">
+
+            <RadioButton
+                android:id="@+id/followsys"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.13"
+                android:checked="false"
+                android:buttonTint="@color/g1"
+                android:onClick="onRadioButtonClicked"
+                android:text="  Follow System"
+               android:textColor="@color/textcolor"
+                android:textSize="16sp" />
+
+            <RadioButton
+                android:id="@+id/light"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.13"
+                android:checked="false"
+                android:buttonTint="@color/g1"
+                android:onClick="onRadioButtonClicked"
+                android:text="  Light"
+                android:textColor="@color/textcolor"
+                android:textSize="16sp" />
+
+            <RadioButton
+                android:id="@+id/dark"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.13"
+                android:checked="false"
+                android:buttonTint="@color/g1"
+                android:onClick="onRadioButtonClicked"
+                android:text="  Dark"
+                android:textColor="@color/textcolor"
+                android:textSize="16sp" />
+        </RadioGroup>
+
+        <Button
+            android:id="@+id/btndone"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_gravity="end"
+            android:layout_marginTop="20dp"
+            android:layout_marginRight="25dp"
+            android:layout_marginBottom="5dp"
+            android:text="Done"
+            android:background="@drawable/roundbutton"
+            android:textColor="@color/textcolor"
+
+            />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialogbox_floatingbutton.xml b/app/src/main/res/layout/dialogbox_floatingbutton.xml
new file mode 100644
index 00000000..6569f851
--- /dev/null
+++ b/app/src/main/res/layout/dialogbox_floatingbutton.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:layout_gravity="bottom"
+    android:background="@android:color/white"
+
+    >
+    <RelativeLayout
+        android:id="@+id/bottomsheetContainer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/backgroundcolor"
+        android:orientation="vertical"
+        android:padding="3dp"
+        android:layout_margin="1dp"
+        android:layout_gravity="bottom">
+
+        <EditText
+            android:id="@+id/habit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="Enter Task"
+            android:textColorHint="@android:color/darker_gray"
+            android:textColor="@color/textcolor"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+        <EditText
+            android:id="@+id/detail"
+            android:layout_width="match_parent"
+            android:layout_height="100dp"
+            android:layout_below="@id/habit"
+            android:hint="Note"
+            android:textColorHint="@android:color/darker_gray"
+            android:textColor="@color/textcolor"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+        <TextView
+            android:id="@+id/txt"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_below="@id/detail"
+            android:layout_marginLeft="5dp"
+            android:gravity="center_vertical"
+            android:text="@string/addlabl"
+            android:textColor="@android:color/darker_gray"
+            android:textSize="18sp"
+            android:textStyle="italic" />
+
+        <Spinner
+            android:id="@+id/spinner"
+            android:layout_width="250dp"
+            android:layout_height="40dp"
+            android:layout_below="@id/detail"
+            android:layout_marginLeft="5dp"
+            android:layout_marginTop="-7dp"
+            android:backgroundTint="@color/g2" />
+
+        <View
+            android:layout_width="240dp"
+            android:layout_height="1dp"
+            android:layout_marginLeft="5dp"
+            android:background="@color/g2"
+            android:layout_below="@id/spinner"/>
+
+
+        <Button
+            android:id="@+id/saveTaskButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/spinner"
+            android:layout_alignParentEnd="true"
+            android:layout_gravity="right"
+            android:layout_marginTop="50dp"
+            android:background="@drawable/roundbutton"
+            android:text="Save"
+            android:textAllCaps="false"
+            android:textColor="@android:color/white"
+            android:textSize="16sp" />
+
+    </RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialogbox_labels.xml b/app/src/main/res/layout/dialogbox_labels.xml
new file mode 100644
index 00000000..75c53b2b
--- /dev/null
+++ b/app/src/main/res/layout/dialogbox_labels.xml
@@ -0,0 +1,43 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom"
+    android:background="@android:color/white"
+    android:orientation="vertical"
+
+    >
+
+    <RelativeLayout
+        android:id="@+id/bottomsheetContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/backgroundcolor"
+        android:padding="3dp"
+        android:layout_margin="1dp">
+
+        <EditText
+            android:id="@+id/label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/addnewlabl"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:textColor="@color/textcolor"
+            android:textColorHint="@android:color/darker_gray"
+            android:textSize="16sp" />
+
+
+        <Button
+            android:id="@+id/saveLabelButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/label"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="50dp"
+            android:background="@drawable/roundbutton"
+            android:text="Save"
+            android:textAllCaps="false"
+            android:textColor="@android:color/white"
+            android:textSize="16sp" />
+
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_avoided.xml b/app/src/main/res/layout/fragment_avoided.xml
index f4b42d65..bcb1d977 100644
--- a/app/src/main/res/layout/fragment_avoided.xml
+++ b/app/src/main/res/layout/fragment_avoided.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/backgroundcolor"
-    tools:context=".Fragments.AvoidedFragment">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginBottom="55dp">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rv"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            />
-    </LinearLayout>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_gravity="bottom"
-        android:elevation="6dp"
-        android:background="@color/backgroundcolor"/>
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/backgroundcolor"
+    tools:context=".Fragments.AvoidedFragment">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_marginBottom="55dp">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            />
+    </LinearLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_gravity="bottom"
+        android:elevation="6dp"
+        android:background="@color/backgroundcolor"/>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_daily.xml b/app/src/main/res/layout/fragment_daily.xml
index 27cfb7bb..b9a5cc7c 100644
--- a/app/src/main/res/layout/fragment_daily.xml
+++ b/app/src/main/res/layout/fragment_daily.xml
@@ -1,146 +1,146 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/backgroundcolor"
-    tools:context=".Fragments.DailyFragment">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="51dp"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="50dp"
-                android:layout_gravity="center"
-                android:layout_marginTop="0dp"
-                android:orientation="horizontal">
-
-                <Button
-                    android:id="@+id/before"
-                    android:layout_width="25dp"
-                    android:layout_height="25dp"
-                    android:layout_gravity="center"
-                    android:src="@drawable/ic_backarrow"
-                    />
-
-                <TextView
-                    android:id="@+id/date"
-                    android:layout_width="250dp"
-                    android:layout_height="50dp"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:textAlignment="center"
-                    android:textColor="@color/textcolor"
-                    />
-
-                <Button
-                    android:id="@+id/after"
-                    android:layout_width="25dp"
-                    android:layout_height="25dp"
-                    android:layout_gravity="center"
-                    android:src="@drawable/ic_nextarrow"
-                    />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/spinnercolor" />
-        </LinearLayout>
-
-        <com.github.mikephil.charting.charts.PieChart
-            android:id="@+id/pieChart"
-            android:layout_width="210dp"
-            android:layout_height="210dp"
-            android:layout_gravity="center"
-
-            />
-        <TextView
-            android:id="@+id/percentage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textAlignment="center"
-            android:textColor="@color/textcolor"
-            android:textSize="16sp" />
-        <TextView
-            android:id="@+id/progressText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="15dp"
-            android:gravity="center"
-            android:textAlignment="center"
-            android:textColor="@color/textcolor"
-            android:textSize="16sp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="45dp"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="43dp"
-                android:background="@drawable/myinnergradientlog"
-                android:gravity="center"
-                android:layout_gravity="center"
-                android:weightSum="3"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:orientation="horizontal">
-
-                <com.ornach.nobobutton.NoboButton
-                    android:id="@+id/dhabits"
-                    android:layout_width="100dp"
-                    android:layout_height="40dp"
-                    android:gravity="center"
-                    app:nb_backgroundColor="@color/spinnercolor"
-                    app:nb_radius="10dp"
-                    app:nb_text="@string/habits"
-                    android:layout_weight="1"
-                    app:nb_textColor="@color/textcolor"
-                    app:nb_textSize="12sp" />
-
-                <com.ornach.nobobutton.NoboButton
-                    android:id="@+id/davoided"
-                    android:layout_width="100dp"
-                    android:layout_height="40dp"
-                    app:nb_backgroundColor="@android:color/transparent"
-                    app:nb_radius="10dp"
-                    app:nb_text="@string/avoided"
-                    android:layout_weight="1"
-                    app:nb_textColor="@color/textcolor"
-                    app:nb_textSize="12sp" />
-
-                <com.ornach.nobobutton.NoboButton
-                    android:id="@+id/ddone"
-                    android:layout_width="100dp"
-                    android:layout_height="40dp"
-                    app:nb_backgroundColor="@android:color/transparent"
-                    app:nb_radius="10dp"
-                    app:nb_text="@string/done"
-                    android:layout_weight="1"
-                    app:nb_textColor="@color/textcolor"
-                    app:nb_textSize="12sp" />
-
-
-            </LinearLayout>
-        </LinearLayout>
-
-        <FrameLayout
-            android:id="@+id/containerLogDailyFragment"
-            android:layout_width="match_parent"
-            android:layout_height="300dp"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-    </LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/backgroundcolor"
+    tools:context=".Fragments.DailyFragment">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="51dp"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="50dp"
+                android:layout_gravity="center"
+                android:layout_marginTop="0dp"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/before"
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_backarrow"
+                    />
+
+                <TextView
+                    android:id="@+id/date"
+                    android:layout_width="250dp"
+                    android:layout_height="50dp"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:textAlignment="center"
+                    android:textColor="@color/textcolor"
+                    />
+
+                <Button
+                    android:id="@+id/after"
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_nextarrow"
+                    />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/spinnercolor" />
+        </LinearLayout>
+
+        <com.github.mikephil.charting.charts.PieChart
+            android:id="@+id/pieChart"
+            android:layout_width="210dp"
+            android:layout_height="210dp"
+            android:layout_gravity="center"
+
+            />
+        <TextView
+            android:id="@+id/percentage"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textAlignment="center"
+            android:textColor="@color/textcolor"
+            android:textSize="16sp" />
+        <TextView
+            android:id="@+id/progressText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="15dp"
+            android:gravity="center"
+            android:textAlignment="center"
+            android:textColor="@color/textcolor"
+            android:textSize="16sp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="45dp"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="43dp"
+                android:background="@drawable/myinnergradientlog"
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:weightSum="3"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:orientation="horizontal">
+
+                <com.ornach.nobobutton.NoboButton
+                    android:id="@+id/dhabits"
+                    android:layout_width="100dp"
+                    android:layout_height="40dp"
+                    android:gravity="center"
+                    app:nb_backgroundColor="@color/spinnercolor"
+                    app:nb_radius="10dp"
+                    app:nb_text="@string/habits"
+                    android:layout_weight="1"
+                    app:nb_textColor="@color/textcolor"
+                    app:nb_textSize="12sp" />
+
+                <com.ornach.nobobutton.NoboButton
+                    android:id="@+id/davoided"
+                    android:layout_width="100dp"
+                    android:layout_height="40dp"
+                    app:nb_backgroundColor="@android:color/transparent"
+                    app:nb_radius="10dp"
+                    app:nb_text="@string/avoided"
+                    android:layout_weight="1"
+                    app:nb_textColor="@color/textcolor"
+                    app:nb_textSize="12sp" />
+
+                <com.ornach.nobobutton.NoboButton
+                    android:id="@+id/ddone"
+                    android:layout_width="100dp"
+                    android:layout_height="40dp"
+                    app:nb_backgroundColor="@android:color/transparent"
+                    app:nb_radius="10dp"
+                    app:nb_text="@string/done"
+                    android:layout_weight="1"
+                    app:nb_textColor="@color/textcolor"
+                    app:nb_textSize="12sp" />
+
+
+            </LinearLayout>
+        </LinearLayout>
+
+        <FrameLayout
+            android:id="@+id/containerLogDailyFragment"
+            android:layout_width="match_parent"
+            android:layout_height="300dp"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+    </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_done.xml b/app/src/main/res/layout/fragment_done.xml
index f4b42d65..bcb1d977 100644
--- a/app/src/main/res/layout/fragment_done.xml
+++ b/app/src/main/res/layout/fragment_done.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/backgroundcolor"
-    tools:context=".Fragments.AvoidedFragment">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginBottom="55dp">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rv"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            />
-    </LinearLayout>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_gravity="bottom"
-        android:elevation="6dp"
-        android:background="@color/backgroundcolor"/>
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/backgroundcolor"
+    tools:context=".Fragments.AvoidedFragment">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_marginBottom="55dp">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            />
+    </LinearLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_gravity="bottom"
+        android:elevation="6dp"
+        android:background="@color/backgroundcolor"/>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_habits.xml b/app/src/main/res/layout/fragment_habits.xml
index 7a12202a..ce668f22 100644
--- a/app/src/main/res/layout/fragment_habits.xml
+++ b/app/src/main/res/layout/fragment_habits.xml
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/backgroundcolor">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginBottom="55dp">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rv"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            />
-
-    </LinearLayout>
-    <TextView
-        android:id="@+id/b"
-        android:layout_width="wrap_content"
-        android:layout_height="30dp"
-        android:textColor="@color/spinr"
-        android:textSize="12sp"
-        android:text="@string/habitswillshowuphere"
-        android:layout_gravity="center"
-        />
-    <TextView
-        android:id="@+id/a"
-        android:layout_width="wrap_content"
-        android:layout_height="30dp"
-        android:layout_weight="1"
-        android:textColor="@color/textcolor"
-        android:textSize="14sp"
-        android:text="@string/puthabit"
-        android:layout_marginBottom="75dp"
-        android:layout_gravity="bottom|center"
-        />
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/floatingbtn"
-        backgroundTint="@color/colorPrimary"
-        android:layout_width="55dp"
-        android:layout_height="55dp"
-        android:layout_marginBottom="25dp"
-        android:background="@color/colorPrimary"
-        android:src="@drawable/ic_add"
-        android:layout_gravity="bottom|center"
-        />
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_gravity="bottom"
-        android:elevation="6dp"
-        android:background="@color/backgroundcolor"/>
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/backgroundcolor">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_marginBottom="55dp">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            />
+
+    </LinearLayout>
+    <TextView
+        android:id="@+id/b"
+        android:layout_width="wrap_content"
+        android:layout_height="30dp"
+        android:textColor="@color/spinr"
+        android:textSize="12sp"
+        android:text="@string/habitswillshowuphere"
+        android:layout_gravity="center"
+        />
+    <TextView
+        android:id="@+id/a"
+        android:layout_width="wrap_content"
+        android:layout_height="30dp"
+        android:layout_weight="1"
+        android:textColor="@color/textcolor"
+        android:textSize="14sp"
+        android:text="@string/puthabit"
+        android:layout_marginBottom="75dp"
+        android:layout_gravity="bottom|center"
+        />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/floatingbtn"
+        backgroundTint="@color/colorPrimary"
+        android:layout_width="55dp"
+        android:layout_height="55dp"
+        android:layout_marginBottom="25dp"
+        android:background="@color/colorPrimary"
+        android:src="@drawable/ic_add"
+        android:layout_gravity="bottom|center"
+        />
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_gravity="bottom"
+        android:elevation="6dp"
+        android:background="@color/backgroundcolor"/>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_log2.xml b/app/src/main/res/layout/fragment_log2.xml
index c4cfda6e..e676e983 100644
--- a/app/src/main/res/layout/fragment_log2.xml
+++ b/app/src/main/res/layout/fragment_log2.xml
@@ -1,85 +1,85 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/backgroundcolor">
-
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:background="@drawable/mygradient"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="45dp"
-                android:background="@drawable/myinnergradient"
-                android:gravity="center"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:orientation="horizontal"
-                android:weightSum="4">
-
-                <com.ornach.nobobutton.NoboButton
-                    android:id="@+id/day"
-                    android:layout_width="0dp"
-                    android:layout_height="40dp"
-                    app:nb_radius="10dp"
-                    app:nb_text="D"
-                    android:layout_marginLeft="2dp"
-                    android:layout_weight="1"
-                    app:nb_textColor="@color/textcolor"
-                    app:nb_textSize="12sp" />
-
-                <com.ornach.nobobutton.NoboButton
-                    android:id="@+id/week"
-                    android:layout_width="0dp"
-                    android:layout_height="40dp"
-                    app:nb_radius="10dp"
-                    app:nb_text="W"
-                    android:layout_weight="1"
-                    app:nb_textColor="@color/textcolor"
-                    app:nb_textSize="12sp" />
-
-                <com.ornach.nobobutton.NoboButton
-                    android:id="@+id/month"
-                    android:layout_width="0dp"
-                    android:layout_height="40dp"
-                    app:nb_radius="10dp"
-                    app:nb_text="M"
-                    android:layout_weight="1"
-                    app:nb_textColor="@color/textcolor"
-                    app:nb_textSize="12sp" />
-
-                <com.ornach.nobobutton.NoboButton
-                    android:id="@+id/year"
-                    android:layout_width="0dp"
-                    android:layout_height="40dp"
-                    app:nb_radius="10dp"
-                    app:nb_text="Y"
-                    android:layout_marginRight="2dp"
-                    android:layout_weight="1"
-                    app:nb_textColor="@color/textcolor"
-                    app:nb_textSize="12sp" />
-
-            </LinearLayout>
-        </LinearLayout>
-
-
-        <FrameLayout
-            android:id="@+id/containerLogFragment"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-    </LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/backgroundcolor">
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:background="@drawable/mygradient"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="45dp"
+                android:background="@drawable/myinnergradient"
+                android:gravity="center"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:orientation="horizontal"
+                android:weightSum="4">
+
+                <com.ornach.nobobutton.NoboButton
+                    android:id="@+id/day"
+                    android:layout_width="0dp"
+                    android:layout_height="40dp"
+                    app:nb_radius="10dp"
+                    app:nb_text="D"
+                    android:layout_marginLeft="2dp"
+                    android:layout_weight="1"
+                    app:nb_textColor="@color/textcolor"
+                    app:nb_textSize="12sp" />
+
+                <com.ornach.nobobutton.NoboButton
+                    android:id="@+id/week"
+                    android:layout_width="0dp"
+                    android:layout_height="40dp"
+                    app:nb_radius="10dp"
+                    app:nb_text="W"
+                    android:layout_weight="1"
+                    app:nb_textColor="@color/textcolor"
+                    app:nb_textSize="12sp" />
+
+                <com.ornach.nobobutton.NoboButton
+                    android:id="@+id/month"
+                    android:layout_width="0dp"
+                    android:layout_height="40dp"
+                    app:nb_radius="10dp"
+                    app:nb_text="M"
+                    android:layout_weight="1"
+                    app:nb_textColor="@color/textcolor"
+                    app:nb_textSize="12sp" />
+
+                <com.ornach.nobobutton.NoboButton
+                    android:id="@+id/year"
+                    android:layout_width="0dp"
+                    android:layout_height="40dp"
+                    app:nb_radius="10dp"
+                    app:nb_text="Y"
+                    android:layout_marginRight="2dp"
+                    android:layout_weight="1"
+                    app:nb_textColor="@color/textcolor"
+                    app:nb_textSize="12sp" />
+
+            </LinearLayout>
+        </LinearLayout>
+
+
+        <FrameLayout
+            android:id="@+id/containerLogFragment"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+    </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_log_habits.xml b/app/src/main/res/layout/fragment_log_habits.xml
index d8f69ba6..0286588b 100644
--- a/app/src/main/res/layout/fragment_log_habits.xml
+++ b/app/src/main/res/layout/fragment_log_habits.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/backgroundcolor">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginBottom="55dp">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rv"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
-            />
-    </LinearLayout>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="80dp"
-        android:layout_gravity="bottom"
-        android:elevation="6dp"
-        android:background="@color/backgroundcolor"/>
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/backgroundcolor">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_marginBottom="55dp">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            />
+    </LinearLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:layout_gravity="bottom"
+        android:elevation="6dp"
+        android:background="@color/backgroundcolor"/>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_monthly.xml b/app/src/main/res/layout/fragment_monthly.xml
index d4b4c032..9332abf5 100644
--- a/app/src/main/res/layout/fragment_monthly.xml
+++ b/app/src/main/res/layout/fragment_monthly.xml
@@ -1,139 +1,139 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/backgroundcolor">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="51dp"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="50dp"
-                android:layout_gravity="center"
-                android:layout_marginTop="0dp"
-                android:orientation="horizontal">
-
-                <Button
-                    android:id="@+id/before"
-                    android:layout_width="25dp"
-                    android:layout_height="25dp"
-                    android:layout_gravity="center"
-                    android:src="@drawable/ic_backarrow" />
-
-                <TextView
-                    android:id="@+id/date"
-                    android:layout_width="125dp"
-                    android:layout_height="50dp"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:textAlignment="center"
-                    android:textColor="@color/textcolor" />
-                <TextView
-                    android:id="@+id/year"
-                    android:layout_width="125dp"
-                    android:layout_height="50dp"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:textAlignment="center"
-                    android:textColor="@color/textcolor" />
-                <Button
-                    android:id="@+id/after"
-                    android:layout_width="25dp"
-                    android:layout_height="25dp"
-                    android:layout_gravity="center"
-                    android:src="@drawable/ic_nextarrow" />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/spinnercolor" />
-        </LinearLayout>
-
-        <com.github.mikephil.charting.charts.PieChart
-            android:id="@+id/pieChart"
-            android:layout_width="220dp"
-            android:layout_height="220dp"
-            android:layout_gravity="center"
-
-            />
-
-        <TextView
-            android:id="@+id/daterange"
-            android:layout_width="match_parent"
-            android:layout_height="30dp"
-            android:gravity="center"
-            android:textAlignment="center"
-            android:textColor="@color/textcolor"
-            android:textSize="16sp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:orientation="horizontal"
-            >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="30dp"
-                android:text="@string/mostav"
-                android:textColor="@color/textcolor"
-                android:textSize="16sp"
-                android:layout_marginLeft="15dp"
-                android:layout_alignParentStart="true" />
-
-            <TextView
-                android:id="@+id/mostavoided"
-                android:layout_width="200dp"
-                android:layout_height="30dp"
-                android:textAlignment="textEnd"
-                android:textColor="@color/textcolor"
-                android:textSize="16sp"
-                android:layout_marginRight="5dp"
-                tools:ignore="RtlCompat"
-                android:maxLength="25"
-                android:layout_alignParentRight="true" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:orientation="horizontal"
-           >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="30dp"
-                android:text="@string/leastav"
-                android:textColor="@color/textcolor"
-                android:textSize="16sp"
-                android:layout_marginLeft="15dp"
-                android:layout_alignParentStart="true" />
-
-            <TextView
-                android:id="@+id/leastavoided"
-                android:layout_width="200dp"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_marginRight="5dp"
-                android:textAlignment="textEnd"
-                android:textColor="@color/textcolor"
-                android:textSize="16sp"
-                android:maxLength="25"
-                tools:ignore="RtlCompat" />
-        </LinearLayout>
-    </LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/backgroundcolor">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="51dp"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="50dp"
+                android:layout_gravity="center"
+                android:layout_marginTop="0dp"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/before"
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_backarrow" />
+
+                <TextView
+                    android:id="@+id/date"
+                    android:layout_width="125dp"
+                    android:layout_height="50dp"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:textAlignment="center"
+                    android:textColor="@color/textcolor" />
+                <TextView
+                    android:id="@+id/year"
+                    android:layout_width="125dp"
+                    android:layout_height="50dp"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:textAlignment="center"
+                    android:textColor="@color/textcolor" />
+                <Button
+                    android:id="@+id/after"
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_nextarrow" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/spinnercolor" />
+        </LinearLayout>
+
+        <com.github.mikephil.charting.charts.PieChart
+            android:id="@+id/pieChart"
+            android:layout_width="220dp"
+            android:layout_height="220dp"
+            android:layout_gravity="center"
+
+            />
+
+        <TextView
+            android:id="@+id/daterange"
+            android:layout_width="match_parent"
+            android:layout_height="30dp"
+            android:gravity="center"
+            android:textAlignment="center"
+            android:textColor="@color/textcolor"
+            android:textSize="16sp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:orientation="horizontal"
+            >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="30dp"
+                android:text="@string/mostav"
+                android:textColor="@color/textcolor"
+                android:textSize="16sp"
+                android:layout_marginLeft="15dp"
+                android:layout_alignParentStart="true" />
+
+            <TextView
+                android:id="@+id/mostavoided"
+                android:layout_width="200dp"
+                android:layout_height="30dp"
+                android:textAlignment="textEnd"
+                android:textColor="@color/textcolor"
+                android:textSize="16sp"
+                android:layout_marginRight="5dp"
+                tools:ignore="RtlCompat"
+                android:maxLength="25"
+                android:layout_alignParentRight="true" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:orientation="horizontal"
+           >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="30dp"
+                android:text="@string/leastav"
+                android:textColor="@color/textcolor"
+                android:textSize="16sp"
+                android:layout_marginLeft="15dp"
+                android:layout_alignParentStart="true" />
+
+            <TextView
+                android:id="@+id/leastavoided"
+                android:layout_width="200dp"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="5dp"
+                android:textAlignment="textEnd"
+                android:textColor="@color/textcolor"
+                android:textSize="16sp"
+                android:maxLength="25"
+                tools:ignore="RtlCompat" />
+        </LinearLayout>
+    </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_today2.xml b/app/src/main/res/layout/fragment_today2.xml
index 611e6c7e..b2a15867 100644
--- a/app/src/main/res/layout/fragment_today2.xml
+++ b/app/src/main/res/layout/fragment_today2.xml
@@ -1,82 +1,82 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/backgroundcolor"
-    tools:context=".Fragments.FragmentToday">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:background="@drawable/mygradient"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="45dp"
-                android:background="@drawable/myinnergradient"
-                android:gravity="center"
-                android:weightSum="3"
-                android:orientation="horizontal"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
-                >
-
-                <com.ornach.nobobutton.NoboButton
-                    android:id="@+id/habits"
-                    android:layout_width="0dp"
-                    android:layout_height="40dp"
-                    android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:layout_marginLeft="2dp"
-                    android:gravity="center"
-                    app:nb_backgroundColor="@color/bottom_sheet_background"
-                    app:nb_radius="10dp"
-                    app:nb_text="@string/habits"
-                    app:nb_textColor="@color/textcolor"
-                    app:nb_textSize="12sp"
-                    />
-
-                <com.ornach.nobobutton.NoboButton
-                    android:id="@+id/avoided"
-                    android:layout_width="0dp"
-                    android:layout_height="40dp"
-                    app:nb_backgroundColor="@android:color/transparent"
-                    app:nb_radius="10dp"
-                    app:nb_text="@string/avoided"
-                    app:nb_textColor="@color/textcolor"
-                    app:nb_textSize="12sp"
-                    android:layout_weight="1"/>
-
-                <com.ornach.nobobutton.NoboButton
-                    android:id="@+id/done"
-                    android:layout_width="0dp"
-                    android:layout_height="40dp"
-                    app:nb_backgroundColor="@android:color/transparent"
-                    app:nb_radius="10dp"
-                    app:nb_text="@string/done"
-                    app:nb_textColor="@color/textcolor"
-                    app:nb_textSize="12sp"
-                    android:layout_marginRight="2dp"
-                    android:layout_weight="1"/>
-            </LinearLayout>
-        </LinearLayout>
-
-        <FrameLayout
-            android:id="@+id/containerTodayFragment"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-    </LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/backgroundcolor"
+    tools:context=".Fragments.FragmentToday">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:background="@drawable/mygradient"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="45dp"
+                android:background="@drawable/myinnergradient"
+                android:gravity="center"
+                android:weightSum="3"
+                android:orientation="horizontal"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                >
+
+                <com.ornach.nobobutton.NoboButton
+                    android:id="@+id/habits"
+                    android:layout_width="0dp"
+                    android:layout_height="40dp"
+                    android:layout_gravity="center"
+                    android:layout_weight="1"
+                    android:layout_marginLeft="2dp"
+                    android:gravity="center"
+                    app:nb_backgroundColor="@color/bottom_sheet_background"
+                    app:nb_radius="10dp"
+                    app:nb_text="@string/habits"
+                    app:nb_textColor="@color/textcolor"
+                    app:nb_textSize="12sp"
+                    />
+
+                <com.ornach.nobobutton.NoboButton
+                    android:id="@+id/avoided"
+                    android:layout_width="0dp"
+                    android:layout_height="40dp"
+                    app:nb_backgroundColor="@android:color/transparent"
+                    app:nb_radius="10dp"
+                    app:nb_text="@string/avoided"
+                    app:nb_textColor="@color/textcolor"
+                    app:nb_textSize="12sp"
+                    android:layout_weight="1"/>
+
+                <com.ornach.nobobutton.NoboButton
+                    android:id="@+id/done"
+                    android:layout_width="0dp"
+                    android:layout_height="40dp"
+                    app:nb_backgroundColor="@android:color/transparent"
+                    app:nb_radius="10dp"
+                    app:nb_text="@string/done"
+                    app:nb_textColor="@color/textcolor"
+                    app:nb_textSize="12sp"
+                    android:layout_marginRight="2dp"
+                    android:layout_weight="1"/>
+            </LinearLayout>
+        </LinearLayout>
+
+        <FrameLayout
+            android:id="@+id/containerTodayFragment"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+    </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_weekly.xml b/app/src/main/res/layout/fragment_weekly.xml
index faa0ecc7..116cc9bb 100644
--- a/app/src/main/res/layout/fragment_weekly.xml
+++ b/app/src/main/res/layout/fragment_weekly.xml
@@ -1,132 +1,132 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/backgroundcolor">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="51dp"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="50dp"
-                android:layout_gravity="center"
-                android:layout_marginTop="0dp"
-                android:orientation="horizontal">
-
-                <Button
-                    android:id="@+id/before"
-                    android:layout_width="25dp"
-                    android:layout_height="25dp"
-                    android:layout_gravity="center"
-                    android:src="@drawable/ic_backarrow" />
-
-                <TextView
-                    android:id="@+id/date"
-                    android:layout_width="250dp"
-                    android:layout_height="50dp"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:textAlignment="center"
-                    android:textColor="@color/textcolor" />
-
-                <Button
-                    android:id="@+id/after"
-                    android:layout_width="25dp"
-                    android:layout_height="25dp"
-                    android:layout_gravity="center"
-                    android:src="@drawable/ic_nextarrow" />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/spinnercolor" />
-        </LinearLayout>
-
-        <com.github.mikephil.charting.charts.PieChart
-            android:id="@+id/pieChart"
-            android:layout_width="220dp"
-            android:layout_height="220dp"
-            android:layout_gravity="center"
-
-            />
-
-        <TextView
-            android:id="@+id/daterange"
-            android:layout_width="match_parent"
-            android:layout_height="30dp"
-            android:gravity="center"
-            android:textAlignment="center"
-            android:textColor="@color/textcolor"
-            android:textSize="16sp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:orientation="horizontal"
-            >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="46dp"
-                android:layout_alignParentStart="true"
-                android:layout_marginLeft="15dp"
-                android:text="@string/mostav"
-                android:textColor="@color/textcolor"
-                android:textSize="16sp" />
-
-            <TextView
-                android:id="@+id/mostavoided"
-                android:layout_width="200dp"
-                android:layout_height="30dp"
-                android:textAlignment="textEnd"
-                android:textColor="@color/textcolor"
-                android:textSize="16sp"
-                android:layout_marginRight="5dp"
-                tools:ignore="RtlCompat"
-                android:maxLength="25"
-                android:layout_alignParentRight="true" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:orientation="horizontal"
-           >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="30dp"
-                android:text="@string/leastav"
-                android:textColor="@color/textcolor"
-                android:textSize="16sp"
-                android:layout_marginLeft="15dp"
-                android:layout_alignParentStart="true" />
-
-            <TextView
-                android:id="@+id/leastavoided"
-                android:layout_width="200dp"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_marginRight="5dp"
-                android:textAlignment="textEnd"
-                android:textColor="@color/textcolor"
-                android:textSize="16sp"
-                android:maxLength="25"
-                tools:ignore="RtlCompat" />
-        </LinearLayout>
-    </LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/backgroundcolor">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="51dp"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="50dp"
+                android:layout_gravity="center"
+                android:layout_marginTop="0dp"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/before"
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_backarrow" />
+
+                <TextView
+                    android:id="@+id/date"
+                    android:layout_width="250dp"
+                    android:layout_height="50dp"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:textAlignment="center"
+                    android:textColor="@color/textcolor" />
+
+                <Button
+                    android:id="@+id/after"
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_nextarrow" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/spinnercolor" />
+        </LinearLayout>
+
+        <com.github.mikephil.charting.charts.PieChart
+            android:id="@+id/pieChart"
+            android:layout_width="220dp"
+            android:layout_height="220dp"
+            android:layout_gravity="center"
+
+            />
+
+        <TextView
+            android:id="@+id/daterange"
+            android:layout_width="match_parent"
+            android:layout_height="30dp"
+            android:gravity="center"
+            android:textAlignment="center"
+            android:textColor="@color/textcolor"
+            android:textSize="16sp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:orientation="horizontal"
+            >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="46dp"
+                android:layout_alignParentStart="true"
+                android:layout_marginLeft="15dp"
+                android:text="@string/mostav"
+                android:textColor="@color/textcolor"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/mostavoided"
+                android:layout_width="200dp"
+                android:layout_height="30dp"
+                android:textAlignment="textEnd"
+                android:textColor="@color/textcolor"
+                android:textSize="16sp"
+                android:layout_marginRight="5dp"
+                tools:ignore="RtlCompat"
+                android:maxLength="25"
+                android:layout_alignParentRight="true" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:orientation="horizontal"
+           >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="30dp"
+                android:text="@string/leastav"
+                android:textColor="@color/textcolor"
+                android:textSize="16sp"
+                android:layout_marginLeft="15dp"
+                android:layout_alignParentStart="true" />
+
+            <TextView
+                android:id="@+id/leastavoided"
+                android:layout_width="200dp"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="5dp"
+                android:textAlignment="textEnd"
+                android:textColor="@color/textcolor"
+                android:textSize="16sp"
+                android:maxLength="25"
+                tools:ignore="RtlCompat" />
+        </LinearLayout>
+    </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_yearly.xml b/app/src/main/res/layout/fragment_yearly.xml
index 5be4fa98..ef6064ad 100644
--- a/app/src/main/res/layout/fragment_yearly.xml
+++ b/app/src/main/res/layout/fragment_yearly.xml
@@ -1,130 +1,130 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/backgroundcolor">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="51dp"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="50dp"
-                android:layout_gravity="center"
-                android:layout_marginTop="0dp"
-                android:orientation="horizontal">
-
-                <Button
-                    android:id="@+id/before"
-                    android:layout_width="25dp"
-                    android:layout_height="25dp"
-                    android:layout_gravity="center"
-                    android:src="@drawable/ic_backarrow" />
-                <TextView
-                    android:id="@+id/year"
-                    android:layout_width="250dp"
-                    android:layout_height="50dp"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:textAlignment="center"
-                    android:textColor="@color/textcolor" />
-                <Button
-                    android:id="@+id/after"
-                    android:layout_width="25dp"
-                    android:layout_height="25dp"
-                    android:layout_gravity="center"
-                    android:src="@drawable/ic_nextarrow" />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/spinnercolor" />
-        </LinearLayout>
-
-        <com.github.mikephil.charting.charts.PieChart
-            android:id="@+id/pieChart"
-            android:layout_width="220dp"
-            android:layout_height="220dp"
-            android:layout_gravity="center"
-
-            />
-
-        <TextView
-            android:id="@+id/daterange"
-            android:layout_width="match_parent"
-            android:layout_height="30dp"
-            android:gravity="center"
-            android:textAlignment="center"
-            android:textColor="@color/textcolor"
-            android:textSize="16sp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:orientation="horizontal"
-            >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="30dp"
-                android:text="@string/mostav"
-                android:textColor="@color/textcolor"
-                android:textSize="16sp"
-                android:layout_marginLeft="15dp"
-                android:layout_alignParentStart="true" />
-
-            <TextView
-                android:id="@+id/mostavoided"
-                android:layout_width="200dp"
-                android:layout_height="30dp"
-                android:textAlignment="textEnd"
-                android:textColor="@color/textcolor"
-                android:textSize="16sp"
-                android:layout_marginRight="5dp"
-                tools:ignore="RtlCompat"
-                android:maxLength="25"
-                android:layout_alignParentRight="true" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:orientation="horizontal"
-           >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="30dp"
-                android:text="@string/leastav"
-                android:textColor="@color/textcolor"
-                android:textSize="16sp"
-                android:layout_marginLeft="15dp"
-                android:layout_alignParentStart="true" />
-
-            <TextView
-                android:id="@+id/leastavoided"
-                android:layout_width="200dp"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_marginRight="5dp"
-                android:textAlignment="textEnd"
-                android:textColor="@color/textcolor"
-                android:textSize="16sp"
-                android:maxLength="25"
-                tools:ignore="RtlCompat" />
-        </LinearLayout>
-    </LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/backgroundcolor">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="51dp"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="50dp"
+                android:layout_gravity="center"
+                android:layout_marginTop="0dp"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/before"
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_backarrow" />
+                <TextView
+                    android:id="@+id/year"
+                    android:layout_width="250dp"
+                    android:layout_height="50dp"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:textAlignment="center"
+                    android:textColor="@color/textcolor" />
+                <Button
+                    android:id="@+id/after"
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_nextarrow" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/spinnercolor" />
+        </LinearLayout>
+
+        <com.github.mikephil.charting.charts.PieChart
+            android:id="@+id/pieChart"
+            android:layout_width="220dp"
+            android:layout_height="220dp"
+            android:layout_gravity="center"
+
+            />
+
+        <TextView
+            android:id="@+id/daterange"
+            android:layout_width="match_parent"
+            android:layout_height="30dp"
+            android:gravity="center"
+            android:textAlignment="center"
+            android:textColor="@color/textcolor"
+            android:textSize="16sp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:orientation="horizontal"
+            >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="30dp"
+                android:text="@string/mostav"
+                android:textColor="@color/textcolor"
+                android:textSize="16sp"
+                android:layout_marginLeft="15dp"
+                android:layout_alignParentStart="true" />
+
+            <TextView
+                android:id="@+id/mostavoided"
+                android:layout_width="200dp"
+                android:layout_height="30dp"
+                android:textAlignment="textEnd"
+                android:textColor="@color/textcolor"
+                android:textSize="16sp"
+                android:layout_marginRight="5dp"
+                tools:ignore="RtlCompat"
+                android:maxLength="25"
+                android:layout_alignParentRight="true" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:orientation="horizontal"
+           >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="30dp"
+                android:text="@string/leastav"
+                android:textColor="@color/textcolor"
+                android:textSize="16sp"
+                android:layout_marginLeft="15dp"
+                android:layout_alignParentStart="true" />
+
+            <TextView
+                android:id="@+id/leastavoided"
+                android:layout_width="200dp"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="5dp"
+                android:textAlignment="textEnd"
+                android:textColor="@color/textcolor"
+                android:textSize="16sp"
+                android:maxLength="25"
+                tools:ignore="RtlCompat" />
+        </LinearLayout>
+    </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/labels_bottom_sheet.xml b/app/src/main/res/layout/labels_bottom_sheet.xml
index 85ad1672..6fa41e4a 100644
--- a/app/src/main/res/layout/labels_bottom_sheet.xml
+++ b/app/src/main/res/layout/labels_bottom_sheet.xml
@@ -1,31 +1,31 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="16dp"
-    android:id="@+id/bottomsheetContainer"
-    android:background="@drawable/bottom_sheet">
-
-    <EditText
-        android:id="@+id/label"
-        android:background="@android:color/white"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="16sp"
-        android:hint="@string/addnewlabl"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
-
-
-    <Button
-        android:id="@+id/saveLabelButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/label"
-        android:background="@drawable/roundbutton"
-        android:textSize="16sp"
-        android:layout_marginTop="50dp"
-        android:text="Save"
-        android:layout_alignParentEnd="true"
-        android:textAllCaps="false"
-        android:textColor="@android:color/white" />
-
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="16dp"
+    android:id="@+id/bottomsheetContainer"
+    android:background="@drawable/bottom_sheet">
+
+    <EditText
+        android:id="@+id/label"
+        android:background="@android:color/white"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="16sp"
+        android:hint="@string/addnewlabl"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
+
+
+    <Button
+        android:id="@+id/saveLabelButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/label"
+        android:background="@drawable/roundbutton"
+        android:textSize="16sp"
+        android:layout_marginTop="50dp"
+        android:text="Save"
+        android:layout_alignParentEnd="true"
+        android:textAllCaps="false"
+        android:textColor="@android:color/white" />
+
 </RelativeLayout>
\ No newline at end of file
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 4f93cebe..a9a00e2e 100644
--- a/app/src/main/res/layout/labels_bottom_sheet_night.xml
+++ b/app/src/main/res/layout/labels_bottom_sheet_night.xml
@@ -1,32 +1,32 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="16dp"
-    android:id="@+id/bottomsheetContainer"
-    android:background="#26272c">
-
-    <EditText
-        android:id="@+id/label"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="16sp"
-        android:hint="@string/addnewlabl"
-        android:textColorHint="#7C7A72"
-        android:textColor="@android:color/white"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
-
-
-    <Button
-        android:id="@+id/saveLabelButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/label"
-        android:background="@drawable/roundbutton"
-        android:textSize="16sp"
-        android:layout_marginTop="50dp"
-        android:text="Save"
-        android:layout_alignParentEnd="true"
-        android:textAllCaps="false"
-        android:textColor="@android:color/white" />
-
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="16dp"
+    android:id="@+id/bottomsheetContainer"
+    android:background="#26272c">
+
+    <EditText
+        android:id="@+id/label"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="16sp"
+        android:hint="@string/addnewlabl"
+        android:textColorHint="#7C7A72"
+        android:textColor="@android:color/white"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
+
+
+    <Button
+        android:id="@+id/saveLabelButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/label"
+        android:background="@drawable/roundbutton"
+        android:textSize="16sp"
+        android:layout_marginTop="50dp"
+        android:text="Save"
+        android:layout_alignParentEnd="true"
+        android:textAllCaps="false"
+        android:textColor="@android:color/white" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/labels_recyclerview_layout.xml b/app/src/main/res/layout/labels_recyclerview_layout.xml
index b9b5d4c6..12c04aa5 100644
--- a/app/src/main/res/layout/labels_recyclerview_layout.xml
+++ b/app/src/main/res/layout/labels_recyclerview_layout.xml
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="70dp"
-    android:layout_gravity="center"
-    android:orientation="vertical"
-    android:background="@color/backgroundcolor">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        android:weightSum="3"
-        >
-
-        <Button
-            android:id="@+id/labelsbtn"
-            android:layout_width="0dp"
-            android:layout_height="20dp"
-            android:layout_gravity="top"
-            android:layout_marginLeft="3dp"
-            android:layout_marginTop="10dp"
-            android:layout_weight="0.1"
-
-            />
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:layout_marginLeft="10dp"
-            android:layout_weight="2.8"
-            >
-
-            <TextView
-                android:id="@+id/tv_label"
-                android:layout_width="match_parent"
-                android:layout_height="30dp"
-                android:layout_marginLeft="15dp"
-                android:background="@color/backgroundcolor"
-                android:gravity="center"
-                android:textAlignment="textStart"
-                android:textColor="@color/textcolor"
-                android:textSize="16sp"
-                tools:ignore="RtlCompat" />
-
-            <TextView
-                android:id="@+id/tv_sum"
-                android:layout_width="match_parent"
-                android:layout_height="20dp"
-                android:textColor="@android:color/darker_gray"
-                android:background="@color/backgroundcolor"
-                android:textSize="12sp"
-                android:layout_marginLeft="15dp"
-                 />
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/bottom_sheet_background"/>
-        </LinearLayout>
-
-
-    </LinearLayout>
-
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="70dp"
+    android:layout_gravity="center"
+    android:orientation="vertical"
+    android:background="@color/backgroundcolor">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:weightSum="3"
+        >
+
+        <Button
+            android:id="@+id/labelsbtn"
+            android:layout_width="0dp"
+            android:layout_height="20dp"
+            android:layout_gravity="top"
+            android:layout_marginLeft="3dp"
+            android:layout_marginTop="10dp"
+            android:layout_weight="0.1"
+
+            />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:layout_marginLeft="10dp"
+            android:layout_weight="2.8"
+            >
+
+            <TextView
+                android:id="@+id/tv_label"
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_marginLeft="15dp"
+                android:background="@color/backgroundcolor"
+                android:gravity="center"
+                android:textAlignment="textStart"
+                android:textColor="@color/textcolor"
+                android:textSize="16sp"
+                tools:ignore="RtlCompat" />
+
+            <TextView
+                android:id="@+id/tv_sum"
+                android:layout_width="match_parent"
+                android:layout_height="20dp"
+                android:textColor="@android:color/darker_gray"
+                android:background="@color/backgroundcolor"
+                android:textSize="12sp"
+                android:layout_marginLeft="15dp"
+                 />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/bottom_sheet_background"/>
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/layout_bottom_sheet.xml b/app/src/main/res/layout/layout_bottom_sheet.xml
index 39090077..3427728e 100644
--- a/app/src/main/res/layout/layout_bottom_sheet.xml
+++ b/app/src/main/res/layout/layout_bottom_sheet.xml
@@ -1,67 +1,69 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/bottomsheetContainer"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/bottom_sheet"
-    android:orientation="vertical"
-    android:padding="16dp">
-
-    <EditText
-        android:id="@+id/habit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="Enter Task"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
-
-    <EditText
-        android:id="@+id/detail"
-        android:layout_width="match_parent"
-        android:layout_height="100dp"
-        android:layout_below="@id/habit"
-        android:hint="Note"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
-
-    <TextView
-        android:id="@+id/txt"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_below="@id/detail"
-        android:layout_marginLeft="5dp"
-        android:gravity="center_vertical"
-        android:text="@string/addlabl"
-        android:textColor="@android:color/darker_gray"
-        android:textSize="18sp"
-        android:textStyle="italic" />
-
-    <Spinner
-        android:id="@+id/spinner"
-        android:layout_width="250dp"
-        android:layout_height="40dp"
-        android:layout_below="@id/detail"
-        android:layout_marginLeft="5dp"
-        android:layout_marginTop="-7dp"
-        android:backgroundTint="@color/g2" />
-
-    <View
-        android:layout_width="240dp"
-        android:layout_height="1dp"
-        android:layout_marginLeft="5dp"
-        android:background="@color/g2"
-        android:layout_below="@id/spinner"/>
-
-
-    <Button
-        android:id="@+id/saveTaskButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/spinner"
-        android:layout_alignParentEnd="true"
-        android:layout_gravity="right"
-        android:layout_marginTop="50dp"
-        android:background="@drawable/roundbutton"
-        android:text="Save"
-        android:textAllCaps="false"
-        android:textColor="@android:color/white"
-        android:textSize="16sp" />
-
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/bottomsheetContainer"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/backgroundcolor"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <EditText
+        android:id="@+id/habit"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="Enter Task"
+        android:textColor="@color/textcolor"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+    <EditText
+        android:id="@+id/detail"
+        android:layout_width="match_parent"
+        android:layout_height="100dp"
+        android:layout_below="@id/habit"
+        android:hint="Note"
+        android:textColor="@color/textcolor"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+    <TextView
+        android:id="@+id/txt"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:layout_below="@id/detail"
+        android:layout_marginLeft="5dp"
+        android:gravity="center_vertical"
+        android:text="@string/addlabl"
+        android:textColor="@android:color/darker_gray"
+        android:textSize="18sp"
+        android:textStyle="italic" />
+
+    <Spinner
+        android:id="@+id/spinner"
+        android:layout_width="250dp"
+        android:layout_height="40dp"
+        android:layout_below="@id/detail"
+        android:layout_marginLeft="5dp"
+        android:layout_marginTop="-7dp"
+        android:backgroundTint="@color/g2" />
+
+    <View
+        android:layout_width="240dp"
+        android:layout_height="1dp"
+        android:layout_marginLeft="5dp"
+        android:background="@color/g2"
+        android:layout_below="@id/spinner"/>
+
+
+    <Button
+        android:id="@+id/saveTaskButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/spinner"
+        android:layout_alignParentEnd="true"
+        android:layout_gravity="right"
+        android:layout_marginTop="50dp"
+        android:background="@drawable/roundbutton"
+        android:text="Save"
+        android:textAllCaps="false"
+        android:textColor="@android:color/white"
+        android:textSize="16sp" />
+
 </RelativeLayout>
\ No newline at end of file
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 2d261f0f..0f327f9b 100644
--- a/app/src/main/res/layout/layout_bottom_sheet_nightmode.xml
+++ b/app/src/main/res/layout/layout_bottom_sheet_nightmode.xml
@@ -1,67 +1,67 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="16dp"
-    android:orientation="vertical"
-    android:id="@+id/bottomsheetContainer"
-    android:background="@drawable/bottom_sheet_nightmode">
-
-    <EditText
-        android:id="@+id/habit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="Enter Task"
-        android:textColorHint="#7C7A72"
-        android:textColor="@android:color/white"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
-
-    <EditText
-        android:id="@+id/detail"
-        android:layout_width="match_parent"
-        android:layout_height="100dp"
-        android:hint="Note"
-        android:textColorHint="#7C7A72"
-        android:textColor="@android:color/white"
-        android:layout_below="@id/habit"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
-<!--    <View-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="1dp"-->
-<!--        android:id="@+id/view1"-->
-<!--        android:background="@android:color/darker_gray"-->
-<!--        android:layout_below="@id/detail"/>-->
-    <TextView
-        android:id="@+id/txt"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_below="@id/detail"
-        android:layout_marginLeft="5dp"
-        android:gravity="center_vertical"
-        android:text="@string/addlabl"
-        android:textColor="#7C7A72"
-        android:textSize="18sp"
-        android:textStyle="italic" />
-    <Spinner
-        android:id="@+id/spinner"
-        android:layout_width="250dp"
-        android:layout_height="40dp"
-        android:layout_below="@id/detail"
-        android:layout_marginLeft="5dp"
-        android:backgroundTint="@color/g2"
-        />
-
-    <Button
-        android:id="@+id/saveTaskButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/spinner"
-        android:background="@drawable/roundbutton"
-        android:textSize="16sp"
-        android:layout_gravity="right"
-        android:layout_marginTop="50dp"
-        android:text="Save"
-        android:layout_alignParentEnd="true"
-        android:textAllCaps="false"
-        android:textColor="@android:color/white" />
-
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="16dp"
+    android:orientation="vertical"
+    android:id="@+id/bottomsheetContainer"
+    android:background="@drawable/bottom_sheet_nightmode">
+
+    <EditText
+        android:id="@+id/habit"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="Enter Task"
+        android:textColorHint="#7C7A72"
+        android:textColor="@android:color/white"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
+
+    <EditText
+        android:id="@+id/detail"
+        android:layout_width="match_parent"
+        android:layout_height="100dp"
+        android:hint="Note"
+        android:textColorHint="#7C7A72"
+        android:textColor="@android:color/white"
+        android:layout_below="@id/habit"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
+<!--    <View-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="1dp"-->
+<!--        android:id="@+id/view1"-->
+<!--        android:background="@android:color/darker_gray"-->
+<!--        android:layout_below="@id/detail"/>-->
+    <TextView
+        android:id="@+id/txt"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:layout_below="@id/detail"
+        android:layout_marginLeft="5dp"
+        android:gravity="center_vertical"
+        android:text="@string/addlabl"
+        android:textColor="#7C7A72"
+        android:textSize="18sp"
+        android:textStyle="italic" />
+    <Spinner
+        android:id="@+id/spinner"
+        android:layout_width="250dp"
+        android:layout_height="40dp"
+        android:layout_below="@id/detail"
+        android:layout_marginLeft="5dp"
+        android:backgroundTint="@color/g2"
+        />
+
+    <Button
+        android:id="@+id/saveTaskButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/spinner"
+        android:background="@drawable/roundbutton"
+        android:textSize="16sp"
+        android:layout_gravity="right"
+        android:layout_marginTop="50dp"
+        android:text="Save"
+        android:layout_alignParentEnd="true"
+        android:textAllCaps="false"
+        android:textColor="@android:color/white" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/menu_fragment.xml b/app/src/main/res/layout/menu_fragment.xml
index 8b976a7a..cc8296d7 100644
--- a/app/src/main/res/layout/menu_fragment.xml
+++ b/app/src/main/res/layout/menu_fragment.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@color/backgroundcolor">
-    <TextView
-        android:id="@+id/settings"
-        android:layout_width="match_parent"
-        android:layout_height="30dp"
-        android:text="@string/settings"
-        android:textColor="@color/textcolor"/>
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="30dp"
-        android:text="@string/about"
-        android:textColor="@color/textcolor" />
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/backgroundcolor">
+    <TextView
+        android:id="@+id/settings"
+        android:layout_width="match_parent"
+        android:layout_height="30dp"
+        android:text="@string/settings"
+        android:textColor="@color/textcolor"/>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="30dp"
+        android:text="@string/about"
+        android:textColor="@color/textcolor" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/recyclerview_layout.xml b/app/src/main/res/layout/recyclerview_layout.xml
index d5e48dc4..de92fca4 100644
--- a/app/src/main/res/layout/recyclerview_layout.xml
+++ b/app/src/main/res/layout/recyclerview_layout.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="70dp"
-    android:layout_gravity="center"
-    android:background="@color/backgroundcolor">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:layout_marginLeft="15dp"
-        >
-
-        <Button
-            android:layout_width="35dp"
-            android:layout_height="35dp"
-            android:layout_weight="0"
-            android:layout_gravity="top"
-            android:layout_marginTop="5dp"
-            android:id="@+id/addToAvoided"
-            />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:layout_marginLeft="10dp">
-
-            <TextView
-                android:id="@+id/task"
-                android:layout_width="match_parent"
-                android:layout_height="30dp"
-                android:layout_marginLeft="15dp"
-                android:gravity="center"
-                android:textAlignment="textStart"
-                android:textColor="@color/textcolor"
-                android:textSize="16sp"
-                tools:ignore="RtlCompat" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:id="@+id/dateoftask"
-                android:layout_height="20dp"
-                android:textColor="@android:color/darker_gray"
-                android:textSize="12sp"
-                android:layout_marginLeft="15dp"
-                android:text="Food and Drink" />
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/bottom_sheet_background"/>
-        </LinearLayout>
-    </LinearLayout>
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="70dp"
+    android:layout_gravity="center"
+    android:background="@color/backgroundcolor">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        android:layout_marginLeft="15dp"
+        >
+
+        <Button
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_weight="0"
+            android:layout_gravity="top"
+            android:layout_marginTop="5dp"
+            android:id="@+id/addToAvoided"
+            />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:layout_marginLeft="10dp">
+
+            <TextView
+                android:id="@+id/task"
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_marginLeft="15dp"
+                android:gravity="center"
+                android:textAlignment="textStart"
+                android:textColor="@color/textcolor"
+                android:textSize="16sp"
+                tools:ignore="RtlCompat" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:id="@+id/dateoftask"
+                android:layout_height="20dp"
+                android:textColor="@android:color/darker_gray"
+                android:textSize="12sp"
+                android:layout_marginLeft="15dp"
+                android:text="Food and Drink" />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/bottom_sheet_background"/>
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/recyclerview_layout_habits.xml b/app/src/main/res/layout/recyclerview_layout_habits.xml
index 3e0b95e0..1daf921e 100644
--- a/app/src/main/res/layout/recyclerview_layout_habits.xml
+++ b/app/src/main/res/layout/recyclerview_layout_habits.xml
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="70dp"
-    android:layout_gravity="center"
-    android:background="@color/backgroundcolor">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal"
-
-        >
-
-        <Button
-            android:layout_marginLeft="5dp"
-            android:layout_width="35dp"
-            android:layout_height="35dp"
-            android:layout_weight="0"
-            android:layout_gravity="top"
-            android:layout_marginTop="5dp"
-            android:id="@+id/addToAvoided"
-            />
-        <Button
-            android:layout_width="35dp"
-            android:layout_height="35dp"
-            android:layout_weight="0"
-            android:layout_gravity="top"
-            android:layout_marginTop="5dp"
-            android:id="@+id/addToDone"
-            />
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:layout_marginLeft="10dp">
-
-            <TextView
-                android:id="@+id/task"
-                android:layout_width="match_parent"
-                android:layout_height="30dp"
-                android:layout_marginLeft="15dp"
-                android:gravity="center"
-                android:textAlignment="textStart"
-                android:textColor="@color/textcolor"
-                android:textSize="16sp"
-                tools:ignore="RtlCompat" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:id="@+id/catagoryoftask"
-                android:layout_height="20dp"
-                android:textColor="@android:color/darker_gray"
-                android:textSize="12sp"
-                android:layout_marginLeft="15dp"
-                android:text="Food and Drink" />
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/bottom_sheet_background"
-
-                />
-        </LinearLayout>
-    </LinearLayout>
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="70dp"
+    android:layout_gravity="center"
+    android:background="@color/backgroundcolor">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+
+        >
+
+        <Button
+            android:layout_marginLeft="5dp"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_weight="0"
+            android:layout_gravity="top"
+            android:layout_marginTop="5dp"
+            android:id="@+id/addToAvoided"
+            />
+        <Button
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_weight="0"
+            android:layout_gravity="top"
+            android:layout_marginTop="5dp"
+            android:id="@+id/addToDone"
+            />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:layout_marginLeft="10dp">
+
+            <TextView
+                android:id="@+id/task"
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_marginLeft="15dp"
+                android:gravity="center"
+                android:textAlignment="textStart"
+                android:textColor="@color/textcolor"
+                android:textSize="16sp"
+                tools:ignore="RtlCompat" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:id="@+id/catagoryoftask"
+                android:layout_height="20dp"
+                android:textColor="@android:color/darker_gray"
+                android:textSize="12sp"
+                android:layout_marginLeft="15dp"
+                android:text="Food and Drink" />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/bottom_sheet_background"
+
+                />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/recyclerview_layout_log_habits.xml b/app/src/main/res/layout/recyclerview_layout_log_habits.xml
index 578a4c97..ffc38d43 100644
--- a/app/src/main/res/layout/recyclerview_layout_log_habits.xml
+++ b/app/src/main/res/layout/recyclerview_layout_log_habits.xml
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="70dp"
-    android:layout_gravity="center"
-    android:background="@color/backgroundcolor">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:layout_marginLeft="15dp"
-        >
-        <Button
-            android:layout_width="35dp"
-            android:layout_height="35dp"
-            android:layout_weight="0"
-            android:layout_gravity="top"
-            android:layout_marginTop="5dp"
-            android:id="@+id/habitsbutton"
-            />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            >
-
-
-
-            <TextView
-                android:id="@+id/task"
-                android:layout_width="match_parent"
-                android:layout_height="30dp"
-                android:layout_marginLeft="15dp"
-                android:gravity="center"
-                android:textAlignment="textStart"
-                android:textColor="@color/textcolor"
-                android:textSize="16sp"
-                tools:ignore="RtlCompat" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:id="@+id/catagoryoftask"
-                android:layout_height="20dp"
-                android:textColor="@android:color/darker_gray"
-                android:textSize="12sp"
-                android:layout_marginLeft="15dp"
-                android:text="Food and Drink" />
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/bottom_sheet_background"
-
-                />
-        </LinearLayout>
-    </LinearLayout>
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="70dp"
+    android:layout_gravity="center"
+    android:background="@color/backgroundcolor">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        android:layout_marginLeft="15dp"
+        >
+        <Button
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_weight="0"
+            android:layout_gravity="top"
+            android:layout_marginTop="5dp"
+            android:id="@+id/habitsbutton"
+            />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            >
+
+
+
+            <TextView
+                android:id="@+id/task"
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_marginLeft="15dp"
+                android:gravity="center"
+                android:textAlignment="textStart"
+                android:textColor="@color/textcolor"
+                android:textSize="16sp"
+                tools:ignore="RtlCompat" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:id="@+id/catagoryoftask"
+                android:layout_height="20dp"
+                android:textColor="@android:color/darker_gray"
+                android:textSize="12sp"
+                android:layout_marginLeft="15dp"
+                android:text="Food and Drink" />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/bottom_sheet_background"
+
+                />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/update_layout_bottom_sheet.xml b/app/src/main/res/layout/update_layout_bottom_sheet.xml
index 29fdb880..cc218ad1 100644
--- a/app/src/main/res/layout/update_layout_bottom_sheet.xml
+++ b/app/src/main/res/layout/update_layout_bottom_sheet.xml
@@ -1,66 +1,66 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/bottomsheetContainer"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/bottom_sheet"
-    android:orientation="vertical"
-    android:padding="16dp">
-
-    <EditText
-        android:id="@+id/updatehabit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="Enter Task"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
-
-    <EditText
-        android:id="@+id/updatedetail"
-        android:layout_width="match_parent"
-        android:layout_height="100dp"
-        android:layout_below="@id/updatehabit"
-        android:hint="Note"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
-
-    <TextView
-        android:id="@+id/txt"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_below="@id/updatedetail"
-        android:layout_marginLeft="5dp"
-        android:gravity="center_vertical"
-        android:text="@string/addlabl"
-        android:textColor="@android:color/darker_gray"
-        android:textSize="18sp"
-        android:textStyle="italic" />
-
-    <Spinner
-        android:id="@+id/updatespinner"
-        android:layout_width="250dp"
-        android:layout_height="40dp"
-        android:layout_below="@id/updatedetail"
-        android:layout_marginLeft="5dp"
-        android:backgroundTint="@color/g2"
-        />
-    <View
-        android:layout_width="240dp"
-        android:layout_height="1dp"
-        android:layout_marginLeft="5dp"
-        android:background="@color/g2"
-        android:layout_below="@id/updatespinner"/>
-
-
-    <Button
-        android:id="@+id/updateTaskButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/updatespinner"
-        android:layout_alignParentEnd="true"
-        android:layout_gravity="right"
-        android:layout_marginTop="50dp"
-        android:background="@drawable/roundbutton"
-        android:text="Update"
-        android:textAllCaps="false"
-        android:textColor="@android:color/white"
-        android:textSize="16sp" />
-
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/bottomsheetContainer"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bottom_sheet"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <EditText
+        android:id="@+id/updatehabit"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="Enter Task"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+    <EditText
+        android:id="@+id/updatedetail"
+        android:layout_width="match_parent"
+        android:layout_height="100dp"
+        android:layout_below="@id/updatehabit"
+        android:hint="Note"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+    <TextView
+        android:id="@+id/txt"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:layout_below="@id/updatedetail"
+        android:layout_marginLeft="5dp"
+        android:gravity="center_vertical"
+        android:text="@string/addlabl"
+        android:textColor="@android:color/darker_gray"
+        android:textSize="18sp"
+        android:textStyle="italic" />
+
+    <Spinner
+        android:id="@+id/updatespinner"
+        android:layout_width="250dp"
+        android:layout_height="40dp"
+        android:layout_below="@id/updatedetail"
+        android:layout_marginLeft="5dp"
+        android:backgroundTint="@color/g2"
+        />
+    <View
+        android:layout_width="240dp"
+        android:layout_height="1dp"
+        android:layout_marginLeft="5dp"
+        android:background="@color/g2"
+        android:layout_below="@id/updatespinner"/>
+
+
+    <Button
+        android:id="@+id/updateTaskButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/updatespinner"
+        android:layout_alignParentEnd="true"
+        android:layout_gravity="right"
+        android:layout_marginTop="50dp"
+        android:background="@drawable/roundbutton"
+        android:text="Update"
+        android:textAllCaps="false"
+        android:textColor="@android:color/white"
+        android:textSize="16sp" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/navigation.xml b/app/src/main/res/menu/navigation.xml
index e5421b03..0ccc0b16 100644
--- a/app/src/main/res/menu/navigation.xml
+++ b/app/src/main/res/menu/navigation.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/navigation_today"
-        android:icon="@drawable/ic_today"
-        android:title="Today"/>
-
-    <item
-        android:id="@+id/navigation_log"
-        android:icon="@drawable/ic_log"
-        android:title="Log"/>
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/navigation_today"
+        android:icon="@drawable/ic_today"
+        android:title="Today"/>
+
+    <item
+        android:id="@+id/navigation_log"
+        android:icon="@drawable/ic_log"
+        android:title="Log"/>
 </menu>
\ 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 10b8b019..c1f5e4a6 100644
--- a/app/src/main/res/menu/topmenu.xml
+++ b/app/src/main/res/menu/topmenu.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/settings"
-        android:title="Settings"/>
-
-    <item
-        android:id="@+id/about"
-        android:title="About"/>
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/settings"
+        android:title="Settings"/>
+
+    <item
+        android:id="@+id/about"
+        android:title="About"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-mdpi/ic_roundstore.png b/app/src/main/res/mipmap-mdpi/ic_roundstore.png
index d21cfb99..7f7167c9 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_roundstore.png and b/app/src/main/res/mipmap-mdpi/ic_roundstore.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_store.png b/app/src/main/res/mipmap-mdpi/ic_store.png
index 0afdc3a0..80e86df8 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_store.png and b/app/src/main/res/mipmap-mdpi/ic_store.png differ
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 16884afe..a6b3daec 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,42 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="LightMode">Lass es!</string>
-    <string name="app_name">Lass es!</string>
-    <string name="habitswillshowuphere">Hier werden Angewohnheiten angezeigt.</string>
-    <string name="puthabit">Um zu beginnen, füge eine schlechte Angewohnheit hinzu</string>
-    <string name="addnewlabl">Neues Label hinzufügen</string>
-    <string name="addlabl">Bitte zuerst Label erstellen</string>
-    <string name="leastav">Am seltensten sein gelassen:</string>
-    <string name="avoided">Sein gelassen</string>
-    <string name="mostav">Am häufigsten sein gelassen:</string>
-    <string name="settings">Einstellungen</string>
-    <string name="labels">Etikette</string>
-    <string name="about">Über</string>
-    <string name="log">Protokoll</string>
-    <string name="today">Heute</string>
-    <string name="habits">Angewohnheiten</string>
-    <string name="done">Fertig</string>
-    <string name="text"> <a href="https://mail.google.com/mail/u/0/#search/arafaatqureshi%40gmail.com?compose=new"> Link</a> Hello blank fragment</string>
-    <string name="hello_blank_fragment">Hello blank fragment</string>
-    <string name="java">Java</string>
-    <string name="nobobutton">NoboButton</string>
-    <string name="materialspinner">MaterialSpinner</string>
-    <string name="gnu">GNU General Public License CE</string>
-    <string name="jetpack">Android Jetpack</string>
-    <string name="mitlicence">MIT-Lizenz</string>
-    <string name="followsys">System folgen</string>
-    <string name="circleimg">CircleImageView</string>
-    <string name="junit">JUnit</string>
-    <string name="mpandroidchart">MPAndroidChart</string>
-    <string name="kotlin">Kotlin</string>
-    <string name="eclipse">Eclipse öffentliche Lizenz 1.0</string>
-    <string name="feather">Feather Icons</string>
-    <string name="appearance">Erscheinungsbild</string>
-    <string name="opensourcelicense">Quelloffene Lizenzen</string>
-    <string name="source">Quelltext überprüfen</string>
-    <string name="report">Einen Fehler melden</string>
-    <string name="translate">Übersetzen</string>
-    <string name="contribute">Mitmachen</string>
-    <string name="developer">Entwickler</string>
-    <string name="apachelicense">Apache-Lizenz 2.0</string>
-</resources>
\ No newline at end of file
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 724fc0d2..9402b101 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -1,21 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="LightMode">La det</string>
-    <string name="app_name">La det</string>
-    <string name="leastav">Minst unngått:</string>
-    <string name="habitswillshowuphere">Vaner vil vises her.</string>
-    <string name="puthabit">Begynn ved å skrive ned en dårlig vane</string>
-    <string name="addnewlabl">Legg til ny etikett</string>
-    <string name="addlabl">Legg til etikett først</string>
-    <string name="mostav">Mest unngått:</string>
-    <string name="settings">Innstillinger</string>
-    <string name="labels">Etiketter</string>
-    <string name="about">Om</string>
-    <string name="log">Logg</string>
-    <string name="today">I dag</string>
-    <string name="habits">Vaner</string>
-    <string name="done">Ferdig</string>
-    <string name="avoided">Unngått</string>
-    <string name="hello_blank_fragment">Hei blanke fragment</string>
-    <string name="text"> <a href="https://mail.google.com/mail/u/0/#search/arafaatqureshi%40gmail.com?compose=new"> Lenke</a> Hei blanke fragment</string>
+    <string name="hello_blank_fragment">Hei, blanke fragment</string>
+    <string name="app_name">To Don\'t</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index d9b7d368..326230d1 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#FFAF01</color>
-    <color name="colorPrimaryDark">#756893</color>
-    <color name="colorAccent">#FFAF01</color>
-
-
-    <color name="g1">#26272c</color>
-    <color name="g2">#26272c</color>
-<!--    <color name="floatingbutton">#fac401</color>-->
-<!--    <color name="innerg1">#7C7A72</color>-->
-    <color name="innerg1">#26272c</color>
-    <color name="innerg2">#26272c</color>
-    <color name="bottom_sheet_background">#26272c</color>
-    <color name="backgroundcolor">#000000</color>
-    <color name="textcolor">#FFFFFF</color>
-    <color name="bottomnavigationline">#26272c</color>
-    <color name="catagoriescolor">#26272c</color>
-    <color name="a">#26272c</color>
-    <color name="radiobuttoncolor">#000000</color>
-    <color name="fragmentsColor">#000000</color>
-    <color name="fragmentsColor2">#000000</color>
-    <color name="innerfragmentsColor1">#26272c</color>
-    <color name="innerfragmentsColor2">#26272c</color>
-    <color name="newhabitsheet">#26272c</color>
-    <color name="spinnercolor">#3A3B40</color>
-    <color name="iconcolor">#ffffff</color>
-
-
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#FFAF01</color>
+    <color name="colorPrimaryDark">#756893</color>
+    <color name="colorAccent">#FFAF01</color>
+
+
+    <color name="g1">#26272c</color>
+    <color name="g2">#26272c</color>
+<!--    <color name="floatingbutton">#fac401</color>-->
+<!--    <color name="innerg1">#7C7A72</color>-->
+    <color name="innerg1">#26272c</color>
+    <color name="innerg2">#26272c</color>
+    <color name="bottom_sheet_background">#26272c</color>
+    <color name="backgroundcolor">#000000</color>
+    <color name="textcolor">#FFFFFF</color>
+    <color name="bottomnavigationline">#26272c</color>
+    <color name="catagoriescolor">#26272c</color>
+    <color name="a">#26272c</color>
+    <color name="radiobuttoncolor">#000000</color>
+    <color name="fragmentsColor">#000000</color>
+    <color name="fragmentsColor2">#000000</color>
+    <color name="innerfragmentsColor1">#26272c</color>
+    <color name="innerfragmentsColor2">#26272c</color>
+    <color name="newhabitsheet">#26272c</color>
+    <color name="spinnercolor">#3A3B40</color>
+    <color name="iconcolor">#ffffff</color>
+
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/strings.xml b/app/src/main/res/values-night/strings.xml
index ca031b5d..d18b4f0e 100644
--- a/app/src/main/res/values-night/strings.xml
+++ b/app/src/main/res/values-night/strings.xml
@@ -1,46 +1,46 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="app_name">To Don\'t</string>
-    <string name="NightMode" tools:ignore="ExtraTranslation">toDonts</string>
-
-    <string name="hello_blank_fragment">Hello blank fragment</string>
-    <string name="avoided">Avoided</string>
-    <string name="done">Done</string>
-    <string name="habits">Habits</string>
-    <string name="today">Today</string>
-    <string name="log">Log</string>
-    <string name="about">About</string>
-    <string name="labels">Labels</string>
-    <string name="settings">Settings</string>
-    <string name="mostav">Most Avoided :</string>
-    <string name="leastav">Least Avoided :</string>
-    <string name="addlabl">Please add Label First</string>
-    <string name="addnewlabl">Add New Label</string>
-    <string name="puthabit">To start off, put down a bad habit</string>
-    <string name="habitswillshowuphere">Habits will show up here.</string>
-    <string name="apachelicense">Apache License 2.0</string>
-    <string name="developer">Developer</string>
-    <string name="contribute">Contributer</string>
-    <string name="translate">Translate</string>
-    <string name="report">Report a problem</string>
-    <string name="source">View Source</string>
-    <string name="opensourcelicense">Open-source licences</string>
-    <string name="appearance">Appearance</string>
-    <string name="followsys">Follow System</string>
-    <string name="nobobutton">NoboButton</string>
-    <string name="circleimg">CircleImageView</string>
-    <string name="mpandroidchart">MPAndroidChart</string>
-    <string name="junit">JUnit</string>
-    <string name="eclipse">Eclipse Public License 1.0</string>
-    <string name="kotlin">Kotlin</string>
-    <string name="java">Java</string>
-    <string name="gnu">GNU General Public License CE</string>
-
-
-    <string-array name="spinner_array">
-        <item>Select Label</item>
-        <item>Social</item>
-        <item>Foods And Drinks</item>
-
-
-    </string-array>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name">To Don\'t</string>
+    <string name="NightMode" tools:ignore="ExtraTranslation">toDonts</string>
+
+    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="avoided">Avoided</string>
+    <string name="done">Done</string>
+    <string name="habits">Habits</string>
+    <string name="today">Today</string>
+    <string name="log">Log</string>
+    <string name="about">About</string>
+    <string name="labels">Labels</string>
+    <string name="settings">Settings</string>
+    <string name="mostav">Most Avoided :</string>
+    <string name="leastav">Least Avoided :</string>
+    <string name="addlabl">Please add Label First</string>
+    <string name="addnewlabl">Add New Label</string>
+    <string name="puthabit">To start off, put down a bad habit</string>
+    <string name="habitswillshowuphere">Habits will show up here.</string>
+    <string name="apachelicense">Apache License 2.0</string>
+    <string name="developer">Developer</string>
+    <string name="contribute">Contributer</string>
+    <string name="translate">Translate</string>
+    <string name="report">Report a problem</string>
+    <string name="source">View Source</string>
+    <string name="opensourcelicense">Open-source licences</string>
+    <string name="appearance">Appearance</string>
+    <string name="followsys">Follow System</string>
+    <string name="nobobutton">NoboButton</string>
+    <string name="circleimg">CircleImageView</string>
+    <string name="mpandroidchart">MPAndroidChart</string>
+    <string name="junit">JUnit</string>
+    <string name="eclipse">Eclipse Public License 1.0</string>
+    <string name="kotlin">Kotlin</string>
+    <string name="java">Java</string>
+    <string name="gnu">GNU General Public License CE</string>
+
+
+    <string-array name="spinner_array">
+        <item>Select Label</item>
+        <item>Social</item>
+        <item>Foods And Drinks</item>
+
+
+    </string-array>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 3dec73b1..35ae9959 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -1,28 +1,28 @@
-<resources>
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="android:windowDisablePreview">true</item>
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:windowBackground">@drawable/mygradient</item>
-        <item name="toolbarStyle">@style/Widget.Toolbar</item>
-        <item name="android:statusBarColor">#00000000</item>
-    </style>
-
-    <style name="BottomSheetDialogTheme" parent="Theme.Design.Light.BottomSheetDialog">
-        <item name="bottomSheetStyle">@style/BottomSheetStyle</item>
-    </style>
-
-    <style name="BottomSheetStyle" parent="Widget.Design.BottomSheet.Modal">
-        <item name="android:background">@android:color/transparent</item>
-    </style>
-
-    <style name="MyRadioButton" parent="Theme.AppCompat.Light">
-        <item name="colorControlNormal">#26272c</item>
-        <item name="colorControlActivated">#26272c</item>
-    </style>
-
-
+<resources>
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="android:windowDisablePreview">true</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:windowBackground">@drawable/mygradient</item>
+        <item name="toolbarStyle">@style/Widget.Toolbar</item>
+        <item name="android:statusBarColor">#00000000</item>
+    </style>
+
+    <style name="BottomSheetDialogTheme" parent="Theme.Design.Light.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/BottomSheetStyle</item>
+    </style>
+
+    <style name="BottomSheetStyle" parent="Widget.Design.BottomSheet.Modal">
+        <item name="android:background">@android:color/transparent</item>
+    </style>
+
+    <style name="MyRadioButton" parent="Theme.AppCompat.Light">
+        <item name="colorControlNormal">#26272c</item>
+        <item name="colorControlActivated">#26272c</item>
+    </style>
+
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 36d1a60d..a6b3daec 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,21 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="LightMode">Proszę się nie martwić</string>
-    <string name="app_name">Proszę się nie martwić</string>
-    <string name="avoided">Uniknione</string>
-    <string name="hello_blank_fragment">Witaj, pusty fragmencie</string>
-    <string name="text"> <a href="https://mail.google.com/mail/u/0/#search/arafaatqureshi%40gmail.com?compose=new"> Link</a> Witaj, pusty fragmencie</string>
-    <string name="habitswillshowuphere">Tutaj pojawią się nawyki.</string>
-    <string name="puthabit">Na początek odstaw zły nawyk</string>
-    <string name="addnewlabl">Dodaj nową etykietę</string>
-    <string name="addlabl">Najpierw dodaj etykietę</string>
-    <string name="leastav">Najmniej Unikane:</string>
-    <string name="mostav">Najbardziej Unikane:</string>
-    <string name="settings">Ustawienia</string>
-    <string name="labels">Etykiety</string>
-    <string name="about">O aplikacji</string>
-    <string name="log">Dziennik</string>
-    <string name="today">Dzisiaj</string>
-    <string name="habits">Nawyki</string>
-    <string name="done">Zrobione</string>
-</resources>
\ No newline at end of file
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 65ab5aa7..5c023704 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#FFAF01</color>
-    <color name="colorPrimaryDark">#3700B3</color>
-    <color name="colorAccent">#FFAF01</color>
-
-
-    <color name="g1">#fac401</color>
-<!--    <color name="floatingbutton">#fac401</color>-->
-    <color name="g2">#ff8c00</color>
-    <color name="innerg1">#f2be00</color>
-    <color name="innerg2">#ed8709</color>
-    <color name="backgroundcolor">#FFFFFF</color>
-    <color name="bottomnavigationline">#FFFFFF</color>
-    <color name="bottom_sheet_background">#F8F8F8</color>
-    <color name="textcolor">#000000</color>
-    <color name="catagoriescolor">#000000</color>
-    <color name="radiobuttoncolor">#000000</color>
-    <color name="fragmentsColor">#f2be00</color>
-    <color name="fragmentsColor2">#ed8709</color>
-    <color name="spinnercolor">#ffffff</color>
-    <color name="a">#ffffff</color>
-    <color name="innerfragmentsColor1">#DADADA</color>
-    <color name="innerfragmentsColor2">#DADADA</color>
-    <color name="iconcolor">#D226272C</color>
-    <color name="newhabitsheet">#ffffff</color>
-    <color name="spinr">#7C7A72</color>
-
-
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#FFAF01</color>
+    <color name="colorPrimaryDark">#3700B3</color>
+    <color name="colorAccent">#FFAF01</color>
+
+
+    <color name="g1">#fac401</color>
+<!--    <color name="floatingbutton">#fac401</color>-->
+    <color name="g2">#ff8c00</color>
+    <color name="innerg1">#f2be00</color>
+    <color name="innerg2">#ed8709</color>
+    <color name="backgroundcolor">#FFFFFF</color>
+    <color name="bottomnavigationline">#FFFFFF</color>
+    <color name="bottom_sheet_background">#F8F8F8</color>
+    <color name="textcolor">#000000</color>
+    <color name="catagoriescolor">#000000</color>
+    <color name="radiobuttoncolor">#000000</color>
+    <color name="fragmentsColor">#f2be00</color>
+    <color name="fragmentsColor2">#ed8709</color>
+    <color name="spinnercolor">#ffffff</color>
+    <color name="a">#ffffff</color>
+    <color name="innerfragmentsColor1">#DADADA</color>
+    <color name="innerfragmentsColor2">#DADADA</color>
+    <color name="iconcolor">#D226272C</color>
+    <color name="newhabitsheet">#ffffff</color>
+    <color name="spinr">#7C7A72</color>
+
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index ccbd565f..a0782ebb 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <dimen name="design_bottom_navigation_icon" tools:override="true">24dp</dimen>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <dimen name="design_bottom_navigation_icon" tools:override="true">24dp</dimen>
 </resources>
\ 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 b1c331a3..c5d02220 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">To Don\'t</string>
     <string name="LightMode">To Don\'t</string>
@@ -16,7 +15,7 @@
     <string name="labels">Labels</string>
     <string name="settings">Settings</string>
     <string name="mostav">Most Avoided :</string>
-    <string name="leastav">Least Avoided:</string>
+    <string name="leastav">Least Avoided :</string>
     <string name="addlabl">Please add Label First</string>
     <string name="addnewlabl">Add New Label</string>
     <string name="puthabit">To start off, put down a bad habit</string>
@@ -33,8 +32,8 @@
     <string name="mitlicence">MIT License</string>
     <string name="jetpack">Android Jetpack</string>
     <string name="materialspinner">MaterialSpinner</string>
-    <string name="nobobutton">NoboButton</string>
     <string name="followsys">Follow System</string>
+    <string name="nobobutton">NoboButton</string>
     <string name="circleimg">CircleImageView</string>
     <string name="mpandroidchart">MPAndroidChart</string>
     <string name="junit">JUnit</string>
@@ -42,9 +41,14 @@
     <string name="kotlin">Kotlin</string>
     <string name="java">Java</string>
     <string name="gnu">GNU General Public License CE</string>
+
+
     <string-array name="spinner_array">
         <item>Social</item>
         <item>Foods And Drinks</item>
         <item>Studies</item>
+
+
     </string-array>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 56db0d11..ff2b30b4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,44 +1,44 @@
-<resources>
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="android:windowDisablePreview">true</item>
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:windowBackground">@drawable/mygradient</item>
-        <item name="toolbarStyle">@style/Widget.Toolbar</item>
-        <item name="android:statusBarColor">#00000000</item>
-    </style>
-
-    <style name="BottomSheetDialogTheme" parent="Theme.Design.Light.BottomSheetDialog">
-        <item name="bottomSheetStyle">@style/BottomSheetStyle</item>
-    </style>
-
-    <style name="BottomNavigationView" parent="@style/TextAppearance.AppCompat.Caption">
-        <item name="android:textSize">13sp</item>
-        <item name="android:textColor">#DF26272C</item>
-
-    </style>
-    <style name="BottomNavigationView.Active" parent="@style/TextAppearance.AppCompat.Caption">
-        <item name="android:textSize">10sp</item>
-        <item name="android:textColor">#FFAF01</item>
-    </style>
-    <style name="BottomSheetStyle" parent="Widget.Design.BottomSheet.Modal">
-        <item name="android:background">@android:color/transparent</item>
-    </style>
-
-    <style name="MyRadioButton" parent="Theme.AppCompat.Light">
-        <item name="colorControlNormal">#000000</item>
-        <item name="colorControlActivated">#000000</item>
-    </style>
-
-    <style name="LightSpinnerTextColor">
-        <item name="android:textColor">#ffffff</item>
-        <!--        <item name="android:background">@drawable/ic_spinner</item>-->
-    </style>
-
-    <style name="NightSpinnerTextColor">
-        <item name="android:textColor">@android:color/white</item>
-    </style>
+<resources>
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="android:windowDisablePreview">true</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:windowBackground">@drawable/mygradient</item>
+        <item name="toolbarStyle">@style/Widget.Toolbar</item>
+        <item name="android:statusBarColor">#00000000</item>
+    </style>
+
+    <style name="BottomSheetDialogTheme" parent="Theme.Design.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/BottomSheetStyle</item>
+    </style>
+
+    <style name="BottomNavigationView" parent="@style/TextAppearance.AppCompat.Caption">
+        <item name="android:textSize">13sp</item>
+        <item name="android:textColor">#717379</item>
+
+    </style>
+    <style name="BottomNavigationView.Active" parent="@style/TextAppearance.AppCompat.Caption">
+        <item name="android:textSize">10sp</item>
+        <item name="android:textColor">#FFAF01</item>
+    </style>
+    <style name="BottomSheetStyle" parent="Widget.Design.BottomSheet.Modal">
+        <item name="android:background">@color/backgroundcolor</item>
+    </style>
+
+    <style name="MyRadioButton" parent="Theme.AppCompat.Light">
+        <item name="colorControlNormal">#000000</item>
+        <item name="colorControlActivated">#000000</item>
+    </style>
+
+    <style name="LightSpinnerTextColor">
+        <item name="android:textColor">#ffffff</item>
+        <!--        <item name="android:background">@drawable/ic_spinner</item>-->
+    </style>
+
+    <style name="NightSpinnerTextColor">
+        <item name="android:textColor">@android:color/white</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/toolbar.xml b/app/src/main/res/values/toolbar.xml
index 8c50d8bc..696fa772 100644
--- a/app/src/main/res/values/toolbar.xml
+++ b/app/src/main/res/values/toolbar.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Widget.Toolbar" parent="@style/Widget.AppCompat.Toolbar">
-        <item name="contentInsetStart">0dp</item>
-        <item name="android:background">@drawable/mygradient</item>
-    </style>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Widget.Toolbar" parent="@style/Widget.AppCompat.Toolbar">
+        <item name="contentInsetStart">0dp</item>
+        <item name="android:background">@drawable/mygradient</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/test/java/rocks/poopjournal/todont/ExampleUnitTest.kt b/app/src/main/test/java/rocks/poopjournal/todont/ExampleUnitTest.kt
index cc44038e..e1f0cbbc 100644
--- a/app/src/main/test/java/rocks/poopjournal/todont/ExampleUnitTest.kt
+++ b/app/src/main/test/java/rocks/poopjournal/todont/ExampleUnitTest.kt
@@ -1,17 +1,17 @@
-package rocks.poopjournal.todont
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
+package rocks.poopjournal.todont
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index c690207a..321a7dd6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,27 +1,27 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
-    ext.kotlin_version = "1.3.72"
-    repositories {
-        google()
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        jcenter()
-        maven{url 'https://jitpack.io'}
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    ext.kotlin_version = "1.3.72"
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath "com.android.tools.build:gradle:4.0.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+        maven{url 'https://jitpack.io'}
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
 }
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index 8e2f5b14..82736c96 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -1,12 +1,12 @@
-<b>A good look at bad habits.</b> Jot down your vices in a tap, right from the home page. Use Notes to add details — like a healthy alternative to that chocolate bar you cannot resist. And organise your input with Labels.
-
-
-<b>Faster than you can grab a pen.</b> Find your bad habits on the home page, and cross out the ones you give into. These will move to Done for the day. The next morning, start off fresh with a full list of things to avoid.
-
-
-<b>Stay on top of your progress.</b> The Log gives you insight into your overall success rates and pinpoints what bad habit you have been most attached to — over a week, a month, or a year. So you can easily work toward a better you.
-
-
-Webpage: <a href="https://www.crazymarvin.com/todont">https://www.crazymarvin.com/todont</a>
-Translate To Don’t: <a href="https://hosted.weblate.org/engage/todont/">https://hosted.weblate.org/engage/todont/</a> 
-Source on GitHub: <a href="https://github.com/Crazy-Marvin/ToDont">https://github.com/Crazy-Marvin/ToDont</a>
+<b>A good look at bad habits.</b> Jot down your vices in a tap, right from the home page. Use Notes to add details — like a healthy alternative to that chocolate bar you cannot resist. And organise your input with Labels.
+
+
+<b>Faster than you can grab a pen.</b> Find your bad habits on the home page, and cross out the ones you give into. These will move to Done for the day. The next morning, start off fresh with a full list of things to avoid.
+
+
+<b>Stay on top of your progress.</b> The Log gives you insight into your overall success rates and pinpoints what bad habit you have been most attached to — over a week, a month, or a year. So you can easily work toward a better you.
+
+
+Webpage: <a href="https://www.crazymarvin.com/todont">https://www.crazymarvin.com/todont</a>
+Translate To Don’t: <a href="https://hosted.weblate.org/engage/todont/">https://hosted.weblate.org/engage/todont/</a> 
+Source on GitHub: <a href="https://github.com/Crazy-Marvin/ToDont">https://github.com/Crazy-Marvin/ToDont</a>
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1.jpeg b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1.jpeg
old mode 100755
new mode 100644
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/1.jpg b/fastlane/metadata/android/en-US/images/tenInchScreenshots/1.jpg
old mode 100755
new mode 100644
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/2.jpg b/fastlane/metadata/android/en-US/images/tenInchScreenshots/2.jpg
old mode 100755
new mode 100644
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/3.jpg b/fastlane/metadata/android/en-US/images/tenInchScreenshots/3.jpg
old mode 100755
new mode 100644
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/4.jpg b/fastlane/metadata/android/en-US/images/tenInchScreenshots/4.jpg
old mode 100755
new mode 100644
diff --git a/fastlane/metadata/android/en-US/video.txt b/fastlane/metadata/android/en-US/video.txt
index 464da2aa..9d987793 100644
--- a/fastlane/metadata/android/en-US/video.txt
+++ b/fastlane/metadata/android/en-US/video.txt
@@ -1 +1 @@
-https://youtu.be/_UStlpEMVro
+https://youtu.be/_UStlpEMVro
diff --git a/gradle.properties b/gradle.properties
index 32e6b67f..4d15d015 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,21 +1,21 @@
-# Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app"s APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
-# Kotlin code style for this project: "official" or "obsolete":
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app"s APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true
+# Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 13372aef..edd05592 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6dfc711f..32a70720 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Apr 18 17:32:36 CEST 2021
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+#Wed Nov 11 18:58:05 PKT 2020
+<resources>=
+</resources>\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000=
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+<string=msgid\="2869576371154716097" name\="status_bar_notification_info_overflow">"\u06F9\u06F9\u06F9+"</string>
+<?xml=version\="1.0" encoding\="utf-8"?>
diff --git a/gradlew b/gradlew
old mode 100755
new mode 100644
index 9d82f789..f05b6d00
Binary files a/gradlew and b/gradlew differ
diff --git a/gradlew.bat b/gradlew.bat
index 8a0b282a..aeb898d3 100644
Binary files a/gradlew.bat and b/gradlew.bat differ
diff --git a/settings.gradle b/settings.gradle
index 3469f31a..a20ba75e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,2 @@
-include ':app'
+include ':app'
 rootProject.name = "toDonts"
\ No newline at end of file