TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 17:58:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved feel of reaction popover.

Browse Source
This commit is contained in:
Greyson Parrelli 2020-02-04 19:05:59 -05:00
parent 8f9ed4bc40
commit 4fcd6b15ed
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
View File

@ -7,14 +7,11 @@ import android.content.Context;
import android.graphics.PointF; import android.graphics.PointF;
import android.graphics.Rect; import android.graphics.Rect;
import android.os.Build; import android.os.Build;
import android.os.VibrationEffect;
import android.os.Vibrator;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.HapticFeedbackConstants; import android.view.HapticFeedbackConstants;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.animation.AccelerateInterpolator;
import android.view.animation.DecelerateInterpolator; import android.view.animation.DecelerateInterpolator;
import android.view.animation.Interpolator; import android.view.animation.Interpolator;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
@ -34,13 +31,10 @@ import com.annimon.stream.Stream;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.animation.AnimationCompleteListener; import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
import org.thoughtcrime.securesms.components.MaskView; import org.thoughtcrime.securesms.components.MaskView;
import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.MessageRecord;
import org.thoughtcrime.securesms.database.model.ReactionRecord; import org.thoughtcrime.securesms.database.model.ReactionRecord;
import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.MessageRecordUtil; import org.thoughtcrime.securesms.util.MessageRecordUtil;
import org.thoughtcrime.securesms.util.ServiceUtil;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.ThemeUtil; import org.thoughtcrime.securesms.util.ThemeUtil;
import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.Util;
import org.thoughtcrime.securesms.util.ViewUtil; import org.thoughtcrime.securesms.util.ViewUtil;
@ -365,7 +359,7 @@ public final class ConversationReactionOverlay extends RelativeLayout {
.scaleY(1.5f) .scaleY(1.5f)
.scaleX(1.5f) .scaleX(1.5f)
.translationY(-selectedVerticalTranslation) .translationY(-selectedVerticalTranslation)
.setDuration(400) .setDuration(200)
.setInterpolator(INTERPOLATOR) .setInterpolator(INTERPOLATOR)
.start(); .start();
} }
@ -375,7 +369,7 @@ public final class ConversationReactionOverlay extends RelativeLayout {
.scaleX(1.0f) .scaleX(1.0f)
.scaleY(1.0f) .scaleY(1.0f)
.translationY(0) .translationY(0)
.setDuration(400) .setDuration(200)
.setInterpolator(INTERPOLATOR) .setInterpolator(INTERPOLATOR)
.start(); .start();
} }

8
app/src/main/res/values/dimens.xml
View File

@ -140,11 +140,11 @@
<dimen name="contact_selection_item_height">@dimen/selection_item_header_height</dimen> <dimen name="contact_selection_item_height">@dimen/selection_item_header_height</dimen>
<dimen name="conversation_reaction_scrubber_height">136dp</dimen> <dimen name="conversation_reaction_scrubber_height">136dp</dimen>
<dimen name="conversation_reaction_scrubber_distance">40dp</dimen> <dimen name="conversation_reaction_scrubber_distance">25dp</dimen>
<dimen name="conversation_reaction_touch_deadzone_size">60dp</dimen> <dimen name="conversation_reaction_touch_deadzone_size">40dp</dimen>
<dimen name="conversation_reaction_scrub_deadzone_distance_from_touch_top">136dp</dimen> <dimen name="conversation_reaction_scrub_deadzone_distance_from_touch_top">136dp</dimen>
<dimen name="conversation_reaction_scrub_deadzone_distance_from_touch_bottom">40dp</dimen> <dimen name="conversation_reaction_scrub_deadzone_distance_from_touch_bottom">30dp</dimen>
<dimen name="conversation_reaction_scrub_vertical_translation">20dp</dimen> <dimen name="conversation_reaction_scrub_vertical_translation">25dp</dimen>
<dimen name="conversation_reaction_scrub_horizontal_margin">16dp</dimen> <dimen name="conversation_reaction_scrub_horizontal_margin">16dp</dimen>
<dimen name="storage_legend_circle_size">8dp</dimen> <dimen name="storage_legend_circle_size">8dp</dimen>