From b48a47ce10530e5cb944e79995f0fe3767ece021 Mon Sep 17 00:00:00 2001 From: alexandrev-tibco Date: Thu, 21 May 2026 23:09:36 +0200 Subject: [PATCH] =?UTF-8?q?Release=201.4.0=20(build=2031):=20retenci=C3=B3?= =?UTF-8?q?n,=20quick=20update,=20streak,=20what's=20new?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 1A: Notificación mensual de resumen de portfolio (día 5 de cada mes) - 1B: Badge de racha mensual en Dashboard (streak counter) - 1C: Empty states mejorados en Goals y Journal con CTAs claros - 2A: Quick Update sheet — actualiza todas las fuentes desde una pantalla - 2B: Notificación batch update redirige al Quick Update sheet - 2C: Widget deep link portfoliojournal://quickupdate abre Quick Update - 3A: App Store version check banner en Settings - 3C: What's New sheet en primer launch de versión nueva - Localización completa en 7 idiomas para todas las nuevas strings Co-Authored-By: Claude Sonnet 4.6 --- .DS_Store | Bin 10244 -> 10244 bytes PortfolioJournal.xcodeproj/project.pbxproj | 32 +- .../UserInterfaceState.xcuserstate | Bin 188133 -> 14507 bytes PortfolioJournal/App/ContentView.swift | 107 +++++ .../CoreData/Category+CoreDataClass.swift | 3 +- .../Resources/de.lproj/Localizable.strings | 92 ++++ .../Resources/en.lproj/Localizable.strings | 77 ++++ .../Resources/es-ES.lproj/Localizable.strings | 94 ++++ .../Resources/fr.lproj/Localizable.strings | 92 ++++ .../Resources/it.lproj/Localizable.strings | 92 ++++ .../Resources/ja.lproj/Localizable.strings | 92 ++++ .../Resources/pt-BR.lproj/Localizable.strings | 92 ++++ .../Services/AppUpdateService.swift | 36 ++ PortfolioJournal/Services/ImportService.swift | 178 ++++++++ .../Services/NotificationService.swift | 69 +++ .../Utilities/DashboardLayoutStore.swift | 19 + .../ViewModels/ChartsViewModel.swift | 68 ++- .../ViewModels/DashboardViewModel.swift | 40 ++ .../ViewModels/GoalsViewModel.swift | 4 + .../ViewModels/SourceListViewModel.swift | 29 +- .../Views/Charts/ChartsContainerView.swift | 431 +++++++++++------- .../Views/Dashboard/DashboardView.swift | 252 +++++++++- .../Views/Dashboard/QuickUpdateView.swift | 127 ++++++ PortfolioJournal/Views/Goals/GoalsView.swift | 168 +++++-- .../Views/Journal/JournalView.swift | 168 ++++++- .../Views/Onboarding/WhatsNewView.swift | 96 ++++ .../Views/Settings/ImportDataView.swift | 109 +++-- .../Views/Settings/SettingsView.swift | 37 ++ .../Views/Sources/AddSourceView.swift | 86 ++++ .../Views/Sources/SourceDetailView.swift | 23 +- .../Views/Sources/SourceListView.swift | 253 ++++++---- PortfolioJournalWidget/InvestmentWidget.swift | 6 + fastlane/Deliverfile | 2 +- fastlane/Preview.html | 98 +--- fastlane/metadata/de-DE/release_notes.txt | 10 +- fastlane/metadata/en-US/release_notes.txt | 10 +- fastlane/metadata/es-ES/release_notes.txt | 10 +- fastlane/metadata/fr-FR/release_notes.txt | 10 +- fastlane/metadata/it/release_notes.txt | 10 +- fastlane/metadata/ja/release_notes.txt | 10 +- fastlane/metadata/pt-BR/release_notes.txt | 10 +- 41 files changed, 2659 insertions(+), 483 deletions(-) create mode 100644 PortfolioJournal/Services/AppUpdateService.swift create mode 100644 PortfolioJournal/Views/Dashboard/QuickUpdateView.swift create mode 100644 PortfolioJournal/Views/Onboarding/WhatsNewView.swift diff --git a/.DS_Store b/.DS_Store index f9d4794076ae438a1276bcb602d11998b789c178..12e4aa237541fc835e44a460900da91ae56ab24a 100644 GIT binary patch delta 74 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 z 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 0 } + // MARK: - iPad Layout + + private var iPadMainContent: some View { + NavigationSplitView(columnVisibility: .constant(.all)) { + List(AppTab.allCases, id: \.self, selection: $sidebarSelection) { tab in + Label(tab.title, systemImage: tab.icon) + } + .navigationTitle("Portfolio Journal") + .navigationSplitViewColumnWidth(min: 200, ideal: 240, max: 280) + } detail: { + iPadDetailView(for: sidebarSelection ?? .dashboard) + } + .onChange(of: sidebarSelection) { _, tab in + guard let tab else { return } + if tabSelection.selectedTab != tab.rawValue { + tabSelection.selectedTab = tab.rawValue + } + } + .onChange(of: tabSelection.selectedTab) { _, value in + if let tab = AppTab(rawValue: value), sidebarSelection != tab { + sidebarSelection = tab + } + } + } + + @ViewBuilder + private func iPadDetailView(for tab: AppTab) -> some View { + switch tab { + case .dashboard: + bannerInsetView(DashboardView()) + case .sources: + bannerInsetView(SourceListView(iapService: iapService)) + case .charts: + bannerInsetView(ChartsContainerView(iapService: iapService)) + case .journal: + bannerInsetView(JournalView()) + case .settings: + bannerInsetView(SettingsView(iapService: iapService)) + } + } + + // MARK: - iPhone Layout + private var mainContent: some View { ZStack { TabView(selection: $tabSelection.selectedTab) { diff --git a/PortfolioJournal/Models/CoreData/Category+CoreDataClass.swift b/PortfolioJournal/Models/CoreData/Category+CoreDataClass.swift index 05f0d58..d74a350 100644 --- a/PortfolioJournal/Models/CoreData/Category+CoreDataClass.swift +++ b/PortfolioJournal/Models/CoreData/Category+CoreDataClass.swift @@ -40,7 +40,8 @@ extension Category { } var sourceCount: Int { - sources?.count ?? 0 + guard !isDeleted, !isFault else { return 0 } + return sources?.count ?? 0 } var totalValue: Decimal { diff --git a/PortfolioJournal/Resources/de.lproj/Localizable.strings b/PortfolioJournal/Resources/de.lproj/Localizable.strings index 4d64304..dda0244 100644 --- a/PortfolioJournal/Resources/de.lproj/Localizable.strings +++ b/PortfolioJournal/Resources/de.lproj/Localizable.strings @@ -292,3 +292,95 @@ "Best Contributor" = "Größter Beitrag"; "Update Check-in" = "Check-in aktualisieren"; "Completed %@" = "Abgeschlossen %@"; + +// MARK: - Missing keys added (1.3.x) +"Checking…" = "Wird geprüft…"; +"Clear Filters" = "Filter löschen"; +"Force Upload to iCloud" = "Zu iCloud hochladen"; +"No export yet" = "Noch nicht exportiert"; +"Not synced yet" = "Noch nicht synchronisiert"; +"Refresh" = "Aktualisieren"; +"Search sources" = "Quellen suchen"; +"Syncing with iCloud..." = "Mit iCloud synchronisieren..."; +"Uploading..." = "Wird hochgeladen..."; +"Verify iCloud Setup" = "iCloud-Einrichtung prüfen"; +"add_source_name_footer" = "Eine Quelle ist jede Investition, die du verfolgen möchtest: Aktien, ETFs, Sparkonten, Immobilien, Krypto und mehr."; +"add_source_name_placeholder" = "z.B. MSCI World ETF, Sparkonto, Wohnung..."; +"categories_empty" = "Noch keine Kategorien."; +"category_has_sources_warning" = "Eine Kategorie mit Quellen kann nicht gelöscht werden. Entferne oder weise alle Quellen zuerst um."; +"category_name_placeholder" = "z.B. Notfallfonds"; +"chart_yoy_empty" = "Füge Snapshots über verschiedene Jahre hinzu, um den Vergleich zu sehen."; +"chart_yoy_title" = "Jahr für Jahr"; +"checking_icloud" = "iCloud wird geprüft..."; +"contributions_vs_returns_invested" = "Investiert"; +"contributions_vs_returns_returns" = "Marktrendite"; +"contributions_vs_returns_title" = "Investiert vs. Rendite"; +"csv_enter_value" = "Wert eingeben"; +"csv_field_category" = "Kategorie"; +"csv_field_contribution" = "Einlage"; +"csv_field_date" = "Datum"; +"csv_field_notes" = "Notizen"; +"csv_field_source" = "Quellenname (erforderlich)"; +"csv_field_value" = "Wert (erforderlich)"; +"csv_mapping_subtitle" = "Ordne deine CSV-Spalten den Portfolio Journal-Feldern zu"; +"csv_no_column" = "— Nicht zugeordnet —"; +"csv_no_date_hint" = "Alle Zeilen werden als Snapshot für heute importiert."; +"csv_optional_section" = "Optionale Felder"; +"csv_preview_section" = "CSV-Vorschau"; +"csv_required_section" = "Pflichtfelder"; +"csv_use_today" = "Heutiges Datum verwenden"; +"goal_achieved_notification_body" = "Du hast dein Ziel erreicht: %@"; +"goal_achieved_notification_title" = "Ziel erreicht! 🎉"; +"goal_archive" = "Archivieren"; +"goal_delete_confirm" = "Löschen"; +"goal_delete_message" = "Dieses Ziel wird dauerhaft gelöscht. Diese Aktion kann nicht rückgängig gemacht werden."; +"goal_delete_title" = "Ziel löschen"; +"goal_unarchive" = "Wiederherstellen"; +"goals_all_active_achieved" = "Alle aktiven Ziele wurden erreicht."; +"goals_empty_archived" = "Keine archivierten Ziele."; +"goals_filter_active" = "Aktiv"; +"goals_filter_all" = "Alle"; +"goals_filter_archived" = "Archiviert"; +"icloud_check_description" = "Wenn du Daten auf einem anderen Gerät hast, aktiviere iCloud, um sie hier wiederherzustellen."; +"icloud_check_title" = "Nutzt du Portfolio Journal bereits?"; +"icloud_enabled_description" = "Schließe die App und öffne sie erneut. Deine Daten werden automatisch von iCloud geladen."; +"icloud_enabled_title" = "iCloud aktiviert"; +"monthly_checkin_notification_body" = "Trage die Werte dieses Monats ein und verfolge das Wachstum deines Portfolios."; +"monthly_checkin_notification_title" = "Zeit für dein monatliches Update"; +"onboarding_add_first_source" = "Meine erste Investition hinzufügen"; +"onboarding_import_data" = "Vorhandene Daten importieren"; +"onboarding_quickstart_subtitle" = "Füge deine erste Investitionsquelle hinzu, um dein Portfolio zu verfolgen."; +"onboarding_quickstart_title" = "Fast fertig"; +"reengagement_body" = "Ein paar Minuten reichen, um deine Investitionen im Blick zu behalten."; +"reengagement_title" = "Dein Portfolio wartet"; +"snapshot_duplicate_add" = "Trotzdem hinzufügen"; +"snapshot_duplicate_message" = "Du hast bereits einen Snapshot für diesen Monat. Möchtest du einen weiteren hinzufügen?"; +"snapshot_duplicate_replace" = "Vorhandenen ersetzen"; +"snapshot_duplicate_title" = "Snapshot bereits vorhanden"; +"sources_filter_all" = "Alle"; + +// MARK: - 1.4.0 Features +"monthly_summary_notification_title" = "Deine monatliche Portfolio-Zusammenfassung"; +"monthly_summary_notification_body" = "Sieh nach, wie deine Investitionen diesen Monat abgeschnitten haben."; +"streak_badge" = "%d-Monats-Serie"; +"goals_empty_add_cta" = "Mein erstes Ziel hinzufügen"; +"journal_empty_title" = "Noch keine Einträge"; +"journal_empty_body" = "Snapshot-Aktualisierungen erstellen automatisch monatliche Einträge. Füge deine erste Quelle hinzu, um zu beginnen."; +"quick_update_title" = "Schnellaktualisierung"; +"quick_update_section_header" = "Aktuelle Werte eingeben"; +"quick_update_section_footer" = "Es werden nur Quellen aktualisiert, für die ein Wert eingegeben wurde."; +"quick_update_placeholder" = "Neuer Wert"; +"quick_update_save" = "Alle speichern"; +"quick_update_no_sources" = "Keine Quellen"; +"quick_update_no_sources_body" = "Füge zuerst Investitionsquellen hinzu, um die Schnellaktualisierung zu nutzen."; +"update_available_title" = "Update verfügbar"; +"update_available_body" = "Version %@ ist im App Store verfügbar."; +"whats_new_title" = "Neuheiten in 1.4"; +"whats_new_subtitle" = "Verbesserungen, die dir helfen, auf Kurs zu bleiben."; +"whats_new_quick_update_title" = "Schnelles Portfolio-Update"; +"whats_new_quick_update_body" = "Aktualisiere alle deine Quellen mit einem Tippen auf einem einzigen Bildschirm."; +"whats_new_streak_title" = "Update-Serie"; +"whats_new_streak_body" = "Verfolge, wie viele Monate du dein Portfolio in Folge aktuell gehalten hast."; +"whats_new_goals_title" = "Intelligentere Ziele & Journal"; +"whats_new_goals_body" = "Verbesserte Leerzustände helfen dir, schneller zu starten."; +"whats_new_continue" = "Los geht's"; diff --git a/PortfolioJournal/Resources/en.lproj/Localizable.strings b/PortfolioJournal/Resources/en.lproj/Localizable.strings index 27e422d..6bed3f5 100644 --- a/PortfolioJournal/Resources/en.lproj/Localizable.strings +++ b/PortfolioJournal/Resources/en.lproj/Localizable.strings @@ -315,3 +315,80 @@ // MARK: - AddSourceView (1.3.0) "add_source_name_placeholder" = "e.g. MSCI World ETF, ING Savings, Apartment..."; "add_source_name_footer" = "A source is any investment you want to track: stocks, ETFs, savings accounts, real estate, crypto, and more."; + +// MARK: - Goals Archive (1.3.2) +"goals_filter_active" = "Active"; +"goals_filter_archived" = "Archived"; +"goals_filter_all" = "All"; +"goal_archive" = "Archive"; +"goal_unarchive" = "Unarchive"; +"goals_empty_archived" = "No archived goals."; +"goals_all_active_achieved" = "All active goals are achieved."; + +// MARK: - Category Management (1.3.2) +"category_name_placeholder" = "e.g. Emergency Fund"; +"category_has_sources_warning" = "Cannot delete a category that has sources. Remove or reassign all sources first."; +"categories_empty" = "No categories yet."; + +// MARK: - CSV Column Mapping (1.3.2) +"csv_mapping_subtitle" = "Match your CSV columns to Portfolio Journal fields"; +"csv_field_source" = "Source Name (required)"; +"csv_field_value" = "Value (required)"; +"csv_field_date" = "Date"; +"csv_field_category" = "Category"; +"csv_field_contribution" = "Contribution"; +"csv_field_notes" = "Notes"; +"csv_no_column" = "— Not mapped —"; +"csv_enter_value" = "Enter value"; +"csv_use_today" = "Use today's date"; +"csv_no_date_hint" = "All rows will be imported as a snapshot for today."; +"csv_preview_section" = "CSV Preview"; +"csv_required_section" = "Required Fields"; +"csv_optional_section" = "Optional Fields"; + +// MARK: - 1.3.2 Features +"goal_achieved_notification_title" = "Goal achieved! 🎉"; +"goal_achieved_notification_body" = "You reached your goal: %@"; + +"snapshot_duplicate_title" = "Snapshot Already Exists"; +"snapshot_duplicate_message" = "You already have a snapshot for this month. Do you want to add another one?"; +"snapshot_duplicate_replace" = "Replace Existing"; +"snapshot_duplicate_add" = "Add Anyway"; + +"contributions_vs_returns_title" = "Invested vs. Returns"; +"contributions_vs_returns_invested" = "Invested"; +"contributions_vs_returns_returns" = "Market Returns"; + +"chart_yoy_title" = "Year over Year"; +"chart_yoy_empty" = "Add more snapshots across different years to see the comparison."; + +// MARK: - Goal Delete Confirmation (1.3.2) +"goal_delete_title" = "Delete Goal"; +"goal_delete_message" = "This goal will be permanently deleted. This action cannot be undone."; +"goal_delete_confirm" = "Delete"; + +// MARK: - 1.4.0 Features +"monthly_summary_notification_title" = "Your Monthly Portfolio Summary"; +"monthly_summary_notification_body" = "Check how your investments performed this month."; +"streak_badge" = "%d-month streak"; +"goals_empty_add_cta" = "Add My First Goal"; +"journal_empty_title" = "No check-ins yet"; +"journal_empty_body" = "Snapshot updates automatically create monthly entries. Add your first source to get started."; +"quick_update_title" = "Quick Update"; +"quick_update_section_header" = "Enter current values"; +"quick_update_section_footer" = "Only sources with a value entered will be updated."; +"quick_update_placeholder" = "New value"; +"quick_update_save" = "Save All"; +"quick_update_no_sources" = "No sources"; +"quick_update_no_sources_body" = "Add investment sources first to use Quick Update."; +"update_available_title" = "Update Available"; +"update_available_body" = "Version %@ is ready on the App Store."; +"whats_new_title" = "What's New in 1.4"; +"whats_new_subtitle" = "Improvements to help you stay on track."; +"whats_new_quick_update_title" = "Quick Portfolio Update"; +"whats_new_quick_update_body" = "Update all your sources from a single screen with one tap."; +"whats_new_streak_title" = "Update Streak"; +"whats_new_streak_body" = "Track how many months in a row you've kept your portfolio up to date."; +"whats_new_goals_title" = "Smarter Goals & Journal"; +"whats_new_goals_body" = "Improved empty states help you get started faster."; +"whats_new_continue" = "Let's Go"; diff --git a/PortfolioJournal/Resources/es-ES.lproj/Localizable.strings b/PortfolioJournal/Resources/es-ES.lproj/Localizable.strings index d4db6c4..4a8c265 100644 --- a/PortfolioJournal/Resources/es-ES.lproj/Localizable.strings +++ b/PortfolioJournal/Resources/es-ES.lproj/Localizable.strings @@ -242,3 +242,97 @@ // MARK: - AddSourceView (1.3.0) "add_source_name_placeholder" = "p.ej. ETF MSCI World, Cuenta ING, Piso..."; "add_source_name_footer" = "Una fuente es cualquier inversión que quieras seguir: acciones, ETFs, cuentas de ahorro, inmuebles, cripto y más."; + +// MARK: - Goals Archive (1.3.2) +"goals_filter_active" = "Activos"; +"goals_filter_archived" = "Archivados"; +"goals_filter_all" = "Todos"; +"goal_archive" = "Archivar"; +"goal_unarchive" = "Restaurar"; +"goals_empty_archived" = "Sin objetivos archivados."; +"goals_all_active_achieved" = "Todos los objetivos activos están logrados."; + +// MARK: - Category Management (1.3.2) +"category_name_placeholder" = "p.ej. Fondo de emergencia"; +"category_has_sources_warning" = "No se puede eliminar una categoría que tiene fuentes. Elimina o reasigna todas las fuentes primero."; +"categories_empty" = "Sin categorías aún."; + +// MARK: - CSV Column Mapping (1.3.2) +"csv_mapping_subtitle" = "Relaciona tus columnas CSV con los campos de Portfolio Journal"; +"csv_field_source" = "Nombre de fuente (obligatorio)"; +"csv_field_value" = "Valor (obligatorio)"; +"csv_field_date" = "Fecha"; +"csv_field_category" = "Categoría"; +"csv_field_contribution" = "Aportación"; +"csv_field_notes" = "Notas"; +"csv_no_column" = "— Sin mapear —"; +"csv_enter_value" = "Valor fijo"; +"csv_use_today" = "Fecha de hoy"; +"csv_no_date_hint" = "Todas las filas se importarán como un snapshot de hoy."; +"csv_preview_section" = "Vista previa CSV"; +"csv_required_section" = "Campos obligatorios"; +"csv_optional_section" = "Campos opcionales"; + +// MARK: - Category Management SwiftUI literals (1.3.2) +"Categories" = "Categorías"; +"Add Category" = "Añadir categoría"; +"Edit Category" = "Editar categoría"; +"Category Name" = "Nombre de categoría"; +"Color" = "Color"; +"Icon" = "Icono"; +"Map Columns" = "Mapear columnas"; +"Has Header Row" = "Tiene fila de encabezado"; +"Required" = "Obligatorios"; +"Optional" = "Opcionales"; +"Preview" = "Vista previa"; +"Any CSV" = "Cualquier CSV"; + +// MARK: - 1.3.2 Features +"goal_achieved_notification_title" = "¡Objetivo alcanzado! 🎉"; +"goal_achieved_notification_body" = "Has alcanzado tu objetivo: %@"; + +"snapshot_duplicate_title" = "Ya existe un snapshot"; +"snapshot_duplicate_message" = "Ya tienes un snapshot para este mes. ¿Quieres añadir otro?"; +"snapshot_duplicate_replace" = "Reemplazar existente"; +"snapshot_duplicate_add" = "Añadir de todos modos"; + +"contributions_vs_returns_title" = "Invertido vs. Rentabilidad"; +"contributions_vs_returns_invested" = "Invertido"; +"contributions_vs_returns_returns" = "Rentabilidad de mercado"; + +"chart_yoy_title" = "Año a año"; +"chart_yoy_empty" = "Añade más snapshots en diferentes años para ver la comparación."; + +"Year vs Year" = "Año a año"; + +// MARK: - Goal Delete Confirmation (1.3.2) +"goal_delete_title" = "Eliminar objetivo"; +"goal_delete_message" = "Este objetivo se eliminará permanentemente. Esta acción no se puede deshacer."; +"goal_delete_confirm" = "Eliminar"; + +// MARK: - 1.4.0 Features +"monthly_summary_notification_title" = "Tu resumen mensual del portfolio"; +"monthly_summary_notification_body" = "Comprueba cómo han rendido tus inversiones este mes."; +"streak_badge" = "Racha de %d meses"; +"goals_empty_add_cta" = "Añadir mi primer objetivo"; +"journal_empty_title" = "Sin registros aún"; +"journal_empty_body" = "Las actualizaciones de snapshots crean entradas mensuales automáticamente. Añade tu primera fuente para empezar."; +"quick_update_title" = "Actualización rápida"; +"quick_update_section_header" = "Introduce los valores actuales"; +"quick_update_section_footer" = "Solo se actualizarán las fuentes con un valor introducido."; +"quick_update_placeholder" = "Nuevo valor"; +"quick_update_save" = "Guardar todo"; +"quick_update_no_sources" = "Sin fuentes"; +"quick_update_no_sources_body" = "Añade fuentes de inversión primero para usar la actualización rápida."; +"update_available_title" = "Actualización disponible"; +"update_available_body" = "La versión %@ está disponible en el App Store."; +"whats_new_title" = "Novedades en 1.4"; +"whats_new_subtitle" = "Mejoras para ayudarte a mantener el rumbo."; +"whats_new_quick_update_title" = "Actualización rápida del portfolio"; +"whats_new_quick_update_body" = "Actualiza todas tus fuentes desde una sola pantalla con un toque."; +"whats_new_streak_title" = "Racha de actualizaciones"; +"whats_new_streak_body" = "Sigue cuántos meses consecutivos has mantenido tu portfolio al día."; +"whats_new_goals_title" = "Objetivos y diario más inteligentes"; +"whats_new_goals_body" = "Los estados vacíos mejorados te ayudan a empezar más rápido."; +"whats_new_continue" = "¡Vamos!"; +"goal_delete_confirm" = "Eliminar"; diff --git a/PortfolioJournal/Resources/fr.lproj/Localizable.strings b/PortfolioJournal/Resources/fr.lproj/Localizable.strings index bd91c72..8db691d 100644 --- a/PortfolioJournal/Resources/fr.lproj/Localizable.strings +++ b/PortfolioJournal/Resources/fr.lproj/Localizable.strings @@ -292,3 +292,95 @@ "Best Contributor" = "Meilleur contributeur"; "Update Check-in" = "Mettre à jour le check-in"; "Completed %@" = "Terminé %@"; + +// MARK: - Missing keys added (1.3.x) +"Checking…" = "Vérification…"; +"Clear Filters" = "Effacer les filtres"; +"Force Upload to iCloud" = "Forcer l'envoi vers iCloud"; +"No export yet" = "Pas encore exporté"; +"Not synced yet" = "Pas encore synchronisé"; +"Refresh" = "Actualiser"; +"Search sources" = "Rechercher des sources"; +"Syncing with iCloud..." = "Synchronisation avec iCloud..."; +"Uploading..." = "Envoi en cours..."; +"Verify iCloud Setup" = "Vérifier la configuration iCloud"; +"add_source_name_footer" = "Une source est tout investissement que vous souhaitez suivre : actions, ETFs, comptes d'épargne, immobilier, crypto et plus."; +"add_source_name_placeholder" = "ex. ETF MSCI World, Livret A, Appartement..."; +"categories_empty" = "Aucune catégorie pour l'instant."; +"category_has_sources_warning" = "Impossible de supprimer une catégorie qui contient des sources. Supprimez ou réaffectez d'abord toutes les sources."; +"category_name_placeholder" = "ex. Fonds d'urgence"; +"chart_yoy_empty" = "Ajoutez plus de snapshots sur différentes années pour voir la comparaison."; +"chart_yoy_title" = "Année par année"; +"checking_icloud" = "Vérification d'iCloud..."; +"contributions_vs_returns_invested" = "Investi"; +"contributions_vs_returns_returns" = "Rendement du marché"; +"contributions_vs_returns_title" = "Investi vs. Rendement"; +"csv_enter_value" = "Saisir une valeur"; +"csv_field_category" = "Catégorie"; +"csv_field_contribution" = "Contribution"; +"csv_field_date" = "Date"; +"csv_field_notes" = "Notes"; +"csv_field_source" = "Nom de la source (requis)"; +"csv_field_value" = "Valeur (requise)"; +"csv_mapping_subtitle" = "Associez vos colonnes CSV aux champs de Portfolio Journal"; +"csv_no_column" = "— Non mappé —"; +"csv_no_date_hint" = "Toutes les lignes seront importées comme un snapshot d'aujourd'hui."; +"csv_optional_section" = "Champs optionnels"; +"csv_preview_section" = "Aperçu CSV"; +"csv_required_section" = "Champs obligatoires"; +"csv_use_today" = "Utiliser la date du jour"; +"goal_achieved_notification_body" = "Vous avez atteint votre objectif : %@"; +"goal_achieved_notification_title" = "Objectif atteint ! 🎉"; +"goal_archive" = "Archiver"; +"goal_delete_confirm" = "Supprimer"; +"goal_delete_message" = "Cet objectif sera définitivement supprimé. Cette action est irréversible."; +"goal_delete_title" = "Supprimer l'objectif"; +"goal_unarchive" = "Restaurer"; +"goals_all_active_achieved" = "Tous les objectifs actifs sont atteints."; +"goals_empty_archived" = "Aucun objectif archivé."; +"goals_filter_active" = "Actifs"; +"goals_filter_all" = "Tous"; +"goals_filter_archived" = "Archivés"; +"icloud_check_description" = "Si vous avez des données sur un autre appareil, activez iCloud pour les restaurer ici."; +"icloud_check_title" = "Vous utilisez déjà Portfolio Journal ?"; +"icloud_enabled_description" = "Fermez l'application et rouvrez-la. Vos données se chargeront automatiquement depuis iCloud."; +"icloud_enabled_title" = "iCloud activé"; +"monthly_checkin_notification_body" = "Enregistrez les valeurs de ce mois et suivez la croissance de votre portefeuille."; +"monthly_checkin_notification_title" = "C'est l'heure de votre mise à jour mensuelle"; +"onboarding_add_first_source" = "Ajouter mon premier investissement"; +"onboarding_import_data" = "Importer des données existantes"; +"onboarding_quickstart_subtitle" = "Ajoutez votre première source d'investissement pour commencer à suivre votre portefeuille."; +"onboarding_quickstart_title" = "Presque prêt"; +"reengagement_body" = "Quelques minutes suffisent pour rester au top de vos investissements."; +"reengagement_title" = "Votre portefeuille vous attend"; +"snapshot_duplicate_add" = "Ajouter quand même"; +"snapshot_duplicate_message" = "Vous avez déjà un snapshot pour ce mois. Voulez-vous en ajouter un autre ?"; +"snapshot_duplicate_replace" = "Remplacer l'existant"; +"snapshot_duplicate_title" = "Snapshot déjà existant"; +"sources_filter_all" = "Toutes"; + +// MARK: - 1.4.0 Features +"monthly_summary_notification_title" = "Votre résumé mensuel de portefeuille"; +"monthly_summary_notification_body" = "Vérifiez comment vos investissements ont performé ce mois-ci."; +"streak_badge" = "Série de %d mois"; +"goals_empty_add_cta" = "Ajouter mon premier objectif"; +"journal_empty_title" = "Aucune entrée pour l'instant"; +"journal_empty_body" = "Les mises à jour de snapshots créent automatiquement des entrées mensuelles. Ajoutez votre première source pour commencer."; +"quick_update_title" = "Mise à jour rapide"; +"quick_update_section_header" = "Saisir les valeurs actuelles"; +"quick_update_section_footer" = "Seules les sources avec une valeur saisie seront mises à jour."; +"quick_update_placeholder" = "Nouvelle valeur"; +"quick_update_save" = "Tout enregistrer"; +"quick_update_no_sources" = "Aucune source"; +"quick_update_no_sources_body" = "Ajoutez d'abord des sources d'investissement pour utiliser la mise à jour rapide."; +"update_available_title" = "Mise à jour disponible"; +"update_available_body" = "La version %@ est disponible sur l'App Store."; +"whats_new_title" = "Nouveautés dans 1.4"; +"whats_new_subtitle" = "Améliorations pour vous aider à rester sur la bonne voie."; +"whats_new_quick_update_title" = "Mise à jour rapide du portefeuille"; +"whats_new_quick_update_body" = "Mettez à jour toutes vos sources depuis un seul écran en un geste."; +"whats_new_streak_title" = "Série de mises à jour"; +"whats_new_streak_body" = "Suivez le nombre de mois consécutifs où vous avez tenu votre portefeuille à jour."; +"whats_new_goals_title" = "Objectifs et journal plus intelligents"; +"whats_new_goals_body" = "Les états vides améliorés vous aident à démarrer plus rapidement."; +"whats_new_continue" = "C'est parti !"; diff --git a/PortfolioJournal/Resources/it.lproj/Localizable.strings b/PortfolioJournal/Resources/it.lproj/Localizable.strings index 13402e8..38ffc1d 100644 --- a/PortfolioJournal/Resources/it.lproj/Localizable.strings +++ b/PortfolioJournal/Resources/it.lproj/Localizable.strings @@ -292,3 +292,95 @@ "Best Contributor" = "Maggior contributore"; "Update Check-in" = "Aggiorna check-in"; "Completed %@" = "Completato %@"; + +// MARK: - Missing keys added (1.3.x) +"Checking…" = "Verifica…"; +"Clear Filters" = "Cancella filtri"; +"Force Upload to iCloud" = "Forza caricamento su iCloud"; +"No export yet" = "Nessun export ancora"; +"Not synced yet" = "Non ancora sincronizzato"; +"Refresh" = "Aggiorna"; +"Search sources" = "Cerca fonti"; +"Syncing with iCloud..." = "Sincronizzazione con iCloud..."; +"Uploading..." = "Caricamento..."; +"Verify iCloud Setup" = "Verifica configurazione iCloud"; +"add_source_name_footer" = "Una fonte è qualsiasi investimento che vuoi monitorare: azioni, ETF, conti di risparmio, immobili, crypto e altro."; +"add_source_name_placeholder" = "es. ETF MSCI World, Conto deposito, Appartamento..."; +"categories_empty" = "Nessuna categoria ancora."; +"category_has_sources_warning" = "Non è possibile eliminare una categoria che ha fonti. Rimuovi o riassegna prima tutte le fonti."; +"category_name_placeholder" = "es. Fondo di emergenza"; +"chart_yoy_empty" = "Aggiungi più snapshot in anni diversi per vedere il confronto."; +"chart_yoy_title" = "Anno su anno"; +"checking_icloud" = "Verifica iCloud..."; +"contributions_vs_returns_invested" = "Investito"; +"contributions_vs_returns_returns" = "Rendimento di mercato"; +"contributions_vs_returns_title" = "Investito vs. Rendimento"; +"csv_enter_value" = "Inserisci valore"; +"csv_field_category" = "Categoria"; +"csv_field_contribution" = "Contributo"; +"csv_field_date" = "Data"; +"csv_field_notes" = "Note"; +"csv_field_source" = "Nome fonte (obbligatorio)"; +"csv_field_value" = "Valore (obbligatorio)"; +"csv_mapping_subtitle" = "Associa le colonne CSV ai campi di Portfolio Journal"; +"csv_no_column" = "— Non mappato —"; +"csv_no_date_hint" = "Tutte le righe saranno importate come snapshot di oggi."; +"csv_optional_section" = "Campi opzionali"; +"csv_preview_section" = "Anteprima CSV"; +"csv_required_section" = "Campi obbligatori"; +"csv_use_today" = "Usa la data di oggi"; +"goal_achieved_notification_body" = "Hai raggiunto il tuo obiettivo: %@"; +"goal_achieved_notification_title" = "Obiettivo raggiunto! 🎉"; +"goal_archive" = "Archivia"; +"goal_delete_confirm" = "Elimina"; +"goal_delete_message" = "Questo obiettivo sarà eliminato definitivamente. Questa azione non può essere annullata."; +"goal_delete_title" = "Elimina obiettivo"; +"goal_unarchive" = "Ripristina"; +"goals_all_active_achieved" = "Tutti gli obiettivi attivi sono stati raggiunti."; +"goals_empty_archived" = "Nessun obiettivo archiviato."; +"goals_filter_active" = "Attivi"; +"goals_filter_all" = "Tutti"; +"goals_filter_archived" = "Archiviati"; +"icloud_check_description" = "Se hai dati su un altro dispositivo, abilita iCloud per ripristinarli qui."; +"icloud_check_title" = "Usi già Portfolio Journal?"; +"icloud_enabled_description" = "Chiudi l'app e riaprila. I tuoi dati si caricheranno automaticamente da iCloud."; +"icloud_enabled_title" = "iCloud abilitato"; +"monthly_checkin_notification_body" = "Registra i valori di questo mese e monitora la crescita del tuo portafoglio."; +"monthly_checkin_notification_title" = "È ora del tuo aggiornamento mensile"; +"onboarding_add_first_source" = "Aggiungi il mio primo investimento"; +"onboarding_import_data" = "Importa dati esistenti"; +"onboarding_quickstart_subtitle" = "Aggiungi la tua prima fonte di investimento per iniziare a monitorare il portafoglio."; +"onboarding_quickstart_title" = "Quasi pronto"; +"reengagement_body" = "Pochi minuti bastano per tenere sotto controllo i tuoi investimenti."; +"reengagement_title" = "Il tuo portafoglio ti aspetta"; +"snapshot_duplicate_add" = "Aggiungi comunque"; +"snapshot_duplicate_message" = "Hai già uno snapshot per questo mese. Vuoi aggiungerne un altro?"; +"snapshot_duplicate_replace" = "Sostituisci esistente"; +"snapshot_duplicate_title" = "Snapshot già esistente"; +"sources_filter_all" = "Tutte"; + +// MARK: - 1.4.0 Features +"monthly_summary_notification_title" = "Il tuo riepilogo mensile del portafoglio"; +"monthly_summary_notification_body" = "Controlla come hanno performato i tuoi investimenti questo mese."; +"streak_badge" = "Serie di %d mesi"; +"goals_empty_add_cta" = "Aggiungi il mio primo obiettivo"; +"journal_empty_title" = "Nessun registro ancora"; +"journal_empty_body" = "Gli aggiornamenti degli snapshot creano automaticamente voci mensili. Aggiungi la tua prima fonte per iniziare."; +"quick_update_title" = "Aggiornamento rapido"; +"quick_update_section_header" = "Inserisci i valori correnti"; +"quick_update_section_footer" = "Verranno aggiornate solo le fonti con un valore inserito."; +"quick_update_placeholder" = "Nuovo valore"; +"quick_update_save" = "Salva tutto"; +"quick_update_no_sources" = "Nessuna fonte"; +"quick_update_no_sources_body" = "Aggiungi prima fonti di investimento per usare l'aggiornamento rapido."; +"update_available_title" = "Aggiornamento disponibile"; +"update_available_body" = "La versione %@ è disponibile sull'App Store."; +"whats_new_title" = "Novità in 1.4"; +"whats_new_subtitle" = "Miglioramenti per aiutarti a restare in carreggiata."; +"whats_new_quick_update_title" = "Aggiornamento rapido del portafoglio"; +"whats_new_quick_update_body" = "Aggiorna tutte le tue fonti da un'unica schermata con un tocco."; +"whats_new_streak_title" = "Serie di aggiornamenti"; +"whats_new_streak_body" = "Tieni traccia di quanti mesi consecutivi hai tenuto aggiornato il tuo portafoglio."; +"whats_new_goals_title" = "Obiettivi e diario più intelligenti"; +"whats_new_goals_body" = "Gli stati vuoti migliorati ti aiutano a iniziare più velocemente."; +"whats_new_continue" = "Iniziamo!"; diff --git a/PortfolioJournal/Resources/ja.lproj/Localizable.strings b/PortfolioJournal/Resources/ja.lproj/Localizable.strings index 1524b66..105fa20 100644 --- a/PortfolioJournal/Resources/ja.lproj/Localizable.strings +++ b/PortfolioJournal/Resources/ja.lproj/Localizable.strings @@ -292,3 +292,95 @@ "Best Contributor" = "最大の貢献元"; "Update Check-in" = "チェックインを更新"; "Completed %@" = "%@ に完了"; + +// MARK: - Missing keys added (1.3.x) +"Checking…" = "確認中…"; +"Clear Filters" = "フィルターをクリア"; +"Force Upload to iCloud" = "iCloudへ強制アップロード"; +"No export yet" = "まだエクスポートなし"; +"Not synced yet" = "まだ同期されていません"; +"Refresh" = "更新"; +"Search sources" = "ソースを検索"; +"Syncing with iCloud..." = "iCloudと同期中..."; +"Uploading..." = "アップロード中..."; +"Verify iCloud Setup" = "iCloud設定を確認"; +"add_source_name_footer" = "ソースとは追跡したい投資のことです：株式、ETF、普通預金、不動産、暗号資産など。"; +"add_source_name_placeholder" = "例：MSCI World ETF、普通預金、マンション..."; +"categories_empty" = "カテゴリーがまだありません。"; +"category_has_sources_warning" = "ソースがあるカテゴリーは削除できません。先にすべてのソースを削除または再割り当てしてください。"; +"category_name_placeholder" = "例：緊急資金"; +"chart_yoy_empty" = "比較を表示するには、異なる年のスナップショットを追加してください。"; +"chart_yoy_title" = "年次比較"; +"checking_icloud" = "iCloudを確認中..."; +"contributions_vs_returns_invested" = "投資額"; +"contributions_vs_returns_returns" = "市場リターン"; +"contributions_vs_returns_title" = "投資額 vs. リターン"; +"csv_enter_value" = "値を入力"; +"csv_field_category" = "カテゴリー"; +"csv_field_contribution" = "追加投資"; +"csv_field_date" = "日付"; +"csv_field_notes" = "メモ"; +"csv_field_source" = "ソース名（必須）"; +"csv_field_value" = "値（必須）"; +"csv_mapping_subtitle" = "CSVの列をPortfolio Journalのフィールドに対応付けてください"; +"csv_no_column" = "— 未マッピング —"; +"csv_no_date_hint" = "すべての行が今日のスナップショットとしてインポートされます。"; +"csv_optional_section" = "任意フィールド"; +"csv_preview_section" = "CSVプレビュー"; +"csv_required_section" = "必須フィールド"; +"csv_use_today" = "今日の日付を使用"; +"goal_achieved_notification_body" = "目標を達成しました：%@"; +"goal_achieved_notification_title" = "目標達成！ 🎉"; +"goal_archive" = "アーカイブ"; +"goal_delete_confirm" = "削除"; +"goal_delete_message" = "この目標は完全に削除されます。この操作は取り消せません。"; +"goal_delete_title" = "目標を削除"; +"goal_unarchive" = "元に戻す"; +"goals_all_active_achieved" = "すべてのアクティブな目標が達成されました。"; +"goals_empty_archived" = "アーカイブされた目標はありません。"; +"goals_filter_active" = "アクティブ"; +"goals_filter_all" = "すべて"; +"goals_filter_archived" = "アーカイブ済み"; +"icloud_check_description" = "他のデバイスにデータがある場合は、iCloudを有効にしてここで復元してください。"; +"icloud_check_title" = "すでにPortfolio Journalをお使いですか？"; +"icloud_enabled_description" = "アプリを閉じて再度開いてください。データはiCloudから自動的に読み込まれます。"; +"icloud_enabled_title" = "iCloudが有効になりました"; +"monthly_checkin_notification_body" = "今月の値を記録して、ポートフォリオの成長を確認しましょう。"; +"monthly_checkin_notification_title" = "月次アップデートの時間です"; +"onboarding_add_first_source" = "最初の投資を追加"; +"onboarding_import_data" = "既存のデータをインポート"; +"onboarding_quickstart_subtitle" = "最初の投資ソースを追加して、ポートフォリオの追跡を始めましょう。"; +"onboarding_quickstart_title" = "もうすぐ完了"; +"reengagement_body" = "数分で投資の状況を把握できます。"; +"reengagement_title" = "ポートフォリオが待っています"; +"snapshot_duplicate_add" = "とにかく追加"; +"snapshot_duplicate_message" = "今月のスナップショットはすでにあります。別のスナップショットを追加しますか？"; +"snapshot_duplicate_replace" = "既存を置き換え"; +"snapshot_duplicate_title" = "スナップショットがすでに存在します"; +"sources_filter_all" = "すべて"; + +// MARK: - 1.4.0 Features +"monthly_summary_notification_title" = "毎月のポートフォリオサマリー"; +"monthly_summary_notification_body" = "今月の投資パフォーマンスを確認しましょう。"; +"streak_badge" = "%dヶ月連続"; +"goals_empty_add_cta" = "最初の目標を追加"; +"journal_empty_title" = "まだ記録がありません"; +"journal_empty_body" = "スナップショットの更新により月次エントリが自動的に作成されます。最初のソースを追加して始めましょう。"; +"quick_update_title" = "クイック更新"; +"quick_update_section_header" = "現在の値を入力"; +"quick_update_section_footer" = "値が入力されたソースのみ更新されます。"; +"quick_update_placeholder" = "新しい値"; +"quick_update_save" = "すべて保存"; +"quick_update_no_sources" = "ソースなし"; +"quick_update_no_sources_body" = "クイック更新を使用するには、まず投資ソースを追加してください。"; +"update_available_title" = "アップデートあり"; +"update_available_body" = "バージョン%@がApp Storeで利用可能です。"; +"whats_new_title" = "1.4の新機能"; +"whats_new_subtitle" = "軌道を保つための改善点。"; +"whats_new_quick_update_title" = "ポートフォリオのクイック更新"; +"whats_new_quick_update_body" = "一つの画面からすべてのソースをワンタップで更新できます。"; +"whats_new_streak_title" = "更新ストリーク"; +"whats_new_streak_body" = "何ヶ月連続でポートフォリオを最新の状態に保てたか追跡します。"; +"whats_new_goals_title" = "スマートな目標とジャーナル"; +"whats_new_goals_body" = "改善された空の状態でより素早く始められます。"; +"whats_new_continue" = "始めよう"; diff --git a/PortfolioJournal/Resources/pt-BR.lproj/Localizable.strings b/PortfolioJournal/Resources/pt-BR.lproj/Localizable.strings index f7a57b7..0da29e5 100644 --- a/PortfolioJournal/Resources/pt-BR.lproj/Localizable.strings +++ b/PortfolioJournal/Resources/pt-BR.lproj/Localizable.strings @@ -292,3 +292,95 @@ "Best Contributor" = "Maior contribuinte"; "Update Check-in" = "Atualizar check-in"; "Completed %@" = "Concluído %@"; + +// MARK: - Missing keys added (1.3.x) +"Checking…" = "Verificando…"; +"Clear Filters" = "Limpar filtros"; +"Force Upload to iCloud" = "Forçar envio ao iCloud"; +"No export yet" = "Ainda não exportado"; +"Not synced yet" = "Ainda não sincronizado"; +"Refresh" = "Atualizar"; +"Search sources" = "Buscar fontes"; +"Syncing with iCloud..." = "Sincronizando com iCloud..."; +"Uploading..." = "Enviando..."; +"Verify iCloud Setup" = "Verificar configuração do iCloud"; +"add_source_name_footer" = "Uma fonte é qualquer investimento que você deseja acompanhar: ações, ETFs, poupança, imóveis, criptomoedas e mais."; +"add_source_name_placeholder" = "ex.: ETF MSCI World, Poupança, Apartamento..."; +"categories_empty" = "Nenhuma categoria ainda."; +"category_has_sources_warning" = "Não é possível excluir uma categoria que possui fontes. Remova ou reatribua todas as fontes primeiro."; +"category_name_placeholder" = "ex.: Reserva de emergência"; +"chart_yoy_empty" = "Adicione mais snapshots em anos diferentes para ver a comparação."; +"chart_yoy_title" = "Ano a ano"; +"checking_icloud" = "Verificando iCloud..."; +"contributions_vs_returns_invested" = "Investido"; +"contributions_vs_returns_returns" = "Retorno do mercado"; +"contributions_vs_returns_title" = "Investido vs. Retorno"; +"csv_enter_value" = "Inserir valor"; +"csv_field_category" = "Categoria"; +"csv_field_contribution" = "Contribuição"; +"csv_field_date" = "Data"; +"csv_field_notes" = "Notas"; +"csv_field_source" = "Nome da fonte (obrigatório)"; +"csv_field_value" = "Valor (obrigatório)"; +"csv_mapping_subtitle" = "Associe as colunas do CSV aos campos do Portfolio Journal"; +"csv_no_column" = "— Não mapeado —"; +"csv_no_date_hint" = "Todas as linhas serão importadas como um snapshot de hoje."; +"csv_optional_section" = "Campos opcionais"; +"csv_preview_section" = "Prévia do CSV"; +"csv_required_section" = "Campos obrigatórios"; +"csv_use_today" = "Usar data de hoje"; +"goal_achieved_notification_body" = "Você atingiu sua meta: %@"; +"goal_achieved_notification_title" = "Meta atingida! 🎉"; +"goal_archive" = "Arquivar"; +"goal_delete_confirm" = "Excluir"; +"goal_delete_message" = "Esta meta será excluída permanentemente. Esta ação não pode ser desfeita."; +"goal_delete_title" = "Excluir meta"; +"goal_unarchive" = "Restaurar"; +"goals_all_active_achieved" = "Todas as metas ativas foram alcançadas."; +"goals_empty_archived" = "Nenhuma meta arquivada."; +"goals_filter_active" = "Ativas"; +"goals_filter_all" = "Todas"; +"goals_filter_archived" = "Arquivadas"; +"icloud_check_description" = "Se você tem dados em outro dispositivo, ative o iCloud para restaurá-los aqui."; +"icloud_check_title" = "Já usa o Portfolio Journal?"; +"icloud_enabled_description" = "Feche o app e abra novamente. Seus dados serão carregados automaticamente do iCloud."; +"icloud_enabled_title" = "iCloud ativado"; +"monthly_checkin_notification_body" = "Registre os valores deste mês e acompanhe o crescimento do seu portfólio."; +"monthly_checkin_notification_title" = "Hora da sua atualização mensal"; +"onboarding_add_first_source" = "Adicionar meu primeiro investimento"; +"onboarding_import_data" = "Importar dados existentes"; +"onboarding_quickstart_subtitle" = "Adicione sua primeira fonte de investimento para começar a acompanhar seu portfólio."; +"onboarding_quickstart_title" = "Quase lá"; +"reengagement_body" = "Alguns minutos são suficientes para manter o controle dos seus investimentos."; +"reengagement_title" = "Seu portfólio está esperando"; +"snapshot_duplicate_add" = "Adicionar mesmo assim"; +"snapshot_duplicate_message" = "Você já tem um snapshot para este mês. Deseja adicionar outro?"; +"snapshot_duplicate_replace" = "Substituir existente"; +"snapshot_duplicate_title" = "Snapshot já existe"; +"sources_filter_all" = "Todas"; + +// MARK: - 1.4.0 Features +"monthly_summary_notification_title" = "Seu resumo mensal do portfólio"; +"monthly_summary_notification_body" = "Veja como seus investimentos se saíram este mês."; +"streak_badge" = "Sequência de %d meses"; +"goals_empty_add_cta" = "Adicionar minha primeira meta"; +"journal_empty_title" = "Nenhum registro ainda"; +"journal_empty_body" = "As atualizações de snapshots criam entradas mensais automaticamente. Adicione sua primeira fonte para começar."; +"quick_update_title" = "Atualização rápida"; +"quick_update_section_header" = "Insira os valores atuais"; +"quick_update_section_footer" = "Apenas as fontes com um valor inserido serão atualizadas."; +"quick_update_placeholder" = "Novo valor"; +"quick_update_save" = "Salvar tudo"; +"quick_update_no_sources" = "Sem fontes"; +"quick_update_no_sources_body" = "Adicione fontes de investimento primeiro para usar a atualização rápida."; +"update_available_title" = "Atualização disponível"; +"update_available_body" = "A versão %@ está disponível na App Store."; +"whats_new_title" = "Novidades no 1.4"; +"whats_new_subtitle" = "Melhorias para te ajudar a manter o rumo."; +"whats_new_quick_update_title" = "Atualização rápida do portfólio"; +"whats_new_quick_update_body" = "Atualize todas as suas fontes em uma única tela com um toque."; +"whats_new_streak_title" = "Sequência de atualizações"; +"whats_new_streak_body" = "Acompanhe quantos meses consecutivos você manteve seu portfólio atualizado."; +"whats_new_goals_title" = "Metas e diário mais inteligentes"; +"whats_new_goals_body" = "Estados vazios melhorados ajudam você a começar mais rápido."; +"whats_new_continue" = "Vamos lá!"; diff --git a/PortfolioJournal/Services/AppUpdateService.swift b/PortfolioJournal/Services/AppUpdateService.swift new file mode 100644 index 0000000..5709be0 --- /dev/null +++ b/PortfolioJournal/Services/AppUpdateService.swift @@ -0,0 +1,36 @@ +import Foundation +import Combine + +@MainActor +class AppUpdateService: ObservableObject { + static let shared = AppUpdateService() + @Published var updateAvailable = false + @Published var latestVersion: String? + + private init() {} + + func checkForUpdate() { + guard let bundleId = Bundle.main.bundleIdentifier else { return } + let urlString = "https://itunes.apple.com/lookup?bundleId=\(bundleId)" + guard let url = URL(string: urlString) else { return } + + Task { + do { + let (data, _) = try await URLSession.shared.data(from: url) + guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any], + let results = json["results"] as? [[String: Any]], + let first = results.first, + let appStoreVersion = first["version"] as? String, + let currentVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String + else { return } + + if appStoreVersion.compare(currentVersion, options: .numeric) == .orderedDescending { + self.updateAvailable = true + self.latestVersion = appStoreVersion + } + } catch { + // silently fail + } + } + } +} diff --git a/PortfolioJournal/Services/ImportService.swift b/PortfolioJournal/Services/ImportService.swift index db27d1b..11fd3a5 100644 --- a/PortfolioJournal/Services/ImportService.swift +++ b/PortfolioJournal/Services/ImportService.swift @@ -655,6 +655,184 @@ Personal,Real Estate,Rental Property,2024-01-01,82000,80000,Estimated value ] } + // MARK: - CSV Column Mapping + + /// Parsed preview data for the mapping UI + struct CSVPreview { + let rows: [[String]] + let columnCount: Int + + func headers(hasHeaderRow: Bool) -> [String] { + if hasHeaderRow, let first = rows.first { + return first + } + return (0.. [String]? { + let start = hasHeaderRow ? 1 : 0 + return rows.count > start ? rows[start] : nil + } + } + + func previewCSV(_ content: String) -> CSVPreview { + let rows = parseCSVRows(content) + let columnCount = rows.first?.count ?? 0 + return CSVPreview(rows: rows, columnCount: columnCount) + } + + // Maps each app field to a CSV column index or a constant value + struct CSVMappingConfig { + // -1 = not mapped, -2 = constant, -3 = use today (date only), 0+ = column index + static let notMapped = -1 + static let constant = -2 + static let useToday = -3 + + var hasHeaderRow: Bool = true + var sourceIndex: Int = notMapped + var sourceConstant: String = "" + var valueIndex: Int = notMapped + var dateIndex: Int = useToday // default: use today + var categoryIndex: Int = constant + var categoryConstant: String = "Other" // default category name when constant + var contributionIndex: Int = notMapped + var notesIndex: Int = notMapped + + var isValid: Bool { + let sourceOk: Bool = { + if sourceIndex == Self.constant { return !sourceConstant.isEmpty } + return sourceIndex >= 0 + }() + let valueOk = valueIndex >= 0 + return sourceOk && valueOk + } + } + + func importCSVWithMapping( + content: String, + mapping: CSVMappingConfig, + defaultAccountName: String? + ) -> ImportResult { + let preview = previewCSV(content) + let accounts = parseCSVWithMapping(preview: preview, mapping: mapping, defaultAccountName: defaultAccountName) + return applyImport(accounts, context: CoreDataStack.shared.viewContext) + } + + func importCSVWithMappingAsync( + content: String, + mapping: CSVMappingConfig, + defaultAccountName: String?, + progress: @escaping (ImportProgress) -> Void + ) async -> ImportResult { + await withCheckedContinuation { continuation in + CoreDataStack.shared.performBackgroundTask { context in + let preview = self.previewCSV(content) + let accounts = self.parseCSVWithMapping(preview: preview, mapping: mapping, defaultAccountName: defaultAccountName) + + let totalSnapshots = accounts.reduce(0) { t, a in + t + a.categories.reduce(0) { s, c in s + c.sources.reduce(0) { $0 + $1.snapshots.count } } + } + DispatchQueue.main.async { + progress(ImportProgress(completed: 0, total: totalSnapshots, message: "Importing data")) + } + + let result = self.applyImport(accounts, context: context) { completed in + DispatchQueue.main.async { + progress(ImportProgress( + completed: completed, + total: totalSnapshots, + message: "Imported \(completed) of \(totalSnapshots) snapshots" + )) + } + } + continuation.resume(returning: result) + } + } + } + + private func parseCSVWithMapping( + preview: CSVPreview, + mapping: CSVMappingConfig, + defaultAccountName: String? + ) -> [ImportedAccount] { + let dataRows = mapping.hasHeaderRow ? Array(preview.rows.dropFirst()) : preview.rows + let fallbackAccount = defaultAccountName ?? "Personal" + + var grouped: [String: [String: [String: [ImportedSnapshot]]]] = [:] + + for row in dataRows { + // Source name + let sourceName: String + if mapping.sourceIndex == CSVMappingConfig.constant { + guard !mapping.sourceConstant.isEmpty else { continue } + sourceName = mapping.sourceConstant + } else if mapping.sourceIndex >= 0 { + guard let v = row.safeValue(at: mapping.sourceIndex), !v.isEmpty else { continue } + sourceName = v + } else { + continue + } + + // Value + guard mapping.valueIndex >= 0, + let valStr = row.safeValue(at: mapping.valueIndex), + let value = parseDecimal(valStr) else { continue } + + // Date + let date: Date + if mapping.dateIndex == CSVMappingConfig.useToday { + date = Calendar.current.startOfDay(for: Date()) + } else if mapping.dateIndex >= 0, + let dateStr = row.safeValue(at: mapping.dateIndex), + let parsed = parseDate(dateStr) { + date = parsed + } else { + date = Calendar.current.startOfDay(for: Date()) + } + + // Category + let categoryName: String + if mapping.categoryIndex == CSVMappingConfig.constant { + categoryName = mapping.categoryConstant.isEmpty ? "Other" : mapping.categoryConstant + } else if mapping.categoryIndex >= 0, + let v = row.safeValue(at: mapping.categoryIndex), !v.isEmpty { + categoryName = v + } else { + categoryName = "Other" + } + + // Contribution + let contribution: Decimal? = mapping.contributionIndex >= 0 + ? row.safeValue(at: mapping.contributionIndex).flatMap(parseDecimal) + : nil + + // Notes + let notes: String? = mapping.notesIndex >= 0 + ? row.safeValue(at: mapping.notesIndex).flatMap { $0.isEmpty ? nil : $0 } + : nil + + let snapshot = ImportedSnapshot(date: date, value: value, contribution: contribution, notes: notes) + grouped[fallbackAccount, default: [:]][categoryName, default: [:]][sourceName, default: []].append(snapshot) + } + + return grouped.map { accountName, categories in + let importedCategories = categories.map { categoryName, sources in + let importedSources = sources.map { sourceName, snapshots in + ImportedSource(name: sourceName, snapshots: snapshots) + } + return ImportedCategory(name: categoryName, colorHex: nil, icon: nil, sources: importedSources) + } + return ImportedAccount( + name: accountName, + currency: nil, + inputMode: .simple, + notificationFrequency: .monthly, + customFrequencyMonths: 1, + categories: importedCategories + ) + } + } + // MARK: - CSV Helpers private func parseCSVRows(_ content: String) -> [[String]] { diff --git a/PortfolioJournal/Services/NotificationService.swift b/PortfolioJournal/Services/NotificationService.swift index 9239c33..000c06e 100644 --- a/PortfolioJournal/Services/NotificationService.swift +++ b/PortfolioJournal/Services/NotificationService.swift @@ -31,6 +31,9 @@ class NotificationService: ObservableObject { await MainActor.run { self.isAuthorized = granted } + if granted { + scheduleMonthlyPerformanceSummary() + } return granted } catch { print("Notification authorization error: \(error)") @@ -155,6 +158,18 @@ extension NotificationService { func handleNotificationResponse(_ response: UNNotificationResponse) { let userInfo = response.notification.request.content.userInfo + // Handle batch update deep link from monthly check-in + if let action = userInfo["action"] as? String, action == "batchUpdate" { + NotificationCenter.default.post(name: .openBatchUpdate, object: nil) + return + } + + // Handle openDashboard deep link from monthly summary notification + if let action = userInfo["action"] as? String, action == "openDashboard" { + NotificationCenter.default.post(name: .openDashboard, object: nil) + return + } + guard let sourceIdString = userInfo["sourceId"] as? String, let sourceId = UUID(uuidString: sourceIdString) else { return @@ -174,6 +189,9 @@ extension NotificationService { extension Notification.Name { static let openSourceDetail = Notification.Name("openSourceDetail") static let didResetData = Notification.Name("didResetData") + static let openBatchUpdate = Notification.Name("openBatchUpdate") + static let openDashboard = Notification.Name("openDashboard") + static let openQuickUpdate = Notification.Name("openQuickUpdate") } // MARK: - Re-engagement Notifications @@ -214,6 +232,7 @@ extension NotificationService { content.title = String(localized: "monthly_checkin_notification_title") content.body = String(localized: "monthly_checkin_notification_body") content.sound = .default + content.userInfo = ["action": "batchUpdate"] var components = DateComponents() components.day = 1 @@ -230,6 +249,56 @@ extension NotificationService { } } } + + /// Schedules a monthly portfolio summary notification on the 5th of each month at 9am. + func scheduleMonthlyPerformanceSummary() { + guard isAuthorized else { return } + + let identifier = "monthly_summary" + center.getPendingNotificationRequests { [weak self] requests in + guard let self, !requests.contains(where: { $0.identifier == identifier }) else { return } + + let content = UNMutableNotificationContent() + content.title = String(localized: "monthly_summary_notification_title") + content.body = String(localized: "monthly_summary_notification_body") + content.sound = .default + content.userInfo = ["action": "openDashboard"] + + var components = DateComponents() + components.day = 5 + components.hour = 9 + components.minute = 0 + + let trigger = UNCalendarNotificationTrigger(dateMatching: components, repeats: true) + let request = UNNotificationRequest(identifier: identifier, content: content, trigger: trigger) + + self.center.add(request) { error in + if let error = error { + print("Monthly summary notification error: \(error)") + } + } + } + } + + /// Fires a one-time local notification celebrating goal achievement. + func scheduleGoalAchievedNotification(goalName: String) { + guard isAuthorized else { return } + + let content = UNMutableNotificationContent() + content.title = String(localized: "goal_achieved_notification_title") + content.body = String(format: String(localized: "goal_achieved_notification_body"), goalName) + content.sound = .default + + let trigger = UNTimeIntervalNotificationTrigger(timeInterval: 1, repeats: false) + let id = "goal_achieved_\(UUID().uuidString)" + let request = UNNotificationRequest(identifier: id, content: content, trigger: trigger) + + center.add(request) { error in + if let error = error { + print("Goal achieved notification error: \(error)") + } + } + } } // MARK: - Background Refresh diff --git a/PortfolioJournal/Utilities/DashboardLayoutStore.swift b/PortfolioJournal/Utilities/DashboardLayoutStore.swift index 8126e0f..f108441 100644 --- a/PortfolioJournal/Utilities/DashboardLayoutStore.swift +++ b/PortfolioJournal/Utilities/DashboardLayoutStore.swift @@ -4,6 +4,22 @@ struct DashboardSectionConfig: Identifiable, Codable, Hashable { let id: String var isVisible: Bool var isCollapsed: Bool + var columnSpan: Int + + init(id: String, isVisible: Bool, isCollapsed: Bool, columnSpan: Int = 1) { + self.id = id + self.isVisible = isVisible + self.isCollapsed = isCollapsed + self.columnSpan = columnSpan + } + + init(from decoder: Decoder) throws { + let container = try decoder.container(keyedBy: CodingKeys.self) + id = try container.decode(String.self, forKey: .id) + isVisible = try container.decode(Bool.self, forKey: .isVisible) + isCollapsed = try container.decode(Bool.self, forKey: .isCollapsed) + columnSpan = try container.decodeIfPresent(Int.self, forKey: .columnSpan) ?? 1 + } } enum DashboardSection: String, CaseIterable, Identifiable { @@ -16,6 +32,7 @@ enum DashboardSection: String, CaseIterable, Identifiable { case goals case pendingUpdates case periodReturns + case contributionsVsReturns var id: String { rawValue } @@ -39,6 +56,8 @@ enum DashboardSection: String, CaseIterable, Identifiable { return "Pending Updates" case .periodReturns: return "Returns" + case .contributionsVsReturns: + return "Invested vs. Returns" } } } diff --git a/PortfolioJournal/ViewModels/ChartsViewModel.swift b/PortfolioJournal/ViewModels/ChartsViewModel.swift index e046919..fbead2f 100644 --- a/PortfolioJournal/ViewModels/ChartsViewModel.swift +++ b/PortfolioJournal/ViewModels/ChartsViewModel.swift @@ -17,6 +17,7 @@ class ChartsViewModel: ObservableObject { case drawdown = "Drawdown" case volatility = "Volatility" case prediction = "Prediction" + case yearOverYear = "Year vs Year" var id: String { rawValue } @@ -32,6 +33,7 @@ class ChartsViewModel: ObservableObject { case .drawdown: return "arrow.down.right.circle" case .volatility: return "waveform.path.ecg" case .prediction: return "wand.and.stars" + case .yearOverYear: return "calendar" } } @@ -40,7 +42,7 @@ class ChartsViewModel: ObservableObject { case .evolution: return false case .allocation, .performance, .contributions, .rollingReturn, .riskReturn, .cashflow, - .drawdown, .volatility, .prediction: + .drawdown, .volatility, .prediction, .yearOverYear: return true } } @@ -67,6 +69,8 @@ class ChartsViewModel: ObservableObject { return "Understand investment risk levels" case .prediction: return "View 12-month forecasts" + case .yearOverYear: + return "Compare portfolio values across years" } } } @@ -104,6 +108,13 @@ class ChartsViewModel: ObservableObject { @Published var volatilityData: [(date: Date, volatility: Double)] = [] @Published var predictionData: [Prediction] = [] @Published var allocationEvolutionData: [(date: Date, category: String, percentage: Double, color: String)] = [] + @Published var yearOverYearData: [YearSeries] = [] + + struct YearSeries: Identifiable { + let id: Int // year + let year: Int + let values: [Decimal] // one value per month (Jan=0, Dec=11), 0 if no data + } @Published var isLoading = false @Published var showingPaywall = false @@ -280,6 +291,8 @@ class ChartsViewModel: ObservableObject { switch chartType { case .evolution, .performance: return [.all, .yearToDate, .year, .quarter] + case .yearOverYear: + return [] // No time range filter for YoY — always uses all data default: return [.month, .quarter, .halfYear, .year, .all] } @@ -368,6 +381,8 @@ class ChartsViewModel: ObservableObject { calculateVolatilityData(from: completedSnapshots) case .prediction: calculatePredictionData(from: completedSnapshots) + case .yearOverYear: + calculateYearOverYearData(from: completedSnapshots) } if let selected = selectedCategory, @@ -955,6 +970,57 @@ class ChartsViewModel: ObservableObject { predictionData = result.predictions } + private func calculateYearOverYearData(from snapshots: [Snapshot]) { + guard !snapshots.isEmpty else { + yearOverYearData = [] + return + } + + // Build all monthly totals (no time range filter for YoY) + let allSourceIds = sourceRepository.sources.filter { shouldIncludeSource($0) }.compactMap { $0.id } + let allSnapshots: [Snapshot] + if let cached = cachedSnapshots { + allSnapshots = cached + } else { + allSnapshots = snapshotRepository.fetchSnapshots(for: allSourceIds, months: maxHistoryMonths) + } + + let calendar = Calendar.current + // group by (year, month), take latest per source + var byYearMonth: [Int: [Int: Decimal]] = [:] + var latestBySource: [UUID: Snapshot] = [:] + + let sorted = allSnapshots.sorted { $0.date < $1.date } + for snap in sorted { + guard let sourceId = snap.source?.id else { continue } + latestBySource[sourceId] = snap + let year = calendar.component(.year, from: snap.date) + let month = calendar.component(.month, from: snap.date) // 1-based + let total = latestBySource.values.reduce(Decimal.zero) { $0 + $1.decimalValue } + byYearMonth[year, default: [:]][month] = total + } + + let years = byYearMonth.keys.sorted() + guard !years.isEmpty else { + yearOverYearData = [] + return + } + + // Forward-fill within each year: carry previous month if no data + yearOverYearData = years.map { year in + var values = [Decimal](repeating: .zero, count: 12) + var last: Decimal = .zero + for monthIdx in 0..<12 { + let month = monthIdx + 1 + if let v = byYearMonth[year]?[month] { + last = v + } + values[monthIdx] = last + } + return YearSeries(id: year, year: year, values: values) + } + } + private func monthlyTotals(from snapshots: [Snapshot]) -> [(date: Date, totalValue: Decimal)] { let groupedByMonth = Dictionary(grouping: snapshots) { snapshot -> Date in chartMonthStart(for: snapshot.date) diff --git a/PortfolioJournal/ViewModels/DashboardViewModel.swift b/PortfolioJournal/ViewModels/DashboardViewModel.swift index f6614a7..a12d031 100644 --- a/PortfolioJournal/ViewModels/DashboardViewModel.swift +++ b/PortfolioJournal/ViewModels/DashboardViewModel.swift @@ -22,6 +22,7 @@ class DashboardViewModel: ObservableObject { // MARK: - Chart Data @Published var evolutionData: [(date: Date, value: Decimal)] = [] + @Published var updateStreak: Int = 0 // MARK: - Portfolio Forecast @@ -204,6 +205,9 @@ class DashboardViewModel: ObservableObject { // Calculate portfolio forecast updatePortfolioForecast() + // Compute update streak + updateStreak = computeStreak(from: evolutionData) + // Log screen view FirebaseService.shared.logScreenView(screenName: "Dashboard") } @@ -535,6 +539,42 @@ class DashboardViewModel: ObservableObject { return annualized } + private func computeStreak(from evolutionData: [(date: Date, value: Decimal)]) -> Int { + guard !evolutionData.isEmpty else { return 0 } + let calendar = Calendar.current + + // Group into (year, month) set + let monthSet: Set = Set(evolutionData.map { point in + let comps = calendar.dateComponents([.year, .month], from: point.date) + return DateComponents(year: comps.year, month: comps.month) + }) + + // Get sorted unique months descending + let sortedMonths = monthSet + .compactMap { comps -> Date? in calendar.date(from: comps) } + .sorted(by: >) + + guard let mostRecent = sortedMonths.first else { return 0 } + + var streak = 1 + var current = mostRecent + + for i in 1.. Date? { // Performance: Use cached completion date if available if let cached = cachedCompletionDates[goal.id] { diff --git a/PortfolioJournal/ViewModels/SourceListViewModel.swift b/PortfolioJournal/ViewModels/SourceListViewModel.swift index a93e23b..cbe86f7 100644 --- a/PortfolioJournal/ViewModels/SourceListViewModel.swift +++ b/PortfolioJournal/ViewModels/SourceListViewModel.swift @@ -8,7 +8,7 @@ class SourceListViewModel: ObservableObject { @Published var sources: [InvestmentSource] = [] @Published var categories: [Category] = [] - @Published var selectedCategory: Category? + @Published var selectedCategoryIds: Set = [] @Published var searchText = "" @Published var selectedAccount: Account? @Published var showAllAccounts = true @@ -55,7 +55,7 @@ class SourceListViewModel: ObservableObject { Publishers.CombineLatest4( sourceRepository.$sources, $searchText.debounce(for: .milliseconds(300), scheduler: DispatchQueue.main), - $selectedCategory, + $selectedCategoryIds, $selectedAccount ) .combineLatest($showAllAccounts) @@ -88,9 +88,12 @@ class SourceListViewModel: ObservableObject { filtered = filtered.filter { $0.account?.id == selectedAccountId } } - // Filter by category - if let category = selectedCategory { - filtered = filtered.filter { $0.category?.id == category.id } + // Filter by category (multi-select) + if !selectedCategoryIds.isEmpty { + filtered = filtered.filter { + guard let id = $0.category?.id else { return false } + return selectedCategoryIds.contains(id) + } } // Filter by search text @@ -200,21 +203,29 @@ class SourceListViewModel: ObservableObject { } var isEmpty: Bool { - sources.isEmpty && searchText.isEmpty && selectedCategory == nil + sources.isEmpty && searchText.isEmpty && selectedCategoryIds.isEmpty } var isFiltered: Bool { - !searchText.isEmpty || selectedCategory != nil + !searchText.isEmpty || !selectedCategoryIds.isEmpty } // MARK: - Category Filter func selectCategory(_ category: Category?) { - selectedCategory = category + guard let category else { + selectedCategoryIds = [] + return + } + if selectedCategoryIds.contains(category.id) { + selectedCategoryIds.remove(category.id) + } else { + selectedCategoryIds.insert(category.id) + } } func clearFilters() { searchText = "" - selectedCategory = nil + selectedCategoryIds = [] } } diff --git a/PortfolioJournal/Views/Charts/ChartsContainerView.swift b/PortfolioJournal/Views/Charts/ChartsContainerView.swift index 41df107..0688243 100644 --- a/PortfolioJournal/Views/Charts/ChartsContainerView.swift +++ b/PortfolioJournal/Views/Charts/ChartsContainerView.swift @@ -7,6 +7,7 @@ struct ChartsContainerView: View { @StateObject private var goalsViewModel = GoalsViewModel() @AppStorage("calmModeEnabled") private var calmModeEnabled = true @AppStorage("showForecast") private var showForecast = true + @Environment(\.horizontalSizeClass) private var horizontalSizeClass init(iapService: IAPService) { _viewModel = StateObject(wrappedValue: ChartsViewModel(iapService: iapService)) @@ -14,50 +15,19 @@ struct ChartsContainerView: View { var body: some View { NavigationStack { - ZStack { - AppBackground() - - ScrollView { - VStack(spacing: 20) { - // Chart Type Selector - chartTypeSelector - - // Paywall nudge for free users - if !viewModel.isPremium { - CompactPaywallBanner(showingPaywall: $viewModel.showingPaywall) - .onAppear { - FirebaseService.shared.logPaywallShown(trigger: "charts_banner") - } - } - - // Unified Filters - filtersSection - - // Chart Content - chartContent - } - .padding() + Group { + if horizontalSizeClass == .regular { + iPadChartsLayout + } else { + iPhoneChartsLayout } } .navigationTitle("Charts") - .sheet(isPresented: $viewModel.showingPaywall) { - PaywallView() - } + .sheet(isPresented: $viewModel.showingPaywall) { PaywallView() } .toolbar { - ToolbarItem(placement: .navigationBarTrailing) { - accountFilterMenu - } + ToolbarItem(placement: .navigationBarTrailing) { accountFilterMenu } } - .onAppear { - viewModel.selectedAccount = accountStore.selectedAccount - viewModel.showAllAccounts = accountStore.showAllAccounts - viewModel.loadData() - goalsViewModel.selectedAccount = accountStore.selectedAccount - goalsViewModel.showAllAccounts = accountStore.showAllAccounts - goalsViewModel.refresh() - viewModel.updatePredictionTargetDate(goalsViewModel.goals) - } - // Performance: Use onChange instead of onReceive for cleaner state updates + .onAppear { syncState() } .onChange(of: accountStore.selectedAccount) { _, newAccount in viewModel.selectedAccount = newAccount goalsViewModel.selectedAccount = newAccount @@ -76,6 +46,128 @@ struct ChartsContainerView: View { } } + // MARK: - iPad Layout (sidebar + full-width chart) + + private var iPadChartsLayout: some View { + HStack(spacing: 0) { + // Left sidebar: chart type list + filters + ScrollView { + VStack(alignment: .leading, spacing: 0) { + Text("Chart Type") + .font(.caption.weight(.semibold)) + .foregroundColor(.secondary) + .padding(.horizontal, 16) + .padding(.top, 16) + .padding(.bottom, 8) + + let types = viewModel.availableChartTypes(calmModeEnabled: calmModeEnabled) + .filter { showForecast || $0 != .prediction } + ForEach(types) { chartType in + iPadChartTypeRow(chartType) + } + + if hasAnyFilter { + Divider().padding(.vertical, 12) + filtersSection + .padding(.horizontal, 16) + .padding(.bottom, 16) + } + } + } + .frame(width: 220) + .background(Color(.systemBackground)) + + Divider() + + // Right panel: full-width chart + ZStack { + AppBackground() + ScrollView { + VStack(spacing: 20) { + if !viewModel.isPremium { + CompactPaywallBanner(showingPaywall: $viewModel.showingPaywall) + .onAppear { + FirebaseService.shared.logPaywallShown(trigger: "charts_banner") + } + } + chartContent + } + .padding() + } + } + } + .ignoresSafeArea(edges: .bottom) + .sheet(isPresented: $viewModel.showingPaywall) { PaywallView() } + } + + // MARK: - iPhone Layout + + private var iPhoneChartsLayout: some View { + ZStack { + AppBackground() + ScrollView { + VStack(spacing: 20) { + chartTypeSelector + if !viewModel.isPremium { + CompactPaywallBanner(showingPaywall: $viewModel.showingPaywall) + .onAppear { + FirebaseService.shared.logPaywallShown(trigger: "charts_banner") + } + } + filtersSection + chartContent + } + .padding() + } + } + } + + // MARK: - iPad Chart Type Row + + private func iPadChartTypeRow(_ chartType: ChartsViewModel.ChartType) -> some View { + let isSelected = viewModel.selectedChartType == chartType + let isPremiumLocked = chartType.isPremium && !viewModel.isPremium + return Button { + viewModel.selectChart(chartType) + } label: { + HStack(spacing: 12) { + ZStack { + RoundedRectangle(cornerRadius: 8) + .fill(isSelected ? Color.appPrimary : Color(.systemGray5)) + .frame(width: 32, height: 32) + Image(systemName: chartType.icon) + .font(.system(size: 14)) + .foregroundColor(isSelected ? .white : .primary) + } + Text(chartType.rawValue) + .font(.subheadline) + .foregroundColor(isPremiumLocked ? .secondary : .primary) + Spacer() + if isPremiumLocked { + Image(systemName: "lock.fill") + .font(.caption2) + .foregroundColor(.secondary) + } + } + .padding(.horizontal, 16) + .padding(.vertical, 10) + .background(isSelected ? Color.appPrimary.opacity(0.08) : Color.clear) + } + .buttonStyle(.plain) + } + + // MARK: - Shared + + private func syncState() { + viewModel.selectedAccount = accountStore.selectedAccount + viewModel.showAllAccounts = accountStore.showAllAccounts + viewModel.loadData() + goalsViewModel.selectedAccount = accountStore.selectedAccount + goalsViewModel.showAllAccounts = accountStore.showAllAccounts + goalsViewModel.refresh() + viewModel.updatePredictionTargetDate(goalsViewModel.goals) + } + // MARK: - Chart Type Selector private var chartTypeSelector: some View { @@ -167,86 +259,76 @@ struct ChartsContainerView: View { // MARK: - Time Range Selector private var timeRangeSelector: some View { - HStack(spacing: 8) { - ForEach(viewModel.availableTimeRanges(for: viewModel.selectedChartType)) { range in - Button { - viewModel.selectedTimeRange = range - } label: { - Text(range.rawValue) - .font(.subheadline.weight(.medium)) - .padding(.horizontal, 16) - .padding(.vertical, 8) - .background( - viewModel.selectedTimeRange == range - ? Color.appPrimary - : Color.gray.opacity(0.1) - ) - .foregroundColor( - viewModel.selectedTimeRange == range - ? .white - : .primary - ) - .cornerRadius(20) + Group { + if horizontalSizeClass == .regular { + LazyVGrid(columns: [GridItem(.flexible()), GridItem(.flexible())], spacing: 6) { + ForEach(viewModel.availableTimeRanges(for: viewModel.selectedChartType)) { range in + timeRangeButton(range, fullWidth: true) + } + } + } else { + ScrollView(.horizontal, showsIndicators: false) { + HStack(spacing: 8) { + ForEach(viewModel.availableTimeRanges(for: viewModel.selectedChartType)) { range in + timeRangeButton(range, fullWidth: false) + } + } } } } } + private func timeRangeButton(_ range: ChartsViewModel.TimeRange, fullWidth: Bool) -> some View { + Button { + viewModel.selectedTimeRange = range + } label: { + Text(range.rawValue) + .font(.subheadline.weight(.medium)) + .frame(maxWidth: fullWidth ? .infinity : nil) + .padding(.horizontal, fullWidth ? 8 : 16) + .padding(.vertical, 8) + .background(viewModel.selectedTimeRange == range ? Color.appPrimary : Color.gray.opacity(0.1)) + .foregroundColor(viewModel.selectedTimeRange == range ? .white : .primary) + .cornerRadius(20) + } + } + // MARK: - Category Filter @ViewBuilder private var categoryFilter: some View { let availableCategories = viewModel.availableCategories(for: viewModel.selectedChartType) if !availableCategories.isEmpty { - ScrollView(.horizontal, showsIndicators: false) { - HStack(spacing: 8) { + if horizontalSizeClass == .regular { + VStack(spacing: 4) { if availableCategories.count > 1 { - Button { + categoryPill(label: "All", color: .appPrimary, isSelected: viewModel.selectedCategory == nil) { viewModel.selectedCategory = nil - } label: { - Text("All") - .font(.caption.weight(.medium)) - .padding(.horizontal, 12) - .padding(.vertical, 6) - .background( - viewModel.selectedCategory == nil - ? Color.appPrimary - : Color.gray.opacity(0.1) - ) - .foregroundColor( - viewModel.selectedCategory == nil - ? .white - : .primary - ) - .cornerRadius(16) } } - ForEach(availableCategories) { category in - Button { + categoryPill(label: category.name, color: category.color, + isSelected: viewModel.selectedCategory?.id == category.id) { viewModel.selectedCategory = category viewModel.selectedSource = nil - } label: { - HStack(spacing: 4) { - Circle() - .fill(category.color) - .frame(width: 8, height: 8) - Text(category.name) + } + } + } + } else { + ScrollView(.horizontal, showsIndicators: false) { + HStack(spacing: 8) { + if availableCategories.count > 1 { + categoryPill(label: "All", color: .appPrimary, + isSelected: viewModel.selectedCategory == nil) { + viewModel.selectedCategory = nil + } + } + ForEach(availableCategories) { category in + categoryPill(label: category.name, color: category.color, + isSelected: viewModel.selectedCategory?.id == category.id) { + viewModel.selectedCategory = category + viewModel.selectedSource = nil } - .font(.caption.weight(.medium)) - .padding(.horizontal, 12) - .padding(.vertical, 6) - .background( - viewModel.selectedCategory?.id == category.id - ? category.color - : Color.gray.opacity(0.1) - ) - .foregroundColor( - viewModel.selectedCategory?.id == category.id - ? .white - : .primary - ) - .cornerRadius(16) } } } @@ -254,69 +336,60 @@ struct ChartsContainerView: View { } } + private func categoryPill(label: String, color: Color, isSelected: Bool, action: @escaping () -> Void) -> some View { + Button(action: action) { + Text(label) + .font(.caption.weight(.medium)) + .frame(maxWidth: horizontalSizeClass == .regular ? .infinity : nil) + .padding(.horizontal, 12) + .padding(.vertical, 6) + .background(isSelected ? color : Color.gray.opacity(0.1)) + .foregroundColor(isSelected ? .white : .primary) + .cornerRadius(16) + } + } + // MARK: - Source Filter @ViewBuilder private var sourceFilter: some View { let availableSources = viewModel.availableSources(for: viewModel.selectedChartType) if !availableSources.isEmpty { - ScrollView(.horizontal, showsIndicators: false) { - HStack(spacing: 8) { + if horizontalSizeClass == .regular { + VStack(spacing: 4) { if availableSources.count > 1 { - Button { + sourcePill(label: "All Sources", color: .appPrimary, + isSelected: viewModel.selectedSourceIds.isEmpty && viewModel.selectedSource == nil) { viewModel.selectedSource = nil viewModel.selectedSourceIds.removeAll() - } label: { - Text("All Sources") - .font(.caption.weight(.medium)) - .padding(.horizontal, 12) - .padding(.vertical, 6) - .background( - viewModel.selectedSourceIds.isEmpty && viewModel.selectedSource == nil - ? Color.appPrimary - : Color.gray.opacity(0.1) - ) - .foregroundColor( - viewModel.selectedSourceIds.isEmpty && viewModel.selectedSource == nil - ? .white - : .primary - ) - .cornerRadius(16) } } - ForEach(Array(availableSources.enumerated()), id: \.element.id) { index, source in - let sourceId = source.id - let isSelected = viewModel.selectedSourceIds.contains(sourceId) - let sourceColor = Color.sourceColor(at: index) - Button { + let isSelected = viewModel.selectedSourceIds.contains(source.id) + sourcePill(label: source.name, color: Color.sourceColor(at: index), isSelected: isSelected) { viewModel.selectedSource = nil - if isSelected { - viewModel.selectedSourceIds.remove(sourceId) - } else { - viewModel.selectedSourceIds.insert(sourceId) + if isSelected { viewModel.selectedSourceIds.remove(source.id) } + else { viewModel.selectedSourceIds.insert(source.id) } + } + } + } + } else { + ScrollView(.horizontal, showsIndicators: false) { + HStack(spacing: 8) { + if availableSources.count > 1 { + sourcePill(label: "All Sources", color: .appPrimary, + isSelected: viewModel.selectedSourceIds.isEmpty && viewModel.selectedSource == nil) { + viewModel.selectedSource = nil + viewModel.selectedSourceIds.removeAll() } - } label: { - HStack(spacing: 4) { - Circle() - .fill(sourceColor) - .frame(width: 8, height: 8) - Text(source.name) + } + ForEach(Array(availableSources.enumerated()), id: \.element.id) { index, source in + let isSelected = viewModel.selectedSourceIds.contains(source.id) + sourcePill(label: source.name, color: Color.sourceColor(at: index), isSelected: isSelected) { + viewModel.selectedSource = nil + if isSelected { viewModel.selectedSourceIds.remove(source.id) } + else { viewModel.selectedSourceIds.insert(source.id) } } - .font(.caption.weight(.medium)) - .padding(.horizontal, 12) - .padding(.vertical, 6) - .background( - isSelected - ? sourceColor - : Color.gray.opacity(0.1) - ) - .foregroundColor( - isSelected - ? .white - : .primary - ) - .cornerRadius(16) } } } @@ -324,34 +397,54 @@ struct ChartsContainerView: View { } } + private func sourcePill(label: String, color: Color, isSelected: Bool, action: @escaping () -> Void) -> some View { + Button(action: action) { + Text(label) + .font(.caption.weight(.medium)) + .frame(maxWidth: horizontalSizeClass == .regular ? .infinity : nil) + .padding(.horizontal, 12) + .padding(.vertical, 6) + .background(isSelected ? color : Color.gray.opacity(0.1)) + .foregroundColor(isSelected ? .white : .primary) + .cornerRadius(16) + } + } + // MARK: - Breakdown Selector private var breakdownSelector: some View { - HStack(spacing: 8) { - ForEach(ChartsViewModel.BreakdownMode.allCases) { mode in - Button { - viewModel.selectedBreakdown = mode - } label: { - Text(mode.rawValue) - .font(.subheadline.weight(.medium)) - .padding(.horizontal, 14) - .padding(.vertical, 8) - .background( - viewModel.selectedBreakdown == mode - ? Color.appPrimary - : Color.gray.opacity(0.1) - ) - .foregroundColor( - viewModel.selectedBreakdown == mode - ? .white - : .primary - ) - .cornerRadius(18) + Group { + if horizontalSizeClass == .regular { + VStack(spacing: 4) { + ForEach(ChartsViewModel.BreakdownMode.allCases) { mode in + breakdownButton(mode) + } + } + } else { + HStack(spacing: 8) { + ForEach(ChartsViewModel.BreakdownMode.allCases) { mode in + breakdownButton(mode) + } } } } } + private func breakdownButton(_ mode: ChartsViewModel.BreakdownMode) -> some View { + Button { + viewModel.selectedBreakdown = mode + } label: { + Text(mode.rawValue) + .font(.subheadline.weight(.medium)) + .frame(maxWidth: horizontalSizeClass == .regular ? .infinity : nil) + .padding(.horizontal, 14) + .padding(.vertical, 8) + .background(viewModel.selectedBreakdown == mode ? Color.appPrimary : Color.gray.opacity(0.1)) + .foregroundColor(viewModel.selectedBreakdown == mode ? .white : .primary) + .cornerRadius(18) + } + } + // MARK: - Chart Content @ViewBuilder @@ -403,6 +496,8 @@ struct ChartsContainerView: View { predictions: viewModel.predictionData, historicalData: viewModel.evolutionData ) + case .yearOverYear: + YearOverYearChartView(series: viewModel.yearOverYearData) } } } diff --git a/PortfolioJournal/Views/Dashboard/DashboardView.swift b/PortfolioJournal/Views/Dashboard/DashboardView.swift index c522776..5ee8b25 100644 --- a/PortfolioJournal/Views/Dashboard/DashboardView.swift +++ b/PortfolioJournal/Views/Dashboard/DashboardView.swift @@ -13,6 +13,10 @@ struct DashboardView: View { @AppStorage("calmModeEnabled") private var calmModeEnabled = true @AppStorage("showForecast") private var showForecast = true @State private var pendingAlertDismissed = false + @State private var fullScreenSection: DashboardSection? = nil + @State private var dragTargetID: String? = nil + @State private var showingQuickUpdate = false + @Environment(\.horizontalSizeClass) private var horizontalSizeClass init() { _viewModel = StateObject(wrappedValue: DashboardViewModel()) @@ -25,6 +29,10 @@ struct DashboardView: View { ScrollView { VStack(spacing: 20) { + if viewModel.updateStreak >= 2 { + streakBadge + } + if viewModel.hasData { if !pendingAlertDismissed && !viewModel.sourcesNeedingUpdate.isEmpty { PendingUpdatesAlertBanner( @@ -38,8 +46,12 @@ struct DashboardView: View { .transition(.move(edge: .top).combined(with: .opacity)) } - ForEach(visibleSections) { config in - sectionView(for: config) + if horizontalSizeClass == .regular { + iPadDashboardLayout + } else { + ForEach(visibleSections) { config in + sectionView(for: config) + } } } else { EmptyDashboardView( @@ -51,7 +63,14 @@ struct DashboardView: View { } .padding() } + + if horizontalSizeClass == .regular, let section = fullScreenSection { + iPadFullScreenOverlay(for: section) + .transition(.opacity.combined(with: .scale(scale: 0.98))) + .zIndex(10) + } } + .animation(.easeInOut(duration: 0.25), value: fullScreenSection) .navigationTitle("Home") .refreshable { viewModel.refreshData() @@ -62,6 +81,13 @@ struct DashboardView: View { } } .toolbar { + ToolbarItem(placement: .navigationBarTrailing) { + Button { + showingQuickUpdate = true + } label: { + Image(systemName: "plus.circle.fill") + } + } ToolbarItem(placement: .navigationBarTrailing) { accountFilterMenu } @@ -103,12 +129,34 @@ struct DashboardView: View { .sheet(isPresented: $showingCustomize) { DashboardCustomizeView(configs: $sectionConfigs) } + .sheet(isPresented: $showingQuickUpdate) { + QuickUpdateView() + .environment(\.managedObjectContext, CoreDataStack.shared.viewContext) + } .sheet(isPresented: $viewModel.showingPaywall) { PaywallView() } + .onReceive(NotificationCenter.default.publisher(for: .openQuickUpdate)) { _ in + showingQuickUpdate = true + } } } + private var streakBadge: some View { + HStack(spacing: 6) { + Image(systemName: "flame.fill") + .font(.caption.weight(.semibold)) + Text(String(format: String(localized: "streak_badge"), viewModel.updateStreak)) + .font(.caption.weight(.semibold)) + } + .foregroundColor(.orange) + .padding(.horizontal, 12) + .padding(.vertical, 6) + .background(Color.orange.opacity(0.15)) + .cornerRadius(20) + .frame(maxWidth: .infinity, alignment: .leading) + } + private var accountFilterMenu: some View { Menu { Button { @@ -149,6 +197,127 @@ struct DashboardView: View { sectionConfigs.filter { $0.isVisible } } + // MARK: - iPad Layout Helpers + + private var iPadGridSections: [DashboardSectionConfig] { + visibleSections.filter { $0.id != DashboardSection.totalValue.id } + } + + @ViewBuilder + private var iPadDashboardLayout: some View { + // Total Portfolio Value — always full width, never in the grid + let totalConfig = sectionConfigs.first(where: { $0.id == DashboardSection.totalValue.id }) + ?? DashboardSectionConfig(id: DashboardSection.totalValue.id, isVisible: true, isCollapsed: false) + sectionView(for: DashboardSectionConfig(id: totalConfig.id, isVisible: true, isCollapsed: totalConfig.isCollapsed)) + + // Other cards — 2-column grid with drag-and-drop + if !iPadGridSections.isEmpty { + LazyVGrid( + columns: [GridItem(.flexible()), GridItem(.flexible())], + spacing: 16 + ) { + ForEach(iPadGridSections) { config in + sectionView(for: config) + .gridCellColumns(config.columnSpan) + .overlay { + if dragTargetID == config.id { + RoundedRectangle(cornerRadius: AppConstants.UI.cornerRadius) + .stroke(Color.appPrimary, lineWidth: 2) + } + } + .draggable(config.id) + .dropDestination(for: String.self) { items, _ in + guard let fromID = items.first else { return false } + return handleIPadDrop(fromID: fromID, toID: config.id) + } isTargeted: { isTargeted in + dragTargetID = isTargeted ? config.id : nil + } + .contextMenu { + Button { + toggleColumnSpan(for: config.id) + } label: { + Label( + config.columnSpan == 2 ? "Normal width" : "Expand to full width", + systemImage: config.columnSpan == 2 ? "rectangle" : "rectangle.expand.diagonal" + ) + } + Button { + withAnimation(.easeInOut(duration: 0.25)) { + fullScreenSection = DashboardSection(rawValue: config.id) + } + } label: { + Label("View full screen", systemImage: "arrow.up.left.and.arrow.down.right") + } + } + } + } + } + } + + @ViewBuilder + private func iPadFullScreenOverlay(for section: DashboardSection) -> some View { + ZStack { + Color(.systemBackground) + .opacity(0.97) + .ignoresSafeArea() + + VStack(spacing: 0) { + HStack { + Text(section.title) + .font(.title3.weight(.semibold)) + Spacer() + Button { + withAnimation(.easeInOut(duration: 0.25)) { + fullScreenSection = nil + } + } label: { + Image(systemName: "xmark.circle.fill") + .font(.title2) + .foregroundColor(.secondary) + } + } + .padding() + + Divider() + + ScrollView { + VStack(spacing: 20) { + let totalConfig = sectionConfigs.first(where: { $0.id == DashboardSection.totalValue.id }) + ?? DashboardSectionConfig(id: DashboardSection.totalValue.id, isVisible: true, isCollapsed: false) + sectionView(for: DashboardSectionConfig(id: totalConfig.id, isVisible: true, isCollapsed: totalConfig.isCollapsed)) + + if let config = sectionConfigs.first(where: { $0.id == section.id }) { + sectionView(for: DashboardSectionConfig(id: config.id, isVisible: true, isCollapsed: false)) + } + } + .padding() + .frame(maxWidth: 800) + .frame(maxWidth: .infinity) + } + } + } + } + + private func handleIPadDrop(fromID: String, toID: String) -> Bool { + guard fromID != toID, + let fromIndex = sectionConfigs.firstIndex(where: { $0.id == fromID }), + let toIndex = sectionConfigs.firstIndex(where: { $0.id == toID }) else { return false } + withAnimation { + sectionConfigs.move(fromOffsets: IndexSet(integer: fromIndex), toOffset: toIndex > fromIndex ? toIndex + 1 : toIndex) + } + DashboardLayoutStore.save(sectionConfigs) + dragTargetID = nil + return true + } + + private func toggleColumnSpan(for id: String) { + guard let index = sectionConfigs.firstIndex(where: { $0.id == id }) else { return } + withAnimation { + sectionConfigs[index].columnSpan = sectionConfigs[index].columnSpan == 2 ? 1 : 2 + } + DashboardLayoutStore.save(sectionConfigs) + } + @ViewBuilder private func sectionView(for config: DashboardSectionConfig) -> some View { if let section = DashboardSection(rawValue: config.id) { @@ -271,6 +440,19 @@ struct DashboardView: View { ) } } + case .contributionsVsReturns: + let contrib = viewModel.portfolioSummary.totalContributions + let returns = viewModel.portfolioSummary.allTimeReturn + if contrib > 0 || returns != 0 { + if config.isCollapsed { + CompactCard(title: "Invested vs. Returns", subtitle: contrib.currencyString) + } else { + ContributionsVsReturnsCard( + totalContributions: contrib, + totalReturns: returns + ) + } + } } } else { EmptyView() @@ -1262,6 +1444,72 @@ struct EmptyGoalsCard: View { } } +// MARK: - Contributions vs Returns Card + +struct ContributionsVsReturnsCard: View { + let totalContributions: Decimal + let totalReturns: Decimal + + private var total: Decimal { totalContributions + totalReturns } + private var contributionFraction: Double { + guard total > 0 else { return 0.5 } + return NSDecimalNumber(decimal: totalContributions / total).doubleValue + } + private var returnFraction: Double { 1 - contributionFraction } + private var isReturnPositive: Bool { totalReturns >= 0 } + + var body: some View { + VStack(alignment: .leading, spacing: 12) { + Text(String(localized: "contributions_vs_returns_title")) + .font(.headline) + + // Bar + GeometryReader { geo in + HStack(spacing: 2) { + RoundedRectangle(cornerRadius: 4) + .fill(Color.appSecondary) + .frame(width: max(4, geo.size.width * CGFloat(contributionFraction))) + + RoundedRectangle(cornerRadius: 4) + .fill(isReturnPositive ? Color.positiveGreen : Color.negativeRed) + .frame(maxWidth: .infinity) + } + .frame(height: 16) + .clipShape(RoundedRectangle(cornerRadius: 6)) + } + .frame(height: 16) + + HStack { + HStack(spacing: 6) { + Circle().fill(Color.appSecondary).frame(width: 10, height: 10) + VStack(alignment: .leading, spacing: 2) { + Text(String(localized: "contributions_vs_returns_invested")) + .font(.caption).foregroundColor(.secondary) + Text(totalContributions.currencyString) + .font(.subheadline.weight(.semibold)) + } + } + Spacer() + HStack(spacing: 6) { + Circle().fill(isReturnPositive ? Color.positiveGreen : Color.negativeRed).frame(width: 10, height: 10) + VStack(alignment: .trailing, spacing: 2) { + Text(String(localized: "contributions_vs_returns_returns")) + .font(.caption).foregroundColor(.secondary) + let prefix = totalReturns >= 0 ? "+" : "" + Text("\(prefix)\(totalReturns.currencyString)") + .font(.subheadline.weight(.semibold)) + .foregroundColor(isReturnPositive ? .positiveGreen : .negativeRed) + } + } + } + } + .padding() + .background(Color(.systemBackground)) + .cornerRadius(AppConstants.UI.cornerRadius) + .shadow(color: .black.opacity(0.05), radius: 8, y: 2) + } +} + #Preview { DashboardView() .environmentObject(IAPService()) diff --git a/PortfolioJournal/Views/Dashboard/QuickUpdateView.swift b/PortfolioJournal/Views/Dashboard/QuickUpdateView.swift new file mode 100644 index 0000000..505810b --- /dev/null +++ b/PortfolioJournal/Views/Dashboard/QuickUpdateView.swift @@ -0,0 +1,127 @@ +import SwiftUI +import CoreData + +struct QuickUpdateView: View { + @Environment(\.dismiss) private var dismiss + @Environment(\.managedObjectContext) private var context + @FetchRequest( + sortDescriptors: [NSSortDescriptor(keyPath: \InvestmentSource.name, ascending: true)], + predicate: NSPredicate(format: "isActive == YES"), + animation: .default + ) private var sources: FetchedResults + + @State private var values: [NSManagedObjectID: String] = [:] + @State private var isSaving = false + @State private var saveError: String? + + var body: some View { + NavigationStack { + ZStack { + AppBackground() + + if sources.isEmpty { + ContentUnavailableView( + String(localized: "quick_update_no_sources"), + systemImage: "list.bullet", + description: Text(String(localized: "quick_update_no_sources_body")) + ) + } else { + List { + Section { + ForEach(sources) { source in + sourceRow(source) + } + } header: { + Text(String(localized: "quick_update_section_header")) + } footer: { + Text(String(localized: "quick_update_section_footer")) + } + } + .scrollContentBackground(.hidden) + } + } + .navigationTitle(String(localized: "quick_update_title")) + .navigationBarTitleDisplayMode(.inline) + .toolbar { + ToolbarItem(placement: .cancellationAction) { + Button(String(localized: "cancel")) { dismiss() } + } + ToolbarItem(placement: .confirmationAction) { + Button(String(localized: "quick_update_save")) { + saveAll() + } + .disabled(isSaving || filledValues.isEmpty) + .fontWeight(.semibold) + } + } + .alert("Error", isPresented: Binding( + get: { saveError != nil }, + set: { if !$0 { saveError = nil } } + )) { + Button("OK", role: .cancel) { saveError = nil } + } message: { + Text(saveError ?? "") + } + } + } + + @ViewBuilder + private func sourceRow(_ source: InvestmentSource) -> some View { + HStack { + VStack(alignment: .leading, spacing: 2) { + Text(source.name) + .font(.subheadline.weight(.medium)) + if source.latestValue != .zero { + Text(source.latestValue.currencyString) + .font(.caption) + .foregroundColor(.secondary) + } + } + Spacer() + TextField( + String(localized: "quick_update_placeholder"), + text: binding(for: source) + ) + .keyboardType(.decimalPad) + .multilineTextAlignment(.trailing) + .frame(width: 120) + .font(.subheadline) + } + } + + private var filledValues: [NSManagedObjectID: String] { + values.filter { !$0.value.trimmingCharacters(in: .whitespaces).isEmpty } + } + + private func binding(for source: InvestmentSource) -> Binding { + Binding( + get: { values[source.objectID] ?? "" }, + set: { values[source.objectID] = $0 } + ) + } + + private func saveAll() { + isSaving = true + let now = Date() + + for source in sources { + guard let raw = values[source.objectID], + !raw.trimmingCharacters(in: .whitespaces).isEmpty, + let value = CurrencyFormatter.parseUserInput(raw) else { continue } + + let snapshot = Snapshot(context: context) + snapshot.id = UUID() + snapshot.value = NSDecimalNumber(decimal: value) + snapshot.date = now + snapshot.source = source + } + + do { + try context.save() + dismiss() + } catch { + saveError = error.localizedDescription + } + isSaving = false + } +} diff --git a/PortfolioJournal/Views/Goals/GoalsView.swift b/PortfolioJournal/Views/Goals/GoalsView.swift index 99d701b..fe721ce 100644 --- a/PortfolioJournal/Views/Goals/GoalsView.swift +++ b/PortfolioJournal/Views/Goals/GoalsView.swift @@ -5,7 +5,20 @@ struct GoalsView: View { @StateObject private var viewModel = GoalsViewModel() @State private var showingAddGoal = false @State private var editingGoal: Goal? - @State private var showAchievedGoals = false + @State private var goalFilter: GoalFilter = .active + @State private var goalToDelete: Goal? + + private enum GoalFilter: String, CaseIterable, Identifiable { + case active, archived, all + var id: String { rawValue } + var label: String { + switch self { + case .active: return String(localized: "goals_filter_active") + case .archived: return String(localized: "goals_filter_archived") + case .all: return String(localized: "goals_filter_all") + } + } + } var body: some View { NavigationStack { @@ -14,11 +27,7 @@ struct GoalsView: View { List { if filteredGoals.isEmpty { - if viewModel.goals.isEmpty { - emptyState - } else { - hiddenAchievedState - } + emptyState(for: goalFilter) } else { Section { ForEach(filteredGoals) { goal in @@ -30,14 +39,24 @@ struct GoalsView: View { estimatedCompletionDate: viewModel.estimateCompletionDate(for: goal), onEdit: { editingGoal = goal } ) - .swipeActions(edge: .trailing, allowsFullSwipe: true) { + .swipeActions(edge: .trailing, allowsFullSwipe: false) { Button(role: .destructive) { - viewModel.deleteGoal(goal) + goalToDelete = goal } label: { Label("Delete", systemImage: "trash") } } .swipeActions(edge: .leading, allowsFullSwipe: false) { + Button { + viewModel.archiveGoal(goal) + } label: { + Label( + goal.isActive ? String(localized: "goal_archive") : String(localized: "goal_unarchive"), + systemImage: goal.isActive ? "archivebox" : "arrow.uturn.backward" + ) + } + .tint(goal.isActive ? .orange : .blue) + Button { editingGoal = goal } label: { @@ -54,10 +73,12 @@ struct GoalsView: View { .navigationTitle("Goals") .toolbar { ToolbarItem(placement: .navigationBarLeading) { - Button(showAchievedGoals ? "Hide Achieved" : "Show Achieved") { - showAchievedGoals.toggle() + Picker(String(localized: "goals_filter_active"), selection: $goalFilter) { + ForEach(GoalFilter.allCases) { filter in + Text(filter.label).tag(filter) + } } - .font(.caption.weight(.semibold)) + .pickerStyle(.menu) } ToolbarItem(placement: .navigationBarTrailing) { Button { @@ -86,44 +107,107 @@ struct GoalsView: View { viewModel.showAllAccounts = showAll viewModel.refresh() } + .alert(String(localized: "goal_delete_title"), isPresented: Binding( + get: { goalToDelete != nil }, + set: { if !$0 { goalToDelete = nil } } + )) { + Button(String(localized: "goal_delete_confirm"), role: .destructive) { + if let goal = goalToDelete { + viewModel.deleteGoal(goal) + } + goalToDelete = nil + } + Button(String(localized: "cancel"), role: .cancel) { + goalToDelete = nil + } + } message: { + Text(String(localized: "goal_delete_message")) + } } } private var filteredGoals: [Goal] { - guard !showAchievedGoals else { return viewModel.goals } - return viewModel.goals.filter { !viewModel.isAchieved($0) } + switch goalFilter { + case .active: + return viewModel.goals.filter { $0.isActive } + case .archived: + return viewModel.goals.filter { !$0.isActive } + case .all: + return viewModel.goals + } } - private var emptyState: some View { - VStack(spacing: 16) { - Image(systemName: "target") - .font(.system(size: 48)) - .foregroundColor(.secondary) - Text("Set your first goal") - .font(.headline) - Text("Track progress toward milestones like \(AppSettings.getOrCreate(in: CoreDataStack.shared.viewContext).currencySymbol)1M and share your wins.") - .font(.subheadline) - .foregroundColor(.secondary) - .multilineTextAlignment(.center) + @ViewBuilder + private func emptyState(for filter: GoalFilter) -> some View { + switch filter { + case .active: + if viewModel.goals.isEmpty { + VStack(spacing: 16) { + Image(systemName: "target") + .font(.system(size: 48)) + .foregroundColor(.secondary) + Text("Set your first goal") + .font(.headline) + Text("Track progress toward milestones like \(AppSettings.getOrCreate(in: CoreDataStack.shared.viewContext).currencySymbol)1M and share your wins.") + .font(.subheadline) + .foregroundColor(.secondary) + .multilineTextAlignment(.center) + Button { + showingAddGoal = true + } label: { + Text(String(localized: "goals_empty_add_cta")) + .font(.subheadline.weight(.semibold)) + .foregroundColor(.white) + .padding(.horizontal, 20) + .padding(.vertical, 10) + .background(Color.appPrimary) + .clipShape(Capsule()) + } + } + .frame(maxWidth: .infinity) + .padding(.vertical, 32) + } else { + VStack(spacing: 12) { + Image(systemName: "archivebox") + .font(.system(size: 40)) + .foregroundColor(.secondary) + Text(String(localized: "goals_all_active_achieved")) + .font(.headline) + .foregroundColor(.secondary) + Text("Switch to \"Archived\" or \"All\" to see other goals.") + .font(.subheadline) + .foregroundColor(.secondary) + .multilineTextAlignment(.center) + } + .frame(maxWidth: .infinity) + .padding(.vertical, 32) + } + case .archived: + VStack(spacing: 12) { + Image(systemName: "archivebox") + .font(.system(size: 40)) + .foregroundColor(.secondary) + Text(String(localized: "goals_empty_archived")) + .font(.headline) + .foregroundColor(.secondary) + } + .frame(maxWidth: .infinity) + .padding(.vertical, 32) + case .all: + VStack(spacing: 16) { + Image(systemName: "target") + .font(.system(size: 48)) + .foregroundColor(.secondary) + Text("Set your first goal") + .font(.headline) + Text("Track progress toward milestones like \(AppSettings.getOrCreate(in: CoreDataStack.shared.viewContext).currencySymbol)1M and share your wins.") + .font(.subheadline) + .foregroundColor(.secondary) + .multilineTextAlignment(.center) + } + .frame(maxWidth: .infinity) + .padding(.vertical, 32) } - .frame(maxWidth: .infinity) - .padding(.vertical, 32) - } - - private var hiddenAchievedState: some View { - VStack(spacing: 12) { - Image(systemName: "party.popper") - .font(.system(size: 40)) - .foregroundColor(.appSecondary) - Text("All visible goals are achieved") - .font(.headline) - Text("Tap \"Show Achieved\" to review completed goals.") - .font(.subheadline) - .foregroundColor(.secondary) - .multilineTextAlignment(.center) - } - .frame(maxWidth: .infinity) - .padding(.vertical, 32) } } diff --git a/PortfolioJournal/Views/Journal/JournalView.swift b/PortfolioJournal/Views/Journal/JournalView.swift index fd77ae5..b25c8c0 100644 --- a/PortfolioJournal/Views/Journal/JournalView.swift +++ b/PortfolioJournal/Views/Journal/JournalView.swift @@ -7,49 +7,171 @@ struct JournalView: View { @State private var scrubberLabel = "" @State private var scrubberOffset: CGFloat = 0 @State private var currentVisibleMonth: Date? + @State private var selectedDate: Date? + @Environment(\.horizontalSizeClass) private var horizontalSizeClass var body: some View { - NavigationStack { - ScrollViewReader { proxy in - ZStack { - AppBackground() + if horizontalSizeClass == .regular { + iPadJournalLayout + } else { + iPhoneJournalLayout + } + } - List { - Section("Monthly Check-ins") { - if filteredMonthlyNotes.isEmpty { - Text(searchText.isEmpty ? "No monthly notes yet." : "No matching notes.") + // MARK: - iPad Layout (list + inline detail) + + private var iPadJournalLayout: some View { + HStack(spacing: 0) { + // Left: month list + NavigationStack { + journalListContent(isPad: true) + .navigationTitle("Journal") + .searchable(text: $searchText, prompt: "Search monthly notes") + .onAppear { viewModel.refresh() } + } + .frame(width: 320) + + Divider() + + // Right: monthly check-in detail + NavigationStack { + if let date = selectedDate { + MonthlyCheckInView(referenceDate: date) + } else { + noMonthSelectedView + } + } + } + } + + // MARK: - iPhone Layout (push navigation) + + private var iPhoneJournalLayout: some View { + NavigationStack { + journalListContent(isPad: false) + .navigationTitle("Journal") + .searchable(text: $searchText, prompt: "Search monthly notes") + .onAppear { viewModel.refresh() } + } + } + + // MARK: - Shared List Content + + private func journalListContent(isPad: Bool) -> some View { + ScrollViewReader { proxy in + ZStack { + AppBackground() + + List { + Section("Monthly Check-ins") { + if filteredMonthlyNotes.isEmpty { + if searchText.isEmpty { + VStack(spacing: 12) { + Image(systemName: "book.closed") + .font(.system(size: 36)) + .foregroundColor(.appSecondary) + Text(String(localized: "journal_empty_title")) + .font(.headline) + Text(String(localized: "journal_empty_body")) + .font(.subheadline) + .foregroundColor(.secondary) + .multilineTextAlignment(.center) + } + .padding(.vertical, 16) + .frame(maxWidth: .infinity) + } else { + Text("No matching notes.") .font(.subheadline) .foregroundColor(.secondary) - } else { - ForEach(filteredMonthlyNotes) { entry in + } + } else { + ForEach(filteredMonthlyNotes) { entry in + if isPad { + Button { + selectedDate = entry.date + } label: { + monthlyNoteRow(entry) + .contentShape(Rectangle()) + } + .buttonStyle(.plain) + .listRowBackground( + selectedDate.map { $0.isSameMonth(as: entry.date) } == true + ? Color.appPrimary.opacity(0.08) + : Color.clear + ) + .id(entry.date) + .onAppear { currentVisibleMonth = entry.date } + } else { NavigationLink { MonthlyCheckInView(referenceDate: entry.date) } label: { monthlyNoteRow(entry) } .id(entry.date) - .onAppear { - currentVisibleMonth = entry.date - } + .onAppear { currentVisibleMonth = entry.date } } } } } - .listStyle(.insetGrouped) - .scrollContentBackground(.hidden) - } - .overlay(alignment: .trailing) { - monthScrubber(proxy: proxy) - } - .navigationTitle("Journal") - .searchable(text: $searchText, prompt: "Search monthly notes") - .onAppear { - viewModel.refresh() } + .listStyle(.insetGrouped) + .scrollContentBackground(.hidden) + } + .overlay(alignment: .trailing) { + monthScrubber(proxy: proxy) } } } + private var noMonthSelectedView: some View { + ZStack { + AppBackground() + + VStack(spacing: 32) { + // Icon badge con gradiente + ZStack { + Circle() + .fill(LinearGradient( + colors: [Color.appSecondary, Color.appSecondary.lighter()], + startPoint: .topLeading, + endPoint: .bottomTrailing + )) + .frame(width: 120, height: 120) + .shadow(color: Color.appSecondary.opacity(0.25), radius: 28, y: 10) + + Circle() + .fill(Color.white.opacity(0.12)) + .frame(width: 120, height: 120) + + Image(systemName: "book.closed.fill") + .font(.system(size: 50, weight: .light)) + .foregroundColor(.white) + } + + VStack(spacing: 10) { + Text("Select a Month") + .font(.title2.weight(.semibold)) + + Text("Choose a month from the list on the\nleft to view your check-in notes.") + .font(.subheadline) + .foregroundColor(.secondary) + .multilineTextAlignment(.center) + } + + Label("Select from the list", systemImage: "arrow.left") + .font(.subheadline.weight(.semibold)) + .foregroundColor(.appSecondary) + .padding(.horizontal, 22) + .padding(.vertical, 11) + .background(Color.appSecondary.opacity(0.1)) + .clipShape(Capsule()) + .overlay(Capsule().stroke(Color.appSecondary.opacity(0.2), lineWidth: 1)) + } + .padding(48) + } + .frame(maxWidth: .infinity, maxHeight: .infinity) + } + private var filteredMonthlyNotes: [MonthlyNoteItem] { let trimmedQuery = searchText.trimmingCharacters(in: .whitespacesAndNewlines) let hasQuery = !trimmedQuery.isEmpty diff --git a/PortfolioJournal/Views/Onboarding/WhatsNewView.swift b/PortfolioJournal/Views/Onboarding/WhatsNewView.swift new file mode 100644 index 0000000..b3c1c60 --- /dev/null +++ b/PortfolioJournal/Views/Onboarding/WhatsNewView.swift @@ -0,0 +1,96 @@ +import SwiftUI + +struct WhatsNewFeature { + let icon: String + let color: Color + let title: String + let description: String +} + +struct WhatsNewView: View { + @Environment(\.dismiss) private var dismiss + + private let features: [WhatsNewFeature] = [ + WhatsNewFeature( + icon: "bolt.circle.fill", + color: .appPrimary, + title: String(localized: "whats_new_quick_update_title"), + description: String(localized: "whats_new_quick_update_body") + ), + WhatsNewFeature( + icon: "flame.fill", + color: .orange, + title: String(localized: "whats_new_streak_title"), + description: String(localized: "whats_new_streak_body") + ), + WhatsNewFeature( + icon: "target", + color: .appSecondary, + title: String(localized: "whats_new_goals_title"), + description: String(localized: "whats_new_goals_body") + ) + ] + + var body: some View { + ZStack { + AppBackground() + + VStack(spacing: 0) { + Spacer() + + VStack(spacing: 32) { + VStack(spacing: 8) { + Text("🎉") + .font(.system(size: 56)) + Text(String(localized: "whats_new_title")) + .font(.title.weight(.bold)) + Text(String(localized: "whats_new_subtitle")) + .font(.subheadline) + .foregroundColor(.secondary) + .multilineTextAlignment(.center) + } + + VStack(spacing: 20) { + ForEach(features, id: \.title) { feature in + HStack(spacing: 16) { + Image(systemName: feature.icon) + .font(.title2) + .foregroundColor(feature.color) + .frame(width: 40) + VStack(alignment: .leading, spacing: 2) { + Text(feature.title) + .font(.subheadline.weight(.semibold)) + Text(feature.description) + .font(.caption) + .foregroundColor(.secondary) + } + Spacer() + } + } + } + .padding() + .background(Color(.systemBackground)) + .cornerRadius(16) + .shadow(color: .black.opacity(0.05), radius: 8, y: 2) + } + .padding() + + Spacer() + + Button { + dismiss() + } label: { + Text(String(localized: "whats_new_continue")) + .font(.headline) + .foregroundColor(.white) + .frame(maxWidth: .infinity) + .padding() + .background(Color.appPrimary) + .cornerRadius(14) + } + .padding() + } + } + .interactiveDismissDisabled() + } +} diff --git a/PortfolioJournal/Views/Settings/ImportDataView.swift b/PortfolioJournal/Views/Settings/ImportDataView.swift index 8e07628..1905541 100644 --- a/PortfolioJournal/Views/Settings/ImportDataView.swift +++ b/PortfolioJournal/Views/Settings/ImportDataView.swift @@ -34,6 +34,10 @@ struct ImportDataView: View { @State private var newAccountName = "" @State private var accountErrorMessage: String? + // CSV column mapping flow + @State private var pendingCSVContent: String? + @State private var showingCSVMapping = false + private let accountRepository = AccountRepository() private var availableAccounts: [Account] { @@ -127,6 +131,13 @@ struct ImportDataView: View { ) { result in handleImport(result) } + .sheet(isPresented: $showingCSVMapping) { + if let content = pendingCSVContent { + CSVMappingView(csvContent: content) { mapping in + performMappedCSVImport(content: content, mapping: mapping) + } + } + } .alert( "Import Complete", isPresented: Binding( @@ -366,12 +377,8 @@ Personal,Stocks,Index Fund,2024-01-01,15000,12000,Long-term handleImportContent(content) } - private func handleImportContent(_ content: String) { - // For non-Premium users or when only one account exists, use the Default account - // For Premium users with multiple accounts, respect their selection + private func resolvedAccountName() -> String { let useAccountSelection = shouldShowAccountSelection && iapService.isPremium - let allowMultipleAccounts = false // Always import into a single account - var defaultAccountName = accountStore.accounts.first(where: { $0.isDefaultAccount })?.name ?? accountStore.selectedAccount?.name ?? accountStore.accounts.first?.name @@ -379,23 +386,64 @@ Personal,Stocks,Index Fund,2024-01-01,15000,12000,Long-term if useAccountSelection { if accountSelection == .new { - accountErrorMessage = validateNewAccountName() - guard accountErrorMessage == nil else { return } let trimmed = newAccountName.trimmingCharacters(in: .whitespacesAndNewlines) - let currency = AppSettings.getOrCreate(in: CoreDataStack.shared.viewContext).currency - let account = accountRepository.createAccount( - name: trimmed, - currency: currency, - inputMode: .simple, - notificationFrequency: .monthly, - customFrequencyMonths: 1 - ) - defaultAccountName = account.name + if !trimmed.isEmpty { + let currency = AppSettings.getOrCreate(in: CoreDataStack.shared.viewContext).currency + let account = accountRepository.createAccount( + name: trimmed, + currency: currency, + inputMode: .simple, + notificationFrequency: .monthly, + customFrequencyMonths: 1 + ) + defaultAccountName = account.name + } } else { defaultAccountName = selectedAccountName ?? defaultAccountName } } + return defaultAccountName + } + private func handleImportContent(_ content: String) { + let useAccountSelection = shouldShowAccountSelection && iapService.isPremium + + if useAccountSelection && accountSelection == .new { + accountErrorMessage = validateNewAccountName() + guard accountErrorMessage == nil else { return } + } + + // CSV → show column mapping sheet first + if selectedFormat == .csv { + pendingCSVContent = content + showingCSVMapping = true + return + } + + // JSON → import directly + runImport(content: content, format: .json, defaultAccountName: resolvedAccountName()) + } + + private func performMappedCSVImport(content: String, mapping: ImportService.CSVMappingConfig) { + let defaultAccountName = resolvedAccountName() + isImporting = true + importProgress = 0 + importStatus = "Parsing file" + + Task { + let importResult = await ImportService.shared.importCSVWithMappingAsync( + content: content, + mapping: mapping, + defaultAccountName: defaultAccountName + ) { progress in + importProgress = progress.fraction + importStatus = progress.message + } + finishImport(importResult) + } + } + + private func runImport(content: String, format: ImportService.ImportFormat, defaultAccountName: String) { isImporting = true importProgress = 0 importStatus = "Parsing file" @@ -403,27 +451,30 @@ Personal,Stocks,Index Fund,2024-01-01,15000,12000,Long-term Task { let importResult = await ImportService.shared.importDataAsync( content: content, - format: selectedFormat, - allowMultipleAccounts: allowMultipleAccounts, + format: format, + allowMultipleAccounts: false, defaultAccountName: defaultAccountName ) { progress in importProgress = progress.fraction importStatus = progress.message } + finishImport(importResult) + } + } - isImporting = false + private func finishImport(_ importResult: ImportService.ImportResult) { + isImporting = false - if importResult.errors.isEmpty { - var message = "Imported \(importResult.sourcesCreated) sources and \(importResult.snapshotsCreated) snapshots." - if importResult.snapshotsUpdated > 0 { - message += " Updated \(importResult.snapshotsUpdated) existing snapshots." - } - resultMessage = message - tabSelection.selectedTab = 0 - dismiss() - } else { - errorMessage = importResult.errors.joined(separator: "\n") + if importResult.errors.isEmpty { + var message = "Imported \(importResult.sourcesCreated) sources and \(importResult.snapshotsCreated) snapshots." + if importResult.snapshotsUpdated > 0 { + message += " Updated \(importResult.snapshotsUpdated) existing snapshots." } + resultMessage = message + tabSelection.selectedTab = 0 + dismiss() + } else { + errorMessage = importResult.errors.joined(separator: "\n") } } diff --git a/PortfolioJournal/Views/Settings/SettingsView.swift b/PortfolioJournal/Views/Settings/SettingsView.swift index 27b26aa..de6f9ab 100644 --- a/PortfolioJournal/Views/Settings/SettingsView.swift +++ b/PortfolioJournal/Views/Settings/SettingsView.swift @@ -15,6 +15,7 @@ struct SettingsView: View { @AppStorage("lockOnBackground") private var lockOnBackground = false @ObservedObject private var cloudStack = CoreDataStack.shared + @ObservedObject private var updateService = AppUpdateService.shared @State private var showingPinSetup = false @State private var showingPinChange = false @@ -39,6 +40,9 @@ struct SettingsView: View { AppBackground() List { + if updateService.updateAvailable { + updateAvailableSection + } brandSection // Premium Section premiumSection @@ -181,6 +185,33 @@ struct SettingsView: View { if viewModel.backupsEnabled { viewModel.refreshBackups() } + updateService.checkForUpdate() + } + } + } + + // MARK: - Update Available Section + + private var updateAvailableSection: some View { + Section { + Link(destination: URL(string: "https://apps.apple.com/app/id6741412965")!) { + HStack { + Image(systemName: "arrow.down.circle.fill") + .foregroundColor(.appPrimary) + VStack(alignment: .leading, spacing: 2) { + Text(String(localized: "update_available_title")) + .font(.subheadline.weight(.semibold)) + if let v = updateService.latestVersion { + Text(String(format: String(localized: "update_available_body"), v)) + .font(.caption) + .foregroundColor(.secondary) + } + } + Spacer() + Image(systemName: "chevron.right") + .foregroundColor(.secondary) + .font(.caption) + } } } } @@ -460,6 +491,12 @@ struct SettingsView: View { } } + NavigationLink { + CategoriesView() + } label: { + Label("Categories", systemImage: "tag") + } + Button { if viewModel.canExport { viewModel.showingExportOptions = true diff --git a/PortfolioJournal/Views/Sources/AddSourceView.swift b/PortfolioJournal/Views/Sources/AddSourceView.swift index 592e515..c3f62c1 100644 --- a/PortfolioJournal/Views/Sources/AddSourceView.swift +++ b/PortfolioJournal/Views/Sources/AddSourceView.swift @@ -390,6 +390,7 @@ struct AddSnapshotView: View { let snapshot: Snapshot? @StateObject private var viewModel: SnapshotFormViewModel + @State private var showingDuplicateAlert = false init(source: InvestmentSource, snapshot: Snapshot? = nil) { self.source = source @@ -515,10 +516,47 @@ struct AddSnapshotView: View { viewModel.checkClipboard() } } + .alert( + String(localized: "snapshot_duplicate_title"), + isPresented: $showingDuplicateAlert + ) { + Button(String(localized: "snapshot_duplicate_replace"), role: .destructive) { + performSave() + } + Button(String(localized: "snapshot_duplicate_add")) { + performSave() + } + Button("Cancel", role: .cancel) {} + } message: { + Text(String(localized: "snapshot_duplicate_message")) + } } } private func saveSnapshot() { + guard snapshot == nil else { + performSave() + return + } + + // Check for existing snapshot in the same month + let calendar = Calendar.current + let selectedMonth = calendar.dateComponents([.year, .month], from: viewModel.date) + let repo = SnapshotRepository() + let existing = repo.fetchSnapshots(for: source, limitedToMonths: nil) + let hasDuplicate = existing.contains { snap in + let snapMonth = calendar.dateComponents([.year, .month], from: snap.date) + return snapMonth == selectedMonth + } + + if hasDuplicate { + showingDuplicateAlert = true + } else { + performSave() + } + } + + private func performSave() { guard let value = viewModel.value else { return } let repository = SnapshotRepository() @@ -536,6 +574,11 @@ struct AddSnapshotView: View { clearNotes: viewModel.notes.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ) } else { + // Capture pre-save goal state for achievement detection + let goalRepo = GoalRepository() + let sourceRepo = InvestmentSourceRepository() + let prevAchievedIds = goalsAchievedBeforeSave(goalRepo: goalRepo, sourceRepo: sourceRepo) + repository.createSnapshot( for: source, date: viewModel.date, @@ -543,6 +586,9 @@ struct AddSnapshotView: View { contribution: viewModel.contribution, notes: viewModel.notes.isEmpty ? nil : viewModel.notes ) + + // Check if any goals became achieved + checkGoalAchievements(goalRepo: goalRepo, sourceRepo: sourceRepo, prevAchievedIds: prevAchievedIds) } // Reschedule notification @@ -553,6 +599,46 @@ struct AddSnapshotView: View { dismiss() } + + private func goalsAchievedBeforeSave(goalRepo: GoalRepository, sourceRepo: InvestmentSourceRepository) -> Set { + let goals = goalRepo.goals.filter { $0.isActive } + var achieved = Set() + for goal in goals { + let currentValue: Decimal + if let accountId = goal.account?.safeId { + currentValue = sourceRepo.sources + .filter { $0.account?.id == accountId } + .reduce(Decimal.zero) { $0 + $1.latestValue } + } else { + currentValue = sourceRepo.sources.reduce(Decimal.zero) { $0 + $1.latestValue } + } + let target = goal.targetDecimal + if target > 0 && currentValue / target >= 1 { + achieved.insert(goal.id) + } + } + return achieved + } + + private func checkGoalAchievements(goalRepo: GoalRepository, sourceRepo: InvestmentSourceRepository, prevAchievedIds: Set) { + // Reload sources to pick up new snapshot value + let goals = goalRepo.goals.filter { $0.isActive } + for goal in goals { + guard !prevAchievedIds.contains(goal.id) else { continue } + let currentValue: Decimal + if let accountId = goal.account?.safeId { + currentValue = sourceRepo.sources + .filter { $0.account?.id == accountId } + .reduce(Decimal.zero) { $0 + $1.latestValue } + } else { + currentValue = sourceRepo.sources.reduce(Decimal.zero) { $0 + $1.latestValue } + } + let target = goal.targetDecimal + if target > 0 && currentValue / target >= 1 { + NotificationService.shared.scheduleGoalAchievedNotification(goalName: goal.name) + } + } + } } #Preview { diff --git a/PortfolioJournal/Views/Sources/SourceDetailView.swift b/PortfolioJournal/Views/Sources/SourceDetailView.swift index 640a71f..9009901 100644 --- a/PortfolioJournal/Views/Sources/SourceDetailView.swift +++ b/PortfolioJournal/Views/Sources/SourceDetailView.swift @@ -40,6 +40,13 @@ struct SourceDetailView: View { // Header Card headerCard + // Performance Summary — full width, above quick actions + if calmModeEnabled { + simpleMetricsSection + } else { + metricsSection + } + // Quick Actions quickActions @@ -48,13 +55,6 @@ struct SourceDetailView: View { chartSection } - // Metrics - if calmModeEnabled { - simpleMetricsSection - } else { - metricsSection - } - // Snapshots List snapshotsSection } @@ -323,10 +323,14 @@ struct SourceDetailView: View { HStack(spacing: 12) { MetricChip(title: "CAGR", value: viewModel.metrics.formattedCAGR) + .frame(maxWidth: .infinity) MetricChip(title: "Avg Monthly", value: viewModel.metrics.formattedAverageMonthlyReturn) + .frame(maxWidth: .infinity) MetricChip(title: "Contributions", value: viewModel.source.totalContributions.compactCurrencyString) + .frame(maxWidth: .infinity) } } + .frame(maxWidth: .infinity) .padding() .background(Color(.systemBackground)) .cornerRadius(AppConstants.UI.cornerRadius) @@ -501,8 +505,9 @@ struct MetricChip: View { Text(value) .font(.caption.weight(.semibold)) } - .padding(.vertical, 8) - .padding(.horizontal, 10) + .frame(maxWidth: .infinity, alignment: .leading) + .padding(.vertical, 10) + .padding(.horizontal, 12) .background(Color.gray.opacity(0.1)) .cornerRadius(10) } diff --git a/PortfolioJournal/Views/Sources/SourceListView.swift b/PortfolioJournal/Views/Sources/SourceListView.swift index 27cbd99..8ea9e4b 100644 --- a/PortfolioJournal/Views/Sources/SourceListView.swift +++ b/PortfolioJournal/Views/Sources/SourceListView.swift @@ -10,69 +10,78 @@ struct SourceListView: View { @State private var sourceToDelete: InvestmentSource? @State private var navigationPath = NavigationPath() @State private var showingSearch = false + @State private var selectedSourceID: NSManagedObjectID? + @Environment(\.horizontalSizeClass) private var horizontalSizeClass init(iapService: IAPService) { _viewModel = StateObject(wrappedValue: SourceListViewModel(iapService: iapService)) } var body: some View { + if horizontalSizeClass == .regular { + iPadSourcesLayout + } else { + iPhoneSourcesLayout + } + } + + // MARK: - iPad Layout (master-detail) + + private var iPadSourcesLayout: some View { + HStack(spacing: 0) { + // Left: source list panel + NavigationStack { + ZStack { + AppBackground() + if viewModel.isEmpty { emptyStateView } else { sourcesList } + } + .navigationTitle("Sources") + .toolbar { sourcesToolbar } + .sheet(isPresented: $viewModel.showingAddSource) { AddSourceView() } + .sheet(isPresented: $viewModel.showingPaywall) { PaywallView() } + .onAppear { syncAccountState() } + .onReceive(accountStore.$selectedAccount) { viewModel.selectedAccount = $0 } + .onReceive(accountStore.$showAllAccounts) { viewModel.showAllAccounts = $0 } + .confirmationDialog( + "Delete Source", + isPresented: Binding(get: { sourceToDelete != nil }, set: { if !$0 { sourceToDelete = nil } }), + titleVisibility: .visible + ) { deleteSourceDialogButtons } message: { deleteSourceDialogMessage } + } + .frame(width: 340) + + Divider() + + // Right: detail panel + NavigationStack { + Group { + if let id = selectedSourceID, + let source = try? context.existingObject(with: id) as? InvestmentSource, + !source.isDeleted { + SourceDetailView(source: source, iapService: iapService) + } else { + noSourceSelectedView + } + } + } + } + } + + // MARK: - iPhone Layout (push navigation) + + private var iPhoneSourcesLayout: some View { NavigationStack(path: $navigationPath) { ZStack { AppBackground() - - Group { - if viewModel.isEmpty { - emptyStateView - } else { - sourcesList - .safeAreaInset(edge: .top, spacing: 0) { - filterBar - } - } - } + if viewModel.isEmpty { emptyStateView } else { sourcesList } } .navigationTitle("Sources") - .toolbar { - ToolbarItem(placement: .navigationBarTrailing) { - Button { - viewModel.addSourceTapped() - } label: { - Image(systemName: "plus") - } - } - - ToolbarItem(placement: .navigationBarTrailing) { - Button { - withAnimation(.easeInOut(duration: 0.2)) { - showingSearch.toggle() - } - if !showingSearch { viewModel.searchText = "" } - } label: { - Image(systemName: showingSearch ? "xmark.circle.fill" : "magnifyingglass") - .foregroundColor(showingSearch ? .secondary : .primary) - } - } - - ToolbarItem(placement: .navigationBarLeading) { - accountFilterMenu - } - } - .sheet(isPresented: $viewModel.showingAddSource) { - AddSourceView() - } - .sheet(isPresented: $viewModel.showingPaywall) { - PaywallView() - } - .onAppear { - viewModel.selectedAccount = accountStore.selectedAccount - viewModel.showAllAccounts = accountStore.showAllAccounts - } - .onReceive(accountStore.$selectedAccount) { account in - viewModel.selectedAccount = account - } - .onReceive(accountStore.$showAllAccounts) { showAll in - viewModel.showAllAccounts = showAll - } + .toolbar { sourcesToolbar } + .sheet(isPresented: $viewModel.showingAddSource) { AddSourceView() } + .sheet(isPresented: $viewModel.showingPaywall) { PaywallView() } + .onAppear { syncAccountState() } + .onReceive(accountStore.$selectedAccount) { viewModel.selectedAccount = $0 } + .onReceive(accountStore.$showAllAccounts) { viewModel.showAllAccounts = $0 } .navigationDestination(for: NSManagedObjectID.self) { objectID in if let source = try? context.existingObject(with: objectID) as? InvestmentSource, !source.isDeleted { @@ -83,33 +92,117 @@ struct SourceListView: View { } .confirmationDialog( "Delete Source", - isPresented: Binding( - get: { sourceToDelete != nil }, - set: { if !$0 { sourceToDelete = nil } } - ), + isPresented: Binding(get: { sourceToDelete != nil }, set: { if !$0 { sourceToDelete = nil } }), titleVisibility: .visible - ) { - Button("Delete", role: .destructive) { - if let source = sourceToDelete { - viewModel.deleteSource(source) - sourceToDelete = nil - } - } - Button("Cancel", role: .cancel) { - sourceToDelete = nil - } - } message: { - if let source = sourceToDelete { - Text("This will permanently delete \(source.name) and all its snapshots.") - } + ) { deleteSourceDialogButtons } message: { deleteSourceDialogMessage } + } + } + + // MARK: - Shared Helpers + + private func syncAccountState() { + viewModel.selectedAccount = accountStore.selectedAccount + viewModel.showAllAccounts = accountStore.showAllAccounts + } + + @ToolbarContentBuilder + private var sourcesToolbar: some ToolbarContent { + ToolbarItem(placement: .navigationBarTrailing) { + Button { viewModel.addSourceTapped() } label: { + Image(systemName: "plus") } } + ToolbarItem(placement: .navigationBarTrailing) { + Button { + withAnimation(.easeInOut(duration: 0.2)) { showingSearch.toggle() } + if !showingSearch { viewModel.searchText = "" } + } label: { + Image(systemName: showingSearch ? "xmark.circle.fill" : "magnifyingglass") + .foregroundColor(showingSearch ? .secondary : .primary) + } + } + ToolbarItem(placement: .navigationBarLeading) { + accountFilterMenu + } + } + + @ViewBuilder + private var deleteSourceDialogButtons: some View { + Button("Delete", role: .destructive) { + if let source = sourceToDelete { + if selectedSourceID == source.objectID { selectedSourceID = nil } + viewModel.deleteSource(source) + sourceToDelete = nil + } + } + Button("Cancel", role: .cancel) { sourceToDelete = nil } + } + + @ViewBuilder + private var deleteSourceDialogMessage: some View { + if let source = sourceToDelete { + Text("This will permanently delete \(source.name) and all its snapshots.") + } + } + + private var noSourceSelectedView: some View { + ZStack { + AppBackground() + + VStack(spacing: 32) { + // Icon badge con gradiente + ZStack { + Circle() + .fill(LinearGradient.appPrimaryGradient) + .frame(width: 120, height: 120) + .shadow(color: Color.appPrimary.opacity(0.25), radius: 28, y: 10) + + Circle() + .fill(Color.white.opacity(0.12)) + .frame(width: 120, height: 120) + + Image(systemName: "chart.line.uptrend.xyaxis") + .font(.system(size: 50, weight: .light)) + .foregroundColor(.white) + } + + VStack(spacing: 10) { + Text("Select a Source") + .font(.title2.weight(.semibold)) + + Text("Pick an investment source from the\npanel on the left to see its details.") + .font(.subheadline) + .foregroundColor(.secondary) + .multilineTextAlignment(.center) + } + + // Call-to-action pill + Label("Select from the list", systemImage: "arrow.left") + .font(.subheadline.weight(.semibold)) + .foregroundColor(.appPrimary) + .padding(.horizontal, 22) + .padding(.vertical, 11) + .background(Color.appPrimary.opacity(0.1)) + .clipShape(Capsule()) + .overlay(Capsule().stroke(Color.appPrimary.opacity(0.2), lineWidth: 1)) + } + .padding(48) + } + .frame(maxWidth: .infinity, maxHeight: .infinity) } // MARK: - Sources List private var sourcesList: some View { List { + // Filter Bar + Section { + filterBarContent + } + .listRowInsets(EdgeInsets()) + .listRowBackground(Color.clear) + .listSectionSeparator(.hidden) + // Summary Header if !viewModel.isFiltered { Section { @@ -162,8 +255,17 @@ struct SourceListView: View { ForEach(viewModel.sources, id: \.objectID) { source in SourceRowView(source: source, calmModeEnabled: calmModeEnabled) .contentShape(Rectangle()) + .background( + horizontalSizeClass == .regular && selectedSourceID == source.objectID + ? Color.appPrimary.opacity(0.08) + : Color.clear + ) .onTapGesture { - navigationPath.append(source.objectID) + if horizontalSizeClass == .regular { + selectedSourceID = source.objectID + } else { + navigationPath.append(source.objectID) + } } .swipeActions(edge: .trailing, allowsFullSwipe: false) { Button(role: .destructive) { @@ -226,14 +328,14 @@ struct SourceListView: View { // MARK: - Filter Bar (chips + search) - private var filterBar: some View { + private var filterBarContent: some View { VStack(spacing: 0) { ScrollView(.horizontal, showsIndicators: false) { HStack(spacing: 8) { CategoryChip( title: String(localized: "sources_filter_all"), icon: nil, - isSelected: viewModel.selectedCategory == nil + isSelected: viewModel.selectedCategoryIds.isEmpty ) { viewModel.selectCategory(nil) } @@ -242,7 +344,7 @@ struct SourceListView: View { CategoryChip( title: category.name, icon: category.icon, - isSelected: viewModel.selectedCategory?.id == category.id + isSelected: viewModel.selectedCategoryIds.contains(category.id) ) { viewModel.selectCategory(category) } @@ -278,10 +380,7 @@ struct SourceListView: View { .padding(.bottom, 10) .transition(.move(edge: .top).combined(with: .opacity)) } - - Divider() } - .background(.bar) } // MARK: - Account Filter Menu diff --git a/PortfolioJournalWidget/InvestmentWidget.swift b/PortfolioJournalWidget/InvestmentWidget.swift index 6583534..8e15558 100644 --- a/PortfolioJournalWidget/InvestmentWidget.swift +++ b/PortfolioJournalWidget/InvestmentWidget.swift @@ -884,16 +884,22 @@ struct InvestmentWidgetEntryView: View { switch family { case .systemSmall: SmallWidgetView(entry: entry) + .widgetURL(URL(string: "portfoliojournal://quickupdate")!) case .systemMedium: MediumWidgetView(entry: entry) + .widgetURL(URL(string: "portfoliojournal://quickupdate")!) case .systemLarge: LargeWidgetView(entry: entry) + .widgetURL(URL(string: "portfoliojournal://quickupdate")!) case .accessoryCircular: AccessoryCircularView(entry: entry) + .widgetURL(URL(string: "portfoliojournal://quickupdate")!) case .accessoryRectangular: AccessoryRectangularView(entry: entry) + .widgetURL(URL(string: "portfoliojournal://quickupdate")!) default: SmallWidgetView(entry: entry) + .widgetURL(URL(string: "portfoliojournal://quickupdate")!) } } } diff --git a/fastlane/Deliverfile b/fastlane/Deliverfile index 465c2c4..dd16523 100644 --- a/fastlane/Deliverfile +++ b/fastlane/Deliverfile @@ -1 +1 @@ -app_version "1.3.1" +app_version "1.3.2" diff --git a/fastlane/Preview.html b/fastlane/Preview.html index 978de77..259d7de 100644 --- a/fastlane/Preview.html +++ b/fastlane/Preview.html @@ -222,7 +222,7 @@
Changelog
- Verbesserungen bei der iCloud-Synchronisierung:
• Daten werden jetzt sofort synchronisiert, wenn du zwischen Apple-Geräten wechselst
• Neue Geräteerkennung: Die App erkennt vorhandene iCloud-Daten vor dem Onboarding, sodass du auf einem neuen Gerät nie von vorne anfangen musst
• Behoben: Änderungen von einem anderen Gerät wurden in einigen Fällen nicht korrekt übernommen
• Allgemeine Stabilitätsverbesserungen und Fehlerbehebungen + Verbessertes Onboarding und monatliche Erinnerungen:

