[Refactor] Toast component to use theme context

Signed-off-by: Mohamed Javid <[email protected]>

Author: smohamedjavid

src/quo2/components/avatars/user_avatar/style.cljs

@@ -41,7 +41,7 @@
      :border-radius dimensions}))
 
 (defn initials-avatar
-  [size draw-ring? customization-color]
+  [size draw-ring? customization-color theme]
   (let [outer-dimensions (get-in sizes [size :outer])
         inner-dimensions (get-in sizes [size (if draw-ring? :inner :outer)])]
     {:position         :absolute
@@ -52,7 +52,7 @@
      :border-radius    inner-dimensions
      :justify-content  :center
      :align-items      :center
-     :background-color (colors/custom-color-by-theme customization-color 50 60)}))
+     :background-color (colors/custom-color-by-theme customization-color 50 60 nil nil theme)}))
 
 (def initials-avatar-text
   {:color colors/white-opa-70})
@@ -67,7 +67,7 @@
      :background-color background}))
 
 (defn dot
-  [size ring?]
+  [size ring? theme]
   (let [dimensions   (get-in sizes [size :status-indicator])
         border-width (get-in sizes [size :status-indicator-border])
         right        (case size
@@ -89,5 +89,5 @@
      :height           dimensions
      :border-width     border-width
      :border-radius    dimensions
-     :background-color (colors/theme-colors colors/white colors/neutral-100)
-     :border-color     (colors/theme-colors colors/white colors/neutral-100)}))
+     :background-color (colors/theme-colors colors/white colors/neutral-100 theme)
+     :border-color     (colors/theme-colors colors/white colors/neutral-100 theme)}))

src/quo2/components/avatars/user_avatar/view.cljs

@@ -1,17 +1,18 @@
 (ns quo2.components.avatars.user-avatar.view
   (:require [quo2.components.avatars.user-avatar.style :as style]
             [quo2.components.markdown.text :as text]
+            [quo2.theme :as quo.theme]
             [react-native.core :as rn]
             [react-native.fast-image :as fast-image]
             utils.string))
 
 (defn initials-avatar
-  [{:keys [full-name size draw-ring? customization-color]}]
+  [{:keys [full-name size draw-ring? customization-color theme]}]
   (let [font-size       (get-in style/sizes [size :font-size])
         amount-initials (if (#{:xs :xxs :xxxs} size) 1 2)]
     [rn/view
      {:accessibility-label :initials-avatar
-      :style               (style/initials-avatar size draw-ring? customization-color)}
+      :style               (style/initials-avatar size draw-ring? customization-color theme)}
      [text/text
       {:style  style/initials-avatar-text
        :size   font-size
@@ -20,12 +21,12 @@
 
 (def valid-ring-sizes #{:big :medium :small})
 
-(defn user-avatar
+(defn- user-avatar-internal
   "If no `profile-picture` is given, draws the initials based on the `full-name` and
   uses `ring-background` to display the ring behind the initials when given. Otherwise,
   shows the `profile-picture` which already comes with the ring drawn."
   [{:keys [full-name status-indicator? online? size profile-picture ring-background
-           customization-color static? muted?]
+           customization-color static? muted? theme]
     :or   {status-indicator?   true
            online?             true
            size                :big
@@ -49,11 +50,14 @@
         {:full-name           full-name
          :size                size
          :draw-ring?          draw-ring?
-         :customization-color customization-color}])
+         :customization-color customization-color
+         :theme               theme}])
      (when status-indicator?
        [rn/view
         {:accessibility-label :status-indicator
-         :style               (style/dot size draw-ring?)}
+         :style               (style/dot size draw-ring? theme)}
         [rn/view
          {:accessibility-label :inner-status-indicator-dot
           :style               (style/inner-dot size online?)}]])]))
+
+(def user-avatar (quo.theme/with-theme user-avatar-internal))

src/quo2/components/icon.cljs

@@ -3,6 +3,7 @@
             [quo2.components.icons.icons :as icons]
             [quo2.components.icons.svg :as icons.svg]
             [quo2.foundations.colors :as colors]
+            [quo2.theme :as quo.theme]
             [react-native.core :as rn]))
 
 (defn- valid-color?
@@ -12,11 +13,10 @@
            (not (string/blank? color)))))
 
 (defn memo-icon-fn
-  [icon-name
-   {:keys [color color-2 no-color
-           container-style size accessibility-label]
+  [{:keys [color color-2 no-color
+           container-style size accessibility-label theme]
     :or   {accessibility-label :icon}}
-   _]
+   icon-name]
   (let [size (or size 20)]
     ^{:key icon-name}
     (if-let [svg-icon (icons.svg/get-icon icon-name size)]
@@ -34,15 +34,15 @@
                (when (not no-color)
                  {:tint-color (if (and (string? color) (not (string/blank? color)))
                                 color
-                                (colors/theme-colors colors/neutral-100 colors/white))})
+                                (colors/theme-colors colors/neutral-100 colors/white theme))})
 
                container-style)
         :accessibility-label accessibility-label
         :source (icons/icon-source (str (name icon-name) size))}])))
 
