From 02c55ab13f628353cbd147e926f584c74dc10e7c Mon Sep 17 00:00:00 2001
From: Rohit <rkumar8092378845@gmail.com>
Date: Fri, 28 Jul 2023 16:01:37 +0530
Subject: [PATCH 1/3] - all the data should be created in viewModels and not in
 the fragments

#109
---
 .idea/gradle.xml                              |   2 +-
 .idea/misc.xml                                |   2 +-
 ...enseCategoryAndTheirTotalExpenseAmounts.kt |   7 +
 .../database/dao/ExpenseCategoryDAO.kt        |   3 +
 .../database/dao/ExpenseDAO.kt                |  68 ++++++
 .../repositories/ExpenseCategoryRepository.kt |   1 +
 .../repositories/ExpenseRepository.kt         |  29 +++
 .../rohitthebest/manageyourrenters/todo.txt   |   8 +
 .../expense/DeepAnalyzeExpenseFragment.kt     | 219 ++++++------------
 .../trackMoney/expense/GraphFragment.kt       | 212 +++++------------
 .../expense/MonthlyGraphFragment.kt           |  49 ++--
 .../ui/viewModels/ExpenseCategoryViewModel.kt |   2 +
 .../viewModels/ExpenseGraphDataViewModel.kt   | 192 +++++++++++++++
 .../ui/viewModels/ExpenseViewModel.kt         |  49 +---
 app/src/main/res/values/strings.xml           |   4 +
 15 files changed, 466 insertions(+), 381 deletions(-)
 create mode 100644 app/src/main/java/com/rohitthebest/manageyourrenters/data/ExpenseCategoryAndTheirTotalExpenseAmounts.kt
 create mode 100644 app/src/main/java/com/rohitthebest/manageyourrenters/todo.txt
 create mode 100644 app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseGraphDataViewModel.kt

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 61413d36..60133aa9 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,7 +8,7 @@
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="$PROJECT_DIR$/../../../../Program Files/gradle-7.4" />
-        <option name="gradleJvm" value="Embedded JDK" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3c044cfd..dc82b60f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -144,7 +144,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/data/ExpenseCategoryAndTheirTotalExpenseAmounts.kt b/app/src/main/java/com/rohitthebest/manageyourrenters/data/ExpenseCategoryAndTheirTotalExpenseAmounts.kt
new file mode 100644
index 00000000..ddcb70c4
--- /dev/null
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/data/ExpenseCategoryAndTheirTotalExpenseAmounts.kt
@@ -0,0 +1,7 @@
+package com.rohitthebest.manageyourrenters.data
+
+data class ExpenseCategoryAndTheirTotalExpenseAmounts(
+    var expenseCategoryKey: String,
+    var categoryName: String,
+    var totalAmount: Double
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/database/dao/ExpenseCategoryDAO.kt b/app/src/main/java/com/rohitthebest/manageyourrenters/database/dao/ExpenseCategoryDAO.kt
index 43e88669..4596af6c 100644
--- a/app/src/main/java/com/rohitthebest/manageyourrenters/database/dao/ExpenseCategoryDAO.kt
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/database/dao/ExpenseCategoryDAO.kt
@@ -28,6 +28,9 @@ interface ExpenseCategoryDAO {
     @Query("SELECT * FROM expense_category_table ORDER BY modified DESC")
     fun getAllExpenseCategories(): Flow<List<ExpenseCategory>>
 
+    @Query("SELECT * FROM expense_category_table limit :limit")
+    fun getAllExpenseCategoriesByLimit(limit: Int): Flow<List<ExpenseCategory>>
+
     @Query("SELECT * FROM expense_category_table WHERE `key` = :key")
     fun getExpenseCategoryByKey(key: String): Flow<ExpenseCategory>
 
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/database/dao/ExpenseDAO.kt b/app/src/main/java/com/rohitthebest/manageyourrenters/database/dao/ExpenseDAO.kt
index 9831a969..06d8858f 100644
--- a/app/src/main/java/com/rohitthebest/manageyourrenters/database/dao/ExpenseDAO.kt
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/database/dao/ExpenseDAO.kt
@@ -1,6 +1,7 @@
 package com.rohitthebest.manageyourrenters.database.dao
 
 import androidx.room.*
+import com.rohitthebest.manageyourrenters.data.ExpenseCategoryAndTheirTotalExpenseAmounts
 import com.rohitthebest.manageyourrenters.database.model.Expense
 import kotlinx.coroutines.flow.Flow
 
@@ -60,6 +61,12 @@ interface ExpenseDAO {
         date2: Long
     ): Flow<Double>
 
+    @Query("SELECT SUM(amount) FROM expense_table WHERE categoryKey IN (:expenseCategoryKeys)")
+    fun getTotalExpenseByCategoryKeys(
+        expenseCategoryKeys: List<String>
+    ): Flow<Double>
+
+
     @Query("SELECT SUM(amount) FROM expense_table WHERE categoryKey IN (:expenseCategoryKeys) AND created BETWEEN :date1 AND :date2")
     fun getTotalExpenseByCategoryKeysAndDateRange(
         expenseCategoryKeys: List<String>,
@@ -103,4 +110,65 @@ interface ExpenseDAO {
 
     @Query("UPDATE expense_table SET isSynced = 0 WHERE `key` = :key")
     suspend fun updateIsSyncedValueToFalse(key: String)
+
+    @Query(
+        "SELECT expense_category_table.`key` as expenseCategoryKey, " +
+                "expense_category_table.categoryName AS categoryName, " +
+                "SUM(expense_table.amount) AS totalAmount " +
+                "FROM expense_table " +
+                "INNER JOIN expense_category_table " +
+                "ON expense_table.categoryKey = expense_category_table.`key` " +
+                "GROUP BY expense_category_table.`key`"
+    )
+    fun getTotalExpenseAmountsWithTheirExpenseCategoryKeys(): Flow<List<ExpenseCategoryAndTheirTotalExpenseAmounts>>
+
+    @Query(
+        "SELECT expense_category_table.`key` AS expenseCategoryKey, " +
+                "expense_category_table.categoryName AS categoryName, " +
+                "SUM(expense_table.amount) AS totalAmount " +
+                "FROM expense_table " +
+                "INNER JOIN expense_category_table " +
+                "ON expense_table.categoryKey = expense_category_table.`key` " +
+                "WHERE expense_table.created BETWEEN :date1 AND :date2 " +
+                "GROUP BY expense_category_table.`key`"
+    )
+    fun getTotalExpenseAmountsWithTheirExpenseCategoryKeysByDateRange(
+        date1: Long,
+        date2: Long
+    ): Flow<List<ExpenseCategoryAndTheirTotalExpenseAmounts>>
+
+    @Query(
+        "SELECT expense_category_table.`key` AS expenseCategoryKey, " +
+                "expense_category_table.categoryName AS categoryName, " +
+                "SUM(expense_table.amount) AS totalAmount " +
+                "FROM expense_table " +
+                "INNER JOIN expense_category_table " +
+                "ON expense_table.categoryKey = expense_category_table.`key` " +
+                "WHERE expense_table.categoryKey IN (:selectedExpenseCategories) " +
+                "GROUP BY expense_category_table.`key`"
+    )
+    fun getTotalExpenseAmountsWithTheirExpenseCategoryKeysForSelectedExpenseCategories(
+        selectedExpenseCategories: List<String>
+    ): Flow<List<ExpenseCategoryAndTheirTotalExpenseAmounts>>
+
+    @Query(
+        "SELECT expense_category_table.`key` AS expenseCategoryKey, " +
+                "expense_category_table.categoryName AS categoryName, " +
+                "SUM(expense_table.amount) AS totalAmount " +
+                "FROM expense_table " +
+                "INNER JOIN expense_category_table " +
+                "ON expense_table.categoryKey = expense_category_table.`key` " +
+                "WHERE expense_table.categoryKey IN (:selectedExpenseCategories) " +
+                "AND expense_table.created BETWEEN :date1 AND :date2 " +
+                "GROUP BY expense_category_table.`key`"
+    )
+    fun getTotalExpenseAmountsWithTheirExpenseCategoryKeysForSelectedExpenseCategoriesByDateRange(
+        selectedExpenseCategories: List<String>,
+        date1: Long,
+        date2: Long
+    ): Flow<List<ExpenseCategoryAndTheirTotalExpenseAmounts>>
+
+
+    @Query("SELECT EXISTS(select `key` from expense_table limit 1)")
+    fun isAnyExpenseAdded(): Flow<Boolean>
 }
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/repositories/ExpenseCategoryRepository.kt b/app/src/main/java/com/rohitthebest/manageyourrenters/repositories/ExpenseCategoryRepository.kt
index 4bbff6b2..2a05b295 100644
--- a/app/src/main/java/com/rohitthebest/manageyourrenters/repositories/ExpenseCategoryRepository.kt
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/repositories/ExpenseCategoryRepository.kt
@@ -31,4 +31,5 @@ class ExpenseCategoryRepository @Inject constructor(
 
     fun getExpenseCategoryByKey(key: String) = dao.getExpenseCategoryByKey(key)
 
+    fun getAllExpenseCategoriesByLimit(limit: Int) = dao.getAllExpenseCategoriesByLimit(limit)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/repositories/ExpenseRepository.kt b/app/src/main/java/com/rohitthebest/manageyourrenters/repositories/ExpenseRepository.kt
index 74e49739..8e0d192a 100644
--- a/app/src/main/java/com/rohitthebest/manageyourrenters/repositories/ExpenseRepository.kt
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/repositories/ExpenseRepository.kt
@@ -64,6 +64,10 @@ class ExpenseRepository @Inject constructor(
     ) =
         dao.getTotalExpenseAmountByCategoryKeyAndDateRange(expenseCategoryKey, date1, date2)
 
+    fun getTotalExpenseByCategoryKeys(
+        expenseCategoryKeys: List<String>
+    ) = dao.getTotalExpenseByCategoryKeys(expenseCategoryKeys)
+
     fun getTotalExpenseByCategoryKeysAndDateRange(
         expenseCategoryKeys: List<String>,
         date1: Long,
@@ -94,6 +98,31 @@ class ExpenseRepository @Inject constructor(
     suspend fun getKeysByExpenseCategoryKey(expenseCategoryKey: String) =
         dao.getKeysByExpenseCategoryKey(expenseCategoryKey)
 
+    fun getTotalExpenseAmountsWithTheirExpenseCategoryKeys() =
+        dao.getTotalExpenseAmountsWithTheirExpenseCategoryKeys()
+
+    fun getTotalExpenseAmountsWithTheirExpenseCategoryKeysByDateRange(date1: Long, date2: Long) =
+        dao.getTotalExpenseAmountsWithTheirExpenseCategoryKeysByDateRange(date1, date2)
+
+    fun getTotalExpenseAmountsWithTheirExpenseCategoryKeysForSelectedExpenseCategories(
+        selectedExpenseCategories: List<String>
+    ) = dao.getTotalExpenseAmountsWithTheirExpenseCategoryKeysForSelectedExpenseCategories(
+        selectedExpenseCategories
+    )
+
+    fun getTotalExpenseAmountsWithTheirExpenseCategoryKeysForSelectedExpenseCategoriesByDateRange(
+        selectedExpenseCategories: List<String>,
+        date1: Long,
+        date2: Long
+    ) =
+        dao.getTotalExpenseAmountsWithTheirExpenseCategoryKeysForSelectedExpenseCategoriesByDateRange(
+            selectedExpenseCategories,
+            date1,
+            date2
+        )
+
+    fun isAnyExpenseAdded() = dao.isAnyExpenseAdded()
+
     fun applyExpenseFilterByPaymentMethods(
         paymentMethodKeys: List<String>,
         expenses: List<Expense>
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/todo.txt b/app/src/main/java/com/rohitthebest/manageyourrenters/todo.txt
new file mode 100644
index 00000000..0b0781eb
--- /dev/null
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/todo.txt
@@ -0,0 +1,8 @@
+- remove the anyChart library and replace with MPChart
+- add new graph in expense graph
+    - individual category graph
+- add option to filter data in graph using payment methods (#107)
+
+
+// done
+- all the data should be created in viewModels and not in the fragments
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/DeepAnalyzeExpenseFragment.kt b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/DeepAnalyzeExpenseFragment.kt
index 71d55d8e..06025232 100644
--- a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/DeepAnalyzeExpenseFragment.kt
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/DeepAnalyzeExpenseFragment.kt
@@ -26,9 +26,16 @@ import com.rohitthebest.manageyourrenters.database.model.ExpenseCategory
 import com.rohitthebest.manageyourrenters.databinding.FragmentDeepAnalyzeExpenseBinding
 import com.rohitthebest.manageyourrenters.others.Constants
 import com.rohitthebest.manageyourrenters.ui.viewModels.ExpenseCategoryViewModel
+import com.rohitthebest.manageyourrenters.ui.viewModels.ExpenseGraphDataViewModel
 import com.rohitthebest.manageyourrenters.ui.viewModels.ExpenseViewModel
-import com.rohitthebest.manageyourrenters.utils.*
+import com.rohitthebest.manageyourrenters.utils.Functions
 import com.rohitthebest.manageyourrenters.utils.Functions.Companion.showToast
+import com.rohitthebest.manageyourrenters.utils.WorkingWithDateAndTime
+import com.rohitthebest.manageyourrenters.utils.executeAfterDelay
+import com.rohitthebest.manageyourrenters.utils.format
+import com.rohitthebest.manageyourrenters.utils.hide
+import com.rohitthebest.manageyourrenters.utils.loadAnyValueFromSharedPreference
+import com.rohitthebest.manageyourrenters.utils.show
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
@@ -46,6 +53,7 @@ class DeepAnalyzeExpenseFragment : Fragment(R.layout.fragment_deep_analyze_expen
 
     private val expenseCategoryViewModel by viewModels<ExpenseCategoryViewModel>()
     private val expenseViewModel by viewModels<ExpenseViewModel>()
+    private val expenseGraphDataViewModel by viewModels<ExpenseGraphDataViewModel>()
 
     private lateinit var pie: Pie
 
@@ -79,6 +87,50 @@ class DeepAnalyzeExpenseFragment : Fragment(R.layout.fragment_deep_analyze_expen
         getAllExpenseCategories()
 
         initListeners()
+
+        observerExpenseGraphData()
+    }
+
+    private fun observerExpenseGraphData() {
+
+        expenseGraphDataViewModel.expenseGraphData.observe(viewLifecycleOwner) {
+
+            if (it != null && it.first.isNotEmpty()) {
+
+                val expenseCategoryNameAndTheirTotalList = it.first
+                val total = it.second
+
+                pie.title("Total expense amount: ${total.format(2)}")
+
+                val data = ArrayList<DataEntry>()
+
+                expenseCategoryNameAndTheirTotalList.forEach { expenseCategoryAndTheirTotalExpenseAmounts ->
+
+                    data.add(
+                        ValueDataEntry(
+                            expenseCategoryAndTheirTotalExpenseAmounts.categoryName,
+                            expenseCategoryAndTheirTotalExpenseAmounts.totalAmount
+                        )
+                    )
+                }
+
+                lifecycleScope.launch {
+
+                    delay(500)
+
+                    if (data.isNotEmpty()) {
+
+                        binding.chart.show()
+                        pie.data(data)
+                    } else {
+
+                        binding.chart.hide()
+                        showToast(requireContext(), getString(R.string.no_data_available))
+                    }
+
+                }
+            }
+        }
     }
 
     private fun loadCustomDateRangeValueFromSharedPreference() {
@@ -243,12 +295,16 @@ class DeepAnalyzeExpenseFragment : Fragment(R.layout.fragment_deep_analyze_expen
 
                     CustomDateRange.THIS_MONTH -> binding.toolbar.subtitle =
                         getString(R.string.this_month)
+
                     CustomDateRange.THIS_WEEK -> binding.toolbar.subtitle =
                         getString(R.string.this_week)
+
                     CustomDateRange.PREVIOUS_MONTH -> binding.toolbar.subtitle =
                         getString(R.string.previous_month)
+
                     CustomDateRange.PREVIOUS_WEEK -> binding.toolbar.subtitle =
                         getString(R.string.previous_week)
+
                     else -> {}
                 }
                 initChartData()
@@ -380,146 +436,22 @@ class DeepAnalyzeExpenseFragment : Fragment(R.layout.fragment_deep_analyze_expen
 
         val selectedCategories =
             deepAnalyzeExpenseCategoryAdapter.currentList.filter { expenseCategory ->
-
                 expenseCategory.isSelected
-            }
-
-        getTotalExpenseAmount(selectedCategories)
-
-        prepareChart(selectedCategories)
-
-    }
-
-    private fun prepareChart(selectedCategories: List<ExpenseCategory>) {
-
-        if (selectedCategories.isNotEmpty()) {
-
-            val data = ArrayList<DataEntry>()
-
-            selectedCategories.forEach { expenseCategory ->
-
-                lifecycleScope.launch {
-
-                    if (!isDateRangeSelected) {
-
-                        // get the all time amount
-
-                        try {
-                            expenseViewModel.getExpenseAmountSumByExpenseCategoryKey(
-                                expenseCategory.key
-                            ).collect { amount ->
-
-                                data.add(
-                                    ValueDataEntry(
-                                        expenseCategory.categoryName,
-                                        amount
-                                    )
-                                )
-                            }
-                        } catch (e: Exception) {
-                            e.printStackTrace()
-                        }
-
-                    } else {
-
-                        // get the amount by the date range selected
-
-                        try {
-                            expenseViewModel.getExpenseAmountSumByExpenseCategoryByDateRange(
-                                expenseCategory.key,
-                                startDate,
-                                endDate + Constants.ONE_DAY_MILLISECONDS
-                            ).collect { amount ->
-
-                                data.add(
-                                    ValueDataEntry(
-                                        expenseCategory.categoryName,
-                                        amount
-                                    )
-                                )
-                            }
-                        } catch (e: Exception) {
-                            e.printStackTrace()
-                        }
-
-                    }
-
-                }
-            }
-
-            lifecycleScope.launch {
-
-                delay(500)
-
-                if (data.isNotEmpty()) {
-
-                    binding.chart.show()
-                    pie.data(data)
-                    //binding.chart.setChart(pie)
-                } else {
-
-                    binding.chart.hide()
-                    showToast(requireContext(), "No Data available!!!")
-                }
-
-            }
-
-        }
-
-    }
-
-    private fun getTotalExpenseAmount(selectedCategories: List<ExpenseCategory>) {
-
-        var total = 0.0
+            }.map { it.key }
 
         if (!isDateRangeSelected) {
 
-            selectedCategories.forEach { expenseCategory ->
-
-                expenseViewModel.getTotalExpenseAmountByExpenseCategory(expenseCategory.key)
-                    .observe(viewLifecycleOwner) { amount ->
-
-                        try {
-
-                            total += amount
-                        } catch (e: NullPointerException) {
-
-                            e.printStackTrace()
-                        }
-
-                    }
-            }
+            expenseGraphDataViewModel.getTotalExpenseAmountWithTheirExpenseCategoryNamesForSelectedExpenseCategories(
+                selectedCategories
+            )
         } else {
 
-            selectedCategories.forEach { expenseCategory ->
-
-
-                expenseViewModel.getTotalExpenseAmountByCategoryKeyAndDateRange(
-                    expenseCategory.key,
-                    startDate,
-                    endDate + Constants.ONE_DAY_MILLISECONDS
-                )
-                    .observe(viewLifecycleOwner) { amount ->
-
-                        try {
-
-                            total += amount
-                        } catch (e: Exception) {
-
-                            e.printStackTrace()
-                        }
-                    }
-
-            }
-
-        }
-
-        lifecycleScope.launch {
-            delay(500)
-            pie.title("Total expense amount: $total")
-
+            expenseGraphDataViewModel.getTotalExpenseAmountWithTheirExpenseCategoryNamesForSelectedExpenseCategoriesByDateRange(
+                selectedCategories,
+                startDate,
+                endDate + Constants.ONE_DAY_MILLISECONDS
+            )
         }
-
     }
 
     private var changeChartDataJob: Job? = null
@@ -530,7 +462,10 @@ class DeepAnalyzeExpenseFragment : Fragment(R.layout.fragment_deep_analyze_expen
 
             if (getSelectedExpenseCategoryCount() <= 2) {
 
-                showToast(requireContext(), "Minimum two categories has to be selected")
+                showToast(
+                    requireContext(),
+                    getString(R.string.minimum_two_categories_needs_to_be_selected)
+                )
                 return
             }
         }
@@ -551,19 +486,9 @@ class DeepAnalyzeExpenseFragment : Fragment(R.layout.fragment_deep_analyze_expen
             binding.clearSelectionFAB.enable()
         }
 
-        try {
-
-            if (changeChartDataJob != null && changeChartDataJob?.isActive == true) {
-
-                changeChartDataJob?.cancel()
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        } finally {
-
-            changeChartDataJob = lifecycleScope.launch {
+        changeChartDataJob = lifecycleScope.launch {
 
-                delay(250)
+            changeChartDataJob.executeAfterDelay(250) {
 
                 initChartData()
             }
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/GraphFragment.kt b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/GraphFragment.kt
index 6bfae5be..edab1515 100644
--- a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/GraphFragment.kt
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/GraphFragment.kt
@@ -24,6 +24,7 @@ import com.rohitthebest.manageyourrenters.others.Constants.CUSTOM_DATE_RANGE_FOR
 import com.rohitthebest.manageyourrenters.others.Constants.CUSTOM_DATE_RANGE_FOR_GRAPH_FRAGMENT_SHARED_PREF_NAME
 import com.rohitthebest.manageyourrenters.others.Constants.ONE_DAY_MILLISECONDS
 import com.rohitthebest.manageyourrenters.ui.viewModels.ExpenseCategoryViewModel
+import com.rohitthebest.manageyourrenters.ui.viewModels.ExpenseGraphDataViewModel
 import com.rohitthebest.manageyourrenters.ui.viewModels.ExpenseViewModel
 import com.rohitthebest.manageyourrenters.utils.*
 import com.rohitthebest.manageyourrenters.utils.Functions.Companion.getUid
@@ -43,9 +44,12 @@ class GraphFragment : Fragment(R.layout.fragment_graph) {
 
     private val expenseCategoryViewModel by viewModels<ExpenseCategoryViewModel>()
     private val expenseViewModel by viewModels<ExpenseViewModel>()
+    private val expenseGraphDataViewModel by viewModels<ExpenseGraphDataViewModel>()
 
     private lateinit var pie: Pie
     private var isAllTimeSelected = false
+    private var d1 = System.currentTimeMillis() - (ONE_DAY_MILLISECONDS * 30)
+    private var d2 = System.currentTimeMillis()
 
     private var selectedCustomDateRangeMenu: CustomDateRange? = CustomDateRange.ALL_TIME
 
@@ -61,6 +65,53 @@ class GraphFragment : Fragment(R.layout.fragment_graph) {
 
         handleDateRangeSelectionMenu(selectedCustomDateRangeMenu ?: CustomDateRange.ALL_TIME)
         initListeners()
+
+        observeExpenseGraphData()
+    }
+
+    private fun observeExpenseGraphData() {
+
+        expenseGraphDataViewModel.expenseGraphData.observe(viewLifecycleOwner) {
+
+            if (it != null && it.first.isNotEmpty()) {
+
+                val expenseCategoryNameAndTheirTotalList = it.first
+                val total = it.second
+
+                pie.legend().title("Total expense : ${total.format(3)}")
+
+                val data = ArrayList<DataEntry>()
+
+                expenseCategoryNameAndTheirTotalList.forEach { expenseCategoryAndTheirTotalExpenseAmounts ->
+
+                    data.add(
+                        ValueDataEntry(
+                            expenseCategoryAndTheirTotalExpenseAmounts.categoryName,
+                            expenseCategoryAndTheirTotalExpenseAmounts.totalAmount
+                        )
+                    )
+                }
+
+                lifecycleScope.launch {
+
+                    delay(500)
+
+                    Log.d(TAG, "getAllExpenseCategory: $data")
+
+                    if (data.isNotEmpty()) {
+
+                        binding.chart.show()
+                        pie.data(data)
+                        //binding.chart.setChart(pie)
+                    } else {
+
+                        binding.chart.hide()
+                        showToast(requireContext(), getString(R.string.no_data_available))
+                    }
+
+                }
+            }
+        }
     }
 
     private fun loadCustomDateRangeValueFromSharedPreference() {
@@ -107,9 +158,6 @@ class GraphFragment : Fragment(R.layout.fragment_graph) {
         binding.chart.setChart(pie)
     }
 
-    private var d1 = System.currentTimeMillis() - (ONE_DAY_MILLISECONDS * 30)
-    private var d2 = System.currentTimeMillis()
-
     private fun initListeners() {
 
         binding.toolbar.setNavigationOnClickListener {
@@ -118,7 +166,7 @@ class GraphFragment : Fragment(R.layout.fragment_graph) {
 
         binding.toolbar.menu.findItem(R.id.menu_deep_analyze_expense).setOnMenuItemClickListener {
 
-            expenseCategoryViewModel.getAllExpenseCategories().observe(viewLifecycleOwner) {
+            expenseCategoryViewModel.getAllExpenseCategoriesByLimit(2).observe(viewLifecycleOwner) {
 
                 if (it.size >= 2) {
 
@@ -138,9 +186,9 @@ class GraphFragment : Fragment(R.layout.fragment_graph) {
 
         binding.toolbar.menu.findItem(R.id.menu_monthly_graph).setOnMenuItemClickListener {
 
-            expenseViewModel.getAllExpenses().observe(viewLifecycleOwner) {
+            expenseViewModel.isAnyExpenseAdded().observe(viewLifecycleOwner) {
 
-                if (it.isNotEmpty()) {
+                if (it) {
                     findNavController().navigate(R.id.action_graphFragment_to_monthlyGraphFragment)
                 } else {
 
@@ -225,14 +273,9 @@ class GraphFragment : Fragment(R.layout.fragment_graph) {
 
                 if (!isAllTimeSelected) {
 
-                    Log.d(
-                        TAG,
-                        "handleDateRangeSelectionMenu: all time selected : $isAllTimeSelected"
-                    )
-
                     isAllTimeSelected = true
 
-                    getExpenseCategoryExpensesByAllTime()
+                    expenseGraphDataViewModel.getTotalExpenseAmountsWithTheirExpenseCategoryNames()
 
                     changeSelectionUI()
 
@@ -330,7 +373,8 @@ class GraphFragment : Fragment(R.layout.fragment_graph) {
         if (!isAllTimeSelected) {
 
             changeSelectionUI()
-            getExpenseCategoryExpensesByDateRange(
+
+            expenseGraphDataViewModel.getTotalExpenseAmountsWithTheirExpenseCategoryNamesByDateRange(
                 d1,
                 d2
             )
@@ -358,148 +402,6 @@ class GraphFragment : Fragment(R.layout.fragment_graph) {
         }
     }
 
-    private fun getExpenseCategoryExpensesByDateRange(date1: Long?, date2: Long?) {
-
-        if (!isAllTimeSelected) {
-
-            Log.d(TAG, "getExpenseCategoryExpensesByDateRange: ")
-
-            expenseViewModel.getTotalExpenseAmountByDateRange(
-                date1!!,
-                date2!! + ONE_DAY_MILLISECONDS
-            )
-                .observe(viewLifecycleOwner) { total ->
-
-                    pie.legend().title("Total expense : %.3f".format(total))
-                }
-
-
-            expenseCategoryViewModel.getAllExpenseCategories()
-                .observe(viewLifecycleOwner) { expenseCategories ->
-
-                    if (expenseCategories.isNotEmpty()) {
-
-                        val data = ArrayList<DataEntry>()
-
-                        expenseCategories.forEach { expenseCategory ->
-
-                            lifecycleScope.launch {
-
-                                try {
-                                    expenseViewModel.getExpenseAmountSumByExpenseCategoryByDateRange(
-                                        expenseCategory.key, date1, date2 + ONE_DAY_MILLISECONDS
-                                    ).collect { amount ->
-
-                                        Log.d(
-                                            TAG,
-                                            "getExpenseCategoryExpensesByDateRange: category : ${expenseCategory.categoryName} -> amount : $amount"
-                                        )
-
-                                        data.add(
-                                            ValueDataEntry(
-                                                expenseCategory.categoryName,
-                                                amount
-                                            )
-                                        )
-                                    }
-                                } catch (e: Exception) {
-                                    e.printStackTrace()
-                                }
-                            }
-                        }
-
-                        lifecycleScope.launch {
-
-                            delay(500)
-
-                            Log.d(TAG, "getAllExpenseCategory: $data")
-
-                            if (data.isNotEmpty()) {
-
-                                binding.chart.show()
-                                pie.data(data)
-                            } else {
-
-                                binding.chart.hide()
-                                showToast(requireContext(), "No data found")
-                            }
-                        }
-
-                    }
-                }
-        }
-
-    }
-
-    private fun getExpenseCategoryExpensesByAllTime() {
-
-        if (isAllTimeSelected) {
-
-
-            Log.d(TAG, "getExpenseCategoryExpensesByAllTime: ")
-
-            expenseViewModel.getTotalExpenseAmount().observe(viewLifecycleOwner) { total ->
-
-                pie.legend().title("Total expense : ${total.format(3)}")
-            }
-
-            expenseCategoryViewModel.getAllExpenseCategories()
-                .observe(viewLifecycleOwner) { expenseCategories ->
-
-                    if (expenseCategories.isNotEmpty()) {
-
-                        val data = ArrayList<DataEntry>()
-
-                        expenseCategories.forEach { expenseCategory ->
-
-                            lifecycleScope.launch {
-
-                                try {
-                                    expenseViewModel.getExpenseAmountSumByExpenseCategoryKey(
-                                        expenseCategory.key
-                                    ).collect { amount ->
-
-                                        Log.d(
-                                            TAG,
-                                            "getExpenseCategoryExpensesByAllTime: category : ${expenseCategory.categoryName} -> amount : $amount"
-                                        )
-
-                                        data.add(
-                                            ValueDataEntry(
-                                                expenseCategory.categoryName,
-                                                amount
-                                            )
-                                        )
-                                    }
-                                } catch (e: Exception) {
-                                    e.printStackTrace()
-                                }
-                            }
-                        }
-
-                        lifecycleScope.launch {
-
-                            delay(500)
-
-                            Log.d(TAG, "getAllExpenseCategory: $data")
-
-                            if (data.isNotEmpty()) {
-
-                                binding.chart.show()
-                                pie.data(data)
-                                //binding.chart.setChart(pie)
-                            } else {
-
-                                binding.chart.hide()
-                            }
-
-                        }
-
-                    }
-                }
-        }
-    }
-
     override fun onDestroyView() {
         super.onDestroyView()
 
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/MonthlyGraphFragment.kt b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/MonthlyGraphFragment.kt
index d128a89b..b06ee4d3 100644
--- a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/MonthlyGraphFragment.kt
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/MonthlyGraphFragment.kt
@@ -13,6 +13,7 @@ import com.anychart.enums.HoverMode
 import com.anychart.enums.TooltipPositionMode
 import com.rohitthebest.manageyourrenters.R
 import com.rohitthebest.manageyourrenters.databinding.FragmentMonthlyGraphBinding
+import com.rohitthebest.manageyourrenters.ui.viewModels.ExpenseGraphDataViewModel
 import com.rohitthebest.manageyourrenters.ui.viewModels.ExpenseViewModel
 import com.rohitthebest.manageyourrenters.utils.WorkingWithDateAndTime
 import com.rohitthebest.manageyourrenters.utils.setListToSpinner
@@ -28,13 +29,12 @@ class MonthlyGraphFragment : Fragment(R.layout.fragment_monthly_graph) {
     private var _binding: FragmentMonthlyGraphBinding? = null
     private val binding get() = _binding!!
 
+    private val expenseGraphDataViewModel by viewModels<ExpenseGraphDataViewModel>()
     private val expenseViewModel by viewModels<ExpenseViewModel>()
 
     private lateinit var cartesian: Cartesian
     private var selectedYear = 2020
 
-    private var isRefreshEnabled = true
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         _binding = FragmentMonthlyGraphBinding.bind(view)
@@ -44,10 +44,7 @@ class MonthlyGraphFragment : Fragment(R.layout.fragment_monthly_graph) {
         setUpChart()
         getStartAndEndYear()
 
-        lifecycleScope.launch {
-            delay(250)
-            loadData()
-        }
+        loadData()
 
         binding.toolbar.setNavigationOnClickListener {
 
@@ -56,37 +53,32 @@ class MonthlyGraphFragment : Fragment(R.layout.fragment_monthly_graph) {
     }
 
     private fun loadData() {
-        expenseViewModel.getExpensesOfAllMonthsOfYear(selectedYear)
+        expenseGraphDataViewModel.getExpensesOfAllMonthsOfYear(selectedYear)
     }
 
     private fun observeExpenseOfEachMonth() {
 
-        expenseViewModel.expenseOfEachMonth.observe(viewLifecycleOwner) { expensePerMonth ->
-
-            if (isRefreshEnabled) {
-                val monthList = resources.getStringArray(R.array.months_short).asList()
-                var i = 0
-
-                val data = ArrayList<DataEntry>()
+        expenseGraphDataViewModel.expenseOfEachMonth.observe(viewLifecycleOwner) { expensePerMonth ->
 
-                expensePerMonth.forEach { expense ->
+            val data = ArrayList<DataEntry>()
 
-                    data.add(ValueDataEntry(monthList[i], expense))
-                    ++i
-                }
-
-                lifecycleScope.launch {
+            expensePerMonth.forEach { monthAndAmount ->
+                data.add(ValueDataEntry(monthAndAmount.first, monthAndAmount.second))
+            }
 
-                    delay(500)
+            lifecycleScope.launch {
 
-                    cartesian.title("Monthly expense for the year : $selectedYear")
-                    cartesian.data(data)
-                }
+                delay(500)
 
-                isRefreshEnabled = false
+                cartesian.title(
+                    getString(
+                        R.string.monthly_expense_for_the_year,
+                        selectedYear.toString()
+                    )
+                )
+                cartesian.data(data)
             }
         }
-
     }
 
     private fun setUpChart() {
@@ -105,8 +97,8 @@ class MonthlyGraphFragment : Fragment(R.layout.fragment_monthly_graph) {
         cartesian.tooltip().positionMode(TooltipPositionMode.POINT)
         cartesian.interactivity().hoverMode(HoverMode.BY_X)
 
-        cartesian.xAxis(0).title("Month")
-        cartesian.yAxis(0).title("Expense")
+        cartesian.xAxis(0).title(getString(R.string.month))
+        cartesian.yAxis(0).title(getString(R.string.expense))
 
         binding.chart.setChart(cartesian)
     }
@@ -141,7 +133,6 @@ class MonthlyGraphFragment : Fragment(R.layout.fragment_monthly_graph) {
             { position ->
 
                 selectedYear = yearList[position]
-                isRefreshEnabled = true
                 loadData()
             }, {}
         )
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseCategoryViewModel.kt b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseCategoryViewModel.kt
index 98ad7f85..67b81da7 100644
--- a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseCategoryViewModel.kt
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseCategoryViewModel.kt
@@ -241,4 +241,6 @@ class ExpenseCategoryViewModel @Inject constructor(
 
     fun getAllExpenseCategories() = expenseCategoryRepository.getAllExpenseCategories().asLiveData()
 
+    fun getAllExpenseCategoriesByLimit(limit: Int) =
+        expenseCategoryRepository.getAllExpenseCategoriesByLimit(limit).asLiveData()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseGraphDataViewModel.kt b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseGraphDataViewModel.kt
new file mode 100644
index 00000000..e8586564
--- /dev/null
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseGraphDataViewModel.kt
@@ -0,0 +1,192 @@
+package com.rohitthebest.manageyourrenters.ui.viewModels
+
+import android.app.Application
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.rohitthebest.manageyourrenters.R
+import com.rohitthebest.manageyourrenters.data.ExpenseCategoryAndTheirTotalExpenseAmounts
+import com.rohitthebest.manageyourrenters.others.Constants
+import com.rohitthebest.manageyourrenters.repositories.ExpenseRepository
+import com.rohitthebest.manageyourrenters.utils.WorkingWithDateAndTime
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+import java.util.Calendar
+import javax.inject.Inject
+
+@HiltViewModel
+class ExpenseGraphDataViewModel @Inject constructor(
+    app: Application,
+    private val expenseRepository: ExpenseRepository
+) : AndroidViewModel(app) {
+
+    /*
+        This variable will be used for storing the data in Pair as
+         first: ExpenseCategoryAndTotalAmount
+         second:  Total of all the totalAmounts
+     */
+    private val _expenseGraphData =
+        MutableLiveData<Pair<List<ExpenseCategoryAndTheirTotalExpenseAmounts>, Double>>()
+    val expenseGraphData: LiveData<Pair<List<ExpenseCategoryAndTheirTotalExpenseAmounts>, Double>> get() = _expenseGraphData
+
+    fun getTotalExpenseAmountsWithTheirExpenseCategoryNames() {
+
+        viewModelScope.launch {
+
+            val expenseCategoriesWithTheirAmounts =
+                try {
+                    expenseRepository.getTotalExpenseAmountsWithTheirExpenseCategoryKeys().first()
+                } catch (e: Exception) {
+                    emptyList()
+                }
+
+            val totalAmount = try {
+                expenseRepository.getTotalExpenseAmount().first()
+            } catch (e: NullPointerException) {
+                0.0
+            }
+
+            setValueForExpenseGraphDataPair(expenseCategoriesWithTheirAmounts, totalAmount)
+        }
+    }
+
+    fun getTotalExpenseAmountsWithTheirExpenseCategoryNamesByDateRange(date1: Long, date2: Long) {
+
+        viewModelScope.launch {
+            val expenseCategoriesWithTheirAmounts =
+                try {
+                    expenseRepository.getTotalExpenseAmountsWithTheirExpenseCategoryKeysByDateRange(
+                        date1,
+                        date2
+                    ).first()
+                } catch (e: Exception) {
+                    emptyList()
+                }
+
+            val totalAmount = try {
+                expenseRepository.getTotalExpenseAmountByDateRange(
+                    date1,
+                    date2 + Constants.ONE_DAY_MILLISECONDS
+                ).first()
+            } catch (e: java.lang.NullPointerException) {
+                0.0
+            }
+
+            setValueForExpenseGraphDataPair(expenseCategoriesWithTheirAmounts, totalAmount)
+        }
+    }
+
+    fun getTotalExpenseAmountWithTheirExpenseCategoryNamesForSelectedExpenseCategories(
+        selectedExpenseCategoryKeys: List<String>
+    ) {
+
+        viewModelScope.launch {
+
+            val expenseCategoriesWithTheirAmounts =
+                try {
+                    expenseRepository.getTotalExpenseAmountsWithTheirExpenseCategoryKeysForSelectedExpenseCategories(
+                        selectedExpenseCategoryKeys
+                    ).first()
+                } catch (e: Exception) {
+                    emptyList()
+                }
+
+            val totalAmount =
+                try {
+                    expenseRepository.getTotalExpenseByCategoryKeys(selectedExpenseCategoryKeys)
+                        .first()
+                } catch (e: java.lang.NullPointerException) {
+                    0.0
+                }
+
+            setValueForExpenseGraphDataPair(expenseCategoriesWithTheirAmounts, totalAmount)
+        }
+    }
+
+    fun getTotalExpenseAmountWithTheirExpenseCategoryNamesForSelectedExpenseCategoriesByDateRange(
+        selectedExpenseCategoryKeys: List<String>,
+        date1: Long,
+        date2: Long
+    ) {
+
+        viewModelScope.launch {
+
+            val expenseCategoriesWithTheirAmounts =
+                try {
+                    expenseRepository.getTotalExpenseAmountsWithTheirExpenseCategoryKeysForSelectedExpenseCategoriesByDateRange(
+                        selectedExpenseCategoryKeys, date1, date2
+                    ).first()
+                } catch (e: Exception) {
+                    emptyList()
+                }
+
+            val totalAmount =
+                try {
+                    expenseRepository.getTotalExpenseByCategoryKeysAndDateRange(
+                        selectedExpenseCategoryKeys,
+                        date1,
+                        date2
+                    ).first()
+                } catch (e: NullPointerException) {
+                    0.0
+                }
+
+            setValueForExpenseGraphDataPair(expenseCategoriesWithTheirAmounts, totalAmount)
+        }
+    }
+
+
+    private fun setValueForExpenseGraphDataPair(
+        expenseCategoriesWithTheirAmounts: List<ExpenseCategoryAndTheirTotalExpenseAmounts>,
+        totalAmount: Double
+    ) {
+
+        val expenseGraphDataPair: Pair<List<ExpenseCategoryAndTheirTotalExpenseAmounts>, Double> =
+            Pair(expenseCategoriesWithTheirAmounts, totalAmount)
+
+        _expenseGraphData.value = expenseGraphDataPair
+    }
+
+    private val _expenseOfEachMonth = MutableLiveData<List<Pair<String, Double>>>()
+    val expenseOfEachMonth: LiveData<List<Pair<String, Double>>> get() = _expenseOfEachMonth
+
+    fun getExpensesOfAllMonthsOfYear(year: Int) {
+
+        val context = getApplication<Application>().applicationContext
+
+        viewModelScope.launch {
+
+            val listOfExpensesInEachMonth = ArrayList<Pair<String, Double>>()
+            val monthList = context.resources.getStringArray(R.array.months_short).asList()
+
+            for (i in 1..12) {
+
+                val calendar = Calendar.getInstance()
+                calendar.set(year, i - 1, 2)
+
+                val startAndEndDateInMillis =
+                    WorkingWithDateAndTime.getMillisecondsOfStartAndEndDayOfMonth(
+                        calendar.timeInMillis
+                    )
+
+                val amount = try {
+                    expenseRepository.getTotalExpenseAmountByDateRange(
+                        startAndEndDateInMillis.first,
+                        startAndEndDateInMillis.second + Constants.ONE_DAY_MILLISECONDS
+                    ).first()
+
+                } catch (e: NullPointerException) {
+                    e.printStackTrace()
+                    0.0
+                }
+
+                listOfExpensesInEachMonth.add(Pair(monthList[i - 1], amount))
+            }
+
+            _expenseOfEachMonth.value = listOfExpensesInEachMonth
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseViewModel.kt b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseViewModel.kt
index 853502d7..64c4f452 100644
--- a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseViewModel.kt
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseViewModel.kt
@@ -21,7 +21,6 @@ import com.rohitthebest.manageyourrenters.repositories.ExpenseRepository
 import com.rohitthebest.manageyourrenters.repositories.MonthlyPaymentRepository
 import com.rohitthebest.manageyourrenters.utils.Functions
 import com.rohitthebest.manageyourrenters.utils.Functions.Companion.isInternetAvailable
-import com.rohitthebest.manageyourrenters.utils.WorkingWithDateAndTime
 import com.rohitthebest.manageyourrenters.utils.compareExpenseModel
 import com.rohitthebest.manageyourrenters.utils.deleteDocumentFromFireStore
 import com.rohitthebest.manageyourrenters.utils.updateDocumentOnFireStore
@@ -29,7 +28,6 @@ import com.rohitthebest.manageyourrenters.utils.uploadDocumentToFireStore
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
-import java.util.Calendar
 import java.util.regex.Pattern
 import javax.inject.Inject
 import kotlin.collections.set
@@ -247,52 +245,6 @@ class ExpenseViewModel @Inject constructor(
     fun getExpensesByExpenseCategoryKey(expenseCategoryKey: String) =
         expenseRepository.getExpensesByExpenseCategoryKey(expenseCategoryKey).asLiveData()
 
-    private val _expenseOfEachMonth = MutableLiveData<List<Double>>(emptyList())
-    val expenseOfEachMonth: LiveData<List<Double>> get() = _expenseOfEachMonth
-
-    fun getExpensesOfAllMonthsOfYear(year: Int) {
-
-        viewModelScope.launch {
-
-            val calendars = ArrayList<Calendar>()
-
-            val listOfExpensesInEachMonth = ArrayList<Double>()
-
-            for (i in 1..12) {
-
-                calendars.add(Calendar.getInstance())
-                calendars[i - 1].set(year, i - 1, 2)
-
-                val startAndEndDateInMillis =
-                    WorkingWithDateAndTime.getMillisecondsOfStartAndEndDayOfMonth(
-                        calendars[i - 1].timeInMillis
-                    )
-
-                val amount = try {
-                    expenseRepository.getTotalExpenseAmountByDateRange(
-                        startAndEndDateInMillis.first,
-                        startAndEndDateInMillis.second + Constants.ONE_DAY_MILLISECONDS
-                    ).first()
-
-                } catch (e: NullPointerException) {
-                    e.printStackTrace()
-                    0.0
-                }
-
-                listOfExpensesInEachMonth.add(amount)
-
-                Log.d(
-                    TAG,
-                    "getExpensesOfAllMonthsOfYear: Year : $year, Month : ${
-                        calendars[i - 1].get(Calendar.MONTH)
-                    }, Amount : $amount"
-                )
-            }
-
-            _expenseOfEachMonth.value = listOfExpensesInEachMonth
-        }
-
-    }
 
     // issue #78
     private val _expensesByPaymentMethods = MutableLiveData<List<Expense>>(emptyList())
@@ -429,4 +381,5 @@ class ExpenseViewModel @Inject constructor(
     ) = expenseRepository.getExpenseByCategoryKeysAndDateRange(expenseCategoryKeys, date1, date2)
         .asLiveData()
 
+    fun isAnyExpenseAdded() = expenseRepository.isAnyExpenseAdded().asLiveData()
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1a64de7c..84610959 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -419,6 +419,10 @@
     <string name="savings_growth">Savings Growth</string>
     <string name="renter_dues">Renter dues</string>
     <string name="revenue_all_time">Revenue - All Time</string>
+    <string name="minimum_two_categories_needs_to_be_selected">Minimum two categories needs to be selected</string>
+    <string name="no_data_available">No Data available!!!</string>
+    <string name="month">Month</string>
+    <string name="monthly_expense_for_the_year">Monthly expense for the year : %1$s</string>
 
     <string-array name="interest_time_schedule">
 

From d6e5b00bd422dac797f991db83f7b280f5ce069c Mon Sep 17 00:00:00 2001
From: Rohit <rkumar8092378845@gmail.com>
Date: Fri, 28 Jul 2023 18:48:03 +0530
Subject: [PATCH 2/3] - add new graph in expense graph     - individual
 category graph

#109
---
 .../rohitthebest/manageyourrenters/todo.txt   |   4 +-
 .../trackMoney/expense/GraphFragment.kt       |  19 ++++
 .../expense/MonthlyGraphFragment.kt           | 102 ++++++++++++++++--
 .../viewModels/ExpenseGraphDataViewModel.kt   |  43 ++++++++
 .../res/layout/fragment_monthly_graph.xml     |  79 ++++++++++++--
 app/src/main/res/menu/graph_menu.xml          |   3 +
 .../res/navigation/track_money_navigation.xml |   7 +-
 app/src/main/res/values/strings.xml           |   3 +
 8 files changed, 235 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/todo.txt b/app/src/main/java/com/rohitthebest/manageyourrenters/todo.txt
index 0b0781eb..dad63c02 100644
--- a/app/src/main/java/com/rohitthebest/manageyourrenters/todo.txt
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/todo.txt
@@ -1,8 +1,8 @@
 - remove the anyChart library and replace with MPChart
-- add new graph in expense graph
-    - individual category graph
 - add option to filter data in graph using payment methods (#107)
 
 
 // done
 - all the data should be created in viewModels and not in the fragments
+- add new graph in expense graph
+    - individual category graph
\ No newline at end of file
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/GraphFragment.kt b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/GraphFragment.kt
index edab1515..807be395 100644
--- a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/GraphFragment.kt
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/GraphFragment.kt
@@ -199,6 +199,25 @@ class GraphFragment : Fragment(R.layout.fragment_graph) {
             true
         }
 
+        binding.toolbar.menu.findItem(R.id.menu_category_graph).setOnMenuItemClickListener {
+
+            expenseViewModel.isAnyExpenseAdded().observe(viewLifecycleOwner) {
+
+                if (it) {
+                    val action = GraphFragmentDirections.actionGraphFragmentToMonthlyGraphFragment(
+                        true
+                    )
+                    findNavController().navigate(action)
+                } else {
+
+                    showToast(requireContext(), getString(R.string.no_expense_added))
+                }
+            }
+
+            true
+        }
+
+
         binding.toolbar.menu.findItem(R.id.menu_share_expense_graph_sc).setOnMenuItemClickListener {
 
             binding.toolbar.hide()
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/MonthlyGraphFragment.kt b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/MonthlyGraphFragment.kt
index b06ee4d3..b4fd1dd8 100644
--- a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/MonthlyGraphFragment.kt
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/MonthlyGraphFragment.kt
@@ -2,6 +2,7 @@ package com.rohitthebest.manageyourrenters.ui.fragments.trackMoney.expense
 
 import android.os.Bundle
 import android.view.View
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
@@ -12,7 +13,9 @@ import com.anychart.charts.Cartesian
 import com.anychart.enums.HoverMode
 import com.anychart.enums.TooltipPositionMode
 import com.rohitthebest.manageyourrenters.R
+import com.rohitthebest.manageyourrenters.database.model.ExpenseCategory
 import com.rohitthebest.manageyourrenters.databinding.FragmentMonthlyGraphBinding
+import com.rohitthebest.manageyourrenters.ui.viewModels.ExpenseCategoryViewModel
 import com.rohitthebest.manageyourrenters.ui.viewModels.ExpenseGraphDataViewModel
 import com.rohitthebest.manageyourrenters.ui.viewModels.ExpenseViewModel
 import com.rohitthebest.manageyourrenters.utils.WorkingWithDateAndTime
@@ -31,20 +34,22 @@ class MonthlyGraphFragment : Fragment(R.layout.fragment_monthly_graph) {
 
     private val expenseGraphDataViewModel by viewModels<ExpenseGraphDataViewModel>()
     private val expenseViewModel by viewModels<ExpenseViewModel>()
+    private val expenseCategoryViewModel by viewModels<ExpenseCategoryViewModel>()
 
     private lateinit var cartesian: Cartesian
     private var selectedYear = 2020
 
+    private lateinit var expenseCategories: List<ExpenseCategory>
+    private lateinit var selectedCategory: ExpenseCategory
+
+    private var isCategoryEnabled = false
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         _binding = FragmentMonthlyGraphBinding.bind(view)
 
-        observeExpenseOfEachMonth()
-
+        getMessage()
         setUpChart()
-        getStartAndEndYear()
-
-        loadData()
 
         binding.toolbar.setNavigationOnClickListener {
 
@@ -52,6 +57,37 @@ class MonthlyGraphFragment : Fragment(R.layout.fragment_monthly_graph) {
         }
     }
 
+    private fun getMessage() {
+
+        if (!arguments?.isEmpty!!) {
+
+            val args = arguments?.let {
+
+                MonthlyGraphFragmentArgs.fromBundle(it)
+            }
+
+            isCategoryEnabled = args?.isCategoryExpenseEnabled ?: false
+            binding.mcvCategories.isVisible = isCategoryEnabled
+
+            if (isCategoryEnabled) {
+                observeAllExpenseCategories()
+            }
+            observeExpenseOfEachMonth()
+            getStartAndEndYear()
+        }
+    }
+
+    private fun observeAllExpenseCategories() {
+
+        expenseCategoryViewModel.getAllExpenseCategories().observe(viewLifecycleOwner) {
+            expenseCategories = it
+
+            if (it.isNotEmpty()) {
+                initCategorySpinner()
+            }
+        }
+    }
+
     private fun loadData() {
         expenseGraphDataViewModel.getExpensesOfAllMonthsOfYear(selectedYear)
     }
@@ -70,12 +106,23 @@ class MonthlyGraphFragment : Fragment(R.layout.fragment_monthly_graph) {
 
                 delay(500)
 
-                cartesian.title(
-                    getString(
-                        R.string.monthly_expense_for_the_year,
-                        selectedYear.toString()
+                if (isCategoryEnabled) {
+                    cartesian.title(
+                        getString(
+                            R.string.monthly_expense_for_the_year_and_category,
+                            selectedYear.toString(), selectedCategory.categoryName
+                        )
                     )
-                )
+                } else {
+
+                    cartesian.title(
+                        getString(
+                            R.string.monthly_expense_for_the_year,
+                            selectedYear.toString()
+                        )
+                    )
+                }
+
                 cartesian.data(data)
             }
         }
@@ -133,11 +180,44 @@ class MonthlyGraphFragment : Fragment(R.layout.fragment_monthly_graph) {
             { position ->
 
                 selectedYear = yearList[position]
-                loadData()
+                if (isCategoryEnabled) {
+                    loadDataForSelectedCategory()
+                } else {
+                    loadData()
+                }
             }, {}
         )
     }
 
+    private fun initCategorySpinner() {
+
+        if (this::expenseCategories.isInitialized) {
+
+            binding.mcvCategories.isVisible = expenseCategories.isNotEmpty()
+
+            if (expenseCategories.isNotEmpty()) {
+
+                binding.categorySpinner.setListToSpinner(
+                    requireContext(),
+                    expenseCategories.map { it.categoryName },
+                    { position ->
+
+                        selectedCategory = expenseCategories[position]
+                        loadDataForSelectedCategory()
+                    }, {}
+                )
+            }
+        }
+    }
+
+    private fun loadDataForSelectedCategory() {
+        expenseGraphDataViewModel.getExpensesOfAllMonthsOfYearForSelectedCategory(
+            selectedYear,
+            selectedCategory.key
+        )
+    }
+
+
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseGraphDataViewModel.kt b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseGraphDataViewModel.kt
index e8586564..df5faf70 100644
--- a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseGraphDataViewModel.kt
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseGraphDataViewModel.kt
@@ -189,4 +189,47 @@ class ExpenseGraphDataViewModel @Inject constructor(
         }
 
     }
+
+    fun getExpensesOfAllMonthsOfYearForSelectedCategory(
+        year: Int,
+        selectedExpenseCategoryKey: String
+    ) {
+
+        val context = getApplication<Application>().applicationContext
+
+        viewModelScope.launch {
+
+            val listOfExpensesInEachMonth = ArrayList<Pair<String, Double>>()
+            val monthList = context.resources.getStringArray(R.array.months_short).asList()
+
+            for (i in 1..12) {
+
+                val calendar = Calendar.getInstance()
+                calendar.set(year, i - 1, 2)
+
+                val startAndEndDateInMillis =
+                    WorkingWithDateAndTime.getMillisecondsOfStartAndEndDayOfMonth(
+                        calendar.timeInMillis
+                    )
+
+                val amount = try {
+                    expenseRepository.getTotalExpenseAmountByCategoryKeyAndDateRange(
+                        selectedExpenseCategoryKey,
+                        startAndEndDateInMillis.first,
+                        startAndEndDateInMillis.second + Constants.ONE_DAY_MILLISECONDS
+                    ).first()
+
+                } catch (e: NullPointerException) {
+                    e.printStackTrace()
+                    0.0
+                }
+
+                listOfExpensesInEachMonth.add(Pair(monthList[i - 1], amount))
+            }
+
+            _expenseOfEachMonth.value = listOfExpensesInEachMonth
+        }
+
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_monthly_graph.xml b/app/src/main/res/layout/fragment_monthly_graph.xml
index 59479a89..0dbfd4d6 100644
--- a/app/src/main/res/layout/fragment_monthly_graph.xml
+++ b/app/src/main/res/layout/fragment_monthly_graph.xml
@@ -24,24 +24,81 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <RelativeLayout
-        android:id="@+id/relativeLayout"
+    <LinearLayout
+        android:id="@+id/ll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
 
-        <Spinner
-            android:id="@+id/year_spinner"
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/mcv_years"
             android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_marginStart="24dp"
-            android:layout_marginEnd="24dp"
-            android:contentDescription="@string/select_from_year"
-            android:minHeight="48dp" />
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            android:layout_weight="1"
+            app:cardCornerRadius="10dp"
+            app:cardElevation="10dp"
+            app:strokeColor="@color/color_green"
+            app:strokeWidth="2dp">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <Spinner
+                    android:id="@+id/year_spinner"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:contentDescription="@string/select_from_year"
+                    android:minHeight="48dp" />
+
+            </RelativeLayout>
+
+
+        </com.google.android.material.card.MaterialCardView>
+
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/mcv_categories"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            android:layout_weight="1"
+            android:visibility="visible"
+            app:cardCornerRadius="10dp"
+            app:cardElevation="10dp"
+            app:strokeColor="@color/color_green"
+            app:strokeWidth="2dp">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <Spinner
+                    android:id="@+id/category_spinner"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:contentDescription="@string/select_from_category"
+                    android:minHeight="48dp" />
+
+            </RelativeLayout>
+
+
+        </com.google.android.material.card.MaterialCardView>
+
+
+    </LinearLayout>
 
-    </RelativeLayout>
 
     <com.anychart.AnyChartView
         android:id="@+id/chart"
@@ -52,7 +109,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/relativeLayout" />
+        app:layout_constraintTop_toBottomOf="@+id/ll" />
 
     <ProgressBar
         android:id="@+id/progressBar"
diff --git a/app/src/main/res/menu/graph_menu.xml b/app/src/main/res/menu/graph_menu.xml
index 3e6027ce..28f8056f 100644
--- a/app/src/main/res/menu/graph_menu.xml
+++ b/app/src/main/res/menu/graph_menu.xml
@@ -10,6 +10,9 @@
                 android:id="@+id/menu_monthly_graph"
                 android:title="@string/monthly_graph" />
 
+            <item
+                android:id="@+id/menu_category_graph"
+                android:title="@string/category_graph" />
         </menu>
 
     </item>
diff --git a/app/src/main/res/navigation/track_money_navigation.xml b/app/src/main/res/navigation/track_money_navigation.xml
index 0ca6a2e7..40175e8c 100644
--- a/app/src/main/res/navigation/track_money_navigation.xml
+++ b/app/src/main/res/navigation/track_money_navigation.xml
@@ -307,7 +307,12 @@
         android:id="@+id/monthlyGraphFragment"
         android:name="com.rohitthebest.manageyourrenters.ui.fragments.trackMoney.expense.MonthlyGraphFragment"
         android:label="MonthlyGraphFragment"
-        tools:layout="@layout/fragment_monthly_graph" />
+        tools:layout="@layout/fragment_monthly_graph">
+        <argument
+            android:name="isCategoryExpenseEnabled"
+            android:defaultValue="false"
+            app:argType="boolean" />
+    </fragment>
     <dialog
         android:id="@+id/showExpenseBottomSheetFragment"
         android:name="com.rohitthebest.manageyourrenters.ui.fragments.trackMoney.expense.ShowExpenseBottomSheetFragment"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 84610959..38c19f0f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -423,6 +423,9 @@
     <string name="no_data_available">No Data available!!!</string>
     <string name="month">Month</string>
     <string name="monthly_expense_for_the_year">Monthly expense for the year : %1$s</string>
+    <string name="monthly_expense_for_the_year_and_category">Monthly expense for the year: %1$s, category: %2$s</string>
+    <string name="category_graph">Category graph</string>
+    <string name="select_from_category">Select categories spinner</string>
 
     <string-array name="interest_time_schedule">
 

From e0ab073184206aa1a5acba48bc54ba5f1d096c6b Mon Sep 17 00:00:00 2001
From: Rohit <rkumar8092378845@gmail.com>
Date: Tue, 1 Aug 2023 13:23:39 +0530
Subject: [PATCH 3/3] - add option to filter data in graph using payment
 methods (#107)

#107
---
 .../budgetAndIncome/BudgetRVAdapter.kt        |  20 +-
 .../database/dao/ExpenseDAO.kt                |  33 +++
 .../repositories/ExpenseRepository.kt         |  14 +-
 .../rohitthebest/manageyourrenters/todo.txt   |   7 +-
 .../trackMoney/expense/GraphFragment.kt       | 242 +++++++++++++-----
 .../expense/MonthlyGraphFragment.kt           |   6 +
 .../expense/ShowExpenseBottomSheetFragment.kt |  57 +++--
 .../viewModels/ExpenseGraphDataViewModel.kt   |  97 +++++--
 .../ui/viewModels/ExpenseViewModel.kt         |   2 +-
 .../manageyourrenters/utils/Functions.kt      |   6 +-
 .../baseline_filter_list_colored_24.xml       |   2 +-
 app/src/main/res/layout/fragment_graph.xml    |  16 ++
 app/src/main/res/menu/graph_menu.xml          |  46 ++--
 app/src/main/res/values/strings.xml           |   7 +-
 14 files changed, 404 insertions(+), 151 deletions(-)

diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/adapters/trackMoneyAdapters/expenseAdapters/budgetAndIncome/BudgetRVAdapter.kt b/app/src/main/java/com/rohitthebest/manageyourrenters/adapters/trackMoneyAdapters/expenseAdapters/budgetAndIncome/BudgetRVAdapter.kt
index 46d4fd3e..667d4b30 100644
--- a/app/src/main/java/com/rohitthebest/manageyourrenters/adapters/trackMoneyAdapters/expenseAdapters/budgetAndIncome/BudgetRVAdapter.kt
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/adapters/trackMoneyAdapters/expenseAdapters/budgetAndIncome/BudgetRVAdapter.kt
@@ -83,17 +83,18 @@ class BudgetRVAdapter : ListAdapter<Budget, BudgetRVAdapter.BudgetViewHolder>(Di
                         myBudget.budgetLimit.format(2)
                     )
 
-                    //Log.d(TAG, "setData: budget: $myBudget")
-
                     val numberOfDaysLeftInMonth =
                         WorkingWithDateAndTime.getNumberOfDaysLeftInAnyMonth(
                             myBudget.month, myBudget.year
                         )
 
-                    //Log.d(TAG, "setData: numberOfDaysLeftInMonth: $numberOfDaysLeftInMonth")
+                    Log.d(TAG, "setData: numberOfDaysLeftInMonth: $numberOfDaysLeftInMonth")
 
-                    var perDayExpense =
+                    var perDayExpense = if (numberOfDaysLeftInMonth != 0) {
                         (myBudget.budgetLimit - myBudget.currentExpenseAmount) / numberOfDaysLeftInMonth
+                    } else {
+                        0.0
+                    }
 
                     if (perDayExpense < 0) perDayExpense = 0.0
 
@@ -113,17 +114,6 @@ class BudgetRVAdapter : ListAdapter<Budget, BudgetRVAdapter.BudgetViewHolder>(Di
 
                     changeProgressColorsByProgressPercent(progressInPercent)
 
-                    Log.d(
-                        TAG,
-                        "setData: ${myBudget.categoryName} - percent: $progressInPercent"
-                    )
-                    Log.d(
-                        TAG,
-                        "setData: ${myBudget.categoryName} - progressDrawable: ${
-                            changeProgressColorsByProgressPercent(progressInPercent).hashCode()
-                        }"
-                    )
-
                     baProgressBar.max = myBudget.budgetLimit.toInt()
 
                     if (myBudget.currentExpenseAmount > myBudget.budgetLimit) {
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/database/dao/ExpenseDAO.kt b/app/src/main/java/com/rohitthebest/manageyourrenters/database/dao/ExpenseDAO.kt
index 06d8858f..8ff5e7ba 100644
--- a/app/src/main/java/com/rohitthebest/manageyourrenters/database/dao/ExpenseDAO.kt
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/database/dao/ExpenseDAO.kt
@@ -122,6 +122,21 @@ interface ExpenseDAO {
     )
     fun getTotalExpenseAmountsWithTheirExpenseCategoryKeys(): Flow<List<ExpenseCategoryAndTheirTotalExpenseAmounts>>
 
+    @Query(
+        "SELECT expense_category_table.`key` as expenseCategoryKey, " +
+                "expense_category_table.categoryName AS categoryName, " +
+                "SUM(expense_table.amount) AS totalAmount " +
+                "FROM expense_table " +
+                "INNER JOIN expense_category_table " +
+                "ON expense_table.categoryKey = expense_category_table.`key` " +
+                "WHERE expense_table.`key` in (:expenseKeys) " +
+                "GROUP BY expense_category_table.`key`"
+    )
+    fun getTotalExpenseAmountsWithTheirExpenseCategoryKeysByListOfExpenseKeys(
+        expenseKeys: List<String>
+    ): Flow<List<ExpenseCategoryAndTheirTotalExpenseAmounts>>
+
+
     @Query(
         "SELECT expense_category_table.`key` AS expenseCategoryKey, " +
                 "expense_category_table.categoryName AS categoryName, " +
@@ -137,6 +152,24 @@ interface ExpenseDAO {
         date2: Long
     ): Flow<List<ExpenseCategoryAndTheirTotalExpenseAmounts>>
 
+    @Query(
+        "SELECT expense_category_table.`key` AS expenseCategoryKey, " +
+                "expense_category_table.categoryName AS categoryName, " +
+                "SUM(expense_table.amount) AS totalAmount " +
+                "FROM expense_table " +
+                "INNER JOIN expense_category_table " +
+                "ON expense_table.categoryKey = expense_category_table.`key` " +
+                "WHERE expense_table.created BETWEEN :date1 AND :date2 " +
+                "AND expense_table.`key` IN (:expenseKeys) " +
+                "GROUP BY expense_category_table.`key`"
+    )
+    fun getTotalExpenseAmountsWithTheirExpenseCategoryKeysByDateRangeAndByListOfExpenseKeys(
+        date1: Long,
+        date2: Long,
+        expenseKeys: List<String>
+    ): Flow<List<ExpenseCategoryAndTheirTotalExpenseAmounts>>
+
+
     @Query(
         "SELECT expense_category_table.`key` AS expenseCategoryKey, " +
                 "expense_category_table.categoryName AS categoryName, " +
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/repositories/ExpenseRepository.kt b/app/src/main/java/com/rohitthebest/manageyourrenters/repositories/ExpenseRepository.kt
index 8e0d192a..763f5ceb 100644
--- a/app/src/main/java/com/rohitthebest/manageyourrenters/repositories/ExpenseRepository.kt
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/repositories/ExpenseRepository.kt
@@ -101,9 +101,21 @@ class ExpenseRepository @Inject constructor(
     fun getTotalExpenseAmountsWithTheirExpenseCategoryKeys() =
         dao.getTotalExpenseAmountsWithTheirExpenseCategoryKeys()
 
+    fun getTotalExpenseAmountsWithTheirExpenseCategoryKeysByListOfExpenseKeys(
+        expenseKeys: List<String>
+    ) = dao.getTotalExpenseAmountsWithTheirExpenseCategoryKeysByListOfExpenseKeys(expenseKeys)
+
     fun getTotalExpenseAmountsWithTheirExpenseCategoryKeysByDateRange(date1: Long, date2: Long) =
         dao.getTotalExpenseAmountsWithTheirExpenseCategoryKeysByDateRange(date1, date2)
 
+    fun getTotalExpenseAmountsWithTheirExpenseCategoryKeysByDateRangeAndByListOfExpenseKeys(
+        date1: Long,
+        date2: Long,
+        expenseKeys: List<String>
+    ) = dao.getTotalExpenseAmountsWithTheirExpenseCategoryKeysByDateRangeAndByListOfExpenseKeys(
+        date1, date2, expenseKeys
+    )
+
     fun getTotalExpenseAmountsWithTheirExpenseCategoryKeysForSelectedExpenseCategories(
         selectedExpenseCategories: List<String>
     ) = dao.getTotalExpenseAmountsWithTheirExpenseCategoryKeysForSelectedExpenseCategories(
@@ -124,7 +136,7 @@ class ExpenseRepository @Inject constructor(
     fun isAnyExpenseAdded() = dao.isAnyExpenseAdded()
 
     fun applyExpenseFilterByPaymentMethods(
-        paymentMethodKeys: List<String>,
+        paymentMethodKeys: List<String?>,
         expenses: List<Expense>
     ): List<Expense> {
 
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/todo.txt b/app/src/main/java/com/rohitthebest/manageyourrenters/todo.txt
index dad63c02..9e7f144a 100644
--- a/app/src/main/java/com/rohitthebest/manageyourrenters/todo.txt
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/todo.txt
@@ -1,8 +1,5 @@
-- remove the anyChart library and replace with MPChart
-- add option to filter data in graph using payment methods (#107)
-
-
 // done
 - all the data should be created in viewModels and not in the fragments
 - add new graph in expense graph
-    - individual category graph
\ No newline at end of file
+    - individual category graph
+- add option to filter data in graph using payment methods (#107)
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/GraphFragment.kt b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/GraphFragment.kt
index 807be395..ce3f5d7a 100644
--- a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/GraphFragment.kt
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/GraphFragment.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.util.Log
 import android.view.View
 import android.widget.Toast
+import androidx.core.content.ContextCompat
 import androidx.core.util.Pair
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
@@ -19,10 +20,13 @@ import com.anychart.enums.LegendLayout
 import com.rohitthebest.manageyourrenters.R
 import com.rohitthebest.manageyourrenters.data.CustomDateRange
 import com.rohitthebest.manageyourrenters.data.ShowExpenseBottomSheetTagsEnum
+import com.rohitthebest.manageyourrenters.data.filter.ExpenseFilterDto
 import com.rohitthebest.manageyourrenters.databinding.FragmentGraphBinding
+import com.rohitthebest.manageyourrenters.others.Constants
 import com.rohitthebest.manageyourrenters.others.Constants.CUSTOM_DATE_RANGE_FOR_GRAPH_FRAGMENT_SHARED_PREF_KEY
 import com.rohitthebest.manageyourrenters.others.Constants.CUSTOM_DATE_RANGE_FOR_GRAPH_FRAGMENT_SHARED_PREF_NAME
 import com.rohitthebest.manageyourrenters.others.Constants.ONE_DAY_MILLISECONDS
+import com.rohitthebest.manageyourrenters.ui.fragments.trackMoney.ShowPaymentMethodSelectorDialogFragment
 import com.rohitthebest.manageyourrenters.ui.viewModels.ExpenseCategoryViewModel
 import com.rohitthebest.manageyourrenters.ui.viewModels.ExpenseGraphDataViewModel
 import com.rohitthebest.manageyourrenters.ui.viewModels.ExpenseViewModel
@@ -37,7 +41,8 @@ import kotlinx.coroutines.launch
 private const val TAG = "GraphFragment"
 
 @AndroidEntryPoint
-class GraphFragment : Fragment(R.layout.fragment_graph) {
+class GraphFragment : Fragment(R.layout.fragment_graph),
+    ShowPaymentMethodSelectorDialogFragment.OnClickListener {
 
     private var _binding: FragmentGraphBinding? = null
     private val binding get() = _binding!!
@@ -53,6 +58,8 @@ class GraphFragment : Fragment(R.layout.fragment_graph) {
 
     private var selectedCustomDateRangeMenu: CustomDateRange? = CustomDateRange.ALL_TIME
 
+    private var expenseFilterDto: ExpenseFilterDto? = null
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         _binding = FragmentGraphBinding.bind(view)
@@ -78,7 +85,7 @@ class GraphFragment : Fragment(R.layout.fragment_graph) {
                 val expenseCategoryNameAndTheirTotalList = it.first
                 val total = it.second
 
-                pie.legend().title("Total expense : ${total.format(3)}")
+                pie.legend().title(getString(R.string.total_expense, total.format(3)))
 
                 val data = ArrayList<DataEntry>()
 
@@ -96,24 +103,31 @@ class GraphFragment : Fragment(R.layout.fragment_graph) {
 
                     delay(500)
 
-                    Log.d(TAG, "getAllExpenseCategory: $data")
+                    Log.d(TAG, "getAllExpenseCategory: ${data.size}")
 
                     if (data.isNotEmpty()) {
 
                         binding.chart.show()
+                        binding.noDataTV.hide()
                         pie.data(data)
-                        //binding.chart.setChart(pie)
                     } else {
 
-                        binding.chart.hide()
-                        showToast(requireContext(), getString(R.string.no_data_available))
+                        handleUIForNoDataAvailable()
                     }
-
                 }
+            } else {
+                handleUIForNoDataAvailable()
             }
         }
     }
 
+    private fun handleUIForNoDataAvailable() {
+
+        binding.chart.hide()
+        binding.noDataTV.show()
+        showToast(requireContext(), getString(R.string.no_data_available))
+    }
+
     private fun loadCustomDateRangeValueFromSharedPreference() {
 
         selectedCustomDateRangeMenu =
@@ -140,7 +154,7 @@ class GraphFragment : Fragment(R.layout.fragment_graph) {
         binding.chart.setProgressBar(binding.progressBar)
 
         pie.title().enabled(true)
-        pie.title("All time")
+        pie.title(getString(R.string.all_time))
         //pie.title("Expenses on each category")
 
         pie.labels().position("outside")
@@ -166,107 +180,193 @@ class GraphFragment : Fragment(R.layout.fragment_graph) {
 
         binding.toolbar.menu.findItem(R.id.menu_deep_analyze_expense).setOnMenuItemClickListener {
 
-            expenseCategoryViewModel.getAllExpenseCategoriesByLimit(2).observe(viewLifecycleOwner) {
+            handleCategoryCompareGraph()
+            true
+        }
 
-                if (it.size >= 2) {
+        binding.toolbar.menu.findItem(R.id.menu_monthly_graph).setOnMenuItemClickListener {
 
-                    findNavController().navigate(R.id.action_graphFragment_to_deepAnalyzeExpenseFragment)
-                } else {
+            handleMonthlyGraphMenu()
+            true
+        }
 
-                    showToast(
-                        requireContext(),
-                        getString(R.string.depp_analyze_error_message),
-                        Toast.LENGTH_LONG
-                    )
-                }
-            }
+        binding.toolbar.menu.findItem(R.id.menu_category_graph).setOnMenuItemClickListener {
 
+            handleCategoryGraph()
             true
         }
 
-        binding.toolbar.menu.findItem(R.id.menu_monthly_graph).setOnMenuItemClickListener {
 
-            expenseViewModel.isAnyExpenseAdded().observe(viewLifecycleOwner) {
+        binding.toolbar.menu.findItem(R.id.menu_share_expense_graph_sc).setOnMenuItemClickListener {
 
-                if (it) {
-                    findNavController().navigate(R.id.action_graphFragment_to_monthlyGraphFragment)
-                } else {
+            handleShareExpenseGraphScreenshotMenu()
+            true
+        }
 
-                    showToast(requireContext(), getString(R.string.no_expense_added))
-                }
-            }
+        binding.toolbar.menu.findItem(R.id.menu_save_expense_graph_sc).setOnMenuItemClickListener {
 
+            handleSaveExpenseGraphScreenshotMenu()
             true
         }
 
-        binding.toolbar.menu.findItem(R.id.menu_category_graph).setOnMenuItemClickListener {
+        binding.toolbar.menu.findItem(R.id.menu_filter_expense_graph).setOnMenuItemClickListener {
+
+            handleFilterExpenseGraphMenu()
+            true
+        }
 
-            expenseViewModel.isAnyExpenseAdded().observe(viewLifecycleOwner) {
+        binding.dateRangeMenuBtn.setOnClickListener { view ->
+
+            showMenuForSelectingCustomTime(view)
+        }
+
+        binding.dateRangeCv.setOnClickListener {
+
+            val action =
+                GraphFragmentDirections.actionGraphFragmentToShowExpenseBottomSheetFragment(
+                    dateRangeMessage = if (selectedCustomDateRangeMenu == CustomDateRange.ALL_TIME) CustomDateRange.ALL_TIME else CustomDateRange.CUSTOM_DATE_RANGE,
+                    date1 = d1,
+                    date2 = d2,
+                    callingFragementTag = ShowExpenseBottomSheetTagsEnum.GRAPH_FRAGMENT,
+                    paymentMethodKey = if (expenseFilterDto != null && !expenseFilterDto?.paymentMethods.isNullOrEmpty()) {
+                        convertStringListToJSON(expenseFilterDto?.paymentMethods ?: emptyList())
+                    } else {
+                        null
+                    }
+                )
+            findNavController().navigate(action)
+        }
+    }
+
+    private fun handleFilterExpenseGraphMenu() {
+
+        //showing Payment Method Selector Dialog
+
+        requireActivity().supportFragmentManager.let { fragmentManager ->
+
+            val bundle = Bundle()
+            bundle.putString(
+                Constants.EXPENSE_FILTER_KEY,
+                if (expenseFilterDto == null) "" else expenseFilterDto.convertToJsonString()
+            )
+
+            ShowPaymentMethodSelectorDialogFragment.newInstance(
+                bundle
+            ).apply {
+                show(fragmentManager, TAG)
+            }.setOnClickListener(this)
+        }
+
+    }
+
+    override fun onFilterApply(selectedPaymentMethods: List<String>?) {
+
+        binding.toolbar.menu.findItem(R.id.menu_filter_expense_graph)
+            .apply {
+
+                if (selectedPaymentMethods.isNullOrEmpty()) {
+                    this.icon =
+                        ContextCompat.getDrawable(
+                            requireContext(),
+                            R.drawable.baseline_filter_list_24
+                        )
+
+                    expenseFilterDto = null
 
-                if (it) {
-                    val action = GraphFragmentDirections.actionGraphFragmentToMonthlyGraphFragment(
-                        true
-                    )
-                    findNavController().navigate(action)
                 } else {
+                    this.icon = ContextCompat.getDrawable(
+                        requireContext(),
+                        R.drawable.baseline_filter_list_colored_24
+                    )
 
-                    showToast(requireContext(), getString(R.string.no_expense_added))
+                    expenseFilterDto = ExpenseFilterDto()
+                    expenseFilterDto!!.isPaymentMethodEnabled = true
+                    expenseFilterDto!!.paymentMethods = selectedPaymentMethods
                 }
             }
 
-            true
+        if (selectedCustomDateRangeMenu == CustomDateRange.ALL_TIME) {
+            // making this value to false, so it will enter the ALL_TIME case in handleDateRangeSelectionMenu function
+            isAllTimeSelected = false
         }
 
+        handleDateRangeSelectionMenu(selectedCustomDateRangeMenu ?: CustomDateRange.ALL_TIME)
+    }
 
-        binding.toolbar.menu.findItem(R.id.menu_share_expense_graph_sc).setOnMenuItemClickListener {
+    private fun handleSaveExpenseGraphScreenshotMenu() {
 
-            binding.toolbar.hide()
+        binding.toolbar.hide()
 
-            val bitmap = binding.root.loadBitmap()
+        val bitmap = binding.root.loadBitmap()
 
-            binding.toolbar.show()
+        binding.toolbar.show()
 
-            lifecycleScope.launch {
+        bitmap.saveToStorage(requireContext(), "${getUid()}_expense_graph")
 
-                saveBitmapToCacheDirectoryAndShare(requireActivity(), bitmap)
-            }
+        showToast(requireContext(), getString(R.string.screenshot_saved_to_phone_storage))
+    }
 
-            true
-        }
+    private fun handleShareExpenseGraphScreenshotMenu() {
 
-        binding.toolbar.menu.findItem(R.id.menu_save_expense_graph_sc).setOnMenuItemClickListener {
+        binding.toolbar.hide()
+
+        val bitmap = binding.root.loadBitmap()
 
-            binding.toolbar.hide()
+        binding.toolbar.show()
 
-            val bitmap = binding.root.loadBitmap()
+        lifecycleScope.launch {
 
-            binding.toolbar.show()
+            saveBitmapToCacheDirectoryAndShare(requireActivity(), bitmap)
+        }
+    }
 
-            bitmap.saveToStorage(requireContext(), "${getUid()}_expense_graph")
+    private fun handleCategoryGraph() {
 
-            showToast(requireContext(), "Screenshot saved to phone storage")
+        expenseViewModel.isAnyExpenseAdded().observe(viewLifecycleOwner) {
 
-            true
+            if (it) {
+                val action = GraphFragmentDirections.actionGraphFragmentToMonthlyGraphFragment(
+                    true
+                )
+                findNavController().navigate(action)
+            } else {
+
+                showToast(requireContext(), getString(R.string.no_expense_added))
+            }
         }
 
-        binding.dateRangeMenuBtn.setOnClickListener { view ->
+    }
 
-            showMenuForSelectingCustomTime(view)
+    private fun handleMonthlyGraphMenu() {
+
+        expenseViewModel.isAnyExpenseAdded().observe(viewLifecycleOwner) {
+
+            if (it) {
+                findNavController().navigate(R.id.action_graphFragment_to_monthlyGraphFragment)
+            } else {
 
+                showToast(requireContext(), getString(R.string.no_expense_added))
+            }
         }
+    }
 
-        binding.dateRangeCv.setOnClickListener {
+    private fun handleCategoryCompareGraph() {
 
-            val action =
-                GraphFragmentDirections.actionGraphFragmentToShowExpenseBottomSheetFragment(
-                    dateRangeMessage = if (selectedCustomDateRangeMenu == CustomDateRange.ALL_TIME) CustomDateRange.ALL_TIME else CustomDateRange.CUSTOM_DATE_RANGE,
-                    date1 = d1,
-                    date2 = d2,
-                    callingFragementTag = ShowExpenseBottomSheetTagsEnum.GRAPH_FRAGMENT,
-                    paymentMethodKey = null
+        expenseCategoryViewModel.getAllExpenseCategoriesByLimit(2).observe(viewLifecycleOwner) {
+
+            if (it.size >= 2) {
+
+                findNavController().navigate(R.id.action_graphFragment_to_deepAnalyzeExpenseFragment)
+            } else {
+
+                showToast(
+                    requireContext(),
+                    getString(R.string.depp_analyze_error_message),
+                    Toast.LENGTH_LONG
                 )
-            findNavController().navigate(action)
+            }
         }
+
     }
 
     private fun showMenuForSelectingCustomTime(view: View) {
@@ -294,7 +394,14 @@ class GraphFragment : Fragment(R.layout.fragment_graph) {
 
                     isAllTimeSelected = true
 
-                    expenseGraphDataViewModel.getTotalExpenseAmountsWithTheirExpenseCategoryNames()
+                    Log.d(
+                        TAG,
+                        "handleDateRangeSelectionMenu: paymentMethods: ${expenseFilterDto?.paymentMethods}"
+                    )
+
+                    expenseGraphDataViewModel.getTotalExpenseAmountsWithTheirExpenseCategoryNames(
+                        expenseFilterDto?.paymentMethods ?: emptyList()
+                    )
 
                     changeSelectionUI()
 
@@ -394,8 +501,9 @@ class GraphFragment : Fragment(R.layout.fragment_graph) {
             changeSelectionUI()
 
             expenseGraphDataViewModel.getTotalExpenseAmountsWithTheirExpenseCategoryNamesByDateRange(
-                d1,
-                d2
+                date1 = d1,
+                date2 = d2 + ONE_DAY_MILLISECONDS,
+                paymentMethodKeys = expenseFilterDto?.paymentMethods ?: emptyList()
             )
         }
     }
@@ -405,7 +513,7 @@ class GraphFragment : Fragment(R.layout.fragment_graph) {
 
         if (isAllTimeSelected) {
 
-            binding.dateRangeTv.text = "All time"
+            binding.dateRangeTv.text = getString(R.string.all_time)
         } else {
 
             binding.dateRangeTv.text = "${
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/MonthlyGraphFragment.kt b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/MonthlyGraphFragment.kt
index b4fd1dd8..dc6d6b9d 100644
--- a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/MonthlyGraphFragment.kt
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/MonthlyGraphFragment.kt
@@ -71,6 +71,7 @@ class MonthlyGraphFragment : Fragment(R.layout.fragment_monthly_graph) {
 
             if (isCategoryEnabled) {
                 observeAllExpenseCategories()
+                binding.toolbar.title = getString(R.string.monthly_category_expense_graph)
             }
             observeExpenseOfEachMonth()
             getStartAndEndYear()
@@ -147,6 +148,11 @@ class MonthlyGraphFragment : Fragment(R.layout.fragment_monthly_graph) {
         cartesian.xAxis(0).title(getString(R.string.month))
         cartesian.yAxis(0).title(getString(R.string.expense))
 
+        cartesian.labels(true)
+        cartesian.labels().format("{%value}")
+        cartesian.labels().fontSize(10)
+        cartesian.labels().fontColor("#4D4C4C")
+
         binding.chart.setChart(cartesian)
     }
 
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/ShowExpenseBottomSheetFragment.kt b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/ShowExpenseBottomSheetFragment.kt
index 87cca785..a21ffd36 100644
--- a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/ShowExpenseBottomSheetFragment.kt
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/fragments/trackMoney/expense/ShowExpenseBottomSheetFragment.kt
@@ -19,6 +19,7 @@ import com.rohitthebest.manageyourrenters.ui.viewModels.ExpenseCategoryViewModel
 import com.rohitthebest.manageyourrenters.ui.viewModels.ExpenseViewModel
 import com.rohitthebest.manageyourrenters.ui.viewModels.PaymentMethodViewModel
 import com.rohitthebest.manageyourrenters.utils.Functions.Companion.showToast
+import com.rohitthebest.manageyourrenters.utils.convertJSONToStringList
 import com.rohitthebest.manageyourrenters.utils.isValid
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -133,31 +134,22 @@ class ShowExpenseBottomSheetFragment : BottomSheetDialogFragment(), ExpenseAdapt
 
         if (budgetAndIncomeExpenseFilter != null) {
 
-            if (budgetAndIncomeExpenseFilter.paymentMethods.isEmpty()) {
+            expenseViewModel.getExpenseByCategoryKeysAndDateRange(
+                budgetAndIncomeExpenseFilter.categoryKeys,
+                date1,
+                date2
+            ).observe(viewLifecycleOwner) { expenses ->
 
-                expenseViewModel.getExpenseByCategoryKeysAndDateRange(
-                    budgetAndIncomeExpenseFilter.categoryKeys,
-                    date1,
-                    date2
-                ).observe(viewLifecycleOwner) { expenses ->
-                    submitListToAdapter(expenses)
-                }
-            } else {
-
-                expenseViewModel.getExpenseByCategoryKeysAndDateRange(
-                    budgetAndIncomeExpenseFilter.categoryKeys,
-                    date1,
-                    date2
-                ).observe(viewLifecycleOwner) { expenses ->
-
-                    submitListToAdapter(
+                submitListToAdapter(
+                    if (budgetAndIncomeExpenseFilter.paymentMethods.isEmpty()) {
+                        expenses
+                    } else {
                         expenseViewModel.applyFilterByPaymentMethods(
                             budgetAndIncomeExpenseFilter.paymentMethods, expenses
                         )
-                    )
-                }
+                    }
+                )
             }
-
         } else {
             showToast(requireContext(), getString(R.string.something_went_wrong))
             dismiss()
@@ -197,24 +189,37 @@ class ShowExpenseBottomSheetFragment : BottomSheetDialogFragment(), ExpenseAdapt
         date1 = args.date1
         date2 = args.date2 + Constants.ONE_DAY_MILLISECONDS
 
+        val paymentMethodKeys =
+            if (args.paymentMethodKey.isValid()) convertJSONToStringList(args.paymentMethodKey) else emptyList()
+
         if (dateRangeEnum == CustomDateRange.ALL_TIME) {
-            getAllExpenses()
+            getAllExpenses(paymentMethodKeys)
         } else if (dateRangeEnum == CustomDateRange.CUSTOM_DATE_RANGE) {
-            getExpensesByDateRange()
+            getExpensesByDateRange(paymentMethodKeys)
         }
     }
 
-    private fun getExpensesByDateRange() {
+    private fun getExpensesByDateRange(paymentMethodKeys: List<String?> = emptyList()) {
 
         expenseViewModel.getExpensesByDateRange(date1, date2)
             .observe(viewLifecycleOwner) { expenses ->
-                submitListToAdapter(expenses)
+                submitListToAdapter(
+                    if (paymentMethodKeys.isEmpty()) expenses else expenseViewModel.applyFilterByPaymentMethods(
+                        paymentMethodKeys,
+                        expenses
+                    )
+                )
             }
     }
 
-    private fun getAllExpenses() {
+    private fun getAllExpenses(paymentMethodKeys: List<String?> = emptyList()) {
         expenseViewModel.getAllExpenses().observe(viewLifecycleOwner) { expenses ->
-            submitListToAdapter(expenses)
+            submitListToAdapter(
+                if (paymentMethodKeys.isEmpty()) expenses else expenseViewModel.applyFilterByPaymentMethods(
+                    paymentMethodKeys,
+                    expenses
+                )
+            )
         }
     }
 
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseGraphDataViewModel.kt b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseGraphDataViewModel.kt
index df5faf70..588a0290 100644
--- a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseGraphDataViewModel.kt
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseGraphDataViewModel.kt
@@ -31,20 +31,35 @@ class ExpenseGraphDataViewModel @Inject constructor(
         MutableLiveData<Pair<List<ExpenseCategoryAndTheirTotalExpenseAmounts>, Double>>()
     val expenseGraphData: LiveData<Pair<List<ExpenseCategoryAndTheirTotalExpenseAmounts>, Double>> get() = _expenseGraphData
 
-    fun getTotalExpenseAmountsWithTheirExpenseCategoryNames() {
+    fun getTotalExpenseAmountsWithTheirExpenseCategoryNames(paymentMethodKeys: List<String> = emptyList()) {
 
         viewModelScope.launch {
 
             val expenseCategoriesWithTheirAmounts =
                 try {
-                    expenseRepository.getTotalExpenseAmountsWithTheirExpenseCategoryKeys().first()
+                    if (paymentMethodKeys.isEmpty()) {
+                        expenseRepository.getTotalExpenseAmountsWithTheirExpenseCategoryKeys()
+                            .first()
+                    } else {
+                        getExpenseCategoriesAndTheirAmountsAfterFilteringByPaymentMethods(
+                            paymentMethodKeys
+                        )
+                    }
                 } catch (e: Exception) {
                     emptyList()
                 }
 
-            val totalAmount = try {
-                expenseRepository.getTotalExpenseAmount().first()
-            } catch (e: NullPointerException) {
+            val totalAmount = if (expenseCategoriesWithTheirAmounts.isNotEmpty()) {
+                try {
+                    if (paymentMethodKeys.isEmpty()) {
+                        expenseRepository.getTotalExpenseAmount().first()
+                    } else {
+                        expenseCategoriesWithTheirAmounts.sumOf { it.totalAmount }
+                    }
+                } catch (e: NullPointerException) {
+                    0.0
+                }
+            } else {
                 0.0
             }
 
@@ -52,25 +67,59 @@ class ExpenseGraphDataViewModel @Inject constructor(
         }
     }
 
-    fun getTotalExpenseAmountsWithTheirExpenseCategoryNamesByDateRange(date1: Long, date2: Long) {
+    private suspend fun getExpenseCategoriesAndTheirAmountsAfterFilteringByPaymentMethods(
+        paymentMethodKeys: List<String>
+    ): List<ExpenseCategoryAndTheirTotalExpenseAmounts> {
+
+        val expenses = expenseRepository.getAllExpenses().first()
+
+        val filteredList =
+            expenseRepository.applyExpenseFilterByPaymentMethods(paymentMethodKeys, expenses)
+
+        return expenseRepository.getTotalExpenseAmountsWithTheirExpenseCategoryKeysByListOfExpenseKeys(
+            filteredList.map { expense -> expense.key }
+        ).first()
+    }
+
+    fun getTotalExpenseAmountsWithTheirExpenseCategoryNamesByDateRange(
+        date1: Long,
+        date2: Long,
+        paymentMethodKeys: List<String> = emptyList()
+    ) {
 
         viewModelScope.launch {
             val expenseCategoriesWithTheirAmounts =
                 try {
-                    expenseRepository.getTotalExpenseAmountsWithTheirExpenseCategoryKeysByDateRange(
-                        date1,
-                        date2
-                    ).first()
+                    if (paymentMethodKeys.isEmpty()) {
+                        expenseRepository.getTotalExpenseAmountsWithTheirExpenseCategoryKeysByDateRange(
+                            date1,
+                            date2
+                        ).first()
+                    } else {
+                        getTotalExpenseAmountsWithTheirExpenseCategoryKeysByDateRangeAndFilterByPaymentMethods(
+                            date1,
+                            date2,
+                            paymentMethodKeys
+                        )
+                    }
                 } catch (e: Exception) {
                     emptyList()
                 }
 
-            val totalAmount = try {
-                expenseRepository.getTotalExpenseAmountByDateRange(
-                    date1,
-                    date2 + Constants.ONE_DAY_MILLISECONDS
-                ).first()
-            } catch (e: java.lang.NullPointerException) {
+            val totalAmount = if (expenseCategoriesWithTheirAmounts.isNotEmpty()) {
+                try {
+                    if (paymentMethodKeys.isEmpty()) {
+                        expenseRepository.getTotalExpenseAmountByDateRange(
+                            date1,
+                            date2
+                        ).first()
+                    } else {
+                        expenseCategoriesWithTheirAmounts.sumOf { it.totalAmount }
+                    }
+                } catch (e: java.lang.NullPointerException) {
+                    0.0
+                }
+            } else {
                 0.0
             }
 
@@ -78,6 +127,22 @@ class ExpenseGraphDataViewModel @Inject constructor(
         }
     }
 
+    private suspend fun getTotalExpenseAmountsWithTheirExpenseCategoryKeysByDateRangeAndFilterByPaymentMethods(
+        date1: Long,
+        date2: Long,
+        paymentMethodKeys: List<String>
+    ): List<ExpenseCategoryAndTheirTotalExpenseAmounts> {
+
+        val expenses = expenseRepository.getExpensesByDateRange(date1, date2).first()
+
+        val filteredList =
+            expenseRepository.applyExpenseFilterByPaymentMethods(paymentMethodKeys, expenses)
+
+        return expenseRepository.getTotalExpenseAmountsWithTheirExpenseCategoryKeysByDateRangeAndByListOfExpenseKeys(
+            date1, date2, filteredList.map { expense -> expense.key }
+        ).first()
+    }
+
     fun getTotalExpenseAmountWithTheirExpenseCategoryNamesForSelectedExpenseCategories(
         selectedExpenseCategoryKeys: List<String>
     ) {
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseViewModel.kt b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseViewModel.kt
index 64c4f452..aa44c731 100644
--- a/app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseViewModel.kt
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/ui/viewModels/ExpenseViewModel.kt
@@ -357,7 +357,7 @@ class ExpenseViewModel @Inject constructor(
     }
 
     fun applyFilterByPaymentMethods(
-        paymentMethodKeys: List<String>,
+        paymentMethodKeys: List<String?>,
         expenses: List<Expense>
     ): List<Expense> {
 
diff --git a/app/src/main/java/com/rohitthebest/manageyourrenters/utils/Functions.kt b/app/src/main/java/com/rohitthebest/manageyourrenters/utils/Functions.kt
index ea4ac3e0..31092da2 100644
--- a/app/src/main/java/com/rohitthebest/manageyourrenters/utils/Functions.kt
+++ b/app/src/main/java/com/rohitthebest/manageyourrenters/utils/Functions.kt
@@ -68,7 +68,6 @@ class Functions {
 
         private val mAuth = Firebase.auth
 
-        private const val TAG = "Functions"
         fun showToast(context: Context, message: Any?, duration: Int = Toast.LENGTH_SHORT) {
             try {
                 Log.d(TAG, message.toString())
@@ -978,7 +977,10 @@ class Functions {
                     )
                 } else {
 
-                    PendingIntent.getActivity(context, 0, notificationIntent, 0)
+                    PendingIntent.getActivity(
+                        context, 0, notificationIntent,
+                        PendingIntent.FLAG_IMMUTABLE
+                    )
                 }
 
             }
diff --git a/app/src/main/res/drawable/baseline_filter_list_colored_24.xml b/app/src/main/res/drawable/baseline_filter_list_colored_24.xml
index 4b6bb7c8..d635aa5c 100644
--- a/app/src/main/res/drawable/baseline_filter_list_colored_24.xml
+++ b/app/src/main/res/drawable/baseline_filter_list_colored_24.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/purple_700"
+    android:tint="@color/color_orange"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/layout/fragment_graph.xml b/app/src/main/res/layout/fragment_graph.xml
index 001ec0a3..c95ca949 100644
--- a/app/src/main/res/layout/fragment_graph.xml
+++ b/app/src/main/res/layout/fragment_graph.xml
@@ -111,4 +111,20 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <TextView
+        android:id="@+id/noDataTV"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:padding="3dp"
+        android:text="@string/no_data_available"
+        android:textColor="@color/primaryTextColor"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/graph_menu.xml b/app/src/main/res/menu/graph_menu.xml
index 28f8056f..559e020e 100644
--- a/app/src/main/res/menu/graph_menu.xml
+++ b/app/src/main/res/menu/graph_menu.xml
@@ -2,36 +2,52 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <item
+        android:id="@+id/menu_filter_expense_graph"
+        android:icon="@drawable/baseline_filter_list_24"
+        android:title="@string/add_filter"
+        app:showAsAction="ifRoom" />
+
     <item android:title="@string/graphs">
 
         <menu>
 
             <item
                 android:id="@+id/menu_monthly_graph"
+                android:icon="@drawable/ic_baseline_bar_chart_24"
                 android:title="@string/monthly_graph" />
 
             <item
                 android:id="@+id/menu_category_graph"
+                android:icon="@drawable/ic_baseline_bar_chart_24"
                 android:title="@string/category_graph" />
+
+            <item
+                android:id="@+id/menu_deep_analyze_expense"
+                android:icon="@drawable/ic_baseline_show_chart_24"
+                android:title="@string/deep_analyze_mode"
+                app:showAsAction="never" />
         </menu>
 
     </item>
 
-    <item
-        android:id="@+id/menu_share_expense_graph_sc"
-        android:icon="@drawable/ic_baseline_share_24"
-        android:title="@string/share_screenshot"
-        app:showAsAction="never" />
+    <item android:title="@string/screenshot">
 
-    <item
-        android:id="@+id/menu_save_expense_graph_sc"
-        android:icon="@drawable/ic_baseline_save_24"
-        android:title="@string/save_screenshot"
-        app:showAsAction="never" />
+        <menu>
+            <item
+                android:id="@+id/menu_share_expense_graph_sc"
+                android:icon="@drawable/ic_baseline_share_24"
+                android:title="@string/share_screenshot"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/menu_save_expense_graph_sc"
+                android:icon="@drawable/ic_baseline_save_24"
+                android:title="@string/save_screenshot"
+                app:showAsAction="never" />
+
+        </menu>
+
+    </item>
 
-    <item
-        android:id="@+id/menu_deep_analyze_expense"
-        android:icon="@drawable/ic_baseline_show_chart_24"
-        android:title="@string/deep_analyze_mode"
-        app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 38c19f0f..abc17afe 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -207,7 +207,7 @@
     <string name="show_all_expenses">Show All Expenses</string>
     <string name="expense_disabled_message">expense shortcut is disabled for now</string>
     <string name="house_renters_disabled_message">house renters shortcut is disabled</string>
-    <string name="deep_analyze_mode">Deep analyze mode</string>
+    <string name="deep_analyze_mode">Category compare graph</string>
     <string name="add_remove_expense_category_selection">Add Remove Expense category selection</string>
     <string name="add_remove_payment_method_selection">Add Remove payment method selection</string>
     <string name="clear_selection_fab">clear selection fab</string>
@@ -423,9 +423,12 @@
     <string name="no_data_available">No Data available!!!</string>
     <string name="month">Month</string>
     <string name="monthly_expense_for_the_year">Monthly expense for the year : %1$s</string>
-    <string name="monthly_expense_for_the_year_and_category">Monthly expense for the year: %1$s, category: %2$s</string>
+    <string name="monthly_expense_for_the_year_and_category">Monthly expense for the year: %1$s and Category: %2$s</string>
     <string name="category_graph">Category graph</string>
     <string name="select_from_category">Select categories spinner</string>
+    <string name="monthly_category_expense_graph">Monthly category expense graph</string>
+    <string name="screenshot">Screenshot</string>
+    <string name="screenshot_saved_to_phone_storage">Screenshot saved to phone storage</string>
 
     <string-array name="interest_time_schedule">