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

reverted timer in recipe detail for now

Browse Source
This commit is contained in:
VincentMeilinger
2024-01-25 23:07:18 +01:00
parent 10cb851a5a
commit ba4df088a0
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Nextcloud Cookbook iOS Client.xcodeproj/project.xcworkspace/xcuserdata/vincie.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

2
Nextcloud Cookbook iOS Client/Localizable.xcstrings
View File

@@ -3171,7 +3171,7 @@
"You're all set for cooking 🍓" : { "You're all set for cooking 🍓" : {
}, },
"Your grocery list is stored locally and therefore not synchronized across different devices!" : { "Your grocery list is stored locally and therefore not synchronized across your devices." : {
} }
}, },

10
Nextcloud Cookbook iOS Client/Views/Recipes/RecipeDetailView.swift
View File

@@ -25,6 +25,7 @@ struct RecipeDetailView: View {
var body: some View { var body: some View {
ScrollView(showsIndicators: false) { ScrollView(showsIndicators: false) {
VStack(alignment: .leading) { VStack(alignment: .leading) {
ZStack {
if let recipeImage = recipeImage { if let recipeImage = recipeImage {
Image(uiImage: recipeImage) Image(uiImage: recipeImage)
.resizable() .resizable()
@@ -32,6 +33,7 @@ struct RecipeDetailView: View {
.frame(maxHeight: 300) .frame(maxHeight: 300)
.clipped() .clipped()
} }
}.animation(.easeInOut, value: recipeImage)
if let recipeDetail = recipeDetail { if let recipeDetail = recipeDetail {
LazyVStack (alignment: .leading) { LazyVStack (alignment: .leading) {
@@ -82,7 +84,7 @@ struct RecipeDetailView: View {
}.padding(.horizontal, 5) }.padding(.horizontal, 5)
} }
}.animation(.easeInOut, value: recipeImage) }
} }
.navigationBarTitleDisplayMode(.inline) .navigationBarTitleDisplayMode(.inline)
.navigationTitle(showTitle ? recipe.name : "") .navigationTitle(showTitle ? recipe.name : "")
@@ -229,13 +231,13 @@ fileprivate struct RecipeDurationSection: View {
.lineLimit(1) .lineLimit(1)
}.padding() }.padding()
} }
/*
if let cookTime = recipeDetail.cookTime, let time = DurationComponents.ptToText(cookTime) { if let cookTime = recipeDetail.cookTime, let time = DurationComponents.ptToText(cookTime) {
TimerView(timer: viewModel.getTimer(forRecipe: recipeDetail.id, duration: DurationComponents.fromPTString(cookTime))) TimerView(timer: viewModel.getTimer(forRecipe: recipeDetail.id, duration: DurationComponents.fromPTString(cookTime)))
.padding() .padding()
} }
*/
/*
if let cookTime = recipeDetail.cookTime, let time = DurationComponents.ptToText(cookTime) { if let cookTime = recipeDetail.cookTime, let time = DurationComponents.ptToText(cookTime) {
VStack(alignment: .leading) { VStack(alignment: .leading) {
HStack { HStack {
@@ -245,7 +247,7 @@ fileprivate struct RecipeDurationSection: View {
Text(time) Text(time)
.lineLimit(1) .lineLimit(1)
}.padding() }.padding()
}*/ }
if let totalTime = recipeDetail.totalTime, let time = DurationComponents.ptToText(totalTime) { if let totalTime = recipeDetail.totalTime, let time = DurationComponents.ptToText(totalTime) {
VStack(alignment: .leading) { VStack(alignment: .leading) {

4
Nextcloud Cookbook iOS Client/Views/Tabs/GroceryListTabView.swift
View File

@@ -103,7 +103,7 @@ fileprivate struct EmptyGroceryListView: View {
.font(.headline) .font(.headline)
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.") 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) .foregroundStyle(.secondary)
Text("Your grocery list is stored locally and therefore not synchronized across different devices!") Text("Your grocery list is stored locally and therefore not synchronized across your devices.")
.foregroundStyle(.secondary) .foregroundStyle(.secondary)
} }
.navigationTitle("Grocery List") .navigationTitle("Grocery List")
@@ -141,7 +141,7 @@ class GroceryRecipeItem: Identifiable, Codable {
class GroceryList: ObservableObject { @MainActor class GroceryList: ObservableObject {
let dataStore: DataStore = DataStore() let dataStore: DataStore = DataStore()
@Published var groceryDict: [String: GroceryRecipe] = [:] @Published var groceryDict: [String: GroceryRecipe] = [:]
@Published var sortBySimilarity: Bool = false @Published var sortBySimilarity: Bool = false