Merge branch 'master' into remove_multidex

Author: MGaetan89

build.gradle

@@ -29,7 +29,7 @@ ext {
     ? project.property('mavenRepoUrl') : '/tmp/myRepo/')
 
   // Current version of the library (could be in-development/unreleased).
-  mdcLibraryVersion = '1.14.0-alpha02'
+  mdcLibraryVersion = '1.14.0-alpha04'
   mdcLibraryPackage = "com.google.android.material"
   mdcLibraryDir = "com/google/android/material"
 }

catalog/build.gradle

@@ -4,20 +4,20 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.1.0'
+    classpath 'org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.2.0'
   }
 }
 
 plugins {
   id 'com.android.application'
   id 'org.jetbrains.kotlin.android' version "2.1.21"
-  id 'org.jetbrains.kotlin.plugin.compose' version "2.1.0"
+  id 'org.jetbrains.kotlin.plugin.compose' version "2.2.0"
 }
 
 dependencies {
 
   // Align kotlin versions
-  implementation(platform('org.jetbrains.kotlin:kotlin-bom:2.1.0'))
+  implementation(platform('org.jetbrains.kotlin:kotlin-bom:2.2.0'))
 
   api libs.dagger
   annotationProcessor libs.dagger.compiler
@@ -96,6 +96,7 @@ def srcDirs = [
   'font',
   'internal',
   'loadingindicator',
+  'listitem',
   'main',
   'materialswitch',
   'menu',

catalog/java/io/material/catalog/assets/res/drawable/ic_star_icon_24px.xml

@@ -0,0 +1,25 @@
+<!--
+  Copyright 2025 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M320,720L480,598L640,720L580,522L740,408L544,408L480,200L416,408L220,408L380,522L320,720ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>

catalog/java/io/material/catalog/fab/ExtendedFabDemoFragment.java

@@ -25,6 +25,9 @@
 import android.widget.Button;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.Nullable;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
 import io.material.catalog.feature.DemoFragment;
@@ -45,6 +48,14 @@ public View onCreateDemoView(
         layoutInflater.inflate(
             R.layout.cat_extended_fab_fragment, viewGroup, false /* attachToRoot */);
 
+    ViewCompat.setOnApplyWindowInsetsListener(
+        root,
+        (v, insets) -> {
+          Insets navBarInsets = insets.getInsets(WindowInsetsCompat.Type.navigationBars());
+          v.setPadding(0, 0, 0, navBarInsets.bottom);
+          return insets;
+        });
+
     ViewGroup content = root.findViewById(R.id.content);
     View.inflate(getContext(), getExtendedFabContent(), content);
 

catalog/java/io/material/catalog/fab/FabMainDemoFragment.java

@@ -26,6 +26,9 @@
 import android.widget.Button;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.Nullable;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
 import io.material.catalog.feature.DemoFragment;
@@ -43,6 +46,14 @@ public View onCreateDemoView(
     View view =
         layoutInflater.inflate(R.layout.cat_fab_fragment, viewGroup, false /* attachToRoot */);
 
+    ViewCompat.setOnApplyWindowInsetsListener(
+        view,
+        (v, insets) -> {
+          Insets navBarInsets = insets.getInsets(WindowInsetsCompat.Type.navigationBars());
+          v.setPadding(0, 0, 0, navBarInsets.bottom);
+          return insets;
+        });
+
     ViewGroup content = view.findViewById(R.id.content);
     View.inflate(getContext(), getFabsContent(), content);
     View.inflate(getContext(), getThemeFabLayoutResId(), content);

catalog/java/io/material/catalog/fab/res/layout/cat_extended_fab_fragment.xml

@@ -54,8 +54,4 @@
         android:layout_margin="8dp"
         android:text="@string/shrink_fabs_label"/>
   </LinearLayout>
-
-  <io.material.catalog.feature.BottomWindowInsetView
-      android:layout_width="match_parent"
-      android:layout_height="0dp" />
 </LinearLayout>

catalog/java/io/material/catalog/fab/res/layout/cat_fab_fragment.xml

@@ -61,10 +61,4 @@
       android:text="@string/rotate_fabs_label"/>
   </LinearLayout>
 
-
-  <io.material.catalog.feature.BottomWindowInsetView
-      android:layout_width="wrap_content"
-      android:layout_height="0dp"
-      />
-
 </LinearLayout>

catalog/java/io/material/catalog/feature/BottomWindowInsetView.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.material.catalog.listitem;
+
+/** A sample data class used to represent List Items **/
+class CustomListItemData {
+  String text;
+  boolean checked;
+  int indexInSection;
+  int sectionCount;
+  String subheading;
+
+  public CustomListItemData(String text, int indexInSection, int sectionCount) {
+    this.text = text;
+    this.indexInSection = indexInSection;
+    this.sectionCount = sectionCount;
+  }
+
+  public CustomListItemData(String subheading) {
+    this.subheading = subheading;
+  }
+}

catalog/java/io/material/catalog/listitem/CustomListItemData.java

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package io.material.catalog.lists;
+package io.material.catalog.listitem;
 
 import io.material.catalog.R;
 
 import androidx.fragment.app.Fragment;
+import androidx.annotation.NonNull;
 import dagger.Provides;
 import dagger.android.ContributesAndroidInjector;
 import dagger.multibindings.IntoSet;
@@ -27,6 +28,8 @@
 import io.material.catalog.feature.Demo;
 import io.material.catalog.feature.DemoLandingFragment;
 import io.material.catalog.feature.FeatureDemo;
+import java.util.ArrayList;
+import java.util.List;
 
 /** A landing fragment that links to List demos for the Catalog app. */
 public class ListsFragment extends DemoLandingFragment {
@@ -42,6 +45,7 @@ public int getDescriptionResId() {
   }
 
   @Override
+  @NonNull
   public Demo getMainDemo() {
     return new Demo() {
       @Override
@@ -51,6 +55,27 @@ public Fragment createFragment() {
     };
   }
 
+  @Override
+  @NonNull
+  public List<Demo> getAdditionalDemos() {
+    List<Demo> additionalDemos = new ArrayList<>();
+    additionalDemos.add(
+        new Demo(R.string.cat_lists_segmented_demo_title) {
+          @Override
+          public Fragment createFragment() {
+            return new SegmentedListDemoFragment();
+          }
+        });
+    additionalDemos.add(
+        new Demo(R.string.cat_lists_multi_section_demo_title) {
+          @Override
+          public Fragment createFragment() {
+            return new MultiSectionListDemoFragment();
+          }
+        });
+    return additionalDemos;
+  }
+
   /** The Dagger module for {@link ListsFragment} dependencies. */
   @dagger.Module
   public abstract static class Module {