Skip to content
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

Jump to bottom

remove hardcode #13

Merged
merged 1 commit into from
Aug 4, 2016
Merged

remove hardcode #13

Show file tree
Hide file tree
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
16 changes: 8 additions & 8 deletions fabtransitionlayout/src/main/java/com/bowyer/app/fabtransitionlayout/BottomSheetLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,11 +289,11 @@ public boolean isFabExpanded() {
mFabExpandLayout.setVisibility(View.VISIBLE);

Animator fabSlideXAnim = ObjectAnimator.ofPropertyValuesHolder(mFab,
PropertyValuesHolder.ofFloat("translationX", 0f, dx));
PropertyValuesHolder.ofFloat(View.TRANSLATION_X, 0f, dx));
fabSlideXAnim.setDuration(animationDuration / 2);

Animator fabSlideYAnim = ObjectAnimator.ofPropertyValuesHolder(mFab,
PropertyValuesHolder.ofFloat("translationY", 0f, dy));
PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, 0f, dy));
fabSlideYAnim.setDuration(animationDuration / 2);

Animator toolbarExpandAnim =
Expand Down Expand Up @@ -356,11 +356,11 @@ private void expandPreLollipop() {
mFabExpandLayout.setVisibility(View.VISIBLE);

Animator fabSlideXAnim = ObjectAnimator.ofPropertyValuesHolder(mFab,
PropertyValuesHolder.ofFloat("translationX", 0f, dx));
PropertyValuesHolder.ofFloat(View.TRANSLATION_X, 0f, dx));
fabSlideXAnim.setDuration(animationDuration / 2);

Animator fabSlideYAnim = ObjectAnimator.ofPropertyValuesHolder(mFab,
PropertyValuesHolder.ofFloat("translationY", 0f, dy));
PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, 0f, dy));
fabSlideYAnim.setDuration(animationDuration / 2);

final SupportAnimator toolbarExpandAnim =
Expand Down Expand Up @@ -435,12 +435,12 @@ private void expandPreLollipop() {
Math.max(y, mFabExpandLayout.getHeight() - y));

Animator fabSlideXAnim = ObjectAnimator.ofPropertyValuesHolder(mFab,
PropertyValuesHolder.ofFloat("translationX", dx, 0f));
PropertyValuesHolder.ofFloat(View.TRANSLATION_X, dx, 0f));
fabSlideXAnim.setStartDelay(animationDuration / 2);
fabSlideXAnim.setDuration(animationDuration / 2);

Animator fabSlideYAnim = ObjectAnimator.ofPropertyValuesHolder(mFab,
PropertyValuesHolder.ofFloat("translationY", dy, 0f));
PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, dy, 0f));
fabSlideYAnim.setStartDelay(animationDuration / 2);
fabSlideYAnim.setDuration(animationDuration / 2);

Expand Down Expand Up @@ -498,11 +498,11 @@ private void contractPreLollipop() {
Math.max(y, mFabExpandLayout.getHeight() - y));

Animator fabSlideXAnim = ObjectAnimator.ofPropertyValuesHolder(mFab,
PropertyValuesHolder.ofFloat("translationX", dx, 0f));
PropertyValuesHolder.ofFloat(View.TRANSLATION_X, dx, 0f));
fabSlideXAnim.setDuration(animationDuration / 2);

Animator fabSlideYAnim = ObjectAnimator.ofPropertyValuesHolder(mFab,
PropertyValuesHolder.ofFloat("translationY", dy, 0f));
PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, dy, 0f));
fabSlideYAnim.setDuration(animationDuration / 2);

final SupportAnimator toolbarContractAnim =
Expand Down
16 changes: 8 additions & 8 deletions fabtransitionlayout/src/main/java/com/bowyer/app/fabtransitionlayout/FooterLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,11 @@ public boolean isFabExpanded() {
mFabExpandLayout.setVisibility(View.VISIBLE);

Animator fabSlideXAnim = ObjectAnimator.ofPropertyValuesHolder(mFab,
PropertyValuesHolder.ofFloat("translationX", 0f, dx));
PropertyValuesHolder.ofFloat(View.TRANSLATION_X, 0f, dx));
fabSlideXAnim.setDuration(animationDuration / 2);

Animator fabSlideYAnim = ObjectAnimator.ofPropertyValuesHolder(mFab,
PropertyValuesHolder.ofFloat("translationY", 0f, dy));
PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, 0f, dy));
fabSlideYAnim.setDuration(animationDuration / 2);

Animator toolbarExpandAnim =
Expand Down Expand Up @@ -343,11 +343,11 @@ private void expandPreLollipop() {
mFabExpandLayout.setVisibility(View.VISIBLE);

Animator fabSlideXAnim = ObjectAnimator.ofPropertyValuesHolder(mFab,
PropertyValuesHolder.ofFloat("translationX", 0f, dx));
PropertyValuesHolder.ofFloat(View.TRANSLATION_X, 0f, dx));
fabSlideXAnim.setDuration(animationDuration / 2);

Animator fabSlideYAnim = ObjectAnimator.ofPropertyValuesHolder(mFab,
PropertyValuesHolder.ofFloat("translationY", 0f, dy));
PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, 0f, dy));
fabSlideYAnim.setDuration(animationDuration / 2);

final SupportAnimator toolbarExpandAnim =
Expand Down Expand Up @@ -422,12 +422,12 @@ private void expandPreLollipop() {
Math.max(y, mFabExpandLayout.getHeight() - y));

Animator fabSlideXAnim = ObjectAnimator.ofPropertyValuesHolder(mFab,
PropertyValuesHolder.ofFloat("translationX", dx, 0f));
PropertyValuesHolder.ofFloat(View.TRANSLATION_X, dx, 0f));
fabSlideXAnim.setStartDelay(animationDuration / 2);
fabSlideXAnim.setDuration(animationDuration / 2);

Animator fabSlideYAnim = ObjectAnimator.ofPropertyValuesHolder(mFab,
PropertyValuesHolder.ofFloat("translationY", dy, 0f));
PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, dy, 0f));
fabSlideYAnim.setStartDelay(animationDuration / 2);
fabSlideYAnim.setDuration(animationDuration / 2);

Expand Down Expand Up @@ -487,11 +487,11 @@ private void contractPreLollipop() {
Math.max(y, mFabExpandLayout.getHeight() - y));

Animator fabSlideXAnim = ObjectAnimator.ofPropertyValuesHolder(mFab,
PropertyValuesHolder.ofFloat("translationX", dx, 0f));
PropertyValuesHolder.ofFloat(View.TRANSLATION_X, dx, 0f));
fabSlideXAnim.setDuration(animationDuration / 2);

Animator fabSlideYAnim = ObjectAnimator.ofPropertyValuesHolder(mFab,
PropertyValuesHolder.ofFloat("translationY", dy, 0f));
PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, dy, 0f));
fabSlideYAnim.setDuration(animationDuration / 2);

final SupportAnimator toolbarContractAnim =
Expand Down