diff --git a/Riot/Constants/RiotDesignValues.h b/Riot/Constants/RiotDesignValues.h index f1887a86c..a04497567 100644 --- a/Riot/Constants/RiotDesignValues.h +++ b/Riot/Constants/RiotDesignValues.h @@ -62,7 +62,6 @@ extern UIStatusBarStyle kRiotDesignStatusBarStyle; extern UIColor *kRiotDesignNavigationBarTintColor; extern UIColor *kRiotDesignNavigationBarBarTintColor; extern NSDictionary *kRiotDesignNavigationBarTitleTextAttributes; -extern BOOL kRiotDesignNavigationBarTranslucent; extern UIBarStyle kRiotDesignSearchBarStyle; extern UIColor *kRiotDesignSearchBarTintColor; diff --git a/Riot/Constants/RiotDesignValues.m b/Riot/Constants/RiotDesignValues.m index 5b18e38cf..8286018df 100644 --- a/Riot/Constants/RiotDesignValues.m +++ b/Riot/Constants/RiotDesignValues.m @@ -54,7 +54,6 @@ UIStatusBarStyle kRiotDesignStatusBarStyle = UIStatusBarStyleDefault; UIColor *kRiotDesignNavigationBarTintColor; UIColor *kRiotDesignNavigationBarBarTintColor; NSDictionary *kRiotDesignNavigationBarTitleTextAttributes; -BOOL kRiotDesignNavigationBarTranslucent = YES; UIBarStyle kRiotDesignSearchBarStyle = UIBarStyleDefault; UIColor *kRiotDesignSearchBarTintColor = nil; @@ -164,7 +163,6 @@ UIKeyboardAppearance kRiotKeyboard; kRiotSelectedBgColor = nil; // Use the default selection color. kRiotDesignStatusBarStyle = UIStatusBarStyleLightContent; - kRiotDesignNavigationBarTranslucent = NO; kRiotDesignSearchBarStyle = UIBarStyleDefault; @@ -235,7 +233,9 @@ UIKeyboardAppearance kRiotKeyboard; navigationBar.tintColor = kRiotDesignNavigationBarTintColor; navigationBar.titleTextAttributes = kRiotDesignNavigationBarTitleTextAttributes; navigationBar.barTintColor = kRiotDesignNavigationBarBarTintColor; - navigationBar.translucent = kRiotDesignNavigationBarTranslucent; + + // The navigation bar needs to be opaque so that its background color is the expected one + navigationBar.translucent = NO; } + (void)applyStyleOnSearchBar:(UISearchBar *)searchBar diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m index db00913df..0b6fba85c 100644 --- a/Riot/Modules/Room/RoomViewController.m +++ b/Riot/Modules/Room/RoomViewController.m @@ -1483,6 +1483,12 @@ - (void)showExpandedHeader:(BOOL)isVisible { + // Use a transparent navigation bar when displaying the expanded header + // Retrieve the main navigation controller if the current view controller + // is embedded inside a split view controlle + self.navigationController.navigationBar.translucent = isVisible; + self.mxk_mainNavigationController.navigationBar.translucent = isVisible; + if (self.expandedHeaderContainer.isHidden == isVisible) { // Check conditions before making the expanded room header visible.