Merge branch 'download-rework' into api-update
This commit is contained in:
@@ -94,7 +94,7 @@ struct MainView: View {
|
||||
}
|
||||
.task {
|
||||
self.serverConnection = await viewModel.checkServerConnection()
|
||||
await viewModel.loadCategoryList()
|
||||
await viewModel.getCategories()//viewModel.loadCategoryList()
|
||||
// Open detail view for default category
|
||||
if userSettings.defaultCategory != "" {
|
||||
if let cat = viewModel.categories.first(where: { c in
|
||||
@@ -109,7 +109,7 @@ struct MainView: View {
|
||||
}
|
||||
.refreshable {
|
||||
self.serverConnection = await viewModel.checkServerConnection()
|
||||
await viewModel.loadCategoryList(needsUpdate: true)
|
||||
await viewModel.getCategories()//loadCategoryList(needsUpdate: true)
|
||||
}
|
||||
|
||||
}
|
||||
@@ -212,7 +212,7 @@ struct RecipeSearchView: View {
|
||||
.navigationTitle("Search recipe")
|
||||
}
|
||||
.task {
|
||||
allRecipes = await viewModel.getAllRecipes()
|
||||
allRecipes = await viewModel.getRecipes()//.getAllRecipes()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user