diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index a88fc36d..7643783a 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,6 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <option name="ENABLE_SECOND_REFORMAT" value="true" />
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
diff --git a/.idea/kotlinScripting.xml b/.idea/kotlinScripting.xml
deleted file mode 100644
index 26da98e5..00000000
--- a/.idea/kotlinScripting.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="KotlinScriptingSettings">
-    <scriptDefinition className="org.jetbrains.kotlin.scripting.resolve.KotlinScriptDefinitionFromAnnotatedTemplate" definitionName="KotlinBuildScript">
-      <order>2147483647</order>
-    </scriptDefinition>
-  </component>
-</project>
\ No newline at end of file
diff --git a/bitapp/attendance/src/main/java/com/atech/attendance/AttendanceFragment.kt b/bitapp/attendance/src/main/java/com/atech/attendance/AttendanceFragment.kt
index 93e8fd75..ddfd18c2 100644
--- a/bitapp/attendance/src/main/java/com/atech/attendance/AttendanceFragment.kt
+++ b/bitapp/attendance/src/main/java/com/atech/attendance/AttendanceFragment.kt
@@ -108,8 +108,8 @@ class AttendanceFragment : Fragment(R.layout.fragment_attendance) {
     }
 
     @Suppress("UNCHECKED_CAST")
-    private fun observeData() {
-        viewModel.unArchive.observe(viewLifecycleOwner) { attendanceList ->
+    private fun observeData() = launchWhenStarted {
+        viewModel.getAttendance().await().observe(viewLifecycleOwner) { attendanceList ->
             findPercentage(
                 attendanceList.sumOf { it.present }.toFloat(),
                 attendanceList.sumOf { it.total }.toFloat()
@@ -174,12 +174,22 @@ class AttendanceFragment : Fragment(R.layout.fragment_attendance) {
                 R.id.menu_archive -> navigateToArchiveFragment()
                 R.id.menu_setting -> navigateToChangePercentageDialog()
                 R.id.menu_delete_all -> deleteAll()
+                R.id.menu_sort -> navigateToSortMenu()
                 else -> false
             }
 
         }
     }
 
+    private fun navigateToSortMenu(): Boolean {
+        viewModel.sortPref.observe(viewLifecycleOwner) { }
+        val sort = viewModel.sortPref.value ?: return false
+        val action = AttendanceFragmentDirections
+            .actionAttendanceFragmentToSortMenuDialog(sort)
+        navigate(action)
+        return true
+    }
+
     private fun navigateToAddSubjectFromSyllabus(): Boolean {
         val action =
             AttendanceFragmentDirections.actionAttendanceFragmentToAddFromSyllabusBottomSheet()
diff --git a/bitapp/attendance/src/main/java/com/atech/attendance/AttendanceViewModel.kt b/bitapp/attendance/src/main/java/com/atech/attendance/AttendanceViewModel.kt
index 49a3eeca..514a04be 100644
--- a/bitapp/attendance/src/main/java/com/atech/attendance/AttendanceViewModel.kt
+++ b/bitapp/attendance/src/main/java/com/atech/attendance/AttendanceViewModel.kt
@@ -3,6 +3,7 @@ package com.atech.attendance
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.asLiveData
+import androidx.lifecycle.switchMap
 import androidx.lifecycle.viewModelScope
 import com.atech.core.datastore.DataStoreCases
 import com.atech.core.room.attendance.AttendanceDao
@@ -11,6 +12,8 @@ import com.atech.core.room.syllabus.SyllabusDao
 import com.atech.core.room.syllabus.SyllabusModel
 import com.atech.core.utils.REQUEST_ADD_SUBJECT_FROM_SYLLABUS
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
@@ -20,22 +23,27 @@ import javax.inject.Inject
 class AttendanceViewModel @Inject constructor(
     private val attendanceDao: AttendanceDao,
     private val syllabusDao: SyllabusDao,
-    cases: DataStoreCases
+    private val cases: DataStoreCases,
 ) : ViewModel() {
 
 
     val getAllPref = cases.getAll.invoke()
-    private val _attendance = attendanceDao.getNonArchiveAttendance()
-    val unArchive: LiveData<List<AttendanceModel>>
-        get() = _attendance.asLiveData()
+
+    val sortPref = cases.attendancePref.invoke()
 
     val archive: LiveData<List<AttendanceModel>> =
         attendanceDao.getAllArchiveAttendance().asLiveData()
-    val allAttendance = attendanceDao.getAllAttendance().asLiveData()
+
+    fun getAttendance() = viewModelScope.async(Dispatchers.IO) {
+        val list = cases.attendancePref.invoke().switchMap {
+            attendanceDao.getAttendanceSorted(it).asLiveData()
+        }
+        list
+    }
 
 
-    val _attendanceEvent = Channel<AttendanceEvent>()
-    val attendanceEvent = _attendanceEvent.receiveAsFlow()
+    val attendanceEventChannel = Channel<AttendanceEvent>()
+    val attendanceEvent = attendanceEventChannel.receiveAsFlow()
 
     //    IO function
     fun update(attendanceModel: AttendanceModel) = viewModelScope.launch {
@@ -46,7 +54,7 @@ class AttendanceViewModel @Inject constructor(
         viewModelScope.launch {
             syllabusDao.updateSyllabusAddedInAttendance(attendanceModel.subject, 0)
             attendanceDao.delete(attendanceModel)
-            _attendanceEvent.send(AttendanceEvent.ShowUndoDeleteMessage(attendanceModel))
+            attendanceEventChannel.send(AttendanceEvent.ShowUndoDeleteMessage(attendanceModel))
         }
 
     fun add(attendanceModel: AttendanceModel, request: Int) = viewModelScope.launch {
diff --git a/bitapp/attendance/src/main/java/com/atech/attendance/menu/AttendanceMenuBottomSheet.kt b/bitapp/attendance/src/main/java/com/atech/attendance/menu/AttendanceMenuBottomSheet.kt
index 89be900e..68656fc1 100644
--- a/bitapp/attendance/src/main/java/com/atech/attendance/menu/AttendanceMenuBottomSheet.kt
+++ b/bitapp/attendance/src/main/java/com/atech/attendance/menu/AttendanceMenuBottomSheet.kt
@@ -71,7 +71,7 @@ class AttendanceMenuBottomSheet : BaseBottomSheet() {
                 bsDelete.setOnClickListener {
                     communicator.delete(attendance)
                     launchWhenStarted {
-                        communicator._attendanceEvent.send(
+                        communicator.attendanceEventChannel.send(
                             AttendanceViewModel.AttendanceEvent.ShowUndoDeleteMessage(
                                 attendance
                             )
diff --git a/bitapp/attendance/src/main/java/com/atech/attendance/sort/SortMenuDialog.kt b/bitapp/attendance/src/main/java/com/atech/attendance/sort/SortMenuDialog.kt
new file mode 100644
index 00000000..bb9aae92
--- /dev/null
+++ b/bitapp/attendance/src/main/java/com/atech/attendance/sort/SortMenuDialog.kt
@@ -0,0 +1,77 @@
+package com.atech.attendance.sort
+
+import android.app.Dialog
+import android.os.Bundle
+import android.util.Log
+import androidx.fragment.app.DialogFragment
+import androidx.navigation.fragment.navArgs
+import com.atech.attendance.databinding.MenuSortBinding
+import com.atech.core.datastore.DataStoreCases
+import com.atech.core.room.attendance.Sort
+import com.atech.core.room.attendance.SortBy
+import com.atech.core.room.attendance.SortOrder
+import com.atech.core.utils.capitalizeWords
+import com.atech.theme.R
+import com.atech.theme.launchWhenStarted
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.textfield.MaterialAutoCompleteTextView
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class SortMenuDialog : DialogFragment() {
+
+    private lateinit var binding: MenuSortBinding
+
+    @Inject
+    lateinit var dataStoreCases: DataStoreCases
+
+    private val args: SortMenuDialogArgs by navArgs()
+
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        binding = MenuSortBinding.inflate(layoutInflater)
+        binding.apply {
+            setView()
+            setDropDown()
+        }
+        return MaterialAlertDialogBuilder(requireContext())
+            .setView(binding.root)
+            .setTitle(getString(R.string.sort))
+            .setPositiveButton("Done") { _, _ ->
+                saveData()
+            }.setNegativeButton("Cancel", null)
+            .create()
+    }
+
+    private fun saveData() = launchWhenStarted {
+        val sortBy = SortBy.valueOf(
+            (binding.textInputLayoutSortBy.editText as? MaterialAutoCompleteTextView)?.text.toString()
+                .uppercase()
+        )
+        val sortOrder = SortOrder.valueOf(
+            (binding.textInputLayoutSortOrder.editText as? MaterialAutoCompleteTextView)?.text.toString()
+                .uppercase()
+        )
+        val sort = Sort(sortBy, sortOrder)
+        Log.d("AAA", "saveData: $sort")
+        dataStoreCases.updateAttendanceSort(sort)
+    }
+
+    private fun MenuSortBinding.setDropDown() = this.root.apply {
+        val sortBy = SortBy.values().map { it.name.capitalizeWords() }.toTypedArray()
+        val sortOrder = SortOrder.values().map { it.name.capitalizeWords() }.toTypedArray()
+
+        (textInputLayoutSortBy.editText as? MaterialAutoCompleteTextView)?.setSimpleItems(sortBy)
+        (textInputLayoutSortOrder.editText as? MaterialAutoCompleteTextView)?.setSimpleItems(
+            sortOrder
+        )
+    }
+
+    private fun MenuSortBinding.setView() {
+        val it = args.sort
+        textInputLayoutSortBy.editText?.setText(it.sortBy.name.capitalizeWords())
+        textInputLayoutSortOrder.editText?.setText(it.sortOrder.name.capitalizeWords())
+    }
+
+}
\ No newline at end of file
diff --git a/bitapp/attendance/src/main/res/layout/menu_sort.xml b/bitapp/attendance/src/main/res/layout/menu_sort.xml
new file mode 100644
index 00000000..3955055c
--- /dev/null
+++ b/bitapp/attendance/src/main/res/layout/menu_sort.xml
@@ -0,0 +1,36 @@
+<?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="wrap_content"
+    android:orientation="vertical"
+    android:padding="@dimen/grid_1"
+    tools:theme="@style/Base.Theme.BITApp">
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/text_input_layout_sort_by"
+        style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <AutoCompleteTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/sort_by"
+            android:inputType="none" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/text_input_layout_sort_order"
+        style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="@dimen/grid_1">
+
+        <AutoCompleteTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/sort_order"
+            android:inputType="none" />
+    </com.google.android.material.textfield.TextInputLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/bitapp/attendance/src/main/res/menu/attendance_app_bar.xml b/bitapp/attendance/src/main/res/menu/attendance_app_bar.xml
index 9d586f01..01f0fb1a 100644
--- a/bitapp/attendance/src/main/res/menu/attendance_app_bar.xml
+++ b/bitapp/attendance/src/main/res/menu/attendance_app_bar.xml
@@ -14,6 +14,11 @@
         android:icon="@drawable/ic_archive"
         android:title="@string/archive"
         app:showAsAction="always" />
+    <item
+        android:id="@+id/menu_sort"
+        android:icon="@drawable/round_sort_24"
+        android:title="@string/sort"
+        app:showAsAction="always" />
     <item
         android:id="@+id/menu_setting"
         android:title="@string/setting"
diff --git a/bitapp/attendance/src/main/res/navigation/attendance_graph.xml b/bitapp/attendance/src/main/res/navigation/attendance_graph.xml
index 215dc028..00c6ee06 100644
--- a/bitapp/attendance/src/main/res/navigation/attendance_graph.xml
+++ b/bitapp/attendance/src/main/res/navigation/attendance_graph.xml
@@ -28,6 +28,9 @@
         <action
             android:id="@+id/action_attendanceFragment_to_addFromSyllabusBottomSheet"
             app:destination="@id/addFromSyllabusBottomSheet" />
+        <action
+            android:id="@+id/action_attendanceFragment_to_sortMenuDialog"
+            app:destination="@id/sortMenuDialog" />
     </fragment>
     <dialog
         android:id="@+id/addEditAttendanceBottomSheet"
@@ -116,4 +119,13 @@
             android:id="@+id/action_addFromSyllabusBottomSheet_to_addEditAttendanceBottomSheet"
             app:destination="@id/addEditAttendanceBottomSheet" />
     </dialog>
+    <dialog
+        android:id="@+id/sortMenuDialog"
+        android:name="com.atech.attendance.sort.SortMenuDialog"
+        tools:layout="@layout/menu_sort"
+        android:label="SortMenuDialog" >
+        <argument
+            android:name="sort"
+            app:argType="com.atech.core.room.attendance.Sort" />
+    </dialog>
 </navigation>
\ No newline at end of file
diff --git a/bitapp/build.gradle.kts b/bitapp/build.gradle.kts
index 8cc3b7b9..e9ee983c 100644
--- a/bitapp/build.gradle.kts
+++ b/bitapp/build.gradle.kts
@@ -18,8 +18,8 @@ android {
         applicationId = "com.atech.bit"
         minSdk = 24
         targetSdk = 33
-        versionCode = 63
-        versionName = "5.0.1"
+        versionCode = 64
+        versionName = "5.0.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/bitapp/src/main/java/com/atech/bit/ui/activities/main_activity/MainActivity.kt b/bitapp/src/main/java/com/atech/bit/ui/activities/main_activity/MainActivity.kt
index 5e29bace..177266db 100644
--- a/bitapp/src/main/java/com/atech/bit/ui/activities/main_activity/MainActivity.kt
+++ b/bitapp/src/main/java/com/atech/bit/ui/activities/main_activity/MainActivity.kt
@@ -45,7 +45,6 @@ import com.atech.theme.changeBottomNav
 import com.atech.theme.changeStatusBarToolbarColorImageView
 import com.atech.theme.currentNavigationFragment
 import com.atech.theme.exitTransition
-import com.atech.theme.initAds
 import com.atech.theme.isDark
 import com.atech.theme.openCustomChromeTab
 import com.atech.theme.openLinks
@@ -115,7 +114,7 @@ class MainActivity : AppCompatActivity(), ParentActivity, DrawerLocker,
         shareReview()
         checkForUpdate()
         if (isConnected()) {
-            initAds(this)
+//            initAds(this)
             fetchRemoteConfigData()
             if (auth.hasLogIn.invoke()) registerLifeCycleOwner(this@MainActivity)
         } else Log.d(TAGS.BIT_DEBUG.name, "onCreate: No Internet")
diff --git a/bitapp/src/main/java/com/atech/bit/ui/fragments/home/adapter/HomeViewHolder.kt b/bitapp/src/main/java/com/atech/bit/ui/fragments/home/adapter/HomeViewHolder.kt
index e20dea23..257598cc 100644
--- a/bitapp/src/main/java/com/atech/bit/ui/fragments/home/adapter/HomeViewHolder.kt
+++ b/bitapp/src/main/java/com/atech/bit/ui/fragments/home/adapter/HomeViewHolder.kt
@@ -19,6 +19,7 @@ import com.atech.bit.utils.getImageLinkNotification
 import com.atech.bit.utils.set
 import com.atech.bit.utils.setView
 import com.atech.core.room.library.LibraryModel
+import com.atech.core.utils.capitalizeWords
 import com.atech.theme.CardHighlightModel
 import com.atech.theme.R
 import com.atech.theme.databinding.CardViewHighlightBinding
@@ -124,7 +125,7 @@ sealed class HomeViewHolder(
         fun bind(model: HomeItems.Subject) {
             binding.apply {
                 binding.root.transitionName = model.data.subject
-                subjectTextView.text = model.data.subject
+                subjectTextView.text = model.data.subject.capitalizeWords()
                 creditTextView.text = String.format("Credits: %d", model.data.credits)
                 creditTextView.visibility =
                     if (model.data.credits == -1) View.GONE else View.VISIBLE
diff --git a/core/src/main/java/com/atech/core/datastore/DataStoreCases.kt b/core/src/main/java/com/atech/core/datastore/DataStoreCases.kt
index c1145c49..f09b25b3 100644
--- a/core/src/main/java/com/atech/core/datastore/DataStoreCases.kt
+++ b/core/src/main/java/com/atech/core/datastore/DataStoreCases.kt
@@ -1,15 +1,18 @@
 package com.atech.core.datastore
 
 import androidx.lifecycle.asLiveData
+import com.atech.core.room.attendance.Sort
 import com.atech.core.room.syllabus.SyllabusDao
 import javax.inject.Inject
 
 data class DataStoreCases @Inject constructor(
     val getAll: GetAllPref,
+    val attendancePref: AttendancePref,
     val updatePercentage: UpdatePercentage,
     val updateCourse: UpdateCourse,
     val updateSem: UpdateSem,
     val updateCgpa: UpdateCgpa,
+    val updateAttendanceSort: UpdateAttendanceSort,
     val reset: Reset,
     val clearAll: ClearAll
 )
@@ -20,6 +23,12 @@ class GetAllPref @Inject constructor(
     operator fun invoke() = preferencesManager.preferencesFlow.asLiveData()
 }
 
+class AttendancePref @Inject constructor(
+    private val preferencesManager: PreferencesManager
+) {
+    operator fun invoke() = preferencesManager.attendanceSortFLow.asLiveData()
+}
+
 class UpdatePercentage @Inject constructor(
     private val preferencesManager: PreferencesManager
 ) {
@@ -28,8 +37,7 @@ class UpdatePercentage @Inject constructor(
 }
 
 class UpdateCourse @Inject constructor(
-    private val preferencesManager: PreferencesManager,
-    private val syllabusDao: SyllabusDao
+    private val preferencesManager: PreferencesManager, private val syllabusDao: SyllabusDao
 ) {
     suspend operator fun invoke(value: String) {
         preferencesManager.updateCourse(value)
@@ -51,6 +59,12 @@ class UpdateCgpa @Inject constructor(
     suspend operator fun invoke(cgpa: Cgpa) = preferencesManager.updateCgpa(cgpa)
 }
 
+class UpdateAttendanceSort @Inject constructor(
+    private val preferencesManager: PreferencesManager
+) {
+    suspend operator fun invoke(sort: Sort) = preferencesManager.updateSort(sort)
+}
+
 class Reset @Inject constructor(
     private val syllabusDao: SyllabusDao
 ) {
diff --git a/core/src/main/java/com/atech/core/datastore/dataStore.kt b/core/src/main/java/com/atech/core/datastore/dataStore.kt
index 25918f7b..192b81cf 100644
--- a/core/src/main/java/com/atech/core/datastore/dataStore.kt
+++ b/core/src/main/java/com/atech/core/datastore/dataStore.kt
@@ -10,6 +10,9 @@ import androidx.datastore.preferences.core.emptyPreferences
 import androidx.datastore.preferences.core.intPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
+import com.atech.core.room.attendance.Sort
+import com.atech.core.room.attendance.SortBy
+import com.atech.core.room.attendance.SortOrder
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.map
@@ -61,7 +64,8 @@ data class FilterPreferences(
     val defPercentage: Int,
     val course: String,
     val sem: String,
-    val cgpa: Cgpa
+    val cgpa: Cgpa,
+    val sort: Sort
 ) : Parcelable {
     @IgnoredOnParcel
     val courseWithSem = "$course$sem"
@@ -72,6 +76,25 @@ data class FilterPreferences(
 class PreferencesManager @Inject constructor(@ApplicationContext val context: Context) {
     private val Context.dataStore by preferencesDataStore(name = "user_preferences")
 
+    val attendanceSortFLow = context.dataStore.data
+        .catch { exception ->
+            when (exception) {
+                is IOException -> {
+                    emit(emptyPreferences())
+                    Log.e(TAG, "$exception")
+                }
+
+                else -> throw exception
+            }
+        }
+        .map { preferences ->
+            val sortBy = preferences[PreferencesKeys.DEF_SORT_BY] ?: SortBy.SUBJECT.name
+            val sortOrder = preferences[PreferencesKeys.DEF_SORT_ORDER] ?: SortOrder.ASC.name
+            Sort(
+                SortBy.valueOf(sortBy),
+                SortOrder.valueOf(sortOrder)
+            )
+        }
 
     val preferencesFlow = context.dataStore.data
         .catch { exception ->
@@ -101,6 +124,8 @@ class PreferencesManager @Inject constructor(@ApplicationContext val context: Co
             val earnCrSem5 = preferences[PreferencesKeys.DEF_EARN_CR_SEM_5] ?: 0.0
             val earnCrSem6 = preferences[PreferencesKeys.DEF_EARN_CR_SEM_6] ?: 0.0
             val cgpa = preferences[PreferencesKeys.DEF_CGPA] ?: 0.0
+            val sortBy = preferences[PreferencesKeys.DEF_SORT_BY] ?: SortBy.SUBJECT.name
+            val sortOrder = preferences[PreferencesKeys.DEF_SORT_ORDER] ?: SortOrder.ASC.name
 
 
 
@@ -122,6 +147,10 @@ class PreferencesManager @Inject constructor(@ApplicationContext val context: Co
                     earnCrSem4,
                     earnCrSem5,
                     earnCrSem6
+                ),
+                Sort(
+                    SortBy.valueOf(sortBy),
+                    SortOrder.valueOf(sortOrder)
                 )
             )
         }
@@ -164,6 +193,13 @@ class PreferencesManager @Inject constructor(@ApplicationContext val context: Co
         }
     }
 
+    suspend fun updateSort(sort: Sort) {
+        context.dataStore.edit { preferences ->
+            preferences[PreferencesKeys.DEF_SORT_BY] = sort.sortBy.name
+            preferences[PreferencesKeys.DEF_SORT_ORDER] = sort.sortOrder.name
+        }
+    }
+
     suspend fun clearAll() {
         context.dataStore.edit { preferences ->
             preferences.clear()
@@ -188,5 +224,7 @@ class PreferencesManager @Inject constructor(@ApplicationContext val context: Co
         val DEF_EARN_CR_SEM_5 = doublePreferencesKey("default_earn_cr_sem_5")
         val DEF_EARN_CR_SEM_6 = doublePreferencesKey("default_earn_cr_sem_6")
         val DEF_CGPA = doublePreferencesKey("default_cgpa")
+        val DEF_SORT_BY = stringPreferencesKey("default_sort_by")
+        val DEF_SORT_ORDER = stringPreferencesKey("default_sort_order")
     }
 }
diff --git a/core/src/main/java/com/atech/core/room/attendance/AttendanceDao.kt b/core/src/main/java/com/atech/core/room/attendance/AttendanceDao.kt
index 565fa103..fc616068 100644
--- a/core/src/main/java/com/atech/core/room/attendance/AttendanceDao.kt
+++ b/core/src/main/java/com/atech/core/room/attendance/AttendanceDao.kt
@@ -10,6 +10,7 @@
 
 package com.atech.core.room.attendance
 
+import android.util.Log
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
@@ -17,6 +18,7 @@ import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
 
 @Dao
 interface AttendanceDao {
@@ -32,10 +34,35 @@ interface AttendanceDao {
     @Delete
     suspend fun delete(attendance: AttendanceModel)
 
-    //select * from attendance_table where  isArchive is NULL or isArchive = 0 ;
-    @Query("SELECT * FROM attendance_table WHERE isArchive is NULL or isArchive = 0 ORDER BY id ASC")
+
+    fun getAttendanceSorted(sort: Sort = Sort()): Flow<List<AttendanceModel>> {
+        val sortBy = when (sort.sortBy) {
+            SortBy.PERCENTAGE -> getNonArchiveAttendanceOrderByPercentage()
+            else -> getNonArchiveAttendance().map { attendanceList->
+                when(sort.sortBy) {
+                    SortBy.SUBJECT -> attendanceList.sortedBy { it.subject }
+                    SortBy.CREATED -> attendanceList.sortedBy { it.created }
+                    SortBy.TOTAL -> attendanceList.sortedBy { it.total }
+                    SortBy.PRESENT -> attendanceList.sortedBy { it.present }
+                    else -> attendanceList
+                }
+            }
+        }
+        val sortOrder = when (sort.sortOrder) {
+            SortOrder.DESC -> sortBy.map { it.reversed() }
+            else -> sortBy
+        }
+        return sortOrder
+    }
+
+
+
+    @Query("SELECT * FROM attendance_table WHERE isArchive is NULL or isArchive = 0")
     fun getNonArchiveAttendance(): Flow<List<AttendanceModel>>
 
+    @Query("SELECT *,  (CAST(present AS REAL) / total) * 100 AS percentage FROM attendance_table WHERE isArchive is NULL or isArchive = 0 ORDER BY percentage ASC")
+    fun getNonArchiveAttendanceOrderByPercentage(): Flow<List<AttendanceModel>>
+
     @Query("SELECT * FROM attendance_table ORDER BY id ASC")
     fun getAllAttendance(): Flow<List<AttendanceModel>>
 
diff --git a/core/src/main/java/com/atech/core/room/attendance/sort.kt b/core/src/main/java/com/atech/core/room/attendance/sort.kt
new file mode 100644
index 00000000..18d25c66
--- /dev/null
+++ b/core/src/main/java/com/atech/core/room/attendance/sort.kt
@@ -0,0 +1,22 @@
+package com.atech.core.room.attendance
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+enum class SortOrder {
+    ASC, DESC
+}
+
+enum class SortBy {
+    SUBJECT, CREATED,
+    TOTAL, PRESENT,
+    PERCENTAGE
+}
+
+@Parcelize
+data class Sort(
+    val sortBy: SortBy = SortBy.SUBJECT,
+    val sortOrder: SortOrder = SortOrder.ASC
+) : Parcelable
+
+
diff --git a/core/src/main/java/com/atech/core/utils/functions.kt b/core/src/main/java/com/atech/core/utils/functions.kt
index 1c0a8c81..8ee3159c 100644
--- a/core/src/main/java/com/atech/core/utils/functions.kt
+++ b/core/src/main/java/com/atech/core/utils/functions.kt
@@ -11,3 +11,11 @@ fun Long.convertLongToTime(pattern: String): String = SimpleDateFormat(pattern).
 }
 
 fun String.encodeUrlSpaces(): String = this.replace(" ", "%20")
+
+
+fun String.capitalizeWords(): String =
+    lowercase().split(" ").joinToString(" ") {
+        it.replaceFirstChar { it1 ->
+            if (it1.isLowerCase()) it1.titlecase() else it
+        }
+    }
diff --git a/theme/src/main/java/com/atech/theme/ads.kt b/theme/src/main/java/com/atech/theme/ads.kt
index bfab1ed8..4d6efad9 100644
--- a/theme/src/main/java/com/atech/theme/ads.kt
+++ b/theme/src/main/java/com/atech/theme/ads.kt
@@ -1,14 +1,7 @@
 package com.atech.theme
 
-import android.content.Context
 import android.util.Log
 import com.atech.theme.databinding.RowAdsViewBinding
-import com.google.android.gms.ads.AdRequest
-import com.google.android.gms.ads.AdSize
-import com.google.android.gms.ads.AdView
-import com.google.android.gms.ads.LoadAdError
-import com.google.android.gms.ads.MobileAds
-import com.google.android.gms.ads.RequestConfiguration
 
 private const val TAG = "ads"
 
@@ -22,37 +15,39 @@ enum class AdsUnit(val id: String) {
     Miscellaneous("ca-app-pub-6172727030505608/8130379370")
 }
 
-fun initAds(mContext: Context) {
-    MobileAds.initialize(mContext) {}
-    if (BuildConfig.DEBUG) {
-        val testDeviceIds = listOf("CE65A74AF824CCB43EEE62129E5A103E")
-        val requestConfiguration = RequestConfiguration.Builder()
-            .setTestDeviceIds(testDeviceIds)
-            .build()
-        MobileAds.setRequestConfiguration(requestConfiguration)
-    }
-}
+//fun initAds(mContext: Context) {
+//    MobileAds.initialize(mContext) {}
+//    if (BuildConfig.DEBUG) {
+//        val testDeviceIds = listOf("CE65A74AF824CCB43EEE62129E5A103E")
+//        val requestConfiguration = RequestConfiguration.Builder()
+//            .setTestDeviceIds(testDeviceIds)
+//            .build()
+//        MobileAds.setRequestConfiguration(requestConfiguration)
+//    }
+//}
 
 fun RowAdsViewBinding.setAdsUnit(id: AdsUnit = AdsUnit.Miscellaneous) {
-    val adView = AdView(root.context)
-    adView.setAdSize(AdSize.BANNER)
-    adView.adUnitId = id.id
-
-    adView.loadAd(AdRequest.Builder().build())
-    adView.adListener = object : com.google.android.gms.ads.AdListener() {
-        override fun onAdLoaded() {
-            super.onAdLoaded()
-            root.visibility = android.view.View.VISIBLE
-        }
-
-        override fun onAdFailedToLoad(p0: LoadAdError) {
-            super.onAdFailedToLoad(p0)
-            root.visibility = android.view.View.GONE
-            Log.d(TAG, "onAdFailedToLoad: ${p0.message}")
-        }
-    }
-    root.childCount.let {
-        if (it == 0)
-            root.addView(adView)
-    }
+    Log.d(TAG, "setAdsUnit: $id")
+    root.visibility = android.view.View.GONE
+//    val adView = AdView(root.context)
+//    adView.setAdSize(AdSize.BANNER)
+//    adView.adUnitId = id.id
+//
+//    adView.loadAd(AdRequest.Builder().build())
+//    adView.adListener = object : com.google.android.gms.ads.AdListener() {
+//        override fun onAdLoaded() {
+//            super.onAdLoaded()
+//            root.visibility = android.view.View.VISIBLE
+//        }
+//
+//        override fun onAdFailedToLoad(p0: LoadAdError) {
+//            super.onAdFailedToLoad(p0)
+//            root.visibility = android.view.View.GONE
+//            Log.d(TAG, "onAdFailedToLoad: ${p0.message}")
+//        }
+//    }
+//    root.childCount.let {
+//        if (it == 0)
+//            root.addView(adView)
+//    }
 }
\ No newline at end of file
diff --git a/theme/src/main/res/drawable/round_sort_24.xml b/theme/src/main/res/drawable/round_sort_24.xml
new file mode 100644
index 00000000..bcd98a33
--- /dev/null
+++ b/theme/src/main/res/drawable/round_sort_24.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="?attr/colorPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M4,18h4c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L4,16c-0.55,0 -1,0.45 -1,1s0.45,1 1,1zM3,7c0,0.55 0.45,1 1,1h16c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L4,6c-0.55,0 -1,0.45 -1,1zM4,13h10c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L4,11c-0.55,0 -1,0.45 -1,1s0.45,1 1,1z" />
+</vector>
diff --git a/theme/src/main/res/layout/list_item.xml b/theme/src/main/res/layout/list_item.xml
new file mode 100644
index 00000000..5209864a
--- /dev/null
+++ b/theme/src/main/res/layout/list_item.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="16dp"
+    android:ellipsize="end"
+    android:maxLines="1"
+    android:textAppearance="?attr/textAppearanceTitleMedium"
+    />
\ No newline at end of file
diff --git a/theme/src/main/res/values/strings.xml b/theme/src/main/res/values/strings.xml
index c82b529d..9e35746f 100644
--- a/theme/src/main/res/values/strings.xml
+++ b/theme/src/main/res/values/strings.xml
@@ -281,4 +281,7 @@
     <string name="event_notification">Event Notifications</string>
     <string name="notice_notification">Notice Notifications</string>
     <string name="notification">Notifications</string>
+    <string name="sort_by">Sort By</string>
+    <string name="sort_order">Sort Order</string>
+    <string name="sort">Sort</string>
 </resources>