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

move messages main screen to status-im2 (#14491) 

* move messages main screen to status-im2
This commit is contained in:
flexsurfer 2022-12-05 14:22:06 +01:00 committed by GitHub
parent f7af7ca25d
commit da0f0d3a81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 222 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.carve_ignore
View File

@ -200,7 +200,7 @@ status-im.utils.platform/isMacOs?
status-im.utils.platform/isNix? status-im.utils.platform/isNix?
status-im.utils.platform/isWin? status-im.utils.platform/isWin?
status-im.utils.platform/android-version>= status-im.utils.platform/android-version>=
status-im.utils.debounce/clear-all utils.debounce/clear-all
status-im.transport.db/create-chat status-im.transport.db/create-chat
status-im.utils.priority-map/priority-map status-im.utils.priority-map/priority-map
status-im.utils.priority-map/priority-map-by status-im.utils.priority-map/priority-map-by

185
src/quo2/components/navigation/page_nav.cljs
View File

@ -3,7 +3,9 @@
[quo2.foundations.colors :as colors] [quo2.foundations.colors :as colors]
[quo2.components.icon :as icons] [quo2.components.icon :as icons]
[quo2.components.markdown.text :as text] [quo2.components.markdown.text :as text]
[clojure.string :as string])) [clojure.string :as string]
[quo2.components.buttons.button :as button]
[quo2.components.avatars.user-avatar :as user-avatar]))
(def ^:private centrify-style (def ^:private centrify-style
{:display :flex {:display :flex
@ -12,12 +14,10 @@
(def ^:private align-left (assoc centrify-style :align-items :flex-start)) (def ^:private align-left (assoc centrify-style :align-items :flex-start))
(def ^:private icon-styles (assoc centrify-style :width 32 :height 32 :border-radius 10))
(defn- big? [size] (= size :big)) (defn- big? [size] (= size :big))
(defn- icon-props [color size] (defn- icon-props [color size]
(merge {:size 20 (merge {:size 20
:container-style {:width (if (big? size) :container-style {:width (if (big? size)
20 20
16) 16)
@ -28,32 +28,27 @@
{:color color} {:color color}
{:no-color true}))) {:no-color true})))
(defn render-left-section [{:keys [on-press icon (defn left-section-view [{:keys [on-press icon accessibility-label type] :or {type :grey}}
icon-color icon-background-color]} put-middle-section-on-left?]
put-middle-section-on-left?]
[rn/view {:style (merge [rn/view {:style (merge
icon-styles {:accessibility-label accessibility-label}
{:background-color icon-background-color
:width 32
:height 32}
(when put-middle-section-on-left? {:margin-right 5}))} (when put-middle-section-on-left? {:margin-right 5}))}
[rn/touchable-opacity {:on-press on-press} [button/button {:on-press on-press :icon true :type type :size 32}
[icons/icon icon (icon-props icon-color :big)]]]) icon]])
(defn- mid-section-comp (defn- mid-section-comp
[{:keys [description-img description-user-icon horizontal-description? [{:keys [description-img description-user-icon horizontal-description?
text-secondary-color align-mid? text-color icon main-text type description]}] text-secondary-color align-mid? text-color icon main-text type description]}]
[rn/view {:style (assoc [rn/view {:style (assoc centrify-style
centrify-style :flex-direction :row
:flex-direction :row :margin-horizontal 2)}
:margin-horizontal 2)}
(when (or (and (not horizontal-description?) (when (or (and (not horizontal-description?)
align-mid? align-mid?
(not= :text-with-description type)) (not= :text-with-description type))
(and (or description-img description-user-icon) (and (or description-img description-user-icon)
(not icon))) (not icon)))
(if description-img (if description-img
[rn/view {:margin-right 8} [rn/view {:margin-right 8}
[description-img]] [description-img]]
[rn/image {:source {:uri description-user-icon} [rn/image {:source {:uri description-user-icon}
:style {:width 32 :style {:width 32
@ -77,75 +72,69 @@
horizontal-description? (assoc :margin-left 4 :margin-top 2))} horizontal-description? (assoc :margin-left 4 :margin-top 2))}
description])]]) description])]])
(defn- render-mid-section (defn- mid-section-view
[{:keys [horizontal-description? one-icon-align-left? type left-align? [{:keys [horizontal-description? one-icon-align-left? type left-align?
main-text right-icon main-text-icon-color left-icon] :as props}] main-text right-icon main-text-icon-color left-icon on-press avatar] :as props}]
(let [text-color (if (colors/dark?) colors/neutral-5 colors/neutral-95) (let [text-color (if (colors/dark?) colors/neutral-5 colors/neutral-95)
text-secondary-color (if (colors/dark?) colors/neutral-40 colors/neutral-50) text-secondary-color (if (colors/dark?) colors/neutral-40 colors/neutral-50)
component-instance [mid-section-comp (assoc props :text-secondary-color text-secondary-color)]] component-instance [mid-section-comp (assoc props :text-secondary-color text-secondary-color)]]
[rn/view {:style (merge [rn/touchable-opacity {:on-press on-press}
(if left-align? [rn/view {:style (merge
align-left (if left-align?
centrify-style) align-left
{:flex 1 centrify-style)
:margin-left 4 {:flex 1
:text-align-vertical :center})} :margin-left 4
(case type :text-align-vertical :center})}
:text-only [text/text {:size :paragraph-1 (case type
:weight :semi-bold :text-only [text/text {:size :paragraph-1
:style {:color text-color}} :weight :semi-bold
main-text] :style {:color text-color}}
:text-with-two-icons [rn/view {:style (assoc centrify-style :flex-direction :row)} main-text]
[icons/icon left-icon :user-avatar [rn/view {:style (assoc centrify-style :flex-direction :row)}
(icon-props main-text-icon-color :big)] [user-avatar/user-avatar avatar]
[text/text {:size :paragraph-1 [text/text {:size :paragraph-1
:weight :semi-bold :weight :semi-bold
:style {:padding-horizontal 4 :style {:padding-horizontal 4
:color text-color}} :color text-color}}
main-text] main-text]]
[icons/icon right-icon :text-with-two-icons [rn/view {:style (assoc centrify-style :flex-direction :row)}
(icon-props main-text-icon-color :big)]] [icons/icon left-icon
:text-with-one-icon [rn/view {:style {:flex-direction :row}} (icon-props main-text-icon-color :big)]
(if one-icon-align-left? [text/text {:size :paragraph-1
[rn/view {:style {:flex-direction :row :weight :semi-bold
:align-items :center}} :style {:padding-horizontal 4
(when horizontal-description? :color text-color}}
[icons/icon left-icon main-text]
(icon-props main-text-icon-color :big)]) [icons/icon right-icon
component-instance] (icon-props main-text-icon-color :big)]]
[rn/view {:style {:flex-direction :row :text-with-one-icon [rn/view {:style {:flex-direction :row}}
:align-items :center}} (if one-icon-align-left?
component-instance [rn/view {:style {:flex-direction :row
(when horizontal-description? :align-items :center}}
[icons/icon left-icon (when horizontal-description?
(icon-props main-text-icon-color :big)])])] [icons/icon left-icon
:text-with-description component-instance)])) (icon-props main-text-icon-color :big)])
component-instance]
[rn/view {:style {:flex-direction :row
:align-items :center}}
component-instance
(when horizontal-description?
[icons/icon left-icon
(icon-props main-text-icon-color :big)])])]
:text-with-description component-instance)]]))
(defn- right-section-icon (defn- right-section-view [right-section-buttons]
[{:keys [background-color icon icon-color push-to-the-left?] :or {push-to-the-left? false}}] [rn/view {:style (assoc centrify-style
[rn/view {:style (assoc :flex-direction :row
icon-styles :flex 1
:background-color background-color :justify-content :flex-end)}
:width 32
:height 32
:margin-right (if push-to-the-left? 8 0))}
[icons/icon icon (icon-props icon-color :big)]])
(defn- render-right-section [right-section-buttons]
[rn/view {:style (assoc
centrify-style
:flex-direction :row
:flex 1
:justify-content :flex-end)}
(let [last-icon-index (-> right-section-buttons count dec)] (let [last-icon-index (-> right-section-buttons count dec)]
(map-indexed (fn [index {:keys [icon background-color icon-color on-press]}] (map-indexed (fn [index {:keys [icon on-press type] :or {type :grey}}]
^{:key index} ^{:key index}
[rn/touchable-opacity {:on-press on-press} [rn/view {:style {:margin-right (if (not= index last-icon-index) 8 0)}}
[right-section-icon [button/button {:on-press on-press :icon true :type type :size 32}
{:icon icon icon]])
:background-color background-color
:icon-color icon-color
:push-to-the-left? (not= index last-icon-index)}]])
right-section-buttons))]) right-section-buttons))])
(defn page-nav (defn page-nav
@ -157,7 +146,7 @@
:page-nav-color color :page-nav-color color
:page-nav-background-uri image-uri :page-nav-background-uri image-uri
:mid-section :mid-section
{:type one-of :text-only :text-with-two-icons :text-with-one-icon :text-with-description {:type one-of :text-only :text-with-two-icons :text-with-one-icon :text-with-description :user-avatar
:icon icon :icon icon
:main-text string :main-text string
:left-icon icon :left-icon icon
@ -170,13 +159,15 @@
:main-text-icon-color color :main-text-icon-color color
} }
:left-section :left-section
{:on-press event {:type button-type
:on-press event
:icon icon :icon icon
:icon-color color :icon-color color
:icon-background-color color :icon-background-color color
} }
:right-section-buttons vector of :right-section-buttons vector of
{:on-press event {:type button-type
:on-press event
:icon icon :icon icon
:icon-color color :icon-color color
:icon-background-color color :icon-background-color color
@ -199,27 +190,29 @@
:one-icon-align-left? one-icon-align-left? :one-icon-align-left? one-icon-align-left?
:right-icon (:right-icon mid-section) :right-icon (:right-icon mid-section)
:icon (:icon mid-section) :icon (:icon mid-section)
:left-icon (:left-icon mid-section)}] :left-icon (:left-icon mid-section)
:avatar (:avatar mid-section)}]
[rn/view {:style (cond-> {:display :flex [rn/view {:style (cond-> {:display :flex
:flex-direction :row :flex-direction :row
;; iPhone 11 Pro's height in Figma divided by Component height 56/1125 ;; iPhone 11 Pro's height in Figma divided by Component height 56/1125
:align-items :center :align-items :center
:padding-horizontal 20 :padding-horizontal 20
:height 56
:justify-content :space-between} :justify-content :space-between}
page-nav-background-uri (assoc :background-color page-nav-color) page-nav-background-uri (assoc :background-color page-nav-color)
page-nav-color (assoc :background page-nav-background-uri))} page-nav-color (assoc :background page-nav-background-uri))}
[rn/view {:style {:flex 1 [rn/view {:style {:flex 1
:flex-direction :row :flex-direction :row
:align-items :center}} :align-items :center}}
(render-left-section left-section put-middle-section-on-left?) [left-section-view left-section put-middle-section-on-left?]
(when put-middle-section-on-left? (when put-middle-section-on-left?
[render-mid-section (assoc mid-section-props [mid-section-view (assoc mid-section-props
:left-align? true :left-align? true
:description (:description mid-section) :description (:description mid-section)
:description-color (:description-color mid-section) :description-color (:description-color mid-section)
:description-icon (:description-icon mid-section) :description-icon (:description-icon mid-section)
:align-mid? align-mid? :align-mid? align-mid?
:description-user-icon (:description-user-icon mid-section))])] :description-user-icon (:description-user-icon mid-section))])]
(when-not put-middle-section-on-left? (when-not put-middle-section-on-left?
[render-mid-section mid-section-props]) [mid-section-view mid-section-props])
(render-right-section right-section-buttons)])) [right-section-view right-section-buttons]]))

17
src/react_native/core.cljs
View File

@ -3,7 +3,8 @@
["react-native" :as react-native] ["react-native" :as react-native]
["@react-native-community/blur" :as blur] ["@react-native-community/blur" :as blur]
[react-native.flat-list :as flat-list] [react-native.flat-list :as flat-list]
[react-native.section-list :as section-list])) [react-native.section-list :as section-list]
[react-native.platform :as platform]))
(def app-state ^js (.-AppState ^js react-native)) (def app-state ^js (.-AppState ^js react-native))
(def blur-view (reagent/adapt-react-class (.-BlurView blur))) (def blur-view (reagent/adapt-react-class (.-BlurView blur)))
@ -55,3 +56,17 @@
(js->clj (.get (.-Dimensions ^js react-native) "window") :keywordize-keys true)) (js->clj (.get (.-Dimensions ^js react-native) "window") :keywordize-keys true))
(def status-bar (.-StatusBar ^js react-native)) (def status-bar (.-StatusBar ^js react-native))
(defn hw-back-add-listener [callback]
(.addEventListener (.-BackHandler ^js react-native) "hardwareBackPress" callback))
(defn hw-back-remove-listener [callback]
(.removeEventListener (.-BackHandler ^js react-native) "hardwareBackPress" callback))
(def keyboard-avoiding-view-class (reagent/adapt-react-class (.-KeyboardAvoidingView react-native)))
(defn keyboard-avoiding-view [props & children]
(into [keyboard-avoiding-view-class
(merge (when platform/ios? {:behavior :padding})
props)]
children))