• Neu gestaltete Ersteinrichtung — eine klare Aktion zum Hinzufügen deiner ersten Investition, ohne unnötige Schritte
• Monatliche Erinnerungen — optionale Benachrichtigungen, damit du das monatliche Portfolio-Update nicht vergisst
• Charts-Vorschau — kostenlose Nutzer sehen, welche Charts verfügbar sind, bevor sie upgraden
• Verbesserter Paywall — eine echte Portfolio-Grafik zeigt, wie der Vollzugang aussieht
• Klarere Quelleneinrichtung — kurze Erklärung beim Erstellen deiner ersten Anlageposition
@@ -237,17 +237,9 @@
Screenshots
- -
-

No Screenshots Found

+

Skipped Screenshots

- deliver couldn't find any screenshots. - - The existing screenshots on App Store Connect will be kept. - if you want to remove them you have to use the --overwrite_screenshots flag. - -

- If you want to download your existing screenshots, run deliver download_screenshots. + Options to skip_screenshots activated. deliver will not modify your app screenshots.

@@ -340,7 +332,7 @@
Changelog
- iCloud Sync improvements:
• Data now syncs instantly when switching between Apple devices
• New device detection: the app now detects existing iCloud data before onboarding, so you never start from scratch on a new phone
• Fixed cases where updates made on another device weren't reflected correctly
• General stability improvements and bug fixes + Smarter onboarding and monthly reminders:

