1.1.0 feature work: Monthly Check-in, Charts, Goals, Share, Reviews

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-11 23:37:11 +01:00
parent daaca95913
commit 4761e2e5c8
19 changed files with 1118 additions and 90 deletions
@@ -160,7 +160,18 @@ struct DashboardView: View {
                    yearChange: viewModel.portfolioSummary.formattedYearChange,
                    sinceInceptionChange: viewModel.portfolioSummary.formattedAllTimeReturn,
                    isYearPositive: viewModel.isYearChangePositive,
-                    isSinceInceptionPositive: viewModel.portfolioSummary.allTimeReturn >= 0
+                    isSinceInceptionPositive: viewModel.portfolioSummary.allTimeReturn >= 0,
+                    onShareTap: {
+                        ShareService.shared.sharePortfolioValue(
+                            totalValue: viewModel.portfolioSummary.formattedTotalValue,
+                            changeText: calmModeEnabled
+                                ? "\(viewModel.latestPortfolioChange.formattedAbsolute) (\(viewModel.latestPortfolioChange.formattedPercentage))"
+                                : viewModel.portfolioSummary.formattedDayChange,
+                            changeLabel: calmModeEnabled ? "since last check-in" : "today",
+                            yearChange: viewModel.portfolioSummary.formattedYearChange,
+                            sinceInceptionChange: viewModel.portfolioSummary.formattedAllTimeReturn
+                        )
+                    }
                )
            }
        case .monthlyCheckIn:
@@ -210,11 +221,12 @@ struct DashboardView: View {
                CategoryBreakdownCard(categories: viewModel.topCategories)
            }
        case .goals:
