Added tabs and a grocery list

Nextcloud Cookbook iOS Client/Views/Tabs/GroceryListTabView.swift

@@ -0,0 +1,118 @@
+//
+//  GroceryListTabView.swift
+//  Nextcloud Cookbook iOS Client
+//
+//  Created by Vincent Meilinger on 23.01.24.
+//
+
+import Foundation
+import SwiftUI
+
+
+struct GroceryListTabView: View {
+    var body: some View {
+        NavigationStack {
+            if GroceryList.shared.listItems.isEmpty {
+                List {
+                    Text("You're all set for cooking 🍓")
+                        .font(.title2)
+                        .foregroundStyle(.secondary)
+                    Text("Add groceries to this list by either using the button next to an ingredient list in a recipe, or by swiping right on individual ingredients of a recipe.")
+                        
+                        .foregroundStyle(.secondary)
+                }
+                .padding()
+                .navigationTitle("Grocery List")
+            } else {
+                List(GroceryList.shared.listItems) { item in
+                    HStack(alignment: .top) {
+                        if item.isChecked {
+                            Image(systemName: "checkmark.circle")
+                        } else {
+                            Image(systemName: "circle")
+                        }
+                        
+                        Text("\(item.name)")
+                            .multilineTextAlignment(.leading)
+                            .lineLimit(5)
+                    }
+                    .foregroundStyle(item.isChecked ? Color.secondary : Color.primary)
+                    .onTapGesture {
+                        item.isChecked.toggle()
+                    }
+                    .animation(.easeInOut, value: item.isChecked)
+                    .swipeActions(edge: .trailing, allowsFullSwipe: true) {
+                        Button {
+                            GroceryList.shared.removeItem(item.name)
+                        } label: {
+                            Label("Delete", systemImage: "trash")
+                        }
+                        .tint(.red)
+                    }
+                }
+                .padding()
+                .navigationTitle("Grocery List")
+            }
+            
+        }
+    }
+}
+
+
+
+class GroceryListItem: ObservableObject, Identifiable, Codable {
+    var name: String
+    var isChecked: Bool
+    
+    init(_ name: String, isChecked: Bool = false) {
+        self.name = name
+        self.isChecked = isChecked
+    }
+}
+
+
+
+class GroceryList: ObservableObject {
+    static let shared: GroceryList = GroceryList()
+    
+    let dataStore: DataStore = DataStore()
+    @Published var listItems: [GroceryListItem] = []
+    
+    
+    func addItem(_ name: String) {
+        listItems.append(GroceryListItem(name))
+        save()
+    }
+    
+    func addItems(_ items: [String]) {
+        for item in items {
+            addItem(item)
+        }
+        save()
+    }
+    
+    func removeItem(_ name: String) {
+        guard let ix = listItems.firstIndex(where: { item in
+            item.name == name
+        }) else { return }
+        listItems.remove(at: ix)
+        save()
+    }
+    
+    func save() {
+        Task {
+            await dataStore.save(data: listItems, toPath: "grocery_list.data")
+        }
+    }
+    
+    func load() async {
+        do {
+            guard let listItems: [GroceryListItem] = try await dataStore.load(
+                fromPath: "grocery_list.data"
+            ) else { return }
+            self.listItems = listItems
+        } catch {
+            print("Unable to load grocery list")
+        }
+    }
+}

Nextcloud Cookbook iOS Client/Views/Tabs/RecipeTabView.swift

