Skip to content

fix: crop course details banner image #659

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
edschema wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −48
Open

fix: crop course details banner image #659

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
73 changes: 25 additions & 48 deletions Discovery/Discovery/Presentation/NativeDiscovery/CourseDetailsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,35 +73,30 @@ public struct CourseDetailsView: View {
// MARK: - Course Banner
CourseBannerView(
courseDetails: courseDetails,
proxy: proxy,
isHorisontal: viewModel.isHorisontal,
onPlayButtonTap: { [weak viewModel] in
viewModel?.showCourseVideo()
}
)
}.aspectRatio(CGSize(width: 16, height: 8.5), contentMode: .fill)
.frame(maxHeight: 250)
.frame(width: 312, height: 312 * 8.5 / 16)
.cornerRadius(12)
.padding(.horizontal, 6)
.padding(.top, 7)

}
}
} else {
// MARK: - iPhone
VStack(alignment: .leading) {
// MARK: - Course Banner
CourseBannerView(
courseDetails: courseDetails,
proxy: proxy,
isHorisontal: viewModel.isHorisontal,
onPlayButtonTap: { [weak viewModel] in
viewModel?.showCourseVideo()
})
}.aspectRatio(CGSize(width: 16, height: 8.5), contentMode: .fill)
.aspectRatio(CGSize(width: 16, height: 8.5), contentMode: .fit)
.cornerRadius(12)
.padding(.horizontal, 6)
.padding(.top, 7)
.fixedSize(horizontal: false, vertical: true)
}

// MARK: - Course state button
CourseStateView(title: title,
Expand Down Expand Up @@ -373,58 +368,40 @@ private struct CourseTitleView: View {

private struct CourseBannerView: View {
@State private var animate = false
private var isHorisontal: Bool
private let courseDetails: CourseDetails
private let idiom: UIUserInterfaceIdiom
private let proxy: GeometryProxy
private let onPlayButtonTap: () -> Void

init(courseDetails: CourseDetails,
proxy: GeometryProxy,
isHorisontal: Bool,
onPlayButtonTap: @escaping () -> Void) {
self.courseDetails = courseDetails
self.isHorisontal = isHorisontal
self.idiom = UIDevice.current.userInterfaceIdiom
self.proxy = proxy
self.onPlayButtonTap = onPlayButtonTap
}

var body: some View {
ZStack(alignment: .center) {
if !isHorisontal {
KFImage(URL(string: courseDetails.courseBannerURL))
.onFailureImage(CoreAssets.noCourseImage.image)
.resizable()
.aspectRatio(16/9, contentMode: .fill)
.frame(width: idiom == .pad ? nil : proxy.size.width - 12)
.opacity(animate ? 1 : 0)
.onAppear {
withAnimation(.linear(duration: 0.5)) {
animate = true
}
}
.accessibilityIdentifier("course_image")
if courseDetails.courseVideoURL != nil {
PlayButton(action: onPlayButtonTap)
}
} else {
KFImage(URL(string: courseDetails.courseBannerURL))
.onFailureImage(CoreAssets.noCourseImage.image)
.resizable()
.aspectRatio(16/9, contentMode: .fill)
.frame(width: 312)
.opacity(animate ? 1 : 0)
.onAppear {
withAnimation(.linear(duration: 0.5)) {
animate = true
}
bannerImage
if courseDetails.courseVideoURL != nil {
PlayButton(action: onPlayButtonTap)
}
}
.clipped()
}

private var bannerImage: some View {
GeometryReader { proxy in
KFImage(URL(string: courseDetails.courseBannerURL))
.onFailureImage(CoreAssets.noCourseImage.image)
.resizable()
.scaledToFill()
.frame(width: proxy.size.width, height: proxy.size.height)
.clipped()
.opacity(animate ? 1 : 0)
.onAppear {
withAnimation(.linear(duration: 0.5)) {
animate = true
}
.accessibilityIdentifier("course_image")
if courseDetails.courseVideoURL != nil {
PlayButton(action: onPlayButtonTap)
}
}
.accessibilityIdentifier("course_image")
}
}
}
Expand Down
Loading