Skip to content

Commit fedaa36

Browse files
Pau1fitzPau1fitz
committed
update to use color
1 parent 7f65c84 commit fedaa36

File tree

9 files changed

+123
-116
lines changed

9 files changed

+123
-116
lines changed

Diff for: ‎src/quo/components/share/share_community_channel_qr_code/schema.cljs

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
(ns quo.components.share.share-community-channel-qr-code.schema)
2+
3+
(def ?schema
4+
[:=>
5+
[:catn
6+
[:props
7+
[:map {:closed true}
8+
[:qr-image-uri :string]
9+
[:emoji {:optional true} [:maybe :string]]
10+
[:customization-color :string]
11+
[:theme :schema.common/theme]]]]
12+
:any])

Diff for: ‎src/quo/components/share/share_community_qr_code/style.cljs renamed to ‎src/quo/components/share/share_community_channel_qr_code/style.cljs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(ns quo.components.share.share-community-qr-code.style
1+
(ns quo.components.share.share-community-channel-qr-code.style
22
(:require [quo.foundations.colors :as colors]))
33

44
(def outer-container
@@ -9,7 +9,7 @@
99
(def ^:private padding 12)
1010

1111
(def container-component
12-
{:padding-bottom padding
12+
{:padding-bottom padding
1313
:background-color colors/white-opa-5})
1414

1515
(def content-container

Diff for: ‎src/quo/components/share/share_community_qr_code/view.cljs renamed to ‎src/quo/components/share/share_community_channel_qr_code/view.cljs

+11-9
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,27 @@
1-
(ns quo.components.share.share-community-qr-code.view
1+
(ns quo.components.share.share-community-channel-qr-code.view
22
(:require [clojure.set]
33
[oops.core :as oops]
44
[quo.components.share.qr-code.view :as qr-code]
5-
[quo.components.share.share-community-qr-code.schema :as component-schema]
6-
[quo.components.share.share-community-qr-code.style :as style]
5+
[quo.components.share.share-community-channel-qr-code.schema :as component-schema]
6+
[quo.components.share.share-community-channel-qr-code.style :as style]
77
[quo.theme]
88
[react-native.core :as rn]
99
[reagent.core :as reagent]
1010
[schema.core :as schema]))
1111

1212
(defn- share-qr-code
13-
[{:keys [qr-image-uri component-width emoji]}]
13+
[{:keys [qr-image-uri component-width emoji customization-color]}]
1414
[:<>
1515
[rn/view {:style style/content-container}
1616
[rn/view {:style style/share-qr-container}]
1717
[quo.theme/provider {:theme :light}
1818
[qr-code/view
19-
{:qr-image-uri qr-image-uri
20-
:size (style/qr-code-size component-width)
21-
:avatar :community
22-
:emoji emoji}]]]])
19+
{:qr-image-uri qr-image-uri
20+
:size (style/qr-code-size component-width)
21+
:avatar :channel
22+
:emoji emoji
23+
:customization-color customization-color}]]]])
24+
2325
(defn- view-internal
2426
[props]
2527
(reagent/with-let [component-width (reagent/atom nil)
@@ -38,4 +40,4 @@
3840

3941
(def view
4042
(quo.theme/with-theme
41-
(schema/instrument #'view-internal component-schema/?schema)))
43+
(schema/instrument #'view-internal component-schema/?schema)))

Diff for: ‎src/quo/components/share/share_community_qr_code/schema.cljs

-11
This file was deleted.

Diff for: ‎src/quo/core.cljs

+2-2
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
quo.components.settings.section-label.view
131131
quo.components.settings.settings-item.view
132132
quo.components.share.qr-code.view
133-
quo.components.share.share-community-qr-code.view
133+
quo.components.share.share-community-channel-qr-code.view
134134
quo.components.share.share-qr-code.view
135135
quo.components.switchers.group-messaging-card.view
136136
quo.components.tabs.account-selector
@@ -378,7 +378,7 @@
378378
;;;; Share
379379
(def qr-code quo.components.share.qr-code.view/view)
380380
(def share-qr-code quo.components.share.share-qr-code.view/view)
381-
(def share-community-qr-code quo.components.share.share-community-qr-code.view/view)
381+
(def share-community-channel-qr-code quo.components.share.share-community-channel-qr-code.view/view)
382382

383383
;;;; SWITCHER
384384
(def group-messaging-card quo.components.switchers.group-messaging-card.view/view)

Diff for: ‎src/status_im/contexts/wallet/share_community_channel/style.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
{:color colors/neutral-40
1010
:margin-top 12
1111
:margin-left :auto
12-
:margin-right :auto})
12+
:margin-right :auto})

Diff for: ‎src/status_im/contexts/wallet/share_community_channel/view.cljs

+21-17
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
11
(ns status-im.contexts.wallet.share-community-channel.view
22
(:require
3-
[quo.core :as quo]
4-
[react-native.core :as rn]
5-
[react-native.safe-area :as safe-area]
6-
[status-im.contexts.wallet.share-community-channel.style :as style]
7-
[utils.i18n :as i18n]
8-
[utils.image-server :as image-server]
9-
[utils.re-frame :as rf]))
3+
[quo.core :as quo]
4+
[react-native.core :as rn]
5+
[react-native.safe-area :as safe-area]
6+
[status-im.contexts.wallet.share-community-channel.style :as style]
7+
[utils.i18n :as i18n]
8+
[utils.image-server :as image-server]
9+
[utils.re-frame :as rf]))
1010

1111
(def qr-size 500)
1212

1313
(defn view
1414
[]
1515
(let [padding-top (:top (safe-area/get-insets))]
1616
(fn []
17-
(let [{:keys [url]} (rf/sub [:get-screen-params])
18-
qr-media-server-uri (image-server/get-qr-image-uri-for-any-url
19-
{:url url
20-
:port (rf/sub [:mediaserver/port])
21-
:qr-size qr-size
22-
:error-level :highest})
23-
title (i18n/label :t/share-channel)]
17+
(let [chat (rf/sub [:chats/current-chat-chat-view])
18+
{:keys [url]} (rf/sub [:get-screen-params])
19+
qr-media-server-uri (image-server/get-qr-image-uri-for-any-url
20+
{:url url
21+
:port (rf/sub [:mediaserver/port])
22+
:qr-size qr-size
23+
:error-level :highest})
24+
title (i18n/label :t/share-channel)]
25+
(print chat)
2426
[quo/overlay {:type :shell}
2527
[rn/view
2628
{:flex 1
@@ -37,9 +39,11 @@
3739
{:container-style style/header-container
3840
:title title}]
3941
[rn/view {:style {:padding-horizontal 20}}
40-
[quo/share-community-qr-code
41-
{:qr-image-uri qr-media-server-uri
42-
:emoji "add emoji here"}]]
42+
[quo/share-community-channel-qr-code
43+
{:qr-image-uri qr-media-server-uri
44+
:customization-color (:color chat)
45+
;; :emoji (:emoji chat)
46+
:emoji "emoji"}]]
4347
[quo/text
4448
{:size :paragraph-2
4549
:weight :regular

Diff for: ‎src/status_im/navigation/screens.cljs

+73-73
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,78 @@
11
(ns status-im.navigation.screens
22
(:require
3-
[legacy.status-im.ui.screens.screens :as old-screens]
4-
[status-im.common.emoji-picker.view :as emoji-picker]
5-
[status-im.common.lightbox.view :as lightbox]
6-
[status-im.config :as config]
7-
[status-im.contexts.chat.group-details.view :as group-details]
8-
[status-im.contexts.chat.home.add-new-contact.scan.scan-profile-qr-page :as scan-profile-qr-page]
9-
[status-im.contexts.chat.home.add-new-contact.views :as add-new-contact]
10-
[status-im.contexts.chat.home.new-chat.view :as new-chat]
11-
[status-im.contexts.chat.messenger.camera.view :as camera-screen]
12-
[status-im.contexts.chat.messenger.messages.view :as chat]
13-
[status-im.contexts.chat.messenger.photo-selector.view :as photo-selector]
14-
[status-im.contexts.communities.actions.accounts-selection.view :as communities.accounts-selection]
15-
[status-im.contexts.communities.actions.addresses-for-permissions.view :as
16-
addresses-for-permissions]
17-
[status-im.contexts.communities.actions.airdrop-addresses.view :as airdrop-addresses]
18-
[status-im.contexts.communities.actions.request-to-join.view :as join-menu]
19-
[status-im.contexts.communities.discover.view :as communities.discover]
20-
[status-im.contexts.communities.overview.view :as communities.overview]
21-
[status-im.contexts.onboarding.create-password.view :as create-password]
22-
[status-im.contexts.onboarding.create-profile.view :as create-profile]
23-
[status-im.contexts.onboarding.enable-biometrics.view :as enable-biometrics]
24-
[status-im.contexts.onboarding.enable-notifications.view :as enable-notifications]
25-
[status-im.contexts.onboarding.enter-seed-phrase.view :as enter-seed-phrase]
26-
[status-im.contexts.onboarding.generating-keys.view :as generating-keys]
27-
[status-im.contexts.onboarding.identifiers.view :as identifiers]
28-
[status-im.contexts.onboarding.intro.view :as intro]
29-
[status-im.contexts.onboarding.new-to-status.view :as new-to-status]
30-
[status-im.contexts.onboarding.sign-in.view :as sign-in]
31-
[status-im.contexts.onboarding.syncing.progress.view :as syncing-devices]
32-
[status-im.contexts.onboarding.syncing.results.view :as syncing-results]
33-
[status-im.contexts.onboarding.welcome.view :as welcome]
34-
[status-im.contexts.preview.feature-flags.view :as feature-flags]
35-
[status-im.contexts.preview.quo.component-preview.view :as component-preview]
36-
[status-im.contexts.preview.quo.main :as quo.preview]
37-
[status-im.contexts.preview.status-im.main :as status-im-preview]
38-
[status-im.contexts.profile.edit.name.view :as edit-name]
39-
[status-im.contexts.profile.edit.view :as edit-profile]
40-
[status-im.contexts.profile.profiles.view :as profiles]
41-
[status-im.contexts.profile.settings.screens.password.view :as settings-password]
42-
[status-im.contexts.profile.settings.view :as settings]
43-
[status-im.contexts.shell.activity-center.view :as activity-center]
44-
[status-im.contexts.shell.jump-to.view :as shell]
45-
[status-im.contexts.shell.share.view :as share]
46-
[status-im.contexts.syncing.find-sync-code.view :as find-sync-code]
47-
[status-im.contexts.syncing.how-to-pair.view :as how-to-pair]
48-
[status-im.contexts.syncing.scan-sync-code-page.view :as scan-sync-code-page]
49-
[status-im.contexts.syncing.setup-syncing.view :as settings-setup-syncing]
50-
[status-im.contexts.syncing.syncing-devices-list.view :as settings-syncing]
51-
[status-im.contexts.wallet.account.bridge-to.view :as bridge-to]
52-
[status-im.contexts.wallet.account.bridge.view :as bridge]
53-
[status-im.contexts.wallet.account.view :as wallet-accounts]
54-
[status-im.contexts.wallet.add-address-to-watch.confirm-address.view :as confirm-address-to-watch]
55-
[status-im.contexts.wallet.add-address-to-watch.view :as add-address-to-watch]
56-
[status-im.contexts.wallet.collectible.view :as wallet-collectible]
57-
[status-im.contexts.wallet.create-account.edit-derivation-path.view :as wallet-edit-derivation-path]
58-
[status-im.contexts.wallet.create-account.new-keypair.backup-recovery-phrase.view :as
59-
wallet-backup-recovery-phrase]
60-
[status-im.contexts.wallet.create-account.new-keypair.check-your-backup.view :as
61-
wallet-check-your-backup]
62-
[status-im.contexts.wallet.create-account.select-keypair.view :as wallet-select-keypair]
63-
[status-im.contexts.wallet.create-account.view :as wallet-create-account]
64-
[status-im.contexts.wallet.edit-account.view :as wallet-edit-account]
65-
[status-im.contexts.wallet.saved-addresses.view :as wallet-saved-addresses]
66-
[status-im.contexts.wallet.scan-account.view :as scan-address]
67-
[status-im.contexts.wallet.send.input-amount.view :as wallet-send-input-amount]
68-
[status-im.contexts.wallet.send.select-address.view :as wallet-select-address]
69-
[status-im.contexts.wallet.send.select-asset.view :as wallet-select-asset]
70-
[status-im.contexts.wallet.send.transaction-confirmation.view :as wallet-transaction-confirmation]
71-
[status-im.contexts.wallet.send.transaction-progress.view :as wallet-transaction-progress]
72-
[status-im.contexts.wallet.share-address.view :as wallet-share-address]
73-
[status-im.contexts.wallet.share-community-channel.view :as share-community-channel]
74-
[status-im.navigation.options :as options]
75-
[status-im.navigation.transitions :as transitions]))
3+
[legacy.status-im.ui.screens.screens :as old-screens]
4+
[status-im.common.emoji-picker.view :as emoji-picker]
5+
[status-im.common.lightbox.view :as lightbox]
6+
[status-im.config :as config]
7+
[status-im.contexts.chat.group-details.view :as group-details]
8+
[status-im.contexts.chat.home.add-new-contact.scan.scan-profile-qr-page :as scan-profile-qr-page]
9+
[status-im.contexts.chat.home.add-new-contact.views :as add-new-contact]
10+
[status-im.contexts.chat.home.new-chat.view :as new-chat]
11+
[status-im.contexts.chat.messenger.camera.view :as camera-screen]
12+
[status-im.contexts.chat.messenger.messages.view :as chat]
13+
[status-im.contexts.chat.messenger.photo-selector.view :as photo-selector]
14+
[status-im.contexts.communities.actions.accounts-selection.view :as communities.accounts-selection]
15+
[status-im.contexts.communities.actions.addresses-for-permissions.view :as
16+
addresses-for-permissions]
17+
[status-im.contexts.communities.actions.airdrop-addresses.view :as airdrop-addresses]
18+
[status-im.contexts.communities.actions.request-to-join.view :as join-menu]
19+
[status-im.contexts.communities.discover.view :as communities.discover]
20+
[status-im.contexts.communities.overview.view :as communities.overview]
21+
[status-im.contexts.onboarding.create-password.view :as create-password]
22+
[status-im.contexts.onboarding.create-profile.view :as create-profile]
23+
[status-im.contexts.onboarding.enable-biometrics.view :as enable-biometrics]
24+
[status-im.contexts.onboarding.enable-notifications.view :as enable-notifications]
25+
[status-im.contexts.onboarding.enter-seed-phrase.view :as enter-seed-phrase]
26+
[status-im.contexts.onboarding.generating-keys.view :as generating-keys]
27+
[status-im.contexts.onboarding.identifiers.view :as identifiers]
28+
[status-im.contexts.onboarding.intro.view :as intro]
29+
[status-im.contexts.onboarding.new-to-status.view :as new-to-status]
30+
[status-im.contexts.onboarding.sign-in.view :as sign-in]
31+
[status-im.contexts.onboarding.syncing.progress.view :as syncing-devices]
32+
[status-im.contexts.onboarding.syncing.results.view :as syncing-results]
33+
[status-im.contexts.onboarding.welcome.view :as welcome]
34+
[status-im.contexts.preview.feature-flags.view :as feature-flags]
35+
[status-im.contexts.preview.quo.component-preview.view :as component-preview]
36+
[status-im.contexts.preview.quo.main :as quo.preview]
37+
[status-im.contexts.preview.status-im.main :as status-im-preview]
38+
[status-im.contexts.profile.edit.name.view :as edit-name]
39+
[status-im.contexts.profile.edit.view :as edit-profile]
40+
[status-im.contexts.profile.profiles.view :as profiles]
41+
[status-im.contexts.profile.settings.screens.password.view :as settings-password]
42+
[status-im.contexts.profile.settings.view :as settings]
43+
[status-im.contexts.shell.activity-center.view :as activity-center]
44+
[status-im.contexts.shell.jump-to.view :as shell]
45+
[status-im.contexts.shell.share.view :as share]
46+
[status-im.contexts.syncing.find-sync-code.view :as find-sync-code]
47+
[status-im.contexts.syncing.how-to-pair.view :as how-to-pair]
48+
[status-im.contexts.syncing.scan-sync-code-page.view :as scan-sync-code-page]
49+
[status-im.contexts.syncing.setup-syncing.view :as settings-setup-syncing]
50+
[status-im.contexts.syncing.syncing-devices-list.view :as settings-syncing]
51+
[status-im.contexts.wallet.account.bridge-to.view :as bridge-to]
52+
[status-im.contexts.wallet.account.bridge.view :as bridge]
53+
[status-im.contexts.wallet.account.view :as wallet-accounts]
54+
[status-im.contexts.wallet.add-address-to-watch.confirm-address.view :as confirm-address-to-watch]
55+
[status-im.contexts.wallet.add-address-to-watch.view :as add-address-to-watch]
56+
[status-im.contexts.wallet.collectible.view :as wallet-collectible]
57+
[status-im.contexts.wallet.create-account.edit-derivation-path.view :as wallet-edit-derivation-path]
58+
[status-im.contexts.wallet.create-account.new-keypair.backup-recovery-phrase.view :as
59+
wallet-backup-recovery-phrase]
60+
[status-im.contexts.wallet.create-account.new-keypair.check-your-backup.view :as
61+
wallet-check-your-backup]
62+
[status-im.contexts.wallet.create-account.select-keypair.view :as wallet-select-keypair]
63+
[status-im.contexts.wallet.create-account.view :as wallet-create-account]
64+
[status-im.contexts.wallet.edit-account.view :as wallet-edit-account]
65+
[status-im.contexts.wallet.saved-addresses.view :as wallet-saved-addresses]
66+
[status-im.contexts.wallet.scan-account.view :as scan-address]
67+
[status-im.contexts.wallet.send.input-amount.view :as wallet-send-input-amount]
68+
[status-im.contexts.wallet.send.select-address.view :as wallet-select-address]
69+
[status-im.contexts.wallet.send.select-asset.view :as wallet-select-asset]
70+
[status-im.contexts.wallet.send.transaction-confirmation.view :as wallet-transaction-confirmation]
71+
[status-im.contexts.wallet.send.transaction-progress.view :as wallet-transaction-progress]
72+
[status-im.contexts.wallet.share-address.view :as wallet-share-address]
73+
[status-im.contexts.wallet.share-community-channel.view :as share-community-channel]
74+
[status-im.navigation.options :as options]
75+
[status-im.navigation.transitions :as transitions]))
7676

7777
(defn screens
7878
[]

Diff for: ‎translations/en.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2493,4 +2493,4 @@
24932493
"do-not-cheat": "Don't try to cheat",
24942494
"do-not-cheat-description": "These 12 words give access to all of your funds so it is important that you write them in the correct order, take it seriously.",
24952495
"see-recovery-phrase-again": "See recovery phrase again"
2496-
}
2496+
}

0 commit comments

Comments
 (0)