Skip to content

Commit f7e10eb

Browse files
committed
Fully working card and list view
1 parent c607089 commit f7e10eb

3 files changed

Lines changed: 7 additions & 5 deletions

File tree

app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
276276
return@setOnItemLongClickListener true
277277
}
278278

279-
feedGroupsCarousel = FeedGroupCarouselItem(requireContext(), carouselAdapter, RecyclerView.HORIZONTAL)
279+
feedGroupsCarousel = FeedGroupCarouselItem(requireContext(), carouselAdapter, RecyclerView.HORIZONTAL, true)
280280

281281
feedGroupsSortMenuItem = HeaderWithMenuItem(
282282
getString(R.string.feed_groups_header_title),
@@ -326,7 +326,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
326326
listenerFeedVerticalGroups.held(item)
327327
return@setOnItemLongClickListener true
328328
}
329-
feedGroupsCarousel = FeedGroupCarouselItem(requireContext(), carouselAdapter, RecyclerView.VERTICAL)
329+
feedGroupsCarousel = FeedGroupCarouselItem(requireContext(), carouselAdapter, RecyclerView.VERTICAL, false)
330330

331331
feedGroupsSortMenuItem = HeaderWithMenuItem(
332332
getString(R.string.feed_groups_header_title),

app/src/main/java/org/schabi/newpipe/local/subscription/item/FeedGroupCarouselItem.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ import org.schabi.newpipe.local.subscription.decoration.FeedGroupCarouselDecorat
1515
class FeedGroupCarouselItem(
1616
context: Context,
1717
private val carouselAdapter: GroupAdapter<GroupieViewHolder<FeedItemCarouselBinding>>,
18-
private var listView: Int
18+
private var listView: Int,
19+
private var isGridLayout: Boolean
1920
) : BindableItem<FeedItemCarouselBinding>() {
2021
private val feedGroupCarouselDecoration = FeedGroupCarouselDecoration(context)
2122

@@ -44,7 +45,8 @@ class FeedGroupCarouselItem(
4445
adapter = carouselAdapter
4546
addItemDecoration(feedGroupCarouselDecoration)
4647
}
47-
viewHolder.recyclerView.setLayoutManager(GridLayoutManager(view.context, 3))
48+
if (isGridLayout)
49+
viewHolder.recyclerView.setLayoutManager(GridLayoutManager(view.context, 3))
4850
return viewHolder
4951
}
5052

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125

126126
<!-- Feed Groups dimensions-->
127127
<dimen name="feed_group_carousel_start_end_margin">12dp</dimen>
128-
<dimen name="feed_group_carousel_top_bottom_margin">12dp</dimen>
128+
<dimen name="feed_group_carousel_top_bottom_margin">6dp</dimen>
129129
<dimen name="feed_group_carousel_between_items_margin">4dp</dimen>
130130

131131
<dimen name="search_suggestion_text_size">16sp</dimen>

0 commit comments

Comments
 (0)