From e7354b5de8adbde358e963035c1cf82053a0f9d2 Mon Sep 17 00:00:00 2001 From: Andrea Maria Piana Date: Wed, 17 Jul 2024 11:44:27 +0100 Subject: [PATCH] remove blurview --- .../java/im/status/ethereum/MainApplication.java | 2 -- nix/deps/gradle/deps.json | 14 -------------- nix/deps/gradle/deps.list | 1 - nix/deps/gradle/deps.urls | 1 - src/status_im/switcher/switcher.cljs | 2 +- src/status_im/ui/components/react.cljs | 5 +---- .../wallet_connect/session_proposal/views.cljs | 6 +++--- 7 files changed, 5 insertions(+), 26 deletions(-) diff --git a/android/app/src/main/java/im/status/ethereum/MainApplication.java b/android/app/src/main/java/im/status/ethereum/MainApplication.java index eb613980c7..ef93456092 100644 --- a/android/app/src/main/java/im/status/ethereum/MainApplication.java +++ b/android/app/src/main/java/im/status/ethereum/MainApplication.java @@ -16,7 +16,6 @@ import com.reactnativenavigation.react.NavigationReactNativeHost; import com.facebook.react.ReactPackage; import com.facebook.react.ReactInstanceManager; import com.facebook.react.modules.network.OkHttpClientProvider; -import com.cmcewen.blurview.BlurViewPackage; import java.util.List; @@ -45,7 +44,6 @@ public class MainApplication extends NavigationApplication { packages.add(new ReactNativeDialogsPackage()); packages.add(new RNStatusKeycardPackage()); packages.add(new PushNotificationPackage()); - packages.add(new BlurViewPackage()); return packages; } diff --git a/nix/deps/gradle/deps.json b/nix/deps/gradle/deps.json index 55676bea69..e603c58453 100644 --- a/nix/deps/gradle/deps.json +++ b/nix/deps/gradle/deps.json @@ -4059,20 +4059,6 @@ } }, - { - "path": "com/eightbitlab/blurview/1.6.6/blurview-1.6.6", - "host": "https://plugins.gradle.org/m2", - "type": "aar", - "pom": { - "sha1": "489f224c45b0b1de96491381bdaa181ccae964a2", - "sha256": "0xjrxz13zkw789npq0d96bxsi5w6f6mjnh9cbnlk3i8gc4c4906q" - }, - "jar": { - "sha1": "6457c0c2928b4580764fafa88ae67a9b451ff0ef", - "sha256": "03y7j7vjyjhqw9imk5wzqghanqh8q541dlhzrmpbdk2sp8hy3cnq" - } - }, - { "path": "com/facebook/fresco/drawee/2.2.0/drawee-2.2.0", "host": "https://plugins.gradle.org/m2", diff --git a/nix/deps/gradle/deps.list b/nix/deps/gradle/deps.list index 332fdaa67e..da2f659b2e 100644 --- a/nix/deps/gradle/deps.list +++ b/nix/deps/gradle/deps.list @@ -310,7 +310,6 @@ com.android.tools:sdk-common:26.2.1 com.android.tools:sdk-common:26.3.1 com.android.tools:sdk-common:26.5.4 com.drewnoakes:metadata-extractor:2.9.1 -com.eightbitlab:blurview:1.6.6 com.facebook.conceal:conceal:1.1.3 com.facebook.flipper:flipper-fresco-plugin:0.54.0 com.facebook.flipper:flipper:0.54.0 diff --git a/nix/deps/gradle/deps.urls b/nix/deps/gradle/deps.urls index b126665a29..28b94298e1 100644 --- a/nix/deps/gradle/deps.urls +++ b/nix/deps/gradle/deps.urls @@ -288,7 +288,6 @@ https://jitpack.io/com/github/status-im/status-keycard-java/lib/3.1.1/lib-3.1.1. https://jitpack.io/com/github/wix-playground/ahbottomnavigation/3.3.0/ahbottomnavigation-3.3.0.pom https://jitpack.io/com/github/wix-playground/reflow-animator/1.0.6/reflow-animator-1.0.6.pom https://jitpack.io/com/github/yalantis/ucrop/2.2.6-native/ucrop-2.2.6-native.pom -https://plugins.gradle.org/m2/com/eightbitlab/blurview/1.6.6/blurview-1.6.6.pom https://plugins.gradle.org/m2/com/facebook/fresco/drawee/2.2.0/drawee-2.2.0.pom https://plugins.gradle.org/m2/com/facebook/fresco/fbcore/2.2.0/fbcore-2.2.0.pom https://plugins.gradle.org/m2/com/facebook/fresco/fresco/2.2.0/fresco-2.2.0.pom diff --git a/src/status_im/switcher/switcher.cljs b/src/status_im/switcher/switcher.cljs index d99f8e03ea..b91e48981d 100644 --- a/src/status_im/switcher/switcher.cljs +++ b/src/status_im/switcher/switcher.cljs @@ -51,7 +51,7 @@ :transform [{:scale (:switcher-container-scale shared-values)}]} switcher-container-original-style)] [reanimated/view {:style switcher-screen-animated-style} - [react/blur-view (styles/switcher-blur-background)] + [react/view (styles/switcher-blur-background)] [reanimated/view {:style switcher-container-animated-style} [switcher-container/tabs toggle-switcher-screen-fn]]]))]) diff --git a/src/status_im/ui/components/react.cljs b/src/status_im/ui/components/react.cljs index 0ee37e9c0e..425d5594b6 100644 --- a/src/status_im/ui/components/react.cljs +++ b/src/status_im/ui/components/react.cljs @@ -13,8 +13,7 @@ ["@react-native-community/clipboard" :default Clipboard] ["react-native-linear-gradient" :default LinearGradient] ["react-native-navigation" :refer (Navigation)] - ["react-native-fast-image" :as FastImage] - ["@react-native-community/blur" :as blur]) + ["react-native-fast-image" :as FastImage]) (:require-macros [status-im.utils.views :as views])) (def native-modules (.-NativeModules react-native)) @@ -40,8 +39,6 @@ (def linear-gradient (reagent/adapt-react-class LinearGradient)) -(def blur-view (reagent/adapt-react-class (.-BlurView blur))) - (defn valid-source? [source] (or (not (map? source)) (not (contains? source :uri)) diff --git a/src/status_im/ui/screens/wallet_connect/session_proposal/views.cljs b/src/status_im/ui/screens/wallet_connect/session_proposal/views.cljs index d87b02a9e3..fe7c48d65f 100644 --- a/src/status_im/ui/screens/wallet_connect/session_proposal/views.cljs +++ b/src/status_im/ui/screens/wallet_connect/session_proposal/views.cljs @@ -121,9 +121,9 @@ (i18n/label :t/close)]] (when managed-session (if platform/ios? - [react/blur-view {:style (styles/blur-view) - :blurAmount 2 - :blurType (if (colors/dark?) :dark :light)}] + [react/view {:style (styles/blur-view) + :blurAmount 2 + :blurType (if (colors/dark?) :dark :light)}] [react/view (styles/blur-view)]))]))) (defview app-management-sheet-view [{:keys [wc-version] :as session}]