Make scrollEdgesAppearance singular to match UIKit

Riot/Managers/Theme/Theme.swift

@@ -112,17 +112,17 @@ import DesignKit
  /// - Parameter tabBar: The tab bar to customise.
  func applyStyle(onTabBar tabBar: UITabBar)
 
- /// Apply the theme on a navigation bar, without enabling the iOS 15's scroll edges appearance.
+ /// Apply the theme on a navigation bar, without enabling the iOS 15's scroll edge appearance.
  ///
  /// - Parameter navigationBar: the navigation bar to customise.
  func applyStyle(onNavigationBar navigationBar: UINavigationBar)
 
  /// Apply the theme on a navigation bar.
  ///
  /// - Parameter navigationBar: the navigation bar to customise.
- /// - Parameter modernScrollEdgesAppearance: whether or not to use the iOS 15 style scroll edges appearance
+ /// - Parameter modernScrollEdgeAppearance: whether or not to use the iOS 15 style scroll edge appearance
  func applyStyle(onNavigationBar navigationBar: UINavigationBar,
- withModernScrollEdgesAppearance modernScrollEdgesAppearance: Bool)
+ withModernScrollEdgeAppearance modernScrollEdgeAppearance: Bool)
 
  /// Apply the theme on a search bar.
  ///

Riot/Managers/Theme/Themes/DarkTheme.swift

@@ -114,11 +114,11 @@ class DarkTheme: NSObject, Theme {
 
  // Protocols don't support default parameter values and a protocol extension won't work for @objc
  func applyStyle(onNavigationBar navigationBar: UINavigationBar) {
- applyStyle(onNavigationBar: navigationBar, withModernScrollEdgesAppearance: false)
+ applyStyle(onNavigationBar: navigationBar, withModernScrollEdgeAppearance: false)
  }
 
  func applyStyle(onNavigationBar navigationBar: UINavigationBar,
- withModernScrollEdgesAppearance modernScrollEdgesAppearance: Bool) {
+ withModernScrollEdgeAppearance modernScrollEdgeAppearance: Bool) {
  navigationBar.tintColor = tintColor
 
  // On iOS 15 use UINavigationBarAppearance to fix visual issues with the scrollEdgeAppearance style.
@@ -127,15 +127,15 @@ class DarkTheme: NSObject, Theme {
 
  appearance.configureWithOpaqueBackground()
  appearance.backgroundColor = baseColor
- if !modernScrollEdgesAppearance {
+ if !modernScrollEdgeAppearance {
  appearance.shadowColor = nil
  }
  appearance.titleTextAttributes = [
  NSAttributedString.Key.foregroundColor: textPrimaryColor
  ]
 
  navigationBar.standardAppearance = appearance
- navigationBar.scrollEdgeAppearance = modernScrollEdgesAppearance ? nil : appearance
+ navigationBar.scrollEdgeAppearance = modernScrollEdgeAppearance ? nil : appearance
  } else {
  navigationBar.titleTextAttributes = [
  NSAttributedString.Key.foregroundColor: textPrimaryColor

Riot/Managers/Theme/Themes/DefaultTheme.swift

@@ -120,11 +120,11 @@ class DefaultTheme: NSObject, Theme {
 
  // Protocols don't support default parameter values and a protocol extension doesn't work for @objc
  func applyStyle(onNavigationBar navigationBar: UINavigationBar) {
- applyStyle(onNavigationBar: navigationBar, withModernScrollEdgesAppearance: false)
+ applyStyle(onNavigationBar: navigationBar, withModernScrollEdgeAppearance: false)
  }
 
  func applyStyle(onNavigationBar navigationBar: UINavigationBar,
- withModernScrollEdgesAppearance modernScrollEdgesAppearance: Bool) {
+ withModernScrollEdgeAppearance modernScrollEdgeAppearance: Bool) {
  navigationBar.tintColor = tintColor
 
  // On iOS 15 use UINavigationBarAppearance to fix visual issues with the scrollEdgeAppearance style.
@@ -133,15 +133,15 @@ class DefaultTheme: NSObject, Theme {
 
  appearance.configureWithOpaqueBackground()
  appearance.backgroundColor = baseColor
- if !modernScrollEdgesAppearance {
+ if !modernScrollEdgeAppearance {
  appearance.shadowColor = nil
  }
  appearance.titleTextAttributes = [
  NSAttributedString.Key.foregroundColor: textPrimaryColor
  ]
 
  navigationBar.standardAppearance = appearance
- navigationBar.scrollEdgeAppearance = modernScrollEdgesAppearance ? nil : appearance
+ navigationBar.scrollEdgeAppearance = modernScrollEdgeAppearance ? nil : appearance
  } else {
  navigationBar.titleTextAttributes = [
  NSAttributedString.Key.foregroundColor: textPrimaryColor

Riot/Modules/Authentication/AuthenticationViewController.m

@@ -211,7 +211,7 @@ - (void)viewDidLoad
 - (void)userInterfaceThemeDidChange
 {
  [ThemeService.shared.theme applyStyleOnNavigationBar:self.navigationController.navigationBar
- withModernScrollEdgesAppearance:YES];
+  withModernScrollEdgeAppearance:YES];
 
  self.view.backgroundColor = ThemeService.shared.theme.backgroundColor;
 

Riot/Modules/Common/SwiftUI/VectorHostingController.swift

@@ -32,7 +32,7 @@ class VectorHostingController: UIHostingController<AnyView> {
 
  // MARK: Public
 
- var enableNavigationBarScrollEdgesAppearance = false
+ var enableNavigationBarScrollEdgeAppearance = false
 
  init<Content>(rootView: Content) where Content: View {
  self.theme = ThemeService.shared().theme
@@ -93,7 +93,7 @@ class VectorHostingController: UIHostingController<AnyView> {
 
  private func update(theme: Theme) {
  if let navigationBar = self.navigationController?.navigationBar {
- theme.applyStyle(onNavigationBar: navigationBar, withModernScrollEdgesAppearance: enableNavigationBarScrollEdgesAppearance)
+ theme.applyStyle(onNavigationBar: navigationBar, withModernScrollEdgeAppearance: enableNavigationBarScrollEdgeAppearance)
  }
  }
 }

RiotSwiftUI/Modules/Onboarding/UseCase/Coordinator/OnboardingUseCaseSelectionCoordinator.swift

@@ -41,7 +41,7 @@ final class OnboardingUseCaseSelectionCoordinator: Coordinator, Presentable {
 
  let hostingController = VectorHostingController(rootView: view)
  hostingController.vc_removeBackTitle()
- hostingController.enableNavigationBarScrollEdgesAppearance = true
+ hostingController.enableNavigationBarScrollEdgeAppearance = true
  onboardingUseCaseHostingController = hostingController
  }
 

RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Coordinator/SpaceSettingsCoordinator.swift

@@ -53,7 +53,7 @@ final class SpaceSettingsCoordinator: Coordinator, Presentable {
  .addDependency(AvatarService.instantiate(mediaManager: parameters.session.mediaManager))
  spaceSettingsViewModel = viewModel
  let controller = VectorHostingController(rootView: view)
- controller.enableNavigationBarScrollEdgesAppearance = true
+ controller.enableNavigationBarScrollEdgeAppearance = true
  spaceSettingsHostingController = controller
  }
 

changelog.d/pr-5826.api

@@ -0,0 +1 @@
+ Rename scrollEdgesAppearance → scrollEdgeAppearance to match UIKit.