Skip to content

Commit 7061859

Browse files
committed
Fix subscription picker colors on API 19
1 parent 4fdc5ea commit 7061859

2 files changed

Lines changed: 11 additions & 0 deletions

File tree

app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.schabi.newpipe.local.subscription.dialog
22

33
import android.app.Dialog
4+
import android.content.res.ColorStateList
45
import android.os.Bundle
56
import android.os.Parcelable
67
import android.view.LayoutInflater
@@ -12,6 +13,7 @@ import androidx.core.content.getSystemService
1213
import androidx.core.os.bundleOf
1314
import androidx.core.view.isGone
1415
import androidx.core.view.isVisible
16+
import androidx.core.widget.ImageViewCompat
1517
import androidx.core.widget.doOnTextChanged
1618
import androidx.fragment.app.DialogFragment
1719
import androidx.lifecycle.Observer
@@ -123,6 +125,14 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
123125
_feedGroupCreateBinding = DialogFeedGroupCreateBinding.bind(view)
124126
_searchLayoutBinding = feedGroupCreateBinding.subscriptionsHeaderSearchContainer
125127

128+
if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.LOLLIPOP) {
129+
// KitKat doesn't apply container's theme to <include> content
130+
val contrastColor = ColorStateList.valueOf(resources.getColor(R.color.contrastColor))
131+
searchLayoutBinding.toolbarSearchEditText.setTextColor(contrastColor)
132+
searchLayoutBinding.toolbarSearchEditText.setHintTextColor(contrastColor.withAlpha(128))
133+
ImageViewCompat.setImageTintList(searchLayoutBinding.toolbarSearchClearIcon, contrastColor)
134+
}
135+
126136
viewModel = ViewModelProvider(
127137
this,
128138
FeedGroupDialogViewModel.Factory(

app/src/main/res/layout/toolbar_search_layout.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
android:background="?attr/selectableItemBackgroundBorderless" />
4343

4444
<ImageView
45+
android:id="@+id/toolbar_search_clear_icon"
4546
android:layout_width="24dp"
4647
android:layout_height="24dp"
4748
android:layout_gravity="center"

0 commit comments

Comments
 (0)