Compare commits

...

8 Commits

Author SHA1 Message Date
Simon Bachmann 2a5797c5ad
Update README.md 2022-05-14 15:53:37 +02:00
Simon Bachmann 2c51255034
Update README.md 2022-05-14 15:50:06 +02:00
Simon Bachmann 8d3a15d0aa
Merge pull request #23 from kamaal111/fix/crash-in-animation-on-background
Fix crash when app goes to background before animation is complete
2022-05-14 15:09:31 +02:00
Simon Bachmann 860ef2cb88
Merge pull request #25 from MarcoEidinger/README
docs: ✏️ improve code snippets in README for easy copying
2022-05-14 15:06:27 +02:00
Simon Bachmann f062bdef3f
Merge pull request #24 from twhitt14/master
One last confetti physics adjustment
2022-05-14 15:05:36 +02:00
Marco Eidinger 8451defe73 docs: ✏️ improve code snippets in README for easy copying 2022-05-02 02:59:43 -07:00
Trevor b507d48d68
One last confetti physics adjustment
This animation curve & timing results in less skipped frames from confetti initially moving too fast.
2022-04-26 13:53:25 -06:00
Kamaal Farah 4458eb45da Fix crash when app goes to background before animation is complete 2022-04-26 20:04:06 +02:00
2 changed files with 14 additions and 14 deletions

View File

@ -79,7 +79,7 @@ If you prefer not to use any of dependency managers, you can integrate `Confetti
First, add `import ConfettiSwiftUI` on every `swift` file you would like to use `ConfettiSwiftUI`. Define a integer as a state varable which is responsible for triggering the animation. Any change to that variable will span a new animation (increment and decrement).
```swift
import ConfettiSwiftUI
import SwiftUI
struct ContentView: View {
@ -117,11 +117,11 @@ struct ContentView: View {
### Configurator Application With Live Preview
You can use the configurator app in [demo project here](https://github.com/simibac/ConfettiSwiftUIDemo) to make your desired animation or get inspired by one of the many examples.
<p align="center">
<img src="./Gifs/configurator.png" width="150" />
<img src="./Gifs/examples.png" width="150" />
</p>
<img src="./Gifs/configurator.png" width="150" />
<img src="./Gifs/examples.png" width="150" />
</p>
### Examples
@ -132,7 +132,7 @@ You can use the configurator app in [demo project here](https://github.com/simib
</p>
```swift
ConfettiCannon(counter: $counter2, colors: [.red, .black], confettiSize: 20)
.confettiCannon(counter: $counter, colors: [.red, .black], confettiSize: 20)
```
#### Repeat Configuration
@ -142,7 +142,7 @@ ConfettiCannon(counter: $counter2, colors: [.red, .black], confettiSize: 20)
</p>
```swift
ConfettiCannon(counter: $counter3, repetitions: 3, repetitionInterval: 0.7)
.confettiCannon(counter: $counter, repetitions: 3, repetitionInterval: 0.7)
```
#### Firework Configuration
@ -152,7 +152,7 @@ ConfettiCannon(counter: $counter3, repetitions: 3, repetitionInterval: 0.7)
</p>
```swift
ConfettiCannon(counter: $counter4, num: 50, openingAngle: Angle(degrees: 0), closingAngle: Angle(degrees: 360), radius: 200)
.confettiCannon(counter: $counter, num: 50, openingAngle: Angle(degrees: 0), closingAngle: Angle(degrees: 360), radius: 200)
```
#### Emoji Configuration
@ -162,7 +162,7 @@ ConfettiCannon(counter: $counter4, num: 50, openingAngle: Angle(degrees: 0), clo
</p>
```swift
ConfettiCannon(counter: $counter5, confettis: [.text("❤️"), .text("💙"), .text("💚"), .text("🧡")])
.confettiCannon(counter: $counter, confettis: [.text("❤️"), .text("💙"), .text("💚"), .text("🧡")])
```
#### Endless Configuration
@ -172,7 +172,7 @@ ConfettiCannon(counter: $counter5, confettis: [.text("❤️"), .text("💙"), .
</p>
```swift
ConfettiCannon(counter: $counter6, num:1, confettis: [.text("💩")], confettiSize: 20, repetitions: 100, repetitionInterval: 0.1)
.confettiCannon(counter: $counter, num:1, confettis: [.text("💩")], confettiSize: 20, repetitions: 100, repetitionInterval: 0.1)
```
#### Make-it-Rain Configuration
@ -182,7 +182,7 @@ ConfettiCannon(counter: $counter6, num:1, confettis: [.text("💩")], confettiSi
</p>
```swift
ConfettiCannon(counter: $counter7, num:1, confettis: [.text("💵"), .text("💶"), .text("💷"), .text("💴")], confettiSize: 30, repetitions: 50, repetitionInterval: 0.1)
.confettiCannon(counter: $counter, num:1, confettis: [.text("💵"), .text("💶"), .text("💷"), .text("💴")], confettiSize: 30, repetitions: 50, repetitionInterval: 0.1)
```
## 👨‍💻 Contributors

View File

@ -130,7 +130,7 @@ public struct ConfettiCannon: View {
for i in 0...confettiConfig.repetitions{
DispatchQueue.main.asyncAfter(deadline: .now() + confettiConfig.repetitionInterval * Double(i)) {
animate.append(false)
if(value < animate.count){
if(value > 0 && value < animate.count){
animate[value-1].toggle()
}
}
@ -191,7 +191,7 @@ struct ConfettiView: View{
}
func getAnimation() -> Animation {
return Animation.timingCurve(0, 1, 0, 1, duration: getAnimationDuration())
return Animation.timingCurve(0.1, 0.8, 0, 1, duration: getAnimationDuration())
}
func getDistance() -> CGFloat {
@ -282,7 +282,7 @@ class ConfettiConfig: ObservableObject {
self.radius = radius
self.repetitions = repetitions
self.repetitionInterval = repetitionInterval
self.explosionAnimationDuration = Double(radius / 1400)
self.explosionAnimationDuration = Double(radius / 1300)
self.rainAnimationDuration = Double((rainHeight + radius) / 200)
}