From 2899f8a7ff7b725bc3adc4138164ceede44579d0 Mon Sep 17 00:00:00 2001
From: Suyash Mittal <suyash8514@gmail.com>
Date: Sun, 28 Jul 2024 01:53:58 +0530
Subject: [PATCH] Added sorting to EMI and refactoring

---
 .idea/compiler.xml                            |   2 +-
 .idea/gradle.xml                              |   2 +-
 .idea/kotlinc.xml                             |   2 +-
 .idea/misc.xml                                |   3 +-
 app/build.gradle.kts                          |  24 ++--
 .../suyash/creditmanager/domain/model/EMI.kt  |   4 +
 .../use_case/credit_card/GetCreditCards.kt    |   4 +-
 .../domain/use_case/emi/GetEMIs.kt            |   6 +-
 .../use_case/transaction/GetTransactions.kt   |   4 +-
 .../domain/util/CreditCardOrder.kt            |  27 ----
 .../creditmanager/domain/util/EMIOrder.kt     |  10 --
 .../creditmanager/domain/util/OrderType.kt    |   6 -
 .../domain/util/order/CreditCardOrder.kt      |  27 ++++
 .../domain/util/order/EMIOrder.kt             |  25 ++++
 .../creditmanager/domain/util/order/Order.kt  |   7 +
 .../domain/util/order/OrderType.kt            |  13 ++
 .../util/{ => order}/TransactionOrder.kt      |   2 +-
 .../add_edit_emi/AddEditEMIViewModel.kt       |   4 +-
 .../add_edit_txn/AddEditTxnViewModel.kt       |   4 +-
 .../components/CustomActionBottomSheet.kt     |  50 +++++++
 ...nDialog.kt => CustomConfirmationDialog.kt} |   4 +-
 .../components/CustomSortingBottomSheet.kt    |  72 ++++++++++
 .../presentation/commons/model/ItemAction.kt  |  10 ++
 .../credit_cards/CreditCardsEvent.kt          |   2 +-
 .../credit_cards/CreditCardsScreen.kt         | 127 +++++-------------
 .../credit_cards/CreditCardsState.kt          |   6 +-
 .../credit_cards/CreditCardsViewModel.kt      |   4 +-
 .../presentation/emis/EMIsEvent.kt            |   2 +
 .../presentation/emis/EMIsScreen.kt           |  97 ++++++-------
 .../presentation/emis/EMIsState.kt            |   4 +-
 .../presentation/emis/EMIsViewModel.kt        |   9 +-
 .../transactions/TransactionsEvent.kt         |   2 +-
 .../transactions/TransactionsScreen.kt        |   4 +-
 .../transactions/TransactionsState.kt         |   4 +-
 .../transactions/TransactionsViewModel.kt     |   6 +-
 build.gradle.kts                              |  11 +-
 36 files changed, 361 insertions(+), 229 deletions(-)
 delete mode 100644 app/src/main/java/com/suyash/creditmanager/domain/util/CreditCardOrder.kt
 delete mode 100644 app/src/main/java/com/suyash/creditmanager/domain/util/EMIOrder.kt
 delete mode 100644 app/src/main/java/com/suyash/creditmanager/domain/util/OrderType.kt
 create mode 100644 app/src/main/java/com/suyash/creditmanager/domain/util/order/CreditCardOrder.kt
 create mode 100644 app/src/main/java/com/suyash/creditmanager/domain/util/order/EMIOrder.kt
 create mode 100644 app/src/main/java/com/suyash/creditmanager/domain/util/order/Order.kt
 create mode 100644 app/src/main/java/com/suyash/creditmanager/domain/util/order/OrderType.kt
 rename app/src/main/java/com/suyash/creditmanager/domain/util/{ => order}/TransactionOrder.kt (79%)
 create mode 100644 app/src/main/java/com/suyash/creditmanager/presentation/commons/components/CustomActionBottomSheet.kt
 rename app/src/main/java/com/suyash/creditmanager/presentation/commons/components/{ConfirmationDialog.kt => CustomConfirmationDialog.kt} (97%)
 create mode 100644 app/src/main/java/com/suyash/creditmanager/presentation/commons/components/CustomSortingBottomSheet.kt
 create mode 100644 app/src/main/java/com/suyash/creditmanager/presentation/commons/model/ItemAction.kt

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b589d56..b86273d 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="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0897082..385bcfd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="gradleJvm" value="21" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index fdf8d99..6d0ee1c 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.0" />
+    <option name="version" value="2.0.0" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8978d23..a599984 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c42ba78..880d829 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     kotlin("plugin.serialization")
+    kotlin("plugin.compose")
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
     id("com.google.dagger.hilt.android")