-(def themed-icon (memoize memo-icon-fn))
+(def ^:private themed-icon (memoize (quo.theme/with-theme memo-icon-fn)))
 
 (defn icon
   ([icon-name] (icon icon-name nil))
   ([icon-name params]
-   (themed-icon icon-name params (colors/dark?))))
+   (themed-icon params icon-name)))

src/quo2/components/markdown/text.cljs

@@ -1,12 +1,12 @@
 (ns quo2.components.markdown.text
   (:require [quo2.foundations.colors :as colors]
             [quo2.foundations.typography :as typography]
-            [quo2.theme :as theme]
+            [quo2.theme :as quo.theme]
             [react-native.core :as rn]
             [reagent.core :as reagent]))
 
 (defn text-style
-  [{:keys [size align weight style]}]
+  [{:keys [size align weight style theme]}]
   (merge (case (or weight :regular)
            :regular   typography/font-regular
            :medium    typography/font-medium
@@ -25,14 +25,16 @@
          {:text-align (or align :auto)}
          (if (:color style)
            style
-           (assoc style :color (if (= (theme/get-theme) :dark) colors/white colors/neutral-100)))))
+           (assoc style :color (if (= theme :dark) colors/white colors/neutral-100)))))
 
-(defn text
+(defn- text-internal
   []
   (let [this  (reagent/current-component)
         props (reagent/props this)
         style (text-style props)]
     (into [rn/text
            (merge {:style style}
-                  (dissoc props :style :size :align :weight :color))]
+                  (dissoc props :style :size :align :weight :color :theme))]
           (reagent/children this))))
+
+(def text (quo.theme/with-theme text-internal))

src/quo2/components/notifications/count_down_circle.cljs

@@ -1,7 +1,7 @@
 (ns quo2.components.notifications.count-down-circle
   (:require [goog.string :as gstring]
             [quo2.foundations.colors :as colors]
-            [quo2.theme :as theme]
+            [quo2.theme :as quo.theme]
             [react-native.core :as rn]
             [react-native.svg :as svg]
             [reagent.core :as reagent]))
@@ -48,8 +48,8 @@
   {:color {:dark  colors/neutral-80-opa-40
            :light colors/white-opa-40}})
 
-(defn circle-timer
-  [{:keys [color duration size stroke-width trail-color rotation initial-remaining-time]}]
+(defn- circle-timer-internal
+  [{:keys [color duration size stroke-width trail-color rotation initial-remaining-time theme]}]
   (let [rotation                     (or rotation :clockwise)
         duration                     (or duration 4)
         stroke-width                 (or stroke-width 1)
@@ -98,8 +98,10 @@
             [svg/path
              {:d                 path
               :fill              :none
-              :stroke            (or color (get-in themes [:color (theme/get-theme)]))
+              :stroke            (or color (get-in themes [:color theme]))
               :stroke-linecap    :square
               :stroke-width      stroke-width
               :stroke-dasharray  path-length
               :stroke-dashoffset (linear-ease @display-time 0 path-length duration)}])]])})))
+
+(def circle-timer (quo.theme/with-theme circle-timer-internal))

src/quo2/components/notifications/toast/view.cljs

