▾ modified flutter/src/frq/hiccup.cljd +2 -2 Viewed
@@ -723,7 +723,7 @@ 723 723 .mainAxisSize m/MainAxisSize.min 724 724 .children 725 725 (into [(m/Text (str (:emoji p "")) 726 - .style (m/TextStyle .fontSize size))] 726 + .style (t/emoji-style size))] 727 727 (when (and (number? n) (pos? n)) 728 728 [(m/SizedBox .width pad) 729 729 (m/Text (str n) @@ -925,7 +925,7 @@ 925 925 field)) 926 926 927 927 :emoji 928 - (m/Text (str (:emoji p "")) .style (m/TextStyle .fontSize (dbl (:size p) 16.0))) 928 + (m/Text (str (:emoji p "")) .style (t/emoji-style (dbl (:size p) 16.0))) 929 929 930 930 ;; A face is a way in to who someone is, so it takes the press that 931 931 ;; opens their profile. It was drawn without one and the chat screen's
@@ -723,7 +723,7 @@ 723 .mainAxisSize m/MainAxisSize.min 723 .mainAxisSize m/MainAxisSize.min 724 .children 724 .children 725 (into [(m/Text (str (:emoji p "")) 725 (into [(m/Text (str (:emoji p "")) 726 - .style (m/TextStyle .fontSize size))] 726 + .style (t/emoji-style size))] 727 (when (and (number? n) (pos? n)) 727 (when (and (number? n) (pos? n)) 728 [(m/SizedBox .width pad) 728 [(m/SizedBox .width pad) 729 (m/Text (str n) 729 (m/Text (str n) @@ -925,7 +925,7 @@ 925 field)) 925 field)) 926 926 927 :emoji 927 :emoji 928 - (m/Text (str (:emoji p "")) .style (m/TextStyle .fontSize (dbl (:size p) 16.0))) 928 + (m/Text (str (:emoji p "")) .style (t/emoji-style (dbl (:size p) 16.0))) 929 929 930 ;; A face is a way in to who someone is, so it takes the press that 930 ;; A face is a way in to who someone is, so it takes the press that 931 ;; opens their profile. It was drawn without one and the chat screen's 931 ;; opens their profile. It was drawn without one and the chat screen's
▾ modified flutter/src/frq/theme.cljd +16 -0 Viewed
@@ -53,6 +53,22 @@ 53 53 back rather than a colour of its own . " 54 54 (.withValues ^m/Color on-bg .alpha 0.7)) 55 55 56 + (defn emoji-style 57 + " A ` TextStyle ` for a run that is nothing but emoji . 58 + 59 + The app sets ` fontFamily ` on the theme , so every ` Text ` that says nothing 60 + about its font is set in Fira Sans — a UI font with no emoji in it , and the 61 + screens draw a picture where it has no glyph . Naming the platform ' s emoji 62 + font here is what keeps `:emoji` and `:reaction` off that font: Noto Color 63 + Emoji is the Android one and the one COSMIC ships, and the fallbacks are the 64 + other two desktops in case this runs on one." 65 + [size] 66 + (m/TextStyle .fontSize size 67 + .fontFamily "Noto Color Emoji" 68 + .fontFamilyFallback ["Apple Color Emoji" 69 + "Segoe UI Emoji" 70 + "Noto Emoji"])) 71 + 56 72 (def brightness (if c/dark? m/Brightness.dark m/Brightness.light)) 57 73 58 74 (defn app-theme []
@@ -53,6 +53,22 @@ 53 back rather than a colour of its own . " 53 back rather than a colour of its own . " 54 (.withValues ^m/Color on-bg .alpha 0.7)) 54 (.withValues ^m/Color on-bg .alpha 0.7)) 55 55 56 + (defn emoji-style 57 + " A ` TextStyle ` for a run that is nothing but emoji . 58 + 59 + The app sets ` fontFamily ` on the theme , so every ` Text ` that says nothing 60 + about its font is set in Fira Sans — a UI font with no emoji in it , and the 61 + screens draw a picture where it has no glyph . Naming the platform ' s emoji 62 + font here is what keeps `:emoji` and `:reaction` off that font: Noto Color 63 + Emoji is the Android one and the one COSMIC ships, and the fallbacks are the 64 + other two desktops in case this runs on one." 65 + [size] 66 + (m/TextStyle .fontSize size 67 + .fontFamily "Noto Color Emoji" 68 + .fontFamilyFallback ["Apple Color Emoji" 69 + "Segoe UI Emoji" 70 + "Noto Emoji"])) 71 + 56 (def brightness (if c/dark? m/Brightness.dark m/Brightness.light)) 72 (def brightness (if c/dark? m/Brightness.dark m/Brightness.light)) 57 73 58 (defn app-theme [] 74 (defn app-theme []