• Redesigned first-run experience — a single clear action to add your first investment, no setup friction
• Monthly reminders — optional notifications so you never forget your monthly portfolio update
• Charts preview — free users now see which charts are available before upgrading
• Improved paywall — a live portfolio chart preview shows what full access looks like
• Clearer source setup — added a short description when creating your first investment source
@@ -355,17 +347,9 @@
Screenshots
- -
-

No Screenshots Found

+

Skipped Screenshots

- deliver couldn't find any screenshots. - - The existing screenshots on App Store Connect will be kept. - if you want to remove them you have to use the --overwrite_screenshots flag. - -

- If you want to download your existing screenshots, run deliver download_screenshots. + Options to skip_screenshots activated. deliver will not modify your app screenshots.

@@ -451,7 +435,7 @@
Changelog
- Mejoras en la sincronización con iCloud:
• Los datos ahora se sincronizan al instante al cambiar entre dispositivos Apple
• Detección de dispositivo nuevo: la app detecta datos existentes en iCloud antes del proceso de bienvenida, para que nunca empieces desde cero en un teléfono nuevo
• Corregidos casos en los que los cambios realizados en otro dispositivo no se reflejaban correctamente
• Mejoras generales de estabilidad y corrección de errores + Incorporación más clara y recordatorios mensuales:

• Primera experiencia rediseñada — una acción clara para añadir tu primera inversión, sin pasos innecesarios
• Recordatorios mensuales — notificaciones opcionales para no olvidar actualizar tu portfolio cada mes
• Vista previa de gráficos — los usuarios gratuitos ven qué gráficos están disponibles antes de desbloquear
• Paywall mejorado — un gráfico real de portfolio muestra cómo se ve el acceso completo
• Configuración de fuentes más clara — descripción breve al crear tu primera fuente de inversión
@@ -466,17 +450,9 @@
Screenshots
- -
-

No Screenshots Found

+

Skipped Screenshots

- deliver couldn't find any screenshots. - - The existing screenshots on App Store Connect will be kept. - if you want to remove them you have to use the --overwrite_screenshots flag. - -

- If you want to download your existing screenshots, run deliver download_screenshots. + Options to skip_screenshots activated. deliver will not modify your app screenshots.

@@ -558,7 +534,7 @@
Changelog
- Améliorations de la synchronisation iCloud :
• Les données se synchronisent désormais instantanément lors du passage entre appareils Apple
• Détection de nouvel appareil : l'app détecte les données iCloud existantes avant l'intégration, pour ne jamais repartir de zéro sur un nouvel iPhone
• Correction des cas où les modifications effectuées sur un autre appareil n'étaient pas correctement reflétées
• Améliorations générales de la stabilité et corrections de bugs + Intégration améliorée et rappels mensuels :