@@ -15,8 +16,8 @@ android {
         applicationId = "com.suyash.creditmanager"
         minSdk = 26
         targetSdk = 35
-        versionCode = 23
-        versionName = "1.0.22"
+        versionCode = 24
+        versionName = "1.0.23"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -37,19 +38,16 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
     buildFeatures {
         buildConfig = true
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.2"
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
@@ -61,14 +59,15 @@ android {
 }
 
 dependencies {
-    val hiltVersion = "2.49"
+    val hiltVersion = "2.51.1"
     val roomVersion = "2.6.1"
     val navVersion = "2.7.7"
     val workVersion = "2.9.0"
+    implementation("org.jetbrains.kotlin:kotlin-reflect:2.0.0")
     implementation("androidx.core:core-ktx:1.13.1")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.2")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.4")
     implementation("androidx.appcompat:appcompat:1.7.0")
-    implementation("androidx.activity:activity-compose:1.9.0")
+    implementation("androidx.activity:activity-compose:1.9.1")
     implementation(platform("androidx.compose:compose-bom:2024.06.00"))
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")
@@ -81,7 +80,7 @@ dependencies {
     implementation("androidx.navigation:navigation-compose:$navVersion")
     implementation("androidx.hilt:hilt-navigation-compose:1.2.0")
     implementation("androidx.datastore:datastore:1.1.1")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1")
     implementation("androidx.work:work-runtime-ktx:$workVersion")
     implementation("androidx.hilt:hilt-work:1.2.0")
     implementation("com.google.code.gson:gson:2.10.1")
@@ -93,6 +92,7 @@ dependencies {
     androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
     androidTestImplementation(platform("androidx.compose:compose-bom:2024.06.00"))
     androidTestImplementation("androidx.compose.ui:ui-test-junit4")
+    androidTestImplementation("androidx.navigation:navigation-testing:$navVersion")
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/suyash/creditmanager/domain/model/EMI.kt b/app/src/main/java/com/suyash/creditmanager/domain/model/EMI.kt
index 20e65b0..d16a42a 100644
--- a/app/src/main/java/com/suyash/creditmanager/domain/model/EMI.kt
+++ b/app/src/main/java/com/suyash/creditmanager/domain/model/EMI.kt
@@ -42,6 +42,10 @@ data class EMI(
         return min(emiPaid, months)
     }
 
+    fun emisRemaining(): Int {
+        return months - emisPaid()
+    }
+
     fun toEmiBackup() =
         EmiBackup (
             name = this.name,
diff --git a/app/src/main/java/com/suyash/creditmanager/domain/use_case/credit_card/GetCreditCards.kt b/app/src/main/java/com/suyash/creditmanager/domain/use_case/credit_card/GetCreditCards.kt
index ec50eb5..14f9f39 100644
--- a/app/src/main/java/com/suyash/creditmanager/domain/use_case/credit_card/GetCreditCards.kt
+++ b/app/src/main/java/com/suyash/creditmanager/domain/use_case/credit_card/GetCreditCards.kt
@@ -2,8 +2,8 @@ package com.suyash.creditmanager.domain.use_case.credit_card
 
 import com.suyash.creditmanager.domain.model.CreditCard
 import com.suyash.creditmanager.domain.repository.CreditCardRepository
-import com.suyash.creditmanager.domain.util.CreditCardOrder
-import com.suyash.creditmanager.domain.util.OrderType
+import com.suyash.creditmanager.domain.util.order.CreditCardOrder
+import com.suyash.creditmanager.domain.util.order.OrderType
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
diff --git a/app/src/main/java/com/suyash/creditmanager/domain/use_case/emi/GetEMIs.kt b/app/src/main/java/com/suyash/creditmanager/domain/use_case/emi/GetEMIs.kt
index eb4869d..5c98cc8 100644
--- a/app/src/main/java/com/suyash/creditmanager/domain/use_case/emi/GetEMIs.kt
+++ b/app/src/main/java/com/suyash/creditmanager/domain/use_case/emi/GetEMIs.kt
@@ -2,8 +2,8 @@ package com.suyash.creditmanager.domain.use_case.emi
 
 import com.suyash.creditmanager.domain.model.EMI
 import com.suyash.creditmanager.domain.repository.EMIRepository
-import com.suyash.creditmanager.domain.util.EMIOrder
-import com.suyash.creditmanager.domain.util.OrderType
+import com.suyash.creditmanager.domain.util.order.EMIOrder
+import com.suyash.creditmanager.domain.util.order.OrderType
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
@@ -19,6 +19,7 @@ class GetEMIs(private val repository: EMIRepository) {
                         is EMIOrder.Months -> emis.sortedBy { it.months }
                         is EMIOrder.Date -> emis.sortedBy { it.date }
                         is EMIOrder.EMIsPaid -> emis.sortedBy { it.emisPaid() }
+                        is EMIOrder.EMIsRemaining -> emis.sortedBy { it.emisRemaining() }
                     }
                 }
                 is OrderType.Descending -> {
@@ -29,6 +30,7 @@ class GetEMIs(private val repository: EMIRepository) {
                         is EMIOrder.Months -> emis.sortedByDescending { it.months }
                         is EMIOrder.Date -> emis.sortedByDescending { it.date }
                         is EMIOrder.EMIsPaid -> emis.sortedByDescending { it.emisPaid() }
+                        is EMIOrder.EMIsRemaining -> emis.sortedByDescending { it.emisRemaining() }
                     }
                 }
             }
diff --git a/app/src/main/java/com/suyash/creditmanager/domain/use_case/transaction/GetTransactions.kt b/app/src/main/java/com/suyash/creditmanager/domain/use_case/transaction/GetTransactions.kt
index 0f528c4..3b0b470 100644
--- a/app/src/main/java/com/suyash/creditmanager/domain/use_case/transaction/GetTransactions.kt
+++ b/app/src/main/java/com/suyash/creditmanager/domain/use_case/transaction/GetTransactions.kt
@@ -2,8 +2,8 @@ package com.suyash.creditmanager.domain.use_case.transaction
 
 import com.suyash.creditmanager.domain.model.Transaction
 import com.suyash.creditmanager.domain.repository.TransactionRepository
-import com.suyash.creditmanager.domain.util.OrderType
-import com.suyash.creditmanager.domain.util.TransactionOrder
+import com.suyash.creditmanager.domain.util.order.OrderType
+import com.suyash.creditmanager.domain.util.order.TransactionOrder
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
diff --git a/app/src/main/java/com/suyash/creditmanager/domain/util/CreditCardOrder.kt b/app/src/main/java/com/suyash/creditmanager/domain/util/CreditCardOrder.kt
deleted file mode 100644
index 409ed12..0000000
--- a/app/src/main/java/com/suyash/creditmanager/domain/util/CreditCardOrder.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.suyash.creditmanager.domain.util
-
-sealed class CreditCardOrder(val orderType: OrderType) {
-    class Name(orderType: OrderType): CreditCardOrder(orderType)
-    class Expiry(orderType: OrderType): CreditCardOrder(orderType)
-    class Limit(orderType: OrderType): CreditCardOrder(orderType)
-    class DueDate(orderType: OrderType): CreditCardOrder(orderType)
-    class BillDate(orderType: OrderType): CreditCardOrder(orderType)
-
-    companion object {
-        val displayNameMap: Map<String, String?> = mapOf(
-            "Name" to Name::class.simpleName,
-            "Expiry" to Expiry::class.simpleName,
-            "Limit" to Limit::class.simpleName,
-            "Due Date" to DueDate::class.simpleName,
-            "Bill Date" to BillDate::class.simpleName
-        )
-
-        val sorting: Map<String?, Pair<CreditCardOrder, CreditCardOrder>> = mapOf(
-            Name::class.simpleName to Pair(Name(OrderType.Ascending), Name(OrderType.Descending)),
-            Expiry::class.simpleName to Pair(Expiry(OrderType.Ascending), Expiry(OrderType.Descending)),
-            Limit::class.simpleName to Pair(Limit(OrderType.Ascending), Limit(OrderType.Descending)),
-            DueDate::class.simpleName to Pair(DueDate(OrderType.Ascending), DueDate(OrderType.Descending)),
-            BillDate::class.simpleName to Pair(BillDate(OrderType.Ascending), BillDate(OrderType.Descending))
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/suyash/creditmanager/domain/util/EMIOrder.kt b/app/src/main/java/com/suyash/creditmanager/domain/util/EMIOrder.kt
deleted file mode 100644
index bbda0ca..0000000
--- a/app/src/main/java/com/suyash/creditmanager/domain/util/EMIOrder.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.suyash.creditmanager.domain.util
-
-sealed class EMIOrder(val orderType: OrderType) {
-    class Name(orderType: OrderType): EMIOrder(orderType)
-    class Amount(orderType: OrderType): EMIOrder(orderType)
-    class Rate(orderType: OrderType): EMIOrder(orderType)
-    class Months(orderType: OrderType): EMIOrder(orderType)
-    class Date(orderType: OrderType): EMIOrder(orderType)
-    class EMIsPaid(orderType: OrderType): EMIOrder(orderType)
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/suyash/creditmanager/domain/util/OrderType.kt b/app/src/main/java/com/suyash/creditmanager/domain/util/OrderType.kt
deleted file mode 100644
index b040093..0000000
--- a/app/src/main/java/com/suyash/creditmanager/domain/util/OrderType.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.suyash.creditmanager.domain.util
-
-sealed class OrderType {
-    data object Ascending: OrderType()
-    data object Descending: OrderType()
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/suyash/creditmanager/domain/util/order/CreditCardOrder.kt b/app/src/main/java/com/suyash/creditmanager/domain/util/order/CreditCardOrder.kt
new file mode 100644
index 0000000..0b6f0e3
--- /dev/null
+++ b/app/src/main/java/com/suyash/creditmanager/domain/util/order/CreditCardOrder.kt
@@ -0,0 +1,27 @@
+package com.suyash.creditmanager.domain.util.order
+
+sealed class CreditCardOrder(
+    override val orderType: OrderType,
+    override val label: String
+) : Order {
+    class Name(orderType: OrderType, label: String = "Name") : CreditCardOrder(orderType, label)
+    class Expiry(orderType: OrderType, label: String = "Expiry") : CreditCardOrder(orderType, label)
+    class Limit(orderType: OrderType, label: String = "Limit") : CreditCardOrder(orderType, label)
+    class DueDate(orderType: OrderType, label: String = "Due Date") :
+        CreditCardOrder(orderType, label)
+
+    class BillDate(orderType: OrderType, label: String = "Bill Date") :
+        CreditCardOrder(orderType, label)
+
+    companion object {
+        fun getOrderList(): List<CreditCardOrder> {
+            return listOf(
+                Name(OrderType.Ascending),
+                Expiry(OrderType.Ascending),
+                Limit(OrderType.Ascending),
+                DueDate(OrderType.Ascending),
+                BillDate(OrderType.Ascending)
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/suyash/creditmanager/domain/util/order/EMIOrder.kt b/app/src/main/java/com/suyash/creditmanager/domain/util/order/EMIOrder.kt
new file mode 100644
index 0000000..1b18702
--- /dev/null
+++ b/app/src/main/java/com/suyash/creditmanager/domain/util/order/EMIOrder.kt
@@ -0,0 +1,25 @@
+package com.suyash.creditmanager.domain.util.order
+
+sealed class EMIOrder(override val orderType: OrderType, override val label: String) : Order {
+    class Name(orderType: OrderType, label: String = "Name") : EMIOrder(orderType, label)
+    class Amount(orderType: OrderType, label: String = "Amount") : EMIOrder(orderType, label)
+    class Rate(orderType: OrderType, label: String = "Rate") : EMIOrder(orderType, label)
+    class Months(orderType: OrderType, label: String = "Months") : EMIOrder(orderType, label)
+    class Date(orderType: OrderType, label: String = "Date") : EMIOrder(orderType, label)
+    class EMIsPaid(orderType: OrderType, label: String = "EMIs Paid") : EMIOrder(orderType, label)
+    class EMIsRemaining(orderType: OrderType, label: String = "EMIs Remaining") : EMIOrder(orderType, label)
+
+    companion object {
+        fun getOrderList(): List<EMIOrder> {
+            return listOf(
+                Name(OrderType.Ascending),
+                Amount(OrderType.Ascending),
+                Rate(OrderType.Ascending),
+                Months(OrderType.Ascending),
+                Date(OrderType.Descending),
+                EMIsPaid(OrderType.Ascending),
+                EMIsRemaining(OrderType.Descending)
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/suyash/creditmanager/domain/util/order/Order.kt b/app/src/main/java/com/suyash/creditmanager/domain/util/order/Order.kt
new file mode 100644
index 0000000..f72abc6
--- /dev/null
+++ b/app/src/main/java/com/suyash/creditmanager/domain/util/order/Order.kt
@@ -0,0 +1,7 @@
+package com.suyash.creditmanager.domain.util.order
+
+sealed interface Order {
+
+    val orderType: OrderType
+    val label: String
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/suyash/creditmanager/domain/util/order/OrderType.kt b/app/src/main/java/com/suyash/creditmanager/domain/util/order/OrderType.kt
new file mode 100644
index 0000000..37f7e00
--- /dev/null
+++ b/app/src/main/java/com/suyash/creditmanager/domain/util/order/OrderType.kt
@@ -0,0 +1,13 @@
+package com.suyash.creditmanager.domain.util.order
+
+sealed class OrderType {
+    data object Ascending: OrderType()
+    data object Descending: OrderType()
+
+    fun getReverse(): OrderType {
+        return when (this) {
+            is Ascending -> Descending
+            is Descending -> Ascending
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/suyash/creditmanager/domain/util/TransactionOrder.kt b/app/src/main/java/com/suyash/creditmanager/domain/util/order/TransactionOrder.kt
similarity index 79%
rename from app/src/main/java/com/suyash/creditmanager/domain/util/TransactionOrder.kt
rename to app/src/main/java/com/suyash/creditmanager/domain/util/order/TransactionOrder.kt
index 75f47bb..aa21ee0 100644
--- a/app/src/main/java/com/suyash/creditmanager/domain/util/TransactionOrder.kt
+++ b/app/src/main/java/com/suyash/creditmanager/domain/util/order/TransactionOrder.kt
@@ -1,4 +1,4 @@
-package com.suyash.creditmanager.domain.util
+package com.suyash.creditmanager.domain.util.order
 
 sealed class TransactionOrder(val orderType: OrderType) {
     class Date(orderType: OrderType): TransactionOrder(orderType)
diff --git a/app/src/main/java/com/suyash/creditmanager/presentation/add_edit_emi/AddEditEMIViewModel.kt b/app/src/main/java/com/suyash/creditmanager/presentation/add_edit_emi/AddEditEMIViewModel.kt
index 6f1308b..bf892c8 100644
--- a/app/src/main/java/com/suyash/creditmanager/presentation/add_edit_emi/AddEditEMIViewModel.kt
+++ b/app/src/main/java/com/suyash/creditmanager/presentation/add_edit_emi/AddEditEMIViewModel.kt
@@ -13,8 +13,8 @@ import com.suyash.creditmanager.domain.model.EMI
 import com.suyash.creditmanager.domain.use_case.CreditCardUseCases
 import com.suyash.creditmanager.domain.use_case.EMIUseCases
 import com.suyash.creditmanager.domain.util.CardType
-import com.suyash.creditmanager.domain.util.CreditCardOrder
-import com.suyash.creditmanager.domain.util.OrderType
+import com.suyash.creditmanager.domain.util.order.CreditCardOrder
+import com.suyash.creditmanager.domain.util.order.OrderType
 import com.suyash.creditmanager.presentation.commons.TextInputState
 import com.suyash.creditmanager.presentation.commons.validateInRange
 import com.suyash.creditmanager.presentation.commons.validateMinMaxLength
diff --git a/app/src/main/java/com/suyash/creditmanager/presentation/add_edit_txn/AddEditTxnViewModel.kt b/app/src/main/java/com/suyash/creditmanager/presentation/add_edit_txn/AddEditTxnViewModel.kt
index 927d8d3..b296a19 100644
--- a/app/src/main/java/com/suyash/creditmanager/presentation/add_edit_txn/AddEditTxnViewModel.kt
+++ b/app/src/main/java/com/suyash/creditmanager/presentation/add_edit_txn/AddEditTxnViewModel.kt
@@ -14,8 +14,8 @@ import com.suyash.creditmanager.domain.model.TxnCategory
 import com.suyash.creditmanager.domain.use_case.CreditCardUseCases
 import com.suyash.creditmanager.domain.use_case.TransactionUseCases
 import com.suyash.creditmanager.domain.use_case.TxnCategoryUseCases
-import com.suyash.creditmanager.domain.util.CreditCardOrder
-import com.suyash.creditmanager.domain.util.OrderType
+import com.suyash.creditmanager.domain.util.order.CreditCardOrder
+import com.suyash.creditmanager.domain.util.order.OrderType
 import com.suyash.creditmanager.domain.util.TransactionType
 import com.suyash.creditmanager.presentation.commons.TextInputState
 import com.suyash.creditmanager.presentation.commons.validateInRange
diff --git a/app/src/main/java/com/suyash/creditmanager/presentation/commons/components/CustomActionBottomSheet.kt b/app/src/main/java/com/suyash/creditmanager/presentation/commons/components/CustomActionBottomSheet.kt
new file mode 100644
index 0000000..d7b9847
--- /dev/null
+++ b/app/src/main/java/com/suyash/creditmanager/presentation/commons/components/CustomActionBottomSheet.kt
@@ -0,0 +1,50 @@
+package com.suyash.creditmanager.presentation.commons.components
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.suyash.creditmanager.presentation.commons.model.ItemAction
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun CustomActionBottomSheet(
+    modifier: Modifier = Modifier,
+    onDismissRequest: () -> Unit,
+    actions: List<ItemAction>
+) {
+    val bottomSheetState = rememberModalBottomSheetState()
+
+    ModalBottomSheet(
+        sheetState = bottomSheetState,
+        onDismissRequest = onDismissRequest
+    ) {
+        Column(
+            modifier = modifier.padding(bottom = 16.dp)
+        ) {
+            actions.forEach {
+                Row(
+                    modifier = Modifier
+                        .clickable {
+                            onDismissRequest()
+                            it.onClick()
+                        }
+                        .fillMaxWidth()
+                        .padding(16.dp)
+                ) {
+                    Icon(it.icon, it.iconName)
+                    Text(text = it.title, modifier = Modifier.padding(start = 16.dp))
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/suyash/creditmanager/presentation/commons/components/ConfirmationDialog.kt b/app/src/main/java/com/suyash/creditmanager/presentation/commons/components/CustomConfirmationDialog.kt
similarity index 97%
rename from app/src/main/java/com/suyash/creditmanager/presentation/commons/components/ConfirmationDialog.kt
rename to app/src/main/java/com/suyash/creditmanager/presentation/commons/components/CustomConfirmationDialog.kt
index fa5fe1a..7057946 100644
--- a/app/src/main/java/com/suyash/creditmanager/presentation/commons/components/ConfirmationDialog.kt
+++ b/app/src/main/java/com/suyash/creditmanager/presentation/commons/components/CustomConfirmationDialog.kt
@@ -18,7 +18,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 
 @Composable
-fun ConfirmationDialog(
+fun CustomConfirmationDialog(
     title: String,
     description: String,
     warningMessage: String? = null,
@@ -88,7 +88,7 @@ fun ConfirmationDialog(
 @Preview(showBackground = true)
 @Composable
 fun ConfirmationDialogPreview() {
-    ConfirmationDialog(title = "Delete Credit Card?",
+    CustomConfirmationDialog(title = "Delete Credit Card?",
         description = "Do you want to delete XXX",
         warningMessage = "This will delete associated transaction(s) and emi(s)",
         onDismissRequest = { },
diff --git a/app/src/main/java/com/suyash/creditmanager/presentation/commons/components/CustomSortingBottomSheet.kt b/app/src/main/java/com/suyash/creditmanager/presentation/commons/components/CustomSortingBottomSheet.kt
new file mode 100644
index 0000000..1ff8c0e
--- /dev/null
+++ b/app/src/main/java/com/suyash/creditmanager/presentation/commons/components/CustomSortingBottomSheet.kt
@@ -0,0 +1,72 @@
+package com.suyash.creditmanager.presentation.commons.components
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowDownward
+import androidx.compose.material.icons.filled.ArrowUpward
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.suyash.creditmanager.domain.util.order.Order
+import com.suyash.creditmanager.domain.util.order.OrderType
+import kotlin.reflect.full.primaryConstructor
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun <T : Order> CustomSortingBottomSheet(
+    modifier: Modifier = Modifier,
+    onDismissRequest: () -> Unit,
+    orderList: List<T>,
+    currentOrder: T,
+    sort: (T) -> Unit,
+) {
+    val bottomSheetState = rememberModalBottomSheetState()
+
+    ModalBottomSheet(
+        sheetState = bottomSheetState,
+        onDismissRequest = onDismissRequest
+    ) {
+        Column(
+            modifier = modifier.padding(bottom = 16.dp)
+        ) {
+            orderList.forEach {
+                Row(
+                    modifier = Modifier
+                        .clickable {
+                            onDismissRequest()
+                            if (currentOrder::class == it::class) {
+                                sort(
+                                    currentOrder::class.primaryConstructor!!.call(
+                                        currentOrder.orderType.getReverse(),
+                                        currentOrder.label
+                                    )
+                                )
+                            } else {
+                                sort(it)
+                            }
+                        }
+                        .fillMaxWidth()
+                        .padding(16.dp)
+                ) {
+                    if (currentOrder::class == it::class) {
+                        if (currentOrder.orderType == OrderType.Ascending) {
+                            Icon(Icons.Filled.ArrowUpward, "Ascending")
+                        } else if (currentOrder.orderType == OrderType.Descending) {
+                            Icon(Icons.Filled.ArrowDownward, "Descending")
+                        }
+                    }
+                    Text(text = it.label, modifier = Modifier.padding(start = 16.dp))
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/suyash/creditmanager/presentation/commons/model/ItemAction.kt b/app/src/main/java/com/suyash/creditmanager/presentation/commons/model/ItemAction.kt
new file mode 100644
index 0000000..1dcf5f6
--- /dev/null
+++ b/app/src/main/java/com/suyash/creditmanager/presentation/commons/model/ItemAction.kt
@@ -0,0 +1,10 @@
+package com.suyash.creditmanager.presentation.commons.model
+
+import androidx.compose.ui.graphics.vector.ImageVector
+
+data class ItemAction(
+    val icon: ImageVector,
+    val title: String,
+    val onClick: () -> Unit,
+    val iconName: String? = null
+)
diff --git a/app/src/main/java/com/suyash/creditmanager/presentation/credit_cards/CreditCardsEvent.kt b/app/src/main/java/com/suyash/creditmanager/presentation/credit_cards/CreditCardsEvent.kt
index b3bbdce..6284245 100644
--- a/app/src/main/java/com/suyash/creditmanager/presentation/credit_cards/CreditCardsEvent.kt
+++ b/app/src/main/java/com/suyash/creditmanager/presentation/credit_cards/CreditCardsEvent.kt
@@ -1,7 +1,7 @@
 package com.suyash.creditmanager.presentation.credit_cards
 
 import com.suyash.creditmanager.domain.model.CreditCard
-import com.suyash.creditmanager.domain.util.CreditCardOrder
+import com.suyash.creditmanager.domain.util.order.CreditCardOrder
 
 sealed class CreditCardsEvent {
     data class Order(val creditCardsOrder: CreditCardOrder): CreditCardsEvent()
diff --git a/app/src/main/java/com/suyash/creditmanager/presentation/credit_cards/CreditCardsScreen.kt b/app/src/main/java/com/suyash/creditmanager/presentation/credit_cards/CreditCardsScreen.kt
index 772d98b..ff3dd7b 100644
--- a/app/src/main/java/com/suyash/creditmanager/presentation/credit_cards/CreditCardsScreen.kt
+++ b/app/src/main/java/com/suyash/creditmanager/presentation/credit_cards/CreditCardsScreen.kt
@@ -1,11 +1,8 @@
 package com.suyash.creditmanager.presentation.credit_cards
 
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
@@ -13,19 +10,15 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.Sort
 import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.ArrowDownward
-import androidx.compose.material.icons.filled.ArrowUpward
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
@@ -41,11 +34,13 @@ import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
-import com.suyash.creditmanager.domain.util.CreditCardOrder
-import com.suyash.creditmanager.domain.util.OrderType
+import com.suyash.creditmanager.domain.util.order.CreditCardOrder
 import com.suyash.creditmanager.presentation.credit_cards.component.CreditCardItem
 import com.suyash.creditmanager.presentation.commons.Screen
-import com.suyash.creditmanager.presentation.commons.components.ConfirmationDialog
+import com.suyash.creditmanager.presentation.commons.components.CustomConfirmationDialog
+import com.suyash.creditmanager.presentation.commons.components.CustomActionBottomSheet
+import com.suyash.creditmanager.presentation.commons.components.CustomSortingBottomSheet
+import com.suyash.creditmanager.presentation.commons.model.ItemAction
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
@@ -54,7 +49,6 @@ fun CreditCardsScreen(
     viewModel: CreditCardsViewModel = hiltViewModel()
 ) {
     val haptics = LocalHapticFeedback.current
-    val bottomSheetState = rememberModalBottomSheetState()
     var isItemBottomSheetOpen by rememberSaveable {
         mutableStateOf(false)
     }
@@ -120,7 +114,7 @@ fun CreditCardsScreen(
             }
         }
         if (openDeleteConfirmationDialog) {
-            ConfirmationDialog(
+            CustomConfirmationDialog(
                 title = "Delete Credit Card?",
                 description = "Do you want to delete ${viewModel.state.value.selectedCreditCard?.cardName}",
                 warningMessage = "This action will delete associated transaction(s) and emi(s)",
@@ -137,87 +131,38 @@ fun CreditCardsScreen(
             )
         }
         if (isItemBottomSheetOpen) {
-            ModalBottomSheet(
-                sheetState = bottomSheetState,
-                onDismissRequest = { isItemBottomSheetOpen = false }
-            ) {
-                Column(
-                    modifier = Modifier.padding(bottom = 16.dp)
-                ) {
-                    Row(
-                        modifier = Modifier
-                            .clickable {
-                                isItemBottomSheetOpen = false
-                                navController.navigate(
-                                    Screen.AddEditCCScreen.route +
-                                            "?ccId=${viewModel.state.value.selectedCreditCard?.id}"
-                                )
-                            }
-                            .fillMaxWidth()
-                            .padding(16.dp)
-                    ) {
-                        Icon(Icons.Filled.Edit, "Edit CC")
-                        Text(text = "Edit", modifier = Modifier.padding(start = 16.dp))
-                    }
-                    Row(
-                        modifier = Modifier
-                            .clickable {
-                                isItemBottomSheetOpen = false
-                                openDeleteConfirmationDialog = true
-                            }
-                            .fillMaxWidth()
-                            .padding(16.dp)
-                    ) {
-                        Icon(Icons.Filled.Delete, "Delete CC")
-                        Text(text = "Delete", modifier = Modifier.padding(start = 16.dp))
-                    }
-                }
-            }
+            CustomActionBottomSheet(
+                onDismissRequest = { isItemBottomSheetOpen = false },
+                actions = listOf(
+                    ItemAction(
+                        icon = Icons.Filled.Edit,
+                        iconName = "Edit CC",
+                        title = "Edit",
+                        onClick = {
+                            navController.navigate(
+                                Screen.AddEditCCScreen.route +
+                                        "?ccId=${viewModel.state.value.selectedCreditCard?.id}"
+                            )
+                        }
+                    ),
+                    ItemAction(
+                        icon = Icons.Filled.Delete,
+                        iconName = "Delete CC",
+                        title = "Delete",
+                        onClick = {
+                            openDeleteConfirmationDialog = true
+                        }
+                    )
+                )
+            )
         }
         if (isSortBottomSheetOpen) {
-            ModalBottomSheet(
-                sheetState = bottomSheetState,
-                onDismissRequest = { isSortBottomSheetOpen = false }
-            ) {
-                Column(
-                    modifier = Modifier.padding(bottom = 16.dp)
-                ) {
-                    CreditCardOrder.displayNameMap.forEach {
-                        Row(
-                            modifier = Modifier
-                                .clickable {
-                                    isSortBottomSheetOpen = false
-                                    if (viewModel.state.value.creditCardsOrder::class.simpleName == it.value) {
-                                        if (viewModel.state.value.creditCardsOrder.orderType == OrderType.Ascending) {
-                                            CreditCardOrder.sorting[it.value]?.let { sort ->
-                                                viewModel.onEvent(CreditCardsEvent.Order(sort.second))
-                                            }
-                                        } else if (viewModel.state.value.creditCardsOrder.orderType == OrderType.Descending) {
-                                            CreditCardOrder.sorting[it.value]?.let { sort ->
-                                                viewModel.onEvent(CreditCardsEvent.Order(sort.first))
-                                            }
-                                        }
-                                    } else {
-                                        CreditCardOrder.sorting[it.value]?.let { sort ->
-                                            viewModel.onEvent(CreditCardsEvent.Order(sort.first))
-                                        }
-                                    }
-                                }
-                                .fillMaxWidth()
-                                .padding(16.dp)
-                        ) {
-                            if (viewModel.state.value.creditCardsOrder::class.simpleName == it.value) {
-                                if (viewModel.state.value.creditCardsOrder.orderType == OrderType.Ascending) {
-                                    Icon(Icons.Filled.ArrowUpward, "Ascending")
-                                } else if (viewModel.state.value.creditCardsOrder.orderType == OrderType.Descending) {
-                                    Icon(Icons.Filled.ArrowDownward, "Descending")
-                                }
-                            }
-                            Text(text = it.key, modifier = Modifier.padding(start = 16.dp))
-                        }
-                    }
-                }
-            }
+            CustomSortingBottomSheet(
+                onDismissRequest = { isSortBottomSheetOpen = false },
+                orderList = CreditCardOrder.getOrderList(),
+                currentOrder = viewModel.state.value.creditCardsOrder,
+                sort = { viewModel.onEvent(CreditCardsEvent.Order(it)) }
+            )
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/suyash/creditmanager/presentation/credit_cards/CreditCardsState.kt b/app/src/main/java/com/suyash/creditmanager/presentation/credit_cards/CreditCardsState.kt
index 7dd234c..2bb7433 100644
--- a/app/src/main/java/com/suyash/creditmanager/presentation/credit_cards/CreditCardsState.kt
+++ b/app/src/main/java/com/suyash/creditmanager/presentation/credit_cards/CreditCardsState.kt
@@ -1,9 +1,11 @@
 package com.suyash.creditmanager.presentation.credit_cards
 
+import androidx.compose.runtime.Immutable
 import com.suyash.creditmanager.domain.model.CreditCard
-import com.suyash.creditmanager.domain.util.CreditCardOrder
-import com.suyash.creditmanager.domain.util.OrderType
+import com.suyash.creditmanager.domain.util.order.CreditCardOrder
+import com.suyash.creditmanager.domain.util.order.OrderType
 
+@Immutable
 data class CreditCardsState(
     val creditCards: List<CreditCard> = emptyList(),
     val creditCardsOrder: CreditCardOrder = CreditCardOrder.Name(OrderType.Ascending),
diff --git a/app/src/main/java/com/suyash/creditmanager/presentation/credit_cards/CreditCardsViewModel.kt b/app/src/main/java/com/suyash/creditmanager/presentation/credit_cards/CreditCardsViewModel.kt
index 11f4dbc..157ea46 100644
--- a/app/src/main/java/com/suyash/creditmanager/presentation/credit_cards/CreditCardsViewModel.kt
+++ b/app/src/main/java/com/suyash/creditmanager/presentation/credit_cards/CreditCardsViewModel.kt
@@ -7,8 +7,8 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.suyash.creditmanager.data.settings.AppSettings
 import com.suyash.creditmanager.domain.use_case.CreditCardUseCases
-import com.suyash.creditmanager.domain.util.CreditCardOrder
-import com.suyash.creditmanager.domain.util.OrderType
+import com.suyash.creditmanager.domain.util.order.CreditCardOrder
+import com.suyash.creditmanager.domain.util.order.OrderType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.launchIn
diff --git a/app/src/main/java/com/suyash/creditmanager/presentation/emis/EMIsEvent.kt b/app/src/main/java/com/suyash/creditmanager/presentation/emis/EMIsEvent.kt
index 63f8152..9f8ecda 100644
--- a/app/src/main/java/com/suyash/creditmanager/presentation/emis/EMIsEvent.kt
+++ b/app/src/main/java/com/suyash/creditmanager/presentation/emis/EMIsEvent.kt
@@ -1,8 +1,10 @@
 package com.suyash.creditmanager.presentation.emis
 
 import com.suyash.creditmanager.domain.model.EMI
+import com.suyash.creditmanager.domain.util.order.EMIOrder
 
 sealed class EMIsEvent {
+    data class Order(val emiOrder: EMIOrder): EMIsEvent()
     data class SelectEMI(val emi: EMI): EMIsEvent()
     data class DeleteEMI(val emi: EMI?): EMIsEvent()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/suyash/creditmanager/presentation/emis/EMIsScreen.kt b/app/src/main/java/com/suyash/creditmanager/presentation/emis/EMIsScreen.kt
index d282984..8cf9c3c 100644
--- a/app/src/main/java/com/suyash/creditmanager/presentation/emis/EMIsScreen.kt
+++ b/app/src/main/java/com/suyash/creditmanager/presentation/emis/EMIsScreen.kt
@@ -1,27 +1,24 @@
 package com.suyash.creditmanager.presentation.emis
 
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.Sort
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
-import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
@@ -37,9 +34,13 @@ import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
+import com.suyash.creditmanager.domain.util.order.EMIOrder
 import com.suyash.creditmanager.presentation.emis.component.EMIItem
 import com.suyash.creditmanager.presentation.commons.Screen
-import com.suyash.creditmanager.presentation.commons.components.ConfirmationDialog
+import com.suyash.creditmanager.presentation.commons.components.CustomActionBottomSheet
+import com.suyash.creditmanager.presentation.commons.components.CustomConfirmationDialog
+import com.suyash.creditmanager.presentation.commons.components.CustomSortingBottomSheet
+import com.suyash.creditmanager.presentation.commons.model.ItemAction
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
@@ -48,10 +49,12 @@ fun EMIsScreen(
     viewModel: EMIsViewModel = hiltViewModel()
 ) {
     val haptics = LocalHapticFeedback.current
-    val bottomSheetState = rememberModalBottomSheetState()
     var isItemBottomSheetOpen by rememberSaveable {
         mutableStateOf(false)
     }
+    var isSortBottomSheetOpen by rememberSaveable {
+        mutableStateOf(false)
+    }
     var openDeleteConfirmationDialog by rememberSaveable {
         mutableStateOf(false)
     }
@@ -64,7 +67,15 @@ fun EMIsScreen(
     Scaffold(
         topBar = {
             TopAppBar(
-                title = { Text(text = "EMIs") }
+                title = { Text(text = "EMIs") },
+                actions = {
+                    IconButton(onClick = { isSortBottomSheetOpen = true }) {
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Filled.Sort,
+                            contentDescription = "Sort Credit Cards"
+                        )
+                    }
+                }
             )
         },
         floatingActionButton = {
@@ -107,7 +118,7 @@ fun EMIsScreen(
             }
         }
         if(openDeleteConfirmationDialog) {
-            ConfirmationDialog(
+            CustomConfirmationDialog(
                 title = "Delete EMI?",
                 description = "Do you want to delete ${viewModel.state.value.selectedEMI?.name}",
                 onDismissRequest = { openDeleteConfirmationDialog = false },
@@ -119,42 +130,38 @@ fun EMIsScreen(
             )
         }
         if(isItemBottomSheetOpen) {
-            ModalBottomSheet(
-                sheetState = bottomSheetState,
-                onDismissRequest = { isItemBottomSheetOpen = false }
-            ) {
-                Column(
-                    modifier = Modifier.padding(bottom = 16.dp)
-                ) {
-                    Row(
-                        modifier = Modifier
-                            .clickable {
-                                isItemBottomSheetOpen = false
-                                navController.navigate(
-                                    Screen.AddEditEMIScreen.route +
-                                            "?emiId=${viewModel.state.value.selectedEMI?.id}"
-                                )
-                            }
-                            .fillMaxWidth()
-                            .padding(16.dp)
-                    ) {
-                        Icon(Icons.Filled.Edit, "Edit EMI")
-                        Text(text = "Edit", modifier = Modifier.padding(start = 16.dp))
-                    }
-                    Row(
-                        modifier = Modifier
-                            .clickable {
-                                isItemBottomSheetOpen = false
-                                openDeleteConfirmationDialog = true
-                            }
-                            .fillMaxWidth()
-                            .padding(16.dp)
-                    ) {
-                        Icon(Icons.Filled.Delete, "Delete EMI")
-                        Text(text = "Delete", modifier = Modifier.padding(start = 16.dp))
-                    }
-                }
-            }
+            CustomActionBottomSheet(
+                onDismissRequest = { isItemBottomSheetOpen = false },
+                actions = listOf(
+                    ItemAction(
+                        icon = Icons.Filled.Edit,
+                        iconName = "Edit EMI",
+                        title = "Edit",
+                        onClick = {
+                            navController.navigate(
+                                Screen.AddEditEMIScreen.route +
+                                        "?emiId=${viewModel.state.value.selectedEMI?.id}"
+                            )
+                        }
+                    ),
+                    ItemAction(
+                        icon = Icons.Filled.Delete,
+                        iconName = "Delete EMI",
+                        title = "Delete",
+                        onClick = {
+                            openDeleteConfirmationDialog = true
+                        }
+                    )
+                )
+            )
+        }
+        if (isSortBottomSheetOpen) {
+            CustomSortingBottomSheet(
+                onDismissRequest = { isSortBottomSheetOpen = false },
+                orderList = EMIOrder.getOrderList(),
+                currentOrder = viewModel.state.value.emiOrder,
+                sort = { viewModel.onEvent(EMIsEvent.Order(it)) }
+            )
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/suyash/creditmanager/presentation/emis/EMIsState.kt b/app/src/main/java/com/suyash/creditmanager/presentation/emis/EMIsState.kt
index 16988da..2244cca 100644
--- a/app/src/main/java/com/suyash/creditmanager/presentation/emis/EMIsState.kt
+++ b/app/src/main/java/com/suyash/creditmanager/presentation/emis/EMIsState.kt
@@ -2,8 +2,8 @@ package com.suyash.creditmanager.presentation.emis
 
 import com.suyash.creditmanager.domain.model.EMI
 import com.suyash.creditmanager.domain.util.DateFormat
-import com.suyash.creditmanager.domain.util.EMIOrder
-import com.suyash.creditmanager.domain.util.OrderType
+import com.suyash.creditmanager.domain.util.order.EMIOrder
+import com.suyash.creditmanager.domain.util.order.OrderType
 
 data class EMIsState(
     val emis: List<EMI> = emptyList(),
diff --git a/app/src/main/java/com/suyash/creditmanager/presentation/emis/EMIsViewModel.kt b/app/src/main/java/com/suyash/creditmanager/presentation/emis/EMIsViewModel.kt
index 563f255..e7bf6d2 100644
--- a/app/src/main/java/com/suyash/creditmanager/presentation/emis/EMIsViewModel.kt
+++ b/app/src/main/java/com/suyash/creditmanager/presentation/emis/EMIsViewModel.kt
@@ -7,7 +7,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.suyash.creditmanager.data.settings.AppSettings
 import com.suyash.creditmanager.domain.use_case.EMIUseCases
-import com.suyash.creditmanager.domain.util.EMIOrder
+import com.suyash.creditmanager.domain.util.order.EMIOrder
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.launchIn
@@ -52,6 +52,13 @@ class EMIsViewModel @Inject constructor(
                     }
                 }
             }
+            is EMIsEvent.Order -> {
+                if(state.value.emiOrder::class == event.emiOrder::class &&
+                    state.value.emiOrder.orderType == event.emiOrder.orderType) {
+                    return
+                }
+                getEMIs(event.emiOrder)
+            }
         }
     }
 
diff --git a/app/src/main/java/com/suyash/creditmanager/presentation/transactions/TransactionsEvent.kt b/app/src/main/java/com/suyash/creditmanager/presentation/transactions/TransactionsEvent.kt
index b6b239f..088eccc 100644
--- a/app/src/main/java/com/suyash/creditmanager/presentation/transactions/TransactionsEvent.kt
+++ b/app/src/main/java/com/suyash/creditmanager/presentation/transactions/TransactionsEvent.kt
@@ -1,7 +1,7 @@
 package com.suyash.creditmanager.presentation.transactions
 
 import com.suyash.creditmanager.domain.model.Transaction
-import com.suyash.creditmanager.domain.util.TransactionOrder
+import com.suyash.creditmanager.domain.util.order.TransactionOrder
 
 sealed class TransactionsEvent {
     data class Order(val transactionOrder: TransactionOrder): TransactionsEvent()
diff --git a/app/src/main/java/com/suyash/creditmanager/presentation/transactions/TransactionsScreen.kt b/app/src/main/java/com/suyash/creditmanager/presentation/transactions/TransactionsScreen.kt
index 59704c1..280eade 100644
--- a/app/src/main/java/com/suyash/creditmanager/presentation/transactions/TransactionsScreen.kt
+++ b/app/src/main/java/com/suyash/creditmanager/presentation/transactions/TransactionsScreen.kt
@@ -43,7 +43,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
 import com.suyash.creditmanager.presentation.transactions.component.TransactionItem
 import com.suyash.creditmanager.presentation.commons.Screen
-import com.suyash.creditmanager.presentation.commons.components.ConfirmationDialog
+import com.suyash.creditmanager.presentation.commons.components.CustomConfirmationDialog
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
@@ -124,7 +124,7 @@ fun TransactionsScreen(
             }
         }
         if (openDeleteConfirmationDialog) {
-            ConfirmationDialog(
+            CustomConfirmationDialog(
                 title = "Delete Transaction?",
                 description = "Do you want to delete the transaction?",
                 onDismissRequest = { openDeleteConfirmationDialog = false },
diff --git a/app/src/main/java/com/suyash/creditmanager/presentation/transactions/TransactionsState.kt b/app/src/main/java/com/suyash/creditmanager/presentation/transactions/TransactionsState.kt
index b288270..480a32a 100644
--- a/app/src/main/java/com/suyash/creditmanager/presentation/transactions/TransactionsState.kt
+++ b/app/src/main/java/com/suyash/creditmanager/presentation/transactions/TransactionsState.kt
@@ -3,8 +3,8 @@ package com.suyash.creditmanager.presentation.transactions
 import com.suyash.creditmanager.domain.model.CreditCard
 import com.suyash.creditmanager.domain.model.Transaction
 import com.suyash.creditmanager.domain.util.DateFormat
-import com.suyash.creditmanager.domain.util.OrderType
-import com.suyash.creditmanager.domain.util.TransactionOrder
+import com.suyash.creditmanager.domain.util.order.OrderType
+import com.suyash.creditmanager.domain.util.order.TransactionOrder
 
 data class TransactionsState(
     val creditCards: Map<Int, CreditCard> = emptyMap(),
diff --git a/app/src/main/java/com/suyash/creditmanager/presentation/transactions/TransactionsViewModel.kt b/app/src/main/java/com/suyash/creditmanager/presentation/transactions/TransactionsViewModel.kt
index 91922f2..142b755 100644
--- a/app/src/main/java/com/suyash/creditmanager/presentation/transactions/TransactionsViewModel.kt
+++ b/app/src/main/java/com/suyash/creditmanager/presentation/transactions/TransactionsViewModel.kt
@@ -8,9 +8,9 @@ import androidx.lifecycle.viewModelScope
 import com.suyash.creditmanager.data.settings.AppSettings
 import com.suyash.creditmanager.domain.use_case.CreditCardUseCases
 import com.suyash.creditmanager.domain.use_case.TransactionUseCases
-import com.suyash.creditmanager.domain.util.CreditCardOrder
-import com.suyash.creditmanager.domain.util.OrderType
-import com.suyash.creditmanager.domain.util.TransactionOrder
+import com.suyash.creditmanager.domain.util.order.CreditCardOrder
+import com.suyash.creditmanager.domain.util.order.OrderType
+import com.suyash.creditmanager.domain.util.order.TransactionOrder
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.launchIn
diff --git a/build.gradle.kts b/build.gradle.kts
index f92c546..b25d245 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,10 +4,11 @@ buildscript {
 }
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.5.0" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.0" apply false
-    id("com.google.dagger.hilt.android") version "2.49" apply false
-    id("com.google.devtools.ksp") version "1.9.0-1.0.12" apply false
+    id("com.android.application") version "8.5.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.0.0" apply false
+    id("com.google.dagger.hilt.android") version "2.51.1" apply false
+    id("com.google.devtools.ksp") version "2.0.0-1.0.22" apply false
     id("androidx.room") version "2.6.1" apply false
-    id("org.jetbrains.kotlin.plugin.serialization") version "1.9.0" apply false
+    id("org.jetbrains.kotlin.plugin.serialization") version "2.0.0" apply false
+    id("org.jetbrains.kotlin.plugin.compose") version "2.0.0" apply false
 }
\ No newline at end of file