Skip to content

[FloatingActionButton] Use the current labelOpacity as the initial animation value #4696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[FloatingActionButton] Use the current labelOpacity as the initial animation value #4696

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion lib/java/com/google/android/material/floatingactionbutton/ExtendedFloatingActionButton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import android.view.ViewGroup.LayoutParams;
import android.view.ViewGroup.MarginLayoutParams;
import androidx.annotation.AnimatorRes;
import androidx.annotation.ColorInt;
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
Expand Down Expand Up @@ -460,6 +461,15 @@ private void saveOriginalTextCsl() {
originalTextCsl = getTextColors();
}

ColorStateList getOriginalTextColor() {
return originalTextCsl;
}

@ColorInt
int getCurrentOriginalTextColor() {
return originalTextCsl.getColorForState(getDrawableState(), 0);
}

/**
* Update the text color without affecting the original, client-set color.
*/
Expand Down Expand Up @@ -1417,7 +1427,9 @@ public AnimatorSet createAnimator() {

if (spec.hasPropertyValues("labelOpacity")) {
PropertyValuesHolder[] labelOpacityValues = spec.getPropertyValues("labelOpacity");
float startValue = extending ? 0F : 1F;
final int originalAlpha = Color.alpha(getCurrentOriginalTextColor());
final int currentAlpha = Color.alpha(getCurrentTextColor());
float startValue = originalAlpha != 0 ? (float) currentAlpha / originalAlpha : 0f;
float endValue = extending ? 1F : 0F;
labelOpacityValues[0].setFloatValues(startValue, endValue);
spec.setPropertyValues("labelOpacity", labelOpacityValues);
Expand Down