Skip to content
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

arrow animation & fix for section title #209

Merged
merged 2 commits into from
Dec 18, 2023
Merged

arrow animation & fix for section title #209

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4df9a13
fix: contains next fixes:
forgotvas Dec 14, 2023
7e0a1c3
fix: hide dropdown when user is scrolling
forgotvas Dec 15, 2023
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
11 changes: 3 additions & 8 deletions Course/Course/Presentation/Outline/CourseExpandableContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,9 @@ struct CourseExpandableContentView: View {
.lineLimit(1)
.foregroundColor(Theme.Colors.textPrimary)
Spacer()
if isExpanded {
Image(systemName: "chevron.right")
.foregroundColor(Theme.Colors.accentColor)
.rotationEffect(.degrees(90))
} else {
Image(systemName: "chevron.right")
.foregroundColor(Theme.Colors.accentColor)
}
Image(systemName: "chevron.right")
.foregroundColor(Theme.Colors.accentColor)
.dropdownArrowRotationAnimation(value: isExpanded)
}
.padding(.horizontal, 30)
.padding(.vertical, 15)
Expand Down
31 changes: 18 additions & 13 deletions Course/Course/Presentation/Unit/CourseUnitView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,21 +296,26 @@ public struct CourseUnitView: View {
}
}
VStack {
NavigationBar(
title: isDropdownActive ? sequenceTitle : "",
leftButtonAction: {
viewModel.router.back()
playerStateSubject.send(VideoPlayerState.kill)
}).padding(.top, isHorizontal ? 10 : 0)
Group {
NavigationBar(
title: isDropdownActive ? sequenceTitle : "",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The screen title is missing when the drop-down isn't active which isn't the desired behavior.
image

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, @saeedbashir, the original upstream develop doesn't contain title, so i moved it to under flag. Should i move it to persistent state @volodymyr-chekyrta ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, @saeedbashir, the original upstream develop doesn't contain title, so i moved it to under flag

If thats the case, you can ignore this request. I thought it got missed because of our recent work.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@saeedbashir, now menu is hide when user scrolls content

leftButtonAction: {
viewModel.router.back()
playerStateSubject.send(VideoPlayerState.kill)
})
.padding(.top, isHorizontal ? 10 : 0)
.padding(.leading, isHorizontal ? -16 : 0)
if isDropdownActive {
CourseUnitDropDownTitle(
title: unitTitle,
isAvailable: isDropdownAvailable,
showDropdown: $showDropdown)
.padding(.top, 0)
.offset(y: -25)
if isDropdownActive {
CourseUnitDropDownTitle(
title: unitTitle,
isAvailable: isDropdownAvailable,
showDropdown: $showDropdown)
.padding(.top, 0)
.padding(.horizontal, 48)
.offset(y: -25)
}
}
.padding(.trailing, isHorizontal ? 215 : 0)
Spacer()
}
HStack(alignment: .center) {
Expand Down
10 changes: 4 additions & 6 deletions Course/Course/Presentation/Unit/Subviews/DropdownList/CourseUnitDropDownTitle.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,17 @@ struct CourseUnitDropDownTitle: View {
HStack {
Text(title)
.opacity(showDropdown ? 0.7 : 1.0)
.lineLimit(1)
if isAvailable {
if showDropdown {
Image(systemName: "chevron.right")
.rotationEffect(.degrees(90))
} else {
Image(systemName: "chevron.right")
}
Image(systemName: "chevron.right")
.dropdownArrowRotationAnimation(value: showDropdown)
}
}
}
.buttonStyle(.plain)
} else {
Text(title)
.lineLimit(1)
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions Course/Course/Presentation/Unit/Subviews/DropdownList/CourseUnitVerticalsDropdownView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ struct CourseUnitVerticalsDropdownView: View {
isLast: isLast,
isSelected: isSelected
) {
if isSelected {
showDropdown.toggle()
return
}
action(vertical)
}
}
Expand Down
13 changes: 13 additions & 0 deletions Course/Course/Presentation/Unit/Subviews/DropdownList/DropdownAnimationModifier.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,21 @@ struct DropdownAnimationModifier<V>: ViewModifier where V: Equatable {
}
}

struct DropdownArrowRotationModifier: ViewModifier {
var value: Bool
func body(content: Content) -> some View {
content
.rotationEffect(value ? .degrees(90) : .degrees(0))
.animation(.easeOut(duration: 0.2), value: value)
}
}

extension View {
func dropdownAnimation<V>(isActive: Bool, value: V) -> some View where V: Equatable {
modifier(DropdownAnimationModifier(isActive: isActive, value: value))
}

func dropdownArrowRotationAnimation(value: Bool) -> some View {
modifier(DropdownArrowRotationModifier(value: value))
}
}