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

tag screen 

Former-commit-id: 83e4c584cb
This commit is contained in:
Roman Volosovskyi 2016-05-13 16:52:42 +03:00
parent 3fc884db25
commit 4fd5bd6f00
13 changed files with 88 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/syng_im/android/core.cljs
View File

@ -9,7 +9,7 @@
[syng-im.components.react :refer [navigator app-registry]]
[syng-im.contacts.screen :refer [contact-list]]
[syng-im.discovery.screen :refer [discovery]]
[syng-im.discovery.discovery-tag :refer [discovery-tag]]
[syng-im.discovery.tag :refer [discovery-tag]]
[syng-im.chat.screen :refer [chat]]
[syng-im.chats-list.screen :refer [chats-list]]
[syng-im.new-group.screen :refer [new-group]]

2
src/syng_im/db.cljs
View File

@ -39,6 +39,4 @@
[:chats chat-id :command-requests])
(defn chat-command-request-path [chat-id msg-id]
[:chats chat-id :command-requests msg-id])
(def updated-discoveries-signal-path [:discovery-updated-signal])
(def current-tag-path [:current-tag])
(def updated-current-tag-signal-path [:current-tag-updated-signal])

57
src/syng_im/discovery/discovery_tag.cljs
View File

@ -1,57 +0,0 @@
(ns syng-im.discovery.discovery-tag
(:require
[re-frame.core :refer [subscribe]]
[syng-im.utils.logging :as log]
[syng-im.utils.listview :refer [to-realm-datasource
to-datasource]]
[syng-im.navigation :refer [nav-pop]]
[syng-im.components.react :refer [android?
view
text]]
[syng-im.components.realm :refer [list-view]]
[syng-im.components.toolbar :refer [toolbar]]
[reagent.core :as r]
[syng-im.discovery.discovery-popular-list-item :refer [discovery-popular-list-item]]
[syng-im.discovery.styles :as st]))
(defn render-row [row section-id row-id]
(log/debug "discovery-tag-row: " row section-id row-id)
(if row
(let [elem (discovery-popular-list-item row)]
elem)
(r/as-element [text "null"])
))
(defn render-separator [sectionID, rowID, adjacentRowHighlighted]
(let [elem (r/as-element [view {:style st/row-separator
:key rowID}])]
elem))
(defn title-content [tag]
[view {:style st/tag-title-container}
[text {:style st/tag-title}
(str " #" tag)]])
(defn discovery-tag [{:keys [tag navigator]}]
(let [tag (subscribe [:get-current-tag])
discoveries (subscribe [:get-discoveries-by-tag @tag 0])]
(log/debug "Got discoveries: " @discoveries)
(fn []
(let [items @discoveries
datasource (to-realm-datasource items)]
[view {:style st/discovery-tag-container}
[toolbar {:navigator navigator
:nav-action {:image {:source {:uri "icon_back"}
:style st/icon-back}
:handler (fn [] (nav-pop navigator))}
:title "Add Participants"
:content (title-content @tag)
:action {:image {:source {:uri "icon_search"}
:style st/icon-search}
:handler (fn []
())}}]
[list-view {:dataSource datasource
:renderRow render-row
:renderSeparator render-separator
:style st/recent-list}]]))))

24
src/syng_im/discovery/handlers.cljs
View File

