empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Enable the ability to react with any emoji.

Browse source
This commit is contained in:
Greyson Parrelli 2020-05-29 17:42:23 -04:00
parent 70c88b68e2
commit 61fe6cc961
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
View file

@ -120,8 +120,7 @@ public final class ConversationReactionOverlay extends RelativeLayout {
.map(e -> findViewById(e.viewId)) .map(e -> findViewById(e.viewId))
.toArray(EmojiImageView[]::new); .toArray(EmojiImageView[]::new);
customEmojiIndex = FeatureFlags.reactWithAnyEmoji() ? ReactionEmoji.values().length - 1 customEmojiIndex = ReactionEmoji.values().length - 1;
: ReactionEmoji.values().length;
distanceFromTouchDownPointToTopOfScrubberDeadZone = getResources().getDimensionPixelSize(R.dimen.conversation_reaction_scrub_deadzone_distance_from_touch_top); distanceFromTouchDownPointToTopOfScrubberDeadZone = getResources().getDimensionPixelSize(R.dimen.conversation_reaction_scrub_deadzone_distance_from_touch_top);
distanceFromTouchDownPointToBottomOfScrubberDeadZone = getResources().getDimensionPixelSize(R.dimen.conversation_reaction_scrub_deadzone_distance_from_touch_bottom); distanceFromTouchDownPointToBottomOfScrubberDeadZone = getResources().getDimensionPixelSize(R.dimen.conversation_reaction_scrub_deadzone_distance_from_touch_bottom);

10
app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
View file

@ -60,7 +60,6 @@ public final class FeatureFlags {
private static final String REMOTE_DELETE = "android.remoteDelete"; private static final String REMOTE_DELETE = "android.remoteDelete";
private static final String PROFILE_FOR_CALLING = "android.profileForCalling"; private static final String PROFILE_FOR_CALLING = "android.profileForCalling";
private static final String CALLING_PIP = "android.callingPip"; private static final String CALLING_PIP = "android.callingPip";
private static final String REACT_WITH_ANY_EMOJI = "android.reactWithAnyEmoji";
private static final String NEW_GROUP_UI = "android.newGroupUI"; private static final String NEW_GROUP_UI = "android.newGroupUI";
private static final String VERSIONED_PROFILES = "android.versionedProfiles"; private static final String VERSIONED_PROFILES = "android.versionedProfiles";
private static final String GROUPS_V2 = "android.groupsv2"; private static final String GROUPS_V2 = "android.groupsv2";
@ -85,7 +84,6 @@ public final class FeatureFlags {
PROFILE_FOR_CALLING, PROFILE_FOR_CALLING,
CALLING_PIP, CALLING_PIP,
NEW_GROUP_UI, NEW_GROUP_UI,
REACT_WITH_ANY_EMOJI,
VERSIONED_PROFILES, VERSIONED_PROFILES,
GROUPS_V2, GROUPS_V2,
GROUPS_V2_CREATE, GROUPS_V2_CREATE,
@ -113,8 +111,7 @@ public final class FeatureFlags {
*/ */
private static final Set<String> HOT_SWAPPABLE = Sets.newHashSet( private static final Set<String> HOT_SWAPPABLE = Sets.newHashSet(
PINS_MEGAPHONE_KILL_SWITCH, PINS_MEGAPHONE_KILL_SWITCH,
ATTACHMENTS_V3, ATTACHMENTS_V3
REACT_WITH_ANY_EMOJI
); );
/** /**
@ -267,11 +264,6 @@ public final class FeatureFlags {
return getBoolean(NEW_GROUP_UI, false); return getBoolean(NEW_GROUP_UI, false);
} }
/** React with Any Emoji */
public static boolean reactWithAnyEmoji() {
return getBoolean(REACT_WITH_ANY_EMOJI, false);
}
/** Read and write versioned profile information. */ /** Read and write versioned profile information. */
public static boolean versionedProfiles() { public static boolean versionedProfiles() {
return getBoolean(VERSIONED_PROFILES, false); return getBoolean(VERSIONED_PROFILES, false);