Fix Dark toolbar text in Light theme
This commit is contained in:
parent
610d0b272e
commit
1d51002173
4 changed files with 15 additions and 17 deletions
|
@ -11,10 +11,7 @@
|
||||||
android:layout_height="?attr/actionBarSize"
|
android:layout_height="?attr/actionBarSize"
|
||||||
android:background="?attr/colorPrimary"
|
android:background="?attr/colorPrimary"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:minHeight="?attr/actionBarSize"
|
android:minHeight="?attr/actionBarSize" />
|
||||||
android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
|
|
||||||
app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
|
|
||||||
app:titleTextAppearance="@style/Toolbar.Title" />
|
|
||||||
|
|
||||||
<WebView
|
<WebView
|
||||||
android:id="@+id/reCaptchaWebView"
|
android:id="@+id/reCaptchaWebView"
|
||||||
|
|
|
@ -108,10 +108,7 @@
|
||||||
android:id="@+id/subscriptions_header_toolbar"
|
android:id="@+id/subscriptions_header_toolbar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="?attr/actionBarSize"
|
android:layout_height="?attr/actionBarSize"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical">
|
||||||
android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
|
|
||||||
app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
|
|
||||||
app:titleTextAppearance="@style/Toolbar.Title">
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/subscriptions_header_info_container"
|
android:id="@+id/subscriptions_header_info_container"
|
||||||
|
|
|
@ -14,9 +14,7 @@
|
||||||
android:background="?attr/colorPrimary"
|
android:background="?attr/colorPrimary"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:minHeight="?attr/actionBarSize"
|
android:minHeight="?attr/actionBarSize"
|
||||||
android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
|
android:theme="@style/ToolbarTheme">
|
||||||
app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
|
|
||||||
app:titleTextAppearance="@style/Toolbar.Title">
|
|
||||||
|
|
||||||
<include
|
<include
|
||||||
android:id="@+id/toolbar_search_container"
|
android:id="@+id/toolbar_search_container"
|
||||||
|
|
|
@ -9,7 +9,11 @@
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<!-- Base themes -->
|
<!-- Base themes -->
|
||||||
<style name="Base.V7.LightTheme" parent="Theme.AppCompat.DayNight.NoActionBar" />
|
<style name="Base.V7" parent="Theme.AppCompat.DayNight.NoActionBar"/>
|
||||||
|
|
||||||
|
<style name="Base" parent="Base.V7"/>
|
||||||
|
|
||||||
|
<style name="Base.V7.LightTheme" parent="Base" />
|
||||||
|
|
||||||
<style name="Base.LightTheme" parent="Base.V7.LightTheme" />
|
<style name="Base.LightTheme" parent="Base.V7.LightTheme" />
|
||||||
|
|
||||||
|
@ -119,7 +123,7 @@
|
||||||
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
|
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Base.V7.DarkTheme" parent="Theme.AppCompat.DayNight.NoActionBar" />
|
<style name="Base.V7.DarkTheme" parent="Base" />
|
||||||
|
|
||||||
<style name="Base.DarkTheme" parent="Base.V7.DarkTheme" />
|
<style name="Base.DarkTheme" parent="Base.V7.DarkTheme" />
|
||||||
|
|
||||||
|
@ -292,10 +296,6 @@
|
||||||
<item name="colorAccent">@color/black_settings_accent_color</item>
|
<item name="colorAccent">@color/black_settings_accent_color</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Toolbar.Title" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
|
|
||||||
<item name="android:textSize">18sp</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style name="OldVideoPlayerTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
|
<style name="OldVideoPlayerTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
|
||||||
<item name="colorPrimary">@color/light_youtube_primary_color</item>
|
<item name="colorPrimary">@color/light_youtube_primary_color</item>
|
||||||
<item name="colorPrimaryDark">@color/light_youtube_primary_color</item>
|
<item name="colorPrimaryDark">@color/light_youtube_primary_color</item>
|
||||||
|
@ -339,4 +339,10 @@
|
||||||
<item name="android:windowAnimationStyle">@null</item>
|
<item name="android:windowAnimationStyle">@null</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<style name="ToolbarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
|
||||||
|
<item name="android:textColorPrimary">@android:color/white</item>
|
||||||
|
<item name="android:textColorSecondary">@android:color/white</item>
|
||||||
|
<item name="popupTheme">@style/ThemeOverlay.AppCompat.DayNight.ActionBar</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
Loading…
Reference in a new issue