Skip to content

Add next features #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
morganchen12 wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Add next features #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e9122e1
pre-Gemini wip
morganchen12 Apr 13, 2026
2908676
fix search
morganchen12 Apr 15, 2026
21ad664
remove averageRating in favor of subquery
morganchen12 Apr 16, 2026
7227c8f
add likes
morganchen12 Apr 22, 2026
dd4c0b6
Fix rating filter and beautify filters
morganchen12 Apr 22, 2026
3718497
code review feedback
morganchen12 Apr 22, 2026
881e7f7
address review feedback
morganchen12 Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
129 changes: 80 additions & 49 deletions FriendlyMeals/FriendlyMeals.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,18 @@

/* Begin PBXBuildFile section */
884B2CF22E144BA7007B2E0E /* MarkdownUI in Frameworks */ = {isa = PBXBuildFile; productRef = 884B2CF12E144BA7007B2E0E /* MarkdownUI */; };
884ECEF72E8ABF9400E3B0CB /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = 884ECEF62E8ABF9400E3B0CB /* FirebaseFirestore */; };
887565682E86CCEE0041DDEF /* ConversationKit in Frameworks */ = {isa = PBXBuildFile; productRef = 887565672E86CCEE0041DDEF /* ConversationKit */; };
887565922E86D6D80041DDEF /* FirebaseRemoteConfig in Frameworks */ = {isa = PBXBuildFile; productRef = 887565912E86D6D80041DDEF /* FirebaseRemoteConfig */; };
88BE941E2E1413D000C81FF5 /* FirebaseAI in Frameworks */ = {isa = PBXBuildFile; productRef = 88BE941D2E1413D000C81FF5 /* FirebaseAI */; };
88C8FB7A2E13DF62001B86C4 /* FirebaseCore in Frameworks */ = {isa = PBXBuildFile; productRef = 88C8FB792E13DF62001B86C4 /* FirebaseCore */; };
8DAB5BA32F04A0FE000D464B /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 8DAB5BA22F04A0FE000D464B /* FirebaseAuth */; };
8DAB5BA82F107BA3000D464B /* FirebaseStorage in Frameworks */ = {isa = PBXBuildFile; productRef = 8DAB5BA72F107BA3000D464B /* FirebaseStorage */; };
8D3574952F997F29003F1C27 /* FirebaseAILogic in Frameworks */ = {isa = PBXBuildFile; productRef = 8D3574942F997F29003F1C27 /* FirebaseAILogic */; };
8D3574972F997F29003F1C27 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 8D3574962F997F29003F1C27 /* FirebaseAuth */; };
8D3574992F997F29003F1C27 /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = 8D3574982F997F29003F1C27 /* FirebaseFirestore */; };
8D35749B2F997F29003F1C27 /* FirebaseRemoteConfig in Frameworks */ = {isa = PBXBuildFile; productRef = 8D35749A2F997F29003F1C27 /* FirebaseRemoteConfig */; };
8D35749D2F997F29003F1C27 /* FirebaseStorage in Frameworks */ = {isa = PBXBuildFile; productRef = 8D35749C2F997F29003F1C27 /* FirebaseStorage */; };
8D772B902F8039530054270D /* FoundationModels.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D772B8F2F8039530054270D /* FoundationModels.framework */; };
8D772B932F803C350054270D /* FirebaseAILogic in Frameworks */ = {isa = PBXBuildFile; productRef = 8D772B922F803C350054270D /* FirebaseAILogic */; };
8D772B952F803C350054270D /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 8D772B942F803C350054270D /* FirebaseAuth */; };
8D772B972F803C350054270D /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = 8D772B962F803C350054270D /* FirebaseFirestore */; };
8D772B992F803C350054270D /* FirebaseRemoteConfig in Frameworks */ = {isa = PBXBuildFile; productRef = 8D772B982F803C350054270D /* FirebaseRemoteConfig */; };
8D772B9B2F803C350054270D /* FirebaseStorage in Frameworks */ = {isa = PBXBuildFile; productRef = 8D772B9A2F803C350054270D /* FirebaseStorage */; };
8DBC83FA2F17076D00DAC906 /* ConversationKit in Frameworks */ = {isa = PBXBuildFile; productRef = 88665A882E1D2DB00039990B /* ConversationKit */; };
8DBC83FB2F17076D00DAC906 /* ConversationKit in Frameworks */ = {isa = PBXBuildFile; productRef = 883F6FA82E86969900519CE3 /* ConversationKit */; };
8DBC83FC2F17076D00DAC906 /* ConversationKit in Frameworks */ = {isa = PBXBuildFile; productRef = 88C207D72E8AA5C6004CD918 /* ConversationKit */; };
Expand All @@ -23,6 +28,7 @@

