Code cleanup

This commit is contained in:
VincentMeilinger
2024-01-25 22:51:08 +01:00
parent f6f9ca553a
commit 10cb851a5a
18 changed files with 131 additions and 107 deletions

View File

@@ -10,7 +10,7 @@ import SwiftUI
import UIKit
@MainActor class MainViewModel: ObservableObject {
@MainActor class AppState: ObservableObject {
@Published var categories: [Category] = []
@Published var recipes: [String: [Recipe]] = [:]
@Published var recipeDetails: [Int: RecipeDetail] = [:]
@@ -513,7 +513,7 @@ import UIKit
extension MainViewModel {
extension AppState {
func loadLocal<T: Codable>(path: String) async -> T? {
do {
return try await dataStore.load(fromPath: path)
@@ -612,7 +612,7 @@ extension DateFormatter {
// Timer logic
extension MainViewModel {
extension AppState {
func createTimer(forRecipe recipeId: String, duration: DurationComponents) -> RecipeTimer {
let timer = RecipeTimer(duration: duration)
timers[recipeId] = timer

View File

@@ -9,7 +9,7 @@ import Foundation
import SwiftUI
@MainActor class RecipeEditViewModel: ObservableObject {
@ObservedObject var mainViewModel: MainViewModel
@ObservedObject var mainViewModel: AppState
@Published var recipe: RecipeDetail = RecipeDetail()
@Published var prepDuration: DurationComponents = DurationComponents()
@@ -29,12 +29,12 @@ import SwiftUI
var waitingForUpload: Bool = false
init(mainViewModel: MainViewModel, uploadNew: Bool) {
init(mainViewModel: AppState, uploadNew: Bool) {
self.mainViewModel = mainViewModel
self.uploadNew = uploadNew
}
init(mainViewModel: MainViewModel, recipeDetail: RecipeDetail, uploadNew: Bool) {
init(mainViewModel: AppState, recipeDetail: RecipeDetail, uploadNew: Bool) {
self.mainViewModel = mainViewModel
self.recipe = recipeDetail
self.uploadNew = uploadNew