From 6cb7274c41350b3adf17c4d2abac94d1740678b7 Mon Sep 17 00:00:00 2001 From: Trey t Date: Fri, 4 Feb 2022 17:41:26 -0600 Subject: [PATCH] alert shows what entry your updating --- Shared/views/ContentView.swift | 22 +++++++++++++++++++++- en.lproj/Localizable.strings | 2 +- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Shared/views/ContentView.swift b/Shared/views/ContentView.swift index 7fb5d4d..adac27f 100644 --- a/Shared/views/ContentView.swift +++ b/Shared/views/ContentView.swift @@ -63,7 +63,8 @@ struct ContentView: View { needsOnboarding = false viewModel.updateOnboardingData(onboardingData: onboardingData) }) - }).alert(String(localized: "content_view_fill_in_missing_entry"), isPresented: $showUpdateEntryAlert) { + }).alert(updateTitleHeader(forEntry: selectedEntry), + isPresented: $showUpdateEntryAlert) { ForEach(Mood.allValues) { mood in Button(mood.strValue, action: { if let selectedEntry = selectedEntry { @@ -89,6 +90,25 @@ struct ContentView: View { } } + private func updateTitleHeader(forEntry entry: MoodEntry?) -> String { + guard let entry = entry else { + return "" + } + + let components = Calendar.current.dateComponents([.day, .month, .year], from: entry.forDate!) + let day = components.day! + let month = components.month! + let year = components.year! + + let monthName = monthName(fromMonthInt: month) + let weekday = weekdayName(fromDate:entry.forDate!) + let dayz = dayFormat(fromDate:entry.forDate!) + + let string = weekday + " " + monthName + " " + dayz + " " + String(year) + + return String(format: String(localized: "content_view_fill_in_missing_entry"), string) + } + private var settingsButtonView: some View { HStack { Spacer() diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings index 542167d..d25fc25 100644 --- a/en.lproj/Localizable.strings +++ b/en.lproj/Localizable.strings @@ -33,7 +33,7 @@ "content_view_tab_main" = "Main"; "content_view_tab_filter" = "Filter"; "content_view_tab_stats" = "Stats"; -"content_view_fill_in_missing_entry" = "Update entry"; +"content_view_fill_in_missing_entry" = "Update %@"; "content_view_fill_in_missing_entry_cancel" = "Cancel"; "content_view_delete_entry" = "Delete this entry"; "content_view_header_title" = "Past %d days";