mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2024-12-23 16:40:32 +00:00
Code Issues Releases Wiki Activity

Fix Subscription Picker's Toolbar colors

Browse Source
This commit is contained in:
krlvm 2021-03-29 14:44:29 +03:00
parent 8002cc2771
commit a7d6ad5162
No known key found for this signature in database
GPG Key ID: B8552A91FD265536
7 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/res/layout/dialog_feed_group_create.xml
View File

@ -108,7 +108,8 @@
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/ContrastToolbarTheme">
<LinearLayout <LinearLayout
android:id="@+id/subscriptions_header_info_container" android:id="@+id/subscriptions_header_info_container"

2
app/src/main/res/layout/picker_subscription_item.xml
View File

@ -52,7 +52,7 @@
android:layout_gravity="top|center_horizontal" android:layout_gravity="top|center_horizontal"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:scaleType="centerInside" android:scaleType="centerInside"
android:tint="@color/white" app:tint="@color/white"
app:srcCompat="@drawable/ic_done" app:srcCompat="@drawable/ic_done"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
</FrameLayout> </FrameLayout>

5
app/src/main/res/layout/toolbar_search_layout.xml
View File

@ -18,12 +18,11 @@
android:focusable="true" android:focusable="true"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
android:hint="@string/search" android:hint="@string/search"
android:textColor="@color/white" android:textColor="?attr/toolbarSearchColor"
android:imeOptions="actionSearch|flagNoFullscreen" android:imeOptions="actionSearch|flagNoFullscreen"
android:inputType="textFilter|textNoSuggestions" android:inputType="textFilter|textNoSuggestions"
android:maxLines="1" android:maxLines="1"
android:nextFocusDown="@+id/suggestions_list" android:nextFocusDown="@+id/suggestions_list"
android:theme="@style/WhiteAccentTheme"
tools:ignore="RtlHardcoded" /> tools:ignore="RtlHardcoded" />
<FrameLayout <FrameLayout
@ -47,7 +46,7 @@
android:layout_gravity="center" android:layout_gravity="center"
android:contentDescription="@string/search" android:contentDescription="@string/search"
android:scaleType="fitCenter" android:scaleType="fitCenter"
app:tint="@color/white" app:tint="?attr/toolbarSearchColor"
app:srcCompat="@drawable/ic_close" app:srcCompat="@drawable/ic_close"
tools:ignore="RtlHardcoded" /> tools:ignore="RtlHardcoded" />
</FrameLayout> </FrameLayout>

1
app/src/main/res/menu/menu_feed_group_dialog.xml
View File

@ -7,6 +7,7 @@
android:id="@+id/action_search" android:id="@+id/action_search"
android:icon="@drawable/ic_search" android:icon="@drawable/ic_search"
android:title="@string/search" android:title="@string/search"
app:iconTint="@color/contrastColor"
app:showAsAction="always" app:showAsAction="always"
tools:ignore="AlwaysShowAction" /> tools:ignore="AlwaysShowAction" />

1
app/src/main/res/values/attrs.xml
View File

@ -15,6 +15,7 @@
<attr name="contrast_background_color" format="color" /> <attr name="contrast_background_color" format="color" />
<attr name="windowBackground" format="color" /> <attr name="windowBackground" format="color" />
<attr name="colorPrimary" 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_background_color" format="color" />
<attr name="card_item_contrast_color" format="color" /> <attr name="card_item_contrast_color" format="color" />

9
app/src/main/res/values/styles.xml
View File

@ -13,6 +13,7 @@
<!-- Base Theme --> <!-- Base Theme -->
<style name="Base.V19" parent="Theme.AppCompat.DayNight.NoActionBar"> <style name="Base.V19" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="toolbarSearchColor">@color/white</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item> <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
</style> </style>
<style name="Base" parent="Base.V19"/> <style name="Base" parent="Base.V19"/>
@ -170,12 +171,4 @@
<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>
<item name="tint">@color/white</item>
<item name="iconTint">@color/white</item>
</style>
</resources> </resources>

21
app/src/main/res/values/styles_misc.xml
View File

@ -62,6 +62,22 @@
<style name="DarkPopupMenu" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/> <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"> <style name="WhiteAccentTheme">
<item name="colorAccent">@color/white</item> <item name="colorAccent">@color/white</item>
</style> </style>
@ -79,4 +95,9 @@
<item name="iconTint">@color/contrastColor</item> <item name="iconTint">@color/contrastColor</item>
</style> </style>
<style name="SearchToolbarTheme">
<item name="colorAccent">@color/white</item>
</style>
</resources> </resources>