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

squash and sign 

lint fix

remove unused import and debug backgrounds

set width boundaries for long usernames in activity

fix lint and pass width from view

updated spacing to accommodate iphoneX

Signed-off-by: andrey <motor4ik@gmail.com>
This commit is contained in:
siddarthkay 2022-03-21 12:47:22 +05:30 committed by andrey
parent c4036aee09
commit c40094f2f9
No known key found for this signature in database
GPG Key ID: 89B67245FD2F0272
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/status_im/ui/screens/notifications_center/styles.cljs
View File

@ -67,10 +67,11 @@
:top 12 :top 12
:left 16}) :left 16})
(def title-text (defn title-text [title-text-width]
{:margin-left 72 {:margin-left 72
:margin-top 12 :margin-top 12
:margin-right 50}) :margin-right 50
:width title-text-width})
(def notification-message-container (def notification-message-container
{:margin-left 72 {:margin-left 72
@ -84,4 +85,4 @@
(def community-info-container (def community-info-container
{:flex-direction :row {:flex-direction :row
:align-items :center}) :align-items :center})

5
src/status_im/ui/screens/notifications_center/views/notification.cljs
View File

@ -19,7 +19,8 @@
{:keys [community-id]} (<sub [:chat-by-id chat-id]) {:keys [community-id]} (<sub [:chat-by-id chat-id])
{:keys [name]} @(re-frame/subscribe [:communities/community community-id]) {:keys [name]} @(re-frame/subscribe [:communities/community community-id])
contact (when message @(re-frame/subscribe [:contacts/contact-by-identity (message :from)])) contact (when message @(re-frame/subscribe [:contacts/contact-by-identity (message :from)]))
sender (when message (first @(re-frame/subscribe [:contacts/contact-two-names-by-identity (message :from)])))] sender (when message (first @(re-frame/subscribe [:contacts/contact-two-names-by-identity (message :from)])))
title-text-width (* @(re-frame/subscribe [:dimensions/window-width]) 0.62)]
[react/touchable-opacity (merge {:style (styles/notification-container read)} opts) [react/touchable-opacity (merge {:style (styles/notification-container read)} opts)
[react/view {:style styles/notification-content-container} [react/view {:style styles/notification-content-container}
(if (or (if (or
@ -42,7 +43,7 @@
:accessibility-label :chat-name-or-sender-text :accessibility-label :chat-name-or-sender-text
:ellipsize-mode :tail :ellipsize-mode :tail
:number-of-lines 1 :number-of-lines 1
:style styles/title-text} :style (styles/title-text title-text-width)}
(if (or (if (or
(= type constants/activity-center-notification-type-mention) (= type constants/activity-center-notification-type-mention)
(= type constants/activity-center-notification-type-reply)) (= type constants/activity-center-notification-type-reply))