built out themes a bit more

This commit is contained in:
Trey t
2022-02-06 14:15:16 -06:00
parent ea8ce75058
commit 3c6adce544
6 changed files with 108 additions and 80 deletions

View File

@@ -66,7 +66,7 @@ struct FilterView: View {
}
.padding(.bottom, 5)
.background(
theme.bg
theme.currentTheme.bg
.edgesIgnoringSafeArea(.all)
)
}
@@ -81,7 +81,7 @@ struct FilterView: View {
.frame(maxWidth: .infinity)
.frame(height: 44)
.foregroundColor(Color(UIColor.label))
.background(Color(theme.secondaryBGColor))
.background(Color(theme.currentTheme.secondaryBGColor))
.cornerRadius(10)
}).frame(maxWidth: .infinity)
}
@@ -103,7 +103,7 @@ struct FilterView: View {
private var statsView: some View {
ZStack {
Color(theme.secondaryBGColor)
Color(theme.currentTheme.secondaryBGColor)
HStack {
Spacer()
@@ -120,7 +120,7 @@ struct FilterView: View {
VStack {
VStack {
ZStack {
Color(theme.secondaryBGColor)
Color(theme.currentTheme.secondaryBGColor)
DatePicker(
String(localized: "filter_view_begin_date"),
selection: $viewModel.entryStartDate,
@@ -135,7 +135,7 @@ struct FilterView: View {
.padding([.leading, .trailing])
ZStack {
Color(theme.secondaryBGColor)
Color(theme.currentTheme.secondaryBGColor)
DatePicker(
String(localized: "filter_view_end_date"),
selection: $viewModel.entryEndDate,
@@ -150,7 +150,7 @@ struct FilterView: View {
.padding([.leading, .trailing])
ZStack {
Color(theme.secondaryBGColor)
Color(theme.currentTheme.secondaryBGColor)
HStack {
Spacer()
ForEach(weekdays.indices, id: \.self) { dayIdx in
@@ -204,7 +204,7 @@ struct FilterView: View {
.font(.title)
yearGridView(yearData: yearData, columns: columns)
.background(
Color(theme.secondaryBGColor)
Color(theme.currentTheme.secondaryBGColor)
)
.cornerRadius(10)
}