2
src/status_im/browser/core.cljs
View File

@ -22,7 +22,7 @@
[status-im.bottom-sheet.core :as bottom-sheet] [status-im.bottom-sheet.core :as bottom-sheet]
[status-im.browser.webview-ref :as webview-ref] [status-im.browser.webview-ref :as webview-ref]
["eth-phishing-detect" :as eth-phishing-detect] ["eth-phishing-detect" :as eth-phishing-detect]
[status-im.utils.debounce :as debounce] [utils.debounce :as debounce]
[status-im.browser.eip3085 :as eip3085] [status-im.browser.eip3085 :as eip3085]
[status-im.browser.eip3326 :as eip3326])) [status-im.browser.eip3326 :as eip3326]))

2
src/status_im/ui/screens/add_new/new_chat/views.cljs
View File

@ -11,7 +11,7 @@
[status-im.ui.components.list.views :as list] [status-im.ui.components.list.views :as list]
[status-im.ui.components.react :as react] [status-im.ui.components.react :as react]
[status-im.ui.components.topbar :as topbar] [status-im.ui.components.topbar :as topbar]
[status-im.utils.debounce :as debounce] [utils.debounce :as debounce]
[status-im.utils.utils :as utils] [status-im.utils.utils :as utils]
[reagent.core :as reagent] [reagent.core :as reagent]
[quo.react-native :as rn] [quo.react-native :as rn]

