luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-04-21 22:39:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1188 from alexbakker/fix-anim-issues

Browse source 
Fix two issues related to animation duration scale
This commit is contained in:
Michael Schättgen 2023-09-11 21:34:33 +02:00 • committed by GitHub
commit 0760bfc618
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/beemdevelopment/aegis/ui/EditEntryActivity.java
View file

@ -377,12 +377,12 @@ public class EditEntryActivity extends AegisActivity {
private void openAdvancedSettings() { private void openAdvancedSettings() {
Animation fadeOut = new AlphaAnimation(1, 0); Animation fadeOut = new AlphaAnimation(1, 0);
fadeOut.setInterpolator(new AccelerateInterpolator()); fadeOut.setInterpolator(new AccelerateInterpolator());
fadeOut.setDuration(220 * (long) AnimationsHelper.Scale.ANIMATOR.getValue(this)); fadeOut.setDuration((long) (220 * AnimationsHelper.Scale.ANIMATOR.getValue(this)));
_advancedSettingsHeader.startAnimation(fadeOut); _advancedSettingsHeader.startAnimation(fadeOut);
Animation fadeIn = new AlphaAnimation(0, 1); Animation fadeIn = new AlphaAnimation(0, 1);
fadeIn.setInterpolator(new AccelerateInterpolator()); fadeIn.setInterpolator(new AccelerateInterpolator());
fadeIn.setDuration(250 * (long) AnimationsHelper.Scale.ANIMATOR.getValue(this)); fadeIn.setDuration((long) (250 * AnimationsHelper.Scale.ANIMATOR.getValue(this)));
fadeOut.setAnimationListener(new SimpleAnimationEndListener((a) -> { fadeOut.setAnimationListener(new SimpleAnimationEndListener((a) -> {
_advancedSettingsHeader.setVisibility(View.GONE); _advancedSettingsHeader.setVisibility(View.GONE);

5
app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java
View file

@ -18,6 +18,7 @@ import com.beemdevelopment.aegis.R;
import com.beemdevelopment.aegis.ViewMode; import com.beemdevelopment.aegis.ViewMode;
import com.beemdevelopment.aegis.helpers.AnimationsHelper; import com.beemdevelopment.aegis.helpers.AnimationsHelper;
import com.beemdevelopment.aegis.helpers.IconViewHelper; import com.beemdevelopment.aegis.helpers.IconViewHelper;
import com.beemdevelopment.aegis.helpers.SimpleAnimationEndListener;
import com.beemdevelopment.aegis.helpers.TextDrawableHelper; import com.beemdevelopment.aegis.helpers.TextDrawableHelper;
import com.beemdevelopment.aegis.helpers.ThemeHelper; import com.beemdevelopment.aegis.helpers.ThemeHelper;
import com.beemdevelopment.aegis.helpers.UiRefresher; import com.beemdevelopment.aegis.helpers.UiRefresher;
@ -258,7 +259,9 @@ public class EntryHolder extends RecyclerView.ViewHolder {
_selected.startAnimation(_scaleIn); _selected.startAnimation(_scaleIn);
} else { } else {
_selected.startAnimation(_scaleOut); _selected.startAnimation(_scaleOut);
_selectedHandler.postDelayed(() -> _selected.setVisibility(View.GONE), 150); _scaleOut.setAnimationListener(new SimpleAnimationEndListener(animation -> {
_selected.setVisibility(View.GONE);
}));
} }
} }