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

Merge branch 'develop' into my-profile 

Former-commit-id: 13205348ed
This commit is contained in:
virvar 2016-05-11 15:49:05 +03:00
parent ad65b798b5 e9029d1130
commit a3effe4f3d
12 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/app/src/main/res/drawable-hdpi/icon_avatar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
android/app/src/main/res/drawable-mdpi/icon_avatar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
android/app/src/main/res/drawable-xhdpi/icon_avatar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
android/app/src/main/res/drawable-xxhdpi/icon_avatar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
android/app/src/main/res/drawable-xxxhdpi/icon_avatar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
images/ic_menu_black_24dp_1x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 82 B

BIN
images/ic_search_black_24dp_1x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 249 B

1
src/syng_im/components/discovery/discovery.cljs
View File

@ -13,7 +13,6 @@
[syng-im.components.toolbar :refer [toolbar]] [syng-im.components.toolbar :refer [toolbar]]
[syng-im.components.discovery.discovery-popular :refer [discovery-popular]] [syng-im.components.discovery.discovery-popular :refer [discovery-popular]]
[syng-im.components.discovery.discovery-recent :refer [discovery-recent]] [syng-im.components.discovery.discovery-recent :refer [discovery-recent]]
[syng-im.resources :as res]
[syng-im.components.discovery.styles :as st] [syng-im.components.discovery.styles :as st]
[syng-im.persistence.realm :as realm])) [syng-im.persistence.realm :as realm]))

3
src/syng_im/components/discovery/discovery_popular_list_item.cljs
View File

@ -5,7 +5,6 @@
view view
text text
image]] image]]
[syng-im.resources :as res]
[syng-im.components.discovery.styles :as st] [syng-im.components.discovery.styles :as st]
[reagent.core :as r]) [reagent.core :as r])
) )
@ -19,6 +18,6 @@
] ]
[view {:style st/popular-list-item-avatar-container} [view {:style st/popular-list-item-avatar-container}
[image {:style st/popular-list-item-avatar [image {:style st/popular-list-item-avatar
:source res/user-no-photo}] :source {:uri "icon_avatar"}}]
] ]
])) ]))

1
src/syng_im/components/discovery/discovery_tag.cljs
View File

@ -12,7 +12,6 @@
[syng-im.components.toolbar :refer [toolbar]] [syng-im.components.toolbar :refer [toolbar]]
[reagent.core :as r] [reagent.core :as r]
[syng-im.components.discovery.discovery-popular-list-item :refer [discovery-popular-list-item]] [syng-im.components.discovery.discovery-popular-list-item :refer [discovery-popular-list-item]]
[syng-im.resources :as res]
[syng-im.components.discovery.styles :as st])) [syng-im.components.discovery.styles :as st]))
(defn render-row [row section-id row-id] (defn render-row [row section-id row-id]

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

@ -4,7 +4,6 @@
[syng-im.utils.logging :as log] [syng-im.utils.logging :as log]
[syng-im.persistence.realm :as realm] [syng-im.persistence.realm :as realm]
[syng-im.persistence.realm :as r] [syng-im.persistence.realm :as r]
[syng-im.resources :as res]
[syng-im.db :as db])) [syng-im.db :as db]))
(defn signal-discoveries-updated [db] (defn signal-discoveries-updated [db]

2
src/syng_im/resources.cljs
View File

@ -17,5 +17,3 @@
(def trash-icon (js/require "./images/trash.png")) (def trash-icon (js/require "./images/trash.png"))
(def leave-icon (js/require "./images/leave.png")) (def leave-icon (js/require "./images/leave.png"))
(def icon-close-gray (js/require "./images/icon_close_gray.png")) (def icon-close-gray (js/require "./images/icon_close_gray.png"))
(def menu (js/require "./images/ic_menu_black_24dp_1x.png"))
(def search (js.require "./images/ic_search_black_24dp_1x.png"))