Advanced filtering options implemented

Mobile/androidApp/src/main/java/com/example/budgeting/android/data/model/ExpenseFilters.kt

@@ -3,7 +3,11 @@ package com.example.budgeting.android.data.model
 data class ExpenseFilters(
     val search: String = "",
     val category: String = "All",
-    val sortOption: SortOption = SortOption.NEWEST
+    val sortOption: SortOption = SortOption.NEWEST,
+    val minAmount: Float? = null,
+    val maxAmount: Float? = null,
+    val startDate: String? = null,
+    val endDate: String? = null
 )
 
 enum class SortOption(

Mobile/androidApp/src/main/java/com/example/budgeting/android/data/network/ExpenseApiService.kt

@@ -18,6 +18,10 @@ interface ExpenseApiService {
         @Query("category") category: String? = null,
         @Query("sort_by") sortBy: String? = "created_at",
         @Query("order") order: String? = "desc",
+        @Query("offset") offset: Int? = 0,
+        @Query("limit") limit: Int? = 100,
+        @Query("min_price") minPrice: Float? = null,
+        @Query("max_price") maxPrice: Float? = null,
         @Query("date_from") dateFrom: String? = null,
         @Query("date_to") dateTo: String? = null
     ): Response<ApiResponse<List<Expense>>>
@@ -30,6 +34,10 @@ interface ExpenseApiService {
         @Query("category") category: String? = null,
         @Query("sort_by") sortBy: String? = "created_at",
         @Query("order") order: String? = "desc",
+        @Query("offset") offset: Int? = 0,
+        @Query("limit") limit: Int? = 100,
+        @Query("min_price") minPrice: Float? = null,
+        @Query("max_price") maxPrice: Float? = null,
         @Query("date_from") dateFrom: String? = null,
         @Query("date_to") dateTo: String? = null
     ): Response<ApiResponse<List<Expense>>>
@@ -43,6 +51,10 @@ interface ExpenseApiService {
         @Query("category") category: String? = null,
         @Query("sort_by") sortBy: String? = "created_at",
         @Query("order") order: String? = "desc",
+        @Query("offset") offset: Int? = 0,
+        @Query("limit") limit: Int? = 100,
+        @Query("min_price") minPrice: Float? = null,
+        @Query("max_price") maxPrice: Float? = null,
         @Query("date_from") dateFrom: String? = null,
         @Query("date_to") dateTo: String? = null
     ): Response<ApiResponse<List<Expense>>>

Mobile/androidApp/src/main/java/com/example/budgeting/android/data/repository/ExpenseRepository.kt

@@ -17,6 +17,10 @@ class ExpenseRepository(
         category: String?,
         sortBy: String?,
         order: String?,
+        offset: Int?,
+        limit: Int?,
+        minPrice: Float?,
+        maxPrice: Float?,
         dateFrom: String?,
         dateTo: String?
     ): List<Expense> {
@@ -25,6 +29,10 @@ class ExpenseRepository(
             category = category,
             sortBy = sortBy,
             order = order,
+            offset = offset,
+            limit = limit,
+            minPrice = minPrice,
+            maxPrice = maxPrice,
             dateFrom = dateFrom,
             dateTo = dateTo
         ).body()?.data ?: throw Exception("Failed to fetch expenses")
@@ -37,13 +45,21 @@ class ExpenseRepository(
         category: String?,
         sortBy: String?,
         order: String?,
+        offset: Int?,
+        limit: Int?,
+        minPrice: Float?,
+        maxPrice: Float?,
         dateFrom: String?,
         dateTo: String?
     ): List<Expense> {
         return api.getAllExpenses(
             category = category,
             sortBy = sortBy,
             order = order,
+            offset = offset,
+            limit = limit,
+            minPrice = minPrice,
+            maxPrice = maxPrice,
             dateFrom = dateFrom,
             dateTo = dateTo
         ).body()?.data ?: throw Exception("Failed to fetch expenses")
@@ -57,6 +73,10 @@ class ExpenseRepository(
         category: String?,
         sortBy: String?,
         order: String?,
+        offset: Int?,
+        limit: Int?,
+        minPrice: Float?,
+        maxPrice: Float?,
         dateFrom: String?,
         dateTo: String?
     ): List<Expense> {
@@ -65,6 +85,10 @@ class ExpenseRepository(
             category = category,
             sortBy = sortBy,
             order = order,
+            offset = offset,
+            limit = limit,
+            minPrice = minPrice,
+            maxPrice = maxPrice,
             dateFrom = dateFrom,
             dateTo = dateTo
         ).body()?.data ?: throw Exception("Failed to fetch expenses")

Mobile/androidApp/src/main/java/com/example/budgeting/android/ui/screens/AnalyticsScreen.kt

@@ -211,11 +211,11 @@ fun AnalyticsContent(
             CategoryCountBarChart(categoryCounts)
         }
 
-        AnalyticsCard("Total amount per category") {
+        AnalyticsCard("Spending by category") {
             CategoryAmountBarChart(categoryAmounts)
         }
 
-        AnalyticsCard("Monthly trend") {
+        AnalyticsCard("Spending over time") {
             MonthlyLineChart(monthlyTotals)
         }
     }