Implement the new Space selector bottom sheet #6410

- Reverted some Theme tweaks to fix some UI regressions
element-hq · Aug 3, 2022 · 3e18325 · 3e18325
1 parent 3a0cb7d
commit 3e18325
Show file tree

Hide file tree

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