• Première expérience repensée — une action claire pour ajouter votre premier investissement, sans étapes superflues
• Rappels mensuels — notifications facultatives pour ne jamais oublier la mise à jour mensuelle de votre portefeuille
• Aperçu des graphiques — les utilisateurs gratuits voient quels graphiques sont disponibles avant de passer à la version complète
• Paywall amélioré — un vrai graphique de portefeuille montre à quoi ressemble l'accès complet
• Configuration des sources clarifiée — courte description lors de la création de votre première source d'investissement
@@ -573,17 +549,9 @@
Screenshots
- -
-

No Screenshots Found

+

Skipped Screenshots

- deliver couldn't find any screenshots. - - The existing screenshots on App Store Connect will be kept. - if you want to remove them you have to use the --overwrite_screenshots flag. - -

- If you want to download your existing screenshots, run deliver download_screenshots. + Options to skip_screenshots activated. deliver will not modify your app screenshots.

@@ -665,7 +633,7 @@
Changelog
- Miglioramenti alla sincronizzazione iCloud:
• I dati ora si sincronizzano immediatamente quando passi da un dispositivo Apple all'altro
• Rilevamento nuovo dispositivo: l'app rileva i dati iCloud esistenti prima dell'onboarding, così non devi ricominciare da zero su un nuovo iPhone
• Risolti casi in cui le modifiche apportate su un altro dispositivo non venivano recepite correttamente
• Miglioramenti generali alla stabilità e correzioni di bug + Onboarding migliorato e promemoria mensili:

