From 0f69d91182f9bf983dc55d998dbc918e54b4e8ae Mon Sep 17 00:00:00 2001 From: Trey t Date: Sun, 27 Feb 2022 15:16:05 -0600 Subject: [PATCH] make list view default screen rename homviewtwo tab to months remove top view on home view two --- Shared/views/HomeView/HomeViewTwo/HomeViewTwo.swift | 6 ------ Shared/views/MainTabView.swift | 10 +++++----- en.lproj/Localizable.strings | 1 + 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Shared/views/HomeView/HomeViewTwo/HomeViewTwo.swift b/Shared/views/HomeView/HomeViewTwo/HomeViewTwo.swift index e371317..e5076bd 100644 --- a/Shared/views/HomeView/HomeViewTwo/HomeViewTwo.swift +++ b/Shared/views/HomeView/HomeViewTwo/HomeViewTwo.swift @@ -47,12 +47,6 @@ struct HomeViewTwo: View { } else { ScrollView { ZStack { - topView - .frame(maxWidth: .infinity, alignment: .leading) - .frame(height: 250) - .background( - .blue - ) settingsButtonView } LazyVStack(spacing: 5, pinnedViews: [.sectionHeaders]) { diff --git a/Shared/views/MainTabView.swift b/Shared/views/MainTabView.swift index 61ac48f..b280ba9 100644 --- a/Shared/views/MainTabView.swift +++ b/Shared/views/MainTabView.swift @@ -18,16 +18,16 @@ struct MainTabView: View { var body: some View { TabView { - HomeViewTwo() - .tabItem { - Label(String(localized: "content_view_tab_main"), systemImage: "calendar") - } - HomeView() .tabItem { Label(String(localized: "content_view_tab_main"), systemImage: "list.dash") } + HomeViewTwo() + .tabItem { + Label(String(localized: "content_view_tab_month"), systemImage: "calendar") + } + FilterView() .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 c519360..35ab7eb 100644 --- a/en.lproj/Localizable.strings +++ b/en.lproj/Localizable.strings @@ -31,6 +31,7 @@ "add_mood_header_view_title_yesterday" = "How was yesterday?"; "content_view_tab_main" = "Main"; +"content_view_tab_month" = "Months"; "content_view_tab_filter" = "Filter"; "content_view_tab_share" = "Share"; "content_view_tab_customize" = "Customize";