hendrik-hog/Nextcloud-Cookbook-iOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'download-rework' into api-update

Browse Source
This commit is contained in:
VincentM
2023-12-10 10:56:04 +01:00
committed by GitHub
parent 6933616269 5e4b87b201
commit 32ea911368
20 changed files with 1094 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Nextcloud Cookbook iOS Client/Data/DataModels.swift
View File

@@ -146,6 +146,9 @@ extension RecipeDetail {
struct RecipeImage {
enum RecipeImageSize {
case THUMB, FULL
}
var imageExists: Bool = true
var thumb: UIImage?
var full: UIImage?
@@ -193,7 +196,4 @@ struct MetaData: Codable {
}
// Networking
struct ServerMessage: Decodable {
let msg: String
}

25
Nextcloud Cookbook iOS Client/Data/UserSettings.swift
View File

@@ -22,6 +22,12 @@ class UserSettings: ObservableObject {
}
}
@Published var authString: String {
didSet {
UserDefaults.standard.set(authString, forKey: "authString")
}
}
@Published var serverAddress: String {
didSet {
UserDefaults.standard.set(serverAddress, forKey: "serverAddress")
@@ -55,11 +61,30 @@ class UserSettings: ObservableObject {
init() {
self.username = UserDefaults.standard.object(forKey: "username") as? String ?? ""
self.token = UserDefaults.standard.object(forKey: "token") as? String ?? ""
self.authString = UserDefaults.standard.object(forKey: "authString") as? String ?? ""
self.serverAddress = UserDefaults.standard.object(forKey: "serverAddress") as? String ?? ""
self.onboarding = UserDefaults.standard.object(forKey: "onboarding") as? Bool ?? true
self.defaultCategory = UserDefaults.standard.object(forKey: "defaultCategory") as? String ?? ""
self.language = UserDefaults.standard.object(forKey: "language") as? String ?? SupportedLanguage.DEVICE.rawValue
self.downloadRecipes = UserDefaults.standard.object(forKey: "downloadRecipes") as? Bool ?? false
if authString == "" {
if token != "" && username != "" {
let loginString = "\(self.username):\(self.token)"
let loginData = loginString.data(using: String.Encoding.utf8)!
authString = loginData.base64EncodedString()
}
}
}
func setAuthString() -> String {
if token != "" && username != "" {
let loginString = "\(self.username):\(self.token)"
let loginData = loginString.data(using: String.Encoding.utf8)!
return loginData.base64EncodedString()
} else {
return ""
}
}