From 400c455308de3699de207bf52ba4c3748ee6cf9a Mon Sep 17 00:00:00 2001 From: Crustack Date: Wed, 3 Jun 2026 21:07:09 +0200 Subject: [PATCH] Add check duplicates toggle to import dialog --- .../philkes/notallyx/data/dao/CommonDao.kt | 6 ++- .../fragment/settings/SettingsFragment.kt | 9 ++-- .../presentation/viewmodel/BaseNoteModel.kt | 12 +++-- .../philkes/notallyx/utils/ErrorActivity.kt | 14 +++++- .../notallyx/utils/backup/ImportExtensions.kt | 11 ++-- app/src/main/res/layout/dialog_import.xml | 47 ++++++++++++++++++ app/src/main/res/values/strings.xml | 3 +- app/translations.xlsx | Bin 181937 -> 182136 bytes 8 files changed, 85 insertions(+), 17 deletions(-) create mode 100644 app/src/main/res/layout/dialog_import.xml diff --git a/app/src/main/java/com/philkes/notallyx/data/dao/CommonDao.kt b/app/src/main/java/com/philkes/notallyx/data/dao/CommonDao.kt index ef5d250d..1bf7afd2 100644 --- a/app/src/main/java/com/philkes/notallyx/data/dao/CommonDao.kt +++ b/app/src/main/java/com/philkes/notallyx/data/dao/CommonDao.kt @@ -51,6 +51,7 @@ abstract class CommonDao(private val database: NotallyDatabase) { baseNotes: List, labels: List