Merge branch 'master' into remove_todo_snackbar

Author: MGaetan89

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

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

@@ -25,6 +25,7 @@
 import android.os.Bundle;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.widget.Toolbar;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -36,6 +37,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.drawerlayout.widget.DrawerLayout.LayoutParams;
 import androidx.drawerlayout.widget.DrawerLayout.SimpleDrawerListener;
@@ -192,4 +194,15 @@ public void onBackCancelled() {
       }
     };
   }
+
+  @Override
+  public boolean onKeyDown(int keyCode, KeyEvent keyEvent) {
+    if (keyCode == KeyEvent.KEYCODE_ESCAPE
+        && (drawerLayout.isDrawerOpen(GravityCompat.START)
+            || drawerLayout.isDrawerOpen(GravityCompat.END))) {
+      drawerLayout.closeDrawers();
+      return true;
+    }
+    return super.onKeyDown(keyCode, keyEvent);
+  }
 }

catalog/java/io/material/catalog/navigationdrawer/CustomNavigationDrawerDemoActivity.java

@@ -21,6 +21,7 @@
 import android.os.Bundle;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.widget.Toolbar;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -123,6 +124,17 @@ private void initNavigationView(NavigationView navigationView) {
         });
   }
 
+  @Override
+  public boolean onKeyDown(int keyCode, KeyEvent keyEvent) {
+    if (keyCode == KeyEvent.KEYCODE_ESCAPE
+        && (drawerLayout.isDrawerOpen(GravityCompat.START)
+            || drawerLayout.isDrawerOpen(GravityCompat.END))) {
+      drawerLayout.closeDrawers();
+      return true;
+    }
+    return super.onKeyDown(keyCode, keyEvent);
+  }
+
   @Override
   protected boolean shouldShowDefaultDemoActionBar() {
     return false;