Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 04:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make emoji burst more "out of the reaction".

Browse Source
This commit is contained in:
Nicholas Tinsley
2023-12-18 09:58:56 -05:00
committed by Cody Henthorne
parent 4d3929948c
commit 45d2a5d0b6
4 changed files with 487 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/reaction/MultiReactionBurstLayout.kt
View File

@@ -9,6 +9,7 @@ import android.content.Context
import android.util.AttributeSet
import android.widget.FrameLayout
import androidx.core.view.children
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.components.emoji.EmojiUtil
import org.thoughtcrime.securesms.events.GroupCallReactionEvent
import kotlin.time.Duration.Companion.seconds
@@ -23,7 +24,8 @@ class MultiReactionBurstLayout @JvmOverloads constructor(
init {
repeat(MAX_SIMULTANEOUS_REACTIONS) {
addView(OnReactionSentView(context))
val view = OnReactionSentView(context, layoutRes = R.layout.reaction_burst_view)
addView(view)
}
}

5
app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/reaction/OnReactionSentView.kt
View File

@@ -11,13 +11,14 @@ import org.thoughtcrime.securesms.components.emoji.EmojiImageView
class OnReactionSentView @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null
attrs: AttributeSet? = null,
layoutRes: Int = R.layout.on_reaction_sent_view
) : FrameLayout(context, attrs) {
var callback: Callback? = null
init {
inflate(context, R.layout.on_reaction_sent_view, this)
inflate(context, layoutRes, this)
}
private val motionLayout: MotionLayout = findViewById(R.id.motion_layout)

103
app/src/main/res/layout/reaction_burst_view.xml Normal file
View File

@@ -0,0 +1,103 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.motion.widget.MotionLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:viewBindingIgnore="true"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/motion_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layoutDirection="ltr"
app:layoutDescription="@xml/reaction_burst_view_scene"
tools:showPaths="true">
<org.thoughtcrime.securesms.components.emoji.EmojiImageView
android:id="@+id/emoji_1"
android:layout_width="56dp"
android:layout_height="56dp"
app:forceJumbo="true"
app:layout_constraintTag="emoji"
tools:background="@drawable/symbol_heart_24" />
<org.thoughtcrime.securesms.components.emoji.EmojiImageView
android:id="@+id/emoji_2"
android:layout_width="80dp"
android:layout_height="80dp"
app:forceJumbo="true"
app:layout_constraintTag="emoji"
tools:background="@drawable/symbol_heart_24" />
<org.thoughtcrime.securesms.components.emoji.EmojiImageView
android:id="@+id/emoji_3"
android:layout_width="56dp"
android:layout_height="56dp"
app:forceJumbo="true"
app:layout_constraintTag="emoji"
tools:background="@drawable/symbol_heart_24" />
<org.thoughtcrime.securesms.components.emoji.EmojiImageView
android:id="@+id/emoji_4"
android:layout_width="70dp"
android:layout_height="70dp"
app:forceJumbo="true"
app:layout_constraintTag="emoji"
tools:background="@drawable/symbol_heart_24" />
<org.thoughtcrime.securesms.components.emoji.EmojiImageView
android:id="@+id/emoji_5"
android:layout_width="64dp"
android:layout_height="64dp"
app:forceJumbo="true"
app:layout_constraintTag="emoji"
tools:background="@drawable/symbol_heart_24" />
<org.thoughtcrime.securesms.components.emoji.EmojiImageView
android:id="@+id/emoji_6"
android:layout_width="70dp"
android:layout_height="70dp"
app:forceJumbo="true"
app:layout_constraintTag="emoji"
tools:background="@drawable/symbol_heart_24" />
<org.thoughtcrime.securesms.components.emoji.EmojiImageView
android:id="@+id/emoji_7"
android:layout_width="40dp"
android:layout_height="40dp"
app:forceJumbo="true"
app:layout_constraintTag="emoji"
tools:background="@drawable/symbol_heart_24" />
<org.thoughtcrime.securesms.components.emoji.EmojiImageView
android:id="@+id/emoji_8"
android:layout_width="70dp"
android:layout_height="70dp"
app:forceJumbo="true"
app:layout_constraintTag="emoji"
tools:background="@drawable/symbol_heart_24"
tools:layout_editor_absoluteX="20dp"
tools:layout_editor_absoluteY="591dp" />
<org.thoughtcrime.securesms.components.emoji.EmojiImageView
android:id="@+id/emoji_9"
android:layout_width="100dp"
android:layout_height="100dp"
app:forceJumbo="true"
app:layout_constraintTag="emoji"
tools:background="@drawable/symbol_heart_24" />
<org.thoughtcrime.securesms.components.emoji.EmojiImageView
android:id="@+id/emoji_10"
android:layout_width="60dp"
android:layout_height="60dp"
app:forceJumbo="true"
app:layout_constraintTag="emoji"
tools:background="@drawable/symbol_heart_24" />
<org.thoughtcrime.securesms.components.emoji.EmojiImageView
android:id="@+id/emoji_11"
android:layout_width="48dp"
android:layout_height="48dp"
app:forceJumbo="true"
app:layout_constraintTag="emoji"
tools:background="@drawable/symbol_heart_24" />
</androidx.constraintlayout.motion.widget.MotionLayout>

378
app/src/main/res/xml/reaction_burst_view_scene.xml Normal file
View File

@@ -0,0 +1,378 @@
<?xml version="1.0" encoding="utf-8"?>
<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:motion="http://schemas.android.com/apk/res-auto">
<ConstraintSet android:id="@+id/start">
<Constraint
android:id="@+id/emoji_1"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_marginStart="12dp"
android:scaleX="0"
android:scaleY="0"
motion:layout_constraintStart_toStartOf="parent"
motion:layout_constraintTop_toBottomOf="parent" />
<Constraint
android:id="@+id/emoji_2"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_marginStart="12dp"
android:scaleX="0"
android:scaleY="0"
motion:layout_constraintStart_toStartOf="parent"
motion:layout_constraintTop_toBottomOf="parent" />
<Constraint
android:id="@id/emoji_3"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_marginStart="12dp"
android:scaleX="0"
android:scaleY="0"
motion:layout_constraintStart_toStartOf="parent"
motion:layout_constraintTop_toBottomOf="parent" />
<Constraint
android:id="@+id/emoji_4"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginStart="12dp"
android:scaleX="0"
android:scaleY="0"
motion:layout_constraintStart_toStartOf="parent"
motion:layout_constraintTop_toBottomOf="parent" />
<Constraint
android:id="@+id/emoji_5"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_marginStart="12dp"
android:scaleX="0"
android:scaleY="0"
motion:layout_constraintStart_toStartOf="parent"
motion:layout_constraintTop_toBottomOf="parent" />
<Constraint
android:id="@+id/emoji_6"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginStart="12dp"
android:scaleX="0"
android:scaleY="0"
motion:layout_constraintStart_toStartOf="parent"
motion:layout_constraintTop_toBottomOf="parent" />
<Constraint
android:id="@+id/emoji_7"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="12dp"
android:scaleX="0"
android:scaleY="0"
motion:layout_constraintStart_toStartOf="parent"
motion:layout_constraintTop_toBottomOf="parent" />
<Constraint
android:id="@+id/emoji_8"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginStart="12dp"
android:scaleX="0"
android:scaleY="0"
motion:layout_constraintStart_toStartOf="parent"
motion:layout_constraintTop_toBottomOf="parent"/>
<Constraint
android:id="@+id/emoji_9"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginStart="12dp"
android:scaleX="0"
android:scaleY="0"
motion:layout_constraintStart_toStartOf="parent"
motion:layout_constraintTop_toBottomOf="parent" />
<Constraint
android:id="@+id/emoji_10"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_marginStart="12dp"
android:scaleX="0"
android:scaleY="0"
motion:layout_constraintStart_toStartOf="parent"
motion:layout_constraintTop_toBottomOf="parent" />
<Constraint
android:id="@+id/emoji_11"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="12dp"
android:scaleX="0"
android:scaleY="0"
motion:layout_constraintStart_toStartOf="parent"
motion:layout_constraintTop_toBottomOf="parent" />
</ConstraintSet>
<ConstraintSet android:id="@+id/end">
<Constraint
android:id="@id/emoji_1"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_marginBottom="16dp"
android:scaleX="1"
android:scaleY="1"
motion:layout_constraintBottom_toTopOf="parent"
motion:layout_constraintEnd_toEndOf="parent"
motion:layout_constraintStart_toStartOf="parent" />
<Constraint
android:id="@id/emoji_2"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_marginEnd="80dp"
android:layout_marginBottom="16dp"
android:scaleX="1"
android:scaleY="1"
motion:layout_constraintBottom_toTopOf="parent"
motion:layout_constraintEnd_toEndOf="parent"
motion:layout_constraintStart_toStartOf="parent" />
<Constraint
android:id="@id/emoji_3"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_marginEnd="56dp"
android:scaleX="1"
android:scaleY="1"
motion:layout_constraintBottom_toTopOf="parent"
motion:layout_constraintEnd_toEndOf="parent" />
<Constraint
android:id="@id/emoji_4"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginStart="12dp"
android:layout_marginBottom="16dp"
android:scaleX="1"
android:scaleY="1"
motion:layout_constraintBottom_toTopOf="parent"
motion:layout_constraintStart_toStartOf="parent" />
<Constraint
android:id="@id/emoji_5"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_marginStart="60dp"
android:layout_marginBottom="16dp"
android:scaleX="1"
android:scaleY="1"
motion:layout_constraintBottom_toTopOf="parent"
motion:layout_constraintEnd_toEndOf="parent"
motion:layout_constraintStart_toStartOf="parent" />
<Constraint
android:id="@id/emoji_6"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginEnd="40dp"
android:layout_marginBottom="16dp"
android:scaleX="1"
android:scaleY="1"
motion:layout_constraintBottom_toTopOf="parent"
motion:layout_constraintEnd_toEndOf="parent" />
<Constraint
android:id="@id/emoji_7"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="16dp"
android:scaleX="1"
android:scaleY="1"
motion:layout_constraintBottom_toTopOf="parent"
motion:layout_constraintEnd_toEndOf="parent"
motion:layout_constraintStart_toStartOf="parent" />
<Constraint
android:id="@id/emoji_8"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginStart="20dp"
android:layout_marginBottom="16dp"
android:scaleX="1"
android:scaleY="1"
motion:layout_constraintBottom_toTopOf="parent"
motion:layout_constraintStart_toStartOf="parent" />
<Constraint
android:id="@+id/emoji_9"
android:layout_width="100dp"
android:layout_height="100dp"
android:scaleX="1"
android:scaleY="1"
motion:layout_constraintEnd_toEndOf="parent"
motion:layout_constraintStart_toStartOf="parent"
motion:layout_constraintTop_toBottomOf="parent" />
<Constraint
android:id="@id/emoji_10"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_marginBottom="16dp"
android:scaleX="1"
android:scaleY="1"
motion:layout_constraintBottom_toTopOf="parent"
motion:layout_constraintEnd_toEndOf="parent"
motion:layout_constraintStart_toStartOf="parent"
android:layout_marginEnd="16dp" />
<Constraint
android:id="@id/emoji_11"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="32dp"
android:layout_marginBottom="16dp"
android:scaleX="1"
android:scaleY="1"
motion:layout_constraintBottom_toTopOf="parent"
motion:layout_constraintStart_toStartOf="parent" />
</ConstraintSet>
<Transition
motion:constraintSetEnd="@id/end"
motion:constraintSetStart="@id/start"
motion:duration="3000"
motion:motionInterpolator="cubic(0.25,0.25,0.5,1)">
<KeyFrameSet>
<KeyAttribute
android:scaleX="1"
motion:framePosition="40"
motion:motionTarget="emoji" />
<KeyAttribute
android:scaleY="1"
motion:framePosition="40"
motion:motionTarget="emoji" />
<KeyCycle
android:rotation="24"
motion:framePosition="0"
motion:motionTarget="@+id/emoji_1"
motion:waveOffset="0"
motion:wavePeriod="1" />
<KeyCycle
android:rotation="24"
motion:framePosition="100"
motion:motionTarget="@+id/emoji_1"
motion:waveOffset="0"
motion:wavePeriod="1" />
<KeyCycle
android:rotation="15"
motion:framePosition="0"
motion:motionTarget="@+id/emoji_2"
motion:waveOffset="-15"
motion:wavePeriod="1" />
<KeyCycle
android:rotation="15"
motion:framePosition="100"
motion:motionTarget="@+id/emoji_2"
motion:waveOffset="-15"
motion:wavePeriod="1" />
<KeyCycle
android:rotation="8"
motion:framePosition="0"
motion:motionTarget="@+id/emoji_3"
motion:waveOffset="0"
motion:wavePeriod="1" />
<KeyCycle
android:rotation="8"
motion:framePosition="100"
motion:motionTarget="@+id/emoji_3"
motion:waveOffset="0"
motion:wavePeriod="1" />
<KeyCycle
android:rotation="12"
motion:framePosition="0"
motion:motionTarget="@+id/emoji_4"
motion:waveOffset="0"
motion:wavePeriod="1" />
<KeyCycle
android:rotation="12"
motion:framePosition="100"
motion:motionTarget="@+id/emoji_4"
motion:waveOffset="0"
motion:wavePeriod="1" />
<KeyCycle
android:rotation="12"
motion:framePosition="0"
motion:motionTarget="@+id/emoji_5"
motion:waveOffset="0"
motion:wavePeriod="1" />
<KeyCycle
android:rotation="12"
motion:framePosition="100"
motion:motionTarget="@+id/emoji_5"
motion:waveOffset="0"
motion:wavePeriod="1" />
<KeyCycle
android:rotation="10"
motion:framePosition="0"
motion:motionTarget="@+id/emoji_8"
motion:waveOffset="2"
motion:wavePeriod="1" />
<KeyCycle
android:rotation="10"
motion:framePosition="100"
motion:motionTarget="@+id/emoji_8"
motion:waveOffset="2"
motion:wavePeriod="1" />
<KeyCycle
android:rotation="6"
motion:framePosition="0"
motion:motionTarget="@+id/emoji_11"
motion:waveOffset="2"
motion:wavePeriod="1" />
<KeyCycle
android:rotation="6"
motion:framePosition="100"
motion:motionTarget="@+id/emoji_11"
motion:waveOffset="2"
motion:wavePeriod="1" />
<KeyPosition
motion:framePosition="40"
motion:keyPositionType="deltaRelative"
motion:motionTarget="@+id/emoji_1"
motion:percentY="1" />
<KeyPosition
motion:framePosition="44"
motion:keyPositionType="deltaRelative"
motion:motionTarget="@+id/emoji_2"
motion:percentY="1" />
<KeyPosition
motion:framePosition="72"
motion:keyPositionType="deltaRelative"
motion:motionTarget="@+id/emoji_3"
motion:percentY="1" />
<KeyPosition
motion:framePosition="52"
motion:keyPositionType="deltaRelative"
motion:motionTarget="@+id/emoji_4"
motion:percentY="1" />
<KeyPosition
motion:framePosition="56"
motion:keyPositionType="deltaRelative"
motion:motionTarget="@+id/emoji_5"
motion:percentY="1" />
<KeyPosition
motion:framePosition="48"
motion:keyPositionType="deltaRelative"
motion:motionTarget="@+id/emoji_6"
motion:percentY="1" />
<KeyPosition
motion:framePosition="64"
motion:keyPositionType="deltaRelative"
motion:motionTarget="@+id/emoji_7"
motion:percentY="1" />
<KeyPosition
motion:framePosition="68"
motion:keyPositionType="deltaRelative"
motion:motionTarget="@+id/emoji_8"
motion:percentY="1" />
<KeyPosition
motion:framePosition="80"
motion:keyPositionType="deltaRelative"
motion:motionTarget="@+id/emoji_9"
motion:percentY="1" />
<KeyPosition
motion:framePosition="88"
motion:keyPositionType="deltaRelative"
motion:motionTarget="@+id/emoji_10"
motion:percentY="1" />
<KeyPosition
motion:framePosition="78"
motion:keyPositionType="deltaRelative"
motion:motionTarget="@+id/emoji_11"
motion:percentY="1" />
</KeyFrameSet>
</Transition>
</MotionScene>