diff --git a/app/src/main/java/com/futo/platformplayer/views/adapters/viewholders/SubscriptionGroupBarViewHolder.kt b/app/src/main/java/com/futo/platformplayer/views/adapters/viewholders/SubscriptionGroupBarViewHolder.kt index 0f93a5eb..dac711c9 100644 --- a/app/src/main/java/com/futo/platformplayer/views/adapters/viewholders/SubscriptionGroupBarViewHolder.kt +++ b/app/src/main/java/com/futo/platformplayer/views/adapters/viewholders/SubscriptionGroupBarViewHolder.kt @@ -3,45 +3,31 @@ package com.futo.platformplayer.views.adapters.viewholders import android.graphics.Color import android.view.LayoutInflater import android.view.ViewGroup -import android.widget.LinearLayout +import android.widget.FrameLayout import android.widget.TextView import com.futo.platformplayer.R -import com.futo.platformplayer.api.media.PlatformID -import com.futo.platformplayer.api.media.models.channels.IPlatformChannel import com.futo.platformplayer.constructs.Event1 -import com.futo.platformplayer.constructs.TaskHandler -import com.futo.platformplayer.dp -import com.futo.platformplayer.logging.Logger import com.futo.platformplayer.models.SubscriptionGroup -import com.futo.platformplayer.polycentric.PolycentricCache -import com.futo.platformplayer.selectBestImage -import com.futo.platformplayer.states.StateApp import com.futo.platformplayer.views.adapters.AnyAdapter -import com.futo.platformplayer.views.others.CreatorThumbnail -import com.futo.polycentric.core.toURLInfoSystemLinkUrl import com.google.android.material.imageview.ShapeableImageView -import com.google.android.material.shape.CornerFamily -import com.google.android.material.shape.ShapeAppearanceModel class SubscriptionGroupBarViewHolder(private val _viewGroup: ViewGroup) : AnyAdapter.AnyViewHolder( LayoutInflater.from(_viewGroup.context).inflate(R.layout.view_subscription_group_bar, _viewGroup, false)) { private var _group: SubscriptionGroup? = null; + private val _root: FrameLayout; private val _image: ShapeableImageView; private val _textSubGroup: TextView; + val onClick = Event1(); val onClickLong = Event1(); init { + _root = _view.findViewById(R.id.root); _image = _view.findViewById(R.id.image); _textSubGroup = _view.findViewById(R.id.text_sub_group); - val dp6 = 6.dp(_view.resources); - _image.shapeAppearanceModel = ShapeAppearanceModel.builder() - .setAllCorners(CornerFamily.ROUNDED, dp6.toFloat()) - .build() - _view.setOnClickListener { _group?.let { onClick.emit(it); @@ -58,9 +44,9 @@ class SubscriptionGroupBarViewHolder(private val _viewGroup: ViewGroup) : AnyAda override fun bind(value: SubscriptionGroup) { _group = value; val img = value.image; - if(img != null) + if(img != null) { img.setImageView(_image) - else { + } else { _image.setImageResource(0); if(value is SubscriptionGroup.Add) @@ -68,10 +54,11 @@ class SubscriptionGroupBarViewHolder(private val _viewGroup: ViewGroup) : AnyAda } _textSubGroup.text = value.name; - if(value is SubscriptionGroup.Selectable && value.selected) - _view.setBackgroundColor(_view.context.resources.getColor(R.color.colorPrimary, null)); - else - _view.setBackgroundColor(_view.context.resources.getColor(R.color.transparent, null)); + if (value is SubscriptionGroup.Selectable && value.selected) { + _root.setBackgroundResource(R.drawable.background_primary_round_6dp) + } else { + _root.background = null + } } companion object { diff --git a/app/src/main/res/drawable/background_dark_round_6dp.xml b/app/src/main/res/drawable/background_dark_round_6dp.xml new file mode 100644 index 00000000..2492f5d0 --- /dev/null +++ b/app/src/main/res/drawable/background_dark_round_6dp.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_primary_round_6dp.xml b/app/src/main/res/drawable/background_primary_round_6dp.xml new file mode 100644 index 00000000..461ba0b2 --- /dev/null +++ b/app/src/main/res/drawable/background_primary_round_6dp.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/view_subscription_group_bar.xml b/app/src/main/res/layout/view_subscription_group_bar.xml index 8dc1f27a..8b8bccf8 100644 --- a/app/src/main/res/layout/view_subscription_group_bar.xml +++ b/app/src/main/res/layout/view_subscription_group_bar.xml @@ -1,36 +1,38 @@ - + android:id="@+id/root" + android:background="@drawable/background_primary_round_6dp"> - + - - - - + android:background="@drawable/background_dark_round_6dp" + android:gravity="center" + android:layout_margin="2dp" /> + + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index d6dd1850..00896559 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -11,6 +11,10 @@ rounded 4dp +