/* Begin PBXFileReference section */
88C8FB652E13D879001B86C4 /* FriendlyMeals.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FriendlyMeals.app; sourceTree = BUILT_PRODUCTS_DIR; };
8D772B8F2F8039530054270D /* FoundationModels.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FoundationModels.framework; path = System/Library/Frameworks/FoundationModels.framework; sourceTree = SDKROOT; };
/* End PBXFileReference section */

/* Begin PBXFileSystemSynchronizedRootGroup section */
Expand All @@ -38,18 +44,23 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
8D772B992F803C350054270D /* FirebaseRemoteConfig in Frameworks */,
8D772B932F803C350054270D /* FirebaseAILogic in Frameworks */,
8DBC83FD2F17076D00DAC906 /* ConversationKit in Frameworks */,
8DBC83FC2F17076D00DAC906 /* ConversationKit in Frameworks */,
8D772B972F803C350054270D /* FirebaseFirestore in Frameworks */,
8D3574972F997F29003F1C27 /* FirebaseAuth in Frameworks */,
8D772B9B2F803C350054270D /* FirebaseStorage in Frameworks */,
8D35749B2F997F29003F1C27 /* FirebaseRemoteConfig in Frameworks */,
8DBC83FB2F17076D00DAC906 /* ConversationKit in Frameworks */,
8D3574992F997F29003F1C27 /* FirebaseFirestore in Frameworks */,
8D772B952F803C350054270D /* FirebaseAuth in Frameworks */,
8D3574952F997F29003F1C27 /* FirebaseAILogic in Frameworks */,
8D35749D2F997F29003F1C27 /* FirebaseStorage in Frameworks */,
8DBC83FA2F17076D00DAC906 /* ConversationKit in Frameworks */,
887565682E86CCEE0041DDEF /* ConversationKit in Frameworks */,
884B2CF22E144BA7007B2E0E /* MarkdownUI in Frameworks */,
88C8FB7A2E13DF62001B86C4 /* FirebaseCore in Frameworks */,
887565922E86D6D80041DDEF /* FirebaseRemoteConfig in Frameworks */,
884ECEF72E8ABF9400E3B0CB /* FirebaseFirestore in Frameworks */,
8DAB5BA82F107BA3000D464B /* FirebaseStorage in Frameworks */,
8DAB5BA32F04A0FE000D464B /* FirebaseAuth in Frameworks */,
88BE941E2E1413D000C81FF5 /* FirebaseAI in Frameworks */,
8D772B902F8039530054270D /* FoundationModels.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -76,6 +87,7 @@
88C8FB782E13DF62001B86C4 /* Frameworks */ = {
isa = PBXGroup;
children = (
8D772B8F2F8039530054270D /* FoundationModels.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand All @@ -100,18 +112,22 @@
);
name = FriendlyMeals;
packageProductDependencies = (
88C8FB792E13DF62001B86C4 /* FirebaseCore */,
88BE941D2E1413D000C81FF5 /* FirebaseAI */,
884B2CF12E144BA7007B2E0E /* MarkdownUI */,
88665A882E1D2DB00039990B /* ConversationKit */,
883F6FA82E86969900519CE3 /* ConversationKit */,
887565672E86CCEE0041DDEF /* ConversationKit */,
887565912E86D6D80041DDEF /* FirebaseRemoteConfig */,
88C207D72E8AA5C6004CD918 /* ConversationKit */,
884ECEF62E8ABF9400E3B0CB /* FirebaseFirestore */,
88FF5D532ECF579900646871 /* ConversationKit */,
8DAB5BA22F04A0FE000D464B /* FirebaseAuth */,
8DAB5BA72F107BA3000D464B /* FirebaseStorage */,
8D772B922F803C350054270D /* FirebaseAILogic */,
8D772B942F803C350054270D /* FirebaseAuth */,
8D772B962F803C350054270D /* FirebaseFirestore */,
8D772B982F803C350054270D /* FirebaseRemoteConfig */,
8D772B9A2F803C350054270D /* FirebaseStorage */,
8D3574942F997F29003F1C27 /* FirebaseAILogic */,
8D3574962F997F29003F1C27 /* FirebaseAuth */,
8D3574982F997F29003F1C27 /* FirebaseFirestore */,
8D35749A2F997F29003F1C27 /* FirebaseRemoteConfig */,
8D35749C2F997F29003F1C27 /* FirebaseStorage */,
);
productName = FriendlyMeals;
productReference = 88C8FB652E13D879001B86C4 /* FriendlyMeals.app */;
Expand Down Expand Up @@ -142,9 +158,9 @@
mainGroup = 88C8FB5C2E13D879001B86C4;
minimizedProjectReferenceProxies = 1;
packageReferences = (
88C8FB772E13DEE1001B86C4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
884B2CF02E144BA7007B2E0E /* XCRemoteSwiftPackageReference "swift-markdown-ui" */,
88FF5D522ECF579900646871 /* XCRemoteSwiftPackageReference "ConversationKit" */,
8D3574932F997F29003F1C27 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
);
preferredProjectObjectVersion = 77;
productRefGroup = 88C8FB662E13D879001B86C4 /* Products */;
Expand Down Expand Up @@ -394,20 +410,20 @@
minimumVersion = 2.4.1;
};
};
88C8FB772E13DEE1001B86C4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
88FF5D522ECF579900646871 /* XCRemoteSwiftPackageReference "ConversationKit" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
repositoryURL = "https://github.com/peterfriese/ConversationKit";
requirement = {
kind = revision;
revision = 1f7389bad09aa93c9eeb508e70013207813a4df2;
kind = upToNextMajorVersion;
minimumVersion = 0.0.3;
};
};
88FF5D522ECF579900646871 /* XCRemoteSwiftPackageReference "ConversationKit" */ = {
8D3574932F997F29003F1C27 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/peterfriese/ConversationKit";
repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 0.0.3;
minimumVersion = 12.12.1;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand All @@ -422,11 +438,6 @@
package = 884B2CF02E144BA7007B2E0E /* XCRemoteSwiftPackageReference "swift-markdown-ui" */;
productName = MarkdownUI;
};
884ECEF62E8ABF9400E3B0CB /* FirebaseFirestore */ = {
isa = XCSwiftPackageProductDependency;
package = 88C8FB772E13DEE1001B86C4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseFirestore;
};
88665A882E1D2DB00039990B /* ConversationKit */ = {
isa = XCSwiftPackageProductDependency;
productName = ConversationKit;
Expand All @@ -435,38 +446,58 @@
isa = XCSwiftPackageProductDependency;
productName = ConversationKit;
};
887565912E86D6D80041DDEF /* FirebaseRemoteConfig */ = {
88C207D72E8AA5C6004CD918 /* ConversationKit */ = {
isa = XCSwiftPackageProductDependency;
package = 88C8FB772E13DEE1001B86C4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseRemoteConfig;
productName = ConversationKit;
};
88BE941D2E1413D000C81FF5 /* FirebaseAI */ = {
88FF5D532ECF579900646871 /* ConversationKit */ = {
isa = XCSwiftPackageProductDependency;
package = 88C8FB772E13DEE1001B86C4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseAI;
package = 88FF5D522ECF579900646871 /* XCRemoteSwiftPackageReference "ConversationKit" */;
productName = ConversationKit;
};
88C207D72E8AA5C6004CD918 /* ConversationKit */ = {
8D3574942F997F29003F1C27 /* FirebaseAILogic */ = {
isa = XCSwiftPackageProductDependency;
productName = ConversationKit;
package = 8D3574932F997F29003F1C27 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseAILogic;
};
88C8FB792E13DF62001B86C4 /* FirebaseCore */ = {
8D3574962F997F29003F1C27 /* FirebaseAuth */ = {
isa = XCSwiftPackageProductDependency;
package = 88C8FB772E13DEE1001B86C4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseCore;
package = 8D3574932F997F29003F1C27 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseAuth;
};
88FF5D532ECF579900646871 /* ConversationKit */ = {
8D3574982F997F29003F1C27 /* FirebaseFirestore */ = {
isa = XCSwiftPackageProductDependency;
package = 88FF5D522ECF579900646871 /* XCRemoteSwiftPackageReference "ConversationKit" */;
productName = ConversationKit;
package = 8D3574932F997F29003F1C27 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseFirestore;
};
8DAB5BA22F04A0FE000D464B /* FirebaseAuth */ = {
8D35749A2F997F29003F1C27 /* FirebaseRemoteConfig */ = {
isa = XCSwiftPackageProductDependency;
package = 8D3574932F997F29003F1C27 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseRemoteConfig;
};
8D35749C2F997F29003F1C27 /* FirebaseStorage */ = {
isa = XCSwiftPackageProductDependency;
package = 8D3574932F997F29003F1C27 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseStorage;
};
8D772B922F803C350054270D /* FirebaseAILogic */ = {
isa = XCSwiftPackageProductDependency;
productName = FirebaseAILogic;
};
8D772B942F803C350054270D /* FirebaseAuth */ = {
isa = XCSwiftPackageProductDependency;
package = 88C8FB772E13DEE1001B86C4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseAuth;
};
8DAB5BA72F107BA3000D464B /* FirebaseStorage */ = {
8D772B962F803C350054270D /* FirebaseFirestore */ = {
isa = XCSwiftPackageProductDependency;
productName = FirebaseFirestore;
};
8D772B982F803C350054270D /* FirebaseRemoteConfig */ = {
isa = XCSwiftPackageProductDependency;
productName = FirebaseRemoteConfig;
};
8D772B9A2F803C350054270D /* FirebaseStorage */ = {
isa = XCSwiftPackageProductDependency;
package = 88C8FB772E13DEE1001B86C4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseStorage;
};
/* End XCSwiftPackageProductDependency section */
Expand Down
138 changes: 88 additions & 50 deletions FriendlyMeals/FriendlyMeals/Features/Cookbook/Views/FilterView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ struct FilterConfiguration {

var recipeTitle = ""

var recipeInstructions = ""

var minimumRating: Double = 0

var selectedTags: Set<String> = []
Expand All @@ -42,6 +44,8 @@ struct FilterConfiguration {

struct FilterView: View {

@Environment(\.dismiss) private var dismiss

init(
tags: [String],
configuration: FilterConfiguration? = FilterConfiguration(),
Expand Down Expand Up @@ -76,68 +80,102 @@ struct FilterView: View {
@State private var configuration: FilterConfiguration

var body: some View {
VStack(alignment: .leading) {
Text("Filters")
.font(.largeTitle)
NavigationStack {
Form {
Section {
Toggle("View only my recipes", isOn: $configuration.shouldShowOnlyOwnRecipes)
} header: {
Label("General", systemImage: "slider.horizontal.3")
}

Toggle(isOn: $configuration.shouldShowOnlyOwnRecipes) {
Text("View only my recipes")
}
Section {
LabeledContent("Title") {
TextField("Scallops", text: $configuration.recipeTitle)
.multilineTextAlignment(.trailing)
}
LabeledContent("Instructions") {
TextField("Bake for 30 minutes", text: $configuration.recipeInstructions)
.multilineTextAlignment(.trailing)
}
} header: {
Label("Search", systemImage: "magnifyingglass")
}

Text("Filter by title")
TextField("Scallops", text: $configuration.recipeTitle)

Text("Minimum rating: \(configuration.minimumRating.formatted())")
Slider(
value: $configuration.minimumRating,
in: 0...5,
step: 0.25
) {
Text("Minimum rating")
} minimumValueLabel: {
Text("0")
} maximumValueLabel: {
Text("5")
} onEditingChanged: { _ in
// do nothing
}
Section {
VStack(alignment: .leading, spacing: 12) {
HStack {
Text(configuration.minimumRating.formatted())
.font(.headline)
Spacer()
HStack(spacing: 2) {
let rating = configuration.minimumRating
ForEach(0..<5) { index in
let starName = index < Int(rating) ? "star.fill" : (index < Int(rating.rounded(.up)) ? "star.leadinghalf.filled" : "star")
Image(systemName: starName)
.foregroundColor(.yellow)
}
}
}
Slider(value: $configuration.minimumRating, in: 0...5, step: 0.25)
.tint(.blue)
}
.padding(.vertical, 4)
} header: {
Label("Minimum Rating", systemImage: "star.fill")
}

Text("Tags")
ScrollView(.horizontal, showsIndicators: true) {
HStack {
ForEach(0 ..< tags.count, id: \.self) { index in
let tag = tags[index]
let isSelected = tagSelections[index]
Toggle(tag, isOn: $tagSelections[index])
.toggleStyle(.button)
.tint(isSelected ? .blue : .secondary)
Section {
ScrollView(.horizontal, showsIndicators: false) {
HStack(spacing: 8) {
ForEach(0 ..< tags.count, id: \.self) { index in
let tag = tags[index]
let isSelected = tagSelections[index]
Toggle(tag, isOn: $tagSelections[index])
.toggleStyle(.button)
.tint(isSelected ? .blue : .secondary)
.clipShape(Capsule())
}
}
.padding(.vertical, 4)
}
} header: {
Label("Tags", systemImage: "tag.fill")
}
}

Text("Sort by")
Picker("Choose a sort method", selection: $configuration.sortOption) {
ForEach(FilterConfiguration.sortOptions, id: \.self) { option in
Text(option.rawValue).tag(option.rawValue)
Section {
Picker("Sort method", selection: $configuration.sortOption) {
ForEach(FilterConfiguration.sortOptions, id: \.self) { option in
Text(option.rawValue).tag(option)
}
}
.pickerStyle(.menu)
} header: {
Label("Sort By", systemImage: "arrow.up.arrow.down")
}
}

HStack {
Button("Remove filters") {
configuration = FilterConfiguration()
tagSelections = tagSelections.map { _ in false }
.navigationTitle("Filters")
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .cancellationAction) {
Button("Reset") {
configuration = FilterConfiguration()
tagSelections = tagSelections.map { _ in false }
}
.foregroundColor(.red)
}
Button("Apply filters") {
let selectedTags = tags.indices
.filter { tagSelections[$0] }
.map { tags[$0] }
configuration.selectedTags = Set(selectedTags)
applyFilters(configuration)
ToolbarItem(placement: .confirmationAction) {
Button("Apply") {
let selectedTags = tags.indices
.filter { tagSelections[$0] }
.map { tags[$0] }
configuration.selectedTags = Set(selectedTags)
applyFilters(configuration)
dismiss()
}
.fontWeight(.bold)
}
}
Spacer()
}
.padding(16)
}

}
Loading