Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Android/MainActivity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ private void AppearanceAdjustments()
var decorView = Window.DecorView;
var flags = (StatusBarVisibility)decorView.SystemUiVisibility;

if (theme == "cozy" || theme == null)
if (theme == "cozy" || (theme == null && !ThemeManager.OsDarkModeEnabled()))
{
// Add the LIGHT_STATUS_BAR flag for dark icons
flags |= (StatusBarVisibility)SystemUiFlags.LightStatusBar;
Expand Down
1 change: 1 addition & 0 deletions src/Android/Resources/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
<item name="colorPrimaryDark">@color/cozy_notificationBar</item>
<item name="colorAccent">@color/cozy_primary</item>
<item name="colorControlNormal">#95999D</item>
<item name="android:textColorPrimary">#95999D</item>
<item name="android:navigationBarColor">@android:color/black</item>
<item name="windowActionModeOverlay">true</item>
<item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item>
Expand Down
8 changes: 6 additions & 2 deletions src/App/Pages/Vault/CiphersPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,17 @@
Text="&#xe5c4;"
VerticalOptions="CenterAndExpand"
Clicked="BackButton_Clicked"
x:Name="_backButton" />
x:Name="_backButton"
TextColor="{DynamicResource MutedColor}" />
<controls:ExtendedSearchBar
x:Name="_searchBar"
HorizontalOptions="FillAndExpand"
TextChanged="SearchBar_TextChanged"
SearchButtonPressed="SearchBar_SearchButtonPressed"
Placeholder="{Binding PageTitle}" />
Placeholder="{Binding PageTitle}"
PlaceholderColor="{DynamicResource MutedColor}"
TextColor="{DynamicResource MutedColor}"
CancelButtonColor="{DynamicResource MutedColor}" />
</StackLayout>
<BoxView StyleClass="list-section-separator-bottom, list-section-separator-bottom-platform"
x:Name="_separator" x:Key="separator" />
Expand Down
4 changes: 2 additions & 2 deletions src/App/Styles/Cozy.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<Color x:Key="SwitchOnColor">#0A84FF</Color>
<Color x:Key="SwitchThumbColor">#ECECEC</Color>

<Color x:Key="StepperBackgroundColor">#5A595B</Color>
<Color x:Key="StepperForegroundColor">#ffffff</Color>
<Color x:Key="StepperBackgroundColor">#ffffff</Color>
<Color x:Key="StepperForegroundColor">#424244</Color>

<Color x:Key="ButtonPrimaryBackgroundColor">#0A84FF</Color>
<Color x:Key="ButtonPrimaryBackgroundColorPressed">#0F5CC7</Color>
Expand Down
2 changes: 1 addition & 1 deletion src/iOS.Core/Utilities/iOSCoreHelpers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public static void AppearanceAdjustments()
var theme = ThemeManager.GetTheme(false);
ThemeHelpers.SetAppearance(theme, ThemeManager.OsDarkModeEnabled());
UIApplication.SharedApplication.StatusBarHidden = false;
if (theme == null || theme == "cozy")
if (theme == "cozy" || (theme == null && !ThemeManager.OsDarkModeEnabled()))
{
UIApplication.SharedApplication.StatusBarStyle = UIStatusBarStyle.DarkContent;
}
Expand Down