From ec55a2677ee4467b21c191329baecaa70533aa7f Mon Sep 17 00:00:00 2001 From: Trey t Date: Sun, 27 Feb 2022 15:11:59 -0600 Subject: [PATCH 1/3] add dev app group --- Feels (iOS)Dev.entitlements | 1 + FeelsWidgetExtension.entitlements | 1 + FeelsWidgetExtensionDev.entitlements | 1 + 3 files changed, 3 insertions(+) diff --git a/Feels (iOS)Dev.entitlements b/Feels (iOS)Dev.entitlements index 657f901..968e8f5 100644 --- a/Feels (iOS)Dev.entitlements +++ b/Feels (iOS)Dev.entitlements @@ -15,6 +15,7 @@ com.apple.security.application-groups group.com.88oak.ifeel + group.com.88oak.ifeelDebug diff --git a/FeelsWidgetExtension.entitlements b/FeelsWidgetExtension.entitlements index 657f901..968e8f5 100644 --- a/FeelsWidgetExtension.entitlements +++ b/FeelsWidgetExtension.entitlements @@ -15,6 +15,7 @@ com.apple.security.application-groups group.com.88oak.ifeel + group.com.88oak.ifeelDebug diff --git a/FeelsWidgetExtensionDev.entitlements b/FeelsWidgetExtensionDev.entitlements index 657f901..968e8f5 100644 --- a/FeelsWidgetExtensionDev.entitlements +++ b/FeelsWidgetExtensionDev.entitlements @@ -15,6 +15,7 @@ com.apple.security.application-groups group.com.88oak.ifeel + group.com.88oak.ifeelDebug From 0f69d91182f9bf983dc55d998dbc918e54b4e8ae Mon Sep 17 00:00:00 2001 From: Trey t Date: Sun, 27 Feb 2022 15:16:05 -0600 Subject: [PATCH 2/3] 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"; From 2decfd4aeb52b6327987fad3aa74b5e83db4c8f4 Mon Sep 17 00:00:00 2001 From: Trey t Date: Sun, 27 Feb 2022 15:16:59 -0600 Subject: [PATCH 3/3] remove double bg view on homeviewtwo detail --- Shared/views/HomeView/HomeViewTwo/MonthDetailView.swift | 3 --- 1 file changed, 3 deletions(-) diff --git a/Shared/views/HomeView/HomeViewTwo/MonthDetailView.swift b/Shared/views/HomeView/HomeViewTwo/MonthDetailView.swift index b18d55b..c8a1fd0 100644 --- a/Shared/views/HomeView/HomeViewTwo/MonthDetailView.swift +++ b/Shared/views/HomeView/HomeViewTwo/MonthDetailView.swift @@ -45,9 +45,6 @@ struct MonthDetailView: View { createListView() .padding([.leading, .trailing]) - .background( - theme.currentTheme.bg - ) monthDetails .frame(maxWidth: .infinity, alignment: .leading)