made necessary changes

PratyushSingh07 · Aug 26, 2023 · a056f6e · a056f6e
1 parent 1942273
commit a056f6e
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 21 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
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
@@ -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
@@ -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
@@ -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({