From a056f6ed2860448c83e1add25283667736f13e23 Mon Sep 17 00:00:00 2001
From: Debobroto Das <debojitdas0707@gmail.com>
Date: Sun, 27 Aug 2023 03:26:02 +0530
Subject: [PATCH] made necessary changes

---
 .idea/compiler.xml                                 |  2 +-
 .idea/gradle.xml                                   |  2 +-
 .idea/misc.xml                                     |  2 +-
 .../cyclofit/ui/activities/DashboardActivity.kt    |  8 +++++---
 .../cyclofit/ui/activities/SettingsActivity.kt     |  8 +++-----
 .../example/cyclofit/ui/activities/SplashScreen.kt | 14 ++++----------
 6 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..b589d56 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="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7b46144..a0de2a1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 54d5acd..0ad17cb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/com/example/cyclofit/ui/activities/DashboardActivity.kt b/app/src/main/java/com/example/cyclofit/ui/activities/DashboardActivity.kt
index e76010f..157e56a 100644
--- a/app/src/main/java/com/example/cyclofit/ui/activities/DashboardActivity.kt
+++ b/app/src/main/java/com/example/cyclofit/ui/activities/DashboardActivity.kt
@@ -56,10 +56,12 @@ class DashboardActivity:AppCompatActivity() {
     }
 
     override fun onBackPressed() {
-        if(mCount==0)
+        if(mCount==0) {
             goHomeFragment()
-        else
-        super.onBackPressed()
+        }
+        else {
+            super.onBackPressed()
+        }
         mCount++
     }
     private fun setCurrentFragment(fragment: Fragment) =
diff --git a/app/src/main/java/com/example/cyclofit/ui/activities/SettingsActivity.kt b/app/src/main/java/com/example/cyclofit/ui/activities/SettingsActivity.kt
index 5498b37..3b1a0a0 100644
--- a/app/src/main/java/com/example/cyclofit/ui/activities/SettingsActivity.kt
+++ b/app/src/main/java/com/example/cyclofit/ui/activities/SettingsActivity.kt
@@ -3,8 +3,6 @@ package com.example.cyclofit.ui.activities
 import android.content.Intent
 import android.content.SharedPreferences
 import android.content.SharedPreferences.Editor
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.view.WindowManager
 import android.widget.Button
@@ -20,7 +18,7 @@ import kotlinx.android.synthetic.main.activity_settings.*
 
 class SettingsActivity :AppCompatActivity(){
 
-    private lateinit var selectThemeBtn:Button
+    private lateinit var selectThemeButton:Button
     private var nightMode:Boolean = false
     private lateinit var sharedPreferences:SharedPreferences
     private lateinit var editor:Editor
@@ -37,7 +35,7 @@ class SettingsActivity :AppCompatActivity(){
         dialogFragment = DialogFragment()
 
 
-        selectThemeBtn = findViewById(R.id.changeThemeButton)
+        selectThemeButton = findViewById(R.id.changeThemeButton)
         changeAppTheme()
 
         val btn = findViewById<Button>(R.id.logoutButton)
@@ -66,7 +64,7 @@ class SettingsActivity :AppCompatActivity(){
 
 
     private fun changeAppTheme(){
-        selectThemeBtn.setOnClickListener {
+        selectThemeButton.setOnClickListener {
             dialogFragment.show(supportFragmentManager,"customDialog")
 //            editor = sharedPreferences.edit()
 //            editor.putBoolean("isNewUser",false)
diff --git a/app/src/main/java/com/example/cyclofit/ui/activities/SplashScreen.kt b/app/src/main/java/com/example/cyclofit/ui/activities/SplashScreen.kt
index f50ff15..798f3bb 100644
--- a/app/src/main/java/com/example/cyclofit/ui/activities/SplashScreen.kt
+++ b/app/src/main/java/com/example/cyclofit/ui/activities/SplashScreen.kt
@@ -1,21 +1,15 @@
 package com.example.cyclofit.ui.activities
 
 import android.annotation.SuppressLint
-import android.app.Dialog
-import android.content.Context
-import android.content.DialogInterface
 import android.content.Intent
 import android.content.SharedPreferences
-import android.content.res.Configuration
 import android.graphics.drawable.AnimationDrawable
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
-import android.util.Log
 import android.view.WindowManager
 import android.widget.LinearLayout
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatDelegate
 import com.example.cyclofit.R
 import com.google.firebase.auth.FirebaseAuth
@@ -36,10 +30,10 @@ class SplashScreen : AppCompatActivity() {
         //checkDarkMode
         checkDarkMode()
         val linear = findViewById<LinearLayout>(R.id.background_splash_screen)
-        val animationDrawable = linear.background as AnimationDrawable
-        animationDrawable.setEnterFadeDuration(2000)
-        animationDrawable.setExitFadeDuration(2000)
-        animationDrawable.start()
+        val animDrawable = linear.background as AnimationDrawable
+        animDrawable.setEnterFadeDuration(2000)
+        animDrawable.setExitFadeDuration(2000)
+        animDrawable.start()
 
         if(FirebaseAuth.getInstance().currentUser == null){
             Handler(Looper.getMainLooper()).postDelayed({