Merge branch 'main' into fix-issue-3535

.github/CODEOWNERS

@@ -1 +1 @@
-* @ILIYANGERMANOV
+* @ILIYANGERMANOV

screen/exchange-rates/src/main/java/com/ivy/exchangerates/ExchangeRatesScreen.kt

@@ -178,6 +178,7 @@ private fun SearchField(
         searchQueryTextFieldValue = searchQueryTextFieldValue,
         hint = "Search currency",
         focus = false,
+        showClearIcon = searchQueryTextFieldValue.text.isNotEmpty(),
         onSetSearchQueryTextField = {
             searchQueryTextFieldValue = it
             onSearch(it.text)

screen/loans/src/main/java/com/ivy/loans/loan/LoanScreenEvent.kt

@@ -9,6 +9,7 @@ sealed interface LoanScreenEvent {
     data class OnReordered(val reorderedList: List<DisplayLoan>) : LoanScreenEvent
     data class OnCreateAccount(val accountData: CreateAccountData) : LoanScreenEvent
     data class OnReOrderModalShow(val show: Boolean) : LoanScreenEvent
+    data class OnTabChanged(val tab: LoanTab) : LoanScreenEvent
     data object OnAddLoan : LoanScreenEvent
     data object OnLoanModalDismiss : LoanScreenEvent
     data object OnChangeDate : LoanScreenEvent

screen/loans/src/main/java/com/ivy/loans/loan/LoanScreenMode.kt

@@ -0,0 +1,6 @@
+package com.ivy.loans.loan
+
+sealed interface LoanScreenMode {
+    data object TabularMode : LoanScreenMode
+    data object NonTabularMode : LoanScreenMode
+}

screen/loans/src/main/java/com/ivy/loans/loan/LoanScreenState.kt

@@ -9,12 +9,16 @@ import java.time.Instant
 data class LoanScreenState(
     val baseCurrency: String,
     val loans: ImmutableList<DisplayLoan>,
+    val completedLoans: ImmutableList<DisplayLoan>,
+    val pendingLoans: ImmutableList<DisplayLoan>,
     val accounts: ImmutableList<Account>,
     val selectedAccount: Account?,
     val loanModalData: LoanModalData?,
     val reorderModalVisible: Boolean,
     val totalOweAmount: String,
     val totalOwedAmount: String,
     val paidOffLoanVisibility: Boolean,
-    val dateTime: Instant
-)
+    val screenMode: LoanScreenMode,
+    val dateTime: Instant,
+    val selectedTab: LoanTab
+)

screen/loans/src/main/java/com/ivy/loans/loan/LoanTab.kt

@@ -0,0 +1,8 @@
+package com.ivy.loans.loan
+
+import androidx.compose.runtime.Immutable
+
+@Immutable
+enum class LoanTab {
+    PENDING, COMPLETED
+}

screen/loans/src/main/java/com/ivy/loans/loan/LoanViewModel.kt

@@ -15,6 +15,7 @@ import com.ivy.data.db.dao.read.LoanRecordDao
 import com.ivy.data.db.dao.read.SettingsDao
 import com.ivy.data.db.dao.write.WriteLoanDao
 import com.ivy.data.model.LoanType
+import com.ivy.domain.features.Features
 import com.ivy.frp.test.TestIdlingResource
 import com.ivy.legacy.datamodel.Account
 import com.ivy.legacy.datamodel.Loan
@@ -58,15 +59,19 @@ class LoanViewModel @Inject constructor(
     private val timeConverter: TimeConverter,
     private val timeProvider: TimeProvider,
     private val dateTimePicker: DateTimePicker,
+    private val features: Features
 ) : ComposeViewModel<LoanScreenState, LoanScreenEvent>() {
 
     private var baseCurrencyCode by mutableStateOf(getDefaultFIATCurrency().currencyCode)
     private var loans by mutableStateOf<ImmutableList<DisplayLoan>>(persistentListOf())
+    private var completedLoans by mutableStateOf<ImmutableList<DisplayLoan>>(persistentListOf())
+    private var pendingLoans by mutableStateOf<ImmutableList<DisplayLoan>>(persistentListOf())
     private var accounts by mutableStateOf<ImmutableList<Account>>(persistentListOf())
     private var selectedAccount by mutableStateOf<Account?>(null)
     private var loanModalData by mutableStateOf<LoanModalData?>(null)
     private var reorderModalVisible by mutableStateOf(false)
     private var dateTime by mutableStateOf<Instant>(timeProvider.utcNow())
+    private var selectedTab by mutableStateOf(LoanTab.PENDING)
 
     /** If true paid off loans will be visible */
     private var paidOffLoanVisibility by mutableStateOf(true)
@@ -93,10 +98,41 @@ class LoanViewModel @Inject constructor(
             totalOweAmount = getTotalOweAmount(totalOweAmount, defaultCurrencyCode),
             totalOwedAmount = getTotalOwedAmount(totalOwedAmount, defaultCurrencyCode),
             paidOffLoanVisibility = getPaidOffLoanVisibility(),
-            dateTime = dateTime
+            screenMode = getScreenMode(),
+            dateTime = dateTime,
+            selectedTab = getSelectedTab(),
+            completedLoans = getCompletedLoans(),
+            pendingLoans = getPendingLoans()
         )
     }
 
+    fun setTab(tab: LoanTab) {
+        selectedTab = tab
+    }
+
+    @Composable
+    private fun getSelectedTab(): LoanTab {
+        return selectedTab
+    }
+
+    @Composable
+    private fun getCompletedLoans(): ImmutableList<DisplayLoan> {
+        return completedLoans
+    }
+
+    @Composable
+    private fun getPendingLoans(): ImmutableList<DisplayLoan> {
+        return pendingLoans
+    }
+
+    @Composable
+    private fun getScreenMode(): LoanScreenMode {
+        return when (features.tabularLoanMode.asEnabledState()) {
+            true -> LoanScreenMode.TabularMode
+            else -> LoanScreenMode.NonTabularMode
+        }
+    }
+
     @Composable
     private fun getReorderModalVisible() = reorderModalVisible
 
@@ -160,9 +196,14 @@ class LoanViewModel @Inject constructor(
             is LoanScreenEvent.OnChangeDate -> {
                 handleChangeDate()
             }
+
             is LoanScreenEvent.OnChangeTime -> {
                 handleChangeTime()
             }
+
+            is LoanScreenEvent.OnTabChanged -> {
+                setTab(event.tab)
+            }
         }
     }
 
@@ -218,6 +259,8 @@ class LoanViewModel @Inject constructor(
                     }.toImmutableList()
             }
             filterLoans()
+            loadPendingLoans()
+            loadCompletedLoans()
 
             TestIdlingResource.decrement()
         }
@@ -332,6 +375,14 @@ class LoanViewModel @Inject constructor(
         }
     }
 
+    private fun loadCompletedLoans() {
+        completedLoans = allLoans.filter { loan -> loan.percentPaid == 1.0 }.toImmutableList()
+    }
+
+    private fun loadPendingLoans() {
+        pendingLoans = allLoans.filter { loan -> loan.percentPaid < 1.0 }.toImmutableList()
+    }
+
     private fun createAccount(data: CreateAccountData) {
         viewModelScope.launch {
             TestIdlingResource.increment()