From f2325848b492b399f29e49c9f67c983130dff5b5 Mon Sep 17 00:00:00 2001 From: Ibrahem Date: Sat, 12 Aug 2023 17:49:34 +0300 Subject: [PATCH 1/6] Test --- package.json | 4 ++-- yarn.lock | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 2501d2bd748..64715e23b5c 100644 --- a/package.json +++ b/package.json @@ -66,13 +66,13 @@ "react-native-randombytes": "^3.6.1", "react-native-reanimated": "2.11.0", "react-native-redash": "^16.0.11", - "react-native-svg": "13.10.0", "react-native-shake": "^3.3.1", "react-native-share": "^8.2.2", "react-native-static-safe-area-insets": "^2.2.0", "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#refs/tags/v2.5.39", + "react-native-svg": "13.10.0", "react-native-touch-id": "^4.4.1", - "react-native-transparent-video": "git+https://github.com/status-im/react-native-transparent-video.git#refs/tags/0.0.9", + "react-native-transparent-video": "git+https://github.com/ibrkhalil/react-native-transparent-video.git#refs/tags/v0.0.1", "react-native-webview": "git+https://github.com/status-im/react-native-webview.git#refs/tags/v11.16.0-status", "react-syntax-highlighter": "^15.5.0", "rn-emoji-keyboard": "0.7.0", diff --git a/yarn.lock b/yarn.lock index 1d2c94af75b..386b19f463b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9012,9 +9012,9 @@ react-native-touch-id@^4.4.1: resolved "https://registry.yarnpkg.com/react-native-touch-id/-/react-native-touch-id-4.4.1.tgz#8b1bb2d04c30bac36bb9696d2d723e719c4a8b08" integrity sha512-1jTl8fC+0fxvqegy/XXTyo6vMvPhjzkoDdaqoYZx0OH8AT250NuXnNPyKktvigIcys3+2acciqOeaCall7lrvg== -"react-native-transparent-video@git+https://github.com/status-im/react-native-transparent-video.git#refs/tags/0.0.9": +"react-native-transparent-video@git+https://github.com/ibrkhalil/react-native-transparent-video.git#refs/tags/v0.0.1": version "0.1.0" - resolved "git+https://github.com/status-im/react-native-transparent-video.git#97d8c773eae82851b170b53c9fc13020f74eefe7" + resolved "git+https://github.com/ibrkhalil/react-native-transparent-video.git#4029967db3fce1cfe5b76bf380426d3732934330" "react-native-webview@git+https://github.com/status-im/react-native-webview.git#refs/tags/v11.16.0-status": version "11.16.0" From e997f633ab27e09ae472a494c6936086ba3b1397 Mon Sep 17 00:00:00 2001 From: ibrkhalil Date: Mon, 14 Aug 2023 19:44:29 +0300 Subject: [PATCH 2/6] Bump version --- package.json | 2 +- src/status_im2/common/parallax/view.cljs | 12 +++++++----- .../contexts/onboarding/generating_keys/view.cljs | 3 ++- yarn.lock | 4 ++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 64715e23b5c..75f47d6c5d8 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#refs/tags/v2.5.39", "react-native-svg": "13.10.0", "react-native-touch-id": "^4.4.1", - "react-native-transparent-video": "git+https://github.com/ibrkhalil/react-native-transparent-video.git#refs/tags/v0.0.1", + "react-native-transparent-video": "git+https://github.com/ibrkhalil/react-native-transparent-video.git#refs/tags/v0.0.2", "react-native-webview": "git+https://github.com/status-im/react-native-webview.git#refs/tags/v11.16.0-status", "react-syntax-highlighter": "^15.5.0", "rn-emoji-keyboard": "0.7.0", diff --git a/src/status_im2/common/parallax/view.cljs b/src/status_im2/common/parallax/view.cljs index ece499fb316..be4adb8b478 100644 --- a/src/status_im2/common/parallax/view.cljs +++ b/src/status_im2/common/parallax/view.cljs @@ -6,7 +6,7 @@ [status-im2.common.parallax.style :as style])) (defn f-sensor-animated-video - [{:keys [offset stretch order source disable-parallax?]}] + [{:keys [offset stretch order source disable-parallax? enable-looping?]}] (let [double-stretch (* 2 stretch) {window-width :width window-height :height} (rn/get-window) @@ -24,15 +24,16 @@ (+ window-height double-stretch)) image-style]} [transparent-video/view - {:source source - :style style/video}]]))) + {:source source + :style style/video + :loopEnabled enable-looping?}]]))) (defn sensor-animated-video [props] [:f> f-sensor-animated-video props]) (defn f-video - [{:keys [layers disable-parallax? offset stretch container-style] + [{:keys [layers disable-parallax? offset stretch container-style enable-looping?] :or {offset 50 stretch 0}}] [rn/view @@ -44,7 +45,8 @@ :offset offset :stretch stretch :order (inc idx) - :disable-parallax? disable-parallax?}]) + :disable-parallax? disable-parallax? + :enable-looping? enable-looping?}]) layers)]) (defn video diff --git a/src/status_im2/contexts/onboarding/generating_keys/view.cljs b/src/status_im2/contexts/onboarding/generating_keys/view.cljs index 10976c16e9f..db7c3dd1daf 100644 --- a/src/status_im2/contexts/onboarding/generating_keys/view.cljs +++ b/src/status_im2/contexts/onboarding/generating_keys/view.cljs @@ -125,7 +125,8 @@ :container-style {:top 40 :left 20} :layers (:generate-keys resources/parallax-video) - :disable-parallax? true}] + :disable-parallax? true + :enable-looping? false}] [:f> f-page-title insets]]) (defn f-simple-page diff --git a/yarn.lock b/yarn.lock index 386b19f463b..cc1a2ece4ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9012,9 +9012,9 @@ react-native-touch-id@^4.4.1: resolved "https://registry.yarnpkg.com/react-native-touch-id/-/react-native-touch-id-4.4.1.tgz#8b1bb2d04c30bac36bb9696d2d723e719c4a8b08" integrity sha512-1jTl8fC+0fxvqegy/XXTyo6vMvPhjzkoDdaqoYZx0OH8AT250NuXnNPyKktvigIcys3+2acciqOeaCall7lrvg== -"react-native-transparent-video@git+https://github.com/ibrkhalil/react-native-transparent-video.git#refs/tags/v0.0.1": +"react-native-transparent-video@git+https://github.com/ibrkhalil/react-native-transparent-video.git#refs/tags/v0.0.2": version "0.1.0" - resolved "git+https://github.com/ibrkhalil/react-native-transparent-video.git#4029967db3fce1cfe5b76bf380426d3732934330" + resolved "git+https://github.com/ibrkhalil/react-native-transparent-video.git#4b0cfadbc3b5b5b9ce24cf856d847212fe5a1993" "react-native-webview@git+https://github.com/status-im/react-native-webview.git#refs/tags/v11.16.0-status": version "11.16.0" From f1c02a93d33f762fd522ffeb8029b42e6d821fbe Mon Sep 17 00:00:00 2001 From: ibrkhalil Date: Mon, 14 Aug 2023 19:47:16 +0300 Subject: [PATCH 3/6] Bump --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 75f47d6c5d8..7a1aef91eb0 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#refs/tags/v2.5.39", "react-native-svg": "13.10.0", "react-native-touch-id": "^4.4.1", - "react-native-transparent-video": "git+https://github.com/ibrkhalil/react-native-transparent-video.git#refs/tags/v0.0.2", + "react-native-transparent-video": "git+https://github.com/ibrkhalil/react-native-transparent-video.git#refs/tags/v0.0.3", "react-native-webview": "git+https://github.com/status-im/react-native-webview.git#refs/tags/v11.16.0-status", "react-syntax-highlighter": "^15.5.0", "rn-emoji-keyboard": "0.7.0", diff --git a/yarn.lock b/yarn.lock index cc1a2ece4ce..de4864dc445 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9012,9 +9012,9 @@ react-native-touch-id@^4.4.1: resolved "https://registry.yarnpkg.com/react-native-touch-id/-/react-native-touch-id-4.4.1.tgz#8b1bb2d04c30bac36bb9696d2d723e719c4a8b08" integrity sha512-1jTl8fC+0fxvqegy/XXTyo6vMvPhjzkoDdaqoYZx0OH8AT250NuXnNPyKktvigIcys3+2acciqOeaCall7lrvg== -"react-native-transparent-video@git+https://github.com/ibrkhalil/react-native-transparent-video.git#refs/tags/v0.0.2": +"react-native-transparent-video@git+https://github.com/ibrkhalil/react-native-transparent-video.git#refs/tags/v0.0.3": version "0.1.0" - resolved "git+https://github.com/ibrkhalil/react-native-transparent-video.git#4b0cfadbc3b5b5b9ce24cf856d847212fe5a1993" + resolved "git+https://github.com/ibrkhalil/react-native-transparent-video.git#365f253c765f8698282e0ecc2e1d93651df676bf" "react-native-webview@git+https://github.com/status-im/react-native-webview.git#refs/tags/v11.16.0-status": version "11.16.0" From 275160458f514c398f6601773b358e83f0289a9f Mon Sep 17 00:00:00 2001 From: ibrkhalil Date: Tue, 15 Aug 2023 20:14:21 +0300 Subject: [PATCH 4/6] Bump rn-transparent-video --- package.json | 2 +- src/status_im2/common/parallax/view.cljs | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 7a1aef91eb0..71546ea0373 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#refs/tags/v2.5.39", "react-native-svg": "13.10.0", "react-native-touch-id": "^4.4.1", - "react-native-transparent-video": "git+https://github.com/ibrkhalil/react-native-transparent-video.git#refs/tags/v0.0.3", + "react-native-transparent-video": "git+https://github.com/status-im/react-native-transparent-video.git#refs/tags/0.1.1", "react-native-webview": "git+https://github.com/status-im/react-native-webview.git#refs/tags/v11.16.0-status", "react-syntax-highlighter": "^15.5.0", "rn-emoji-keyboard": "0.7.0", diff --git a/src/status_im2/common/parallax/view.cljs b/src/status_im2/common/parallax/view.cljs index be4adb8b478..9306b96818e 100644 --- a/src/status_im2/common/parallax/view.cljs +++ b/src/status_im2/common/parallax/view.cljs @@ -7,15 +7,15 @@ (defn f-sensor-animated-video [{:keys [offset stretch order source disable-parallax? enable-looping?]}] - (let [double-stretch (* 2 stretch) + (let [double-stretch (* 2 stretch) {window-width :width window-height :height} (rn/get-window) - image-style (if (not disable-parallax?) - (worklets.parallax/sensor-animated-image order offset stretch) - {:top 0 - :right 0 - :bottom 0 - :left 0})] + image-style (if (not disable-parallax?) + (worklets.parallax/sensor-animated-image order offset stretch) + {:top 0 + :right 0 + :bottom 0 + :left 0})] (fn [] [reanimated/view {:needsOffscreenAlphaCompositing true @@ -24,9 +24,9 @@ (+ window-height double-stretch)) image-style]} [transparent-video/view - {:source source - :style style/video - :loopEnabled enable-looping?}]]))) + {:source source + :style style/video + :loop enable-looping?}]]))) (defn sensor-animated-video [props] From 9cdb628037d2733ce839cffdb1c5935a644ef731 Mon Sep 17 00:00:00 2001 From: ibrkhalil Date: Tue, 15 Aug 2023 20:38:32 +0300 Subject: [PATCH 5/6] Bump package --- yarn.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index de4864dc445..34226e29635 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9012,9 +9012,9 @@ react-native-touch-id@^4.4.1: resolved "https://registry.yarnpkg.com/react-native-touch-id/-/react-native-touch-id-4.4.1.tgz#8b1bb2d04c30bac36bb9696d2d723e719c4a8b08" integrity sha512-1jTl8fC+0fxvqegy/XXTyo6vMvPhjzkoDdaqoYZx0OH8AT250NuXnNPyKktvigIcys3+2acciqOeaCall7lrvg== -"react-native-transparent-video@git+https://github.com/ibrkhalil/react-native-transparent-video.git#refs/tags/v0.0.3": +"react-native-transparent-video@git+https://github.com/status-im/react-native-transparent-video.git#refs/tags/0.1.1": version "0.1.0" - resolved "git+https://github.com/ibrkhalil/react-native-transparent-video.git#365f253c765f8698282e0ecc2e1d93651df676bf" + resolved "git+https://github.com/status-im/react-native-transparent-video.git#1327fc622f7521269f66299c3aca610494c76fe1" "react-native-webview@git+https://github.com/status-im/react-native-webview.git#refs/tags/v11.16.0-status": version "11.16.0" From 2616a2f025b6e23ea324884cb06ec7e884e2530f Mon Sep 17 00:00:00 2001 From: ibrkhalil Date: Tue, 15 Aug 2023 21:19:06 +0300 Subject: [PATCH 6/6] lint --- src/status_im2/common/parallax/view.cljs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/status_im2/common/parallax/view.cljs b/src/status_im2/common/parallax/view.cljs index 9306b96818e..402144450ab 100644 --- a/src/status_im2/common/parallax/view.cljs +++ b/src/status_im2/common/parallax/view.cljs @@ -7,15 +7,15 @@ (defn f-sensor-animated-video [{:keys [offset stretch order source disable-parallax? enable-looping?]}] - (let [double-stretch (* 2 stretch) + (let [double-stretch (* 2 stretch) {window-width :width window-height :height} (rn/get-window) - image-style (if (not disable-parallax?) - (worklets.parallax/sensor-animated-image order offset stretch) - {:top 0 - :right 0 - :bottom 0 - :left 0})] + image-style (if (not disable-parallax?) + (worklets.parallax/sensor-animated-image order offset stretch) + {:top 0 + :right 0 + :bottom 0 + :left 0})] (fn [] [reanimated/view {:needsOffscreenAlphaCompositing true