Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 16:49:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Utilize fast-in-extra-slow-out interpolator.

Browse Source
This commit is contained in:
Alex Hart
2021-09-07 15:02:23 -03:00
committed by Greyson Parrelli
parent 969e763997
commit a805f9b6b4
8 changed files with 47 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java
View File

@@ -47,6 +47,7 @@ import org.thoughtcrime.securesms.imageeditor.renderers.FaceBlurRenderer;
import org.thoughtcrime.securesms.imageeditor.renderers.MultiLineTextRenderer;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.mediasend.MediaSendPageFragment;
import org.thoughtcrime.securesms.mediasend.v2.MediaAnimations;
import org.thoughtcrime.securesms.mms.MediaConstraints;
import org.thoughtcrime.securesms.mms.PushMediaConstraints;
import org.thoughtcrime.securesms.mms.SentMediaQuality;
@@ -648,6 +649,7 @@ public final class ImageEditorFragment extends Fragment implements ImageEditorHu
resizeAnimation = new ResizeAnimation(imageEditorView, targetWidth, targetHeight);
resizeAnimation.setDuration(250);
resizeAnimation.setInterpolator(MediaAnimations.getInterpolator());
imageEditorView.startAnimation(resizeAnimation);
}
@@ -668,6 +670,7 @@ public final class ImageEditorFragment extends Fragment implements ImageEditorHu
resizeAnimation = new ResizeAnimation(imageEditorView, targetWidth, targetHeight);
resizeAnimation.setDuration(250);
resizeAnimation.setInterpolator(MediaAnimations.getInterpolator());
imageEditorView.startAnimation(resizeAnimation);
}

30
app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHudV2.kt
View File

@@ -11,7 +11,6 @@ import android.util.AttributeSet
import android.view.HapticFeedbackConstants
import android.view.MotionEvent
import android.view.View
import android.view.animation.DecelerateInterpolator
import android.widget.FrameLayout
import android.widget.ImageView
import android.widget.SeekBar
@@ -24,6 +23,7 @@ import com.airbnb.lottie.SimpleColorFilter
import com.google.android.material.switchmaterial.SwitchMaterial
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.components.TooltipPopup
import org.thoughtcrime.securesms.mediasend.v2.MediaAnimations
import org.thoughtcrime.securesms.scribbles.HSVColorSlider.getColor
import org.thoughtcrime.securesms.scribbles.HSVColorSlider.setColor
import org.thoughtcrime.securesms.scribbles.HSVColorSlider.setUpForColor
@@ -180,15 +180,9 @@ class ImageEditorHudV2 @JvmOverloads constructor(
widthSeekBar.setOnTouchListener { v, event ->
if (event.action == MotionEvent.ACTION_DOWN) {
v?.animate()
?.setDuration(ANIMATION_DURATION)
?.setInterpolator(DecelerateInterpolator())
?.translationX(ViewUtil.dpToPx(36).toFloat())
animateWidthSeekbarIn()
} else if (event.action == MotionEvent.ACTION_UP || event.action == MotionEvent.ACTION_CANCEL) {
v?.animate()
?.setDuration(ANIMATION_DURATION)
?.setInterpolator(DecelerateInterpolator())
?.translationX(0f)
animateWidthSeekbarOut()
}
v.onTouchEvent(event)
@@ -197,6 +191,20 @@ class ImageEditorHudV2 @JvmOverloads constructor(
widthSeekBar.progress = 20
}
private fun animateWidthSeekbarIn() {
widthSeekBar.animate()
?.setDuration(ANIMATION_DURATION)
?.setInterpolator(MediaAnimations.interpolator)
?.translationX(ViewUtil.dpToPx(36).toFloat())
}
private fun animateWidthSeekbarOut() {
widthSeekBar.animate()
?.setDuration(ANIMATION_DURATION)
?.setInterpolator(MediaAnimations.interpolator)
?.translationX(0f)
}
fun setUpForAvatarEditing() {
isAvatarEdit = true
}
@@ -292,6 +300,7 @@ class ImageEditorHudV2 @JvmOverloads constructor(
ObjectAnimator.ofFloat(deleteBackground, "scaleY", deleteBackground.scaleY, 1.365f),
)
duration = ANIMATION_DURATION
interpolator = MediaAnimations.interpolator
start()
}
}
@@ -304,6 +313,7 @@ class ImageEditorHudV2 @JvmOverloads constructor(
ObjectAnimator.ofFloat(deleteBackground, "scaleY", deleteBackground.scaleY, 1f),
)
duration = ANIMATION_DURATION
interpolator = MediaAnimations.interpolator
start()
}
}
@@ -440,6 +450,7 @@ class ImageEditorHudV2 @JvmOverloads constructor(
modeAnimatorSet = AnimatorSet().apply {
playTogether(animations)
duration = ANIMATION_DURATION
interpolator = MediaAnimations.interpolator
start()
}
}
@@ -454,6 +465,7 @@ class ImageEditorHudV2 @JvmOverloads constructor(
undoAnimatorSet = AnimatorSet().apply {
playTogether(animations)
duration = ANIMATION_DURATION
interpolator = MediaAnimations.interpolator
start()
}
}