2
src/status_im/ui/screens/browser/eip3326/sheet.cljs
View File

@ -5,7 +5,7 @@
[status-im.ui.components.icons.icons :as icons] [status-im.ui.components.icons.icons :as icons]
[status-im.ui.components.react :as react] [status-im.ui.components.react :as react]
[status-im.ui.screens.browser.styles :as styles] [status-im.ui.screens.browser.styles :as styles]
[status-im.utils.debounce :as debounce] [utils.debounce :as debounce]
[status-im.network.core :as network] [status-im.network.core :as network]
[quo.design-system.colors :as colors] [quo.design-system.colors :as colors]
[quo.core :as quo]) [quo.core :as quo])

2
src/status_im/ui/screens/browser/views.cljs
View File

@ -15,7 +15,7 @@
[status-im.ui.screens.browser.permissions.views :as permissions.views] [status-im.ui.screens.browser.permissions.views :as permissions.views]
[status-im.ui.screens.browser.site-blocked.views :as site-blocked.views] [status-im.ui.screens.browser.site-blocked.views :as site-blocked.views]
[status-im.ui.screens.browser.styles :as styles] [status-im.ui.screens.browser.styles :as styles]
[status-im.utils.debounce :as debounce] [utils.debounce :as debounce]
[status-im.utils.http :as http] [status-im.utils.http :as http]
[status-im.utils.js-resources :as js-res] [status-im.utils.js-resources :as js-res]
[status-im.ui.components.permissions :as components.permissions] [status-im.ui.components.permissions :as components.permissions]

