admin/Reflect
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

filtering days in customize will filter views

Browse Source
This commit is contained in:
Trey t
2022-03-31 14:45:08 -05:00
parent 9e4cfd2775
commit bdd0b0ce59
14 changed files with 102 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Shared/views/MonthView/MonthView.swift
View File

@@ -8,6 +8,8 @@
import SwiftUI
struct MonthView: View {
@EnvironmentObject var daysFilter: DaysFilterClass
@AppStorage(UserDefaultsStore.Keys.needsOnboarding.rawValue, store: GroupUserDefaults.groupDefaults) private var needsOnboarding = true
@AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system
@@ -22,7 +24,6 @@ struct MonthView: View {
// store a value that gets changed when user updates custom colors to update the view since the moodTint doesn't change
@AppStorage(UserDefaultsStore.Keys.customMoodTintUpdateNumber.rawValue, store: GroupUserDefaults.groupDefaults) private var customMoodTintUpdateNumber: Int = 0
@ObservedObject var viewModel = HomeViewViewModel(addMonthStartWeekdayPadding: true)
@StateObject private var selectedDetail = StupidAssDetailViewObservableObject()
@State private var showingSheet = false
@@ -43,6 +44,8 @@ struct MonthView: View {
GridItem(.flexible(minimum: 5, maximum: 400))
]
@ObservedObject var viewModel: DayViewViewModel
var body: some View {
ZStack {
if viewModel.hasNoData {
@@ -201,10 +204,17 @@ extension MonthView {
Divider()
LazyVGrid(columns: columns, spacing: 15) {
ForEach(entries, id: \.self) { entry in
shape.view(withText: Text(""),
bgColor: entry.mood == .placeholder ? .clear : moodTint.color(forMood: entry.mood),
textColor: .clear)
.frame(minHeight: 25, idealHeight: 25, maxHeight: 50, alignment: .center)
if daysFilter.currentFilters.contains(Int(entry.weekDay)) {
shape.view(withText: Text(""),
bgColor: entry.mood == .placeholder ? .clear : moodTint.color(forMood: entry.mood),
textColor: .clear)
.frame(minHeight: 25, idealHeight: 25, maxHeight: 50, alignment: .center)
} else {
shape.view(withText: Text(""),
bgColor: .clear,
textColor: .clear)
.frame(minHeight: 25, idealHeight: 25, maxHeight: 50, alignment: .center)
}
}
}
}
@@ -223,6 +233,6 @@ extension MonthView {
struct HomeViewTwo_Previews: PreviewProvider {
static var previews: some View {
MonthView()
MonthView(viewModel: DayViewViewModel(addMonthStartWeekdayPadding: true))
}
}