From 5bb954f8a7c5dd4fcff0335d24090eb1c91f7684 Mon Sep 17 00:00:00 2001 From: flexsurfer Date: Wed, 20 Sep 2023 14:17:52 +0200 Subject: [PATCH] [#17351] remove status-im.utils.platform (#17352) --- .carve_ignore | 4 -- src/status_im/browser/core.cljs | 2 +- src/status_im/chat/models/images.cljs | 2 +- src/status_im/chat/models/message.cljs | 2 +- src/status_im/keycard/common.cljs | 2 +- src/status_im/keycard/real_keycard.cljs | 2 +- src/status_im/keycard/recovery.cljs | 2 +- src/status_im/multiaccounts/login/core.cljs | 2 +- src/status_im/node/core.cljs | 8 ++-- src/status_im/pairing/core.cljs | 2 +- .../ui/components/bottom_panel/views.cljs | 2 +- .../ui/components/emoji_thumbnail/styles.cljs | 2 +- .../ui/components/emoji_thumbnail/utils.cljs | 2 +- src/status_im/ui/components/list/views.cljs | 2 +- .../ui/components/list_selection.cljs | 2 +- src/status_im/ui/components/react.cljs | 2 +- src/status_im/ui/components/tabbar/core.cljs | 10 ----- src/status_im/ui/components/webview.cljs | 2 +- src/status_im/ui/screens/chat/group.cljs | 2 +- .../ui/screens/keycard/pin/views.cljs | 2 +- src/status_im/ui/screens/popover/views.cljs | 2 +- .../privacy_and_security_settings/views.cljs | 2 +- .../profile/visibility_status/views.cljs | 2 +- src/status_im/ui/screens/signing/views.cljs | 2 +- src/status_im/utils/logging/core.cljs | 2 +- src/status_im/utils/platform.cljs | 40 ------------------- src/status_im/utils/styles.clj | 2 +- src/status_im/utils/styles.cljs | 2 +- src/status_im2/common/bottom_sheet/style.cljs | 2 +- src/status_im2/contexts/syncing/events.cljs | 8 ++-- 30 files changed, 33 insertions(+), 87 deletions(-) delete mode 100644 src/status_im/ui/components/tabbar/core.cljs delete mode 100644 src/status_im/utils/platform.cljs diff --git a/.carve_ignore b/.carve_ignore index 7c3f13fa73..ab656c4309 100644 --- a/.carve_ignore +++ b/.carve_ignore @@ -196,10 +196,6 @@ status-im.desktop.core/init status-im.chat.models-test/test-db quo.design-system.spacing/padding-vertical status-im.utils.money/percent-change -status-im.utils.platform/isMacOs? -status-im.utils.platform/isNix? -status-im.utils.platform/isWin? -status-im.utils.platform/android-version>= utils.debounce/clear-all status-im.transport.db/create-chat status-im.utils.priority-map/priority-map diff --git a/src/status_im/browser/core.cljs b/src/status_im/browser/core.cljs index 7089d1fd12..1dad3be275 100644 --- a/src/status_im/browser/core.cljs +++ b/src/status_im/browser/core.cljs @@ -18,7 +18,7 @@ [status-im.ui.components.list-selection :as list-selection] [utils.re-frame :as rf] [utils.url :as url] - [status-im.utils.platform :as platform] + [react-native.platform :as platform] [status-im.utils.random :as random] [status-im.utils.types :as types] [status-im.utils.universal-links.utils :as links] diff --git a/src/status_im/chat/models/images.cljs b/src/status_im/chat/models/images.cljs index 31a5161de5..5d4ebe38b1 100644 --- a/src/status_im/chat/models/images.cljs +++ b/src/status_im/chat/models/images.cljs @@ -7,7 +7,7 @@ [react-native.fs :as fs] [status-im2.constants :as constants] [utils.re-frame :as rf] - [status-im.utils.platform :as platform] + [react-native.platform :as platform] [taoensso.timbre :as log])) (def temp-image-url (str (fs/cache-dir) "/StatusIm_Image.jpeg")) diff --git a/src/status_im/chat/models/message.cljs b/src/status_im/chat/models/message.cljs index 6bad643ad3..37cb760e29 100644 --- a/src/status_im/chat/models/message.cljs +++ b/src/status_im/chat/models/message.cljs @@ -4,7 +4,7 @@ [status-im.chat.models.loading :as chat.loading] [status-im.data-store.messages :as data-store.messages] [status-im.transport.message.protocol :as protocol] - [status-im.utils.platform :as platform] + [react-native.platform :as platform] [status-im.utils.types :as types] [status-im2.contexts.chat.messages.delete-message.events :as delete-message] [status-im2.contexts.chat.messages.list.events :as message-list] diff --git a/src/status_im/keycard/common.cljs b/src/status_im/keycard/common.cljs index 2919cf529b..6f9d15d995 100644 --- a/src/status_im/keycard/common.cljs +++ b/src/status_im/keycard/common.cljs @@ -10,7 +10,7 @@ [utils.re-frame :as rf] [utils.datetime :as datetime] [status-im.utils.keychain.core :as keychain] - [status-im.utils.platform :as platform] + [react-native.platform :as platform] [status-im.utils.types :as types] [status-im2.navigation.events :as navigation] [taoensso.timbre :as log])) diff --git a/src/status_im/keycard/real_keycard.cljs b/src/status_im/keycard/real_keycard.cljs index 77026ab5e7..37df03a4e0 100644 --- a/src/status_im/keycard/real_keycard.cljs +++ b/src/status_im/keycard/real_keycard.cljs @@ -5,7 +5,7 @@ [status-im.ethereum.core :as ethereum] [status-im.keycard.keycard :as keycard] [native-module.core :as native-module] - [status-im.utils.platform :as platform] + [react-native.platform :as platform] [status-im.utils.types :as types] [taoensso.timbre :as log])) diff --git a/src/status_im/keycard/recovery.cljs b/src/status_im/keycard/recovery.cljs index 0447e1d3a5..a4ea7b50ac 100644 --- a/src/status_im/keycard/recovery.cljs +++ b/src/status_im/keycard/recovery.cljs @@ -15,7 +15,7 @@ [utils.re-frame :as rf] [utils.datetime :as datetime] [status-im.utils.keychain.core :as keychain] - [status-im.utils.platform :as platform] + [react-native.platform :as platform] [status-im.utils.types :as types] [status-im2.navigation.events :as navigation] [taoensso.timbre :as log] diff --git a/src/status_im/multiaccounts/login/core.cljs b/src/status_im/multiaccounts/login/core.cljs index ef39fdf6a8..efdfb175c0 100644 --- a/src/status_im/multiaccounts/login/core.cljs +++ b/src/status_im/multiaccounts/login/core.cljs @@ -5,7 +5,7 @@ [native-module.core :as native-module] [status-im.ui.components.react :as react] [utils.re-frame :as rf] - [status-im.utils.platform :as platform] + [react-native.platform :as platform] [status-im.utils.types :as types] [utils.security.core :as security])) diff --git a/src/status_im/node/core.cljs b/src/status_im/node/core.cljs index 7b6a1b6817..c8d9da2159 100644 --- a/src/status_im/node/core.cljs +++ b/src/status_im/node/core.cljs @@ -3,9 +3,9 @@ [native-module.core :as native-module] [status-im2.config :as config] [utils.re-frame :as rf] - [status-im.utils.platform :as utils.platform] [status-im.utils.types :as types] - [clojure.string :as string])) + [clojure.string :as string] + [react-native.platform :as platform])) (defn- add-custom-bootnodes [config network all-bootnodes] @@ -173,7 +173,7 @@ :WakuV2Config (merge (assoc wakuv2-config :Enabled wakuv2-enabled) wakuv2-default-config) :ShhextConfig - {:BackupDisabledDataDir (utils.platform/no-backup-directory) + {:BackupDisabledDataDir (if platform/android? "/../no_backup" "/") :InstallationID installation-id :MaxMessageDeliveryAttempts config/max-message-delivery-attempts :MailServerConfirmations config/mailserver-confirmations-enabled? @@ -205,7 +205,7 @@ which will take care of building up the proper config based on settings in app-db" {:events [::save-new-config]} - [{:keys [db]} config {:keys [on-success]}] + [_ config {:keys [on-success]}] {:json-rpc/call [{:method "settings_saveSetting" :params [:node-config config] :on-success on-success}]}) diff --git a/src/status_im/pairing/core.cljs b/src/status_im/pairing/core.cljs index c1c010a0a2..0cc1d56c32 100644 --- a/src/status_im/pairing/core.cljs +++ b/src/status_im/pairing/core.cljs @@ -4,7 +4,7 @@ [status-im.multiaccounts.update.core :as multiaccounts.update] [status-im2.config :as config] [utils.re-frame :as rf] - [status-im.utils.platform :as utils.platform] + [react-native.platform :as utils.platform] [status-im2.common.json-rpc.events :as json-rpc] [status-im2.navigation.events :as navigation] [taoensso.timbre :as log])) diff --git a/src/status_im/ui/components/bottom_panel/views.cljs b/src/status_im/ui/components/bottom_panel/views.cljs index bf4a7b5d30..801c4db7d1 100644 --- a/src/status_im/ui/components/bottom_panel/views.cljs +++ b/src/status_im/ui/components/bottom_panel/views.cljs @@ -4,7 +4,7 @@ [reagent.core :as reagent] [status-im.ui.components.animation :as anim] [status-im.ui.components.react :as react] - [status-im.utils.platform :as platform]) + [react-native.platform :as platform]) (:require-macros [status-im.utils.views :as views])) (def back-listener (atom nil)) diff --git a/src/status_im/ui/components/emoji_thumbnail/styles.cljs b/src/status_im/ui/components/emoji_thumbnail/styles.cljs index fe54d38c76..4d4c3c3aff 100644 --- a/src/status_im/ui/components/emoji_thumbnail/styles.cljs +++ b/src/status_im/ui/components/emoji_thumbnail/styles.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.components.emoji-thumbnail.styles (:require [quo.design-system.colors :as colors] [status-im.ui.components.emoji-thumbnail.utils :as emoji-utils] - [status-im.utils.platform :as platform])) + [react-native.platform :as platform])) (defn emoji-thumbnail-icon [color size] diff --git a/src/status_im/ui/components/emoji_thumbnail/utils.cljs b/src/status_im/ui/components/emoji_thumbnail/utils.cljs index 5c9d1fedbc..d8b2a20c75 100644 --- a/src/status_im/ui/components/emoji_thumbnail/utils.cljs +++ b/src/status_im/ui/components/emoji_thumbnail/utils.cljs @@ -1,5 +1,5 @@ (ns status-im.ui.components.emoji-thumbnail.utils - (:require [status-im.utils.platform :as platform])) + (:require [react-native.platform :as platform])) (defn emoji-font-size [container_size] diff --git a/src/status_im/ui/components/list/views.cljs b/src/status_im/ui/components/list/views.cljs index 67cee5539d..54770ca247 100644 --- a/src/status_im/ui/components/list/views.cljs +++ b/src/status_im/ui/components/list/views.cljs @@ -3,7 +3,7 @@ [reagent.core :as reagent] [status-im.ui.components.list.styles :as styles] [status-im.ui.components.react :as react] - [status-im.utils.platform :as platform])) + [react-native.platform :as platform])) (def flat-list-class (reagent/adapt-react-class (.-FlatList react-native))) (def section-list-class (reagent/adapt-react-class (.-SectionList react-native))) diff --git a/src/status_im/ui/components/list_selection.cljs b/src/status_im/ui/components/list_selection.cljs index ffd1092a46..9dd7b9d47a 100644 --- a/src/status_im/ui/components/list_selection.cljs +++ b/src/status_im/ui/components/list_selection.cljs @@ -5,7 +5,7 @@ [status-im.ui.components.dialog :as dialog] [status-im.ui.components.react :as react] [utils.url :as url] - [status-im.utils.platform :as platform])) + [react-native.platform :as platform])) (defn open-share [content] diff --git a/src/status_im/ui/components/react.cljs b/src/status_im/ui/components/react.cljs index 484cd5dffe..af612e2ffc 100644 --- a/src/status_im/ui/components/react.cljs +++ b/src/status_im/ui/components/react.cljs @@ -12,7 +12,7 @@ [reagent.core :as reagent] [utils.i18n :as i18n] [status-im.ui.components.typography :as typography] - [status-im.utils.platform :as platform] + [react-native.platform :as platform] [status-im.utils.utils :as utils]) (:require-macros [status-im.utils.views :as views])) diff --git a/src/status_im/ui/components/tabbar/core.cljs b/src/status_im/ui/components/tabbar/core.cljs deleted file mode 100644 index a182d24fa1..0000000000 --- a/src/status_im/ui/components/tabbar/core.cljs +++ /dev/null @@ -1,10 +0,0 @@ -(ns status-im.ui.components.tabbar.core - (:require [status-im.utils.platform :as platform])) - -(defn get-height - [] - (if platform/android? - 56 - (if platform/iphone-x? - 84 - 50))) diff --git a/src/status_im/ui/components/webview.cljs b/src/status_im/ui/components/webview.cljs index fcbf940b31..505ebcaa73 100644 --- a/src/status_im/ui/components/webview.cljs +++ b/src/status_im/ui/components/webview.cljs @@ -2,7 +2,7 @@ (:require ["react-native-webview" :default rn-webview] [reagent.core :as reagent] [status-im2.config :as config] - [status-im.utils.platform :as platform])) + [react-native.platform :as platform])) (def webview-class (reagent/adapt-react-class rn-webview)) diff --git a/src/status_im/ui/screens/chat/group.cljs b/src/status_im/ui/screens/chat/group.cljs index f8588db8d7..c866e1fdd4 100644 --- a/src/status_im/ui/screens/chat/group.cljs +++ b/src/status_im/ui/screens/chat/group.cljs @@ -5,7 +5,7 @@ [status-im2.constants :as constants] [utils.i18n :as i18n] [status-im.ui.components.react :as react] - [status-im.utils.platform :as platform] + [react-native.platform :as platform] [utils.debounce :as debounce]) (:require-macros [status-im.utils.views :refer [defview letsubs]])) diff --git a/src/status_im/ui/screens/keycard/pin/views.cljs b/src/status_im/ui/screens/keycard/pin/views.cljs index e5383e1df3..8b53c8e383 100644 --- a/src/status_im/ui/screens/keycard/pin/views.cljs +++ b/src/status_im/ui/screens/keycard/pin/views.cljs @@ -9,7 +9,7 @@ [status-im.ui.components.icons.icons :as icons] [status-im.ui.components.react :as react] [status-im.ui.screens.keycard.pin.styles :as styles] - [status-im.utils.platform :as platform])) + [react-native.platform :as platform])) (def default-pin-retries-number 3) (def default-puk-retries-number 5) diff --git a/src/status_im/ui/screens/popover/views.cljs b/src/status_im/ui/screens/popover/views.cljs index 59c23cfe34..86f60a48a5 100644 --- a/src/status_im/ui/screens/popover/views.cljs +++ b/src/status_im/ui/screens/popover/views.cljs @@ -14,7 +14,7 @@ [status-im.ui.screens.signing.views :as signing] [status-im.ui.screens.wallet.request.views :as request] [status-im.ui.screens.wallet.signing-phrase.views :as signing-phrase] - [status-im.utils.platform :as platform])) + [react-native.platform :as platform])) (defn hide-panel-anim [bottom-anim-value alpha-value window-height] diff --git a/src/status_im/ui/screens/privacy_and_security_settings/views.cljs b/src/status_im/ui/screens/privacy_and_security_settings/views.cljs index e22a33f61e..58f876aa6c 100644 --- a/src/status_im/ui/screens/privacy_and_security_settings/views.cljs +++ b/src/status_im/ui/screens/privacy_and_security_settings/views.cljs @@ -8,7 +8,7 @@ [status-im.ui.components.common.common :as components.common] [status-im.ui.components.react :as react] [status-im2.config :as config] - [status-im.utils.platform :as platform]) + [react-native.platform :as platform]) (:require-macros [status-im.utils.views :as views])) (defn separator diff --git a/src/status_im/ui/screens/profile/visibility_status/views.cljs b/src/status_im/ui/screens/profile/visibility_status/views.cljs index 81ba572d42..e40ddb5a21 100644 --- a/src/status_im/ui/screens/profile/visibility_status/views.cljs +++ b/src/status_im/ui/screens/profile/visibility_status/views.cljs @@ -12,7 +12,7 @@ [status-im.ui.screens.profile.visibility-status.styles :as styles] [status-im.ui.screens.profile.visibility-status.utils :as utils] [utils.re-frame :as rf] - [status-im.utils.platform :as platform])) + [react-native.platform :as platform])) ;; === Code Related to visibility-status-button === diff --git a/src/status_im/ui/screens/signing/views.cljs b/src/status_im/ui/screens/signing/views.cljs index c61be68678..6aae6f7380 100644 --- a/src/status_im/ui/screens/signing/views.cljs +++ b/src/status_im/ui/screens/signing/views.cljs @@ -22,7 +22,7 @@ [status-im.ui.screens.signing.sheets :as sheets] [status-im.ui.screens.signing.styles :as styles] [status-im.ui.screens.wallet.components.views :as wallet.components] - [status-im.utils.platform :as platform] + [react-native.platform :as platform] [status-im.utils.types :as types] [status-im.utils.utils :as utils] [status-im.wallet.utils :as wallet.utils] diff --git a/src/status_im/utils/logging/core.cljs b/src/status_im/utils/logging/core.cljs index 6adda8bf91..a8ded5c7a9 100644 --- a/src/status_im/utils/logging/core.cljs +++ b/src/status_im/utils/logging/core.cljs @@ -11,7 +11,7 @@ [status-im.utils.build :as build] [utils.re-frame :as rf] [utils.datetime :as datetime] - [status-im.utils.platform :as platform] + [react-native.platform :as platform] [status-im.utils.types :as types] [status-im2.common.log :as log] [status-im2.config :as config])) diff --git a/src/status_im/utils/platform.cljs b/src/status_im/utils/platform.cljs deleted file mode 100644 index c1b1bdc64b..0000000000 --- a/src/status_im/utils/platform.cljs +++ /dev/null @@ -1,40 +0,0 @@ -(ns status-im.utils.platform - (:require ["react-native" :as react-native :refer (Dimensions)])) - -(def platform - (.-Platform react-native)) - -(def os - (when platform - (.-OS ^js platform))) - -(def version - (when platform - (.-Version ^js platform))) - -;; iPhone X dimensions -(def x-height 812) -(def xs-height 896) - -(defn iphone-x-dimensions? - [] - (let [{:keys [height]} (-> Dimensions - (.get "window") - (js->clj :keywordize-keys true))] - (or (= height x-height) (= height xs-height)))) - -(def android? (= os "android")) -(def ios? (= os "ios")) -(def iphone-x? (and ios? (iphone-x-dimensions?))) - -(defn no-backup-directory - [] - (cond - android? "/../no_backup" - ios? "/")) - -(defn android-version>= - [v] - (and android? (>= version v))) - -(def low-device? (and android? (< version 29))) diff --git a/src/status_im/utils/styles.clj b/src/status_im/utils/styles.clj index 42f4516297..ab75872d94 100644 --- a/src/status_im/utils/styles.clj +++ b/src/status_im/utils/styles.clj @@ -4,7 +4,7 @@ [style] `(let [style# ~style common# (dissoc style# :android :ios) - platform# (keyword status-im.utils.platform/os) + platform# (keyword react-native.platform/os) platform-specific# (get style# platform#)] (if platform-specific# (merge common# platform-specific#) diff --git a/src/status_im/utils/styles.cljs b/src/status_im/utils/styles.cljs index beb1cc2e88..7ac858e64f 100644 --- a/src/status_im/utils/styles.cljs +++ b/src/status_im/utils/styles.cljs @@ -1,3 +1,3 @@ (ns status-im.utils.styles (:require-macros status-im.utils.styles) - (:require status-im.utils.platform)) + (:require react-native.platform)) diff --git a/src/status_im2/common/bottom_sheet/style.cljs b/src/status_im2/common/bottom_sheet/style.cljs index 6f6c592b59..1ddac1f8bc 100644 --- a/src/status_im2/common/bottom_sheet/style.cljs +++ b/src/status_im2/common/bottom_sheet/style.cljs @@ -1,7 +1,7 @@ (ns status-im2.common.bottom-sheet.style (:require [quo2.foundations.colors :as colors] [quo2.theme :as theme] - [status-im.utils.platform :as platform])) + [react-native.platform :as platform])) (defn handle [theme] diff --git a/src/status_im2/contexts/syncing/events.cljs b/src/status_im2/contexts/syncing/events.cljs index 6bfb7a5689..03fe82019c 100644 --- a/src/status_im2/contexts/syncing/events.cljs +++ b/src/status_im2/contexts/syncing/events.cljs @@ -3,13 +3,13 @@ [re-frame.core :as re-frame] [status-im.data-store.settings :as data-store.settings] [status-im.node.core :as node] - [status-im.utils.platform :as utils.platform] [status-im2.config :as config] [status-im2.constants :as constants] [taoensso.timbre :as log] [utils.re-frame :as rf] [utils.security.core :as security] - [utils.transforms :as transforms])) + [utils.transforms :as transforms] + [react-native.platform :as platform])) (rf/defn local-pairing-update-role {:events [:syncing/update-role]} @@ -60,7 +60,7 @@ {:receiverConfig {:kdfIterations config/default-kdf-iterations :nodeConfig final-node-config :settingCurrentNetwork config/default-network - :deviceType utils.platform/os + :deviceType platform/os :deviceName (native-module/get-installation-name)}}))] (rf/dispatch [:syncing/update-role constants/local-pairing-role-receiver]) @@ -87,7 +87,7 @@ (clj->js {:senderConfig {:keyUID key-uid :keystorePath "" :password sha3-pwd - :deviceType utils.platform/os} + :deviceType platform/os} :serverConfig {:timeout 0}}))] (native-module/get-connection-string-for-bootstrapping-another-device config-map