diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/MaterialMenuSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/MaterialMenuSheet.kt index 109ac4cbd5..ac11b91def 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/MaterialMenuSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/MaterialMenuSheet.kt @@ -12,6 +12,7 @@ import android.widget.ImageView import android.widget.TextView import androidx.annotation.DrawableRes import androidx.annotation.StringRes +import androidx.core.widget.TextViewCompat import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.textview.MaterialTextView @@ -88,8 +89,10 @@ open class MaterialMenuSheet( if (item.id == selectedId) { currentIndex = index setTextColor(context.getResourceColor(R.attr.colorAccent)) - compoundDrawableTintList = + TextViewCompat.setCompoundDrawableTintList( + this, ColorStateList.valueOf(context.getResourceColor(R.attr.colorAccent)) + ) } updateLayoutParams { height = 48.dpToPx @@ -143,7 +146,10 @@ open class MaterialMenuSheet( val textView = (binding.menuLayout.getChildAt(it) as ViewGroup).getChildAt(0) as TextView val imageView = (binding.menuLayout.getChildAt(it) as ViewGroup).getChildAt(1) as ImageView textView.setTextColor(primaryColor) - textView.compoundDrawableTintList = ColorStateList.valueOf(primaryColor) + TextViewCompat.setCompoundDrawableTintList( + textView, + ColorStateList.valueOf(primaryColor) + ) imageView.invisible() } } @@ -155,9 +161,13 @@ open class MaterialMenuSheet( val layout = binding.menuLayout.findViewById(id) ?: return val textView = layout.getChildAt(0) as? TextView val imageView = layout.getChildAt(1) as? ImageView - textView?.setTextColor(context.getResourceColor(R.attr.colorAccent)) - textView?.compoundDrawableTintList = - ColorStateList.valueOf(context.getResourceColor(R.attr.colorAccent)) + textView?.setTextColor(textView.context.getResourceColor(R.attr.colorAccent)) + textView?.let { + TextViewCompat.setCompoundDrawableTintList( + it, + ColorStateList.valueOf(it.context.getResourceColor(R.attr.colorAccent)) + ) + } imageView?.visible() imageView?.setImageResource(drawableRes) } diff --git a/app/src/main/res/color/unread_badge.xml b/app/src/main/res/color/unread_badge.xml new file mode 100644 index 0000000000..aca8280bd1 --- /dev/null +++ b/app/src/main/res/color/unread_badge.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/reader_nav.xml b/app/src/main/res/layout/reader_nav.xml index 103d73c781..8cbffd162c 100644 --- a/app/src/main/res/layout/reader_nav.xml +++ b/app/src/main/res/layout/reader_nav.xml @@ -58,7 +58,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:progressBackgroundTint="?actionBarTintColor" + android:progressBackgroundTint="@color/tint_color_secondary" android:maxHeight="?attr/actionBarSize" android:minHeight="?attr/actionBarSize" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9e6507afdb..fa2a9946e5 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -15,7 +15,6 @@ @color/text_color_hint - @color/colorAccent @color/md_white_1000 @color/pale_green @color/md_black_1000