Hendrik Hogertz
7c824b492e
Network layer: - Replace static CookbookApi protocol with instance-based CookbookApiProtocol using async/throws instead of tuple returns - Refactor ApiRequest to use URLComponents for proper URL encoding, replace print statements with OSLog, and return typed NetworkError cases - Add structured NetworkError variants (httpError, connectionError, etc.) - Remove global cookbookApi constant in favor of injected dependency on AppState - Delete unused RecipeEditViewModel, RecipeScraper, and Scraper playground Data & model fixes: - Add custom Decodable for RecipeDetail with safe fallbacks for malformed JSON - Make Category Hashable/Equatable use only `name` so NavigationSplitView selection survives category refreshes with updated recipe_count - Return server-assigned ID from uploadRecipe so new recipes get their ID before the post-upload refresh block executes View updates: - Refresh both old and new category recipe lists after upload when category changes, mapping empty recipeCategory to "*" for uncategorized recipes - Raise deployment target to iOS 18, adopt new SwiftUI API conventions - Clean up alerts, onboarding views, and settings Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
122 lines
3.2 KiB
Swift
122 lines
3.2 KiB
Swift
//
|
|
// AlertHandler.swift
|
|
// Nextcloud Cookbook iOS Client
|
|
//
|
|
// Created by Vincent Meilinger on 18.10.23.
|
|
//
|
|
|
|
import Foundation
|
|
import SwiftUI
|
|
|
|
|
|
protocol UserAlert: Error {
|
|
var localizedTitle: LocalizedStringKey { get }
|
|
var localizedDescription: LocalizedStringKey { get }
|
|
var alertButtons: [AlertButton] { get }
|
|
}
|
|
|
|
enum AlertButton: LocalizedStringKey, Identifiable {
|
|
var id: Self {
|
|
return self
|
|
}
|
|
|
|
case OK = "Ok", DELETE = "Delete", CANCEL = "Cancel"
|
|
}
|
|
|
|
|
|
|
|
enum RecipeAlert: UserAlert {
|
|
|
|
case NO_TITLE,
|
|
DUPLICATE,
|
|
UPLOAD_ERROR,
|
|
UPLOAD_SUCCESS,
|
|
CONFIRM_DELETE,
|
|
DELETE_SUCCESS,
|
|
LOGIN_FAILED,
|
|
GENERIC,
|
|
CUSTOM(title: LocalizedStringKey, description: LocalizedStringKey)
|
|
|
|
var localizedDescription: LocalizedStringKey {
|
|
switch self {
|
|
case .NO_TITLE:
|
|
return "Please enter a recipe name."
|
|
case .DUPLICATE:
|
|
return "A recipe with that name already exists."
|
|
case .UPLOAD_ERROR:
|
|
return "Unable to upload your recipe. Please check your internet connection."
|
|
case .UPLOAD_SUCCESS:
|
|
return "Recipe upload successful."
|
|
case .CONFIRM_DELETE:
|
|
return "This action is not reversible!"
|
|
case .DELETE_SUCCESS:
|
|
return "Deletion successful."
|
|
case .LOGIN_FAILED:
|
|
return "Please check your credentials and internet connection."
|
|
case .CUSTOM(title: _, description: let description):
|
|
return description
|
|
default:
|
|
return "An unknown error occured."
|
|
}
|
|
}
|
|
|
|
var localizedTitle: LocalizedStringKey {
|
|
switch self {
|
|
case .NO_TITLE:
|
|
return "Missing recipe name."
|
|
case .DUPLICATE:
|
|
return "Duplicate recipe."
|
|
case .UPLOAD_ERROR:
|
|
return "Network error."
|
|
case .UPLOAD_SUCCESS:
|
|
return "Success!"
|
|
case .CONFIRM_DELETE:
|
|
return "Delete recipe?"
|
|
case .DELETE_SUCCESS:
|
|
return "Success!"
|
|
case .LOGIN_FAILED:
|
|
return "Login failed."
|
|
case .CUSTOM(title: let title, description: _):
|
|
return title
|
|
default:
|
|
return "Error."
|
|
}
|
|
}
|
|
|
|
var alertButtons: [AlertButton] {
|
|
switch self {
|
|
case .CONFIRM_DELETE:
|
|
return [.CANCEL, .DELETE]
|
|
default:
|
|
return [.OK]
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
enum RequestAlert: UserAlert {
|
|
case REQUEST_DELAYED,
|
|
REQUEST_DROPPED,
|
|
REQUEST_SUCCESS
|
|
|
|
var localizedDescription: LocalizedStringKey {
|
|
switch self {
|
|
case .REQUEST_DELAYED: return "Could not establish a connection to the server. The action will be retried upon reconnection."
|
|
case .REQUEST_DROPPED: return "Unable to complete action."
|
|
case .REQUEST_SUCCESS: return ""
|
|
}
|
|
}
|
|
|
|
var localizedTitle: LocalizedStringKey {
|
|
switch self {
|
|
case .REQUEST_DELAYED: return "Action delayed"
|
|
case .REQUEST_DROPPED: return "Error"
|
|
case .REQUEST_SUCCESS: return "Success!"
|
|
}
|
|
}
|
|
|
|
var alertButtons: [AlertButton] {
|
|
return [.OK]
|
|
}
|
|
}
|