Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,9 @@ class HomeParentItemAdapterPreview(
private val previewViewpager: ViewPager2 =
itemView.findViewById(R.id.home_preview_viewpager)

private val homePreviewShimmer: com.facebook.shimmer.ShimmerFrameLayout? =
itemView.findViewById(R.id.home_preview_shimmer)

private val previewViewpagerText: ViewGroup =
itemView.findViewById(R.id.home_preview_viewpager_text)

Expand Down Expand Up @@ -652,7 +655,7 @@ class HomeParentItemAdapterPreview(
}

private fun updatePreview(preview: Resource<Pair<Boolean, List<LoadResponse>>>) {
if (preview is Resource.Success) {
if (preview is Resource.Success || isLayout(TV or EMULATOR)) {
homeNonePadding.apply {
val params = layoutParams
params.height = 0
Expand All @@ -662,6 +665,8 @@ class HomeParentItemAdapterPreview(

when (preview) {
is Resource.Success -> {
homePreviewShimmer?.stopShimmer()
homePreviewShimmer?.isGone = true
previewAdapter.submitList(preview.value.second)
previewAdapter.hasMoreItems = preview.value.first
/*if (!.setItems(
Expand Down Expand Up @@ -693,7 +698,16 @@ class HomeParentItemAdapterPreview(
}
}

is Resource.Loading -> {
previewViewpager.isGone = true
previewViewpagerText.isGone = true
homePreviewShimmer?.isVisible = true
homePreviewShimmer?.startShimmer()
}

else -> {
homePreviewShimmer?.stopShimmer()
homePreviewShimmer?.isGone = true
previewAdapter.submitList(listOf())
previewViewpager.setCurrentItem(0, false)
previewViewpager.isVisible = false
Expand Down
38 changes: 4 additions & 34 deletions app/src/main/res/layout/fragment_home.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_marginTop="15dp"
android:orientation="vertical"
android:paddingTop="40dp"
app:shimmer_auto_start="true"
app:shimmer_base_alpha="0.2"
app:shimmer_duration="@integer/loading_time"
Expand All @@ -40,39 +38,11 @@
android:layout_height="wrap_content"
android:orientation="vertical">

<FrameLayout
<View
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">

<androidx.cardview.widget.CardView
android:layout_width="125dp"
android:layout_height="200dp"
android:layout_gravity="center"
android:layout_margin="@dimen/loading_margin"
android:background="@color/grayShimmer"
android:translationX="-164dp"
app:cardCornerRadius="@dimen/loading_radius" />

<androidx.cardview.widget.CardView
android:layout_width="148dp"
android:layout_height="234dp"
android:layout_gravity="center"
android:layout_margin="@dimen/loading_margin"
android:background="@color/grayShimmer"
app:cardCornerRadius="@dimen/loading_radius" />

<androidx.cardview.widget.CardView
android:layout_width="125dp"
android:layout_height="200dp"
android:layout_gravity="center"
android:layout_margin="@dimen/loading_margin"
android:background="@color/grayShimmer"
android:translationX="164dp"
app:cardCornerRadius="@dimen/loading_radius" />
</FrameLayout>

<include layout="@layout/loading_line_short_center" />
android:layout_height="500dp"
android:alpha="0.25"
android:background="@color/grayShimmer" />

<LinearLayout
android:layout_width="match_parent"
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/layout/fragment_home_head.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@

</androidx.viewpager2.widget.ViewPager2>

<include layout="@layout/loading_hero_banner" />

<LinearLayout
android:id="@+id/home_padding"
android:layout_width="match_parent"
Expand Down
28 changes: 15 additions & 13 deletions app/src/main/res/layout/fragment_home_head_tv.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<androidx.cardview.widget.CardView
android:id="@+id/home_preview_info_btt"
android:layout_width="match_parent"
android:layout_height="400dp"
android:layout_height="260dp"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
Expand All @@ -58,6 +58,8 @@

</androidx.viewpager2.widget.ViewPager2>

<include layout="@layout/loading_hero_banner" />

<LinearLayout
android:id="@+id/home_preview_viewpager_text"
android:layout_width="match_parent"
Expand All @@ -67,15 +69,15 @@
android:layout_marginStart="@dimen/navbar_width"
android:gravity="bottom"
android:orientation="vertical"
android:padding="20dp">
android:padding="16dp">

<ImageView
android:id="@+id/home_background_poster_watermark_badge_holder"
android:layout_width="wrap_content"
android:layout_height="72dp"
android:layout_height="48dp"
android:contentDescription="LogoURL"
android:minHeight="72dp"
android:maxWidth="220dp"
android:minHeight="48dp"
android:maxWidth="200dp"
android:scaleType="fitStart"
android:adjustViewBounds="true" />

Expand All @@ -85,10 +87,10 @@
android:id="@+id/home_preview_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginTop="4dp"
android:ellipsize="end"
android:maxLines="1"
android:textSize="25sp"
android:textSize="22sp"
android:textStyle="bold"
android:shadowColor="#B0000000"
android:shadowDx="0"
Expand All @@ -100,7 +102,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="10dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:gravity="center_vertical">

Expand Down Expand Up @@ -140,9 +142,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="3"
android:paddingBottom="5dp"
android:textSize="15sp"
android:maxLines="2"
android:paddingBottom="4dp"
android:textSize="14sp"
android:textColor="@color/textColor"
android:shadowColor="#B0000000"
android:shadowDx="0"
Expand All @@ -156,9 +158,9 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textSize="13sp"
android:textSize="12sp"
android:textColor="@color/gray_400"
android:paddingBottom="5dp"
android:paddingBottom="2dp"
tools:text="Cast: Actor One, Actor Two" />

<com.google.android.material.chip.ChipGroup
Expand Down
54 changes: 12 additions & 42 deletions app/src/main/res/layout/fragment_home_tv.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
android:id="@+id/home_loading"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/navbar_width"
android:visibility="gone"
tools:visibility="visible">

Expand All @@ -28,10 +27,8 @@
android:id="@+id/home_loading_shimmer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_marginTop="15dp"
android:layout_marginTop="60dp"
android:orientation="vertical"
android:paddingTop="40dp"
app:shimmer_auto_start="true"
app:shimmer_base_alpha="0.2"
app:shimmer_duration="@integer/loading_time"
Expand All @@ -42,54 +39,27 @@
android:layout_height="wrap_content"
android:orientation="vertical">

<FrameLayout
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">

<androidx.cardview.widget.CardView
android:layout_width="125dp"
android:layout_height="200dp"
android:layout_gravity="center"
android:layout_margin="@dimen/loading_margin"
android:background="@color/grayShimmer"
android:translationX="-164dp"
app:cardCornerRadius="@dimen/loading_radius" />

<androidx.cardview.widget.CardView
android:layout_width="148dp"
android:layout_height="234dp"
android:layout_gravity="center"
android:layout_margin="@dimen/loading_margin"
android:background="@color/grayShimmer"
app:cardCornerRadius="@dimen/loading_radius" />

<androidx.cardview.widget.CardView
android:layout_width="125dp"
android:layout_height="200dp"
android:layout_gravity="center"
android:layout_margin="@dimen/loading_margin"
android:background="@color/grayShimmer"
android:translationX="164dp"
app:cardCornerRadius="@dimen/loading_radius" />
</FrameLayout>

<include layout="@layout/loading_line_short_center" />
android:layout_height="260dp"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:alpha="0.25"
app:cardBackgroundColor="@color/grayShimmer"
app:cardCornerRadius="@dimen/rounded_image_radius" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/result_padding"
android:layout_marginTop="@dimen/result_padding"

android:layout_marginEnd="@dimen/result_padding"
android:layout_marginStart="10dp"
android:layout_marginTop="0dp"
android:layout_marginEnd="10dp"
android:orientation="vertical">

<include layout="@layout/loading_list" />

<include layout="@layout/loading_list" />

<include layout="@layout/loading_list" />
</LinearLayout>
</LinearLayout>
</com.facebook.shimmer.ShimmerFrameLayout>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/home_scroll_view_tv.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<View
android:id="@+id/title_shadow"
android:layout_width="match_parent"
android:layout_height="250dp"
android:layout_height="180dp"
android:layout_gravity="bottom"
android:background="@drawable/background_shadow" />

Expand Down
17 changes: 17 additions & 0 deletions app/src/main/res/layout/loading_hero_banner.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<com.facebook.shimmer.ShimmerFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/home_preview_shimmer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"
app:shimmer_auto_start="true"
app:shimmer_base_alpha="0.05"
app:shimmer_duration="@integer/loading_time"
app:shimmer_highlight_alpha="0.18">

<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/grayShimmer" />
</com.facebook.shimmer.ShimmerFrameLayout>