status-im
/
status-mobile
mirror of https://github.com/status-im/status-mobile.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Android] The text within buttons is slightly visible when buttons ar… (#19461)

This commit is contained in:
Ibrahem Khalil 2024-04-09 02:06:57 +02:00 committed by GitHub
parent ca8b404e5b
commit 18fc168537
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/quo/components/buttons/button/style.cljs
View File

@ -1,4 +1,5 @@
(ns quo.components.buttons.button.style) (ns quo.components.buttons.button.style
(:require [quo.foundations.colors :as colors]))
(def blur-view (def blur-view
{:position :absolute {:position :absolute
@ -9,11 +10,12 @@
(defn icon-style (defn icon-style
[{:keys [icon-container-size icon-container-rounded? [{:keys [icon-container-size icon-container-rounded?
icon-size margin-left margin-right]}] icon-size margin-left margin-right disabled?]}]
(cond-> (merge {:margin-left margin-left (cond-> (merge {:margin-left margin-left
:margin-right margin-right :margin-right margin-right
:align-items :center :align-items :center
:justify-content :center}) :justify-content :center
:opacity (when disabled? 0.3)})
icon-container-size icon-container-size
(assoc :width icon-container-size :height icon-container-size) (assoc :width icon-container-size :height icon-container-size)
icon-container-rounded? icon-container-rounded?
@ -21,24 +23,26 @@
(defn icon-left-icon-style (defn icon-left-icon-style
[{:keys [override-margins size icon-container-size icon-container-rounded? [{:keys [override-margins size icon-container-size icon-container-rounded?
icon-size]}] icon-size disabled?]}]
(icon-style (icon-style
{:margin-left (or (get override-margins :left) {:margin-left (or (get override-margins :left)
(if (= size 40) 12 8)) (if (= size 40) 12 8))
:margin-right (or (get override-margins :right) 4) :margin-right (or (get override-margins :right) 4)
:icon-container-size icon-container-size :icon-container-size icon-container-size
:icon-container-rounded? icon-container-rounded? :icon-container-rounded? icon-container-rounded?
:icon-size icon-size})) :icon-size icon-size
:disabled? disabled?}))
(defn icon-right-icon-style (defn icon-right-icon-style
[{:keys [override-margins size icon-container-size icon-container-rounded? [{:keys [override-margins size icon-container-size icon-container-rounded?
icon-size]}] icon-size disabled?]}]
(icon-style {:margin-left (or (get override-margins :left) 4) (icon-style {:margin-left (or (get override-margins :left) 4)
:margin-right (or (get override-margins :right) :margin-right (or (get override-margins :right)
(if (= size 40) 12 8)) (if (= size 40) 12 8))
:icon-container-size icon-container-size :icon-container-size icon-container-size
:icon-container-rounded? icon-container-rounded? :icon-container-rounded? icon-container-rounded?
:icon-size icon-size})) :icon-size icon-size
:disabled? disabled?}))
(defn shape-style-container (defn shape-style-container
[size border-radius] [size border-radius]
@ -95,7 +99,7 @@
24 0 24 0
9)) 9))
:overflow :hidden :overflow :hidden
:background-color background-color :background-color (if disabled? (colors/alpha background-color 0.3) background-color)
:border-radius (if border-radius :border-radius (if border-radius
border-radius border-radius
(case size (case size
@ -110,6 +114,4 @@
{:width size}) {:width size})
(when border-color (when border-color
{:border-color border-color {:border-color border-color
:border-width 1}) :border-width 1})))
(when disabled?
{:opacity 0.3})))

12
src/quo/components/buttons/button/view.cljs
View File

@ -92,14 +92,16 @@
(when icon-top (when icon-top
[rn/view [rn/view
[quo.icons/icon icon-top [quo.icons/icon icon-top
{:container-style {:margin-bottom 2} {:container-style {:margin-bottom 2
:opacity (when disabled? 0.3)}
:color icon-color :color icon-color
:size icon-size}]]) :size icon-size}]])
(when icon-left (when icon-left
[rn/view [rn/view
{:style (style/icon-left-icon-style {:style (style/icon-left-icon-style
{:size size {:size size
:icon-size icon-size})} :icon-size icon-size
:disabled? disabled?})}
[quo.icons/icon icon-left [quo.icons/icon icon-left
{:color icon-color {:color icon-color
:size icon-size}]]) :size icon-size}]])
@ -115,7 +117,8 @@
{:size (when (#{56 24} size) :paragraph-2) {:size (when (#{56 24} size) :paragraph-2)
:weight :medium :weight :medium
:number-of-lines 1 :number-of-lines 1
:style {:color label-color}} :style {:color label-color
:opacity (when disabled? 0.3)}}
children] children]
(vector? children) (vector? children)
@ -124,7 +127,8 @@
[rn/view [rn/view
{:style (style/icon-right-icon-style {:style (style/icon-right-icon-style
{:size size {:size size
:icon-size icon-size})} :icon-size icon-size
:disabled? disabled?})}
[quo.icons/icon icon-right [quo.icons/icon icon-right
{:color icon-color {:color icon-color
:size icon-size}]])]]])) :size icon-size}]])]]]))