diff --git a/Nextcloud Cookbook iOS Client.xcodeproj/project.xcworkspace/xcuserdata/vincie.xcuserdatad/UserInterfaceState.xcuserstate b/Nextcloud Cookbook iOS Client.xcodeproj/project.xcworkspace/xcuserdata/vincie.xcuserdatad/UserInterfaceState.xcuserstate index d2cf90a..7665b73 100644 Binary files a/Nextcloud Cookbook iOS Client.xcodeproj/project.xcworkspace/xcuserdata/vincie.xcuserdatad/UserInterfaceState.xcuserstate and b/Nextcloud Cookbook iOS Client.xcodeproj/project.xcworkspace/xcuserdata/vincie.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Nextcloud Cookbook iOS Client/Views/Recipes/RecipeListView.swift b/Nextcloud Cookbook iOS Client/Views/Recipes/RecipeListView.swift index c93c370..147914d 100644 --- a/Nextcloud Cookbook iOS Client/Views/Recipes/RecipeListView.swift +++ b/Nextcloud Cookbook iOS Client/Views/Recipes/RecipeListView.swift @@ -19,23 +19,6 @@ struct RecipeListView: View { @State var selectedRecipe: Recipe? = nil var body: some View { - /*ScrollView(showsIndicators: false) { - LazyVStack { - ForEach(recipesFiltered(), id: \.recipe_id) { recipe in - NavigationLink(value: recipe) { - RecipeCardView(recipe: recipe) - .shadow(radius: 2) - - } - .buttonStyle(.plain) - .onTapGesture { - selectedRecipe = recipe - //presentRecipeView = true - } - } - } - - }*/ List(recipesFiltered(), id: \.recipe_id) { recipe in RecipeCardView(recipe: recipe) .shadow(radius: 2) @@ -47,7 +30,7 @@ struct RecipeListView: View { .opacity(0) ) .frame(height: 85) - .listRowInsets(EdgeInsets(top: 5, leading: 10, bottom: 5, trailing: 10)) + .listRowInsets(EdgeInsets(top: 5, leading: 15, bottom: 5, trailing: 15)) .listRowSeparatorTint(.clear) } .listStyle(.plain) diff --git a/Nextcloud Cookbook iOS Client/Views/Tabs/SearchTabView.swift b/Nextcloud Cookbook iOS Client/Views/Tabs/SearchTabView.swift index 7a4cfae..0a127a9 100644 --- a/Nextcloud Cookbook iOS Client/Views/Tabs/SearchTabView.swift +++ b/Nextcloud Cookbook iOS Client/Views/Tabs/SearchTabView.swift @@ -15,24 +15,21 @@ struct SearchTabView: View { var body: some View { NavigationStack { VStack { - ScrollView(showsIndicators: false) { - /* - Picker("Topping", selection: $viewModel.searchMode) { - ForEach(ViewModel.SearchMode.allCases, id: \.self) { mode in - Text(mode.rawValue) - } - }.pickerStyle(.segmented) - */ - LazyVStack { - ForEach(viewModel.recipesFiltered(), id: \.recipe_id) { recipe in + List(viewModel.recipesFiltered(), id: \.recipe_id) { recipe in + RecipeCardView(recipe: recipe) + .shadow(radius: 2) + .background( NavigationLink(value: recipe) { - RecipeCardView(recipe: recipe) - .shadow(radius: 2) + EmptyView() } .buttonStyle(.plain) - } - } + .opacity(0) + ) + .frame(height: 85) + .listRowInsets(EdgeInsets(top: 5, leading: 15, bottom: 5, trailing: 15)) + .listRowSeparatorTint(.clear) } + .listStyle(.plain) .navigationDestination(for: Recipe.self) { recipe in RecipeView(viewModel: RecipeView.ViewModel(recipe: recipe)) }