Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59ad1360 authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-22.2' into a15

parents 3154fb13 db31b2c1
Loading
Loading
Loading
Loading
Loading
+0 −15
Original line number Diff line number Diff line
@@ -34,21 +34,6 @@ data class Lyrics(

        private val lines = mutableListOf<TempLine>()

        /**
         * Add a new line.
         *
         * @param line The [Line]
         */
        fun addLine(line: Line) = apply {
            lines.add(
                TempLine(
                    text = line.text,
                    startMs = line.durationMs?.first,
                    endMs = line.durationMs?.last,
                )
            )
        }

        /**
         * Add a new line. If necessary, end instant will be calculated from the other lines.
         *
+2 −0
Original line number Diff line number Diff line
@@ -44,9 +44,11 @@ class SortingChip @JvmOverloads constructor(

    init {
        setChipBackgroundColorResource(R.color.e_floating_background_variant)
        val chipContentColor = context.getColor(R.color.e_primary_text_color)
        chipStrokeWidth = 0f

        setText(R.string.sort_by_unknown)
        setTextColor(chipContentColor)

        setCloseIcon(R.drawable.ic_arrow_drop_down)