Update All chats screen with latest design #6407

- Update after code review
element-hq · Aug 1, 2022 · 6e93716 · 6e93716
1 parent cd68bae
commit 6e93716
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 19 deletions.
diff --git a/Riot/Managers/Theme/Themes/DarkTheme.swift b/Riot/Managers/Theme/Themes/DarkTheme.swift
@@ -146,15 +146,7 @@ class DarkTheme: NSObject, Theme {
 
  navigationBar.standardAppearance = appearance
 
- if BuildSettings.newAppLayoutEnabled {
- appearance.configureWithOpaqueBackground()
- appearance.backgroundColor = baseColor
- appearance.shadowColor = nil
- appearance.titleTextAttributes = [
- NSAttributedString.Key.foregroundColor: textPrimaryColor
- ]
- }
- navigationBar.scrollEdgeAppearance = modernScrollEdgeAppearance ? nil : appearance
+ navigationBar.scrollEdgeAppearance = modernScrollEdgeAppearance || BuildSettings.newAppLayoutEnabled ? nil : appearance
  } else {
  navigationBar.titleTextAttributes = [
  NSAttributedString.Key.foregroundColor: textPrimaryColor

diff --git a/Riot/Managers/Theme/Themes/DefaultTheme.swift b/Riot/Managers/Theme/Themes/DefaultTheme.swift
@@ -149,16 +149,7 @@ class DefaultTheme: NSObject, Theme {
  ]
 
  navigationBar.standardAppearance = appearance
-
- if BuildSettings.newAppLayoutEnabled {
- appearance.configureWithOpaqueBackground()
- appearance.backgroundColor = baseColor
- appearance.shadowColor = nil
- appearance.titleTextAttributes = [
- NSAttributedString.Key.foregroundColor: textPrimaryColor
- ]
- }
- navigationBar.scrollEdgeAppearance = modernScrollEdgeAppearance ? nil : appearance
+ navigationBar.scrollEdgeAppearance = modernScrollEdgeAppearance || BuildSettings.newAppLayoutEnabled ? nil : appearance
  } else {
  navigationBar.titleTextAttributes = [
  NSAttributedString.Key.foregroundColor: textPrimaryColor