Skip to content

Commit

Permalink
Cleaned up Code
Browse files Browse the repository at this point in the history 
Also I probably should have just made all the video views and other duplicated views once and then called them later I don't know why I didn't do that
  • Loading branch information
@GrantHough
GrantHough committed Nov 1, 2021
1 parent 363d614 commit fa50f90
Show file tree
Hide file tree
Showing 14 changed files with 11 additions and 248 deletions.
2 changes: 0 additions & 2 deletions Test/ChangePassword.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,6 @@ struct ChangePassword: View {
dismissButton: .default(Text("Dismiss"))

)


}

})
Expand Down
4 changes: 0 additions & 4 deletions Test/ForgotPassword.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ struct ForgotPassword: View {
print("tapped Dismiss")
}))

// present(alert, animated: true)

}

var body: some View {
Expand Down Expand Up @@ -110,8 +108,6 @@ struct ForgotPassword: View {
dismissButton: .default(Text("Dismiss"))

)


}

})
Expand Down
27 changes: 1 addition & 26 deletions Test/MarimbaVideo3.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,32 +57,7 @@ struct MarimbaVideo3: View {
MarimbaDropDown3()
.shadow(color: Color.black.opacity(0.15), radius: 10, x: 0, y: 5)
.padding(2)
// .padding()

// NavigationLink(destination: Video2().navigationBarTitle("")
//
// .navigationBarHidden(true)) {

// Text("On to Video 2")
// .padding()
// .font(.system(size: 18, weight: .bold))
// .background(Color.blue)
// .foregroundColor(Color.white)
// .cornerRadius(20)

// }
//
//Toggle (
// isOn: $toggleIsOn,
// label: {
// })
// .padding(.top)
// .padding(.horizontal, 200)
// .toggleStyle(SwitchToggleStyle(tint: Color(.gray)))

// Text(toggleIsOn ? "Video Completed" : "Tap to Complete")
// .font(.title2)
// .fontWeight(.semibold)

VStack(alignment: .center) {
Toggle(isOn: $progress.marimbaVideo3Completed) {

Expand Down
6 changes: 0 additions & 6 deletions Test/Video1.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,6 @@ struct Video: View {


}



struct Video_Previews: PreviewProvider {

static var previews: some View {
Expand Down Expand Up @@ -179,9 +176,6 @@ struct Video: View {
.multilineTextAlignment(.leading)
}
.foregroundColor(Color("whiteblack").opacity(0.65))



}
})
.padding()
Expand Down
27 changes: 1 addition & 26 deletions Test/Video10.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,32 +66,7 @@ struct Video10: View {

.padding(2)
.shadow(color: Color.black.opacity(0.45), radius: 10, x: 1, y: 10)
// .padding()

// NavigationLink(destination: Video2().navigationBarTitle("")
//
// .navigationBarHidden(true)) {

// Text("On to Video 2")
// .padding()
// .font(.system(size: 18, weight: .bold))
// .background(Color.blue)
// .foregroundColor(Color.white)
// .cornerRadius(20)

// }
//
//Toggle (
// isOn: $toggleIsOn,
// label: {
// })
// .padding(.top)
// .padding(.horizontal, 200)
// .toggleStyle(SwitchToggleStyle(tint: Color(.gray)))

// Text(toggleIsOn ? "Video Completed" : "Tap to Complete")
// .font(.title2)
// .fontWeight(.semibold)

VStack(alignment: .center) {
Toggle(isOn: $progress.video10Completed) {

Expand Down
27 changes: 1 addition & 26 deletions Test/Video11.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,32 +71,7 @@ struct Video11: View {

.padding(2)
.shadow(color: Color.black.opacity(0.45), radius: 10, x: 1, y: 10)
// .padding()

// NavigationLink(destination: Video2().navigationBarTitle("")
//
// .navigationBarHidden(true)) {

// Text("On to Video 2")
// .padding()
// .font(.system(size: 18, weight: .bold))
// .background(Color.blue)
// .foregroundColor(Color.white)
// .cornerRadius(20)

// }
//
//Toggle (
// isOn: $toggleIsOn,
// label: {
// })
// .padding(.top)
// .padding(.horizontal, 200)
// .toggleStyle(SwitchToggleStyle(tint: Color(.gray)))

// Text(toggleIsOn ? "Video Completed" : "Tap to Complete")
// .font(.title2)
// .fontWeight(.semibold)

VStack(alignment: .center) {
Toggle(isOn: $progress.video11Completed) {

Expand Down
27 changes: 1 addition & 26 deletions Test/Video12.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,32 +66,7 @@ struct Video12: View {

.padding(2)
.shadow(color: Color.black.opacity(0.45), radius: 10, x: 1, y: 10)
// .padding()

// NavigationLink(destination: Video2().navigationBarTitle("")
//
// .navigationBarHidden(true)) {

// Text("On to Video 2")
// .padding()
// .font(.system(size: 18, weight: .bold))
// .background(Color.blue)
// .foregroundColor(Color.white)
// .cornerRadius(20)

// }
//
//Toggle (
// isOn: $toggleIsOn,
// label: {
// })
// .padding(.top)
// .padding(.horizontal, 200)
// .toggleStyle(SwitchToggleStyle(tint: Color(.gray)))

// Text(toggleIsOn ? "Video Completed" : "Tap to Complete")
// .font(.title2)
// .fontWeight(.semibold)

VStack(alignment: .center) {
Toggle(isOn: $progress.video12Completed) {

Expand Down
27 changes: 1 addition & 26 deletions Test/Video13.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,32 +68,7 @@ struct Video13: View {

.padding(2)
.shadow(color: Color.black.opacity(0.45), radius: 10, x: 1, y: 10)
// .padding()

// NavigationLink(destination: Video2().navigationBarTitle("")
//
// .navigationBarHidden(true)) {

// Text("On to Video 2")
// .padding()
// .font(.system(size: 18, weight: .bold))
// .background(Color.blue)
// .foregroundColor(Color.white)
// .cornerRadius(20)

// }
//
//Toggle (
// isOn: $toggleIsOn,
// label: {
// })
// .padding(.top)
// .padding(.horizontal, 200)
// .toggleStyle(SwitchToggleStyle(tint: Color(.gray)))

// Text(toggleIsOn ? "Video Completed" : "Tap to Complete")
// .font(.title2)
// .fontWeight(.semibold)

VStack(alignment: .center) {
Toggle(isOn: $progress.video13Completed) {

Expand Down
2 changes: 1 addition & 1 deletion Test/Video4.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ struct Video4: View {
.padding()
.background(Color("blueblue"))
.shadow(color: Color.black.opacity(0.45), radius: 10, x: 0, y: 20)
// .background(LinearGradient(gradient: Gradient(colors: [Color(#colorLiteral(red: 0.9999018312, green: 1, blue: 0.9998798966, alpha: 1)).opacity(0.24), Color(#colorLiteral(red: 0.9999018312, green: 1, blue: 0.9998798966, alpha: 1)).opacity(0.36)]), startPoint: .leading, endPoint: .trailing))

.cornerRadius(20)
.animation(.spring())

Expand Down
1 change: 0 additions & 1 deletion Test/Video5.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ struct Video5: View {
.padding()
.background(Color("blueblue"))
.shadow(color: Color.black.opacity(0.45), radius: 10, x: 0, y: 20)
// .background(LinearGradient(gradient: Gradient(colors: [Color(#colorLiteral(red: 0.9999018312, green: 1, blue: 0.9998798966, alpha: 1)).opacity(0.24), Color(#colorLiteral(red: 0.9999018312, green: 1, blue: 0.9998798966, alpha: 1)).opacity(0.36)]), startPoint: .leading, endPoint: .trailing))
.cornerRadius(20)
.animation(.spring())

Expand Down
29 changes: 2 additions & 27 deletions Test/Video6.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,32 +65,7 @@ struct Video6: View {

.padding(2)
.shadow(color: Color.black.opacity(0.45), radius: 10, x: 1, y: 10)
// .padding()

// NavigationLink(destination: Video2().navigationBarTitle("")
//
// .navigationBarHidden(true)) {

// Text("On to Video 2")
// .padding()
// .font(.system(size: 18, weight: .bold))
// .background(Color.blue)
// .foregroundColor(Color.white)
// .cornerRadius(20)

// }
//
//Toggle (
// isOn: $toggleIsOn,
// label: {
// })
// .padding(.top)
// .padding(.horizontal, 200)
// .toggleStyle(SwitchToggleStyle(tint: Color(.gray)))

// Text(toggleIsOn ? "Video Completed" : "Tap to Complete")
// .font(.title2)
// .fontWeight(.semibold)

VStack(alignment: .center) {
Toggle(isOn: $progress.video6Completed) {

Expand Down Expand Up @@ -124,7 +99,7 @@ struct Video6: View {
.padding(.vertical, 11)
.cornerRadius(20)
.background(Color("blueblue"))
// .background(LinearGradient(gradient: Gradient(colors: [Color(#colorLiteral(red: 0.9999018312, green: 1, blue: 0.9998798966, alpha: 1)).opacity(0.24), Color(#colorLiteral(red: 0.9999018312, green: 1, blue: 0.9998798966, alpha: 1)).opacity(0.36)]), startPoint: .leading, endPoint: .trailing))

.cornerRadius(20)
.animation(.spring())
.shadow(color: Color.black.opacity(0.75), radius: 10, x: 1, y: 10)
Expand Down
26 changes: 1 addition & 25 deletions Test/Video7.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,31 +66,7 @@ struct Video7: View {
.padding(2)
.shadow(color: Color.black.opacity(0.45), radius: 10, x: 1, y: 10)
// .padding()

// NavigationLink(destination: Video2().navigationBarTitle("")
//
// .navigationBarHidden(true)) {

// Text("On to Video 2")
// .padding()
// .font(.system(size: 18, weight: .bold))
// .background(Color.blue)
// .foregroundColor(Color.white)
// .cornerRadius(20)

// }
//
//Toggle (
// isOn: $toggleIsOn,
// label: {
// })
// .padding(.top)
// .padding(.horizontal, 200)
// .toggleStyle(SwitchToggleStyle(tint: Color(.gray)))

// Text(toggleIsOn ? "Video Completed" : "Tap to Complete")
// .font(.title2)
// .fontWeight(.semibold)

VStack(alignment: .center) {
Toggle(isOn: $progress.video7Completed) {

Expand Down
27 changes: 1 addition & 26 deletions Test/Video8.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,32 +65,7 @@ struct Video8: View {

.padding(2)
.shadow(color: Color.black.opacity(0.45), radius: 10, x: 1, y: 10)
// .padding()

// NavigationLink(destination: Video2().navigationBarTitle("")
//
// .navigationBarHidden(true)) {

// Text("On to Video 2")
// .padding()
// .font(.system(size: 18, weight: .bold))
// .background(Color.blue)
// .foregroundColor(Color.white)
// .cornerRadius(20)

// }
//
//Toggle (
// isOn: $toggleIsOn,
// label: {
// })
// .padding(.top)
// .padding(.horizontal, 200)
// .toggleStyle(SwitchToggleStyle(tint: Color(.gray)))

// Text(toggleIsOn ? "Video Completed" : "Tap to Complete")
// .font(.title2)
// .fontWeight(.semibold)

VStack(alignment: .center) {
Toggle(isOn: $progress.video8Completed) {

Expand Down
27 changes: 1 addition & 26 deletions Test/Video9.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,32 +65,7 @@ struct Video9: View {

.padding(2)
.shadow(color: Color.black.opacity(0.45), radius: 10, x: 1, y: 10)
// .padding()

// NavigationLink(destination: Video2().navigationBarTitle("")
//
// .navigationBarHidden(true)) {

// Text("On to Video 2")
// .padding()
// .font(.system(size: 18, weight: .bold))
// .background(Color.blue)
// .foregroundColor(Color.white)
// .cornerRadius(20)

// }
//
//Toggle (
// isOn: $toggleIsOn,
// label: {
// })
// .padding(.top)
// .padding(.horizontal, 200)
// .toggleStyle(SwitchToggleStyle(tint: Color(.gray)))

// Text(toggleIsOn ? "Video Completed" : "Tap to Complete")
// .font(.title2)
// .fontWeight(.semibold)

VStack(alignment: .center) {
Toggle(isOn: $progress.video9Completed) {

Expand Down

0 comments on commit fa50f90

Please sign in to comment.