add channel

README.md

@@ -14,16 +14,20 @@
 
 ## 更新日志
 
+### v1.4.9（高版本专用）
+
+* 同步v1.4.8
+
 ### v1.4.8（通用版）
 
-* 频道号从1开始，cctv5+为18
+* 频道号从1开始，CCTV5+为18
-* 提高cctv6清晰度
+* 提高CCTV6清晰度
 * 增加天津卫视、新疆卫视
 
 ### v1.4.7（高版本专用）
 
-* 修复部分用户cctv13播放过程中卡住的问题
+* 修复部分用户CCTV13播放过程中卡住的问题
-* 调整cctv的频道顺序
+* 调整CCTV的频道顺序
 
 ### v1.4.6（通用版）
 

app/build.gradle

@@ -101,7 +101,7 @@ dependencies {
     implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
 
     // 21:2.9.0 17:2.6.4
-    def retrofit2_version = "2.6.4"
+    def retrofit2_version = "2.9.0"
 
     implementation 'com.google.protobuf:protobuf-kotlin:3.25.1'
     implementation "com.squareup.retrofit2:converter-gson:$retrofit2_version"

app/src/main/java/com/lizongying/mytv/CardAdapter.kt

@@ -1,119 +0,0 @@
-package com.lizongying.mytv
-
-import android.graphics.Color
-import android.view.ContextThemeWrapper
-import android.view.View
-import android.view.ViewGroup
-import android.view.animation.ScaleAnimation
-import android.widget.ImageView
-import androidx.leanback.widget.ImageCardView
-import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import com.lizongying.mytv.models.TVListViewModel
-import com.lizongying.mytv.models.TVViewModel
-
-
-class CardAdapter(private val owner: LifecycleOwner, private var tvListViewModel: TVListViewModel) :
-    RecyclerView.Adapter<CardAdapter.ViewHolder>() {
-
-    private var listener: ItemListener? = null
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val cardView = object :
-            ImageCardView(ContextThemeWrapper(parent.context, R.style.CustomImageCardTheme)) {}
-        startScaleAnimation(cardView, 1.0f, 0.9f)
-        cardView.isFocusable = true
-        cardView.isFocusableInTouchMode = true
-
-        return ViewHolder(cardView)
-    }
-
-    private fun startScaleAnimation(view: View, fromScale: Float, toScale: Float) {
-        val scaleAnimation = ScaleAnimation(
-            fromScale, toScale,
-            fromScale, toScale,
-            ScaleAnimation.RELATIVE_TO_SELF, 0.5f,
-            ScaleAnimation.RELATIVE_TO_SELF, 0.5f
-        )
-        scaleAnimation.duration = 200
-        scaleAnimation.fillAfter = true
-
-        view.startAnimation(scaleAnimation)
-    }
-
-    override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
-        val item = tvListViewModel.getTVViewModel(position)
-
-        val tvViewModel = item as TVViewModel
-        val cardView = viewHolder.view as ImageCardView
-
-        cardView.setOnFocusChangeListener { _, hasFocus ->
-            listener?.onItemFocusChange(item, hasFocus)
-            if (hasFocus) {
-                startScaleAnimation(cardView, 0.9f, 1.0f)
-            } else {
-                startScaleAnimation(cardView, 1.0f, 0.9f)
-            }
-        }
-
-        cardView.setOnClickListener { _ ->
-            listener?.onItemClicked(item)
-        }
-
-        cardView.titleText = tvViewModel.title.value
-        cardView.tag = tvViewModel.videoUrl.value
-
-        when (tvViewModel.title.value) {
-            "CCTV8K 超高清" -> Glide.with(viewHolder.view.context)
-                .load(R.drawable.cctv8k)
-                .centerInside()
-                .into(cardView.mainImageView)
-
-            "天津卫视" -> Glide.with(viewHolder.view.context)
-                .load(R.drawable.tianjin)
-                .centerInside()
-                .into(cardView.mainImageView)
-
-            "新疆卫视" -> Glide.with(viewHolder.view.context)
-                .load(R.drawable.xinjiang)
-                .centerInside()
-                .into(cardView.mainImageView)
-
-            else -> Glide.with(viewHolder.view.context)
-                .load(tvViewModel.logo.value)
-                .centerInside()
-                .into(cardView.mainImageView)
-        }
-
-        cardView.mainImageView.setBackgroundColor(Color.WHITE)
-        cardView.setMainImageScaleType(ImageView.ScaleType.CENTER_INSIDE)
-
-        tvViewModel.program.observe(owner) { _ ->
-            val program = tvViewModel.getProgramOne()
-            if (program != null) {
-                cardView.contentText = program.name
-            }
-        }
-    }
-
-    override fun getItemCount() = tvListViewModel.size()
-
-    class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val view = itemView
-    }
-
-    interface ItemListener {
-        fun onItemFocusChange(tvViewModel: TVViewModel, hasFocus: Boolean)
-        fun onItemClicked(tvViewModel: TVViewModel)
-    }
-
-    fun setItemListener(listener: ItemListener) {
-        this.listener = listener
-    }
-
-    companion object {
-        private const val TAG = "CardAdapter"
-    }
-}
-