2
src/status_im/ui/screens/chat/group.cljs
View File

@ -8,7 +8,7 @@
[status-im.i18n.i18n :as i18n] [status-im.i18n.i18n :as i18n]
[status-im.ui.components.list-selection :as list-selection] [status-im.ui.components.list-selection :as list-selection]
[quo.design-system.colors :as colors] [quo.design-system.colors :as colors]
[status-im.utils.debounce :as debounce] [utils.debounce :as debounce]
[status-im.utils.platform :as platform]) [status-im.utils.platform :as platform])
(:require-macros [status-im.utils.views :refer [defview letsubs]])) (:require-macros [status-im.utils.views :refer [defview letsubs]]))

2
src/status_im/ui/screens/chat/stickers/views.cljs
View File

@ -8,7 +8,7 @@
[status-im.i18n.i18n :as i18n] [status-im.i18n.i18n :as i18n]
[quo.core :as quo] [quo.core :as quo]
[status-im.ui.screens.chat.stickers.styles :as styles] [status-im.ui.screens.chat.stickers.styles :as styles]
[status-im.utils.debounce :as debounce] [utils.debounce :as debounce]
[status-im.ui.components.fast-image :as fast-image])) [status-im.ui.components.fast-image :as fast-image]))
(def icon-size 28) (def icon-size 28)

2
src/status_im/ui/screens/chat/views.cljs
View File

@ -35,7 +35,7 @@
[status-im.utils.platform :as platform] [status-im.utils.platform :as platform]
[status-im.utils.utils :as utils] [status-im.utils.utils :as utils]
[status-im.ui.screens.chat.sheets :as sheets] [status-im.ui.screens.chat.sheets :as sheets]
[status-im.utils.debounce :as debounce] [utils.debounce :as debounce]
[status-im2.navigation.state :as navigation.state] [status-im2.navigation.state :as navigation.state]
[status-im.react-native.resources :as resources])) [status-im.react-native.resources :as resources]))

2
src/status_im/ui/screens/communities/create.cljs
View File

@ -11,7 +11,7 @@
[status-im.ui.components.react :as react] [status-im.ui.components.react :as react]
[status-im.ui.screens.communities.membership :as memberships] [status-im.ui.screens.communities.membership :as memberships]
[status-im.ui.components.icons.icons :as icons] [status-im.ui.components.icons.icons :as icons]
[status-im.utils.debounce :as debounce])) [utils.debounce :as debounce]))
(def max-name-length 30) (def max-name-length 30)
(def max-description-length 140) (def max-description-length 140)

2
src/status_im/ui/screens/communities/create_category.cljs
View File

@ -4,7 +4,7 @@
[status-im.ui.components.toolbar :as toolbar] [status-im.ui.components.toolbar :as toolbar]
[status-im.ui.components.react :as react] [status-im.ui.components.react :as react]
[quo.core :as quo] [quo.core :as quo]
[status-im.utils.debounce :as debounce] [utils.debounce :as debounce]
[status-im.i18n.i18n :as i18n] [status-im.i18n.i18n :as i18n]
[clojure.string :as str] [clojure.string :as str]
[status-im.ui.components.list.views :as list] [status-im.ui.components.list.views :as list]

2
src/status_im/ui/screens/communities/create_channel.cljs
View File

