From 2e57d476a825742863bbd416862b7b69f08e3672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oskar=20Thor=C3=A9n?= Date: Tue, 24 Oct 2017 13:35:55 +0200 Subject: [PATCH] Discover tag search screen: Fix margins and some nice to haves --- .../discover/search_results/views.cljs | 37 +++++++------------ src/status_im/ui/screens/discover/styles.cljs | 5 +-- 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/src/status_im/ui/screens/discover/search_results/views.cljs b/src/status_im/ui/screens/discover/search_results/views.cljs index f812743357..339af0b587 100644 --- a/src/status_im/ui/screens/discover/search_results/views.cljs +++ b/src/status_im/ui/screens/discover/search_results/views.cljs @@ -1,8 +1,6 @@ (ns status-im.ui.screens.discover.search-results.views (:require-macros [status-im.utils.views :refer [defview letsubs]]) - (:require [status-im.utils.listview :refer [to-datasource]] - [status-im.components.status-bar :as status-bar] - [status-im.components.react :as react] + (:require [status-im.components.react :as react] [status-im.components.icons.vector-icons :as vi] [status-im.components.toolbar.view :refer [toolbar]] [status-im.ui.screens.discover.components.views :as components] @@ -11,36 +9,29 @@ [status-im.ui.screens.contacts.styles :as contacts-styles] [status-im.components.toolbar-new.view :as toolbar])) -(defn render-separator [_ row-id _] - (react/list-item [react/view {:style styles/row-separator - :key row-id}])) - - +;; TOOD(oskarth): Refactor this, very similar to discover-all-hashtags view (defview discover-search-results [] (letsubs [{:keys [discoveries total]} [:get-popular-discoveries 250] tags [:get :discover-search-tags] contacts [:get-contacts] current-account [:get-current-account]] - (let [datasource (to-datasource discoveries)] [react/view styles/discover-tag-container - [status-bar/status-bar] [toolbar/toolbar2 {} toolbar/default-nav-back - [react/view {:flex-direction :row - :justify-content :flex-start} - [react/text {} (str "#" (first tags) " " total)]]] + [toolbar/content-title (str "#" (first tags) " " total)]] (if (empty? discoveries) [react/view styles/empty-view [vi/icon :icons/group-big {:style contacts-styles/empty-contacts-icon}] [react/text {:style contacts-styles/empty-contacts-text} (i18n/label :t/no-statuses-found)]] - ;TODO (goranjovic) replace this with status-im.components.list.views - ;as per https://github.com/status-im/status-react/issues/1840 - [react/list-view {:dataSource datasource - :renderRow (fn [row _ _] - (react/list-item [components/discover-list-item - {:message row - :current-account current-account - :contacts contacts}])) - :renderSeparator render-separator - :style styles/status-list-inner}])]))) + [react/scroll-view styles/list-container + [react/view styles/status-list-outer + [react/view styles/status-list-inner + (let [discoveries (map-indexed vector discoveries)] + (for [[i {:keys [message-id] :as message}] discoveries] + ^{:key (str "message-hashtag-" message-id)} + [components/discover-list-item-full + {:message message + :show-separator? (not= (inc i) (count discoveries)) + :contacts contacts + :current-account current-account}]))]]])])) diff --git a/src/status_im/ui/screens/discover/styles.cljs b/src/status_im/ui/screens/discover/styles.cljs index f22c1fae0e..2f9780cead 100644 --- a/src/status_im/ui/screens/discover/styles.cljs +++ b/src/status_im/ui/screens/discover/styles.cljs @@ -241,10 +241,6 @@ {:border-bottom-color styles/color-light-gray5 :border-bottom-width 1}) -(def discover-tag-container - {:flex 1 - :background-color styles/color-light-gray}) - (def tag-title-container {:height 68 :margin-left 16 @@ -468,4 +464,5 @@ ;; TODO(goranjovic): Using the same style in dapp-details screen - reconcile later (def dapp-details-container all-dapps-container) +(def discover-tag-container all-dapps-container)