diff --git a/app/build.gradle b/app/build.gradle index 9b165031..48995fee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,7 +35,7 @@ android { applicationId "kr.co.vividnext.sodalive" minSdk 23 targetSdk 34 - versionCode 178 + versionCode 179 versionName "1.40.0" } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/home/CreatorRankingAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/home/CreatorRankingAdapter.kt index a2b87c2f..016ac094 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/home/CreatorRankingAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/home/CreatorRankingAdapter.kt @@ -5,11 +5,13 @@ import android.content.Context import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.core.graphics.toColorInt import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide import com.bumptech.glide.load.resource.bitmap.CircleCrop import com.bumptech.glide.request.RequestOptions import kr.co.vividnext.sodalive.R +import kr.co.vividnext.sodalive.common.SharedPreferenceManager import kr.co.vividnext.sodalive.databinding.ItemHomeCreatorBinding import kr.co.vividnext.sodalive.explorer.GetExplorerSectionCreatorResponse @@ -60,13 +62,20 @@ class CreatorRankingAdapter( if (item.follow) { binding.tvFollow.text = "팔로잉" + binding.tvFollow.setBackgroundResource(R.drawable.bg_round_corner_999_455a64) + binding.tvFollow.setTextColor(context.getColor(R.color.white)) + } else { binding.tvFollow.text = "팔로우" + binding.tvFollow.setBackgroundResource(R.drawable.bg_round_corner_999_white) + binding.tvFollow.setTextColor("#263238".toColorInt()) } binding.tvFollow.setOnClickListener { - item.follow = !item.follow - notifyItemChanged(index) + if (SharedPreferenceManager.token.isNotBlank()) { + item.follow = !item.follow + notifyItemChanged(index) + } onClickFollow(item.id, item.follow) } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt index e3fad980..d5e1ce18 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt @@ -407,7 +407,14 @@ class LiveFragment : BaseFragment(FragmentLiveBinding::infl recyclerView.adapter = adapter viewModel.latestFinishedLiveListLiveData.observe(viewLifecycleOwner) { - adapter.addItems(it) + if (it.isNotEmpty()) { + adapter.addItems(it) + binding.llLatestFinishedLiveChannel.visibility = View.VISIBLE + binding.rvLatestFinishedLiveChannel.visibility = View.VISIBLE + } else { + binding.llLatestFinishedLiveChannel.visibility = View.GONE + binding.rvLatestFinishedLiveChannel.visibility = View.GONE + } } } diff --git a/app/src/main/res/drawable/bg_round_corner_999_455a64.xml b/app/src/main/res/drawable/bg_round_corner_999_455a64.xml new file mode 100644 index 00000000..5b65758d --- /dev/null +++ b/app/src/main/res/drawable/bg_round_corner_999_455a64.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/layout/fragment_live.xml b/app/src/main/res/layout/fragment_live.xml index 79f0c802..7a143be1 100644 --- a/app/src/main/res/layout/fragment_live.xml +++ b/app/src/main/res/layout/fragment_live.xml @@ -80,7 +80,8 @@ layout="@layout/layout_live_recommend_channel" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="48dp" /> + android:layout_marginBottom="48dp" + android:visibility="gone" /> + android:textSize="24sp" + android:visibility="gone" /> + android:orientation="horizontal" + android:visibility="gone"> + android:paddingHorizontal="24dp" + android:visibility="gone" />