mirror of
https://github.com/TeamNewPipe/NewPipe
synced 2024-12-23 08:30:44 +00:00
Fix Subscription Picker's Toolbar colors
This commit is contained in:
parent
8002cc2771
commit
a7d6ad5162
@ -108,7 +108,8 @@
|
||||
android:id="@+id/subscriptions_header_toolbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?attr/actionBarSize"
|
||||
android:gravity="center_vertical">
|
||||
android:gravity="center_vertical"
|
||||
android:theme="@style/ContrastToolbarTheme">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/subscriptions_header_info_container"
|
||||
|
@ -52,7 +52,7 @@
|
||||
android:layout_gravity="top|center_horizontal"
|
||||
android:layout_marginTop="4dp"
|
||||
android:scaleType="centerInside"
|
||||
android:tint="@color/white"
|
||||
app:tint="@color/white"
|
||||
app:srcCompat="@drawable/ic_done"
|
||||
tools:ignore="ContentDescription" />
|
||||
</FrameLayout>
|
||||
|
@ -18,12 +18,11 @@
|
||||
android:focusable="true"
|
||||
android:focusableInTouchMode="true"
|
||||
android:hint="@string/search"
|
||||
android:textColor="@color/white"
|
||||
android:textColor="?attr/toolbarSearchColor"
|
||||
android:imeOptions="actionSearch|flagNoFullscreen"
|
||||
android:inputType="textFilter|textNoSuggestions"
|
||||
android:maxLines="1"
|
||||
android:nextFocusDown="@+id/suggestions_list"
|
||||
android:theme="@style/WhiteAccentTheme"
|
||||
tools:ignore="RtlHardcoded" />
|
||||
|
||||
<FrameLayout
|
||||
@ -47,7 +46,7 @@
|
||||
android:layout_gravity="center"
|
||||
android:contentDescription="@string/search"
|
||||
android:scaleType="fitCenter"
|
||||
app:tint="@color/white"
|
||||
app:tint="?attr/toolbarSearchColor"
|
||||
app:srcCompat="@drawable/ic_close"
|
||||
tools:ignore="RtlHardcoded" />
|
||||
</FrameLayout>
|
||||
|
@ -7,6 +7,7 @@
|
||||
android:id="@+id/action_search"
|
||||
android:icon="@drawable/ic_search"
|
||||
android:title="@string/search"
|
||||
app:iconTint="@color/contrastColor"
|
||||
app:showAsAction="always"
|
||||
tools:ignore="AlwaysShowAction" />
|
||||
|
||||
|
@ -15,6 +15,7 @@
|
||||
<attr name="contrast_background_color" format="color" />
|
||||
<attr name="windowBackground" format="color" />
|
||||
<attr name="colorPrimary" format="color" />
|
||||
<attr name="toolbarSearchColor" format="reference|color" />
|
||||
|
||||
<attr name="card_item_background_color" format="color" />
|
||||
<attr name="card_item_contrast_color" format="color" />
|
||||
|
@ -13,6 +13,7 @@
|
||||
|
||||
<!-- Base Theme -->
|
||||
<style name="Base.V19" parent="Theme.AppCompat.DayNight.NoActionBar">
|
||||
<item name="toolbarSearchColor">@color/white</item>
|
||||
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
|
||||
</style>
|
||||
<style name="Base" parent="Base.V19"/>
|
||||
@ -170,12 +171,4 @@
|
||||
<item name="android:windowAnimationStyle">@null</item>
|
||||
</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>
|
||||
<item name="tint">@color/white</item>
|
||||
<item name="iconTint">@color/white</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
@ -62,6 +62,22 @@
|
||||
|
||||
<style name="DarkPopupMenu" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
|
||||
|
||||
<style name="ToolbarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
|
||||
<item name="popupTheme">@style/ThemeOverlay.AppCompat.DayNight.ActionBar</item>
|
||||
<item name="android:textColorPrimary">@android:color/white</item>
|
||||
<item name="android:textColorSecondary">@android:color/white</item>
|
||||
<item name="tint">@color/white</item>
|
||||
<item name="iconTint">@color/white</item>
|
||||
</style>
|
||||
<style name="ContrastToolbarTheme" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
|
||||
<item name="popupTheme">@style/ThemeOverlay.AppCompat.DayNight.ActionBar</item>
|
||||
<item name="android:textColorPrimary">@color/contrastColor</item>
|
||||
<item name="android:textColorSecondary">@color/contrastColor</item>
|
||||
<item name="tint">@color/contrastColor</item>
|
||||
<item name="iconTint">@color/contrastColor</item>
|
||||
<item name="toolbarSearchColor">@color/contrastColor</item>
|
||||
</style>
|
||||
|
||||
<style name="WhiteAccentTheme">
|
||||
<item name="colorAccent">@color/white</item>
|
||||
</style>
|
||||
@ -79,4 +95,9 @@
|
||||
<item name="iconTint">@color/contrastColor</item>
|
||||
</style>
|
||||
|
||||
|
||||
<style name="SearchToolbarTheme">
|
||||
<item name="colorAccent">@color/white</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
Loading…
Reference in New Issue
Block a user