Skip to content

Added a PrepBibleView #240

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
gojamesgo85 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Added a PrepBibleView #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d096db6
Added a PrepBibleView
gojamesgo85 Apr 8, 2025
1a986aa
Fixed spacing issues in PrepBibleRecipeView
gojamesgo85 Apr 9, 2025
a88bb0f
Centered recipe title
gojamesgo85 Apr 9, 2025
8668450
code cleanup
MatthewHunt84 Apr 9, 2025
77c8b36
Revert "code cleanup"
MatthewHunt84 Apr 10, 2025
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
24 changes: 24 additions & 0 deletions MetaCocktailsSwiftData.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,10 @@
4DBFF8572B60AAFB0011B5B1 /* CableCar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DBFF8562B60AAFB0011B5B1 /* CableCar.swift */; };
4DBFF8592B60AD800011B5B1 /* CableCar(W&G).swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DBFF8582B60AD800011B5B1 /* CableCar(W&G).swift */; };
4DBFF85B2B60AFE60011B5B1 /* Carajillo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DBFF85A2B60AFE60011B5B1 /* Carajillo.swift */; };
4DC058E82DA5BEAF006AAE5B /* PrepBibleViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DC058E72DA5BEAF006AAE5B /* PrepBibleViewModel.swift */; };
4DC058EC2DA5C41F006AAE5B /* PrepBibleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DC058EB2DA5C41F006AAE5B /* PrepBibleView.swift */; };
4DC058EE2DA5C459006AAE5B /* ResourcesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DC058ED2DA5C459006AAE5B /* ResourcesView.swift */; };
4DC058F62DA5D21E006AAE5B /* PrepBibleRecipeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DC058F52DA5D21E006AAE5B /* PrepBibleRecipeView.swift */; };
4DCAA7A52C35E77200FBC4FE /* CustomIngredientRecipeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DCAA7A42C35E77200FBC4FE /* CustomIngredientRecipeView.swift */; };
4DCAA7A72C35E83F00FBC4FE /* AddRecipeStepDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DCAA7A62C35E83F00FBC4FE /* AddRecipeStepDetailView.swift */; };
4DCAA7A92C373D1700FBC4FE /* AddIngredientDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DCAA7A82C373D1700FBC4FE /* AddIngredientDetailView.swift */; };
Expand Down Expand Up @@ -973,6 +977,10 @@
4DBFF8562B60AAFB0011B5B1 /* CableCar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CableCar.swift; sourceTree = "<group>"; };
4DBFF8582B60AD800011B5B1 /* CableCar(W&G).swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CableCar(W&G).swift"; sourceTree = "<group>"; };
4DBFF85A2B60AFE60011B5B1 /* Carajillo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Carajillo.swift; sourceTree = "<group>"; };
4DC058E72DA5BEAF006AAE5B /* PrepBibleViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrepBibleViewModel.swift; sourceTree = "<group>"; };
4DC058EB2DA5C41F006AAE5B /* PrepBibleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrepBibleView.swift; sourceTree = "<group>"; };
4DC058ED2DA5C459006AAE5B /* ResourcesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResourcesView.swift; sourceTree = "<group>"; };
4DC058F52DA5D21E006AAE5B /* PrepBibleRecipeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrepBibleRecipeView.swift; sourceTree = "<group>"; };
4DCAA7A42C35E77200FBC4FE /* CustomIngredientRecipeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomIngredientRecipeView.swift; sourceTree = "<group>"; };
4DCAA7A62C35E83F00FBC4FE /* AddRecipeStepDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddRecipeStepDetailView.swift; sourceTree = "<group>"; };
4DCAA7A82C373D1700FBC4FE /* AddIngredientDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddIngredientDetailView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1392,6 +1400,7 @@
1AC386962AAABED00064F52A /* Views */ = {
isa = PBXGroup;
children = (
4DC058E02DA5BC6E006AAE5B /* ResourcesView */,
4DABDD1C2CEBC47F0080A529 /* AboutUsView */,
F493F3B22C6D256F006A0ADB /* Design */,
4D5DA09C2B9ED43300C14F1F /* CustomAlertView */,
Expand Down Expand Up @@ -1441,6 +1450,9 @@
1AC3869E2AAABED00064F52A /* Prep Bible */ = {
isa = PBXGroup;
children = (
4DC058F52DA5D21E006AAE5B /* PrepBibleRecipeView.swift */,
4DC058EB2DA5C41F006AAE5B /* PrepBibleView.swift */,
4DC058E72DA5BEAF006AAE5B /* PrepBibleViewModel.swift */,
4DB1C08F2B2E484A00943C69 /* Prep Descriptions */,
1AC3869F2AAABED00064F52A /* PrepRecipeView.swift */,
1AC386A12AAABED00064F52A /* PrepBible.swift */,
Expand Down Expand Up @@ -1998,6 +2010,14 @@
path = "General Cocktail Instructions";
sourceTree = "<group>";
};
4DC058E02DA5BC6E006AAE5B /* ResourcesView */ = {
isa = PBXGroup;
children = (
4DC058ED2DA5C459006AAE5B /* ResourcesView.swift */,
);
path = ResourcesView;
sourceTree = "<group>";
};
4DE33DF52B8D931500312EC3 /* CreateACocktailView */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -2362,6 +2382,7 @@
4DCAA7A52C35E77200FBC4FE /* CustomIngredientRecipeView.swift in Sources */,
F4D185012C8F95370035B280 /* Brancolada.swift in Sources */,
4DBFF83F2B6082E40011B5B1 /* Boulevardier(W&G).swift in Sources */,
4DC058E82DA5BEAF006AAE5B /* PrepBibleViewModel.swift in Sources */,
4D5DA08E2B9E8E6A00C14F1F /* AddBuildStepDetailView.swift in Sources */,
4DF408D02B60EBDE00EF9A6E /* CloverClub(W&G).swift in Sources */,
4DBBA44E2B673E3D00179B8F /* HoneymoonCocktail1st.swift in Sources */,
Expand Down Expand Up @@ -2603,6 +2624,7 @@
1AC386C02AAABED10064F52A /* BlackberrySageSmash.swift in Sources */,
4DBFF84F2B609F1F0011B5B1 /* BrownDerby(OGRumVersion).swift in Sources */,
F40FB6B12B7E38DA0047D597 /* CocktailCollection.swift in Sources */,
4DC058F62DA5D21E006AAE5B /* PrepBibleRecipeView.swift in Sources */,
4DA567582B6C43CA003F6F04 /* UltimaPalabra(London).swift in Sources */,
4DBBA42A2B65A2FC00179B8F /* Grasshopper.swift in Sources */,
4DBBA4D32B6A425B00179B8F /* RememberTheMaine(OG).swift in Sources */,
Expand Down Expand Up @@ -2645,6 +2667,7 @@
4DBBA4702B67A35300179B8F /* KentuckyMaid(W&G).swift in Sources */,
4DBAE6F32C713D7400F3DBFD /* WhiteLinen.swift in Sources */,
1AFDB7D22AE3477A000A3812 /* Margarita.swift in Sources */,
4DC058EE2DA5C459006AAE5B /* ResourcesView.swift in Sources */,
4DA5674A2B6C32E4003F6F04 /* TiPunch(W&G).swift in Sources */,
4D5DA0B62BA127BD00C14F1F /* PiscoSour(W&G Version).swift in Sources */,
F4FBF1232AAABBB900BBF7CF /* MetaCocktailsSwiftDataApp.swift in Sources */,
Expand Down Expand Up @@ -2794,6 +2817,7 @@
4DAD6C922C83B86C00860555 /* RiffPickerView.swift in Sources */,
4D54F73E2B7B053800D046D9 /* LoadedCocktailIngredientCell.swift in Sources */,
4DA5677A2B6C90E9003F6F04 /* CleverGirl.swift in Sources */,
4DC058EC2DA5C41F006AAE5B /* PrepBibleView.swift in Sources */,
F4D7C0122CBC3D7100B8D9C0 /* IngredientPrepOverlay.swift in Sources */,
4DA567F22B6DE424003F6F04 /* BurisBovineBeverage.swift in Sources */,
4DA567C82B6DB8F5003F6F04 /* PrettyInParadox.swift in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion MetaCocktailsSwiftData/Views/AboutUsView/AboutUsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ struct AboutUsView: View {
MattPicture()
}
}
.aboutHeaderWithNavigation(title: "About Cocktail Copilot", dismiss: dismiss)
.jamesHeaderWithNavigation(title: "About Cocktail Copilot", dismiss: dismiss)
.navigationBarTitleDisplayMode(.inline)
.background(
Image(.limeSegments)
Expand Down
2 changes: 1 addition & 1 deletion MetaCocktailsSwiftData/Views/Cocktail List View/CocktailListView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ struct SearchBarForCocktailListView: View {
NavigationStack {

NavigationLink {
AboutUsView()
ResourcesView()
.navigationBarBackButtonHidden(true)
} label: {

Expand Down
114 changes: 114 additions & 0 deletions MetaCocktailsSwiftData/Views/Prep Bible/PrepBibleRecipeView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
//
// PrepBibleRecipeView.swift
// MetaCocktailsSwiftData
//
// Created by James Menkal on 4/8/25.
//


//
// PrepBibleRecipeView.swift
// MetaCocktails
//
// Created on 4/8/25.
//

import SwiftUI
import SwiftData

struct PrepBibleRecipeView: View {
let prep: Prep
@Environment(\.dismiss) private var dismiss
@State private var borderColor = ColorScheme.presentedFrontBorder

var body: some View {
NavigationStack {
ZStack {
ColorScheme.background
.ignoresSafeArea()

GeometryReader { outerGeo in
ZStack {
BackgroundGlowAnimation(gradient: borderColor.top, isFavorite: .constant(false))

VStack(alignment: .leading, spacing: 15) {

HStack {
Button(action: {
dismiss()
}) {
Image(systemName: "chevron.backward")
.font(.system(size: 20))
.foregroundStyle(ColorScheme.interactionTint)
}

Spacer()

Text("\(prep.prepIngredientName) recipe")
.font(FontFactory.recipeCardHeader18B)
.foregroundColor(.white)
.multilineTextAlignment(.center)

Spacer()

Color.clear
.frame(width: 24, height: 24)
}
.padding(.bottom, 20)

ScrollView {
ForEach(prep.prepRecipe) { instruction in
HStack(alignment: .top) {
Text("\(instruction.step).")
.font(FontFactory.mediumFont(size: 16))
.bold()

Text(instruction.method)
.font(FontFactory.mediumFont(size: 16))
}
.foregroundStyle(.primary)
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.trailing, 10)

Divider()

}
}


Spacer()
}
.padding(20)
.background(BlackGlassBackgroundView())
.frame(width: outerGeo.size.width * 0.88, height: outerGeo.contentSize(for: outerGeo.size.height))

Border(height: outerGeo.size.height, gradient: $borderColor)
}
}
}
}
.navigationBarBackButtonHidden(true)
.navigationBarTitleDisplayMode(.inline)
}
}


extension GeometryProxy {
func contentSize(for height: CGFloat) -> CGFloat {
switch height {
case 0..<650:
return height * 0.896
case 651..<672:
return height * 0.90
default:
return height * 0.91
}
}
}


#Preview {
NavigationStack {
PrepBibleRecipeView(prep: PrepBible.gingerSyrup)
}
}
Loading