[Catalog][Carousel] Fix slider value out of bounds crash in carousel …

…demos caused by state restore happening after resetting slider values Resolves #4037 Resolves #4036 GIT_ORIGIN_REV_ID=b41cac6c34c66ffccdb6a7696cd554e620b2e0bc Co-authored-by: imhappi PiperOrigin-RevId: 625484603
material-components · Apr 17, 2024 · c600b38 · c600b38
1 parent 8c541e6
commit c600b38
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/catalog/java/io/material/catalog/carousel/HeroCarouselDemoFragment.java b/catalog/java/io/material/catalog/carousel/HeroCarouselDemoFragment.java
@@ -43,6 +43,8 @@
 public class HeroCarouselDemoFragment extends DemoFragment {
 
  private MaterialDividerItemDecoration horizontalDivider;
+ private CarouselAdapter adapter;
+ private Slider positionSlider;
 
  @NonNull
  @Override
@@ -67,7 +69,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle bundle) {
  MaterialSwitch drawDividers = view.findViewById(R.id.draw_dividers_switch);
  MaterialSwitch enableFlingSwitch = view.findViewById(R.id.enable_fling_switch);
  AutoCompleteTextView itemCountDropdown = view.findViewById(R.id.item_count_dropdown);
- Slider positionSlider = view.findViewById(R.id.position_slider);
+ positionSlider = view.findViewById(R.id.position_slider);
  RadioButton startAlignButton = view.findViewById(R.id.start_align);
  RadioButton centerAlignButton = view.findViewById(R.id.center_align);
 
@@ -96,7 +98,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle bundle) {
  }
  });
 
- CarouselAdapter adapter =
+ adapter =
  new CarouselAdapter(
  (item, position) -> {
  heroStartRecyclerView.scrollToPosition(position);
@@ -141,6 +143,11 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle bundle) {
  v -> heroStartCarouselLayoutManager.setCarouselAlignment(ALIGNMENT_CENTER));
 
  heroStartRecyclerView.setAdapter(adapter);
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
  adapter.submitList(CarouselData.createItems(), updateSliderRange(positionSlider, adapter));
  }
 

diff --git a/catalog/java/io/material/catalog/carousel/MultiBrowseCarouselDemoFragment.java b/catalog/java/io/material/catalog/carousel/MultiBrowseCarouselDemoFragment.java
@@ -37,6 +37,8 @@
 public class MultiBrowseCarouselDemoFragment extends DemoFragment {
 
  private MaterialDividerItemDecoration horizontalDivider;
+ private CarouselAdapter adapter;
+ private Slider positionSlider;
 
  @NonNull
  @Override
@@ -61,7 +63,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle bundle) {
  MaterialSwitch drawDividers = view.findViewById(R.id.draw_dividers_switch);
  MaterialSwitch snapSwitch = view.findViewById(R.id.snap_switch);
  AutoCompleteTextView itemCountDropdown = view.findViewById(R.id.item_count_dropdown);
- Slider positionSlider = view.findViewById(R.id.position_slider);
+ positionSlider = view.findViewById(R.id.position_slider);
 
  // A start-aligned multi-browse carousel
  RecyclerView multiBrowseStartRecyclerView =
@@ -99,7 +101,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle bundle) {
  }
  });
 
- CarouselAdapter adapter =
+ adapter =
  new CarouselAdapter(
  (item, position) -> {
  multiBrowseStartRecyclerView.scrollToPosition(position);
@@ -120,6 +122,11 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle bundle) {
  CarouselDemoUtils.createScrollToPositionSliderTouchListener(multiBrowseStartRecyclerView));
 
  multiBrowseStartRecyclerView.setAdapter(adapter);
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
  adapter.submitList(CarouselData.createItems(), updateSliderRange(positionSlider, adapter));
  }
 

diff --git a/catalog/java/io/material/catalog/carousel/UncontainedCarouselDemoFragment.java b/catalog/java/io/material/catalog/carousel/UncontainedCarouselDemoFragment.java
@@ -38,6 +38,8 @@
 public class UncontainedCarouselDemoFragment extends DemoFragment {
 
  private MaterialDividerItemDecoration horizontalDivider;
+ private CarouselAdapter adapter;
+ private Slider positionSlider;
 
  @NonNull
  @Override
@@ -62,7 +64,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle bundle) {
  MaterialSwitch drawDividers = view.findViewById(R.id.draw_dividers_switch);
  MaterialSwitch snapSwitch = view.findViewById(R.id.snap_switch);
  AutoCompleteTextView itemCountDropdown = view.findViewById(R.id.item_count_dropdown);
- Slider positionSlider = view.findViewById(R.id.position_slider);
+ positionSlider = view.findViewById(R.id.position_slider);
 
  RecyclerView uncontainedRecyclerView =
  view.findViewById(R.id.uncontained_carousel_recycler_view);
@@ -99,7 +101,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle bundle) {
  }
  });
 
- CarouselAdapter adapter =
+ adapter =
  new CarouselAdapter(
  (item, position) -> {
  uncontainedRecyclerView.scrollToPosition(position);
@@ -119,6 +121,11 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle bundle) {
  CarouselDemoUtils.createScrollToPositionSliderTouchListener(uncontainedRecyclerView));
 
  uncontainedRecyclerView.setAdapter(adapter);
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
  adapter.submitList(CarouselData.createItems(), updateSliderRange(positionSlider, adapter));
  }