Closes #98, closes #99; Implement Smart Title suggestions

Ivy-Apps · Nov 16, 2021 · a98d5f6 · a98d5f6
1 parent 9e00d87
commit a98d5f6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/src/main/java/com/ivy/wallet/logic/SmartTitleSuggestionsLogic.kt b/app/src/main/java/com/ivy/wallet/logic/SmartTitleSuggestionsLogic.kt
@@ -4,6 +4,7 @@ import com.ivy.wallet.base.capitalizeWords
 import com.ivy.wallet.base.isNotNullOrBlank
 import com.ivy.wallet.model.entity.Transaction
 import com.ivy.wallet.persistence.dao.TransactionDao
+import com.ivy.wallet.ui.edit.core.SUGGESTIONS_LIMIT
 import java.util.*
 
 class SmartTitleSuggestionsLogic(
@@ -49,9 +50,8 @@ class SmartTitleSuggestionsLogic(
         }
 
 
-        if (suggestions.isEmpty() && accountId != null) {
+        if (suggestions.size < SUGGESTIONS_LIMIT && accountId != null) {
             //last resort, suggest by account
-
             //all titles used for the specific account
             //ordered by N times used
 
@@ -71,6 +71,8 @@ class SmartTitleSuggestionsLogic(
         }
 
         return suggestions
+            .filter { it != title }
+            .toSet()
     }
 }
 

diff --git a/app/src/main/java/com/ivy/wallet/ui/edit/core/Title.kt b/app/src/main/java/com/ivy/wallet/ui/edit/core/Title.kt
@@ -27,7 +27,7 @@ import com.ivy.wallet.ui.theme.components.IvyTitleTextField
 import com.ivy.wallet.ui.theme.style
 import java.util.*
 
-private const val SUGGESTIONS_LIMIT = 10
+const val SUGGESTIONS_LIMIT = 10
 
 @Composable
 fun ColumnScope.Title(
@@ -128,7 +128,7 @@ private fun PreviewTitleWithSuggestions() {
             Title(
                 type = TransactionType.EXPENSE,
                 titleFocus = FocusRequester(),
-                initialTransactionId = UUID.randomUUID(),
+                initialTransactionId = null,
                 titleTextFieldValue = selectEndTextFieldValue(""),
                 setTitleTextFieldValue = {},
                 suggestions = setOf(