@ -5,7 +5,7 @@
[status-im.i18n.i18n :as i18n] [status-im.i18n.i18n :as i18n]
[status-im.ui.components.toolbar :as toolbar] [status-im.ui.components.toolbar :as toolbar]
[status-im.communities.core :as communities] [status-im.communities.core :as communities]
[status-im.utils.debounce :as debounce] [utils.debounce :as debounce]
[status-im.utils.handlers :refer [>evt <sub]] [status-im.utils.handlers :refer [>evt <sub]]
[status-im.ui.screens.communities.create :as create] [status-im.ui.screens.communities.create :as create]
[status-im.ui.components.keyboard-avoid-presentation :as kb-presentation] [status-im.ui.components.keyboard-avoid-presentation :as kb-presentation]

2
src/status_im/ui/screens/communities/edit_channel.cljs
View File

@ -4,7 +4,7 @@
[status-im.i18n.i18n :as i18n] [status-im.i18n.i18n :as i18n]
[status-im.ui.components.toolbar :as toolbar] [status-im.ui.components.toolbar :as toolbar]
[status-im.communities.core :as communities] [status-im.communities.core :as communities]
[status-im.utils.debounce :as debounce] [utils.debounce :as debounce]
[status-im.utils.handlers :refer [<sub]] [status-im.utils.handlers :refer [<sub]]
[status-im.ui.screens.communities.create-channel :as create-channel])) [status-im.ui.screens.communities.create-channel :as create-channel]))

2
src/status_im/ui/screens/communities/select_category.cljs
View File

@ -3,7 +3,7 @@
[status-im.ui.components.toolbar :as toolbar] [status-im.ui.components.toolbar :as toolbar]
[quo.core :as quo] [quo.core :as quo]
[status-im.i18n.i18n :as i18n] [status-im.i18n.i18n :as i18n]
[status-im.utils.debounce :as debounce] [utils.debounce :as debounce]
[status-im.ui.components.list.views :as list] [status-im.ui.components.list.views :as list]
[reagent.core :as reagent] [reagent.core :as reagent]
[status-im.utils.handlers :refer [>evt <sub]] [status-im.utils.handlers :refer [>evt <sub]]

2
src/status_im/ui/screens/ens/views.cljs
View File

@ -20,7 +20,7 @@
[status-im.ui.screens.chat.message.message :as message] [status-im.ui.screens.chat.message.message :as message]
[status-im.ui.screens.chat.photos :as photos] [status-im.ui.screens.chat.photos :as photos]
[status-im.ui.screens.profile.components.views :as profile.components] [status-im.ui.screens.profile.components.views :as profile.components]
[status-im.utils.debounce :as debounce] [utils.debounce :as debounce]
[clojure.string :as string] [clojure.string :as string]
[status-im.ethereum.tokens :as tokens] [status-im.ethereum.tokens :as tokens]
[quo.core :as quo] [quo.core :as quo]

2
src/status_im/ui/screens/group/views.cljs
View File

@ -17,7 +17,7 @@
[status-im.ui.components.topbar :as topbar] [status-im.ui.components.topbar :as topbar]
[status-im.ui.screens.group.styles :as styles] [status-im.ui.screens.group.styles :as styles]
[quo.core :as quo] [quo.core :as quo]
[status-im.utils.debounce :as debounce]) [utils.debounce :as debounce])
(:require-macros [status-im.utils.views :as views])) (:require-macros [status-im.utils.views :as views]))
(defn- render-contact [row] (defn- render-contact [row]

2
src/status_im/ui/screens/home/views.cljs
View File

@ -15,7 +15,7 @@
[status-im.add-new.core :as new-chat] [status-im.add-new.core :as new-chat]
[status-im.ui.components.search-input.view :as search-input] [status-im.ui.components.search-input.view :as search-input]
[status-im.add-new.db :as db] [status-im.add-new.db :as db]
[status-im.utils.debounce :as debounce] [utils.debounce :as debounce]
[status-im.utils.utils :as utils] [status-im.utils.utils :as utils]
[status-im.ui.components.topbar :as topbar] [status-im.ui.components.topbar :as topbar]
[status-im.ui.components.plus-button :as components.plus-button] [status-im.ui.components.plus-button :as components.plus-button]

2
src/status_im/ui/screens/network/network_details/views.cljs
View File

@ -6,7 +6,7 @@
[status-im.ui.screens.network.styles :as st] [status-im.ui.screens.network.styles :as st]
[status-im.ui.screens.network.views :as network-settings] [status-im.ui.screens.network.views :as network-settings]
[status-im.ui.components.react :as react] [status-im.ui.components.react :as react]
[status-im.utils.debounce :refer [dispatch-and-chill]]) [utils.debounce :refer [dispatch-and-chill]])
(:require-macros [status-im.utils.views :as views])) (:require-macros [status-im.utils.views :as views]))
(views/defview network-details [] (views/defview network-details []

4
src/status_im/ui/screens/onboarding/keys/views.cljs
View File

@ -7,7 +7,7 @@
[status-im.ui.screens.onboarding.styles :as styles] [status-im.ui.screens.onboarding.styles :as styles]
[status-im.utils.gfycat.core :as gfy] [status-im.utils.gfycat.core :as gfy]
[status-im.utils.identicon :as identicon] [status-im.utils.identicon :as identicon]
[status-im.utils.debounce :refer [dispatch-and-chill]] [utils.debounce :refer [dispatch-and-chill]]
[quo.core :as quo] [quo.core :as quo]
[status-im.utils.utils :as utils] [status-im.utils.utils :as utils]
[status-im.ui.screens.onboarding.views :as ui] [status-im.ui.screens.onboarding.views :as ui]
@ -94,4 +94,4 @@
:type :secondary} :type :secondary}
(i18n/label :t/access-existing-keys)]] (i18n/label :t/access-existing-keys)]]
[react/text {:style (assoc (styles/wizard-text) :margin-top 20 :margin-bottom 16)} [react/text {:style (assoc (styles/wizard-text) :margin-top 20 :margin-bottom 16)}
(i18n/label :t/this-will-take-few-seconds)]])])) (i18n/label :t/this-will-take-few-seconds)]])]))

