Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes UI styling and added contact request screen
- Loading branch information
1 parent
e30345e
commit d86df4b
Showing
11 changed files
with
418 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| (ns status-im.ui.screens.contact-requests.styles | ||
| (:require [status-im.ui.components.colors :as colors] | ||
| [quo.design-system.colors :as quo-colors])) | ||
|
|
||
| (def contact-request-message-text | ||
| {:flex 1 | ||
| :align-self :stretch | ||
| :line-height 22 | ||
| :font-size 15 | ||
| :color (:text-01 @quo-colors/theme)}) | ||
|
|
||
| (def mention-text | ||
| {:color colors/blue}) | ||
|
|
||
| (def datetime-text | ||
| {:color colors/text-gray | ||
| :font-size 10 | ||
| :text-align :right | ||
| :letter-spacing 0.4 | ||
| :align-items :center | ||
| :line-height 12 | ||
| :position :absolute | ||
| :top 17 | ||
| :right 16}) | ||
|
|
||
| (def group-info-container | ||
| {:height 22 | ||
| :align-self :baseline | ||
| :align-items :center | ||
| :justify-content :center | ||
| :border-radius 11 | ||
| :border-color colors/gray-transparent-40 | ||
| :border-width 1 | ||
| :margin-top 6 | ||
| :margin-bottom 10 | ||
| :padding-left 7 | ||
| :padding-right 5 | ||
| :flex-direction :row}) | ||
|
|
||
| (defn contact-request-container [read] | ||
| {:min-height 64 | ||
| :background-color (when-not read colors/blue-light)}) | ||
|
|
||
| (def contact-request-content-container | ||
| {:flex 1}) | ||
|
|
||
| (def photo-container | ||
| {:position :absolute | ||
| :top 12 | ||
| :left 16}) | ||
|
|
||
| (def title-text | ||
| {:margin-left 72 | ||
| :margin-top 12 | ||
| :margin-right 50}) | ||
|
|
||
| (def contact-request-message-container | ||
| {:margin-left 72 | ||
| :margin-right 16}) | ||
|
|
||
| (def group-icon | ||
| {:margin-right 4}) | ||
|
|
||
| (def community-info-container | ||
| {:flex-direction :row | ||
| :align-items :center}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| (ns status-im.ui.screens.contact-requests.views | ||
| (:require [status-im.ui.components.react :as react] | ||
| [status-im.ui.components.topbar :as topbar] | ||
| [status-im.i18n.i18n :as i18n] | ||
| [status-im.ui.components.list.views :as list] | ||
| [re-frame.core :as re-frame] | ||
| [quo.core :as quo] | ||
| [status-im.ui.components.colors :as colors] | ||
| [reagent.core :as reagent] | ||
| [status-im.ui.components.toolbar :as toolbar] | ||
| [clojure.string :as string] | ||
| [status-im.constants :as constants] | ||
| [status-im.ui.screens.contact-requests.views.contact-request :as contact-request])) | ||
|
|
||
| (def selecting (reagent/atom nil)) | ||
| (def select-all (reagent/atom nil)) | ||
| (def selected-items (reagent/atom #{})) | ||
|
|
||
| (defn render-fn [{:keys [id type] :as home-item}] | ||
| (when id | ||
| (let [selected (get @selected-items id) | ||
| on-change (fn [] | ||
| (when-not (= type 1) (swap! selected-items #(if selected (disj % id) (conj % id)))))] | ||
| [react/view {:flex-direction :row :flex 1 :align-items :center} | ||
| (when (and @selecting (not (= type 2))) | ||
| [react/view {:padding-left 16} | ||
| [quo/checkbox {:value (or @select-all selected) | ||
| :disabled @select-all | ||
| :on-change on-change}]]) | ||
| [react/view {:flex 1} | ||
| [contact-request/activity-text-item | ||
| home-item | ||
| {:on-press (fn [] | ||
| (if @selecting | ||
| (on-change) | ||
| (re-frame/dispatch [:accept-activity-center-contact-request-and-open-chat id]))) | ||
| :on-long-press #(do (reset! selecting true) | ||
| (when-not (= type constants/activity-center-contact-request-type-mention) (swap! selected-items conj id)))}]]]))) | ||
| (defn filter-item [] | ||
| [react/view {:padding-vertical 8 :border-bottom-width 1 :border-bottom-color colors/gray-lighter} | ||
| [react/view {:align-items :center :justify-content :space-between :padding-horizontal 16 :flex-direction :row} | ||
| (if @selecting | ||
| [react/view {:flex-direction :row} | ||
| [quo/checkbox {:value @select-all | ||
| :on-change #(do | ||
| (reset! selected-items #{}) | ||
| (swap! select-all not))}] | ||
| [react/text {:style {:color colors/gray :margin-left 20}} | ||
| (str (if @select-all (i18n/label :t/all) (count @selected-items)) | ||
| " " (string/lower-case (i18n/label :t/selected)))]] | ||
| [quo/button {:type :secondary | ||
| :accessibility-label :select-button-activity-center | ||
| :on-press #(reset! selecting true)} | ||
| (i18n/label :t/select)]) | ||
| (when @selecting | ||
| [quo/button {:type :secondary | ||
| :on-press #(do (reset! selecting false) | ||
| (reset! select-all false) | ||
| (reset! selected-items #{}))} | ||
| (i18n/label :t/cancel)])]]) | ||
|
|
||
| (defn reset-state [] | ||
| (reset! selecting nil) | ||
| (reset! select-all nil) | ||
| (reset! selected-items #{})) | ||
|
|
||
| (defn toolbar-action [accept] | ||
| (if accept | ||
| (if @select-all | ||
| (re-frame/dispatch [:accept-all-activity-center-contact-requests]) | ||
| (re-frame/dispatch [:accept-activity-center-contact-requests @selected-items])) | ||
| (if @select-all | ||
| (re-frame/dispatch [:dismiss-all-activity-center-contact-requests]) | ||
| (re-frame/dispatch [:dismiss-activity-center-contact-requests @selected-items]))) | ||
| (reset-state)) | ||
|
|
||
| (defn center [] | ||
| (reagent/create-class | ||
| {:display-name "activity-center" | ||
| :component-did-mount #(re-frame/dispatch [:get-activity-center-contact-requests]) | ||
| :reagent-render (fn [] | ||
| (let [contact-requests @(re-frame/subscribe [:activity.center/contact-requests-grouped-by-date])] | ||
| [react/keyboard-avoiding-view {:style {:flex 1} | ||
| :ignore-offset true} | ||
| [topbar/topbar {:navigation {:on-press #(do | ||
| (reset-state) | ||
| (re-frame/dispatch [:navigate-back]))} | ||
| :title (i18n/label :t/activity)}] | ||
| (if (= (count contact-requests) 0) | ||
| [react/view {:style {:flex 1 | ||
| :justify-content :center | ||
| :align-items :center}} | ||
| [quo/text {:color :secondary | ||
| :size :large | ||
| :align :center} | ||
| (i18n/label :t/empty-activity-center)]] | ||
| [:<> | ||
| [filter-item] | ||
| [list/section-list | ||
| {:key-fn #(str (:timestamp %) (or (:chat-id %) (:id %))) | ||
| :on-end-reached #(re-frame/dispatch [:load-more-activity-center-contact-requests]) | ||
| :keyboard-should-persist-taps :always | ||
| :sections contact-requests | ||
| :render-fn render-fn | ||
| :stickySectionHeadersEnabled false | ||
| :render-section-header-fn | ||
| (fn [{:keys [title]}] | ||
| [quo/list-header title])}] | ||
| (when (or @select-all (> (count @selected-items) 0)) | ||
| [toolbar/toolbar | ||
| {:show-border? true | ||
| :left [quo/button {:type :secondary | ||
| :theme :negative | ||
| :accessibility-label :reject-and-delete-activity-center | ||
| :on-press #(toolbar-action false)} | ||
| (i18n/label :t/reject-and-delete)] | ||
| :right [quo/button {:type :secondary | ||
| :accessibility-label :accept-and-add-activity-center | ||
| :on-press #(toolbar-action true)} | ||
| (i18n/label :t/accept-and-add)]}])])]))})) |
Oops, something went wrong.