From 01d25e03987b1f1cb40ab97bbe4d788f63e1826d Mon Sep 17 00:00:00 2001 From: yenda Date: Thu, 20 Sep 2018 15:15:06 +0200 Subject: [PATCH] [feature 5923] move default public chats list in json file Signed-off-by: yenda --- resources/default_public_chats.json | 1 + .../screens/add_new/new_public_chat/view.cljs | 25 +++++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 resources/default_public_chats.json diff --git a/resources/default_public_chats.json b/resources/default_public_chats.json new file mode 100644 index 0000000000..6266489a06 --- /dev/null +++ b/resources/default_public_chats.json @@ -0,0 +1 @@ +["status", "status 中文", "status 日本語", "status 한국어", "status по-русски", "status español", "status فارسی", "cryptocurrency", "cryptostrikers", "dapps", "ethereum", "openbounty"] diff --git a/src/status_im/ui/screens/add_new/new_public_chat/view.cljs b/src/status_im/ui/screens/add_new/new_public_chat/view.cljs index 8813668623..3f6f25febb 100644 --- a/src/status_im/ui/screens/add_new/new_public_chat/view.cljs +++ b/src/status_im/ui/screens/add_new/new_public_chat/view.cljs @@ -1,19 +1,22 @@ (ns status-im.ui.screens.add-new.new-public-chat.view - (:require-macros [status-im.utils.views :as views]) - (:require [re-frame.core :as re-frame] + (:require [cljs.spec.alpha :as spec] + [re-frame.core :as re-frame] [status-im.i18n :as i18n] [status-im.ui.components.list.views :as list] [status-im.ui.components.react :as react] [status-im.ui.components.status-bar.view :as status-bar] - [status-im.ui.components.toolbar.view :as toolbar] - [status-im.ui.screens.add-new.styles :as add-new.styles] - [status-im.ui.screens.add-new.new-public-chat.styles :as styles] - [status-im.ui.screens.add-new.new-public-chat.db :as v] - [status-im.ui.components.text-input.view :as text-input.view] - status-im.utils.db [status-im.ui.components.styles :as common.styles] - [cljs.spec.alpha :as spec] - [status-im.ui.components.tooltip.views :as tooltip])) + [status-im.ui.components.text-input.view :as text-input.view] + [status-im.ui.components.toolbar.view :as toolbar] + [status-im.ui.components.tooltip.views :as tooltip] + [status-im.ui.screens.add-new.new-public-chat.db :as v] + [status-im.ui.screens.add-new.new-public-chat.styles :as styles] + [status-im.ui.screens.add-new.styles :as add-new.styles] + status-im.utils.db + [status-im.utils.types :as types]) + (:require-macros + [status-im.utils.slurp :refer [slurp]] + [status-im.utils.views :as views])) (defn- chat-name-input [topic error] [react/view @@ -54,7 +57,7 @@ [list/item-icon {:icon :icons/forward :icon-opts {:color :gray}}]]]]) -(def default-public-chats ["status" "status 中文" "status 日本語" "status 한국어" "status по-русски" "status español" "status فارسی" "cryptocurrency" "cryptostrikers" "dapps" "ethereum" "openbounty"]) +(def default-public-chats (types/json->clj (slurp "resources/default_public_chats.json"))) (views/defview new-public-chat [] (views/letsubs [topic [:get :public-group-topic]