File tree 6 files changed +11
-3
lines changed
6 files changed +11
-3
lines changed Original file line number Diff line number Diff line change 8
8
[status-im.ui.screens.chat.photos :as photos]
9
9
[status-im.utils.platform :as platform]))
10
10
11
+ ; ;TODO REWORK THIS NAMESPACE
12
+
11
13
(defn default-chat-icon [name styles]
12
14
(when-not (string/blank? name)
13
15
[react/view (:default-chat-icon styles)
Original file line number Diff line number Diff line change 33
33
[react/text {:style {:color colors/blue}}
34
34
(utils.label/stringify label)])]]))
35
35
36
+ (def default-title-padding 16 )
36
37
; ; TODO(Ferossgp): Tobbar should handle safe area
37
- (defn topbar [_ ]
38
- (let [title-padding (reagent/atom 16 )]
38
+ (defn topbar [{ :keys [initial-title-padding]} ]
39
+ (let [title-padding (reagent/atom ( or initial-title-padding default-title-padding ) )]
39
40
(fn [& [{:keys [title navigation accessories show-border? modal? content]}]]
40
41
(let [navigation (or navigation (default-navigation modal? ))]
41
42
[react/view (cond-> {:height 56 :align-items :center :flex-direction :row }
Original file line number Diff line number Diff line change 38
38
appender])
39
39
40
40
(defview quoted-message
41
- [_ {:keys [from text]} outgoing current-public-key public?]
41
+ [_ {:keys [from text image ]} outgoing current-public-key public?]
42
42
(letsubs [contact-name [:contacts/contact-name-by-identity from]]
43
43
[react/view {:style (style/quoted-message-container outgoing)}
44
44
[react/view {:style style/quoted-message-author-container}
Original file line number Diff line number Diff line change 6
6
[status-im.utils.universal-links.core :as universal-links]
7
7
[status-im.ui.components.chat-icon.screen :as chat-icon]
8
8
[status-im.ui.components.colors :as colors]
9
+ [status-im.multiaccounts.core :as multiaccounts]
9
10
[status-im.utils.platform :as platform]
10
11
[status-im.ui.screens.chat.styles.message.sheets :as sheets.styles]
11
12
[status-im.ui.components.list-item.views :as list-item]))
Original file line number Diff line number Diff line change 27
27
[topbar/topbar
28
28
{:content [toolbar-content/toolbar-content-view]
29
29
:show-border? true
30
+ :initial-title-padding 56
30
31
:navigation {:icon :main-icons/back
31
32
:accessibility-label :back-button
32
33
:handler
Original file line number Diff line number Diff line change 121
121
:else nil )
122
122
:title (if group-chat
123
123
(utils/truncate-str chat-name 30 )
124
+ ; ; This looks a bit odd, but I would like only to subscribe
125
+ ; ; if it's a one-to-one. If wrapped in a component styling
126
+ ; ; won't be applied correctly.
124
127
@(re-frame/subscribe [:contacts/contact-name-by-identity chat-id]))
125
128
:title-accessibility-label :chat-name-text
126
129
:title-row-accessory [message-timestamp (if (pos? (:whisper-timestamp last-message))
You can’t perform that action at this time.
0 commit comments