From ed162dfde2aa6b28e8e3f8cc2a29decb3a82153f Mon Sep 17 00:00:00 2001 From: Trey t Date: Thu, 31 Mar 2022 11:27:42 -0500 Subject: [PATCH] rename view to day month year --- Shared/views/FilterView/FilterView.swift | 8 ++++---- Shared/views/HomeView/HomeView.swift | 10 +++++----- Shared/views/MainTabView.swift | 4 ++-- en.lproj/Localizable.strings | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Shared/views/FilterView/FilterView.swift b/Shared/views/FilterView/FilterView.swift index 4aab7c1..52269b9 100644 --- a/Shared/views/FilterView/FilterView.swift +++ b/Shared/views/FilterView/FilterView.swift @@ -8,7 +8,7 @@ import SwiftUI import CoreData -struct FilterView: View { +struct YearView: View { let weekdays = [("Sun", 1), ("mon", 2), ("tue", 3), ("wed", 4), ("thur", 5), ("fri", 6), ("sat", 7)] let months = [(0, "J"), (1, "F"), (2,"M"), (3,"A"), (4,"M"), (5, "J"), (6,"J"), (7,"A"), (8,"S"), (9,"O"), (10, "N"), (11,"D")] @@ -172,12 +172,12 @@ struct FilterView: View { } } -struct FilterView_Previews: PreviewProvider { +struct YearView_Previews: PreviewProvider { static var previews: some View { Group { - FilterView() + YearView() - FilterView() + YearView() .preferredColorScheme(.dark) } } diff --git a/Shared/views/HomeView/HomeView.swift b/Shared/views/HomeView/HomeView.swift index 6327475..998ba6f 100644 --- a/Shared/views/HomeView/HomeView.swift +++ b/Shared/views/HomeView/HomeView.swift @@ -14,7 +14,7 @@ struct HomeViewConstants { static let minHeaderHeight = 120.0 } -struct HomeView: View { +struct DayView: View { @Environment(\.managedObjectContext) private var viewContext @AppStorage(UserDefaultsStore.Keys.deleteEnable.rawValue, store: GroupUserDefaults.groupDefaults) private var deleteEnabled = true @@ -280,7 +280,7 @@ struct HomeView: View { } // view that make up the list body -extension HomeView { +extension DayView { private func SectionHeaderView(month: Int, year: Int) -> some View { Text("\(Random.monthName(fromMonthInt: month)) \(String(year))") .font(.title) @@ -324,14 +324,14 @@ private let itemFormatter: DateFormatter = { return formatter }() -struct ContentView_Previews: PreviewProvider { +struct DayView_Previews: PreviewProvider { static var previews: some View { - HomeView().environment(\.managedObjectContext, PersistenceController.shared.viewContext) + DayView().environment(\.managedObjectContext, PersistenceController.shared.viewContext) .onAppear(perform: { PersistenceController.shared.populateMemory() }) - HomeView() + DayView() .preferredColorScheme(.dark) .environment(\.managedObjectContext, PersistenceController.shared.viewContext) } diff --git a/Shared/views/MainTabView.swift b/Shared/views/MainTabView.swift index e40cab0..2574946 100644 --- a/Shared/views/MainTabView.swift +++ b/Shared/views/MainTabView.swift @@ -18,7 +18,7 @@ struct MainTabView: View { var body: some View { TabView { - HomeView() + DayView() .tabItem { Label(String(localized: "content_view_tab_main"), systemImage: "list.dash") } @@ -28,7 +28,7 @@ struct MainTabView: View { Label(String(localized: "content_view_tab_month"), systemImage: "calendar") } - FilterView() + YearView() .tabItem { Label(String(localized: "content_view_tab_filter"), systemImage: "line.3.horizontal.decrease.circle") } diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings index a8e6ba3..ca0b39b 100644 --- a/en.lproj/Localizable.strings +++ b/en.lproj/Localizable.strings @@ -31,9 +31,9 @@ "add_mood_header_view_title_yesterday" = "How was yesterday?"; "add_mood_header_view_title" = "How was %@?"; -"content_view_tab_main" = "Main"; +"content_view_tab_main" = "Day"; "content_view_tab_month" = "Months"; -"content_view_tab_filter" = "Filter"; +"content_view_tab_filter" = "Year"; "content_view_tab_share" = "Share"; "content_view_tab_customize" = "Customize"; "content_view_fill_in_missing_entry" = "Update %@";