DEV/material-components_material-components-android
1
0
Fork 0
mirror of https://github.com/material-components/material-components-android.git synced 2026-02-20 08:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[SnackBar] Fix margins are added multiple times when show() is called

Browse Source 
When a snack bar is hidden and its show() method is called, it will be added to the target parent, and at this moment the parent view will set the layout params to the snack bar, with the same existing margins if any. Therefore if the margins are already updated with extra margins, the original margins will be incorrectly updated. This CL introduces a flag to tells this situation from other "real" scenarios in which clients want to update their custom margins.

Resolves https://github.com/material-components/material-components-android/issues/2666

PiperOrigin-RevId: 445159923
(cherry picked from commit 46fa8cc45b8bb6d1423f7349986c7f3f4cdc5d4e)
This commit is contained in:
conradchen 2022-04-28 11:35:42 -04:00 committed by Dan Nizri
parent d6cd0e6910
commit 2bfc7bae07
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/java/com/google/android/material/snackbar/BaseTransientBottomBar.java
View File

@ -712,7 +712,7 @@ public abstract class BaseTransientBottomBar<B extends BaseTransientBottomBar<B>
setUpBehavior((CoordinatorLayout.LayoutParams) lp);
}
targetParent.addView(this.view);
this.view.addToTargetParent(targetParent);
recalculateAndUpdateMargins();
// Set view to INVISIBLE so it doesn't flash on the screen before the inset adjustment is
@ -1111,6 +1111,7 @@ public abstract class BaseTransientBottomBar<B extends BaseTransientBottomBar<B>
private PorterDuff.Mode backgroundTintMode;
@Nullable private Rect originalMargins;
private boolean addingToTargetParent;
protected SnackbarBaseLayout(@NonNull Context context) {
this(context, null);
@ -1233,7 +1234,10 @@ public abstract class BaseTransientBottomBar<B extends BaseTransientBottomBar<B>
@Override
public void setLayoutParams(ViewGroup.LayoutParams params) {
super.setLayoutParams(params);
if (params instanceof MarginLayoutParams) {
if (!addingToTargetParent && params instanceof MarginLayoutParams) {
// Do not update the original margins when the layout is being added to its target parent,
// since the margins are just copied from the existing layout params, which can already be
// updated with extra margins.
updateOriginalMargins((MarginLayoutParams) params);
if (baseTransientBottomBar != null) {
baseTransientBottomBar.updateMargins();
@ -1266,6 +1270,12 @@ public abstract class BaseTransientBottomBar<B extends BaseTransientBottomBar<B>
return maxInlineActionWidth;
}
void addToTargetParent(ViewGroup targetParent) {
addingToTargetParent = true;
targetParent.addView(this);
addingToTargetParent = false;
}
private void setBaseTransientBottomBar(BaseTransientBottomBar<?> baseTransientBottomBar) {
this.baseTransientBottomBar = baseTransientBottomBar;
}