rename HomeViewTwo to MonthView

This commit is contained in:
Trey t
2022-02-27 15:37:23 -06:00
parent 6a83c4d74f
commit fca4b3cb02
4 changed files with 12 additions and 12 deletions

View File

@@ -0,0 +1,168 @@
//
// MonthDetailView.swift
// Feels (iOS)
//
// Created by Trey Tartt on 2/18/22.
//
import SwiftUI
struct MonthDetailView: View {
@AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system
@AppStorage(UserDefaultsStore.Keys.deleteEnable.rawValue, store: GroupUserDefaults.groupDefaults) private var deleteEnabled = true
@AppStorage(UserDefaultsStore.Keys.moodTint.rawValue, store: GroupUserDefaults.groupDefaults) private var moodTint: MoodTints = .Default
@State private var showingSheet = false
@State private var selectedEntry: MoodEntry?
@State private var showingUpdateEntryAlert = false
@State private var showUpdateEntryAlert = false
let monthInt: Int
let yearInt: Int
@State var entries: [MoodEntry]
var parentViewModel: HomeViewViewModel
let columns = [
GridItem(.flexible(minimum: 5, maximum: 50)),
GridItem(.flexible(minimum: 5, maximum: 50)),
GridItem(.flexible(minimum: 5, maximum: 50)),
GridItem(.flexible(minimum: 5, maximum: 50)),
GridItem(.flexible(minimum: 5, maximum: 50)),
GridItem(.flexible(minimum: 5, maximum: 50)),
GridItem(.flexible(minimum: 5, maximum: 50))
]
var body: some View {
VStack {
Text("\(Random.monthName(fromMonthInt: monthInt)) \(String(yearInt))")
.font(.title)
.foregroundColor(theme.currentTheme.labelColor)
.frame(maxWidth: .infinity, alignment: .leading)
.padding()
.background(
theme.currentTheme.secondaryBGColor
)
createListView()
.padding([.leading, .trailing])
monthDetails
.frame(maxWidth: .infinity, alignment: .leading)
.background(
theme.currentTheme.secondaryBGColor
)
}
.alert(HomeViewViewModel.updateTitleHeader(forEntry: selectedEntry),
isPresented: $showUpdateEntryAlert) {
ForEach(Mood.allValues) { mood in
Button(mood.strValue, action: {
if let selectedEntry = selectedEntry {
PersistenceController.shared.update(entryDate: selectedEntry.forDate!, withModd: mood)
}
updateEntries()
showUpdateEntryAlert = false
selectedEntry = nil
})
}
if let selectedEntry = selectedEntry,
deleteEnabled,
selectedEntry.mood != .missing {
Button(String(localized: "content_view_delete_entry"), action: {
PersistenceController.shared.update(entryDate: selectedEntry.forDate!, withModd: .missing)
updateEntries()
showUpdateEntryAlert = false
})
}
Button(String(localized: "content_view_fill_in_missing_entry_cancel"), role: .cancel, action: {
updateEntries()
selectedEntry = nil
showUpdateEntryAlert = false
})
}
.background(
theme.currentTheme.bg
)
}
private func createListView() -> some View {
ScrollView {
LazyVGrid(columns: columns, spacing: 25) {
ForEach(entries, id: \.self) { entry in
listViewEntry(forEntry: entry)
.onTapGesture(perform: {
if entry.canEdit {
selectedEntry = entry
showUpdateEntryAlert = true
}
})
}
}
}
}
private func listViewEntry(forEntry entry: MoodEntry) -> some View {
VStack {
if entry.mood == .placeholder {
Text(" ")
.font(.title3)
.foregroundColor(Mood.placeholder.color)
} else {
Text(entry.forDate!,
format: Date.FormatStyle().day())
.font(.title3)
.foregroundColor(theme.currentTheme.labelColor)
}
if entry.mood == .placeholder {
Circle()
.frame(minWidth: 5,
maxWidth: 50,
minHeight: 5,
maxHeight: 50,
alignment: .center)
.foregroundColor(moodTint.color(forMood: entry.mood))
} else {
entry.mood.icon
.resizable()
.aspectRatio(contentMode: .fit)
.frame(minWidth: 5,
maxWidth: 50,
minHeight: 5,
maxHeight: 50,
alignment: .center)
.foregroundColor(moodTint.color(forMood: entry.mood))
}
}
}
private func updateEntries() {
parentViewModel.updateData()
let (startDate, endDate) = Date.dateRange(monthInt: monthInt, yearInt: yearInt)
let updatedEntries = PersistenceController.shared.getData(startDate: startDate, endDate: endDate, includedDays: [1,2,3,4,5,6,7])
let padded = MoodEntryFunctions.padMoodEntriesMonth(monthEntries: updatedEntries)
entries = padded
}
private var monthDetails: some View {
VStack {
SmallRollUpHeaderView(entries: entries,
viewType: .constant(.total))
SmallRollUpHeaderView(entries: entries,
viewType: .constant(.percentageCircle))
.padding(.top, -20)
}
.padding()
}
}
struct MonthDetailView_Previews: PreviewProvider {
static var previews: some View {
MonthDetailView(monthInt: 5, yearInt: 2022, entries:
PersistenceController.shared.randomEntries(count: 30).sorted(by: {
$0.forDate! < $1.forDate!
}), parentViewModel: HomeViewViewModel(addMonthStartWeekdayPadding: true))
}
}

