diff --git a/FizzBuzz.playground/timeline.xctimeline b/FizzBuzz.playground/timeline.xctimeline new file mode 100644 index 0000000..bf468af --- /dev/null +++ b/FizzBuzz.playground/timeline.xctimeline @@ -0,0 +1,6 @@ + + + + + diff --git a/MyPlaygroundgrefgrbfsvdabsf vdbfsvdvgsfb.playground/timeline.xctimeline b/MyPlaygroundgrefgrbfsvdabsf vdbfsvdvgsfb.playground/timeline.xctimeline new file mode 100644 index 0000000..bf468af --- /dev/null +++ b/MyPlaygroundgrefgrbfsvdabsf vdbfsvdvgsfb.playground/timeline.xctimeline @@ -0,0 +1,6 @@ + + + + + diff --git a/Splits/Assets.xcassets/AppIcon-1.appiconset/Contents.json b/Splits/Assets.xcassets/AppIcon-1.appiconset/Contents.json deleted file mode 100644 index 9221b9b..0000000 --- a/Splits/Assets.xcassets/AppIcon-1.appiconset/Contents.json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "images" : [ - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "iphone", - "scale" : "3x", - "size" : "20x20" - }, - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "iphone", - "scale" : "3x", - "size" : "29x29" - }, - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "iphone", - "scale" : "3x", - "size" : "40x40" - }, - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "60x60" - }, - { - "idiom" : "iphone", - "scale" : "3x", - "size" : "60x60" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { - "idiom" : "ios-marketing", - "scale" : "1x", - "size" : "1024x1024" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Splits/Assets.xcassets/aiden.moore.states.imageset/Contents.json b/Splits/Assets.xcassets/aiden.moore.states.imageset/Contents.json deleted file mode 100644 index 3a67159..0000000 --- a/Splits/Assets.xcassets/aiden.moore.states.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "aiden.moore.states.jpg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Splits/Assets.xcassets/aiden.moore.states.imageset/aiden.moore.states.jpg b/Splits/Assets.xcassets/aiden.moore.states.imageset/aiden.moore.states.jpg deleted file mode 100644 index 5cb71c3..0000000 Binary files a/Splits/Assets.xcassets/aiden.moore.states.imageset/aiden.moore.states.jpg and /dev/null differ diff --git a/Splits/Assets.xcassets/caleb.bost.duo.imageset/Contents.json b/Splits/Assets.xcassets/caleb.bost.duo.imageset/Contents.json deleted file mode 100644 index 031e6e7..0000000 --- a/Splits/Assets.xcassets/caleb.bost.duo.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "caleb.bost.duo.heic", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Splits/Assets.xcassets/caleb.bost.duo.imageset/caleb.bost.duo.heic b/Splits/Assets.xcassets/caleb.bost.duo.imageset/caleb.bost.duo.heic deleted file mode 100644 index 6213935..0000000 Binary files a/Splits/Assets.xcassets/caleb.bost.duo.imageset/caleb.bost.duo.heic and /dev/null differ diff --git a/Splits/Assets.xcassets/isaac.greene.clouds.imageset/Contents.json b/Splits/Assets.xcassets/isaac.greene.clouds.imageset/Contents.json deleted file mode 100644 index a8c4a63..0000000 --- a/Splits/Assets.xcassets/isaac.greene.clouds.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "isaac.greene.clouds.heic", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Splits/Assets.xcassets/isaac.greene.clouds.imageset/isaac.greene.clouds.heic b/Splits/Assets.xcassets/isaac.greene.clouds.imageset/isaac.greene.clouds.heic deleted file mode 100644 index c07fd40..0000000 Binary files a/Splits/Assets.xcassets/isaac.greene.clouds.imageset/isaac.greene.clouds.heic and /dev/null differ diff --git a/Splits/Assets.xcassets/jake.zimmerman.group.imageset/Contents.json b/Splits/Assets.xcassets/jake.zimmerman.group.imageset/Contents.json deleted file mode 100644 index f37f4bd..0000000 --- a/Splits/Assets.xcassets/jake.zimmerman.group.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "jake.zimmerman.group.jpg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Splits/Assets.xcassets/jake.zimmerman.group.imageset/jake.zimmerman.group.jpg b/Splits/Assets.xcassets/jake.zimmerman.group.imageset/jake.zimmerman.group.jpg deleted file mode 100644 index 785682d..0000000 Binary files a/Splits/Assets.xcassets/jake.zimmerman.group.imageset/jake.zimmerman.group.jpg and /dev/null differ diff --git a/Splits/Assets.xcassets/launchScreenBackground.colorset/Contents.json b/Splits/Assets.xcassets/launchScreenBackground.colorset/Contents.json new file mode 100644 index 0000000..0425637 --- /dev/null +++ b/Splits/Assets.xcassets/launchScreenBackground.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "1.000", + "green" : "1.000", + "red" : "1.000" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.000", + "green" : "0.000", + "red" : "0.000" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Splits/Assets.xcassets/launchScreenImage.imageset/Contents.json b/Splits/Assets.xcassets/launchScreenImage.imageset/Contents.json new file mode 100644 index 0000000..bc211de --- /dev/null +++ b/Splits/Assets.xcassets/launchScreenImage.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "filename" : "launch screen dark.svg", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "launch screen light.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Splits/Assets.xcassets/launchScreenImage.imageset/launch screen dark.svg b/Splits/Assets.xcassets/launchScreenImage.imageset/launch screen dark.svg new file mode 100644 index 0000000..adae24c --- /dev/null +++ b/Splits/Assets.xcassets/launchScreenImage.imageset/launch screen dark.svg @@ -0,0 +1 @@ +PacesA revolutionary new app from Isaac Greenerepresenting thousands of years ofdevelopment brought to you free of charge. \ No newline at end of file diff --git a/Splits/Assets.xcassets/launchScreenImage.imageset/launch screen light.svg b/Splits/Assets.xcassets/launchScreenImage.imageset/launch screen light.svg new file mode 100644 index 0000000..4ddcaa7 --- /dev/null +++ b/Splits/Assets.xcassets/launchScreenImage.imageset/launch screen light.svg @@ -0,0 +1 @@ +PacesA revolutionary new app from Isaac Greenerepresenting thousands of years ofdevelopment brought to you free of charge. \ No newline at end of file diff --git a/Splits/ChangeLogData.swift b/Splits/ChangeLogData.swift index 983d55e..bf539ee 100644 --- a/Splits/ChangeLogData.swift +++ b/Splits/ChangeLogData.swift @@ -10,6 +10,19 @@ import SwiftUI struct June2023: View { var body: some View { ScrollView { + //2023-06-06 + HStack { + VStack (alignment: .leading) { + Text("2023-06-06") + .font(.title2) + Text("Version Prerelease Build LVSXT11x\n") + .font(.footnote) + Text("\u{2022} Started working on custom launch screen but now it's not working") + } + Spacer() + } + .padding(30) + //2023-06-05 HStack { VStack (alignment: .leading) { diff --git a/Splits/ComingSoonView.swift b/Splits/ComingSoonView.swift index a3a53a8..d96d4e3 100644 --- a/Splits/ComingSoonView.swift +++ b/Splits/ComingSoonView.swift @@ -6,7 +6,6 @@ // import SwiftUI -import iosMath import UIKit struct ComingSoonView: View { diff --git a/Splits/Documentation.docc/Documentation.md b/Splits/Documentation.docc/Documentation.md index 9711ca9..a048a70 100644 --- a/Splits/Documentation.docc/Documentation.md +++ b/Splits/Documentation.docc/Documentation.md @@ -1,4 +1,4 @@ -# ``Splits`` +# Splits Splits is a revolutionary new app to calculate paces. It takes a value, in kilometers or miles, and converts @@ -11,4 +11,4 @@ It takes a value, in kilometers or miles, and converts ### Getting Started -- ``Symbol`` + diff --git a/Splits/HelpView.swift b/Splits/HelpView.swift index 77f2346..67fb261 100644 --- a/Splits/HelpView.swift +++ b/Splits/HelpView.swift @@ -26,8 +26,8 @@ struct HelpView: View { self.mathSheet.toggle() }) .frame(width: 130, height: 40, alignment: .center) - .background(.tertiary) - .foregroundColor(.primary) + .background(Color.blue) + .foregroundColor(.white) .cornerRadius(12) .padding(30) .sheet(isPresented: self.$mathSheet, content: { @@ -76,3 +76,9 @@ struct mathView: View { } } } + +struct HelpView_Previews: PreviewProvider { + static var previews: some View { + HelpView() + } +} diff --git a/Splits/Info.plist b/Splits/Info.plist new file mode 100644 index 0000000..2cd5bd8 --- /dev/null +++ b/Splits/Info.plist @@ -0,0 +1,13 @@ + + + + + UILaunchScreen + + UIColorName + launchScreenBackground + UIImageRespectsSafeAreaInsets + + + + diff --git a/Splits/LaTeXView.swift b/Splits/LaTeXView.swift index 390fbaa..95f3365 100644 --- a/Splits/LaTeXView.swift +++ b/Splits/LaTeXView.swift @@ -5,6 +5,7 @@ // Created by Isaac Greene on 2023-01-16. // + import SwiftUI import UIKit import iosMath @@ -30,3 +31,4 @@ struct MathView: UIViewRepresentable { return colorScheme == .dark ? .white : .black } } + diff --git a/Splits/ModalView.swift b/Splits/ModalView.swift deleted file mode 100644 index d9b3703..0000000 --- a/Splits/ModalView.swift +++ /dev/null @@ -1,102 +0,0 @@ -// -// ModalView.swift -// Splits -// -// Created by Isaac Greene on 4/3/22. -// - -import SwiftUI -import RichTextView - -struct HelpView: View { - @State var mathSheet = false - @State var problemSheet = false - - var body: some View { - VStack { - Text("Help") - .font(.largeTitle) - .bold() - .padding(.top, 40) - - Text("Due to limitations in the system, you can only use kilometers and miles at this time. \nSmaller units like meters and feet are not supported. \nYou can, however, use decimals, such as .2km or .8mi.\n\nI apologize for any inconvenience. In the future, I hope to make our app easier to use.\n\nI'm currently looking to add help articles about running to this page and it'll have loads of stuff about running and pace and all that stuff to actually help you with running. If I do, the purpose of this app might change.") - .padding() - - Button("See our math", action: { - self.mathSheet.toggle() - }) - .padding(30) - .sheet(isPresented: self.$mathSheet, content: { - algorithmView() - }) - } - } -} - -struct algorithmView: View { - - var body: some View { - Text("The Algorithm") - .font(.largeTitle) - .bold() - VStack(alignment: .leading, spacing: 0) { - Text("Calculating pace is fairly straightforward, and does not change with increased complexity. The standard formula is simply this:\n") - mathView() - Text("\nWhere:\n") - HStack { - Text("\"t\"") - .font(.custom("Charter", size: 18)) - Text("is total time") - } - HStack{ - Text("\"d\"") - .font(.custom("Charter", size: 18)) - Text("is distance") - } - HStack { - Text("\"p\"") - .font(.custom("Charter", size: 18)) - Text("is the resulting pace") - } - } - .padding() - } -} - -struct mathView: View { - @State var mathString:String = "[math] \\frac{t}{d} &= p [/math]" - - var body: some View { - mathLaTeX_inator(mathString: $mathString) - .padding(30) - .frame(maxHeight: 300) - } -} - - -struct mathLaTeX_inator: UIViewRepresentable { - @Environment(\.colorScheme) var colorScheme - @Binding var mathString:String - - func makeUIView(context: Context) -> RichTextView { - let richTextView = RichTextView( - input: mathString, - latexParser: LatexParser(), - font: UIFont.systemFont(ofSize: UIFont.systemFontSize), - textColor: (colorScheme == .dark ? UIColor.white : UIColor.black), - frame: CGRect.zero, - completion: nil - ) - return richTextView - } - - func updateUIView(_ uiView: RichTextView, context: Context) { - uiView.update( - input: mathString, - latexParser: LatexParser(), - font: UIFont.systemFont(ofSize: UIFont.systemFontSize), - textColor: (colorScheme == .dark ? UIColor.white : UIColor.black), - completion: nil - ) - } - } diff --git a/Splits/SecretView.swift b/Splits/SecretView.swift deleted file mode 100644 index 2555f49..0000000 --- a/Splits/SecretView.swift +++ /dev/null @@ -1,184 +0,0 @@ -// -// SecretView.swift -// Splits -// -// Created by Isaac Greene on 2022-06-09. -// - -import SwiftUI - -struct SecretView: View { - var body: some View { - ScrollView { - VStack { - VStack { - Image("jake.zimmerman.group") - .resizable() - .interpolation(.high) - .frame(width: 75, height: 75) - .clipShape(Circle()) - Text("Zim") - .font(.title2) - VStack (alignment: .leading) { - Text(""" -Name: Jake Zimmerman -Email: jzimmerman@lakeviewspartans.org -""") - HStack { - Text("Phone:") - Link("(269) 753-5620", destination: URL(string: "tel:2697535620")!) - } - } - } - .frame(minWidth: 350, minHeight: 175) - .border(.primary) - VStack { - Image("caleb.bost.duo") - .resizable() - .interpolation(.high) - .frame(width: 75, height: 75) - .clipShape(Circle()) - Text("Caleb") - .font(.title2) - VStack (alignment: .leading) { - Text(""" -Name: Caleb Bost -Email: bostc@students.lakeviewspartans.org -""") - HStack { - Text("Phone:") - Link("(269) 578-6148", destination: URL(string: "tel:2695786148")!) - } - } - } - .frame(minWidth: 350, minHeight: 175) - .border(.primary) - VStack { - Image("aiden.moore.states") - .resizable() - .interpolation(.high) - .frame(width: 75, height: 75) - .clipShape(Circle()) - Text("Aiden") - .font(.title2) - VStack (alignment: .leading) { - Text(""" -Name: Aiden Moore -Email: moorea8@students.lakeviewspartans.org -""") - HStack { - Text("Phone:") - Link("(269) 579-3882", destination: URL(string: "tel:2695793882")!) - } - } - } - .frame(minWidth: 350, minHeight: 175) - .border(.primary) - VStack { - Image("isaac.greene.clouds") - .resizable() - .interpolation(.high) - .frame(width: 75, height: 75) - .clipShape(Circle()) - Text("Isaac") - .font(.title2) - VStack (alignment: .leading) { - Text(""" -Name: Isaac Greene -Email: greenei@students.lakeviewspartans.org -""") - HStack { - Text("Phone:") - Link("(269) 282-2280", destination: URL(string: "tel:2692822280")!) - } - } - } - .frame(minWidth: 350, minHeight: 175) - .border(.primary) - VStack { - Image(systemName: "person.crop.circle.fill") - .resizable() - .aspectRatio(contentMode: .fit) - .frame(width: 75, height: 75) - Text("Pryor") - .font(.title2) - VStack (alignment: .leading) { - Text(""" -Name: Becky Pryor -Email: bpryor@lakeviewspartans.org -""") - HStack { - Text("Phone:") - Link("(269) 209-9906", destination: URL(string: "tel:2692099906")!) - } - } - } - .frame(minWidth: 350, minHeight: 175) - .border(.primary) - VStack { - Image(systemName: "person.crop.circle.fill") - .resizable() - .aspectRatio(contentMode: .fit) - .frame(width: 75, height: 75) - Text("Paige") - .font(.title2) - VStack (alignment: .leading) { - Text(""" -Name: Paige Ratliff -Email: ratliffp@students.lakeviewspartans.org -""") - HStack { - Text("Phone:") - Link("(269) 753-8569", destination: URL(string: "tel:2697538569")!) - } - } - } - .frame(minWidth: 350, minHeight: 175) - .border(.primary) - VStack { - Image(systemName: "person.crop.circle.fill") - .resizable() - .aspectRatio(contentMode: .fit) - .frame(width: 75, height: 75) - Text("Emma") - .font(.title2) - VStack (alignment: .leading) { - Text(""" -Name: Emma Kerschbaum -Email: kerschbaume@students.lakeviewspartans.org -""") - HStack { - Text("Phone:") - Link("(269) 419-7880", destination: URL(string: "tel:2694197880")!) - } - } - } - .frame(minWidth: 350, minHeight: 175) - .border(.primary) - VStack { - Image(systemName: "person.crop.circle.fill") - .resizable() - .aspectRatio(contentMode: .fit) - .frame(width: 75, height: 75) - Text("Alyssa") - .font(.title2) - VStack (alignment: .leading) { - Text(""" -Name: Alyssa Hinton -Email: hintona2@students.lakeviewspartans.org -""") - HStack { - Text("Phone:") - Link("(269) 589-7609", destination: URL(string: "tel:2695897609")!) - } - } - } - .frame(minWidth: 350, minHeight: 175) - .border(.primary) - - } - .frame(maxWidth: .infinity) - .navigationTitle("Contacts") - } - } -}