+            let homeGoals = goalsViewModel.goals.filter { !GoalsViewModel.isAchieved(progress: goalsViewModel.progress(for: $0)) }
            if config.isCollapsed {
-                CompactCard(title: "Goals", subtitle: "\(goalsViewModel.goals.count) active")
+                CompactCard(title: "Goals", subtitle: "\(homeGoals.count) active")
            } else {
                GoalsSummaryCard(
-                    goals: goalsViewModel.goals,
+                    goals: homeGoals,
                    progressProvider: goalsViewModel.progress(for:),
                    currentValueProvider: goalsViewModel.totalValue(for:),
                    paceStatusProvider: goalsViewModel.paceStatus(for:),
@@ -266,12 +278,24 @@ struct TotalValueCard: View {
    var sinceInceptionChange: String?
    var isYearPositive: Bool = true
    var isSinceInceptionPositive: Bool = true
+    var onShareTap: (() -> Void)?

    var body: some View {
        VStack(spacing: 8) {
-            Text("Total Portfolio Value")
-                .font(.subheadline)
-                .foregroundColor(.white.opacity(0.85))
+            ZStack(alignment: .trailing) {
+                Text("Total Portfolio Value")
+                    .font(.headline.weight(.semibold))
+                    .foregroundColor(.white.opacity(0.85))
+
+                if let onShareTap {
+                    Button(action: onShareTap) {
+                        Image(systemName: "square.and.arrow.up")
+                            .font(.subheadline.weight(.semibold))
+                            .foregroundColor(.white.opacity(0.9))
+                    }
+                    .padding(.trailing, 8)
+                }
+            }

            Text(totalValue)
                .font(.system(size: 42, weight: .bold, design: .rounded))
@@ -423,13 +447,6 @@ struct MonthlyCheckInCard: View {

                Spacer()

-                NavigationLink {
-                    AchievementsView(referenceDate: Date())
-                } label: {
-                    Image(systemName: "trophy.fill")
-                }
-                .font(.subheadline.weight(.semibold))
-
                if let reminderDate {
                    Button {
                        let title = String(
@@ -1053,6 +1070,12 @@ struct GoalsSummaryCard: View {
                ForEach(goals.prefix(2)) { goal in
                    let currentValue = currentValueProvider(goal)
                    let paceStatus = paceStatusProvider(goal)
+                    let isAchieved = GoalsViewModel.isAchieved(progress: progressProvider(goal))
+                    let targetUrgency = GoalsViewModel.urgencyLevel(
+                        targetDate: goal.targetDate,
+                        isBehind: paceStatus?.isBehind ?? false,
+                        isAchieved: isAchieved
+                    )
                    VStack(alignment: .leading, spacing: 6) {
                        HStack {
                            Text(goal.name)
@@ -1083,6 +1106,12 @@ struct GoalsSummaryCard: View {
                                .foregroundColor(.secondary)
                        }

+                        if let targetDate = goal.targetDate {
+                            Text("Target: \(targetDate.mediumDateString)")
+                                .font(.caption2.weight(.semibold))
+                                .foregroundColor(targetUrgency == .critical ? .negativeRed : (targetUrgency == .warning ? .appWarning : .secondary))
+                        }
+
                        if let etaText = etaProvider(goal) {
                            Text(etaText)
                                .font(.caption2)
@@ -1,6 +1,7 @@
 import SwiftUI

 struct MonthlyCheckInView: View {
+    @Environment(\.openURL) private var openURL
    @EnvironmentObject var accountStore: AccountStore
    @StateObject private var viewModel = MonthlyCheckInViewModel()
    let referenceDate: Date
@@ -13,6 +14,8 @@ struct MonthlyCheckInView: View {
    @State private var editingSnapshot: Snapshot?
    @State private var addingSource: InvestmentSource?
    @State private var didApplyDuplicate = false
+    @State private var showAchievementSatisfactionDialog = false
+    @State private var showAppStoreReviewAlert = false

    init(referenceDate: Date = Date(), duplicatePrevious: Bool = false) {
        self.referenceDate = referenceDate
@@ -56,7 +59,7 @@ struct MonthlyCheckInView: View {
    }

    private var canAddNewCheckIn: Bool {
-        lastCompletionDate == nil || checkInProgress >= 0.7
+        true
    }

    var body: some View {
@@ -119,11 +122,36 @@ struct MonthlyCheckInView: View {
        .onChange(of: selectedMood) { _, newValue in
            MonthlyCheckInStore.setMood(newValue, for: referenceDate)
        }
+        .confirmationDialog(
+            "How much are you enjoying Portfolio Journal?",
+            isPresented: $showAchievementSatisfactionDialog,
+            titleVisibility: .visible
+        ) {
+            ForEach(1...5, id: \.self) { value in
+                Button("\(value) Star\(value > 1 ? "s" : "")") {
+                    if value == 5 {
+                        showAppStoreReviewAlert = true
+                    }
+                }
+            }
+            Button("Not Now", role: .cancel) {}
+        } message: {
+            Text("Congrats on your new achievement! Your feedback helps us improve.")
+        }
+        .alert("Would you like to leave an App Store review?", isPresented: $showAppStoreReviewAlert) {
+            Button("Not Now", role: .cancel) {}
+            Button("Write a Review") {
+                ReviewPromptService.shared.markStoreReviewCompleted()
+                openURL(ReviewPromptService.appStoreWriteReviewURL())
+            }
+        } message: {
+            Text("Thanks for the 5 stars. It really helps other investors discover the app.")
+        }
    }

    private var headerCard: some View {
        VStack(alignment: .leading, spacing: 8) {
-            Text("This Month")
+            Text(monthLabel)
                .font(.headline)

            if let date = lastCompletionDate {
@@ -162,6 +190,7 @@ struct MonthlyCheckInView: View {
            }

            Button {
+                let previousUnlockedAchievementKeys = unlockedAchievementKeys()
                let now = Date()
                let completionDate = referenceDate.isSameMonth(as: now)
                    ? now
@@ -169,6 +198,12 @@ struct MonthlyCheckInView: View {
                MonthlyCheckInStore.setCompletionDate(completionDate, for: referenceDate)
                ReviewPromptService.shared.recordMonthlyCheckInCompleted()
                viewModel.refresh()
+                let newlyUnlockedAchievementKeys = unlockedAchievementKeys().subtracting(previousUnlockedAchievementKeys)
+                if ReviewPromptService.shared.shouldAskForAchievementSatisfaction(
+                    newlyUnlockedAchievementKeys: newlyUnlockedAchievementKeys
+                ) {
+                    showAchievementSatisfactionDialog = true
+                }
            } label: {
                Text("Mark Check-in Complete")
                    .font(.subheadline.weight(.semibold))
@@ -178,12 +213,6 @@ struct MonthlyCheckInView: View {
                    .cornerRadius(AppConstants.UI.cornerRadius)
            }
            .disabled(!canAddNewCheckIn)
-
-            if !canAddNewCheckIn {
-                Text("Editing stays open. New check-ins unlock after 70% of the month.")
-                    .font(.caption)
-                    .foregroundColor(.secondary)
-            }
        }
        .padding()
        .background(Color(.systemBackground))
@@ -191,6 +220,27 @@ struct MonthlyCheckInView: View {
        .shadow(color: .black.opacity(0.05), radius: 8, y: 2)
    }

+    private var monthLabel: String {
+        Self.monthLabel(for: referenceDate, relativeTo: Date(), locale: .current)
+    }
+
+    private func unlockedAchievementKeys() -> Set<String> {
+        Set(
+            MonthlyCheckInStore
+                .achievementStatuses(referenceDate: referenceDate)
+                .filter(\.isUnlocked)
+                .map(\.id)
+        )
+    }
+
+    static func monthLabel(for date: Date, relativeTo referenceDate: Date, locale: Locale) -> String {
+        let formatter = DateFormatter()
+        formatter.dateFormat = "LLLL yyyy"
+        formatter.locale = locale
+        let effectiveMonth = MonthlyCheckInStore.effectiveMonth(for: date, relativeTo: referenceDate)
+        return formatter.string(from: effectiveMonth)
+    }
+
    private var reflectionCard: some View {
        VStack(alignment: .leading, spacing: 12) {
            HStack {
@@ -457,11 +507,7 @@ struct MonthlyCheckInView: View {

    private func shareMonthlyCheckIn() {
        let summary = viewModel.monthlySummary
-        let text = ShareService.buildMonthlyCheckInShareText(
-            summary: summary,
-            appName: appDisplayName
-        )
-        ShareService.shared.shareText(text)
+        ShareService.shared.shareMonthlyCheckIn(summary: summary, appName: appDisplayName)
    }

    private var appDisplayName: String {
@@ -0,0 +1,143 @@
+import SwiftUI
+
+struct MonthlyCheckInShareCardView: View {
+    let summary: MonthlySummary
+    let appName: String
+    var qrCodeImage: UIImage? = nil
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 14) {
+            Text(summary.periodLabel)
+                .font(.caption.weight(.semibold))
+                .foregroundColor(.white.opacity(0.85))
+
+            Text("Monthly Check-in")
+                .font(.title2.weight(.bold))
+                .foregroundColor(.white)
+
+            metricRow("Starting", summary.formattedStartingValue)
+            metricRow("Ending", summary.formattedEndingValue)
+            metricRow("Contributions", summary.formattedContributions)
+            metricRow("Net performance", "\(summary.formattedNetPerformance) (\(summary.formattedNetPerformancePercentage))")
+
+            Spacer(minLength: 0)
+            shareFooter(appName: appName, qrCodeImage: qrCodeImage)
+        }
+        .padding(20)
+        .frame(width: 320, height: 300)
+        .background(LinearGradient.appPrimaryGradient)
+        .clipShape(RoundedRectangle(cornerRadius: 24, style: .continuous))
+        .overlay(
+            RoundedRectangle(cornerRadius: 24, style: .continuous)
+                .stroke(Color.white.opacity(0.2), lineWidth: 1)
+        )
+    }
+}
+
+struct PortfolioValueShareCardView: View {
+    let totalValue: String
+    let changeText: String
+    let changeLabel: String
+    let yearChange: String?
+    let sinceInceptionChange: String?
+    let appName: String
+    var qrCodeImage: UIImage? = nil
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 14) {
+            Text("Portfolio Snapshot")
+                .font(.caption.weight(.semibold))
+                .foregroundColor(.white.opacity(0.85))
+
+            Text("Total Portfolio Value")
+                .font(.headline.weight(.semibold))
+                .foregroundColor(.white.opacity(0.9))
+
+            Text(totalValue)
+                .font(.system(size: 34, weight: .bold, design: .rounded))
+                .foregroundColor(.white)
+
+            Text("\(changeText) \(changeLabel)")
+                .font(.subheadline.weight(.semibold))
+                .foregroundColor(.white.opacity(0.9))
+
+            if let yearChange {
+                metricRow("YoY", yearChange)
+            }
+
+            if let sinceInceptionChange {
+                metricRow("Since inception", sinceInceptionChange)
+            }
+
+            Spacer(minLength: 0)
+            shareFooter(appName: appName, qrCodeImage: qrCodeImage)
+        }
+        .padding(20)
+        .frame(width: 320, height: 290)
+        .background(
+            LinearGradient(
+                colors: [Color.appSecondary, Color.appPrimary],
+                startPoint: .topLeading,
+                endPoint: .bottomTrailing
+            )
+        )
+        .clipShape(RoundedRectangle(cornerRadius: 24, style: .continuous))
+        .overlay(
+            RoundedRectangle(cornerRadius: 24, style: .continuous)
+                .stroke(Color.white.opacity(0.2), lineWidth: 1)
+        )
+    }
+}
+
+private func metricRow(_ title: String, _ value: String) -> some View {
+    HStack {
+        Text(title)
+            .font(.caption.weight(.semibold))
+            .foregroundColor(.white.opacity(0.8))
+        Spacer()
+        Text(value)
+            .font(.subheadline.weight(.semibold))
+            .foregroundColor(.white)
+            .multilineTextAlignment(.trailing)
+    }
+}
+
+private func shareFooter(appName: String, qrCodeImage: UIImage?) -> some View {
+    VStack(spacing: 10) {
+        Rectangle()
+            .fill(Color.white.opacity(0.2))
+            .frame(height: 1)
+
+        HStack(spacing: 12) {
+            Image("BrandMark")
+                .resizable()
+                .aspectRatio(contentMode: .fit)
+                .frame(width: 36, height: 36)
+                .clipShape(RoundedRectangle(cornerRadius: 8, style: .continuous))
+
+            VStack(alignment: .leading, spacing: 2) {
+                Text("Powered by")
+                    .font(.caption2.weight(.medium))
+                    .foregroundColor(.white.opacity(0.7))
+                Text(appName)
+                    .font(.subheadline.weight(.bold))
+                    .foregroundColor(.white)
+            }
+
+            Spacer()
+
+            if let qrCodeImage {
+                Image(uiImage: qrCodeImage)
+                    .interpolation(.none)
+                    .resizable()
+                    .frame(width: 48, height: 48)
+                    .background(Color.white)
+                    .clipShape(RoundedRectangle(cornerRadius: 6, style: .continuous))
+            } else {
+                Image(systemName: "qrcode")
+                    .font(.title3)
+                    .foregroundColor(.white.opacity(0.9))
+            }
+        }
+    }
+}