set spanCount according to screen width

This commit is contained in:
Jannik 2022-12-04 14:48:25 +01:00
parent fffbeaeb49
commit ed8f3fdcda
Signed by: Seil0
GPG Key ID: E8459F3723C52C24
10 changed files with 27 additions and 11 deletions

View File

@ -52,6 +52,8 @@ class HomeFragment : Fragment() {
private val model: HomeViewModel by viewModels() private val model: HomeViewModel by viewModels()
private lateinit var binding: FragmentHomeBinding private lateinit var binding: FragmentHomeBinding
private val itemOffset = 21
private val playerResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { private val playerResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
model.updateUpNextItems() model.updateUpNextItems()
} }
@ -68,35 +70,35 @@ class HomeFragment : Fragment() {
MediaEpisodeListAdapter.OnClickListener { MediaEpisodeListAdapter.OnClickListener {
playerResult.launch(playerIntent(it.panel.episodeMetadata.seasonId, it.panel.id)) playerResult.launch(playerIntent(it.panel.episodeMetadata.seasonId, it.panel.id))
}, },
21 itemOffset
) )
binding.recyclerWatchlist.adapter = MediaItemListAdapter( binding.recyclerWatchlist.adapter = MediaItemListAdapter(
MediaItemListAdapter.OnClickListener { MediaItemListAdapter.OnClickListener {
activity?.showFragment(MediaFragment(it.id)) activity?.showFragment(MediaFragment(it.id))
}, },
21 itemOffset
) )
binding.recyclerRecommendations.adapter = MediaItemListAdapter( binding.recyclerRecommendations.adapter = MediaItemListAdapter(
MediaItemListAdapter.OnClickListener { MediaItemListAdapter.OnClickListener {
activity?.showFragment(MediaFragment(it.id)) activity?.showFragment(MediaFragment(it.id))
}, },
21 itemOffset
) )
binding.recyclerNewTitles.adapter = MediaItemListAdapter( binding.recyclerNewTitles.adapter = MediaItemListAdapter(
MediaItemListAdapter.OnClickListener { MediaItemListAdapter.OnClickListener {
activity?.showFragment(MediaFragment(it.id)) activity?.showFragment(MediaFragment(it.id))
}, },
21 itemOffset
) )
binding.recyclerTopTen.adapter = MediaItemListAdapter( binding.recyclerTopTen.adapter = MediaItemListAdapter(
MediaItemListAdapter.OnClickListener { MediaItemListAdapter.OnClickListener {
activity?.showFragment(MediaFragment(it.id)) activity?.showFragment(MediaFragment(it.id))
}, },
21 itemOffset
) )
binding.textHighlightMyList.setOnClickListener { binding.textHighlightMyList.setOnClickListener {
@ -186,7 +188,7 @@ class HomeFragment : Fragment() {
private fun setShimmerLayoutItemSize(shimmerLayout: ShimmerFrameLayout) { private fun setShimmerLayoutItemSize(shimmerLayout: ShimmerFrameLayout) {
(shimmerLayout.children.first() as? LinearLayout)?.children?.forEach { child -> (shimmerLayout.children.first() as? LinearLayout)?.children?.forEach { child ->
child.layoutParams.apply { child.layoutParams.apply {
width = (binding.root.measuredWidth / 2) - 21 width = (binding.root.measuredWidth / requireContext().resources.getInteger(R.integer.item_media_columns)) - itemOffset
} }
} }
} }

View File

@ -20,7 +20,7 @@ class MediaEpisodeListAdapter(private val onClickListener: OnClickListener, priv
false false
) )
binding.root.layoutParams.apply { binding.root.layoutParams.apply {
width = (parent.measuredWidth / 2) - itemOffset width = (parent.measuredWidth / parent.context.resources.getInteger(R.integer.item_media_columns)) - itemOffset
} }
return MediaViewHolder(binding) return MediaViewHolder(binding)

View File

@ -7,6 +7,7 @@ import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import org.mosad.teapod.R
import org.mosad.teapod.databinding.ItemMediaBinding import org.mosad.teapod.databinding.ItemMediaBinding
import org.mosad.teapod.util.ItemMedia import org.mosad.teapod.util.ItemMedia
@ -19,7 +20,7 @@ class MediaItemListAdapter(private val onClickListener: OnClickListener, private
false false
) )
binding.root.layoutParams.apply { binding.root.layoutParams.apply {
width = (parent.measuredWidth / 2) - itemOffset width = (parent.measuredWidth / parent.context.resources.getInteger(R.integer.item_media_columns)) - itemOffset
} }
return MediaViewHolder(binding) return MediaViewHolder(binding)

View File

@ -19,7 +19,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:spanCount="2" app:spanCount="@integer/item_media_columns"
tools:listitem="@layout/item_media" /> tools:listitem="@layout/item_media" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

View File

@ -16,7 +16,7 @@
android:paddingEnd="3dp" android:paddingEnd="3dp"
android:paddingBottom="3dp" android:paddingBottom="3dp"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:spanCount="2" app:spanCount="@integer/item_media_columns"
tools:listitem="@layout/item_media" /> tools:listitem="@layout/item_media" />
</FrameLayout> </FrameLayout>

View File

@ -35,7 +35,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/search_text" app:layout_constraintTop_toBottomOf="@+id/search_text"
app:spanCount="2" app:spanCount="@integer/item_media_columns"
tools:listitem="@layout/item_media"> tools:listitem="@layout/item_media">
</androidx.recyclerview.widget.RecyclerView> </androidx.recyclerview.widget.RecyclerView>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item name="item_media_columns" type="integer">3</item>
</resources>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item name="item_media_columns" type="integer">4</item>
</resources>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item name="item_media_columns" type="integer">5</item>
</resources>

View File

@ -2,4 +2,5 @@
<resources> <resources>
<dimen name="player_styled_progress_layout_height">28dp</dimen> <dimen name="player_styled_progress_layout_height">28dp</dimen>
<dimen name="player_styled_progress_margin_bottom">52dp</dimen> <dimen name="player_styled_progress_margin_bottom">52dp</dimen>
<item name="item_media_columns" type="integer">2</item>
</resources> </resources>