Merge pull request #188 from ILIYANGERMANOV/loans

WIP Loans + easy improvements

app/src/main/java/com/ivy/wallet/base/UIExt.kt

@@ -22,6 +22,9 @@ import android.view.inputmethod.InputMethodManager
 import androidx.annotation.FloatRange
 import androidx.annotation.RequiresApi
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalView
@@ -32,6 +35,23 @@ import androidx.core.view.doOnLayout
 import kotlin.math.roundToInt
 
 
+@Composable
+fun keyboardVisibleState(): State<Boolean> {
+    val rootView = LocalView.current
+
+    val keyboardVisible = remember {
+        mutableStateOf(false)
+    }
+
+    onScreenStart {
+        rootView.addKeyboardListener {
+            keyboardVisible.value = it
+        }
+    }
+
+    return keyboardVisible
+}
+
 fun View.addKeyboardListener(keyboardCallback: (visible: Boolean) -> Unit) {
     doOnLayout {
         //get init state of keyboard

app/src/main/java/com/ivy/wallet/di/AppModule.kt

@@ -115,6 +115,12 @@ object AppModule {
     @Provides
     fun provideSettingsDao(db: IvyRoomDatabase): SettingsDao = db.settingsDao()
 
+    @Provides
+    fun provideLoanDao(db: IvyRoomDatabase): LoanDao = db.loanDao()
+
+    @Provides
+    fun provideLoanRecordDao(db: IvyRoomDatabase): LoanRecordDao = db.loanRecordDao()
+
     @Provides
     fun provideTrnRecurringRuleDao(db: IvyRoomDatabase): PlannedPaymentRuleDao =
         db.plannedPaymentRuleDao()
@@ -226,6 +232,32 @@ object AppModule {
         )
     }
 
+    @Provides
+    fun provideLoanUploader(
+        loanDao: LoanDao,
+        restClient: RestClient,
+        ivySession: IvySession
+    ): LoanUploader {
+        return LoanUploader(
+            dao = loanDao,
+            restClient = restClient,
+            ivySession = ivySession
+        )
+    }
+
+    @Provides
+    fun provideLoanRecordUploader(
+        dao: LoanRecordDao,
+        restClient: RestClient,
+        ivySession: IvySession
+    ): LoanRecordUploader {
+        return LoanRecordUploader(
+            dao = dao,
+            restClient = restClient,
+            ivySession = ivySession
+        )
+    }
+
     @Provides
     fun provideCategorySync(
         sharedPrefs: SharedPrefs,
@@ -260,6 +292,40 @@ object AppModule {
         )
     }
 
+    @Provides
+    fun provideLoanSync(
+        sharedPrefs: SharedPrefs,
+        dao: LoanDao,
+        restClient: RestClient,
+        loanUploader: LoanUploader,
+        ivySession: IvySession
+    ): LoanSync {
+        return LoanSync(
+            sharedPrefs = sharedPrefs,
+            dao = dao,
+            restClient = restClient,
+            uploader = loanUploader,
+            ivySession = ivySession
+        )
+    }
+
+    @Provides
+    fun provideLoanRecordSync(
+        sharedPrefs: SharedPrefs,
+        dao: LoanRecordDao,
+        restClient: RestClient,
+        uploader: LoanRecordUploader,
+        ivySession: IvySession
+    ): LoanRecordSync {
+        return LoanRecordSync(
+            sharedPrefs = sharedPrefs,
+            dao = dao,
+            restClient = restClient,
+            uploader = uploader,
+            ivySession = ivySession
+        )
+    }
+
     @Provides
     fun provideTransactionUploader(
         transactionDao: TransactionDao,
@@ -328,6 +394,8 @@ object AppModule {
         transactionSync: TransactionSync,
         plannedPaymentSync: PlannedPaymentSync,
         budgetSync: BudgetSync,
+        loanSync: LoanSync,
+        loanRecordSync: LoanRecordSync,
         ivySession: IvySession
     ): IvySync {
         return IvySync(
@@ -336,6 +404,8 @@ object AppModule {
             transactionSync = transactionSync,
             plannedPaymentSync = plannedPaymentSync,
             budgetSync = budgetSync,
+            loanSync = loanSync,
+            loanRecordSync = loanRecordSync,
             ivySession = ivySession
         )
     }
@@ -518,6 +588,19 @@ object AppModule {
         )
     }
 
+    @Provides
+    fun provideLoanCreator(
+        paywallLogic: PaywallLogic,
+        dao: LoanDao,
+        uploader: LoanUploader
+    ): LoanCreator {
+        return LoanCreator(
+            paywallLogic = paywallLogic,
+            dao = dao,
+            uploader = uploader
+        )
+    }
+
     @Provides
     fun provideAccountCreator(
         paywallLogic: PaywallLogic,

app/src/main/java/com/ivy/wallet/logic/LoanCreator.kt

@@ -0,0 +1,99 @@
+package com.ivy.wallet.logic
+
+import androidx.compose.ui.graphics.toArgb
+import com.ivy.wallet.base.ioThread
+import com.ivy.wallet.logic.model.CreateLoanData
+import com.ivy.wallet.model.entity.Loan
+import com.ivy.wallet.persistence.dao.LoanDao
+import com.ivy.wallet.sync.uploader.LoanUploader
+
+class LoanCreator(
+    private val paywallLogic: PaywallLogic,
+    private val dao: LoanDao,
+    private val uploader: LoanUploader
+) {
+    suspend fun create(
+        data: CreateLoanData,
+        onRefreshUI: suspend (Loan) -> Unit
+    ) {
+        val name = data.name
+        if (name.isBlank()) return
+        if (data.amount <= 0) return
+
+        try {
+            paywallLogic.protectAddWithPaywall(
+                //TODO: Handle addLoan = true
+//                addBudget = true,
+            ) {
+                val newItem = ioThread {
+                    val item = Loan(
+                        name = name.trim(),
+                        amount = data.amount,
+                        type = data.type,
+                        color = data.color.toArgb(),
+                        icon = data.icon,
+                        orderNum = dao.findMaxOrderNum() + 1,
+                        isSynced = false
+                    )
+
+                    dao.save(item)
+                    item
+                }
+
+                onRefreshUI(newItem)
+
+                ioThread {
+                    uploader.sync(newItem)
+                }
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+
+    suspend fun edit(
+        updatedItem: Loan,
+        onRefreshUI: suspend (Loan) -> Unit
+    ) {
+        if (updatedItem.name.isBlank()) return
+        if (updatedItem.amount <= 0.0) return
+
+        try {
+            ioThread {
+                dao.save(
+                    updatedItem.copy(
+                        isSynced = false
+                    )
+                )
+            }
+
+            onRefreshUI(updatedItem)
+
+            ioThread {
+                uploader.sync(updatedItem)
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    suspend fun delete(
+        item: Loan,
+        onRefreshUI: suspend () -> Unit
+    ) {
+        try {
+            ioThread {
+                dao.flagDeleted(item.id)
+            }
+
+            onRefreshUI()
+
+            ioThread {
+                uploader.delete(item.id)
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+}

app/src/main/java/com/ivy/wallet/logic/PaywallLogic.kt

@@ -67,6 +67,7 @@ class PaywallLogic(
         addCategory: Boolean = false,
         addBudget: Boolean = false,
         action: suspend () -> Unit
+    //TODO: Handle loan
     ) {
         val paywallReason = checkPaywall {
             paywallHitAddItem(

app/src/main/java/com/ivy/wallet/logic/model/CreateLoanData.kt

@@ -0,0 +1,12 @@
+package com.ivy.wallet.logic.model
+
+import androidx.compose.ui.graphics.Color
+import com.ivy.wallet.model.LoanType
+
+data class CreateLoanData(
+    val name: String,
+    val amount: Double,
+    val type: LoanType,
+    val color: Color,
+    val icon: String?
+)

app/src/main/java/com/ivy/wallet/model/LoanType.kt

@@ -0,0 +1,5 @@
+package com.ivy.wallet.model
+
+enum class LoanType {
+    BORROW, LEND
+}

app/src/main/java/com/ivy/wallet/model/entity/Loan.kt

@@ -0,0 +1,29 @@
+package com.ivy.wallet.model.entity
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.ivy.wallet.model.LoanType
+import com.ivy.wallet.model.Reorderable
+import java.util.*
+
+@Entity(tableName = "loans")
+data class Loan(
+    val name: String,
+    val amount: Double,
+    val type: LoanType,
+    val color: Int = 0,
+    val icon: String? = null,
+    val orderNum: Double = 0.0,
+
+    val isSynced: Boolean = false,
+    val isDeleted: Boolean = false,
+
+    @PrimaryKey
+    val id: UUID = UUID.randomUUID()
+) : Reorderable {
+    override fun getItemOrderNum() = orderNum
+
+    override fun withNewOrderNum(newOrderNum: Double) = this.copy(
+        orderNum = newOrderNum
+    )
+}

app/src/main/java/com/ivy/wallet/model/entity/LoanRecord.kt

@@ -0,0 +1,20 @@
+package com.ivy.wallet.model.entity
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.time.LocalDateTime
+import java.util.*
+
+@Entity(tableName = "loan_records")
+data class LoanRecord(
+    val loanId: UUID,
+    val amount: Double,
+    val note: String?,
+    val dateTime: LocalDateTime,
+
+    val isSynced: Boolean = false,
+    val isDeleted: Boolean = false,
+
+    @PrimaryKey
+    val id: UUID = UUID.randomUUID()
+)

app/src/main/java/com/ivy/wallet/network/RestClient.kt

@@ -198,6 +198,7 @@ class RestClient private constructor(
     val categoryService: CategoryService by lazy { retrofit.create(CategoryService::class.java) }
     val accountService: AccountService by lazy { retrofit.create(AccountService::class.java) }
     val budgetService: BudgetService by lazy { retrofit.create(BudgetService::class.java) }
+    val loanService: LoanService by lazy { retrofit.create(LoanService::class.java) }
     val transactionService: TransactionService by lazy { retrofit.create(TransactionService::class.java) }
     val plannedPaymentRuleService: PlannedPaymentRuleService by lazy {
         retrofit.create(

app/src/main/java/com/ivy/wallet/network/request/loan/DeleteLoanRecordRequest.kt

@@ -0,0 +1,7 @@
+package com.ivy.wallet.network.request.loan
+
+import java.util.*
+
+data class DeleteLoanRecordRequest(
+    val id: UUID? = null
+)

app/src/main/java/com/ivy/wallet/network/request/loan/DeleteLoanRequest.kt

@@ -0,0 +1,7 @@
+package com.ivy.wallet.network.request.loan
+
+import java.util.*
+
+data class DeleteLoanRequest(
+    val id: UUID? = null
+)

app/src/main/java/com/ivy/wallet/network/request/loan/LoanRecordsResponse.kt

@@ -0,0 +1,7 @@
+package com.ivy.wallet.network.request.loan
+
+import com.ivy.wallet.model.entity.LoanRecord
+
+data class LoanRecordsResponse(
+    val loanRecords: List<LoanRecord>
+)

app/src/main/java/com/ivy/wallet/network/request/loan/LoansResponse.kt

@@ -0,0 +1,7 @@
+package com.ivy.wallet.network.request.loan
+
+import com.ivy.wallet.model.entity.Loan
+
+data class LoansResponse(
+    val loans: List<Loan>
+)

app/src/main/java/com/ivy/wallet/network/request/loan/UpdateLoanRecordRequest.kt

@@ -0,0 +1,7 @@
+package com.ivy.wallet.network.request.loan
+
+import com.ivy.wallet.model.entity.LoanRecord
+
+data class UpdateLoanRecordRequest(
+    val loanRecord: LoanRecord? = null
+)