fix margin and padding

status-im · Jun 13, 2023 · 6a56384 · 6a56384
1 parent 2d10f7e
commit 6a56384
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 21 deletions.
diff --git a/src/status_im2/contexts/share/style.cljs b/src/status_im2/contexts/share/style.cljs
@@ -13,24 +13,33 @@
    :background-color colors/neutral-80-opa-40
    :blur-amount   20})
 
+(def header-row
+  {:flex-direction     :row
+   :justify-content    :space-between
+   :padding-horizontal screen-padding
+   :margin-vertical    12})
+
 (def header-button
   {:margin-bottom 12
-   :margin-left   screen-padding})
+   :margin-left   screen-padding
+   :background-color colors/white-opa-5})
 
 (def header-heading
   {:padding-horizontal screen-padding
    :padding-vertical   12
    :color              colors/white})
 
 (def qr-code-container
-  {:padding           12
-   :border-radius     16
-   :margin-top        12
-   :margin-bottom     4
-   :margin-horizontal screen-padding
-   :background-color  colors/white-opa-5
-   :flex-direction    :column
-   :justify-content   :center})
+  {:padding-top        12
+   :padding-bottom     8
+   :padding-horizontal 12
+   :border-radius      16
+   :margin-top         12
+   :margin-bottom      4
+   :margin-horizontal  screen-padding
+   :background-color   colors/white-opa-5
+   :flex-direction     :column
+   :justify-content    :center})
 
 (def emoji-hash-container
   {:border-radius     16
@@ -59,13 +68,12 @@
 (def profile-address-container
   {:flex-direction    :row
    :justify-content   :flex-start
-   :margin-top        6
+   :margin-top        4
    :margin-horizontal 4})
 
 (def emoji-address-container
   {:flex-direction    :row
    :justify-content   :flex-start
-   :margin-top        6
    :margin-horizontal 4})
 
 (def emoji-hash-label

diff --git a/src/status_im2/contexts/share/view.cljs b/src/status_im2/contexts/share/view.cljs
@@ -15,20 +15,30 @@
 (defn header
   []
   [:<>
-   [quo/button
-    {:icon                true
-     :type                :blur-bg
-     :size                32
-     :accessibility-label :close-shell-share-tab
-     :override-theme      :dark
-     :style               style/header-button
-     :on-press            #(rf/dispatch [:navigate-back])}
-    :i/close]
+   [rn/view {:style style/header-row}
+     [quo/button
+      {:icon                true
+       :type                :blur-bg
+       :size                32
+       :accessibility-label :close-shell-share-tab
+       :override-theme      :dark
+       :on-press            #(rf/dispatch [:navigate-back])}
+      :i/close]
+      [quo/button
+       {:icon                true
+        :type                :blur-bg
+        :size                32
+        :accessibility-label :shell-scan-button
+        :override-theme      :dark
+        :on-press            #(rf/dispatch [:navigate-back])}
+       :i/scan]
+     ]
    [quo/text
     {:size   :heading-1
      :weight :semi-bold
      :style  style/header-heading}
-    (i18n/label :t/share)]])
+    (i18n/label :t/share)]
+   ])
 
 (defn abbreviated-url
   "The goal here is to generate a string that begins with