@@ -4,31 +4,38 @@
             [quo2.components.markdown.text :as text]
             [quo2.components.notifications.count-down-circle :as count-down-circle]
             [quo2.components.notifications.toast.style :as style]
-            [quo2.theme :as theme]
+            [quo2.theme :as quo.theme]
             [react-native.blur :as blur]
             [react-native.core :as rn]
             [utils.i18n :as i18n]))
 
 (defn toast-action-container
-  [{:keys [on-press style]} & children]
+  [{:keys [on-press style theme]} & children]
   [rn/touchable-highlight
    {:on-press       on-press
     :underlay-color :transparent}
    [into
     [rn/view
-     {:style (merge (style/action-container (theme/get-theme)) style)}]
+     {:style (merge (style/action-container theme) style)}]
     children]])
 
-(defn toast-undo-action
-  [duration on-press theme]
-  [toast-action-container {:on-press on-press :accessibility-label :toast-undo-action}
+(defn toast-undo-action-internal
+  [{:keys [undo-duration undo-on-press theme]}]
+  [toast-action-container
+   {:on-press            undo-on-press
+    :accessibility-label :toast-undo-action
+    :theme               theme}
    [rn/view {:style {:margin-right 5}}
-    [count-down-circle/circle-timer {:duration duration}]]
+    [count-down-circle/circle-timer {:duration undo-duration}]]
    [text/text
-    {:size :paragraph-2 :weight :medium :style (style/text theme)}
+    {:size   :paragraph-2
+     :weight :medium
+     :style  (style/text theme)}
     [i18n/label :t/undo]]])
 
-(defn- toast-container
+(def ^:private toast-undo-action (quo.theme/with-theme toast-undo-action-internal))
+
+(defn- toast-container-internal
   [{:keys [left title text right container-style theme]}]
   [rn/view {:style (merge style/box-container container-style)}
    [blur/view
@@ -58,22 +65,27 @@
         text])]
     right]])
 
+(def ^:private toast-container (quo.theme/with-theme toast-container-internal))
+
 (defn toast
   [{:keys [icon icon-color title text action undo-duration undo-on-press container-style
            theme user]}]
-  [toast-container
-   {:left            (cond icon
-                           [icon/icon icon
-                            (cond-> (style/icon theme)
-                              icon-color
-                              (assoc :color icon-color))]
+  (let [context-theme (or theme (quo.theme/get-theme))]
+    [quo.theme/provider {:theme context-theme}
+     [toast-container
+      {:left            (cond icon
+                              [icon/icon icon
+                               (cond-> (style/icon context-theme)
+                                 icon-color
+                                 (assoc :color icon-color))]
 
-                           user
-                           [user-avatar/user-avatar user])
-    :title           title
-    :text            text
-    :right           (if undo-duration
-                       [toast-undo-action undo-duration undo-on-press theme]
-                       action)
-    :container-style container-style
-    :theme           theme}])
+                              user
+                              [user-avatar/user-avatar user])
+       :title           title
+       :text            text
+       :right           (if undo-duration
+                          [toast-undo-action
+                           {:undo-duration undo-duration
+                            :undo-on-press undo-on-press}]
+                          action)
+       :container-style container-style}]]))

src/quo2/foundations/colors.cljs

@@ -256,11 +256,14 @@
    suffix-light  50/60
    suffix-dark   50/60
    opacity-light 0-100 (optional)
-   opacity-dark  0-100 (optional)"
+   opacity-dark  0-100 (optional)
+   theme         :light/:dark (optional)"
   ([color suffix-light suffix-dark]
-   (custom-color-by-theme color suffix-light suffix-dark nil nil))
+   (custom-color-by-theme color suffix-light suffix-dark nil nil (theme/get-theme)))
   ([color suffix-light suffix-dark opacity-light opacity-dark]
-   (if (theme/dark?)
+   (custom-color-by-theme color suffix-light suffix-dark opacity-light opacity-dark (theme/get-theme)))
+  ([color suffix-light suffix-dark opacity-light opacity-dark theme]
+   (if (= theme :dark)
      (custom-color color suffix-dark opacity-dark)
      (custom-color color suffix-light opacity-light))))