@ -2,17 +2,18 @@
(:require [re-frame.core :refer [register-handler after dispatch enrich
log-ex debug]]
[syng-im.protocol.api :as api]
[syng-im.models.discoveries :refer [save-discoveries
set-current-tag]]
[syng-im.models.discoveries :refer [save-discoveries]]
[syng-im.navigation.handlers :as nav]
[syng-im.models.discoveries :as discoveries]
[syng-im.utils.handlers :as u]))
(defmethod nav/preload-data! :discovery
[{:keys [] :as db} _]
(-> db
(assoc :tags (discoveries/all-tags))
(assoc :discoveries (discoveries/discovery-list))))
[{:keys [discoveries] :as db} _]
(if-not (seq discoveries)
(-> db
(assoc :tags (discoveries/all-tags))
(assoc :discoveries (discoveries/discovery-list)))
db))
(register-handler :discovery-response-received
(u/side-effect!
@ -29,15 +30,14 @@
(dispatch [:add-discovery discovery])))))
(register-handler :broadcast-status
(fn [{:keys [name] :as db} [_ status hashtags]]
(api/broadcast-discover-status name status hashtags)
db))
(u/side-effect!
(fn [{:keys [name]} [_ status hashtags]]
(api/broadcast-discover-status name status hashtags))))
(register-handler :show-discovery-tag
(fn [db [_ tag]]
(let [db (set-current-tag db tag)]
(dispatch [:navigate-to :discovery-tag])
db)))
(dispatch [:navigate-to :discovery-tag])
(assoc db :current-tag tag)))
;; todo remove this
(register-handler :create-fake-discovery!

18
src/syng_im/discovery/screen.cljs
View File

@ -1,27 +1,21 @@
(ns syng-im.discovery.screen
(:require
[syng-im.utils.logging :as log]
[re-frame.core :refer [dispatch subscribe]]
[syng-im.models.discoveries :refer [save-discoveries]]
[syng-im.components.react :refer [android?
view
[syng-im.components.react :refer [view
scroll-view
text
text-input]]
[reagent.core :as r]
[syng-im.components.toolbar :refer [toolbar]]
[syng-im.discovery.views.popular :refer [popular]]
[syng-im.discovery.discovery-recent :refer [discovery-recent]]
[syng-im.discovery.styles :as st]
[syng-im.persistence.realm :as realm]))
[syng-im.discovery.views.recent :refer [discovery-recent]]
[syng-im.discovery.styles :as st]))
(defn get-hashtags [status]
(let [hashtags (map #(subs % 1) (re-seq #"#[^ !?,;:.]+" status))]
(or hashtags [])))
(defn title-content [showSearch]
(if showSearch
(defn title-content [show-search]
(if show-search
[text-input {:style st/discovery-search-input
:autoFocus true
:placeholder "Type your search tags here"
@ -48,7 +42,7 @@
:height 12}}
:handler #(dispatch [:create-fake-discovery!])}
:title "Add Participants"
:content (title-content @show-search)
:content [title-content @show-search]
:action {:image {:source {:uri :icon_search}
:style {:width 17
:height 17}}

22
src/syng_im/discovery/subs.cljs
View File

@ -1,26 +1,20 @@
(ns syng-im.discovery.subs
(:require-macros [reagent.ratom :refer [reaction]])
(:require [re-frame.core :refer [register-sub]]
[syng-im.models.discoveries :refer [current-tag
current-tag-updated?]]))
(:require [re-frame.core :refer [register-sub]]))
(register-sub :get-discoveries-by-tag
(fn [db [_ tag limit]]
(let [discoveries (reaction (:discoveries @db))]
(let [discoveries (reaction (:discoveries @db))
tag' (or tag (:current-tag @db))
filter-tag (filter #(some #{tag'} (map :name (:tags %))))
xform (if limit
(comp filter-tag (take limit))
filter-tag)]
(->> @discoveries
(into [] (comp (filter #(some #{tag} (map :name (:tags %))))
(take limit)))
(into [] xform)
(reaction)))))
(register-sub :get-popular-tags
(fn [db [_ limit]]
(reaction (take limit (:tags @db)))))
(register-sub :get-current-tag
(fn [db _]
(let [current-tag-updated (-> (current-tag-updated? @db)
(reaction))]
(reaction
(let [_ @current-tag-updated]
(current-tag @db))))))

42
src/syng_im/discovery/tag.cljs Normal file
View File

@ -0,0 +1,42 @@
(ns syng-im.discovery.tag
(:require
[re-frame.core :refer [subscribe dispatch]]
[syng-im.utils.logging :as log]
[syng-im.utils.listview :refer [to-datasource2]]
[syng-im.components.react :refer [view text list-view list-item]]
[syng-im.components.toolbar :refer [toolbar]]
[syng-im.discovery.views.popular-list-item :refer [popular-list-item]]
[syng-im.discovery.styles :as st]))
(defn render-row [row _ _]
(list-item [popular-list-item row]))
(defn render-separator [_ row-id _]
(list-item [view {:style st/row-separator
:key row-id}]))
(defn title-content [tag]
[view st/tag-title-container
[text {:style st/tag-title} (str " #" tag)]])
(defn discovery-tag []
(let [tag (subscribe [:get :current-tag])
discoveries (subscribe [:get-discoveries-by-tag])]
(log/debug "Got discoveries: " @discoveries)
(fn []
(let [items @discoveries
datasource (to-datasource2 items)]
[view st/discovery-tag-container
[toolbar {:nav-action {:image {:source {:uri :icon_back}
:style st/icon-back}
:handler #(dispatch [:navigate-back])}
:title "Add Participants"
:content (title-content @tag)
:action {:image {:source {:uri :icon_search}
:style st/icon-search}
:handler (fn [])}}]
[list-view {:dataSource datasource
:renderRow render-row
:renderSeparator render-separator
:style st/recent-list}]]))))

2
src/syng_im/discovery/views/popular.cljs
View File

@ -6,7 +6,7 @@
text]]
[syng-im.components.carousel.carousel :refer [carousel]]
[syng-im.discovery.styles :as st]
[syng-im.discovery.discovery-popular-list :refer [discovery-popular-list]]))
[syng-im.discovery.views.popular-list :refer [discovery-popular-list]]))
(defn page-width []
(.-width (.get (.. js/React -Dimensions) "window")))

24
src/syng_im/discovery/discovery_popular_list.cljs → src/syng_im/discovery/views/popular_list.cljs
View File

@ -1,27 +1,21 @@
(ns syng-im.discovery.discovery-popular-list
(ns syng-im.discovery.views.popular-list
(:require
[re-frame.core :refer [subscribe dispatch dispatch-sync]]
[syng-im.utils.logging :as log]
[syng-im.components.react :refer [android?
view
[re-frame.core :refer [subscribe dispatch]]
[syng-im.components.react :refer [view
list-view
list-item
touchable-highlight
text
image]]
[reagent.core :as r]
text]]
[syng-im.discovery.styles :as st]
[syng-im.utils.listview :refer [to-realm-datasource to-datasource2]]
[syng-im.discovery.discovery-popular-list-item :refer [discovery-popular-list-item] ])
)
[syng-im.utils.listview :refer [to-datasource2]]
[syng-im.discovery.views.popular-list-item :refer [popular-list-item]]))
(defn render-row [row _ _]
(list-item [discovery-popular-list-item row]))
(list-item [popular-list-item row]))
(defn render-separator [sectionID rowID adjacentRowHighlighted]
(defn render-separator [_ row-id _]
(list-item [view {:style st/row-separator
:key rowID}]))
:key row-id}]))
(defn discovery-popular-list [tag count]
(let [discoveries (subscribe [:get-discoveries-by-tag tag 3])]

5
src/syng_im/discovery/discovery_popular_list_item.cljs → src/syng_im/discovery/views/popular_list_item.cljs
View File

@ -1,9 +1,10 @@
(ns syng-im.discovery.discovery-popular-list-item
(ns syng-im.discovery.views.popular-list-item
;syng-im.discovery.views.popular-list-item
(:require [syng-im.components.react :refer [view text image]]
[syng-im.discovery.styles :as st]
[reagent.core :as r]))
(defn discovery-popular-list-item
(defn popular-list-item
[{:keys [name status]}]
[view st/popular-list-item
[view st/popular-list-item-name-container

8
src/syng_im/discovery/discovery_recent.cljs → src/syng_im/discovery/views/recent.cljs
View File

@ -1,14 +1,14 @@
(ns syng-im.discovery.discovery-recent
(ns syng-im.discovery.views.recent
(:require
[re-frame.core :refer [subscribe]]
[syng-im.components.react :refer [view list-view list-item]]
[syng-im.utils.listview :refer [to-realm-datasource to-datasource2]]
[syng-im.discovery.styles :as st]
[syng-im.discovery.discovery-popular-list-item
:refer [discovery-popular-list-item]]))
[syng-im.discovery.views.popular-list-item
:refer [popular-list-item]]))
(defn render-row [row _ _]
(list-item [discovery-popular-list-item row]))
(list-item [popular-list-item row]))
(defn render-separator [_ row-id _]
(list-item [view {:style st/row-separator

7
src/syng_im/models/commands.cljs
View File

@ -1,12 +1,9 @@
(ns syng-im.models.commands
(:require [clojure.string :refer [join split]]
[clojure.walk :refer [stringify-keys keywordize-keys]]
[cljs.core.async :as async :refer [chan put! <! >!]]
[re-frame.core :refer [subscribe dispatch dispatch-sync]]
[re-frame.core :refer [subscribe dispatch]]
[syng-im.db :as db]
[syng-im.components.styles :refer [color-blue
color-dark-mint]]
[syng-im.utils.utils :refer [log toast]]))
[syng-im.components.styles :refer [color-blue color-dark-mint]]))
;; todo delete
(def commands [{:command :money

9
src/syng_im/models/discoveries.cljs
View File

@ -5,15 +5,6 @@
[syng-im.persistence.realm :as r]
[syng-im.db :as db]))
(defn current-tag-updated? [db]
(get-in db db/updated-current-tag-signal-path))
(defn current-tag [db]
(get-in db db/current-tag-path))
(defn set-current-tag [db tag]
(assoc-in db db/current-tag-path tag))
(defn get-tag [tag]
(log/debug "Getting tag: " tag)
(-> (r/get-by-field :tag :name tag)