View File

@@ -0,0 +1,163 @@
//
// HomeViewTwo.swift
// Feels (iOS)
//
// Created by Trey Tartt on 2/18/22.
//
import SwiftUI
struct MonthView: View {
@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
@AppStorage(UserDefaultsStore.Keys.moodTint.rawValue, store: GroupUserDefaults.groupDefaults) private var moodTint: MoodTints = .Default
@ObservedObject var viewModel = HomeViewViewModel(addMonthStartWeekdayPadding: true)
@StateObject private var selectedDetail = StupidAssDetailViewObservableObject()
@State private var showingSheet = false
@StateObject private var onboardingData = OnboardingDataDataManager.shared
class StupidAssDetailViewObservableObject: ObservableObject {
@Published var fuckingWrapped: MonthDetailView? = nil
@Published var showFuckingSheet = false
}
let columns = [
GridItem(.flexible(minimum: 5, maximum: 400)),
GridItem(.flexible(minimum: 5, maximum: 400)),
GridItem(.flexible(minimum: 5, maximum: 400)),
GridItem(.flexible(minimum: 5, maximum: 400)),
GridItem(.flexible(minimum: 5, maximum: 400)),
GridItem(.flexible(minimum: 5, maximum: 400)),
GridItem(.flexible(minimum: 5, maximum: 400))
]
var body: some View {
ZStack {
if viewModel.hasNoData {
settingsButtonView
VStack {
Spacer()
EmptyHomeView(viewModel: viewModel)
.padding()
Spacer()
}
} else {
ScrollView {
LazyVStack(spacing: 5, pinnedViews: [.sectionHeaders]) {
ForEach(viewModel.grouped.sorted(by: { $0.key < $1.key }), id: \.key) { year, months in
// for reach month
ForEach(months.sorted(by: { $0.key < $1.key }), id: \.key) { month, entries in
Section() {
homeViewTwoMonthListView(month: month, year: year, entries: entries)
}
}
.padding(.bottom)
}
.padding()
.background(
RoundedRectangle(cornerRadius: 10)
.foregroundColor(
theme.currentTheme.secondaryBGColor
)
)
}
.padding([.leading, .trailing])
}.sheet(isPresented: $selectedDetail.showFuckingSheet,
onDismiss: didDismiss) {
selectedDetail.fuckingWrapped
}
.edgesIgnoringSafeArea(.top)
}
}
.background(
theme.currentTheme.bg
.edgesIgnoringSafeArea(.all)
)
}
func didDismiss() {
selectedDetail.showFuckingSheet = false
selectedDetail.fuckingWrapped = nil
}
}
extension MonthView {
private var topView: some View {
VStack {
if ShowBasedOnVoteLogics.isMissingCurrentVote(onboardingData: onboardingData.savedOnboardingData) {
Text("Vote")
}
Text("dis top")
.foregroundColor(theme.currentTheme.secondaryBGColor)
}
}
private var settingsButtonView: some View {
HStack {
Spacer()
VStack {
Button(action: {
showingSheet.toggle()
}, label: {
Image(systemName: "gear")
.foregroundColor(Color(UIColor.darkGray))
.font(.system(size: 20))
}).sheet(isPresented: $showingSheet) {
SettingsView(editedDataClosure: {
withAnimation{
viewModel.updateData()
}
})
}
.padding(.top, 60)
.padding(.trailing)
Spacer()
}
}
}
}
// view that make up the list body
extension MonthView {
private func homeViewTwoSectionHeaderView(month: Int, year: Int) -> some View {
Text("\(Random.monthName(fromMonthInt: month)) \(String(year))")
.font(.body)
.foregroundColor(theme.currentTheme.labelColor)
.frame(maxWidth: .infinity, alignment: .leading)
}
private func homeViewTwoMonthListView(month: Int, year: Int, entries: [MoodEntry]) -> some View {
VStack {
homeViewTwoSectionHeaderView(month: month, year: year)
Divider()
LazyVGrid(columns: columns, spacing: 15) {
ForEach(entries, id: \.self) { entry in
Circle()
.foregroundColor(entry.mood == .placeholder ? .clear : moodTint.color(forMood: entry.mood))
.frame(minHeight: 5, idealHeight: 20, maxHeight: 50, alignment: .center)
}
}
}
.contentShape(Rectangle())
.onTapGesture{
let deailView = MonthDetailView(monthInt: month,
yearInt: year,
entries: entries,
parentViewModel: viewModel)
selectedDetail.fuckingWrapped = deailView
selectedDetail.showFuckingSheet = true
}
}
}
struct HomeViewTwo_Previews: PreviewProvider {
static var previews: some View {
MonthView()
}
}