From 6007f5208514c4f69ca6fa75507abba92ef5372d Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Mon, 9 Oct 2017 16:59:04 -0700 Subject: Improved FAB UX. One of the biggest issues with the FAB is that it doesn't scale in/out properly. It looked more like setVisibility was being called instead. This CL migrates the FAB controller to use the built in scale in/out methods #show and #hide and the animation is much nicer. Some of the other issues were: - Now scaling animation is correct and visible. - No longer flashes when going in/out of search. - No longer shows on top of the return to call controller. - No longer bugs when switching between VVM TOS and contacts. - No longer shows FAB over VVM TOS when entering/exiting search Bug: 62588192,35359563,64116334,27458212,37991480,67419607 Test: manual PiperOrigin-RevId: 171608105 Change-Id: I9b3f61df35abf3659a432adf411b1b7d20eba683 --- .../widget/FloatingActionButtonController.java | 201 --------------------- 1 file changed, 201 deletions(-) delete mode 100644 java/com/android/contacts/common/widget/FloatingActionButtonController.java (limited to 'java/com/android/contacts/common') diff --git a/java/com/android/contacts/common/widget/FloatingActionButtonController.java b/java/com/android/contacts/common/widget/FloatingActionButtonController.java deleted file mode 100644 index d924681ea..000000000 --- a/java/com/android/contacts/common/widget/FloatingActionButtonController.java +++ /dev/null @@ -1,201 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.contacts.common.widget; - -import android.app.Activity; -import android.content.res.Resources; -import android.graphics.drawable.Drawable; -import android.support.design.widget.FloatingActionButton; -import android.view.View; -import android.view.animation.AnimationUtils; -import android.view.animation.Interpolator; -import com.android.contacts.common.R; -import com.android.dialer.animation.AnimUtils; -import com.android.dialer.common.Assert; - -/** Controls the movement and appearance of the FAB (Floating Action Button). */ -public class FloatingActionButtonController { - - public static final int ALIGN_MIDDLE = 0; - public static final int ALIGN_QUARTER_END = 1; - public static final int ALIGN_END = 2; - - private static final int FAB_SCALE_IN_DURATION = 266; - private static final int FAB_SCALE_IN_FADE_IN_DELAY = 100; - private static final int FAB_ICON_FADE_OUT_DURATION = 66; - - private final int mAnimationDuration; - private final int mFloatingActionButtonWidth; - private final int mFloatingActionButtonMarginRight; - private final FloatingActionButton mFab; - private final Interpolator mFabInterpolator; - private int mScreenWidth; - - public FloatingActionButtonController(Activity activity, FloatingActionButton fab) { - Resources resources = activity.getResources(); - mFabInterpolator = - AnimationUtils.loadInterpolator(activity, android.R.interpolator.fast_out_slow_in); - mFloatingActionButtonWidth = - resources.getDimensionPixelSize(R.dimen.floating_action_button_width); - mFloatingActionButtonMarginRight = - resources.getDimensionPixelOffset(R.dimen.floating_action_button_margin_right); - mAnimationDuration = resources.getInteger(R.integer.floating_action_button_animation_duration); - mFab = fab; - } - - /** - * Passes the screen width into the class. Necessary for translation calculations. Should be - * called as soon as parent View width is available. - * - * @param screenWidth The width of the screen in pixels. - */ - public void setScreenWidth(int screenWidth) { - mScreenWidth = screenWidth; - } - - public boolean isVisible() { - return mFab.getVisibility() == View.VISIBLE; - } - - /** - * Sets FAB as shown or hidden. - * - * @param visible Whether or not to make the container visible. - */ - public void setVisible(boolean visible) { - if (visible) { - mFab.show(); - } else { - mFab.hide(); - } - } - - public void changeIcon(Drawable icon, String description) { - if (mFab.getDrawable() != icon || !mFab.getContentDescription().equals(description)) { - mFab.setImageDrawable(icon); - mFab.setContentDescription(description); - } - } - - /** - * Updates the FAB location (middle to right position) as the PageView scrolls. - * - * @param positionOffset A fraction used to calculate position of the FAB during page scroll. - */ - public void onPageScrolled(float positionOffset) { - // As the page is scrolling, if we're on the first tab, update the FAB position so it - // moves along with it. - mFab.setTranslationX(positionOffset * getTranslationXForAlignment(ALIGN_END)); - } - - /** - * Aligns the FAB to the described location - * - * @param align One of ALIGN_MIDDLE, ALIGN_QUARTER_RIGHT, or ALIGN_RIGHT. - * @param animate Whether or not to animate the transition. - */ - public void align(int align, boolean animate) { - align(align, 0 /*offsetX */, 0 /* offsetY */, animate); - } - - /** - * Aligns the FAB to the described location plus specified additional offsets. - * - * @param align One of ALIGN_MIDDLE, ALIGN_QUARTER_RIGHT, or ALIGN_RIGHT. - * @param offsetX Additional offsetX to translate by. - * @param offsetY Additional offsetY to translate by. - * @param animate Whether or not to animate the transition. - */ - private void align(int align, int offsetX, int offsetY, boolean animate) { - if (mScreenWidth == 0) { - return; - } - - int translationX = getTranslationXForAlignment(align); - - // Skip animation if container is not shown; animation causes container to show again. - if (animate && mFab.isShown()) { - mFab.animate() - .translationX(translationX + offsetX) - .translationY(offsetY) - .setInterpolator(mFabInterpolator) - .setDuration(mAnimationDuration) - .start(); - } else { - mFab.setTranslationX(translationX + offsetX); - mFab.setTranslationY(offsetY); - } - } - - /** - * Scales the floating action button from no height and width to its actual dimensions. This is an - * animation for showing the floating action button. - * - * @param delayMs The delay for the effect, in milliseconds. - */ - public void scaleIn(int delayMs) { - setVisible(true); - AnimUtils.scaleIn(mFab, FAB_SCALE_IN_DURATION, delayMs); - AnimUtils.fadeIn(mFab, FAB_SCALE_IN_DURATION, delayMs + FAB_SCALE_IN_FADE_IN_DELAY, null); - } - - /** - * Scales the floating action button from its actual dimensions to no height and width. This is an - * animation for hiding the floating action button. - */ - public void scaleOut() { - AnimUtils.scaleOut(mFab, mAnimationDuration); - // Fade out the icon faster than the scale out animation, so that the icon scaling is less - // obvious. We don't want it to scale, but the resizing the container is not as performant. - AnimUtils.fadeOut(mFab, FAB_ICON_FADE_OUT_DURATION, null); - } - - /** - * Calculates the X offset of the FAB to the given alignment, adjusted for whether or not the view - * is in RTL mode. - * - * @param align One of ALIGN_MIDDLE, ALIGN_QUARTER_RIGHT, or ALIGN_RIGHT. - * @return The translationX for the given alignment. - */ - private int getTranslationXForAlignment(int align) { - int result; - switch (align) { - case ALIGN_MIDDLE: - // Moves the FAB to exactly center screen. - return 0; - case ALIGN_QUARTER_END: - // Moves the FAB a quarter of the screen width. - result = mScreenWidth / 4; - break; - case ALIGN_END: - // Moves the FAB half the screen width. Same as aligning right with a marginRight. - result = - mScreenWidth / 2 - mFloatingActionButtonWidth / 2 - mFloatingActionButtonMarginRight; - break; - default: - throw Assert.createIllegalStateFailException("Invalid alignment value: " + align); - } - if (isLayoutRtl()) { - result *= -1; - } - return result; - } - - private boolean isLayoutRtl() { - return mFab.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL; - } -} -- cgit v1.2.3