app/src/main/java/com/lizongying/mytv/InfoFragment.kt

@@ -48,7 +48,6 @@ class InfoFragment : Fragment() {
                 .into(binding.infoLogo)
         }
 
-
         val program = tvViewModel.getProgramOne()
         if (program != null) {
             binding.infoDesc.text = program.name

app/src/main/java/com/lizongying/mytv/MainActivity.kt

@@ -122,7 +122,6 @@ class MainActivity : FragmentActivity() {
         val transaction = supportFragmentManager.beginTransaction()
 
         if (mainFragment.isHidden) {
-            mainFragment.setPosition()
             transaction.show(mainFragment)
             keepRunnable()
         } else {

app/src/main/java/com/lizongying/mytv/MainFragment.kt

@@ -6,31 +6,30 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import android.widget.Toast
-import androidx.fragment.app.Fragment
+import androidx.leanback.app.BrowseSupportFragment
+import androidx.leanback.widget.ArrayObjectAdapter
+import androidx.leanback.widget.HeaderItem
+import androidx.leanback.widget.ListRow
+import androidx.leanback.widget.ListRowPresenter
+import androidx.leanback.widget.ListRowPresenter.SelectItemViewHolderTask
+import androidx.leanback.widget.OnItemViewClickedListener
+import androidx.leanback.widget.OnItemViewSelectedListener
+import androidx.leanback.widget.Presenter
+import androidx.leanback.widget.Row
+import androidx.leanback.widget.RowPresenter
 import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.lizongying.mytv.Utils.dpToPx
 import com.lizongying.mytv.Utils.getDateTimestamp
-import com.lizongying.mytv.databinding.RowBinding
-import com.lizongying.mytv.databinding.ShowBinding
 import com.lizongying.mytv.models.TVListViewModel
 import com.lizongying.mytv.models.TVViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
-class MainFragment : Fragment(), CardAdapter.ItemListener {
+class MainFragment : BrowseSupportFragment() {
 
     private var itemPosition = 0
 
-    private var rowList: MutableList<View> = mutableListOf()
+    private var rowsAdapter: ArrayObjectAdapter? = null
-
-    private var _binding: ShowBinding? = null
-    private val binding get() = _binding!!
 
     private var request = Request()
 
@@ -45,12 +44,9 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
 
     private var ready = 0
 
-    override fun onCreateView(
+    override fun onCreate(savedInstanceState: Bundle?) {
-        inflater: LayoutInflater, container: ViewGroup?,
+        super.onCreate(savedInstanceState)
-        savedInstanceState: Bundle?
+        headersState = HEADERS_DISABLED
-    ): View {
-        _binding = ShowBinding.inflate(inflater, container, false)
-        return binding.root
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -59,140 +55,172 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
         activity?.let { request.initYSP(it) }
         sharedPref = activity?.getPreferences(Context.MODE_PRIVATE)
 
-        view?.post {
+        loadRows()
-            val content = binding.content
 
-            var idx: Long = 0
+        setupEventListeners()
-            for ((k, v) in TVList.list) {
-                val itemBinding: RowBinding =
-                    RowBinding.inflate(layoutInflater, content, false)
 
-                val tvListViewModelCurrent = TVListViewModel()
+        mUpdateProgramRunnable = UpdateProgramRunnable()
-                for ((idx2, v1) in v.withIndex()) {
+        handler.post(mUpdateProgramRunnable)
-                    val tvViewModel = TVViewModel(v1)
+
-                    tvViewModel.setRowPosition(idx.toInt())
+        tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
-                    tvViewModel.setItemPosition(idx2)
+            tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
-                    tvListViewModelCurrent.addTVViewModel(tvViewModel)
+                if (tvViewModel.errInfo.value != null
-                    tvListViewModel.addTVViewModel(tvViewModel)
+                    && tvViewModel.id.value == itemPosition
+                ) {
+                    Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT).show()
                 }
-                tvListViewModel.maxNum.add(v.size)
-
-                val adapter = CardAdapter(viewLifecycleOwner, tvListViewModelCurrent)
-                rowList.add(itemBinding.rowItems)
-
-                adapter.setItemListener(this)
-
-                itemBinding.rowHeader.text = k
-                itemBinding.rowItems.adapter = adapter
-                itemBinding.rowItems.layoutManager =
-                    LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
-
-                val layoutParams = itemBinding.row.layoutParams as ViewGroup.MarginLayoutParams
-                layoutParams.topMargin = dpToPx(11F)
-                itemBinding.row.layoutParams = layoutParams
-                content.addView(itemBinding.row)
-
-                idx++
             }
+            tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
 
-            mUpdateProgramRunnable = UpdateProgramRunnable()
+                // not first time && channel not change
-            handler.post(mUpdateProgramRunnable)
+                if (tvViewModel.ready.value != null
-
+                    && tvViewModel.id.value == itemPosition
-            itemPosition = sharedPref?.getInt(POSITION, 0)!!
+                    && check(tvViewModel)
-            if (itemPosition >= tvListViewModel.size()) {
+                ) {
-                itemPosition = 0
+                    Log.i(TAG, "ready ${tvViewModel.title.value}")
+                    (activity as? MainActivity)?.play(tvViewModel)
+                }
             }
-            tvListViewModel.setItemPosition(itemPosition)
+            tvViewModel.change.observe(viewLifecycleOwner) { _ ->
-            setPosition()
+                if (tvViewModel.change.value != null) {
-            tvListViewModel.getTVListViewModel().value?.forEach { tvViewModel ->
+                    val title = tvViewModel.title.value
-                tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
+                    Log.i(TAG, "switch $title")
-                    if (tvViewModel.errInfo.value != null
+                    if (tvViewModel.pid.value != "") {
-                        && tvViewModel.id.value == itemPosition
+                        Log.i(TAG, "request $title ${tvViewModel.pid.value}")
-                    ) {
+                        lifecycleScope.launch(Dispatchers.IO) {
-                        Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT)
+                            tvViewModel.let { request.fetchData(it) }
-                            .show()
+                        }
-                    }
+                        (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                }
+                        setSelectedPosition(
-                tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
+                            tvViewModel.getRowPosition(), true,
-
+                            SelectItemViewHolderTask(tvViewModel.getItemPosition())
-                    // not first time && channel not change
+                        )
-                    if (tvViewModel.ready.value != null
+                    } else {
-                        && tvViewModel.id.value == itemPosition
+                        if (check(tvViewModel)) {
-                        && check(tvViewModel)
+                            (activity as? MainActivity)?.play(tvViewModel)
-                    ) {
-                        Log.i(TAG, "ready ${tvViewModel.title.value}")
-                        (activity as? MainActivity)?.play(tvViewModel)
-                    }
-                }
-                tvViewModel.change.observe(viewLifecycleOwner) { _ ->
-                    if (tvViewModel.change.value != null) {
-                        val title = tvViewModel.title.value
-                        Log.i(TAG, "switch $title")
-                        if (tvViewModel.pid.value != "") {
-                            Log.i(TAG, "request $title ${tvViewModel.pid.value}")
-                            lifecycleScope.launch(Dispatchers.IO) {
-                                tvViewModel.let { request.fetchData(it) }
-                            }
                             (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                            setPosition(
+                            setSelectedPosition(
-                                tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
+                                tvViewModel.getRowPosition(), true,
+                                SelectItemViewHolderTask(tvViewModel.getItemPosition())
                             )
-                        } else {
-                            if (check(tvViewModel)) {
-                                (activity as? MainActivity)?.play(tvViewModel)
-                                (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                                setPosition(
-                                    tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
-                                )
-                            }
                         }
                     }
                 }
             }
+        }
 
-            fragmentReady()
+        fragmentReady()
+    }
+
+    fun toLastPosition() {
+        setSelectedPosition(
+            selectedPosition, false,
+            SelectItemViewHolderTask(tvListViewModel.maxNum[selectedPosition] - 1)
+        )
+    }
+
+    fun toFirstPosition() {
+        setSelectedPosition(
+            selectedPosition, false,
+            SelectItemViewHolderTask(0)
+        )
+    }
+
+    override fun startHeadersTransition(withHeaders: Boolean) {
+    }
+
+    private fun loadRows() {
+        rowsAdapter = ArrayObjectAdapter(ListRowPresenter())
+
+        val cardPresenter = CardPresenter(viewLifecycleOwner)
+
+        var idx: Long = 0
+        for ((k, v) in TVList.list) {
+            val listRowAdapter = ArrayObjectAdapter(cardPresenter)
+            for ((idx2, v1) in v.withIndex()) {
+                val tvViewModel = TVViewModel(v1)
+                tvViewModel.setRowPosition(idx.toInt())
+                tvViewModel.setItemPosition(idx2)
+                tvListViewModel.addTVViewModel(tvViewModel)
+                listRowAdapter.add(tvViewModel)
+            }
+            tvListViewModel.maxNum.add(v.size)
+            val header = HeaderItem(idx, k)
+            rowsAdapter!!.add(ListRow(header, listRowAdapter))
+            idx++
+        }
+
+        adapter = rowsAdapter
+
+        itemPosition = sharedPref?.getInt(POSITION, 0)!!
+        if (itemPosition >= tvListViewModel.size()) {
+            itemPosition = 0
+        }
+        tvListViewModel.setItemPosition(itemPosition)
+    }
+
+    fun prevSource() {
+        view?.post {
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            if (tvViewModel != null) {
+                if (tvViewModel.videoUrl.value!!.size > 1) {
+                    val videoIndex = tvViewModel.videoIndex.value?.minus(1)
+                    if (videoIndex == -1) {
+                        tvViewModel.setVideoIndex(tvViewModel.videoUrl.value!!.size - 1)
+                    }
+                    tvViewModel.changed()
+                }
+            }
         }
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    fun nextSource() {
-        super.onViewCreated(view, savedInstanceState)
+        view?.post {
-    }
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-
+            if (tvViewModel != null) {
-    override fun onItemFocusChange(tvViewModel: TVViewModel, hasFocus: Boolean) {
+                if (tvViewModel.videoUrl.value!!.size > 1) {
-        if (hasFocus) {
+                    val videoIndex = tvViewModel.videoIndex.value?.plus(1)
-            tvListViewModel.setItemPositionCurrent(tvViewModel.id.value!!)
+                    if (videoIndex == tvViewModel.videoUrl.value!!.size) {
-            (activity as MainActivity).keepRunnable()
+                        tvViewModel.setVideoIndex(0)
+                    }
+                    tvViewModel.changed()
+                }
+            }
         }
     }
 
-    override fun onItemClicked(tvViewModel: TVViewModel) {
+    private fun setupEventListeners() {
-        if (this.isHidden) {
+        onItemViewClickedListener = ItemViewClickedListener()
-            (activity as? MainActivity)?.switchMainFragment()
+        onItemViewSelectedListener = ItemViewSelectedListener()
-            return
-        }
-
-        if (itemPosition != tvViewModel.id.value!!) {
-            itemPosition = tvViewModel.id.value!!
-            tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.getTVViewModel(itemPosition)?.changed()
-        }
-        (activity as? MainActivity)?.switchMainFragment()
     }
 
-    fun setPosition() {
+    private inner class ItemViewClickedListener : OnItemViewClickedListener {
-        val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+        override fun onItemClicked(
-        rowList[tvViewModel!!.getRowPosition()].post {
+            itemViewHolder: Presenter.ViewHolder,
-            ((rowList[tvViewModel.getRowPosition()] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
+            item: Any,
-                tvViewModel.getItemPosition()
+            rowViewHolder: RowPresenter.ViewHolder,
-            )?.requestFocus()
+            row: Row
+        ) {
+            if (item is TVViewModel) {
+                if (itemPosition != item.id.value!!) {
+                    itemPosition = item.id.value!!
+                    tvListViewModel.setItemPosition(itemPosition)
+                    tvListViewModel.getTVViewModel(itemPosition)?.changed()
+                }
+                (activity as? MainActivity)?.switchMainFragment()
+            }
         }
     }
 
-    fun setPosition(rowPosition: Int, itemPosition: Int) {
+    private inner class ItemViewSelectedListener : OnItemViewSelectedListener {
-        rowList[rowPosition].post {
+        override fun onItemSelected(
-            ((rowList[rowPosition] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
+            itemViewHolder: Presenter.ViewHolder?, item: Any?,
-                itemPosition
+            rowViewHolder: RowPresenter.ViewHolder, row: Row
-            )?.requestFocus()
+        ) {
+            if (item is TVViewModel) {
+                tvListViewModel.setItemPositionCurrent(item.id.value!!)
+                (activity as MainActivity).keepRunnable()
+            }
         }
     }
 
@@ -262,7 +290,7 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
                 tvViewModel.programUpdateTime = timestamp
                 request.fetchProgram(tvViewModel)
             } else {
-                if (timestamp - tvViewModel.program.value!!.last().et < 600) {
+                if (tvViewModel.program.value!!.last().et - timestamp < 600) {
                     tvViewModel.programUpdateTime = timestamp
                     request.fetchProgram(tvViewModel)
                 }
@@ -272,7 +300,7 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
 
     inner class UpdateProgramRunnable : Runnable {
         override fun run() {
-            tvListViewModel.getTVListViewModel().value?.filter { it.programId.value != null }
+            tvListViewModel.tvListViewModel.value?.filter { it.programId.value != null }
                 ?.forEach { tvViewModel ->
                     updateProgram(
                         tvViewModel
@@ -298,12 +326,6 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
         handler.removeCallbacks(mUpdateProgramRunnable)
     }
 
-    override fun onDestroyView() {
-        Log.i(TAG, "onDestroyView")
-        super.onDestroyView()
-        _binding = null
-    }
-
     override fun onResume() {
         super.onResume()
         view?.post { view?.requestFocus() }

app/src/main/java/com/lizongying/mytv/Request.kt

@@ -125,7 +125,7 @@ class Request {
                                 keyBytes + byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0),
                                 ivBytes
                             ).uppercase()
-                            Log.i(TAG, "$title url $url")
+                            Log.d(TAG, "$title url $url")
                             tvModel.addVideoUrl(url)
                             tvModel.allReady()
                             tvModel.retryTimes = 0

app/src/main/java/com/lizongying/mytv/models/TVListViewModel.kt

@@ -8,7 +8,9 @@ class TVListViewModel : ViewModel() {
 
     var maxNum = mutableListOf<Int>()
 
-    private val tvListViewModel = MutableLiveData<MutableList<TVViewModel>>()
+    private val _tvListViewModel = MutableLiveData<MutableList<TVViewModel>>()
+    val tvListViewModel: LiveData<MutableList<TVViewModel>>
+        get() = _tvListViewModel
 
     private val _itemPosition = MutableLiveData<Int>()
     val itemPosition: LiveData<Int>
@@ -18,22 +20,20 @@ class TVListViewModel : ViewModel() {
     val itemPositionCurrent: LiveData<Int>
         get() = _itemPositionCurrent
 
-    fun getTVListViewModel(): MutableLiveData<MutableList<TVViewModel>> {
-        return tvListViewModel
-    }
-
     fun addTVViewModel(tvViewModel: TVViewModel) {
-        val currentTVModelList = tvListViewModel.value ?: mutableListOf()
+        if (_tvListViewModel.value == null) {
-        currentTVModelList.add(tvViewModel)
+            _tvListViewModel.value = mutableListOf(tvViewModel)
-        tvListViewModel.value = currentTVModelList
+        } else {
+            _tvListViewModel.value?.add(tvViewModel)
+        }
     }
 
     fun getTVViewModel(id: Int): TVViewModel? {
-        return tvListViewModel.value?.get(id)
+        return _tvListViewModel.value?.get(id)
     }
 
     fun getTVViewModelCurrent(): TVViewModel? {
-        return _itemPositionCurrent.value?.let { tvListViewModel.value?.get(it) }
+        return _itemPositionCurrent.value?.let { _tvListViewModel.value?.get(it) }
     }
 
     fun setItemPosition(position: Int) {
@@ -46,6 +46,9 @@ class TVListViewModel : ViewModel() {
     }
 
     fun size(): Int {
-        return tvListViewModel.value!!.size
+        if (_tvListViewModel.value == null) {
+            return 0
+        }
+        return _tvListViewModel.value!!.size
     }
 }

app/src/main/java/com/lizongying/mytv/models/TVViewModel.kt

@@ -78,6 +78,7 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     var needToken = false
 
     private val channelsNeedToken = arrayOf(
+//        "CCTV4K 超高清",
         "CCTV3 综艺",
         "CCTV6 电影",
         "CCTV8 电视剧",

app/src/main/res/layout/row.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/row_header"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start"
-        android:layout_marginTop="0dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginBottom="5dp"
-        android:gravity="start"
-        android:textColor="#FFEEEEEE"
-        android:textSize="22sp" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/row_items"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-    </androidx.recyclerview.widget.RecyclerView>
-</LinearLayout>

app/src/main/res/layout/show.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/show_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <ScrollView
-        android:id="@+id/scroll_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <LinearLayout
-            android:id="@+id/content"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-        </LinearLayout>
-    </ScrollView>
-</FrameLayout>

app/src/main/res/values/styles.xml

@@ -1,25 +1,10 @@
 <resources>
 
     <style name="CustomImageCardViewStyle" parent="Widget.Leanback.ImageCardViewStyle">
-        <item name="cardType">infoUnder</item>
+        <item name="lbImageCardViewType">Title|Content</item>
-        <item name="infoVisibility">always</item>
-        <!-- In order to keep backward compatibility we have to create an icon on right. -->
-        <item name="lbImageCardViewType">Title|Content|IconOnRight</item>
-        <!-- Deprecated. Use 'Widget.Leanback.ImageCardView.InfoAreaStyle' instead. -->
-        <item name="infoAreaBackground">@null</item>
-    </style>
-
-    <style name="CustomImageCardViewImageStyle" parent="Widget.Leanback.ImageCardView.ImageStyle">
-        <item name="android:layout_width">143dp</item>
-        <item name="android:layout_height">50dp</item>
-        <item name="android:adjustViewBounds">true</item>
-        <item name="android:contentDescription">@null</item>
-        <item name="android:scaleType">centerCrop</item>
-        <item name="layout_viewType">main</item>
     </style>
 
     <style name="CustomImageCardTheme" parent="Theme.Leanback">
         <item name="imageCardViewStyle">@style/CustomImageCardViewStyle</item>
-        <item name="imageCardViewImageStyle">@style/CustomImageCardViewImageStyle</item>
     </style>
 </resources>