• Prima esperienza riprogettata — un'azione chiara per aggiungere il tuo primo investimento, senza passaggi inutili
• Promemoria mensili — notifiche opzionali per non dimenticare l'aggiornamento mensile del portafoglio
• Anteprima grafici — gli utenti gratuiti vedono quali grafici sono disponibili prima di passare alla versione completa
• Paywall migliorato — un vero grafico del portafoglio mostra come appare l'accesso completo
• Configurazione delle fonti più chiara — breve descrizione durante la creazione della prima fonte di investimento
@@ -680,17 +648,9 @@
Screenshots
- -
-

No Screenshots Found

+

Skipped Screenshots

- deliver couldn't find any screenshots. - - The existing screenshots on App Store Connect will be kept. - if you want to remove them you have to use the --overwrite_screenshots flag. - -

- If you want to download your existing screenshots, run deliver download_screenshots. + Options to skip_screenshots activated. deliver will not modify your app screenshots.

@@ -790,7 +750,7 @@
Changelog
- iCloud同期の改善：
• Appleデバイス間を切り替えたとき、データが即座に同期されるようになりました
• 新デバイス検出機能：オンボーディング前にiCloudの既存データを検出するようになり、新しいiPhoneでもゼロからやり直す必要がありません
• 別のデバイスでの変更が正しく反映されないケースを修正
• 全般的な安定性の向上とバグ修正 + 改善されたオンボーディングと月次リマインダー：

