Skip to content

Commit a0b433a

Browse files
committed
address design feedback on profile share UI
1 parent 0003800 commit a0b433a

File tree

4 files changed

+56
-41
lines changed

4 files changed

+56
-41
lines changed

src/quo2/components/tabs/segmented_tab.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
[theme :background-color])
2727
:border-radius (case size
2828
32 10
29-
28 8
29+
28 10
3030
24 8
3131
20 6)
3232
:padding 2}

src/status_im2/contexts/shell/share/style.cljs

+32-29
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,38 @@
55
(def screen-padding 20)
66

77
(def blur
8-
{:style {:position :absolute
9-
:top 0
10-
:left 0
11-
:right 0
12-
:bottom 0}
13-
:overlay-color colors/neutral-80-opa-80
14-
:blur-amount 20})
8+
{:position :absolute
9+
:top 0
10+
:left 0
11+
:right 0
12+
:bottom 0})
13+
14+
(def header-row
15+
{:flex-direction :row
16+
:justify-content :space-between
17+
:padding-horizontal screen-padding
18+
:margin-vertical 12})
1519

1620
(def header-button
17-
{:margin-bottom 12
18-
:margin-left screen-padding})
21+
{:margin-bottom 12
22+
:margin-left screen-padding
23+
:background-color colors/white-opa-5})
1924

2025
(def header-heading
2126
{:padding-horizontal screen-padding
2227
:padding-vertical 12
2328
:color colors/white})
2429

2530
(def qr-code-container
26-
{:padding 12
27-
:border-radius 16
28-
:margin-top 12
29-
:margin-bottom 4
30-
:margin-horizontal screen-padding
31-
:background-color colors/white-opa-5
32-
:flex-direction :column
33-
:justify-content :center})
31+
{:padding-top 12
32+
:padding-bottom 8
33+
:padding-horizontal 12
34+
:border-radius 16
35+
:margin-top 8
36+
:margin-horizontal screen-padding
37+
:background-color colors/white-opa-5
38+
:flex-direction :column
39+
:justify-content :center})
3440

3541
(def emoji-hash-container
3642
{:border-radius 16
@@ -57,16 +63,13 @@
5763
:padding-top 2})
5864

5965
(def profile-address-container
60-
{:flex-direction :row
61-
:justify-content :flex-start
62-
:margin-top 6
63-
:margin-horizontal 4})
66+
{:flex-direction :row
67+
:justify-content :flex-start
68+
:margin-top 4})
6469

6570
(def emoji-address-container
66-
{:flex-direction :row
67-
:justify-content :flex-start
68-
:margin-top 6
69-
:margin-horizontal 4})
71+
{:flex-direction :row
72+
:justify-content :flex-start})
7073

7174
(def emoji-hash-label
7275
{:color colors/white-opa-40
@@ -78,20 +81,20 @@
7881
(def share-button-container
7982
{:position :absolute
8083
:right 0
81-
:top 16})
84+
:top 12})
8285

8386
(def emoji-share-button-container
8487
{:position :absolute
85-
:right 4
86-
:top 16})
88+
:right 0
89+
:top 12})
8790

8891
(def emoji-hash-content
8992
{:color colors/white
9093
:align-self :flex-start
9194
:padding-top 4
9295
:padding-bottom 12
9396
:padding-left 12
94-
:font-size 14})
97+
:font-size 13})
9598

9699
(def tabs-container
97100
{:padding-horizontal screen-padding

src/status_im2/contexts/shell/share/view.cljs

+22-10
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,24 @@
1616
(defn header
1717
[]
1818
[:<>
19-
[quo/button
20-
{:icon-only? true
21-
:type :grey
22-
:background :blur
23-
:size 32
24-
:accessibility-label :close-shell-share-tab
25-
:container-style style/header-button
26-
:on-press #(rf/dispatch [:navigate-back])}
27-
:i/close]
19+
[rn/view {:style style/header-row}
20+
[quo/button
21+
{icon-only? true
22+
:type :grey
23+
:background :blur
24+
:size 32
25+
:accessibility-label :close-shell-share-tab
26+
:container-style style/header-button
27+
:on-press #(rf/dispatch [:navigate-back])}
28+
:i/close]
29+
[quo/button
30+
{:icon true
31+
:type :blur-bg
32+
:size 32
33+
:accessibility-label :shell-scan-button
34+
:override-theme :dark
35+
:on-press #(rf/dispatch [:navigate-back])}
36+
:i/scan]]
2837
[quo/text
2938
{:size :heading-1
3039
:weight :semi-bold
@@ -154,5 +163,8 @@
154163
[rn/view
155164
{:flex 1
156165
:padding-top (navigation/status-bar-height)}
157-
[blur/view style/blur]
166+
[blur/view
167+
{:style style/blur
168+
:background-color colors/neutral-80-opa-80-blur
169+
:blur-amount 20}]
158170
[tab-content window-width]])))

src/utils/image_server.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@
283283
"&allowProfileImage="
284284
superimpose-profile?
285285
"&size="
286-
qr-size
286+
(* 2 qr-size)
287287
"&imageName="
288288
profile-image-type)]
289289
media-server-url))

0 commit comments

Comments
 (0)