Skip to content

Commit 1981eea

Browse files
siddarthkaysiddarthkay
committed
fix: re-animated v3 animations (Easing, FadeIn)
1 parent 33074f6 commit 1981eea

File tree

12 files changed

+75
-187
lines changed

12 files changed

+75
-187
lines changed

‎ios/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,7 @@ SPEC CHECKSUMS:
830830
FBLazyVector: 5d4a3b7f411219a45a6d952f77d2c0a6c9989da5
831831
FBReactNativeSpec: 3fc2d478e1c4b08276f9dd9128f80ec6d5d85c1f
832832
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
833-
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
833+
glog: 39f165f95d368bf68eb4fdab79c1799b09c283d5
834834
HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
835835
Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
836836
libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef

‎src/quo/animated.cljs

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
(ns quo.animated
22
(:refer-clojure :exclude [abs set delay divide])
33
(:require ["react-native-reanimated" :default animated :refer
4-
(clockRunning
5-
; EasingNode
6-
)]
4+
(clockRunning Easing)]
75
["react-native-redash" :as redash]
86
[oops.core :refer [ocall oget]]
97
[quo.gesture-handler :as gh]
@@ -91,22 +89,22 @@
9189
;;;;; TODO: replace this with an updated implementation
9290
;;;TypeError: undefined is not an object (evaluating
9391
;;;'shadow.js.shim.module$react_native_reanimated.EasingNode.bezier')
94-
;(def bezier (.-bezier ^js EasingNode))
92+
(def bezier (.-bezier ^js Easing))
9593

9694
;;;ERROR TypeError: undefined is not an object (evaluating
9795
;;;'shadow.js.shim.module$react_native_reanimated.EasingNode.linear')
9896
;(def linear (.-linear ^js EasingNode))
9997

10098

10199
;;; They depend on bezier and linear
102-
;(def easings
103-
; {:linear linear
104-
; :ease-in (bezier 0.42 0 1 1)
105-
; :ease-out (bezier 0 0 0.58 1)
106-
; :ease-in-out (bezier 0.42 0 0.58 1)
107-
; :cubic (bezier 0.55 0.055 0.675 0.19)
108-
; :keyboard (bezier 0.17 0.59 0.4 0.77)})
109-
;
100+
(def easings
101+
{; :linear linear
102+
:ease-in (bezier 0.42 0 1 1)
103+
:ease-out (bezier 0 0 0.58 1)
104+
:ease-in-out (bezier 0.42 0 0.58 1)
105+
:cubic (bezier 0.55 0.055 0.675 0.19)
106+
:keyboard (bezier 0.17 0.59 0.4 0.77)})
107+
110108
(def springs
111109
{:lazy {:damping 50
112110
:mass 0.3

‎src/quo2/components/drawers/drawer_buttons/view.cljs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,56 +129,56 @@
129129
(reanimated/animate-shared-value-with-delay bottom-view-top
130130
(:height (rn/get-screen))
131131
animations-duration
132-
; :easing4
132+
:easing4
133133
animations-delay)
134134
(reanimated/animate-shared-value-with-delay
135135
height
136136
max-height
137137
animations-duration
138-
; :easing4
138+
:easing4
139139
animations-delay)
140140
(reanimated/animate-shared-value-with-delay
141141
top-padding
142142
(+ 68 (safe-area/get-top))
143143
animations-duration
144-
; :easing4
144+
:easing4
145145
animations-delay)
146146
(reanimated/animate-shared-value-with-delay
147147
top-children-opacity
148148
0
149149
animations-duration
150-
; :easing4
150+
:easing4
151151
animations-delay)
152152
(reanimated/animate-shared-value-with-delay
153153
top-title-opacity
154154
0
155155
0
156-
; :linear
156+
:linear
157157
(+ animations-delay animations-duration 500)))
158158
reset-top-animation (fn []
159159
(reanimated/set-shared-value top-title-opacity 1)
160160
(reanimated/animate-shared-value-with-delay bottom-view-top
161161
80
162162
animations-duration
163-
; :easing4
163+
:easing4
164164
50)
165165
(reanimated/animate-shared-value-with-timing
166166
height
167167
default-height
168168
animations-duration
169-
; :easing4
169+
:easing4
170170
)
171171
(reanimated/animate-shared-value-with-timing
172172
top-padding
173173
12
174174
animations-duration
175-
; :easing4
175+
:easing4
176176
)
177177
(reanimated/animate-shared-value-with-timing
178178
top-children-opacity
179179
1
180180
animations-duration
181-
; :easing4
181+
:easing4
182182
))]
183183
(rn/use-effect (fn []
184184
(when on-init

‎src/quo2/components/loaders/skeleton.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
(reanimated/animate-shared-value-with-repeat translate-x
3737
window-width
3838
1000
39-
; :linear
39+
:linear
4040
(- 1)
4141
false)
4242
[masked-view/masked-view

‎src/quo2/components/record_audio/record_audio/helpers.cljs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
shared-value
88
value
99
duration
10-
; :linear
10+
:linear
1111
))
1212

1313
(defn animate-linear-with-delay
@@ -16,7 +16,7 @@
1616
shared-value
1717
value
1818
duration
19-
; :linear
19+
:linear
2020
delay))
2121

2222
(defn animate-linear-with-delay-loop
@@ -25,7 +25,7 @@
2525
shared-value
2626
value
2727
duration
28-
; :linear
28+
:linear
2929
delay
3030
-1))
3131

@@ -35,7 +35,7 @@
3535
shared-value
3636
value
3737
duration
38-
; :easing1
38+
:easing1
3939
))
4040

4141
(defn animate-easing-with-delay
@@ -44,7 +44,7 @@
4444
shared-value
4545
value
4646
duration
47-
; :easing1
47+
:easing1
4848
delay))
4949

5050
(defn set-value

0 commit comments

Comments
 (0)