Merge pull request #253 from flow-mn:develop

Release 0.10.0
flow-mn · Dec 31, 2024 · 8279cc9 · 8279cc9
2 parents 11a2451 + 3b2c001
commit 8279cc9
Show file tree

Hide file tree

Showing 82 changed files with 2,109 additions and 937 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,9 +5,11 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
 migrate_working_dir/
 
 # IntelliJ related

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,32 @@
 # Changelog
 
-## Beta next (0.9.0)
+## Beta 0.10.0
+
+### New features
+
+* Now you can deactivate accounts.
+  * Deactivated accounts will no longer show up in account selection
+  sheets, and the accounts tab. It will still show up for older transactions, and reports.
+  * You can find inactive accounts in Profile tab > Accounts
+
+### Changes and improvements
+
+* [BREAKING] Profile pictures are now stored elsewhere. Auto-migration will be in place for few builds.
+Please reapply your profile picture if you need to.
+* Now you are unable to permanently delete an account until you deactivate it.
+* Now account in transaction page shows post-transcation balance instead of current balance
+* Account selection sheet now shows current balance for each account
+* Now you can import an old backup at the setup
+
+### Fixes
+
+* Fixed home page wasn't scrolling to the top when clicking on iOS app bar
+* Now you can do ZIP backups that include account/profile photos, fixes [#173](https://github.com/flow-mn/flow/issues/173)
+  and [#204](https://github.com/flow-mn/flow/issues/204)
+* Transfers no longer incorrectly ask confirmation when nothing has changed on transaction page
+* With updating flutter, fix of [#82](https://github.com/flow-mn/flow/issues/82) came
+
+## Beta 0.9.0
 
 ### New features
 

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -31,7 +31,7 @@ if (keystorePropertiesFile.exists()) {
 android {
     namespace "mn.flow.flow"
     compileSdkVersion 34
-    ndkVersion "26.2.11394342"
+    ndkVersion "27.0.12077973"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
-distributionSha256Sum=5022b0b25fe182b0e50867e77f484501dba44feeea88f5c1f13b6b4660463640
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
+distributionSha256Sum=7ebdac923867a3cec0098302416d1e3c6c0c729fc4e2e05c10637a8af33a76c5
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -19,7 +19,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.2.0" apply false
+    id "com.android.application" version "8.7.0" apply false
     id "org.jetbrains.kotlin.android" version "1.9.10" apply false
 }
 

diff --git a/assets/l10n/en_IN.json b/assets/l10n/en_IN.json
@@ -68,11 +68,19 @@
     "setup.categories.preset.utils": "Utils",
     "setup.categories.preset.taxes": "Taxes",
     "setup.categories.preset.paychecks": "Paycheck",
+    "setup.onboarding": "Let's start",
+    "setup.onboarding.freshStart": "Start fresh",
+    "setup.onboarding.freshStart.description": "I'm using Flow for the first time",
+    "setup.onboarding.importExisting": "Import from a backup",
+    "setup.onboarding.importExisting.description": "Restore data from a previous Flow backup",
 
     "account": "Account",
     "account.name": "Account name",
     "account.balance": "Balance",
     "account.balance.upcomingDescription": "Upcoming transactions don't affect current balance",
+    "account.archive": "Deactivate",
+    "account.archive.description": "Once you deactivate, this account will no longer show up everywhere except for reports. You are able to delete the account with its associated transactions after deactivating.",
+    "account.archived": "Inactive",
     "account.excludeFromTotalBalance": "Exclude from balance",
     "account.excludeFromTotalBalance.description": "If you check this option, this account's balance will not be included in the total balance. Useful for savings or non-personal accounts.",
     "account.updateBalance": "Update balance",
@@ -87,6 +95,7 @@
     "account.noAccounts": "You don't have any accounts!",
     "account.thisMonth": "This month",
     "account.postTransactionBalance": "Balance after this transaction",
+    "accounts": "Accounts",
 
     "transaction": "Transaction",
     "transaction.new": "New transaction",
@@ -147,6 +156,8 @@
     "categories": "Categories",
     "categories.noCategories": "You don't have any categories",
 
+    "profile.name": "Name",
+
     "currency": "Currency",
     "currency.searchHint": "Search... (country, currency, code)",
 
@@ -192,7 +203,6 @@
     "preferences.pendingTransactions.updateDateUponConfirmation": "Update date on confirm",
     "preferences.pendingTransactions.updateDateUponConfirmation.description": "Disable to retain original transaction date",
     "preferences.privacyMode": "Privacy mode",
-    "preferences.privacyMode.description": "Nasconde importi. Attiva/disattiva con l'icona dell'occhio nell'angolo in alto a destra della schermata iniziale",
     "preferences.privacyMode.enableAtStartup": "Enable at startup",
     "preferences.moneyFormatting": "Money formatting",
     "preferences.moneyFormatting.preferFull": "Prefer full amounts",
@@ -268,7 +278,7 @@
     "sync.import.pickFile": "Select a file",
     "sync.import.pickFile.pickOrDrop": "Select or drop a file",
     "sync.import.pickFile.dropzone.active": "Drop here",
-    "sync.import.pickFile.description": "Pick a Flow backup file to restore. Must be a JSON file",
+    "sync.import.pickFile.description": "Pick a Flow backup file to restore. Must be a JSON or a ZIP file.",
     "sync.import.syncData.olderBackupWarning": "Since this back up was made in an older version of the app, something might go wrong!",
     "sync.import.syncData.createdDate": "Back up date",
     "sync.import.syncData.parsedEstimate": "Estimated data to recover",
@@ -279,14 +289,17 @@
     "sync.import.emergencyBackup": "As a precaution, Flow will try to backup current data to your device before proceeding",
     "sync.import.emergencyBackup.successful": "Previous data was backed up. You can save the backup file from Backup > Backup history",
     "sync.import.start": "Start importing",
+    "sync.import.zipWarning": "Make sure to import ZIP file produced by Flow app!",
     "sync.import.success": "Import successful!",
 
     "sync.export": "Export",
     "sync.export.type": "Export ({type})",
     "sync.export.asCSV": "As CSV",
     "sync.export.asCSV.description": "Cannot be used for restore/import! Ideal for opening in software like Google Sheets",
+    "sync.export.asZIP": "As backup (zip)",
+    "sync.export.asZIP.description": "Can be fully restored later",
     "sync.export.asJSON": "As backup (json)",
-    "sync.export.asJSON.description": "Can be restored later",
+    "sync.export.asJSON.description": "Can be partially restored. Omits non-essential data (e.g., account image)",
     "sync.export.autoBackup": "Auto-backup",
     "sync.export.autoBackup.iCloudAlreadySyncs": "If you're using Flow on iOS or macOS, your data will be synced to your iCloud",
     "sync.export.onDeviceWarning": "All backups are stored on-device, meaning when you uninstall Flow or reset your device, all the backups will be gone!",
@@ -338,6 +351,18 @@
     "enum.ImportV1Progress@success": "Success",
     "enum.ImportV1Progress@error": "Something went wrong ({error})",
 
+    "enum.ImportV2Progress@waitingConfirmation": "Waiting for confirmation",
+    "enum.ImportV2Progress@erasing": "Erasing current data",
+    "enum.ImportV2Progress@writingCategories": "Writing categories",
+    "enum.ImportV2Progress@writingAccounts": "Writing accounts",
+    "enum.ImportV2Progress@resolvingTransactions": "Sorting out transactions",
+    "enum.ImportV2Progress@writingTransactions": "Writing transactions",
+    "enum.ImportV2Progress@writingProfile": "Writing profile data",
+    "enum.ImportV2Progress@settingPrimaryCurrency": "Setting primary currency",
+    "enum.ImportV2Progress@copyingImages": "Copying images",
+    "enum.ImportV2Progress@success": "Success",
+    "enum.ImportV2Progress@error": "Something went wrong ({error})",
+
     "enum.BackupEntryType@manual": "Manual",
     "enum.BackupEntryType@manual.description": "Backup created by user",
     "enum.BackupEntryType@automated": "Auto-backup",
@@ -357,6 +382,7 @@
     "error.input.noImagePicked": "No image was selected",
     "error.input.cropFailed": "An error occured during cropping the picture",
     "error.input.wrongFileType": "Please choose a {type} file",
+    "error.input.invalidZip": "Not a valid Flow zip file",
     "error.input.pasteFormatMismatch": "Unable to parse",
     "error.sync.invalidBackupFile": "Invalid backup file",
     "error.sync.safetyBackupFailed": "Unable to start import",

diff --git a/assets/l10n/en_US.json b/assets/l10n/en_US.json
@@ -68,11 +68,19 @@
     "setup.categories.preset.utils": "Utils",
     "setup.categories.preset.taxes": "Taxes",
     "setup.categories.preset.paychecks": "Paycheck",
+    "setup.onboarding": "Let's start",
+    "setup.onboarding.freshStart": "Start fresh",
+    "setup.onboarding.freshStart.description": "I'm using Flow for the first time",
+    "setup.onboarding.importExisting": "Import from a backup",
+    "setup.onboarding.importExisting.description": "Restore data from a previous Flow backup",
 
     "account": "Account",
     "account.name": "Account name",
     "account.balance": "Balance",
     "account.balance.upcomingDescription": "Upcoming transactions don't affect current balance",
+    "account.archive": "Deactivate",
+    "account.archive.description": "Deactivating an account hides it from everywhere except in reports. You can permanently delete the account with its associated transactions after deactivating.",
+    "account.archived": "Inactive",
     "account.excludeFromTotalBalance": "Exclude from balance",
     "account.excludeFromTotalBalance.description": "If you check this option, this account's balance will not be included in the total balance. Useful for savings or non-personal accounts.",
     "account.updateBalance": "Update balance",
@@ -87,6 +95,7 @@
     "account.noAccounts": "You don't have any accounts!",
     "account.thisMonth": "This month",
     "account.postTransactionBalance": "Balance after this transaction",
+    "accounts": "Accounts",
 
     "transaction": "Transaction",
     "transaction.new": "New transaction",
@@ -147,6 +156,8 @@
     "categories": "Categories",
     "categories.noCategories": "You don't have any categories",
 
+    "profile.name": "Name",
+
     "currency": "Currency",
     "currency.searchHint": "Search... (country, currency, code)",
 
@@ -192,7 +203,6 @@
     "preferences.pendingTransactions.updateDateUponConfirmation": "Update date on confirm",
     "preferences.pendingTransactions.updateDateUponConfirmation.description": "Disable to retain original transaction date",
     "preferences.privacyMode": "Privacy mode",
-    "preferences.privacyMode.description": "Obscures amounts. Toggle with the eye icon at the upper right corner of home screen",
     "preferences.privacyMode.enableAtStartup": "Enable at startup",
     "preferences.moneyFormatting": "Money formatting",
     "preferences.moneyFormatting.preferFull": "Prefer full amounts",
@@ -268,7 +278,7 @@
     "sync.import.pickFile": "Select a file",
     "sync.import.pickFile.pickOrDrop": "Select or drop a file",
     "sync.import.pickFile.dropzone.active": "Drop here",
-    "sync.import.pickFile.description": "Pick a Flow backup file to restore. Must be a JSON file",
+    "sync.import.pickFile.description": "Pick a Flow backup file to restore. Must be a JSON or a ZIP file.",
     "sync.import.syncData.olderBackupWarning": "Since this back up was made in an older version of the app, something might go wrong!",
     "sync.import.syncData.createdDate": "Back up date",
     "sync.import.syncData.parsedEstimate": "Estimated data to recover",
@@ -279,14 +289,17 @@
     "sync.import.emergencyBackup": "As a precaution, Flow will try to backup current data to your device before proceeding",
     "sync.import.emergencyBackup.successful": "Previous data was backed up. You can save the backup file from Backup > Backup history",
     "sync.import.start": "Start importing",
+    "sync.import.zipWarning": "Make sure to import ZIP file produced by Flow app!",
     "sync.import.success": "Import successful!",
 
     "sync.export": "Export",
     "sync.export.type": "Export ({type})",
     "sync.export.asCSV": "As CSV",
     "sync.export.asCSV.description": "Cannot be used for restore/import! Ideal for opening in software like Google Sheets",
+    "sync.export.asZIP": "As backup (zip)",
+    "sync.export.asZIP.description": "Can be fully restored later",
     "sync.export.asJSON": "As backup (json)",
-    "sync.export.asJSON.description": "Can be restored later",
+    "sync.export.asJSON.description": "Can be partially restored. Omits non-essential data (e.g., account image)",
     "sync.export.autoBackup": "Auto-backup",
     "sync.export.autoBackup.iCloudAlreadySyncs": "If you're using Flow on iOS or macOS, your data will be synced to your iCloud",
     "sync.export.onDeviceWarning": "All backups are stored on-device, meaning when you uninstall Flow or reset your device, all the backups will be gone!",
@@ -333,11 +346,23 @@
     "enum.ImportV1Progress@erasing": "Erasing current data",
     "enum.ImportV1Progress@writingCategories": "Writing categories",
     "enum.ImportV1Progress@writingAccounts": "Writing accounts",
-    "enum.ImportV1Progress@resolvingTransactions": "Soring out transactions",
+    "enum.ImportV1Progress@resolvingTransactions": "Sorting out transactions",
     "enum.ImportV1Progress@writingTransactions": "Writing transactions",
     "enum.ImportV1Progress@success": "Success",
     "enum.ImportV1Progress@error": "Something went wrong ({error})",
 
+    "enum.ImportV2Progress@waitingConfirmation": "Waiting for confirmation",
+    "enum.ImportV2Progress@erasing": "Erasing current data",
+    "enum.ImportV2Progress@writingCategories": "Writing categories",
+    "enum.ImportV2Progress@writingAccounts": "Writing accounts",
+    "enum.ImportV2Progress@resolvingTransactions": "Sorting out transactions",
+    "enum.ImportV2Progress@writingTransactions": "Writing transactions",
+    "enum.ImportV2Progress@writingProfile": "Writing profile data",
+    "enum.ImportV2Progress@settingPrimaryCurrency": "Setting primary currency",
+    "enum.ImportV2Progress@copyingImages": "Copying images",
+    "enum.ImportV2Progress@success": "Success",
+    "enum.ImportV2Progress@error": "Something went wrong ({error})",
+
     "enum.BackupEntryType@manual": "Manual",
     "enum.BackupEntryType@manual.description": "Backup created by user",
     "enum.BackupEntryType@automated": "Auto-backup",
@@ -357,6 +382,7 @@
     "error.input.noImagePicked": "No image was selected",
     "error.input.cropFailed": "An error occured during cropping the picture",
     "error.input.wrongFileType": "Please choose a {type} file",
+    "error.input.invalidZip": "Not a valid Flow zip file",
     "error.sync.invalidBackupFile": "Invalid backup file",
     "error.input.pasteFormatMismatch": "Unable to parse",
     "error.sync.safetyBackupFailed": "Unable to start import",