rename view to day month year
This commit is contained in:
@@ -8,7 +8,7 @@
|
|||||||
import SwiftUI
|
import SwiftUI
|
||||||
import CoreData
|
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 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")]
|
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 {
|
static var previews: some View {
|
||||||
Group {
|
Group {
|
||||||
FilterView()
|
YearView()
|
||||||
|
|
||||||
FilterView()
|
YearView()
|
||||||
.preferredColorScheme(.dark)
|
.preferredColorScheme(.dark)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ struct HomeViewConstants {
|
|||||||
static let minHeaderHeight = 120.0
|
static let minHeaderHeight = 120.0
|
||||||
}
|
}
|
||||||
|
|
||||||
struct HomeView: View {
|
struct DayView: View {
|
||||||
@Environment(\.managedObjectContext) private var viewContext
|
@Environment(\.managedObjectContext) private var viewContext
|
||||||
|
|
||||||
@AppStorage(UserDefaultsStore.Keys.deleteEnable.rawValue, store: GroupUserDefaults.groupDefaults) private var deleteEnabled = true
|
@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
|
// view that make up the list body
|
||||||
extension HomeView {
|
extension DayView {
|
||||||
private func SectionHeaderView(month: Int, year: Int) -> some View {
|
private func SectionHeaderView(month: Int, year: Int) -> some View {
|
||||||
Text("\(Random.monthName(fromMonthInt: month)) \(String(year))")
|
Text("\(Random.monthName(fromMonthInt: month)) \(String(year))")
|
||||||
.font(.title)
|
.font(.title)
|
||||||
@@ -324,14 +324,14 @@ private let itemFormatter: DateFormatter = {
|
|||||||
return formatter
|
return formatter
|
||||||
}()
|
}()
|
||||||
|
|
||||||
struct ContentView_Previews: PreviewProvider {
|
struct DayView_Previews: PreviewProvider {
|
||||||
static var previews: some View {
|
static var previews: some View {
|
||||||
HomeView().environment(\.managedObjectContext, PersistenceController.shared.viewContext)
|
DayView().environment(\.managedObjectContext, PersistenceController.shared.viewContext)
|
||||||
.onAppear(perform: {
|
.onAppear(perform: {
|
||||||
PersistenceController.shared.populateMemory()
|
PersistenceController.shared.populateMemory()
|
||||||
})
|
})
|
||||||
|
|
||||||
HomeView()
|
DayView()
|
||||||
.preferredColorScheme(.dark)
|
.preferredColorScheme(.dark)
|
||||||
.environment(\.managedObjectContext, PersistenceController.shared.viewContext)
|
.environment(\.managedObjectContext, PersistenceController.shared.viewContext)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ struct MainTabView: View {
|
|||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
TabView {
|
TabView {
|
||||||
HomeView()
|
DayView()
|
||||||
.tabItem {
|
.tabItem {
|
||||||
Label(String(localized: "content_view_tab_main"), systemImage: "list.dash")
|
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")
|
Label(String(localized: "content_view_tab_month"), systemImage: "calendar")
|
||||||
}
|
}
|
||||||
|
|
||||||
FilterView()
|
YearView()
|
||||||
.tabItem {
|
.tabItem {
|
||||||
Label(String(localized: "content_view_tab_filter"), systemImage: "line.3.horizontal.decrease.circle")
|
Label(String(localized: "content_view_tab_filter"), systemImage: "line.3.horizontal.decrease.circle")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,9 +31,9 @@
|
|||||||
"add_mood_header_view_title_yesterday" = "How was yesterday?";
|
"add_mood_header_view_title_yesterday" = "How was yesterday?";
|
||||||
"add_mood_header_view_title" = "How was %@?";
|
"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_month" = "Months";
|
||||||
"content_view_tab_filter" = "Filter";
|
"content_view_tab_filter" = "Year";
|
||||||
"content_view_tab_share" = "Share";
|
"content_view_tab_share" = "Share";
|
||||||
"content_view_tab_customize" = "Customize";
|
"content_view_tab_customize" = "Customize";
|
||||||
"content_view_fill_in_missing_entry" = "Update %@";
|
"content_view_fill_in_missing_entry" = "Update %@";
|
||||||
|
|||||||
Reference in New Issue
Block a user