Merge pull request #209 from flow-mn:develop

Beta 0.7.2 - Themes
flow-mn · Oct 28, 2024 · eae6442 · eae6442
2 parents 6e349b7 + 713ee38
commit eae6442
Show file tree

Hide file tree

Showing 40 changed files with 1,556 additions and 616 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## Beta 0.7.2
+
+* Added themes, closes [#105](https://github.com/flow-mn/flow/issues/105)
+* Add transaction description, type, and lat/long for CSV exports, closes [#203](https://github.com/flow-mn/flow/issues/203)
+
+## Beta 0.7.1
+
+* Fixed transfer transactions
+
 ## Beta 0.7.0
 
 * Added an option to choose location on a map

diff --git a/assets/l10n/en_IN.json b/assets/l10n/en_IN.json
@@ -146,11 +146,10 @@
     "preferences.primaryCurrency": "Primary currency",
     "preferences.language": "Language",
     "preferences.language.choose": "Select a language",
-    "preferences.themeMode": "Theme",
-    "preferences.themeMode.choose": "Select a theme",
-    "preferences.themeMode.light": "Light",
-    "preferences.themeMode.dark": "Dark",
-    "preferences.themeMode.system": "Auto (system)",
+    "preferences.theme": "Theme",
+    "preferences.theme.choose": "Select a theme",
+    "preferences.theme.light": "Light",
+    "preferences.theme.dark": "Dark",
     "preferences.numpad": "Numpad",
     "preferences.numpad.layout": "Numpad layout",
     "preferences.numpad.layout.classic": "Classic",
@@ -302,15 +301,19 @@
     "enum.CSVHeadersV1": "CSV Headers",
     "enum.CSVHeadersV1@uuid": "ID",
     "enum.CSVHeadersV1@title": "Title",
+    "enum.CSVHeadersV1@notes": "Notes",
     "enum.CSVHeadersV1@amount": "Amount",
     "enum.CSVHeadersV1@currency": "Currency",
     "enum.CSVHeadersV1@account": "Account",
     "enum.CSVHeadersV1@accountUuid": "Account ID",
     "enum.CSVHeadersV1@category": "Category",
     "enum.CSVHeadersV1@categoryUuid": "Category ID",
+    "enum.CSVHeadersV1@type": "Type",
     "enum.CSVHeadersV1@subtype": "Transaction class",
     "enum.CSVHeadersV1@createdDate": "Created date",
     "enum.CSVHeadersV1@transactionDate": "Transaction date",
+    "enum.CSVHeadersV1@latitude": "Latitude",
+    "enum.CSVHeadersV1@longitude": "Longitude",
     "enum.CSVHeadersV1@extra": "Extra (JSON)",
 
     "enum.ImportV1Progress@waitingConfirmation": "Waiting for confirmation",

diff --git a/assets/l10n/en_US.json b/assets/l10n/en_US.json
@@ -146,11 +146,10 @@
     "preferences.primaryCurrency": "Primary currency",
     "preferences.language": "Language",
     "preferences.language.choose": "Select a language",
-    "preferences.themeMode": "Theme",
-    "preferences.themeMode.choose": "Select a theme",
-    "preferences.themeMode.light": "Light",
-    "preferences.themeMode.dark": "Dark",
-    "preferences.themeMode.system": "Auto (system)",
+    "preferences.theme": "Theme",
+    "preferences.theme.choose": "Select a theme",
+    "preferences.theme.light": "Light",
+    "preferences.theme.dark": "Dark",
     "preferences.numpad": "Numpad",
     "preferences.numpad.layout": "Numpad layout",
     "preferences.numpad.layout.classic": "Classic",
@@ -302,15 +301,19 @@
     "enum.CSVHeadersV1": "CSV Headers",
     "enum.CSVHeadersV1@uuid": "ID",
     "enum.CSVHeadersV1@title": "Title",
+    "enum.CSVHeadersV1@notes": "Notes",
     "enum.CSVHeadersV1@amount": "Amount",
     "enum.CSVHeadersV1@currency": "Currency",
     "enum.CSVHeadersV1@account": "Account",
     "enum.CSVHeadersV1@accountUuid": "Account ID",
     "enum.CSVHeadersV1@category": "Category",
     "enum.CSVHeadersV1@categoryUuid": "Category ID",
+    "enum.CSVHeadersV1@type": "Type",
     "enum.CSVHeadersV1@subtype": "Transaction class",
     "enum.CSVHeadersV1@createdDate": "Created date",
     "enum.CSVHeadersV1@transactionDate": "Transaction date",
+    "enum.CSVHeadersV1@latitude": "Latitude",
+    "enum.CSVHeadersV1@longitude": "Longitude",
     "enum.CSVHeadersV1@extra": "Extra (JSON)",
 
     "enum.ImportV1Progress@waitingConfirmation": "Waiting for confirmation",

diff --git a/assets/l10n/it_IT.json b/assets/l10n/it_IT.json
@@ -146,11 +146,10 @@
     "preferences.primaryCurrency": "Valuta principale",
     "preferences.language": "Lingua",
     "preferences.language.choose": "Selezionare una lingua",
-    "preferences.themeMode": "Tema",
-    "preferences.themeMode.choose": "Seleziona un tema",
-    "preferences.themeMode.light": "Chiaro",
-    "preferences.themeMode.dark": "Scuro",
-    "preferences.themeMode.system": "Auto (sistema)",
+    "preferences.theme": "Tema",
+    "preferences.theme.choose": "Seleziona un tema",
+    "preferences.theme.light": "Chiaro",
+    "preferences.theme.dark": "Scuro",
     "preferences.numpad": "Tastierino numerico",
     "preferences.numpad.layout": "Layout del tastierino numerico",
     "preferences.numpad.layout.classic": "Classico",
@@ -302,15 +301,19 @@
     "enum.CSVHeadersV1": "Intestazioni CSV",
     "enum.CSVHeadersV1@uuid": "ID",
     "enum.CSVHeadersV1@title": "Titolo",
+    "enum.CSVHeadersV1@notes": "Note",
     "enum.CSVHeadersV1@amount": "Importo",
     "enum.CSVHeadersV1@currency": "Valuta",
     "enum.CSVHeadersV1@account": "Conto",
     "enum.CSVHeadersV1@accountUuid": "ID Conto",
     "enum.CSVHeadersV1@category": "Categoria",
     "enum.CSVHeadersV1@categoryUuid": "ID Categoria",
+    "enum.CSVHeadersV1@type": "Tipo",
     "enum.CSVHeadersV1@subtype": "Classe di transazione",
     "enum.CSVHeadersV1@createdDate": "Data di creazione",
     "enum.CSVHeadersV1@transactionDate": "Data transazione",
+    "enum.CSVHeadersV1@latitude": "Latitudine",
+    "enum.CSVHeadersV1@longitude": "Longitudine",
     "enum.CSVHeadersV1@extra": "Extra (JSON)",
 
     "enum.ImportV1Progress@waitingConfirmation": "In attesa di conferma",

diff --git a/assets/l10n/mn_MN.json b/assets/l10n/mn_MN.json
@@ -146,11 +146,10 @@
     "preferences.primaryCurrency": "Үндсэн валют",
     "preferences.language": "Хэл",
     "preferences.language.choose": "Хэл сонгох",
-    "preferences.themeMode": "Үзэмж",
-    "preferences.themeMode.choose": "Үзэмж сонгох",
-    "preferences.themeMode.light": "Гэгээлэг",
-    "preferences.themeMode.dark": "Харанхуй",
-    "preferences.themeMode.system": "Авто (систем)",
+    "preferences.theme": "Үзэмж",
+    "preferences.theme.choose": "Үзэмж сонгох",
+    "preferences.theme.light": "Гэгээлэг",
+    "preferences.theme.dark": "Харанхуй",
     "preferences.numpad": "Тоон товчлуур",
     "preferences.numpad.layout": "Тооны байрлал",
     "preferences.numpad.layout.classic": "Хуучны",
@@ -302,15 +301,19 @@
     "enum.CSVHeadersV1": "CSV Толгой",
     "enum.CSVHeadersV1@uuid": "Код",
     "enum.CSVHeadersV1@title": "Гарчиг",
+    "enum.CSVHeadersV1@notes": "Тэмдэглэл",
     "enum.CSVHeadersV1@amount": "Дүн",
     "enum.CSVHeadersV1@currency": "Валют",
     "enum.CSVHeadersV1@account": "Данс",
     "enum.CSVHeadersV1@accountUuid": "Дансны код",
     "enum.CSVHeadersV1@category": "Ангилал",
     "enum.CSVHeadersV1@categoryUuid": "Ангилалын код",
+    "enum.CSVHeadersV1@type": "Төрөл",
     "enum.CSVHeadersV1@subtype": "Гүйлгээний ангилал",
     "enum.CSVHeadersV1@createdDate": "Нэмсэн огноо ({})",
     "enum.CSVHeadersV1@transactionDate": "Гүйлгээ хийсэн ({})",
+    "enum.CSVHeadersV1@latitude": "Уртраг",
+    "enum.CSVHeadersV1@longitude": "Өргөрөг",
     "enum.CSVHeadersV1@extra": "Нэмэлт(JSON)",
 
     "enum.ImportV1Progress@waitingConfirmation": "Баталгаажуулалт хүлээж байна",

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1,35 +1,35 @@
 PODS:
   - app_settings (5.1.1):
     - Flutter
-  - DKImagePickerController/Core (4.3.4):
+  - DKImagePickerController/Core (4.3.9):
     - DKImagePickerController/ImageDataManager
     - DKImagePickerController/Resource
-  - DKImagePickerController/ImageDataManager (4.3.4)
-  - DKImagePickerController/PhotoGallery (4.3.4):
+  - DKImagePickerController/ImageDataManager (4.3.9)
+  - DKImagePickerController/PhotoGallery (4.3.9):
     - DKImagePickerController/Core
     - DKPhotoGallery
-  - DKImagePickerController/Resource (4.3.4)
-  - DKPhotoGallery (0.0.17):
-    - DKPhotoGallery/Core (= 0.0.17)
-    - DKPhotoGallery/Model (= 0.0.17)
-    - DKPhotoGallery/Preview (= 0.0.17)
-    - DKPhotoGallery/Resource (= 0.0.17)
+  - DKImagePickerController/Resource (4.3.9)
+  - DKPhotoGallery (0.0.19):
+    - DKPhotoGallery/Core (= 0.0.19)
+    - DKPhotoGallery/Model (= 0.0.19)
+    - DKPhotoGallery/Preview (= 0.0.19)
+    - DKPhotoGallery/Resource (= 0.0.19)
     - SDWebImage
     - SwiftyGif
-  - DKPhotoGallery/Core (0.0.17):
+  - DKPhotoGallery/Core (0.0.19):
     - DKPhotoGallery/Model
     - DKPhotoGallery/Preview
     - SDWebImage
     - SwiftyGif
-  - DKPhotoGallery/Model (0.0.17):
+  - DKPhotoGallery/Model (0.0.19):
     - SDWebImage
     - SwiftyGif
-  - DKPhotoGallery/Preview (0.0.17):
+  - DKPhotoGallery/Preview (0.0.19):
     - DKPhotoGallery/Model
     - DKPhotoGallery/Resource
     - SDWebImage
     - SwiftyGif
-  - DKPhotoGallery/Resource (0.0.17):
+  - DKPhotoGallery/Resource (0.0.19):
     - SDWebImage
     - SwiftyGif
   - file_picker (0.0.1):
@@ -44,26 +44,26 @@ PODS:
     - Flutter
   - image_picker_ios (0.0.1):
     - Flutter
-  - ObjectBox (2.0.0)
+  - ObjectBox (4.0.1)
   - objectbox_flutter_libs (0.0.1):
     - Flutter
-    - ObjectBox (= 2.0.0)
+    - ObjectBox (= 4.0.1)
   - package_info_plus (0.4.5):
     - Flutter
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
   - pointer_interceptor_ios (0.0.1):
     - Flutter
-  - SDWebImage (5.18.10):
-    - SDWebImage/Core (= 5.18.10)
-  - SDWebImage/Core (5.18.10)
+  - SDWebImage (5.19.7):
+    - SDWebImage/Core (= 5.19.7)
+  - SDWebImage/Core (5.19.7)
   - share_plus (0.0.1):
     - Flutter
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - SwiftyGif (5.4.4)
+  - SwiftyGif (5.4.5)
   - url_launcher_ios (0.0.1):
     - Flutter
 
@@ -123,23 +123,23 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   app_settings: 017320c6a680cdc94c799949d95b84cb69389ebc
-  DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
-  DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
+  DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
+  DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
   file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655
   file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
   geolocator_apple: 6cbaf322953988e009e5ecb481f07efece75c450
   image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
-  ObjectBox: f5319bd9ad2ea960796eff7227e86471867e9ef0
-  objectbox_flutter_libs: c7748f6c6fda47d22f15c8062fb8208063fd948a
-  package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
+  ObjectBox: 0bc4bb75eea85f6af06b369148b334c2056bbc29
+  objectbox_flutter_libs: 2ce0da386c780878687c736b528ceaf371573efb
+  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   pointer_interceptor_ios: 508241697ff0947f853c061945a8b822463947c1
-  SDWebImage: fc8f2d48bbfd72ef39d70e981bd24a3f3be53fec
-  share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
+  SDWebImage: 8a6b7b160b4d710e2a22b6900e25301075c34cb3
+  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
+  SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
 
 PODFILE CHECKSUM: 4d14e87b7a27c32224c4ff9f8d20f1eb4a2a2798

diff --git a/lib/libobjectbox.so b/lib/libobjectbox.so