diff --git a/app/src/main/java/com/github/libretube/ui/adapters/SubscriptionChannelAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/SubscriptionChannelAdapter.kt index 2fe7277f7..feb47d1a0 100644 --- a/app/src/main/java/com/github/libretube/ui/adapters/SubscriptionChannelAdapter.kt +++ b/app/src/main/java/com/github/libretube/ui/adapters/SubscriptionChannelAdapter.kt @@ -1,6 +1,7 @@ package com.github.libretube.ui.adapters import android.view.LayoutInflater +import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.github.libretube.R @@ -30,7 +31,7 @@ class SubscriptionChannelAdapter( override fun onBindViewHolder(holder: SubscriptionChannelViewHolder, position: Int) { val subscription = subscriptions[position] - var subscribed = true + var isSubscribed = true holder.binding.apply { subscriptionChannelName.text = subscription.name @@ -43,15 +44,17 @@ class SubscriptionChannelAdapter( } subscriptionSubscribe.setOnClickListener { val channelId = subscription.url!!.toID() - if (subscribed) { + if (isSubscribed) { SubscriptionHelper.handleUnsubscribe(root.context, channelId, subscription.name ?: "") { subscriptionSubscribe.text = root.context.getString(R.string.subscribe) - subscribed = false + notificationBell.visibility = View.GONE + isSubscribed = false } } else { SubscriptionHelper.subscribe(channelId) subscriptionSubscribe.text = root.context.getString(R.string.unsubscribe) - subscribed = true + notificationBell.visibility = View.VISIBLE + isSubscribed = true } } } diff --git a/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt index f3ea8b1ca..0cc63d135 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt @@ -130,17 +130,20 @@ class ChannelFragment : BaseFragment() { } channelId?.let { binding.notificationBell.setupNotificationBell(it) } + if (isSubscribed == false) binding.notificationBell.visibility = View.GONE binding.channelSubscribe.setOnClickListener { if (isSubscribed == true) { SubscriptionHelper.handleUnsubscribe(requireContext(), channelId!!, channelName) { isSubscribed = false binding.channelSubscribe.text = getString(R.string.subscribe) + binding.notificationBell.visibility = View.GONE } } else { SubscriptionHelper.subscribe(channelId!!) isSubscribed = true binding.channelSubscribe.text = getString(R.string.unsubscribe) + binding.notificationBell.visibility = View.VISIBLE } } diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml index afbb9e879..25f028b28 100644 --- a/app/src/main/res/layout/fragment_channel.xml +++ b/app/src/main/res/layout/fragment_channel.xml @@ -63,14 +63,15 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="start" + android:maxLines="1" android:text="@string/app_name" android:textSize="12sp" />