4
src/status_im/ui/screens/onboarding/phrase/view.cljs
View File

@ -8,7 +8,7 @@
[quo.core :as quo] [quo.core :as quo]
[status-im.utils.datetime :as datetime] [status-im.utils.datetime :as datetime]
[status-im.ui.screens.onboarding.views :as ui] [status-im.ui.screens.onboarding.views :as ui]
[status-im.utils.debounce :refer [dispatch-and-chill]] [utils.debounce :refer [dispatch-and-chill]]
[status-im.utils.utils :as utils] [status-im.utils.utils :as utils]
[reagent.core :as reagent])) [reagent.core :as reagent]))
@ -134,4 +134,4 @@
(i18n/label :t/processing)]])] (i18n/label :t/processing)]])]
[ui/next-button [ui/next-button
#(dispatch-and-chill [:multiaccounts.recover/enter-phrase-next-pressed] 300) #(dispatch-and-chill [:multiaccounts.recover/enter-phrase-next-pressed] 300)
next-button-disabled?]])))) next-button-disabled?]]))))

4
src/status_im/ui/screens/onboarding/storage/views.cljs
View File

@ -2,7 +2,7 @@
(:require [re-frame.core :as re-frame] (:require [re-frame.core :as re-frame]
[status-im.i18n.i18n :as i18n] [status-im.i18n.i18n :as i18n]
[status-im.ui.components.react :as react] [status-im.ui.components.react :as react]
[status-im.utils.debounce :refer [dispatch-and-chill]] [utils.debounce :refer [dispatch-and-chill]]
[quo.core :as quo] [quo.core :as quo]
[status-im.ui.screens.onboarding.views :as ui]) [status-im.ui.screens.onboarding.views :as ui])
(:require-macros [status-im.utils.views :refer [defview letsubs]])) (:require-macros [status-im.utils.views :refer [defview letsubs]]))
@ -45,4 +45,4 @@
[:keycard/start-onboarding-flow]) [:keycard/start-onboarding-flow])
[:navigate-to :create-password]) [:navigate-to :create-password])
300) 300)
false]])) false]]))

2
src/status_im/ui/screens/profile/group_chat/views.cljs
View File

