Skip to content

Commit 3e9940d

Browse files
committed
address design feedback on profile share UI
1 parent bca7ab7 commit 3e9940d

File tree

3 files changed

+54
-40
lines changed

3 files changed

+54
-40
lines changed

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

+30-27
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
@@ -82,7 +85,7 @@
8285

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

8891
(def emoji-hash-content
@@ -91,7 +94,7 @@
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

+23-12
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,23 @@
1515
(defn header
1616
[]
1717
[:<>
18-
[quo/button
19-
{:icon true
20-
:type :blur-bg
21-
:size 32
22-
:accessibility-label :close-shell-share-tab
23-
:override-theme :dark
24-
:style style/header-button
25-
:on-press #(rf/dispatch [:navigate-back])}
26-
:i/close]
18+
[rn/view {:style style/header-row}
19+
[quo/button
20+
{:icon true
21+
:type :blur-bg
22+
:size 32
23+
:accessibility-label :close-shell-share-tab
24+
:override-theme :dark
25+
:on-press #(rf/dispatch [:navigate-back])}
26+
:i/close]
27+
[quo/button
28+
{:icon true
29+
:type :blur-bg
30+
:size 32
31+
:accessibility-label :shell-scan-button
32+
:override-theme :dark
33+
:on-press #(rf/dispatch [:navigate-back])}
34+
:i/scan]]
2735
[quo/text
2836
{:size :heading-1
2937
:weight :semi-bold
@@ -34,12 +42,12 @@
3442
"The goal here is to generate a string that begins with
3543
join.status.im/u/ joined with the 1st 5 characters
3644
of the compressed public key followed by an ellipsis followed by
37-
the last 12 characters of the compressed public key"
45+
the last 10 characters of the compressed public key"
3846
[base-url public-pk]
3947
(let [first-part-of-public-pk (subs public-pk 0 5)
4048
ellipsis "..."
4149
public-pk-size (count public-pk)
42-
last-part-of-public-pk (subs public-pk (- public-pk-size 12) (- public-pk-size 1))
50+
last-part-of-public-pk (subs public-pk (- public-pk-size 10) (- public-pk-size 1))
4351
abbreviated-url (str base-url first-part-of-public-pk ellipsis last-part-of-public-pk)]
4452
abbreviated-url))
4553

@@ -167,5 +175,8 @@
167175
[rn/view
168176
{:flex 1
169177
:padding-top (navigation/status-bar-height)}
170-
[blur/view style/blur]
178+
[blur/view
179+
{:style style/blur
180+
:background-color colors/neutral-80-opa-80-blur
181+
:blur-amount 20}]
171182
[tab-content window-width]])))

src/utils/image_server.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"&allowProfileImage="
7878
superimpose-profile?
7979
"&size="
80-
qr-size
80+
(* 2 qr-size)
8181
"&imageName="
8282
profile-image-type)]
8383
media-server-url))

0 commit comments

Comments
 (0)