Merge branch 'develop'

This commit is contained in:
Trey t
2022-02-27 15:19:27 -06:00
7 changed files with 9 additions and 14 deletions

View File

@@ -15,6 +15,7 @@
<key>com.apple.security.application-groups</key> <key>com.apple.security.application-groups</key>
<array> <array>
<string>group.com.88oak.ifeel</string> <string>group.com.88oak.ifeel</string>
<string>group.com.88oak.ifeelDebug</string>
</array> </array>
</dict> </dict>
</plist> </plist>

View File

@@ -15,6 +15,7 @@
<key>com.apple.security.application-groups</key> <key>com.apple.security.application-groups</key>
<array> <array>
<string>group.com.88oak.ifeel</string> <string>group.com.88oak.ifeel</string>
<string>group.com.88oak.ifeelDebug</string>
</array> </array>
</dict> </dict>
</plist> </plist>

View File

@@ -15,6 +15,7 @@
<key>com.apple.security.application-groups</key> <key>com.apple.security.application-groups</key>
<array> <array>
<string>group.com.88oak.ifeel</string> <string>group.com.88oak.ifeel</string>
<string>group.com.88oak.ifeelDebug</string>
</array> </array>
</dict> </dict>
</plist> </plist>

View File

@@ -47,12 +47,6 @@ struct HomeViewTwo: View {
} else { } else {
ScrollView { ScrollView {
ZStack { ZStack {
topView
.frame(maxWidth: .infinity, alignment: .leading)
.frame(height: 250)
.background(
.blue
)
settingsButtonView settingsButtonView
} }
LazyVStack(spacing: 5, pinnedViews: [.sectionHeaders]) { LazyVStack(spacing: 5, pinnedViews: [.sectionHeaders]) {

View File

@@ -45,9 +45,6 @@ struct MonthDetailView: View {
createListView() createListView()
.padding([.leading, .trailing]) .padding([.leading, .trailing])
.background(
theme.currentTheme.bg
)
monthDetails monthDetails
.frame(maxWidth: .infinity, alignment: .leading) .frame(maxWidth: .infinity, alignment: .leading)

View File

@@ -18,16 +18,16 @@ struct MainTabView: View {
var body: some View { var body: some View {
TabView { TabView {
HomeViewTwo()
.tabItem {
Label(String(localized: "content_view_tab_main"), systemImage: "calendar")
}
HomeView() HomeView()
.tabItem { .tabItem {
Label(String(localized: "content_view_tab_main"), systemImage: "list.dash") Label(String(localized: "content_view_tab_main"), systemImage: "list.dash")
} }
HomeViewTwo()
.tabItem {
Label(String(localized: "content_view_tab_month"), systemImage: "calendar")
}
FilterView() FilterView()
.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")

View File

@@ -31,6 +31,7 @@
"add_mood_header_view_title_yesterday" = "How was yesterday?"; "add_mood_header_view_title_yesterday" = "How was yesterday?";
"content_view_tab_main" = "Main"; "content_view_tab_main" = "Main";
"content_view_tab_month" = "Months";
"content_view_tab_filter" = "Filter"; "content_view_tab_filter" = "Filter";
"content_view_tab_share" = "Share"; "content_view_tab_share" = "Share";
"content_view_tab_customize" = "Customize"; "content_view_tab_customize" = "Customize";