feat: change sheet height dynamically

protonpass · May 24, 2024 · 29b7645 · 29b7645
1 parent 43461cb
commit 29b7645
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 5 deletions.
diff --git a/iOS/Scenes/Homepage/HomepageCoordinator.swift b/iOS/Scenes/Homepage/HomepageCoordinator.swift
@@ -813,13 813,13 @@ extension HomepageCoordinator {
  }
 
  func publicLink(item: ItemContent) {
- let view = PublicLinkView(viewModel: .init(itemContent: item))
  let viewModel = PublicLinkViewModel(itemContent: item)
  let view = PublicLinkView(viewModel: viewModel)
  let viewController = UIHostingController(rootView: view)
-
- viewController.setDetentType(.medium,
  viewController.setDetentType(.custom(PublicLinkViewModelState.default.sheetHeight),
  parentViewController: rootViewController)
-
  viewController.sheetPresentationController?.prefersGrabberVisible = true
  viewModel.sheetPresentation = viewController.sheetPresentationController
  present(viewController)
  }
 

diff --git a/iOS/Scenes/Sharing/PublicLinkView/PublicLinkView.swift b/iOS/Scenes/Sharing/PublicLinkView/PublicLinkView.swift
@@ -55,7 55,6 @@ private extension PublicLinkView {
  .showSpinner(viewModel.loading)
  .animation(.default, value: viewModel.link)
  .animation(.default, value: viewModel.viewCount)
- .scrollViewEmbeded(maxWidth: .infinity)
  .background(PassColor.backgroundNorm.toColor)
  .toolbar { toolbarContent }
  }

diff --git a/iOS/Scenes/Sharing/PublicLinkView/PublicLinkViewModel.swift b/iOS/Scenes/Sharing/PublicLinkView/PublicLinkViewModel.swift
@@ -25,6 25,7 @@ import Entities
 import Factory
 import Foundation
 import Macro
 import UIKit
 
 enum SecureLinkExpiration: Sendable, Hashable, Identifiable {
  case hour(Int)
@@ -55,20 56,70 @@ enum SecureLinkExpiration: Sendable, Hashable, Identifiable {
  }
 }
 
 enum PublicLinkViewModelState {
  case creationWithoutRestriction
  case creationWithRestriction
  case created
 
  var sheetHeight: CGFloat {
  switch self {
  case .creationWithoutRestriction:
  280
  case .creationWithRestriction:
  350
  case .created:
  250
  }
  }
 
  static var `default`: Self { .creationWithoutRestriction }
 }
 
 @MainActor
 final class PublicLinkViewModel: ObservableObject, Sendable {
  @Published private(set) var link: SharedPublicLink?
  @Published var selectedExpiration: SecureLinkExpiration = .day(7)
  @Published var loading = false
  @Published var viewCount = 0
 
  private var state = PassthroughSubject<PublicLinkViewModelState, Never>()
  private var cancellables = Set<AnyCancellable>()
 
  let router = resolve(\SharedRouterContainer.mainUIKitSwiftUIRouter)
  let createItemSharingPublicLink = resolve(\SharedUseCasesContainer.createItemSharingPublicLink)
 
  let itemContent: ItemContent
  weak var sheetPresentation: UISheetPresentationController?
 
  init(itemContent: ItemContent) {
  self.itemContent = itemContent
 
  Publishers.CombineLatest($link, $viewCount)
  .sink { [weak self] link, count in
  guard let self else { return }
  if link != nil {
  state.send(.created)
  } else if count == 0 { // swiftlint:disable:this empty_count
  state.send(.creationWithoutRestriction)
  } else {
  state.send(.creationWithRestriction)
  }
  }
  .store(in: &cancellables)
 
  state
  .receive(on: DispatchQueue.main)
  .sink { [weak self] state in
  guard let self else { return }
  let detent = UISheetPresentationController.Detent.custom { _ in
  CGFloat(state.sheetHeight)
  }
  sheetPresentation?.animateChanges { [weak self] in
  guard let self else { return }
  sheetPresentation?.detents = [detent]
  }
  }
  .store(in: &cancellables)
  }
 
  func createLink() {