• 初回セットアップを刷新 — 最初の投資を追加するためのシンプルな1ステップ、余計な手順なし
• 月次リマインダー — 毎月のポートフォリオ更新を忘れないためのオプション通知
• グラフのプレビュー — 無料ユーザーがアップグレード前に利用可能なグラフを確認できるように
• パイウォールを改善 — 実際のポートフォリオグラフでフルアクセスの内容をプレビュー
• 投資元の作成をわかりやすく — 最初の投資元を追加する際に簡単な説明文を表示
@@ -805,17 +765,9 @@
Screenshots
- -
-

No Screenshots Found

+

Skipped Screenshots

- deliver couldn't find any screenshots. - - The existing screenshots on App Store Connect will be kept. - if you want to remove them you have to use the --overwrite_screenshots flag. - -

- If you want to download your existing screenshots, run deliver download_screenshots. + Options to skip_screenshots activated. deliver will not modify your app screenshots.

@@ -899,7 +851,7 @@
Changelog
- Melhorias na sincronização com iCloud:
• Os dados agora sincronizam instantaneamente ao trocar entre dispositivos Apple
• Detecção de novo dispositivo: o app detecta dados existentes no iCloud antes do onboarding, para você nunca começar do zero em um novo iPhone
• Corrigidos casos em que alterações feitas em outro dispositivo não eram refletidas corretamente
• Melhorias gerais de estabilidade e correções de bugs + Integração mais clara e lembretes mensais:

• Primeira experiência redesenhada — uma ação clara para adicionar seu primeiro investimento, sem etapas desnecessárias
• Lembretes mensais — notificações opcionais para nunca esquecer de atualizar sua carteira todo mês
• Prévia de gráficos — usuários gratuitos veem quais gráficos estão disponíveis antes de fazer upgrade
• Paywall melhorado — um gráfico real da carteira mostra como é o acesso completo
• Configuração de fontes mais clara — breve descrição ao criar sua primeira fonte de investimento
@@ -914,17 +866,9 @@
Screenshots
- -
-

No Screenshots Found

+

Skipped Screenshots

- deliver couldn't find any screenshots. - - The existing screenshots on App Store Connect will be kept. - if you want to remove them you have to use the --overwrite_screenshots flag. - -

- If you want to download your existing screenshots, run deliver download_screenshots. + Options to skip_screenshots activated. deliver will not modify your app screenshots.

diff --git a/fastlane/metadata/de-DE/release_notes.txt b/fastlane/metadata/de-DE/release_notes.txt index 93cf4f0..e112315 100644 --- a/fastlane/metadata/de-DE/release_notes.txt +++ b/fastlane/metadata/de-DE/release_notes.txt @@ -1,6 +1,8 @@ -Verbesserungen bei iCloud-Sync und Quellenverwaltung: +Native iPad-Unterstützung und neue Portfolio-Tools: -• iCloud-Sync — deine Daten synchronisieren sich jetzt zuverlässig auf allen Apple-Geräten -• Quellensuche — finde jede Quelle schnell nach Namen -• Kategoriefilter — filtere deine Quellen nach Anlageklasse +• iPad — vollständig native Erfahrung mit Split-View-Navigation und optimierten Layouts für Dashboard, Quellen, Charts und Journal +• Ziele archivieren — erledigte Ziele archivieren, um die Liste übersichtlich zu halten +• Kategorieverwaltung — eigene Anlagekategorien in den Einstellungen erstellen und anpassen +• Jahresvergleichs-Chart — Portfolio-Wert über mehrere Jahre auf einen Blick vergleichen (Premium) +• Flexibler CSV-Import — beliebiges Spaltenformat für den Import von jedem Broker zuordnen • Fehlerbehebungen und Leistungsverbesserungen diff --git a/fastlane/metadata/en-US/release_notes.txt b/fastlane/metadata/en-US/release_notes.txt index b04fa6a..e87a5cd 100644 --- a/fastlane/metadata/en-US/release_notes.txt +++ b/fastlane/metadata/en-US/release_notes.txt @@ -1,6 +1,8 @@ -iCloud sync and source management improvements: +Native iPad support and new portfolio tools: -• iCloud sync — your data now syncs reliably across all your Apple devices -• Source search — quickly find any source by name -• Category filters — filter your sources by asset category +• iPad — full native experience with split-view navigation, optimised layouts for Dashboard, Sources, Charts and Journal +• Goal archiving — archive completed goals to keep your list focused +• Category management — create, edit and customise your investment categories from Settings +• Year-over-year chart — compare your portfolio value across multiple years at a glance (Premium) +• Flexible CSV import — map any column format to import data from any broker • Bug fixes and performance improvements diff --git a/fastlane/metadata/es-ES/release_notes.txt b/fastlane/metadata/es-ES/release_notes.txt index c610bfe..e186988 100644 --- a/fastlane/metadata/es-ES/release_notes.txt +++ b/fastlane/metadata/es-ES/release_notes.txt @@ -1,6 +1,8 @@ -Mejoras en la sincronización iCloud y la gestión de fuentes: +Soporte nativo para iPad y nuevas herramientas de cartera: -• Sincronización iCloud — tus datos se sincronizan de forma fiable en todos tus dispositivos Apple -• Búsqueda de fuentes — encuentra cualquier fuente por nombre rápidamente -• Filtros por categoría — filtra tus fuentes por tipo de activo +• iPad — experiencia nativa completa con navegación en vista dividida y diseños optimizados para Dashboard, Fuentes, Gráficos y Diario +• Archivado de objetivos — archiva los objetivos completados para mantener tu lista organizada +• Gestión de categorías — crea, edita y personaliza tus categorías de inversión desde Ajustes +• Gráfico año a año — compara el valor de tu cartera en múltiples años de un vistazo (Premium) +• Importación CSV flexible — mapea cualquier formato de columnas para importar datos de cualquier bróker • Correcciones de errores y mejoras de rendimiento diff --git a/fastlane/metadata/fr-FR/release_notes.txt b/fastlane/metadata/fr-FR/release_notes.txt index 4190b83..24fed1f 100644 --- a/fastlane/metadata/fr-FR/release_notes.txt +++ b/fastlane/metadata/fr-FR/release_notes.txt @@ -1,6 +1,8 @@ -Améliorations de la synchronisation iCloud et de la gestion des sources : +Support iPad natif et nouveaux outils de portefeuille : -• Synchronisation iCloud — vos données se synchronisent désormais de manière fiable sur tous vos appareils Apple -• Recherche de sources — trouvez rapidement n'importe quelle source par nom -• Filtres par catégorie — filtrez vos sources par classe d'actifs +• iPad — expérience native complète avec navigation en vue fractionnée et mises en page optimisées pour le Tableau de bord, les Sources, les Graphiques et le Journal +• Archivage des objectifs — archivez les objectifs atteints pour garder votre liste organisée +• Gestion des catégories — créez, modifiez et personnalisez vos catégories d'investissement depuis les Réglages +• Graphique année par année — comparez la valeur de votre portefeuille sur plusieurs années d'un coup d'œil (Premium) +• Import CSV flexible — mappez n'importe quel format de colonnes pour importer des données de n'importe quel courtier • Corrections de bugs et améliorations des performances diff --git a/fastlane/metadata/it/release_notes.txt b/fastlane/metadata/it/release_notes.txt index d15ec06..aa08b90 100644 --- a/fastlane/metadata/it/release_notes.txt +++ b/fastlane/metadata/it/release_notes.txt @@ -1,6 +1,8 @@ -Miglioramenti alla sincronizzazione iCloud e alla gestione delle fonti: +Supporto nativo iPad e nuovi strumenti per il portafoglio: -• Sincronizzazione iCloud — i tuoi dati si sincronizzano in modo affidabile su tutti i dispositivi Apple -• Ricerca fonti — trova rapidamente qualsiasi fonte per nome -• Filtri per categoria — filtra le fonti per classe di asset +• iPad — esperienza nativa completa con navigazione a vista divisa e layout ottimizzati per Dashboard, Fonti, Grafici e Diario +• Archiviazione obiettivi — archivia gli obiettivi raggiunti per mantenere la lista organizzata +• Gestione categorie — crea, modifica e personalizza le tue categorie di investimento dalle Impostazioni +• Grafico anno su anno — confronta il valore del portafoglio su più anni in un colpo d'occhio (Premium) +• Import CSV flessibile — mappa qualsiasi formato di colonne per importare dati da qualsiasi broker • Correzioni di bug e miglioramenti delle prestazioni diff --git a/fastlane/metadata/ja/release_notes.txt b/fastlane/metadata/ja/release_notes.txt index d56b3c0..f87adc9 100644 --- a/fastlane/metadata/ja/release_notes.txt +++ b/fastlane/metadata/ja/release_notes.txt @@ -1,6 +1,8 @@ -iCloud同期とソース管理の改善： +ネイティブiPadサポートと新しいポートフォリオツール： -• iCloud同期 — すべてのAppleデバイス間でデータが確実に同期されるようになりました -• ソース検索 — 名前で素早くソースを検索 -• カテゴリフィルター — 資産クラス別にソースをフィルタリング +• iPad — スプリットビューナビゲーションとダッシュボード、ソース、チャート、ジャーナルに最適化されたレイアウトを備えた完全なネイティブ体験 +• 目標のアーカイブ — 達成した目標をアーカイブしてリストを整理 +• カテゴリ管理 — 設定から投資カテゴリを作成・編集・カスタマイズ +• 年別比較チャート — 複数年にわたるポートフォリオの価値を一目で比較（プレミアム） +• 柔軟なCSVインポート — 任意の証券会社のデータをインポートするために列形式をマッピング • バグ修正とパフォーマンス改善 diff --git a/fastlane/metadata/pt-BR/release_notes.txt b/fastlane/metadata/pt-BR/release_notes.txt index 11b6711..9884a50 100644 --- a/fastlane/metadata/pt-BR/release_notes.txt +++ b/fastlane/metadata/pt-BR/release_notes.txt @@ -1,6 +1,8 @@ -Melhorias na sincronização iCloud e no gerenciamento de fontes: +Suporte nativo ao iPad e novas ferramentas de portfólio: -• Sincronização iCloud — seus dados agora sincronizam de forma confiável em todos os dispositivos Apple -• Pesquisa de fontes — encontre qualquer fonte rapidamente por nome -• Filtros por categoria — filtre suas fontes por classe de ativo +• iPad — experiência nativa completa com navegação em tela dividida e layouts otimizados para Dashboard, Fontes, Gráficos e Diário +• Arquivamento de objetivos — arquive objetivos concluídos para manter sua lista organizada +• Gerenciamento de categorias — crie, edite e personalize suas categorias de investimento nas Configurações +• Gráfico ano a ano — compare o valor do portfólio em vários anos de forma rápida (Premium) +• Importação CSV flexível — mapeie qualquer formato de colunas para importar dados de qualquer corretora • Correções de bugs e melhorias de desempenho