Skip to content

Commit

Permalink
minor ui changes
Browse files Browse the repository at this point in the history 
updated video ui
  • Loading branch information
@GrantHough
GrantHough committed Oct 29, 2021
1 parent 66dacca commit a32268b
Show file tree
Hide file tree
Showing 14 changed files with 45 additions and 159 deletions.
7 changes: 3 additions & 4 deletions Test/Video1.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ struct Video: View {
VStack {

Spacer()
.frame(height: 110)
.frame(height: 100)

AdView()
.frame(width: 100, height: 15)
Expand Down Expand Up @@ -58,7 +58,7 @@ struct Video: View {
// .padding(.bottom)

VideoView(videoID: "SH097lJCI1s")
.frame(minHeight: 0, maxHeight: UIScreen.main.bounds.height * 0.4)
.frame(minHeight: 0, maxHeight: UIScreen.main.bounds.height * 0.5)
.frame(minWidth: 0, maxWidth: UIScreen.main.bounds.width * 0.9)
.cornerRadius(15)
.padding(.bottom, 7)
Expand Down Expand Up @@ -118,8 +118,7 @@ struct Video: View {
}

.frame(width: 400, height: 200)
Spacer()
.frame(height: 50)


}.modifier(DarkModeViewModifier())

Expand Down
7 changes: 3 additions & 4 deletions Test/Video10.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ struct Video10: View {
VStack {

Spacer()
.frame(height: 110)
.frame(height: 100)

AdView()
.frame(width: 100, height: 15)
Expand All @@ -51,7 +51,7 @@ struct Video10: View {
.multilineTextAlignment(.center)

VideoView(videoID: "kkpFFx5IMws")
.frame(minHeight: 0, maxHeight: UIScreen.main.bounds.height * 0.4)
.frame(minHeight: 0, maxHeight: UIScreen.main.bounds.height * 0.5)
.frame(minWidth: 0, maxWidth: UIScreen.main.bounds.width * 0.9)
.cornerRadius(15)
.padding(.bottom, 7)
Expand Down Expand Up @@ -133,8 +133,7 @@ struct Video10: View {
.frame(minWidth: 0, maxWidth: UIScreen.main.bounds.width * 0.9)
}
.frame(width: 400, height: 200)
Spacer()
.frame(height: 50)


}.modifier(DarkModeViewModifier())

Expand Down
7 changes: 3 additions & 4 deletions Test/Video11.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ struct Video11: View {
VStack {

Spacer()
.frame(height: 110)
.frame(height: 100)

AdView()
.frame(width: 100, height: 15)
Expand Down Expand Up @@ -56,7 +56,7 @@ struct Video11: View {
.multilineTextAlignment(.center)

VideoView(videoID: "aIIyFTC28nM")
.frame(minHeight: 0, maxHeight: UIScreen.main.bounds.height * 0.4)
.frame(minHeight: 0, maxHeight: UIScreen.main.bounds.height * 0.5)
.frame(minWidth: 0, maxWidth: UIScreen.main.bounds.width * 0.9)
.cornerRadius(15)
.padding(.bottom, 7)
Expand Down Expand Up @@ -138,8 +138,7 @@ struct Video11: View {
.frame(minWidth: 0, maxWidth: UIScreen.main.bounds.width * 0.9)
}
.frame(width: 400, height: 200)
Spacer()
.frame(height: 50)


}.modifier(DarkModeViewModifier())

Expand Down
7 changes: 3 additions & 4 deletions Test/Video12.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ struct Video12: View {
VStack {

Spacer()
.frame(height: 110)
.frame(height: 100)

AdView()
.frame(width: 100, height: 15)
Expand All @@ -51,7 +51,7 @@ struct Video12: View {
.multilineTextAlignment(.center)

VideoView(videoID: "FsG55QzDGyk")
.frame(minHeight: 0, maxHeight: UIScreen.main.bounds.height * 0.4)
.frame(minHeight: 0, maxHeight: UIScreen.main.bounds.height * 0.5)
.frame(minWidth: 0, maxWidth: UIScreen.main.bounds.width * 0.9)
.cornerRadius(15)
.padding(.bottom, 7)
Expand Down Expand Up @@ -133,8 +133,7 @@ struct Video12: View {
.frame(minWidth: 0, maxWidth: UIScreen.main.bounds.width * 0.9)
}
.frame(width: 400, height: 200)
Spacer()
.frame(height: 50)


}.modifier(DarkModeViewModifier())

Expand Down
4 changes: 2 additions & 2 deletions Test/Video13.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ struct Video13: View {
VStack {

Spacer()
.frame(height: 110)
.frame(height: 100)

AdView()
.frame(width: 100, height: 15)
Expand All @@ -51,7 +51,7 @@ struct Video13: View {
.multilineTextAlignment(.center)

VideoView(videoID: "scFBn9iNGyg")
.frame(minHeight: 0, maxHeight: UIScreen.main.bounds.height * 0.4)
.frame(minHeight: 0, maxHeight: UIScreen.main.bounds.height * 0.5)
.frame(minWidth: 0, maxWidth: UIScreen.main.bounds.width * 0.9)
.cornerRadius(15)
.padding(.bottom, 7)
Expand Down
32 changes: 3 additions & 29 deletions Test/Video2.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ struct Video2: View {
VStack {

Spacer()
.frame(height: 110)
.frame(height: 100)

AdView()
.frame(width: 100, height: 15)
Expand All @@ -52,7 +52,7 @@ struct Video2: View {
.multilineTextAlignment(.center)

VideoView(videoID: "K-1RYJ4TN4g")
.frame(minHeight: 0, maxHeight: UIScreen.main.bounds.height * 0.4)
.frame(minHeight: 0, maxHeight: UIScreen.main.bounds.height * 0.5)
.frame(minWidth: 0, maxWidth: UIScreen.main.bounds.width * 0.9)
.cornerRadius(15)
.padding(.bottom, 7)
Expand All @@ -67,31 +67,6 @@ struct Video2: View {
.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.video2Completed) {

Expand Down Expand Up @@ -133,8 +108,7 @@ struct Video2: View {
.frame(minWidth: 0, maxWidth: UIScreen.main.bounds.width * 0.9)
}
.frame(width: 400, height: 200)
Spacer()
.frame(height: 50)


}.modifier(DarkModeViewModifier())

Expand Down
34 changes: 4 additions & 30 deletions Test/Video3.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ struct Video3: View {
VStack {

Spacer()
.frame(height: 110)
.frame(height: 100)

AdView()
.frame(width: 100, height: 15)
Expand Down Expand Up @@ -62,7 +62,7 @@ struct Video3: View {
.multilineTextAlignment(.center)

VideoView(videoID: "7vb2DTA5GMQ")
.frame(minHeight: 0, maxHeight: UIScreen.main.bounds.height * 0.4)
.frame(minHeight: 0, maxHeight: UIScreen.main.bounds.height * 0.5)
.frame(minWidth: 0, maxWidth: UIScreen.main.bounds.width * 0.9)
.cornerRadius(15)
.padding(.bottom, 7)
Expand All @@ -76,32 +76,7 @@ struct Video3: 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.video3Completed) {
Expand Down Expand Up @@ -142,8 +117,7 @@ struct Video3: View {
.frame(minWidth: 0, maxWidth: UIScreen.main.bounds.width * 0.9)
}
.frame(width: 400, height: 200)
Spacer()
.frame(height: 50)


}.modifier(DarkModeViewModifier())

Expand Down
35 changes: 4 additions & 31 deletions Test/Video4.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ struct Video4: View {
VStack {

Spacer()
.frame(height: 110)
.frame(height: 100)

AdView()
.frame(width: 100, height: 15)
Expand All @@ -50,7 +50,7 @@ struct Video4: View {
.multilineTextAlignment(.center)

VideoView(videoID: "CcuK1xE-92M")
.frame(minHeight: 0, maxHeight: UIScreen.main.bounds.height * 0.4)
.frame(minHeight: 0, maxHeight: UIScreen.main.bounds.height * 0.5)
.frame(minWidth: 0, maxWidth: UIScreen.main.bounds.width * 0.9)
.cornerRadius(15)
.padding(.bottom, 7)
Expand All @@ -65,32 +65,7 @@ struct Video4: 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.video4Completed) {

Expand Down Expand Up @@ -124,16 +99,14 @@ struct Video4: 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)
}
.frame(minWidth: 0, maxWidth: UIScreen.main.bounds.width * 0.9)
}
.frame(width: 400, height: 200)
Spacer()
.frame(height: 50)

}.modifier(DarkModeViewModifier())


Expand Down
34 changes: 4 additions & 30 deletions Test/Video5.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ struct Video5: View {

VStack {
Spacer()
.frame(height: 110)
.frame(height: 100)

AdView()
.frame(width: 100, height: 15)
Expand All @@ -49,7 +49,7 @@ struct Video5: View {
.multilineTextAlignment(.center)

VideoView(videoID: "mqHwJDh1hCc")
.frame(minHeight: 0, maxHeight: UIScreen.main.bounds.height * 0.4)
.frame(minHeight: 0, maxHeight: UIScreen.main.bounds.height * 0.5)
.frame(minWidth: 0, maxWidth: UIScreen.main.bounds.width * 0.9)
.cornerRadius(15)
.padding(.bottom, 7)
Expand All @@ -64,32 +64,7 @@ struct Video5: 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.video5Completed) {

Expand Down Expand Up @@ -131,8 +106,7 @@ struct Video5: View {
.frame(minWidth: 0, maxWidth: UIScreen.main.bounds.width * 0.9)
}
.frame(width: 400, height: 200)
Spacer()
.frame(height: 50)


}.modifier(DarkModeViewModifier())

Expand Down
Loading

0 comments on commit a32268b

Please sign in to comment.