@@ -0,0 +1,166 @@
+//
+//  RecipeTabView.swift
+//  Nextcloud Cookbook iOS Client
+//
+//  Created by Vincent Meilinger on 23.01.24.
+//
+
+import Foundation
+import SwiftUI
+
+
+struct RecipeTabView: View {
+    @Binding var selectedCategory: Category?
+    @Binding var showLoadingIndicator: Bool
+    
+    @EnvironmentObject var viewModel: MainViewModel
+    @StateObject var userSettings: UserSettings = UserSettings.shared
+    
+    @State private var showEditView: Bool = false
+    @State private var serverConnection: Bool = false
+    
+    
+    var body: some View {
+        NavigationSplitView {
+            List(selection: $selectedCategory) {
+                // Categories
+                ForEach(viewModel.categories) { category in
+                    if category.recipe_count != 0 {
+                        NavigationLink(value: category) {
+                            HStack(alignment: .center) {
+                                if selectedCategory != nil && category.name == selectedCategory!.name {
+                                    Image(systemName: "book")
+                                } else {
+                                    Image(systemName: "book.closed.fill")
+                                }
+                                Text(category.name == "*" ? String(localized: "Other") : category.name)
+                                    .font(.system(size: 20, weight: .medium, design: .default))
+                                Spacer()
+                                Text("\(category.recipe_count)")
+                                    .font(.system(size: 15, weight: .bold, design: .default))
+                                    .foregroundStyle(Color.background)
+                                    .frame(width: 25, height: 25, alignment: .center)
+                                    .minimumScaleFactor(0.5)
+                                    .background {
+                                        Circle()
+                                            .foregroundStyle(Color.secondary)
+                                    }
+                            }.padding(7)
+                        }
+                    }
+                }
+            }
+            .navigationTitle("Cookbooks")
+            .toolbar {
+                RecipeTabViewToolBar(
+                    viewModel: viewModel,
+                    showEditView: $showEditView,
+                    serverConnection: $serverConnection,
+                    showLoadingIndicator: $showLoadingIndicator
+                )
+            }
+        } detail: {
+            NavigationStack {
+                if let category = selectedCategory {
+                    CategoryDetailView(
+                        categoryName: category.name,
+                        viewModel: viewModel,
+                        showEditView: $showEditView
+                    )
+                    .id(category.id) // Workaround: This is needed to update the detail view when the selection changes
+                }
+            }
+        }
+        .tint(.nextcloudBlue)
+        .sheet(isPresented: $showEditView) {
+            RecipeEditView(
+                viewModel:
+                    RecipeEditViewModel(
+                        mainViewModel: viewModel,
+                        uploadNew: true
+                    ),
+                isPresented: $showEditView
+            )
+        }
+        .task {
+            self.serverConnection = await viewModel.checkServerConnection()
+        }
+        .refreshable {
+            self.serverConnection = await viewModel.checkServerConnection()
+            await viewModel.getCategories()
+        }
+    }
+}
+
+
+fileprivate struct RecipeTabViewToolBar: ToolbarContent {
+    @ObservedObject var viewModel: MainViewModel
+    @Binding var showEditView: Bool
+    @Binding var serverConnection: Bool
+    @Binding var showLoadingIndicator: Bool
+    @State private var presentPopover: Bool = false
+    
+    var body: some ToolbarContent {
+        // Top left menu toolbar item
+        ToolbarItem(placement: .topBarLeading) {
+            Menu {
+                Button {
+                    Task {
+                        showLoadingIndicator = true
+                        UserSettings.shared.lastUpdate = Date.distantPast
+                        await viewModel.getCategories()
+                        for category in viewModel.categories {
+                            await viewModel.getCategory(named: category.name, fetchMode: .preferServer)
+                        }
+                        await viewModel.updateAllRecipeDetails()
+                        showLoadingIndicator = false
+                    }
+                } label: {
+                    Text("Refresh all")
+                    Image(systemName: "icloud.and.arrow.down")
+                }
+                
+            } label: {
+                Image(systemName: "ellipsis.circle")
+            }
+        }
+        
+        // Server connection indicator
+        ToolbarItem(placement: .topBarTrailing) {
+            Button {
+                print("Check server connection")
+                presentPopover = true
+            } label: {
+                if showLoadingIndicator {
+                    ProgressView()
+                } else if serverConnection {
+                    Image(systemName: "checkmark.icloud")
+                } else {
+                    Image(systemName: "xmark.icloud")
+                }
+            }.popover(isPresented: $presentPopover) {
+                VStack(alignment: .leading) {
+                    Text(serverConnection ? LocalizedStringKey("Connected to server.") : LocalizedStringKey("Unable to connect to server."))
+                        .bold()
+                        
+                    Text("Last updated: \(DateFormatter.utcToString(date: UserSettings.shared.lastUpdate))")
+                        .font(.caption)
+                        .foregroundStyle(Color.secondary)
+                }
+                .padding()
+                .presentationCompactAdaptation(.popover)
+            }
+        }
+        
+        // Create new recipes
+        ToolbarItem(placement: .topBarTrailing) {
+            Button {
+                print("Add new recipe")
+                showEditView = true
+            } label: {
+                Image(systemName: "plus.circle.fill")
+            }
+        }
+    
+    }
+}

Nextcloud Cookbook iOS Client/Views/Tabs/SearchTabView.swift

@@ -0,0 +1,58 @@
+//
+//  SearchTabView.swift
+//  Nextcloud Cookbook iOS Client
+//
+//  Created by Vincent Meilinger on 23.01.24.
+//
+
+import Foundation
+import SwiftUI
+
+
+struct SearchTabView: View {
+    @EnvironmentObject var viewModel: MainViewModel
+    
+    var body: some View {
+        RecipeSearchView(viewModel: viewModel)
+    }
+}
+
+struct RecipeSearchView: View {
+    @ObservedObject var viewModel: MainViewModel
+    @State var searchText: String = ""
+    @State var allRecipes: [Recipe] = []
+    
+    var body: some View {
+        NavigationStack {
+            VStack {
+                ScrollView(showsIndicators: false) {
+                    LazyVStack {
+                        ForEach(recipesFiltered(), id: \.recipe_id) { recipe in
+                            NavigationLink(value: recipe) {
+                                RecipeCardView(viewModel: viewModel, recipe: recipe)
+                                    .shadow(radius: 2)
+                            }
+                            .buttonStyle(.plain)
+                        }
+                    }
+                }
+                .navigationDestination(for: Recipe.self) { recipe in
+                    RecipeDetailView(viewModel: viewModel, recipe: recipe)
+                }
+                .searchable(text: $searchText, prompt: "Search recipes/keywords")
+            }
+            .navigationTitle("Search recipe")
+        }
+        .task {
+            allRecipes = await viewModel.getRecipes()
+        }
+    }
+    
+    func recipesFiltered() -> [Recipe] {
+        guard searchText != "" else { return allRecipes }
+        return allRecipes.filter { recipe in
+            recipe.name.lowercased().contains(searchText.lowercased()) || // check name for occurence of search term
+            (recipe.keywords != nil && recipe.keywords!.lowercased().contains(searchText.lowercased())) // check keywords for search term
+        }
+    }
+}