code optimisation and bug fixes

evicky2002 · Jul 27, 2022 · 239932b · 239932b
1 parent 158ef9b
commit 239932b
Show file tree

Hide file tree

Showing 17 changed files with 128 additions and 182 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/vignesh/attendancetracker/GetPreferencesActivity.kt b/app/src/main/java/com/vignesh/attendancetracker/GetPreferencesActivity.kt
@@ -1,28 +1,18 @@
 package com.vignesh.attendancetracker
 
-import android.app.Application
 import android.content.Context
-import android.content.Intent
 import android.content.SharedPreferences
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.os.Handler
 import android.util.Log
-import android.widget.Button
-import android.widget.EditText
-import android.widget.FrameLayout
-import android.widget.Toast
-import androidx.appcompat.widget.AppCompatEditText
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import com.vignesh.attendancetracker.fragments.GetDepartmentFragment
-import com.vignesh.attendancetracker.fragments.GetSemesterFragment
 
 class GetPreferencesActivity : AppCompatActivity() {
     private var TAG = "GetPreferences"
-    private lateinit var myApplication: GlobalStorage
     private lateinit var sharedPreferences: SharedPreferences
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -32,7 +22,7 @@ class GetPreferencesActivity : AppCompatActivity() {
 
         sharedPreferences = this.getSharedPreferences("USER_PREFERENCE", Context.MODE_PRIVATE)
 
-        val getDepartmentFragment: GetDepartmentFragment = GetDepartmentFragment()
+        val getDepartmentFragment= GetDepartmentFragment()
         supportFragmentManager.beginTransaction().apply {
             replace(R.id.flFragment, getDepartmentFragment).commit()
         }

diff --git a/app/src/main/java/com/vignesh/attendancetracker/GlobalStorage.kt b/app/src/main/java/com/vignesh/attendancetracker/GlobalStorage.kt
@@ -1,22 +1,7 @@
 package com.vignesh.attendancetracker
 
 import android.app.Application
-import android.content.ContentValues.TAG
-import android.content.Context
-import android.content.SharedPreferences
-import android.util.Log
-import com.google.firebase.auth.FirebaseAuth
-import com.google.firebase.auth.FirebaseUser
-import com.google.firebase.firestore.FirebaseFirestore
-import com.google.firebase.firestore.ktx.firestore
-import com.google.firebase.ktx.Firebase
-import com.vignesh.attendancetracker.dataModels.NewSubject
-import com.vignesh.attendancetracker.dataModels.Semester
-import com.vignesh.attendancetracker.dataModels.Subject
 import com.vignesh.attendancetracker.dataModels.User
-import kotlinx.coroutines.tasks.await
-import java.lang.Exception
-import java.util.logging.Handler
 
 class GlobalStorage : Application() {
     companion object{

diff --git a/app/src/main/java/com/vignesh/attendancetracker/MainActivity.kt b/app/src/main/java/com/vignesh/attendancetracker/MainActivity.kt
@@ -1,7 +1,8 @@
 package com.vignesh.attendancetracker
 
+import android.content.Context
+import android.content.SharedPreferences
 import android.os.Bundle
-import android.os.Handler
 import android.util.Log
 import android.view.View
 import android.widget.ProgressBar
@@ -13,10 +14,6 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.android.material.card.MaterialCardView
-import com.google.firebase.auth.FirebaseAuth
-import com.google.firebase.firestore.FirebaseFirestore
-import com.google.firebase.firestore.ktx.firestore
-import com.google.firebase.ktx.Firebase
 import com.vignesh.attendancetracker.dataModels.Semester
 import com.vignesh.attendancetracker.dataModels.User
 import com.vignesh.attendancetracker.fragments.DashboardFragment
@@ -26,18 +23,14 @@ import com.vignesh.attendancetracker.networkActivity.NetworkService
 
 class MainActivity : AppCompatActivity() {
     private var TAG = "NetworkService"
+    private lateinit var  sharedPreferences: SharedPreferences
 
-    private var networkService = NetworkService(this)
-
-    private lateinit var myApplication: GlobalStorage
-    private var mFirebaseAuth: FirebaseAuth = FirebaseAuth.getInstance()
-    private var db: FirebaseFirestore = Firebase.firestore
-
+    private lateinit var networkService: NetworkService
 
     private var semesterObject: Semester? = null
-    private var userObject: com.vignesh.attendancetracker.dataModels.User? = null
+    private var userObject: User? = null
 
-    var progressBar: ProgressBar? = null
+    private var progressBar: ProgressBar? = null
     private var tvWait:TextView? = null
     private var bottom:MaterialCardView? = null
     private lateinit var homeFragment: HomeFragment
@@ -47,12 +40,14 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+        sharedPreferences = getSharedPreferences("USER_PREFERENCE", Context.MODE_PRIVATE)
+        networkService = NetworkService(this, sharedPreferences.getString("DEPARTMENT","dept") as String, sharedPreferences.getString("SEMESTER","sem") as String)
         WindowCompat.setDecorFitsSystemWindows(window, false)
         hideSystemBars()
         tvWait = findViewById(R.id.tvWait)
         progressBar = findViewById(R.id.progressBar)
         bottom = findViewById(R.id.bottom)
-        progressBar?.setVisibility(View.VISIBLE);
+        progressBar?.setVisibility(View.VISIBLE)
         tvWait?.visibility = View.VISIBLE
         bottom?.visibility = View.INVISIBLE
         bottomNavigationView = findViewById(R.id.bottomNavigationView)
@@ -107,7 +102,7 @@ class MainActivity : AppCompatActivity() {
             bottom?.visibility = View.VISIBLE
             bottom?.visibility = View.VISIBLE
             tvWait?.visibility = View.INVISIBLE
-            progressBar?.setVisibility(View.GONE);
+            progressBar?.setVisibility(View.GONE)
         }
         bottomNavigationView.setOnItemSelectedListener {
             when(it.itemId){

diff --git a/app/src/main/java/com/vignesh/attendancetracker/adapters/SubjectDataCardAdapter.kt b/app/src/main/java/com/vignesh/attendancetracker/adapters/SubjectDataCardAdapter.kt
@@ -29,20 +29,20 @@ class SubjectDataCardAdapter(private val mList: ArrayList<NewSubject>, private v
 
     @SuppressLint("ResourceAsColor")
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val myDialog: Dialog = Dialog(context)
+        val myDialog = Dialog(context)
         myDialog.setContentView(R.layout.history_dialog)
         myDialog.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
         holder.tvSubjectDataCardName?.text = userObject?.subjectsList?.get(position)?.subjectName
         holder.tvSubjectDataCount?.text = userObject?.subjectsList?.get(position)?.totalAbsentCount
-        var totalHours = mList.get(position).subjectTotalHours.toInt()
-        var totalAbsentCount = mList.get(position).totalAbsentCount.toInt()
-        var remainingHours = (totalHours - totalAbsentCount)
-        var percentage : Double = ( remainingHours.toDouble()/ totalHours.toDouble())* 100
+        val totalHours = mList.get(position).subjectTotalHours.toInt()
+        val totalAbsentCount = mList.get(position).totalAbsentCount.toInt()
+        val remainingHours = (totalHours - totalAbsentCount)
+        val percentage : Double = ( remainingHours.toDouble()/ totalHours.toDouble())* 100
         Log.d(TAG,totalHours.toString())
         Log.d(TAG,totalAbsentCount.toString())
         Log.d(TAG,remainingHours.toString())
         Log.d(TAG,percentage.toString())
-        var roundedPercentage = percentage.toInt()
+        val roundedPercentage = percentage.toInt()
         holder.dataCard?.setBackgroundColor(ContextCompat.getColor(context, R.color.project_yellow))
 
         if(roundedPercentage < 75.0){
@@ -59,7 +59,6 @@ class SubjectDataCardAdapter(private val mList: ArrayList<NewSubject>, private v
                 var string = ""
                 val tvDates = myDialog.findViewById<TextView>(R.id.tvDates)
                 for(i in array){
-                    val map = i
                     string+="\n\n"
                     string+=i.getValue(1.toString())
                 }

diff --git a/app/src/main/java/com/vignesh/attendancetracker/adapters/SubjectUpdateCardAdapter.kt b/app/src/main/java/com/vignesh/attendancetracker/adapters/SubjectUpdateCardAdapter.kt
@@ -59,24 +59,19 @@ class SubjectUpdateCardAdapter(private val mList: ArrayList<NewSubject>, private
             count = count?.plus(temp)
             if(temp>0){
                 for(i in 1..temp){
-                    val map = mapOf<String,String>("1" to getCurrentDate())
+                    val map = mapOf("1" to getCurrentDate())
                     GlobalStorage.userObject?.subjectsList?.get(position)?.dateTracker?.add(map)
                 }
             }else if(temp<0){
                 val pos = temp + (temp*-2)
                 Log.d(TAG,"here")
-                Log.d(TAG,"pos : ${pos.toString()}")
+                Log.d(TAG,"pos : $pos")
                 Log.d(TAG,"size : ${userObject?.subjectsList?.get(position)?.dateTracker?.size as Int}")
                 for (i in pos downTo 1){
                     GlobalStorage.userObject?.subjectsList?.get(position)?.dateTracker
                         ?.removeAt((userObject!!.subjectsList.get(position).dateTracker?.size as Int) - 1)
                 }
             }
-
-//            if(temp>0){
-//                val map = mapOf<String,String>(temp.toString() to getCurrentDate())
-//                userObject.subjectsList.get(position).dateTracker?.add(map)
-//            }
             GlobalStorage.userObject?.subjectsList?.get(position)?.totalAbsentCount = count.toString()
             holder.tvSubjectCardCount?.text = "0"
             db.collection("users").document(user?.uid.toString())
@@ -87,7 +82,7 @@ class SubjectUpdateCardAdapter(private val mList: ArrayList<NewSubject>, private
         }
 
     }
-    fun getCurrentDate():String{
+    private fun getCurrentDate():String{
         val sdf = SimpleDateFormat("'Date: 'dd-MM-yyyy 'Time: 'HH:mm")
         return sdf.format(Date())
     }

diff --git a/app/src/main/java/com/vignesh/attendancetracker/dataModels/NewSubject.kt b/app/src/main/java/com/vignesh/attendancetracker/dataModels/NewSubject.kt
@@ -1,12 +1,9 @@
 package com.vignesh.attendancetracker.dataModels
-
-import java.io.Serializable
-
 data class NewSubject(
     var subjectCode : String,
     var subjectCredits : String,
     var subjectName : String,
     var subjectTotalHours : String,
     var totalAbsentCount: String,
     var dateTracker: ArrayList<Map<String,String>>?
-): Serializable
+)
diff --git a/app/src/main/java/com/vignesh/attendancetracker/dataModels/Semester.kt b/app/src/main/java/com/vignesh/attendancetracker/dataModels/Semester.kt
@@ -1,6 +1,3 @@
 package com.vignesh.attendancetracker.dataModels
 
-data class Semester (
-     var subjectsList: ArrayList<Subject>
-
-     )
+data class Semester (var subjectsList: ArrayList<Subject>)
diff --git a/app/src/main/java/com/vignesh/attendancetracker/dataModels/Subject.kt b/app/src/main/java/com/vignesh/attendancetracker/dataModels/Subject.kt
@@ -1,10 +1,7 @@
 package com.vignesh.attendancetracker.dataModels
-
-import java.io.Serializable
-
 data class Subject(
     var subjectCode : String,
     var subjectCredits : String,
     var subjectName : String,
     var subjectTotalHours : String
-): Serializable
+)
diff --git a/app/src/main/java/com/vignesh/attendancetracker/dataModels/User.kt b/app/src/main/java/com/vignesh/attendancetracker/dataModels/User.kt
@@ -1,5 +1,2 @@
 package com.vignesh.attendancetracker.dataModels
-
-data class User(
-    var subjectsList: ArrayList<NewSubject>
-)
+data class User(var subjectsList: ArrayList<NewSubject>)
diff --git a/app/src/main/java/com/vignesh/attendancetracker/fragments/DashboardFragment.kt b/app/src/main/java/com/vignesh/attendancetracker/fragments/DashboardFragment.kt
@@ -4,15 +4,11 @@ import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import androidx.fragment.app.Fragment
-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.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.button.MaterialButton
 import com.google.firebase.auth.FirebaseAuth
 import com.vignesh.attendancetracker.GlobalStorage
 import com.vignesh.attendancetracker.LoginActivity
@@ -48,9 +44,9 @@ class DashboardFragment : Fragment(R.layout.fragment_dashboard) {
         var n = 0
         for(i in userObject!!.subjectsList){
             n++
-            var total = i.subjectTotalHours.toInt()
-            var absent = i.totalAbsentCount.toInt()
-            var rem = total-absent
+            val total = i.subjectTotalHours.toInt()
+            val absent = i.totalAbsentCount.toInt()
+            val rem = total-absent
             val perc : Double= (rem.toDouble()/total.toDouble())*100
             percentageTotal+=perc
         }

diff --git a/app/src/main/java/com/vignesh/attendancetracker/fragments/GetDepartmentFragment.kt b/app/src/main/java/com/vignesh/attendancetracker/fragments/GetDepartmentFragment.kt
@@ -3,14 +3,12 @@ package com.vignesh.attendancetracker.fragments
 import android.content.Context
 import android.content.SharedPreferences
 import android.content.res.ColorStateList
-import android.graphics.Color
 import android.os.Bundle
 import android.util.Log
 import android.view.HapticFeedbackConstants
 import androidx.fragment.app.Fragment
 import android.view.View
 import android.widget.Toast
-import androidx.core.view.WindowCompat
 import com.google.android.material.button.MaterialButton
 import com.vignesh.attendancetracker.R
 

diff --git a/app/src/main/java/com/vignesh/attendancetracker/fragments/GetSemesterFragment.kt b/app/src/main/java/com/vignesh/attendancetracker/fragments/GetSemesterFragment.kt
@@ -5,22 +5,17 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.content.res.ColorStateList
 import android.os.Bundle
+import android.util.Log
 import android.view.HapticFeedbackConstants
 import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.Toast
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.WindowInsetsControllerCompat
 import com.google.android.material.button.MaterialButton
 import com.vignesh.attendancetracker.GlobalStorage
 import com.vignesh.attendancetracker.MainActivity
 import com.vignesh.attendancetracker.R
 
 class GetSemesterFragment : Fragment(R.layout.fragment_get_semester), View.OnClickListener {
-    private var myApplication: GlobalStorage? = null
     private var TAG = "GetSemesterFragment"
     private var btnSemOne: MaterialButton? = null
     private var btnSemTwo: MaterialButton? = null

diff --git a/app/src/main/java/com/vignesh/attendancetracker/fragments/HomeFragment.kt b/app/src/main/java/com/vignesh/attendancetracker/fragments/HomeFragment.kt
@@ -1,14 +1,8 @@
 package com.vignesh.attendancetracker.fragments
 
-import android.content.Context
-import android.content.SharedPreferences
 import android.os.Bundle
-import android.os.Handler
-import android.util.Log
 import androidx.fragment.app.Fragment
 import android.view.View
-import android.widget.Button
-import android.widget.TextView
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.firebase.auth.FirebaseAuth
@@ -19,13 +13,9 @@ import com.google.firebase.ktx.Firebase
 import com.vignesh.attendancetracker.GlobalStorage
 import com.vignesh.attendancetracker.R
 import com.vignesh.attendancetracker.adapters.SubjectUpdateCardAdapter
-import com.vignesh.attendancetracker.dataModels.Semester
-import com.vignesh.attendancetracker.dataModels.Subject
 import com.vignesh.attendancetracker.dataModels.User
 
 class HomeFragment : Fragment(R.layout.fragment_home) {
-    private lateinit var myApplication: GlobalStorage
-    private lateinit var sharedPreferences: SharedPreferences
     private val TAG = "HomeFragment"
     private var userObject: User? = null
     private var rvSubjectList: RecyclerView? = null