fix: theme settings not respected & simplify theming

protonpass · May 27, 2024 · d1d8f92 · d1d8f92
1 parent 81ed02e
commit d1d8f92
Show file tree

Hide file tree

Showing 38 changed files with 35 additions and 168 deletions.
diff --git a/AutoFill/CredentialProviderCoordinator.swift b/AutoFill/CredentialProviderCoordinator.swift
@@ -53,7 53,6 @@ final class CredentialProviderCoordinator: DeinitPrintable {
  private let router = resolve(\SharedRouterContainer.mainUIKitSwiftUIRouter)
  private let corruptedSessionEventStream = resolve(\SharedDataStreamContainer.corruptedSessionEventStream)
 
- private let theme = resolve(\SharedToolingContainer.theme)
  private weak var rootViewController: UIViewController?
  private weak var context: ASCredentialProviderExtensionContext?
  private var cancellables = Set<AnyCancellable>()
@@ -124,7 123,8 @@ final class CredentialProviderCoordinator: DeinitPrintable {
  guard let self else { return }
  do {
  try await preferencesManager.setUp()
- rootViewController?.view.overrideUserInterfaceStyle = theme.userInterfaceStyle
  let theme = preferencesManager.sharedPreferences.unwrapped().theme
  rootViewController?.overrideUserInterfaceStyle = theme.userInterfaceStyle
  start(mode: mode)
  } catch {
  handle(error: error)
@@ -381,7 381,6 @@ private extension CredentialProviderCoordinator {
  guard let self else { return }
  cancelAutoFill(reason: .userCanceled, context: context)
  }
- .theme(theme)
  showView(view)
  }
 
@@ -435,7 434,8 @@ private extension CredentialProviderCoordinator {
 
  func present(_ viewController: UIViewController, animated: Bool = true, dismissible: Bool = false) {
  viewController.isModalInPresentation = !dismissible
- viewController.overrideUserInterfaceStyle = theme.userInterfaceStyle
  viewController.overrideUserInterfaceStyle = rootViewController?
  .overrideUserInterfaceStyle ?? .unspecified
  topMostViewController?.present(viewController, animated: animated)
  }
 

diff --git a/AutoFill/Scenes/CredentialsView/CredentialsView.swift b/AutoFill/Scenes/CredentialsView/CredentialsView.swift
@@ -31,7 31,6 @@ import SwiftUI
 struct CredentialsView: View {
  @StateObject private var viewModel: CredentialsViewModel
  @FocusState private var isFocusedOnSearchBar
- private let theme = resolve(\SharedToolingContainer.theme)
 
  init(viewModel: CredentialsViewModel) {
  _viewModel = .init(wrappedValue: viewModel)
@@ -46,7 45,6 @@ struct CredentialsView: View {
  .task {
  await viewModel.sync()
  }
- .theme(theme)
  .localAuthentication(delayed: false,
  onAuth: {},
  onSuccess: viewModel.handleAuthenticationSuccess,
@@ -82,7 80,6 @@ struct CredentialsView: View {
  if let info = viewModel.selectPasskeySheetInformation,
  let context = viewModel.context {
  SelectPasskeyView(info: info, context: context)
- .theme(theme)
  .presentationDetents([.height(CGFloat(info.passkeys.count * 60)   80)])
  }
  }

diff --git a/AutoFill/Scenes/ExtensionSettings/ExtensionSettingsView.swift b/AutoFill/Scenes/ExtensionSettings/ExtensionSettingsView.swift
@@ -25,7 25,6 @@ import SwiftUI
 
 struct ExtensionSettingsView: View {
  @StateObject private var viewModel = ExtensionSettingsViewModel()
- private let theme = resolve(\SharedToolingContainer.theme)
 
  private let onDismiss: () -> Void
  private let onLogOut: () -> Void
@@ -83,7 82,6 @@ struct ExtensionSettingsView: View {
  }
  }
  }
- .theme(theme)
  .localAuthentication(delayed: false,
  onAuth: {},
  onSuccess: {},

diff --git a/AutoFill/Scenes/LockedCredential/LockedCredentialView.swift b/AutoFill/Scenes/LockedCredential/LockedCredentialView.swift
@@ -25,7 25,6 @@ import SwiftUI
 
 /// When autofilling from QuickType bar but local authentication is turned on
 struct LockedCredentialView: View {
- private let theme = resolve(\SharedToolingContainer.theme)
  let viewModel: LockedCredentialViewModel
 
  init(viewModel: LockedCredentialViewModel) {
@@ -41,7 40,6 @@ struct LockedCredentialView: View {
  onFailure: { viewModel.handleAuthenticationFailure() })
  .toolbar { toolbarContent }
  }
- .theme(theme)
  }
 
  @ToolbarContentBuilder

diff --git a/AutoFill/Scenes/Passkey/PasskeyCredentialsView.swift b/AutoFill/Scenes/Passkey/PasskeyCredentialsView.swift
@@ -28,7 28,6 @@ import SwiftUI
 
 struct PasskeyCredentialsView: View {
  @StateObject private var viewModel: PasskeyCredentialsViewModel
- private let theme = resolve(\SharedToolingContainer.theme)
  private let onCreate: () -> Void
  private let onCancel: () -> Void
 
@@ -63,7 62,6 @@ struct PasskeyCredentialsView: View {
  onRetry: { Task { await viewModel.loadCredentials() } })
  }
  }
- .theme(theme)
  .showSpinner(viewModel.isCreatingPasskey)
  .alert("Create passkey",
  isPresented: $viewModel.isShowingAssociationConfirmation,

diff --git a/LocalPackages/Core/Sources/Core/Coordinator/Coordinator.swift b/LocalPackages/Core/Sources/Core/Coordinator/Coordinator.swift
@@ -37,7 37,6 @@ public protocol CoordinatorProtocol: AnyObject {
 // animated: Bool,
 // dismissible: Bool)
  func present(_ viewController: UIViewController,
- userInterfaceStyle: UIUserInterfaceStyle,
  animated: Bool,
  dismissible: Bool,
  uniquenessTag: (any RawRepresentable<Int>)?)
@@ -76,13 75,11 @@ public extension CoordinatorProtocol {
  /// When `uniquenessTag` is set and there is a sheet that holds the same tag,
  /// we dismiss the top most sheet and do nothing. Otherwise we present the sheet as normal
  func present(_ viewController: UIViewController,
- userInterfaceStyle: UIUserInterfaceStyle,
  animated: Bool = true,
  dismissible: Bool = true,
  uniquenessTag: (any RawRepresentable<Int>)? = nil) {
  viewController.sheetPresentationController?.preferredCornerRadius = 16
  viewController.isModalInPresentation = !dismissible
- viewController.overrideUserInterfaceStyle = userInterfaceStyle
  if let uniquenessTag {
  viewController.view.tag = uniquenessTag.rawValue
  if rootViewController.containsUniqueSheet(uniquenessTag) {

diff --git a/LocalPackages/DesignSystem/Sources/DesignSystem/ExtensionCoordinator.swift b/LocalPackages/DesignSystem/Sources/DesignSystem/ExtensionCoordinator.swift
@@ -48,6 48,7 @@ public extension ExtensionCoordinator {
 
  let viewController = UIHostingController(rootView: view)
  viewController.view.translatesAutoresizingMaskIntoConstraints = false
  viewController.overrideUserInterfaceStyle = rootViewController.overrideUserInterfaceStyle
  rootViewController.view.addSubview(viewController.view)
  NSLayoutConstraint.activate([
  viewController.view.topAnchor.constraint(equalTo: rootViewController.view.topAnchor),

diff --git a/LocalPackages/DesignSystem/Sources/DesignSystem/Extensions/UIViewController Extensions.swift b/LocalPackages/DesignSystem/Sources/DesignSystem/Extensions/UIViewController Extensions.swift
@@ -68,15 68,6 @@ public extension UIViewController {
  }
  return false
  }
-
- /// Override `userInterfaceStyle` of the current view controller as well as its presented view controllers
- func setUserInterfaceStyle(_ userInterfaceStyle: UIUserInterfaceStyle) {
- overrideUserInterfaceStyle = userInterfaceStyle
- guard let presentationController = presentedViewController else {
- return
- }
- presentationController.overrideUserInterfaceStyle = userInterfaceStyle
- }
 }
 
 private extension UIViewController {

diff --git a/LocalPackages/DesignSystem/Sources/DesignSystem/View ColorScheme.swift b/LocalPackages/DesignSystem/Sources/DesignSystem/View ColorScheme.swift
diff --git a/LocalPackages/Entities/Sources/Entities/Models/Configuration/Theme.swift b/LocalPackages/Entities/Sources/Entities/Models/Configuration/Theme.swift
@@ -20,11 20,23 @@
 //
 
 import Foundation
 import UIKit
 
 public enum Theme: Int, Codable, CaseIterable, Sendable {
  case light = 0
  case dark = 1
  case matchSystem = 2
 
  public static var `default`: Self { .dark }
 
  public var userInterfaceStyle: UIUserInterfaceStyle {
  switch self {
  case .light:
  .light
  case .dark:
  .dark
  case .matchSystem:
  .unspecified
  }
  }
 }
diff --git a/Share/ShareCoordinator.swift b/Share/ShareCoordinator.swift
@@ -74,7 74,6 @@ final class ShareCoordinator {
  private let credentialProvider = resolve(\SharedDataContainer.credentialProvider)
  private let setUpSentry = resolve(\SharedUseCasesContainer.setUpSentry)
  private let setCoreLoggerEnvironment = resolve(\SharedUseCasesContainer.setCoreLoggerEnvironment)
- private let theme = resolve(\SharedToolingContainer.theme)
  private let router = resolve(\SharedRouterContainer.mainUIKitSwiftUIRouter)
  private let sendErrorToSentry = resolve(\SharedUseCasesContainer.sendErrorToSentry)
  private let wipeAllData = resolve(\SharedUseCasesContainer.wipeAllData)
@@ -195,7 194,6 @@ private extension ShareCoordinator {
  guard let self else { return }
  dismissExtension()
  }
- .theme(theme)
  showView(view)
  }
 

diff --git a/Share/SharedContentView.swift b/Share/SharedContentView.swift
@@ -25,7 25,6 @@ import ProtonCoreUIFoundations
 import SwiftUI
 
 struct SharedContentView: View {
- private let theme = resolve(\SharedToolingContainer.theme)
  let content: SharedContent
  let onCreate: (SharedItemType) -> Void
  let onDismiss: () -> Void
@@ -58,7 57,6 @@ struct SharedContentView: View {
  .toolbar { toolbarContent }
  .navigationTitle("Create")
  .navigationStackEmbeded()
- .theme(theme)
  }
 }
 

diff --git a/iOS/App/SceneDelegate.swift b/iOS/App/SceneDelegate.swift
@@ -68,7 68,6 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
 private extension SceneDelegate {
  struct AppCoverView: View {
- private let theme = resolve(\SharedToolingContainer.theme)
  let windowSize: CGSize
 
  var body: some View {
@@ -83,7 82,6 @@ private extension SceneDelegate {
  .frame(width: min(windowSize.width, windowSize.height) * 2 / 3)
  .frame(maxWidth: 245)
  }
- .theme(theme)
  }
  }
 

diff --git a/iOS/Scenes/App/AppCoordinator.swift b/iOS/Scenes/App/AppCoordinator.swift
@@ -67,6 67,10 @@ final class AppCoordinator {
 
  private let sendErrorToSentry = resolve(\SharedUseCasesContainer.sendErrorToSentry)
 
  private var theme: Theme {
  preferencesManager.sharedPreferences.unwrapped().theme
  }
 
  init(window: UIWindow) {
  self.window = window
  appStateObserver = .init()
@@ -152,6 156,7 @@ final class AppCoordinator {
  guard let self else { return }
  do {
  try await preferencesManager.setUp()
  window.overrideUserInterfaceStyle = theme.userInterfaceStyle
  start()
  } catch {
  appStateObserver.updateAppState(.loggedOut(.failedToInitializePreferences(error)))
@@ -173,7 178,7 @@ private extension AppCoordinator {
 
  func showWelcomeScene(reason: LogOutReason) {
  let welcomeCoordinator = WelcomeCoordinator(apiService: apiManager.apiService,
- preferences: preferences)
  theme: theme)
  welcomeCoordinator.delegate = self
  self.welcomeCoordinator = welcomeCoordinator
  homepageCoordinator = nil
@@ -203,7 208,6 @@ private extension AppCoordinator {
  func animateUpdateRootViewController(_ newRootViewController: UIViewController,
  completion: (() -> Void)? = nil) {
  window.rootViewController = newRootViewController
- window.overrideUserInterfaceStyle = preferences.theme.userInterfaceStyle
  UIView.transition(with: window,
  duration: 0.35,
  options: .transitionCrossDissolve,

diff --git a/iOS/Scenes/DeepLinks/TotpLogins/TotpLoginsView.swift b/iOS/Scenes/DeepLinks/TotpLogins/TotpLoginsView.swift
@@ -32,8 32,6 @@ struct TotpLoginsView: View {
  @FocusState private var isFocusedOnSearchBar
  @Environment(\.dismiss) private var dismiss
 
- private let theme = resolve(\SharedToolingContainer.theme)
-
  var body: some View {
  ZStack {
  PassColor.backgroundNorm.toColor
@@ -45,7 43,6 @@ struct TotpLoginsView: View {
  .task {
  await viewModel.loadLogins()
  }
- .theme(theme)
  .navigationBarTitleDisplayMode(.inline)
  .navigationTitle("Set up 2FA")
  .toolbarBackground(PassColor.backgroundNorm.toColor,

diff --git a/iOS/Scenes/Homepage/Create & Edit Items/CreateAliasLiteView.swift b/iOS/Scenes/Homepage/Create & Edit Items/CreateAliasLiteView.swift
@@ -26,7 26,6 @@ import ProtonCoreUIFoundations
 import SwiftUI
 
 struct CreateAliasLiteView: View {
- private let theme = resolve(\SharedToolingContainer.theme)
  @Environment(\.dismiss) private var dismiss
  @StateObject private var viewModel: CreateAliasLiteViewModel
  @FocusState private var focusedField: Field?
@@ -101,7 100,6 @@ struct CreateAliasLiteView: View {
  }
  }
  }
- .theme(theme)
  }
 
  @ViewBuilder

diff --git a/iOS/Scenes/Homepage/Create & Edit Items/CreateEditLoginView.swift b/iOS/Scenes/Homepage/Create & Edit Items/CreateEditLoginView.swift
@@ -30,7 30,6 @@ import SwiftUI
 import TipKit
 
 struct CreateEditLoginView: View {
- private let theme = resolve(\SharedToolingContainer.theme)
  @Environment(\.dismiss) private var dismiss
  @StateObject private var viewModel: CreateEditLoginViewModel
  @FocusState private var focusedField: Field?
@@ -162,7 161,6 @@ struct CreateEditLoginView: View {
  .toolbar { keyboardToolbar }
  }
  .tint(viewModel.itemContentType().normMajor2Color.toColor)
- .theme(theme)
  .obsoleteItemAlert(isPresented: $viewModel.isObsolete, onAction: dismiss.callAsFunction)
  .discardChangesAlert(isPresented: $isShowingDiscardAlert, onDiscard: dismiss.callAsFunction)
  }

diff --git a/iOS/Scenes/Homepage/Create & Edit Items/CreateEditNoteView.swift b/iOS/Scenes/Homepage/Create & Edit Items/CreateEditNoteView.swift
@@ -25,7 25,6 @@ import ProtonCoreUIFoundations
 import SwiftUI
 
 struct CreateEditNoteView: View {
- private let theme = resolve(\SharedToolingContainer.theme)
  @Environment(\.dismiss) private var dismiss
  @StateObject private var viewModel: CreateEditNoteViewModel
  @FocusState private var focusedField: Field?
@@ -92,7 91,6 @@ struct CreateEditNoteView: View {
  onSave: { viewModel.save() })
  }
  }
- .theme(theme)
  .tint(viewModel.itemContentType().normMajor1Color.toColor)
  .obsoleteItemAlert(isPresented: $viewModel.isObsolete, onAction: dismiss.callAsFunction)
  .discardChangesAlert(isPresented: $isShowingDiscardAlert, onDiscard: dismiss.callAsFunction)

diff --git a/iOS/Scenes/Homepage/Create & Edit Items/Custom fields/CustomFieldAdditionCoordinator.swift b/iOS/Scenes/Homepage/Create & Edit Items/Custom fields/CustomFieldAdditionCoordinator.swift
@@ -34,7 34,6 @@ protocol CustomFieldAdditionDelegate: AnyObject {
 final class CustomFieldAdditionCoordinator: DeinitPrintable, CustomCoordinator {
  deinit { print(deinitMessage) }
 
- private let theme = resolve(\SharedToolingContainer.theme)
  weak var rootViewController: UIViewController?
  weak var delegate: (any CustomFieldAdditionDelegate)?
 
@@ -61,7 60,6 @@ final class CustomFieldAdditionCoordinator: DeinitPrintable, CustomCoordinator {
  }
 
  viewController.sheetPresentationController?.prefersGrabberVisible = true
- viewController.overrideUserInterfaceStyle = theme.userInterfaceStyle
  rootViewController?.topMostViewController.present(viewController, animated: true)
  }
 }

diff --git a/iOS/Scenes/Homepage/Create & Edit Items/Password generator/GeneratePasswordView.swift b/iOS/Scenes/Homepage/Create & Edit Items/Password generator/GeneratePasswordView.swift
@@ -26,7 26,6 @@ import ProtonCoreUIFoundations
 import SwiftUI
 
 struct GeneratePasswordView: View {
- private var theme = resolve(\SharedToolingContainer.theme)
  @Environment(\.dismiss) private var dismiss
  @StateObject private var viewModel: GeneratePasswordViewModel
 
@@ -123,7 122,6 @@ struct GeneratePasswordView: View {
  }
  }
  }
- .theme(theme)
  }
 
  private var passwordTypeRow: some View {