diff --git a/changelog.d/5079.misc b/changelog.d/5079.misc new file mode 100644 index 00000000000..c38bf043ea4 --- /dev/null +++ b/changelog.d/5079.misc @@ -0,0 +1 @@ +Upgrade konfetti lib from 1.3.2 to 2.0.2 \ No newline at end of file diff --git a/vector/build.gradle b/vector/build.gradle index a7e347949b0..f5e01736012 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -446,7 +446,8 @@ dependencies { implementation 'me.leolin:ShortcutBadger:1.1.22@aar' // Chat effects - implementation 'nl.dionsegijn:konfetti:1.3.2' + implementation 'nl.dionsegijn:konfetti-xml:2.0.2' + implementation 'com.github.jetradarmobile:android-snowfall:1.2.1' // DI implementation libs.dagger.hilt diff --git a/vector/src/main/java/im/vector/app/core/animations/Konfetti.kt b/vector/src/main/java/im/vector/app/core/animations/Konfetti.kt index 22764ac5bd9..882891810b3 100644 --- a/vector/src/main/java/im/vector/app/core/animations/Konfetti.kt +++ b/vector/src/main/java/im/vector/app/core/animations/Konfetti.kt @@ -20,9 +20,14 @@ import android.content.Context import androidx.annotation.ColorInt import androidx.core.content.ContextCompat import im.vector.app.R -import nl.dionsegijn.konfetti.KonfettiView -import nl.dionsegijn.konfetti.models.Shape -import nl.dionsegijn.konfetti.models.Size +import nl.dionsegijn.konfetti.core.Angle +import nl.dionsegijn.konfetti.core.Party +import nl.dionsegijn.konfetti.core.Position +import nl.dionsegijn.konfetti.core.Spread +import nl.dionsegijn.konfetti.core.emitter.Emitter +import nl.dionsegijn.konfetti.core.models.Shape +import nl.dionsegijn.konfetti.core.models.Size +import nl.dionsegijn.konfetti.xml.KonfettiView fun KonfettiView.play() { val confettiColors = listOf( @@ -35,16 +40,22 @@ fun KonfettiView.play() { R.color.palette_prune, R.color.palette_kiwi ) - build() - .addColors(confettiColors.toColorInt(context)) - .setDirection(0.0, 359.0) - .setSpeed(2f, 5f) - .setFadeOutEnabled(true) - .setTimeToLive(2000L) - .addShapes(Shape.Square, Shape.Circle) - .addSizes(Size(12)) - .setPosition(-50f, width + 50f, -50f, -50f) - .streamFor(150, 3000L) + val emitterConfig = Emitter(2000).perSecond(100) + val party = Party( + emitter = emitterConfig, + colors = confettiColors.toColorInt(context), + angle = Angle.Companion.BOTTOM, + spread = Spread.ROUND, + shapes = listOf(Shape.Square, Shape.Circle), + size = listOf(Size(12)), + speed = 2f, + maxSpeed = 5f, + fadeOutEnabled = true, + timeToLive = 2000L, + position = Position.Relative(0.0, 0.0).between(Position.Relative(1.0, 0.0)), + ) + reset() + start(party) } @ColorInt diff --git a/vector/src/main/res/layout/fragment_ftue_account_created.xml b/vector/src/main/res/layout/fragment_ftue_account_created.xml index 5b8dddba22a..83c5cb76b9a 100644 --- a/vector/src/main/res/layout/fragment_ftue_account_created.xml +++ b/vector/src/main/res/layout/fragment_ftue_account_created.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:background="?colorSecondary"> - - -