Merge pull request #6456 from TeamNewPipe/feature/switch-theme

Apply theme to switches
This commit is contained in:
Stypox 2021-07-18 13:12:47 +02:00 committed by GitHub
commit 6c25ce56a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 14 deletions

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/channel_header_layout" android:id="@+id/channel_header_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -8,25 +8,28 @@
<TextView <TextView
android:id="@+id/next_stream_title" android:id="@+id/next_stream_title"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/autoplay_switch" android:layout_marginStart="16dp"
android:layout_marginLeft="12dp" android:layout_marginEnd="16dp"
android:text="@string/exo_controls_next_description" android:text="@string/exo_controls_next_description"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="12sp" android:textSize="13sp"
tools:ignore="RtlHardcoded" /> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/autoplay_switch"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Switch <androidx.appcompat.widget.SwitchCompat
android:id="@+id/autoplay_switch" android:id="@+id/autoplay_switch"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_marginEnd="16dp"
android:layout_alignParentEnd="true"
android:paddingRight="5dp"
android:switchPadding="5dp"
android:text="@string/auto_queue_toggle" android:text="@string/auto_queue_toggle"
android:textColor="@android:color/tab_indicator_text" android:textColor="@android:color/tab_indicator_text"
android:textSize="12sp" /> android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</RelativeLayout> </androidx.constraintlayout.widget.ConstraintLayout>

View File

@ -70,4 +70,23 @@
<item name="colorAccent">@color/dark_media_ccc_accent_color</item> <item name="colorAccent">@color/dark_media_ccc_accent_color</item>
</style> </style>
<!-- Bandcamp -->
<style name="LightTheme.Bandcamp" parent="LightTheme">
<item name="colorPrimary">@color/light_bandcamp_primary_color</item>
<item name="colorPrimaryDark">@color/light_bandcamp_statusbar_color</item>
<item name="colorAccent">@color/light_bandcamp_accent_color</item>
</style>
<style name="DarkTheme.Bandcamp" parent="DarkTheme">
<item name="colorPrimary">@color/dark_bandcamp_primary_color</item>
<item name="colorPrimaryDark">@color/dark_bandcamp_statusbar_color</item>
<item name="colorAccent">@color/dark_bandcamp_accent_color</item>
</style>
<style name="BlackTheme.Bandcamp" parent="BlackTheme">
<item name="colorPrimary">@color/dark_bandcamp_primary_color</item>
<item name="colorPrimaryDark">@color/dark_bandcamp_statusbar_color</item>
<item name="colorAccent">@color/dark_bandcamp_accent_color</item>
</style>
</resources> </resources>

View File

@ -17,6 +17,7 @@
<item name="floatingActionButtonStyle">@style/FloatingActionButtonTheme</item> <item name="floatingActionButtonStyle">@style/FloatingActionButtonTheme</item>
<item name="toolbarSearchColor">@color/white</item> <item name="toolbarSearchColor">@color/white</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item> <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="colorControlActivated">?attr/colorPrimary</item>
</style> </style>
<style name="Base" parent="Base.V19"/> <style name="Base" parent="Base.V19"/>