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

Jump to bottom

feat: Add possibility to hide points on slides #1594

Merged
merged 2 commits into from
Nov 1, 2024
Merged

feat: Add possibility to hide points on slides #1594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa9b037
feat: Add possibility to hide points on slides
BaptGrv Oct 25, 2024
90bdec1
fix: Change isPageIndicatorHidden place
BaptGrv Nov 1, 2024
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
2 changes: 1 addition & 1 deletion Mail/Views/Onboarding/AuthorizationView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ struct AuthorizationView: View {
private var slides = Slide.authorizationSlides

var body: some View {
WaveView(slides: slides, selectedSlide: $selection, isScrollEnabled: isScrollEnabled) { _ in
WaveView(slides: slides, selectedSlide: $selection, isScrollEnabled: isScrollEnabled, isPageIndicatorHidden: true) { _ in
VStack(spacing: IKPadding.small) {
Button(MailResourcesStrings.Localizable.contentDescriptionButtonNext, action: nextButtonClicked)
.buttonStyle(.ikBorderedProminent)
Expand Down
6 changes: 5 additions & 1 deletion Mail/Views/Onboarding/WaveView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ struct WaveView<BottomView: View>: UIViewControllerRepresentable {
@Binding var selectedSlide: Int

let isScrollEnabled: Bool
let isPageIndicatorHidden: Bool
let slides: [Slide]
let headerImage: UIImage?

Expand All @@ -39,6 +40,7 @@ struct WaveView<BottomView: View>: UIViewControllerRepresentable {
slides: [Slide],
selectedSlide: Binding<Int>,
isScrollEnabled: Bool = true,
isPageIndicatorHidden: Bool = false,
headerImage: UIImage? = MailResourcesAsset.logoText.image,
dismissHandler: (() -> Void)? = nil,
shouldAnimateBottomViewForIndex: @escaping (Int) -> Bool = { _ in return false },
Expand All @@ -51,6 +53,7 @@ struct WaveView<BottomView: View>: UIViewControllerRepresentable {
self.dismissHandler = dismissHandler
self.shouldAnimateBottomViewForIndex = shouldAnimateBottomViewForIndex
self.bottomView = bottomView
self.isPageIndicatorHidden = isPageIndicatorHidden
}

func makeUIViewController(context: Context) -> OnboardingViewController {
Expand All @@ -59,7 +62,8 @@ struct WaveView<BottomView: View>: UIViewControllerRepresentable {
slides: slides,
pageIndicatorColor: accentColor.primary.color,
isScrollEnabled: isScrollEnabled,
dismissHandler: dismissHandler
dismissHandler: dismissHandler,
isPageIndicatorHidden: isPageIndicatorHidden
)

let controller = OnboardingViewController(configuration: configuration)
Expand Down
30 changes: 15 additions & 15 deletions Tuist/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{
"identity" : "cocoalumberjack",
"kind" : "remoteSourceControl",
"location" : "https://github.com/CocoaLumberjack/CocoaLumberjack.git",
"location" : "https://github.com/CocoaLumberjack/CocoaLumberjack",
"state" : {
"revision" : "4b8714a7fb84d42393314ce897127b3939885ec3",
"version" : "3.8.5"
Expand All @@ -41,17 +41,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/Infomaniak/ios-core",
"state" : {
"revision" : "688a8ff5f5dbc213bc4e752db97ed54e8570fc4c",
"version" : "12.3.3"
"revision" : "82fa2c1f0fc4b6d0f520697bb073a7acddd52833",
"version" : "12.5.0"
}
},
{
"identity" : "ios-core-ui",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Infomaniak/ios-core-ui",
"state" : {
"revision" : "1aeba8dae671e8c2d7ea239a9669c0b9e085b2de",
"version" : "13.2.0"
"revision" : "e0afbab522df72496b92042ee65c20f8d593a3f7",
"version" : "13.4.0"
}
},
{
Expand Down Expand Up @@ -95,8 +95,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/Infomaniak/ios-onboarding",
"state" : {
"revision" : "85257ac8c76050acf057d37ff35fc9f8d0f82fda",
"version" : "1.0.5"
"revision" : "639f24fbed01d6f084d63d3ddbd7108d1af2cc25",
"version" : "1.1.0"
}
},
{
Expand Down Expand Up @@ -176,26 +176,26 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/realm/realm-core.git",
"state" : {
"revision" : "e474a8d2270a8b12ac63ac9504e4757e39814b99",
"version" : "14.13.0"
"revision" : "85eeca41654cc9070ad81a21a4b1d153ad467c33",
"version" : "14.13.1"
}
},
{
"identity" : "realm-swift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/realm/realm-swift",
"state" : {
"revision" : "863498d37a9f0e72caa65963da9641d8cdfc8228",
"version" : "10.54.0"
"revision" : "5553cfd1c789efdb3d6daf7f0cc0733cfe601846",
"version" : "10.54.1"
}
},
{
"identity" : "sentry-cocoa",
"kind" : "remoteSourceControl",
"location" : "https://github.com/getsentry/sentry-cocoa",
"state" : {
"revision" : "54cc2e3e4fcbf9d4c7708ce00d3b6eee29aecbb1",
"version" : "8.38.0"
"revision" : "0b8ba88f5fd70062887d55f87a970c59b1ceebcf",
"version" : "8.39.0"
}
},
{
Expand Down Expand Up @@ -275,8 +275,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/Infomaniak/swift-rich-html-editor.git",
"state" : {
"revision" : "8ce8a211512d09f4e4635c3d936a5693c7ec1c45",
"version" : "1.4.0"
"revision" : "d4e8bd9b1bf62bd2a7ad81ce4e94170b2d6f7ab7",
"version" : "1.4.1"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion Tuist/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ let package = Package(
.package(url: "https://github.com/Infomaniak/ios-create-account", .upToNextMajor(from: "12.0.0")),
.package(url: "https://github.com/Infomaniak/ios-bug-tracker", .upToNextMajor(from: "7.0.0")),
.package(url: "https://github.com/Infomaniak/ios-version-checker", .upToNextMajor(from: "7.0.0")),
.package(url: "https://github.com/Infomaniak/ios-onboarding", .upToNextMajor(from: "1.0.3")),
.package(url: "https://github.com/Infomaniak/ios-onboarding", .upToNextMajor(from: "1.1.0")),
.package(url: "https://github.com/Infomaniak/swift-modal-presentation", .upToNextMajor(from: "1.0.0")),
.package(url: "https://github.com/Infomaniak/SwiftSoup", .upToNextMajor(from: "1.1.0")),
.package(url: "https://github.com/ProxymanApp/atlantis", .upToNextMajor(from: "1.21.0")),
Expand Down
Loading