@ -16,7 +16,7 @@
[status-im.ui.screens.chat.message.message :as message] [status-im.ui.screens.chat.message.message :as message]
[status-im.ui.screens.chat.photos :as photos] [status-im.ui.screens.chat.photos :as photos]
[status-im.ui.screens.chat.utils :as chat.utils] [status-im.ui.screens.chat.utils :as chat.utils]
[status-im.utils.debounce :as debounce]) [utils.debounce :as debounce])
(:require-macros [status-im.utils.views :refer [defview letsubs]])) (:require-macros [status-im.utils.views :refer [defview letsubs]]))
(defn member-sheet [chat-id member us-admin?] (defn member-sheet [chat-id member us-admin?]

2
src/status_im/ui/screens/wallet/recipient/views.cljs
View File

@ -7,7 +7,7 @@
[status-im.ui.components.topbar :as topbar] [status-im.ui.components.topbar :as topbar]
[quo.core :as quo] [quo.core :as quo]
[quo.design-system.colors :as colors] [quo.design-system.colors :as colors]
[status-im.utils.debounce :as debounce] [utils.debounce :as debounce]
[status-im.ui.components.search-input.view :as search-input] [status-im.ui.components.search-input.view :as search-input]
[status-im.ui.screens.wallet.components.views :as components] [status-im.ui.screens.wallet.components.views :as components]
[status-im.ui.components.icons.icons :as icons] [status-im.ui.components.icons.icons :as icons]

2
src/status_im/ui2/screens/chat/composer/style.cljs
View File

@ -59,7 +59,7 @@
:bottom (- 2 (:bottom insets))}) :bottom (- 2 (:bottom insets))})
(defn bottom-sheet-background [window-height] (defn bottom-sheet-background [window-height]
{:pointerEvents :none {:pointer-events :none
:position :absolute :position :absolute
:left 0 :left 0
:right 0 :right 0

100
src/status_im/ui2/screens/chat/view.cljs
View File

@ -1,100 +0,0 @@
(ns status-im.ui2.screens.chat.view
(:require [reagent.core :as reagent]
[status-im.ui.components.connectivity.view :as connectivity]
[status-im.ui.components.topbar :as topbar]
[status-im.ui2.screens.chat.composer.view :as composer]
[status-im.utils.debounce :as debounce]
[quo.react-native :as rn]
[re-frame.core :as re-frame]
[status-im.i18n.i18n :as i18n]
[quo2.components.buttons.button :as quo2.button]
[quo2.foundations.colors :as colors]
[status-im.ui.components.react :as react]
[status-im2.navigation.state :as navigation.state]
[status-im.ui2.screens.chat.messages.view :as messages]
[status-im.utils.handlers :refer [<sub >evt]]
[status-im.ui.components.icons.icons :as icons]
[status-im.ui2.screens.chat.messages.pinned-message :as pinned-message]
[re-frame.db]
[quo2.components.navigation.floating-shell-button :as floating-shell-button]
[status-im.ui2.screens.chat.messages.message :as message]))
(defn topbar-content []
(let [window-width (<sub [:dimensions/window-width])
{:keys [group-chat chat-id chat-name]} (<sub [:chats/current-chat])]
[rn/view {:flex-direction :row :align-items :center :height 56}
[rn/touchable-highlight {:on-press #(when-not group-chat
(debounce/dispatch-and-chill [:chat.ui/show-profile chat-id] 1000))
:style {:flex 1 :margin-left 12 :width (- window-width 120)}}
[rn/view
[rn/text chat-name]]]]))
(defn back-button []
[quo2.button/button {:type :grey
:size 32
:width 32
:accessibility-label "back-button"
:on-press #(do
(>evt [:close-chat])
(>evt [:navigate-back]))}
[icons/icon :main-icons/arrow-left {:color (colors/theme-colors colors/neutral-100 colors/white)}]])
(defn search-button []
[quo2.button/button {:type :grey
:size 32
:width 32
:accessibility-label "search-button"}
[icons/icon :main-icons/search {:color (colors/theme-colors colors/neutral-100 colors/white)}]])
(defn navigate-back-handler []
(when (and (not @navigation.state/curr-modal) (= (get @re-frame.db/app-db :view-id) :chat))
(react/hw-back-remove-listener navigate-back-handler)
(>evt [:close-chat])
(>evt [:navigate-back])))
(defn chat-render []
(let [{:keys [chat-id show-input?] :as chat}
;;we want to react only on these fields, do not use full chat map here
(<sub [:chats/current-chat-chat-view])
mutual-contact-requests-enabled? (<sub [:mutual-contact-requests/enabled?])]
[react/keyboard-avoiding-view-new {:style {:flex 1}
:ignore-offset false}
;;TODO It is better to not use topbar component because of performance
[topbar/topbar {:navigation :none
:left-component [rn/view {:flex-direction :row :margin-left 16}
[back-button]]
:title-component [topbar-content]
:right-component [rn/view {:flex-direction :row :margin-right 16}
[search-button]]
:border-bottom false
:new-ui? true}]
[connectivity/loading-indicator]
;;TODO not implemented
#_(when chat-id
(if group-chat
[invitation-requests chat-id admins]
(when-not mutual-contact-requests-enabled? [add-contact-bar chat-id])))
[pinned-message/pin-limit-popover chat-id message/pinned-messages-list]
[message/pinned-banner chat-id]
;;MESSAGES LIST
[messages/messages-view
{:chat chat
:mutual-contact-requests-enabled? mutual-contact-requests-enabled?
:show-input? show-input?
:bottom-space 15}]
;;INPUT COMPOSER
(when show-input?
[composer/composer chat-id])
[floating-shell-button/floating-shell-button
{:jump-to {:on-press #(re-frame/dispatch [:shell/navigate-to-jump-to])
:label (i18n/label :t/jump-to)}}
{:position :absolute
:bottom 117}]]))
(defn chat []
(reagent/create-class
{:component-did-mount (fn []
(react/hw-back-remove-listener navigate-back-handler)
(react/hw-back-add-listener navigate-back-handler))
:component-will-unmount (fn [] (react/hw-back-remove-listener navigate-back-handler))
:reagent-render chat-render}))

2
src/status_im/utils/handlers.cljs
View File

@ -2,7 +2,7 @@
(:require [re-frame.core :as re-frame] (:require [re-frame.core :as re-frame]
[re-frame.interceptor :refer [->interceptor get-coeffect]] [re-frame.interceptor :refer [->interceptor get-coeffect]]
[taoensso.timbre :as log] [taoensso.timbre :as log]
[status-im.utils.debounce :as debounce])) [utils.debounce :as debounce]))
(defn- pretty-print-event [ctx] (defn- pretty-print-event [ctx]
(let [[first _] (get-coeffect ctx :event)] (let [[first _] (get-coeffect ctx :event)]

86
src/status_im2/contexts/chat/messages/view.cljs Normal file
View File

@ -0,0 +1,86 @@
(ns status-im2.contexts.chat.messages.view
(:require [reagent.core :as reagent]
[re-frame.db]
[i18n.i18n :as i18n]
[react-native.core :as rn]
[utils.re-frame :as rf]
[utils.debounce :as debounce]
[quo2.core :as quo]
[status-im2.navigation.state :as navigation.state]
;;TODO move to status-im2
[status-im.ui2.screens.chat.composer.view :as composer]
[status-im.ui2.screens.chat.messages.view :as messages]
[status-im.ui2.screens.chat.messages.pinned-message :as pinned-message]
[status-im.ui2.screens.chat.messages.message :as message]))
(defn navigate-back-handler []
(when (and (not @navigation.state/curr-modal) (= (get @re-frame.db/app-db :view-id) :chat))
(rn/hw-back-remove-listener navigate-back-handler)
(rf/dispatch [:close-chat])
(rf/dispatch [:navigate-back])))
(defn page-nav []
(let [{:keys [group-chat chat-id chat-name emoji]} (rf/sub [:chats/current-chat])
display-name (first (rf/sub [:contacts/contact-two-names-by-identity chat-id]))
online? (rf/sub [:visibility-status-updates/online? chat-id])
contact (when-not group-chat (rf/sub [:contacts/contact-by-address chat-id]))
photo-path (when-not (empty? (:images contact)) (rf/sub [:chats/photo-path chat-id]))]
[quo/page-nav
{:align-mid? true
:mid-section
(if group-chat
{:type :text-only
:main-text (str emoji " " chat-name)}
{:type :user-avatar
:avatar {:full-name display-name
:online? online?
:profile-picture photo-path
:size :medium}
:main-text display-name
:on-press #(debounce/dispatch-and-chill [:chat.ui/show-profile chat-id] 1000)})
:left-section
{:on-press #(do
(rf/dispatch [:close-chat])
(rf/dispatch [:navigate-back]))
:icon :i/arrow-left
:accessibility-label :back-button}
:right-section-buttons
[{:on-press #() ;; TODO not implemented
:icon :i/options
:accessibility-label :options-button}]}]))
(defn chat-render []
(let [;;we want to react only on these fields, do not use full chat map here
{:keys [chat-id show-input?] :as chat} (rf/sub [:chats/current-chat-chat-view])
mutual-contact-requests-enabled? (rf/sub [:mutual-contact-requests/enabled?])]
[rn/keyboard-avoiding-view {:style {:flex 1}}
[page-nav]
[pinned-message/pin-limit-popover chat-id message/pinned-messages-list]
[message/pinned-banner chat-id]
;;MESSAGES LIST
[messages/messages-view
{:chat chat
:mutual-contact-requests-enabled? mutual-contact-requests-enabled?
:show-input? show-input?
:bottom-space 15}]
;;INPUT COMPOSER
(when show-input?
[composer/composer chat-id])
[quo/floating-shell-button
{:jump-to {:on-press #(rf/dispatch [:shell/navigate-to-jump-to])
:label (i18n/label :t/jump-to)}}
{:position :absolute
:bottom 117}]]))
(defn chat []
(reagent/create-class
{:component-did-mount (fn []
(rn/hw-back-remove-listener navigate-back-handler)
(rn/hw-back-add-listener navigate-back-handler))
:component-will-unmount (fn [] (rn/hw-back-remove-listener navigate-back-handler))
:reagent-render chat-render}))

4
src/status_im2/navigation/screens.cljs
View File

@ -4,9 +4,9 @@
[status-im2.contexts.communities.overview.view :as communities.overview] [status-im2.contexts.communities.overview.view :as communities.overview]
[status-im2.contexts.shell.view :as shell] [status-im2.contexts.shell.view :as shell]
[status-im2.contexts.quo-preview.main :as quo.preview] [status-im2.contexts.quo-preview.main :as quo.preview]
[status-im2.contexts.chat.messages.view :as chat]
;; TODO remove when not used anymore\ ;; TODO remove when not used anymore
[status-im.ui2.screens.chat.view :as chat]
[status-im.ui.screens.screens :as old-screens])) [status-im.ui.screens.screens :as old-screens]))
(def components (def components

4
src/status_im/utils/debounce.cljs → src/utils/debounce.cljs
View File

@ -1,4 +1,4 @@
(ns status-im.utils.debounce (ns utils.debounce
(:require [re-frame.core :as re-frame])) (:require [re-frame.core :as re-frame]))
(def timeout (atom {})) (def timeout (atom {}))
@ -27,4 +27,4 @@
(when-not (get @chill event-key) (when-not (get @chill event-key)
(swap! chill assoc event-key true) (swap! chill assoc event-key true)
(js/setTimeout #(swap! chill assoc event-key false) time) (js/setTimeout #(swap! chill assoc event-key false) time)
(re-frame/dispatch event)))) (re-frame/dispatch event))))