Merge "BottomAppBar window inset fix."

Author: hunterstich

app/src/main/AndroidManifest.xml

@@ -9,10 +9,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Reply.DayNight">
-        <activity android:name="com.materialstudies.reply.ui.MainActivity">
+        <activity android:name=".ui.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>

app/src/main/java/com/materialstudies/reply/ui/MainActivity.kt

@@ -159,6 +159,7 @@ class MainActivity : AppCompatActivity(),
     private fun setBottomAppBarForHome(@MenuRes menuRes: Int) {
         binding.run {
             fab.setImageState(intArrayOf(-android.R.attr.state_activated), true)
+            bottomAppBar.visibility = View.VISIBLE
             bottomAppBar.replaceMenu(menuRes)
             fab.contentDescription = getString(R.string.fab_compose_email_content_description)
             bottomAppBarTitle.visibility = View.VISIBLE
@@ -170,6 +171,7 @@ class MainActivity : AppCompatActivity(),
     private fun setBottomAppBarForEmail(@MenuRes menuRes: Int) {
         binding.run {
             fab.setImageState(intArrayOf(android.R.attr.state_activated), true)
+            bottomAppBar.visibility = View.VISIBLE
             bottomAppBar.replaceMenu(menuRes)
             fab.contentDescription = getString(R.string.fab_reply_email_content_description)
             bottomAppBarTitle.visibility = View.INVISIBLE
@@ -182,6 +184,9 @@ class MainActivity : AppCompatActivity(),
         binding.run {
             bottomAppBar.performHide()
             fab.hide()
+            // Hide the BottomAppBar to avoid it showing above the keyboard
+            // when composing a new email.
+            bottomAppBar.visibility = View.GONE
         }
     }
 

app/src/main/java/com/materialstudies/reply/util/BindingAdapter.kt

@@ -16,11 +16,8 @@
 package com.materialstudies.reply.util
 
 import android.content.Context
-import android.graphics.Color
-import android.graphics.Rect
 import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.Drawable
-import android.graphics.drawable.GradientDrawable
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
@@ -30,11 +27,6 @@ import android.widget.ImageView
 import android.widget.Spinner
 import android.widget.TextView
 import androidx.annotation.DrawableRes
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.blue
-import androidx.core.graphics.green
-import androidx.core.graphics.red
-import androidx.core.view.doOnNextLayout
 import androidx.core.view.updateLayoutParams
 import androidx.databinding.BindingAdapter
 import com.bumptech.glide.Glide
@@ -180,26 +172,6 @@ fun View.bindLayoutFullscreen(previousFullscreen: Boolean, fullscreen: Boolean)
     }
 }
 
-@BindingAdapter(
-    "heightAdditiveTopSystemWindowInsets",
-    "heightAdditiveBottomSystemWindowInsets",
-    requireAll = false
-)
-fun View.bindSystemWindowInsetHeight(
-    previousApplyTop: Boolean,
-    previousApplyBottom: Boolean,
-    applyTop: Boolean,
-    applyBottom: Boolean
-) {
-    if (previousApplyTop == applyTop && previousApplyBottom == applyBottom) return
-    doOnApplyWindowInsets { view, insets, _, _, initialHeight ->
-        val top = if (applyTop) insets.systemWindowInsetTop else 0
-        val bottom = if (applyBottom) insets.systemWindowInsetBottom else 0
-
-        view.layoutParams.height = initialHeight + top + bottom
-    }
-}
-
 @BindingAdapter(
     "paddingLeftSystemWindowInsets",
     "paddingTopSystemWindowInsets",

app/src/main/res/layout/activity_main.xml

@@ -41,14 +41,12 @@
         <com.google.android.material.bottomappbar.BottomAppBar
             android:id="@+id/bottom_app_bar"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/bottom_app_bar_height"
+            android:layout_height="wrap_content"
             android:layout_gravity="bottom"
-            android:gravity="top"
             app:fabAlignmentMode="center"
             app:fabCradleRoundedCornerRadius="@dimen/bottom_app_bar_fab_cradle_corner_radius"
             app:fabCradleMargin="@dimen/bottom_app_bar_fab_cradle_margin"
-            app:hideOnScroll="true"
-            app:heightAdditiveBottomSystemWindowInsets="@{true}">
+            app:hideOnScroll="true">
 
             <LinearLayout
                 android:id="@+id/bottom_app_bar_content_container"