Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing merge conflicts

This commit is contained in:
LucasGGamerM 2023-02-17 18:35:29 -03:00
parent 1e2dd3dec6 e12d19d0d6
commit da5f3a9094
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
View File

@ -894,8 +894,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
currentPhotoViewer.offsetView(0, oldScrollY-scrollY); currentPhotoViewer.offsetView(0, oldScrollY-scrollY);
} }
if (GlobalUserPreferences.enableFabAutoHide) { if(GlobalUserPreferences.enableFabAutoHide){
int dy = scrollY - oldScrollY; int dy = scrollY - oldScrollY;
if (dy > 0 && fab.getVisibility() == View.VISIBLE) { if (dy > 0 && fab.getVisibility() == View.VISIBLE) {
TranslateAnimation animate = new TranslateAnimation( TranslateAnimation animate = new TranslateAnimation(
0, 0,
@ -903,12 +904,11 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
0, 0,
fab.getHeight() * 2); fab.getHeight() * 2);
animate.setDuration(300); animate.setDuration(300);
animate.setFillAfter(true);
fab.startAnimation(animate); fab.startAnimation(animate);
fab.setVisibility(View.INVISIBLE); fab.setVisibility(View.INVISIBLE);
scrollDiff = 0; scrollDiff = 0;
} else if (dy < 0 && fab.getVisibility() != View.VISIBLE) { } else if (dy < 0 && fab.getVisibility() != View.VISIBLE) {
if (v.getScrollY() == 0 || scrollDiff > 400) { if (scrollDiff > 400) {
fab.setVisibility(View.VISIBLE); fab.setVisibility(View.VISIBLE);
TranslateAnimation animate = new TranslateAnimation( TranslateAnimation animate = new TranslateAnimation(
0, 0,
@ -916,7 +916,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
fab.getHeight() * 2, fab.getHeight() * 2,
0); 0);
animate.setDuration(300); animate.setDuration(300);
animate.setFillAfter(true);
fab.startAnimation(animate); fab.startAnimation(animate);
scrollDiff = 0; scrollDiff = 0;
} else { } else {