Merge branch 'master' into release-1.10

Author: hunterstich

.travis.yml

@@ -1,4 +1,3 @@
-[![Build Status](https://img.shields.io/travis/material-components/material-components-android/master.svg)](https://travis-ci.org/material-components/material-components-android/)
 [![Chat](https://img.shields.io/discord/259087343246508035.svg)](https://discord.gg/material-components)
 
 # Material Components for Android

README.md

@@ -17,27 +17,30 @@ allprojects {
 }
 
 ext {
-  compileSdkVersion = 'android-UpsideDownCake'
+  compileSdkVersion = 34
   minSdkVersion = 14
   targetSdkVersion = 33
 
   androidXVersions = [
-    annotation            : '1.2.0',
-    appCompat             : '1.6.1',
-    cardView              : '1.0.0',
-    constraintlayout      : '2.0.1',
-    coordinatorlayout     : '1.1.0',
-    core                  : '1.6.0',
-    drawerlayout          : '1.1.1',
-    experimental          : '1.0.0',
-    fragment              : '1.2.5',
-    lifecycle             : '2.0.0',
-    recyclerView          : '1.0.0',
-    recyclerViewSelection : '1.0.0',
-    transition            : '1.2.0',
-    vectorDrawable        : '1.1.0',
-    viewpager2            : '1.0.0',
-    dynamicanimation      : '1.0.0',
+    activity                     : '1.8.0-alpha05',
+    annotation                   : '1.2.0',
+    appCompat                    : '1.6.1',
+    cardView                     : '1.0.0',
+    constraintlayout             : '2.0.1',
+    coordinatorlayout            : '1.1.0',
+    core                         : '1.6.0',
+    drawerlayout                 : '1.1.1',
+    experimental                 : '1.0.0',
+    fragment                     : '1.2.5',
+    lifecycle                    : '2.0.0',
+    recyclerView                 : '1.0.0',
+    recyclerViewSelection        : '1.0.0',
+    resourceInspectionAnnotation : '1.0.1',
+    resourceInspectionProcessor  : '1.0.1',
+    transition                   : '1.2.0',
+    vectorDrawable               : '1.1.0',
+    viewpager2                   : '1.0.0',
+    dynamicanimation             : '1.0.0',
   ]
 
   errorproneVersion = '2.15.0'
@@ -55,7 +58,7 @@ ext {
     ? project.property('mavenRepoUrl') : '/tmp/myRepo/')
 
   // Current version of the library (could be in-development/unreleased).
-  mdcLibraryVersion = '1.10.0-alpha03'
+  mdcLibraryVersion = '1.10.0-alpha04'
   mdcLibraryPackage = "com.google.android.material"
   mdcLibraryDir = "com/google/android/material"
 }
@@ -84,6 +87,8 @@ private def getTransformedProjectPath(projectPath) {
  */
 def compatibility(name) {
   switch (name) {
+    case "activity":
+      return "androidx.activity:activity:${androidXVersions.activity}"
     case "annotation":
       return "androidx.annotation:annotation:${androidXVersions.annotation}"
     case "appcompat":
@@ -112,6 +117,10 @@ def compatibility(name) {
       return "androidx.vectordrawable:vectordrawable:${androidXVersions.vectorDrawable}"
     case "recyclerViewSelection":
       return "androidx.recyclerview:recyclerview-selection:${androidXVersions.recyclerViewSelection}"
+    case "resourceInspectionAnnotation":
+      return "androidx.resourceinspection:resourceinspection-annotation:${androidXVersions.resourceInspectionAnnotation}"
+    case "resourceInspectionProcessor":
+      return "androidx.resourceinspection:resourceinspection-processor:${androidXVersions.resourceInspectionProcessor}"
     case "viewpager2":
       return "androidx.viewpager2:viewpager2:${androidXVersions.viewpager2}"
     case "experimental":

build.gradle

@@ -8,24 +8,24 @@ dependencies {
     }
   }
 
-  api 'com.google.dagger:dagger:2.45'
-  annotationProcessor 'com.google.dagger:dagger-compiler:2.46'
+  api 'com.google.dagger:dagger:2.46.1'
+  annotationProcessor 'com.google.dagger:dagger-compiler:2.46.1'
 
-  api 'com.google.dagger:dagger-android:2.45'
+  api 'com.google.dagger:dagger-android:2.46.1'
   api 'com.google.dagger:dagger-android-support:2.46'
-  annotationProcessor 'com.google.dagger:dagger-android-processor:2.45'
+  annotationProcessor 'com.google.dagger:dagger-android-processor:2.46.1'
 
   api 'androidx.multidex:multidex:2.0.1'
   api 'androidx.constraintlayout:constraintlayout:2.1.0'
   api 'androidx.gridlayout:gridlayout:1.0.0'
   api "androidx.multidex:multidex:2.0.1"
-  api "androidx.activity:activity:1.8.0-alpha02"
+  api "androidx.activity:activity:1.8.0-alpha05"
   api "androidx.recyclerview:recyclerview:1.2.1"
   api 'androidx.window:window:1.0.0-beta04'
   api "androidx.window:window-java:1.0.0-beta04"
   api "androidx.preference:preference:1.1.1"
 
-  api 'com.google.guava:guava:31.1-android'
+  api 'com.google.guava:guava:32.0.0-android'
 
   api 'com.github.bumptech.glide:glide:4.15.1'
 

catalog/build.gradle

@@ -18,7 +18,6 @@
 
 import io.material.catalog.R;
 
-import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
@@ -29,12 +28,11 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityEvent;
-import android.window.BackEvent;
+import androidx.activity.BackEventCompat;
 import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import com.google.android.material.bottomappbar.BottomAppBar;
 import com.google.android.material.bottomappbar.BottomAppBarTopEdgeTreatment;
@@ -59,15 +57,13 @@ public class BottomAppBarMainDemoFragment extends DemoFragment {
 
   private final OnBackPressedCallback bottomDrawerOnBackPressedCallback =
       new OnBackPressedCallback(/* enabled= */ false) {
-        @RequiresApi(VERSION_CODES.UPSIDE_DOWN_CAKE)
         @Override
-        public void handleOnBackStarted(@NonNull BackEvent backEvent) {
+        public void handleOnBackStarted(@NonNull BackEventCompat backEvent) {
           bottomDrawerBehavior.startBackProgress(backEvent);
         }
 
-        @RequiresApi(VERSION_CODES.UPSIDE_DOWN_CAKE)
         @Override
-        public void handleOnBackProgressed(@NonNull BackEvent backEvent) {
+        public void handleOnBackProgressed(@NonNull BackEventCompat backEvent) {
           bottomDrawerBehavior.updateBackProgress(backEvent);
         }
 
@@ -76,7 +72,6 @@ public void handleOnBackPressed() {
           bottomDrawerBehavior.handleBackInvoked();
         }
 
-        @RequiresApi(VERSION_CODES.UPSIDE_DOWN_CAKE)
         @Override
         public void handleOnBackCancelled() {
           bottomDrawerBehavior.cancelBackProgress();

catalog/java/io/material/catalog/bottomappbar/BottomAppBarMainDemoFragment.java

@@ -34,6 +34,7 @@
 import com.google.android.material.badge.BadgeDrawable;
 import com.google.android.material.badge.BadgeDrawable.BadgeGravity;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
+import com.google.android.material.materialswitch.MaterialSwitch;
 import com.google.android.material.navigation.NavigationBarView.OnItemSelectedListener;
 import io.material.catalog.feature.DemoFragment;
 import io.material.catalog.feature.DemoUtils;
@@ -193,6 +194,15 @@ public void onItemSelected(AdapterView<?> parent, View view, int position, long
           @Override
           public void onNothingSelected(AdapterView<?> parent) {}
         });
+
+    MaterialSwitch materialSwitch = view.findViewById(R.id.bold_text_switch);
+    materialSwitch.setChecked(true);
+    materialSwitch.setOnCheckedChangeListener(
+        (buttonView, isChecked) -> {
+          for (BottomNavigationView bn : bottomNavigationViews) {
+            bn.setItemTextAppearanceActiveBoldEnabled(isChecked);
+          }
+        });
   }
 
   private void initAddIncreaseBadgeNumberButton(Button incrementBadgeNumberButton) {

catalog/java/io/material/catalog/bottomnav/BottomNavigationDemoFragment.java

@@ -102,7 +102,22 @@
             android:layout_width="wrap_content"
             android:layout_height="48dp"/>
       </LinearLayout>
-
+      <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <TextView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_gravity="end|center_vertical"
+          android:labelFor="@+id/bold_text_switch"
+          android:text="@string/cat_bottom_nav_label_active_bold" />
+        <com.google.android.material.materialswitch.MaterialSwitch
+          android:id="@+id/bold_text_switch"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginStart="12dp" />
+      </LinearLayout>
     </LinearLayout>
   </ScrollView>
   <FrameLayout

catalog/java/io/material/catalog/bottomnav/res/layout/cat_bottom_nav_fragment.xml

@@ -57,6 +57,7 @@
   <string name="cat_bottom_nav_badge_gravity_bottom_start">Bottom start</string>
 
   <string name="cat_bottom_nav_badge_gravity_spinner_label">Badge gravity</string>
+  <string name="cat_bottom_nav_label_active_bold" translatable="false">Bold active label</string>
 
 </resources>
 

catalog/java/io/material/catalog/bottomnav/res/values/strings.xml

@@ -19,7 +19,6 @@
 import io.material.catalog.R;
 
 import android.app.Activity;
-import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
@@ -29,12 +28,11 @@
 import android.widget.FrameLayout;
 import android.widget.TextView;
 import android.widget.Toast;
-import android.window.BackEvent;
+import androidx.activity.BackEventCompat;
 import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
@@ -50,15 +48,13 @@ public class BottomSheetMainDemoFragment extends DemoFragment {
   private final OnBackPressedCallback persistentBottomSheetBackCallback =
       new OnBackPressedCallback(/* enabled= */ false) {
 
-        @RequiresApi(VERSION_CODES.UPSIDE_DOWN_CAKE)
         @Override
-        public void handleOnBackStarted(@NonNull BackEvent backEvent) {
+        public void handleOnBackStarted(@NonNull BackEventCompat backEvent) {
           persistentBottomSheetBehavior.startBackProgress(backEvent);
         }
 
-        @RequiresApi(VERSION_CODES.UPSIDE_DOWN_CAKE)
         @Override
-        public void handleOnBackProgressed(@NonNull BackEvent backEvent) {
+        public void handleOnBackProgressed(@NonNull BackEventCompat backEvent) {
           persistentBottomSheetBehavior.updateBackProgress(backEvent);
         }
 
@@ -67,7 +63,6 @@ public void handleOnBackPressed() {
           persistentBottomSheetBehavior.handleBackInvoked();
         }
 
-        @RequiresApi(VERSION_CODES.UPSIDE_DOWN_CAKE)
         @Override
         public void handleOnBackCancelled() {
           persistentBottomSheetBehavior.cancelBackProgress();

catalog/java/io/material/catalog/bottomsheet/BottomSheetMainDemoFragment.java

@@ -64,7 +64,13 @@ public List<Demo> getAdditionalDemos() {
         new Demo(R.string.cat_carousel_multi_browse_demo_title) {
           @Override
           public Fragment createFragment() {
-            return new MultiBrowseDemoFragment();
+            return new MultiBrowseCarouselDemoFragment();
+          }
+        },
+        new Demo(R.string.cat_carousel_hero_demo_title) {
+          @Override
+          public Fragment createFragment() {
+            return new HeroCarouselDemoFragment();
           }
         },
         new Demo(R.string.cat_carousel_default_list_demo_title) {