Skip to content

Commit 596efb0

Browse files
committed
konfetti 2.0.1
Does not compile
1 parent 0391684 commit 596efb0

File tree

3 files changed

+20
-14
lines changed

3 files changed

+20
-14
lines changed

vector/build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,8 @@ dependencies {
451451
implementation 'me.leolin:ShortcutBadger:1.1.22@aar'
452452

453453
// Chat effects
454-
implementation 'nl.dionsegijn:konfetti:1.3.2'
454+
implementation 'nl.dionsegijn:konfetti-xml:2.0.1'
455+
455456
implementation 'com.github.jetradarmobile:android-snowfall:1.2.1'
456457
// DI
457458
implementation libs.dagger.hilt

vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt

+17-12
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@ import kotlinx.coroutines.flow.map
203203
import kotlinx.coroutines.flow.onEach
204204
import kotlinx.coroutines.launch
205205
import kotlinx.coroutines.withContext
206-
import nl.dionsegijn.konfetti.models.Shape
207-
import nl.dionsegijn.konfetti.models.Size
206+
import nl.dionsegijn.konfetti.core.Party
207+
import nl.dionsegijn.konfetti.core.emitter.Emitter
208208
import org.billcarsonfr.jsonviewer.JSonViewerDialog
209209
import org.commonmark.parser.Parser
210210
import org.matrix.android.sdk.api.session.Session
@@ -559,16 +559,21 @@ class TimelineFragment @Inject constructor(
559559
when (chatEffect) {
560560
ChatEffect.CONFETTI -> {
561561
views.viewKonfetti.isVisible = true
562-
views.viewKonfetti.build()
563-
.addColors(Color.YELLOW, Color.GREEN, Color.MAGENTA)
564-
.setDirection(0.0, 359.0)
565-
.setSpeed(2f, 5f)
566-
.setFadeOutEnabled(true)
567-
.setTimeToLive(2000L)
568-
.addShapes(Shape.Square, Shape.Circle)
569-
.addSizes(Size(12))
570-
.setPosition(-50f, views.viewKonfetti.width + 50f, -50f, -50f)
571-
.streamFor(150, 3000L)
562+
val party = Party(
563+
/*
564+
// Keep default setting for now.
565+
colors = listOf(Color.YELLOW, Color.GREEN, Color.MAGENTA),
566+
timeToLive = 2000L,
567+
fadeOutEnabled = true,
568+
speed = 2f,
569+
maxSpeed = 5f,
570+
damping = 0.9f,
571+
spread = 360,
572+
position = Position.Relative(0.5, 0.3),
573+
*/
574+
emitter = Emitter(duration = 100).max(100)
575+
)
576+
views.viewKonfetti.start(party)
572577
}
573578
ChatEffect.SNOWFALL -> {
574579
views.viewSnowFall.isVisible = true

vector/src/main/res/layout/fragment_timeline.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
app:layout_constraintEnd_toEndOf="parent"
167167
app:tint="@android:color/black" />
168168

169-
<nl.dionsegijn.konfetti.KonfettiView
169+
<nl.dionsegijn.konfetti.xml.KonfettiView
170170
android:id="@+id/viewKonfetti"
171171
android:layout_width="match_parent"
172172
android:layout_height="match_parent"

0 commit comments

Comments
 (0)