mirror of
https://gitlab.com/ultrasonic/ultrasonic.git
synced 2025-04-26 13:42:15 +03:00
Merge branch 'highlightColor2' into 'develop'
Make track view transparent by default See merge request ultrasonic/ultrasonic!1046
This commit is contained in:
commit
ab50be3784
@ -1,5 +1,6 @@
|
|||||||
package org.moire.ultrasonic.adapters
|
package org.moire.ultrasonic.adapters
|
||||||
|
|
||||||
|
import android.graphics.Color
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.widget.Checkable
|
import android.widget.Checkable
|
||||||
import android.widget.CheckedTextView
|
import android.widget.CheckedTextView
|
||||||
@ -45,7 +46,6 @@ class TrackViewHolder(val view: View) :
|
|||||||
CoroutineScope by CoroutineScope(Dispatchers.IO) {
|
CoroutineScope by CoroutineScope(Dispatchers.IO) {
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
val COLOR_NORMAL = com.google.android.material.R.attr.colorSurface
|
|
||||||
val COLOR_HIGHLIGHT = com.google.android.material.R.attr.colorSecondaryContainer
|
val COLOR_HIGHLIGHT = com.google.android.material.R.attr.colorSecondaryContainer
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -186,8 +186,7 @@ class TrackViewHolder(val view: View) :
|
|||||||
title.setCompoundDrawablesWithIntrinsicBounds(
|
title.setCompoundDrawablesWithIntrinsicBounds(
|
||||||
0, 0, 0, 0
|
0, 0, 0, 0
|
||||||
)
|
)
|
||||||
val color = MaterialColors.getColor(view, COLOR_NORMAL)
|
songLayout.setBackgroundColor(Color.TRANSPARENT)
|
||||||
songLayout.setBackgroundColor(color)
|
|
||||||
songLayout.elevation = 0F
|
songLayout.elevation = 0F
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,7 +5,6 @@
|
|||||||
a:id="@+id/song_layout"
|
a:id="@+id/song_layout"
|
||||||
a:layout_width="fill_parent"
|
a:layout_width="fill_parent"
|
||||||
a:layout_height="?android:attr/listPreferredItemHeight"
|
a:layout_height="?android:attr/listPreferredItemHeight"
|
||||||
a:background="?attr/colorSurface"
|
|
||||||
a:minHeight="?android:attr/listPreferredItemHeight"
|
a:minHeight="?android:attr/listPreferredItemHeight"
|
||||||
a:orientation="horizontal">
|
a:orientation="horizontal">
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user