Merge pull request #396 from status-im/feature/#391
Wallet & Requests icons
After Width: | Height: | Size: 447 B |
After Width: | Height: | Size: 473 B |
After Width: | Height: | Size: 396 B |
After Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 315 B |
After Width: | Height: | Size: 400 B |
After Width: | Height: | Size: 262 B |
After Width: | Height: | Size: 831 B |
After Width: | Height: | Size: 518 B |
After Width: | Height: | Size: 581 B |
After Width: | Height: | Size: 398 B |
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 834 B |
After Width: | Height: | Size: 783 B |
After Width: | Height: | Size: 610 B |
After Width: | Height: | Size: 2.6 KiB |
After Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 1.0 KiB |
After Width: | Height: | Size: 766 B |
After Width: | Height: | Size: 3.8 KiB |
|
@ -0,0 +1,23 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "icon_location.png",
|
||||||
|
"scale" : "1x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "icon_location-1.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "icon_location-2.png",
|
||||||
|
"scale" : "3x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
After Width: | Height: | Size: 518 B |
After Width: | Height: | Size: 834 B |
After Width: | Height: | Size: 315 B |
|
@ -0,0 +1,23 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "icon_money_white.png",
|
||||||
|
"scale" : "1x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "icon_money_white-1.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "icon_money_white-2.png",
|
||||||
|
"scale" : "3x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
BIN
ios/StatusIm/Images.xcassets/icon_money_white.imageset/icon_money_white-1.png
vendored
Normal file
After Width: | Height: | Size: 581 B |
BIN
ios/StatusIm/Images.xcassets/icon_money_white.imageset/icon_money_white-2.png
vendored
Normal file
After Width: | Height: | Size: 783 B |
BIN
ios/StatusIm/Images.xcassets/icon_money_white.imageset/icon_money_white.png
vendored
Normal file
After Width: | Height: | Size: 400 B |
|
@ -0,0 +1,23 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "icon_phone_white.png",
|
||||||
|
"scale" : "1x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "icon_phone_white-1.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "icon_phone_white-2.png",
|
||||||
|
"scale" : "3x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
BIN
ios/StatusIm/Images.xcassets/icon_phone_white.imageset/icon_phone_white-1.png
vendored
Normal file
After Width: | Height: | Size: 398 B |
BIN
ios/StatusIm/Images.xcassets/icon_phone_white.imageset/icon_phone_white-2.png
vendored
Normal file
After Width: | Height: | Size: 610 B |
BIN
ios/StatusIm/Images.xcassets/icon_phone_white.imageset/icon_phone_white.png
vendored
Normal file
After Width: | Height: | Size: 262 B |
|
@ -0,0 +1,23 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "wallet_avatar.png",
|
||||||
|
"scale" : "1x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "wallet_avatar-1.png",
|
||||||
|
"scale" : "2x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "wallet_avatar-2.png",
|
||||||
|
"scale" : "3x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
BIN
ios/StatusIm/Images.xcassets/icon_wallet_avatar.imageset/wallet_avatar-1.png
vendored
Normal file
After Width: | Height: | Size: 1.5 KiB |
BIN
ios/StatusIm/Images.xcassets/icon_wallet_avatar.imageset/wallet_avatar-2.png
vendored
Normal file
After Width: | Height: | Size: 2.6 KiB |
After Width: | Height: | Size: 831 B |
|
@ -1,7 +1,8 @@
|
||||||
status.command({
|
status.command({
|
||||||
name: "location",
|
name: "location",
|
||||||
|
icon: "location",
|
||||||
description: "Send location",
|
description: "Send location",
|
||||||
color: "#9a5dcf",
|
color: "#a187d5",
|
||||||
preview: function (params) {
|
preview: function (params) {
|
||||||
var text = status.components.text(
|
var text = status.components.text(
|
||||||
{
|
{
|
||||||
|
@ -118,6 +119,7 @@ function sendTransaction(params, context) {
|
||||||
|
|
||||||
status.command({
|
status.command({
|
||||||
name: "send",
|
name: "send",
|
||||||
|
icon: "money_white",
|
||||||
color: "#5fc48d",
|
color: "#5fc48d",
|
||||||
description: "Send transaction",
|
description: "Send transaction",
|
||||||
params: [{
|
params: [{
|
||||||
|
|
|
@ -99,8 +99,9 @@ function phoneSuggestions(params) {
|
||||||
|
|
||||||
var phoneConfig = {
|
var phoneConfig = {
|
||||||
name: "phone",
|
name: "phone",
|
||||||
|
icon: "phone_white",
|
||||||
description: "Send phone number",
|
description: "Send phone number",
|
||||||
color: "#5fc48d",
|
color: "#5bb2a2",
|
||||||
params: [{
|
params: [{
|
||||||
name: "phone",
|
name: "phone",
|
||||||
type: status.types.PHONE,
|
type: status.types.PHONE,
|
||||||
|
|
|
@ -7,7 +7,8 @@
|
||||||
(def dapp-contact
|
(def dapp-contact
|
||||||
{:whisper-identity wallet-chat-id
|
{:whisper-identity wallet-chat-id
|
||||||
:name (s/capitalize wallet-chat-id)
|
:name (s/capitalize wallet-chat-id)
|
||||||
:dapp? true})
|
:dapp? true
|
||||||
|
:photo-path :icon_wallet_avatar})
|
||||||
|
|
||||||
|
|
||||||
(register-handler :init-wallet-chat
|
(register-handler :init-wallet-chat
|
||||||
|
|
|
@ -16,9 +16,13 @@
|
||||||
[text {:style (:default-chat-icon-text styles)}
|
[text {:style (:default-chat-icon-text styles)}
|
||||||
(first name)]])
|
(first name)]])
|
||||||
|
|
||||||
(defn chat-icon [photo-path styles]
|
(defn chat-icon [photo-path {:keys [size border]}]
|
||||||
|
[view
|
||||||
|
(merge st/default-border-style
|
||||||
|
border
|
||||||
|
(st/border-style size))
|
||||||
[image {:source {:uri photo-path}
|
[image {:source {:uri photo-path}
|
||||||
:style (:chat-icon styles)}])
|
:style (st/image-style size)}]])
|
||||||
|
|
||||||
(defn dapp-badge [styles]
|
(defn dapp-badge [styles]
|
||||||
[view st/online-view-wrapper
|
[view st/online-view-wrapper
|
||||||
|
@ -54,6 +58,7 @@
|
||||||
:online-view st/online-view
|
:online-view st/online-view
|
||||||
:online-dot-left st/online-dot-left
|
:online-dot-left st/online-dot-left
|
||||||
:online-dot-right st/online-dot-right
|
:online-dot-right st/online-dot-right
|
||||||
|
:size 40
|
||||||
:chat-icon st/chat-icon-chat-list
|
:chat-icon st/chat-icon-chat-list
|
||||||
:default-chat-icon (st/default-chat-icon-chat-list color)
|
:default-chat-icon (st/default-chat-icon-chat-list color)
|
||||||
:default-chat-icon-text st/default-chat-icon-text}])
|
:default-chat-icon-text st/default-chat-icon-text}])
|
||||||
|
@ -64,6 +69,7 @@
|
||||||
:online-view st/online-view
|
:online-view st/online-view
|
||||||
:online-dot-left st/online-dot-left
|
:online-dot-left st/online-dot-left
|
||||||
:online-dot-right st/online-dot-right
|
:online-dot-right st/online-dot-right
|
||||||
|
:size 36
|
||||||
:chat-icon st/chat-icon-view-action
|
:chat-icon st/chat-icon-view-action
|
||||||
:default-chat-icon (st/default-chat-icon-view-action color)
|
:default-chat-icon (st/default-chat-icon-view-action color)
|
||||||
:default-chat-icon-text st/default-chat-icon-text}])
|
:default-chat-icon-text st/default-chat-icon-text}])
|
||||||
|
@ -74,6 +80,7 @@
|
||||||
:online-view st/online-view-menu-item
|
:online-view st/online-view-menu-item
|
||||||
:online-dot-left st/online-dot-left-menu-item
|
:online-dot-left st/online-dot-left-menu-item
|
||||||
:online-dot-right st/online-dot-right-menu-item
|
:online-dot-right st/online-dot-right-menu-item
|
||||||
|
:size 24
|
||||||
:chat-icon st/chat-icon-menu-item
|
:chat-icon st/chat-icon-menu-item
|
||||||
:default-chat-icon (st/default-chat-icon-menu-item color)
|
:default-chat-icon (st/default-chat-icon-menu-item color)
|
||||||
:default-chat-icon-text st/default-chat-icon-text}])
|
:default-chat-icon-text st/default-chat-icon-text}])
|
||||||
|
@ -84,6 +91,8 @@
|
||||||
:online-view st/online-view
|
:online-view st/online-view
|
||||||
:online-dot-left st/online-dot-left
|
:online-dot-left st/online-dot-left
|
||||||
:online-dot-right st/online-dot-right
|
:online-dot-right st/online-dot-right
|
||||||
|
:size 64
|
||||||
|
:border {}
|
||||||
:chat-icon st/chat-icon-message-status
|
:chat-icon st/chat-icon-message-status
|
||||||
:default-chat-icon (st/default-chat-icon-message-status color)
|
:default-chat-icon (st/default-chat-icon-message-status color)
|
||||||
:default-chat-icon-text st/message-status-icon-text}])
|
:default-chat-icon-text st/message-status-icon-text}])
|
||||||
|
@ -104,6 +113,7 @@
|
||||||
:online-view st/online-view
|
:online-view st/online-view
|
||||||
:online-dot-left st/online-dot-left
|
:online-dot-left st/online-dot-left
|
||||||
:online-dot-right st/online-dot-right
|
:online-dot-right st/online-dot-right
|
||||||
|
:size 40
|
||||||
:chat-icon st/chat-icon-chat-list
|
:chat-icon st/chat-icon-chat-list
|
||||||
:default-chat-icon (st/default-chat-icon-chat-list default-chat-color)
|
:default-chat-icon (st/default-chat-icon-chat-list default-chat-color)
|
||||||
:default-chat-icon-text st/default-chat-icon-text}])
|
:default-chat-icon-text st/default-chat-icon-text}])
|
||||||
|
@ -113,6 +123,7 @@
|
||||||
:online-view st/online-view-profile
|
:online-view st/online-view-profile
|
||||||
:online-dot-left st/online-dot-left-profile
|
:online-dot-left st/online-dot-left-profile
|
||||||
:online-dot-right st/online-dot-right-profile
|
:online-dot-right st/online-dot-right-profile
|
||||||
|
:size 64
|
||||||
:chat-icon st/chat-icon-profile
|
:chat-icon st/chat-icon-profile
|
||||||
:default-chat-icon (st/default-chat-icon-profile color)
|
:default-chat-icon (st/default-chat-icon-profile color)
|
||||||
:default-chat-icon-text st/default-chat-icon-text}]
|
:default-chat-icon-text st/default-chat-icon-text}]
|
||||||
|
|
|
@ -61,13 +61,13 @@
|
||||||
(def chat-icon-chat-list
|
(def chat-icon-chat-list
|
||||||
(merge chat-icon
|
(merge chat-icon
|
||||||
{:width 40
|
{:width 40
|
||||||
:height 40}))
|
:height 40
|
||||||
|
:margin 0}))
|
||||||
|
|
||||||
(def chat-icon-menu-item
|
(def chat-icon-menu-item
|
||||||
(merge chat-icon
|
|
||||||
{:width 24
|
{:width 24
|
||||||
:height 24
|
:height 24
|
||||||
:border-radius 12}))
|
:border-radius 12})
|
||||||
|
|
||||||
(def chat-icon-profile
|
(def chat-icon-profile
|
||||||
(merge chat-icon
|
(merge chat-icon
|
||||||
|
@ -79,7 +79,8 @@
|
||||||
(merge chat-icon
|
(merge chat-icon
|
||||||
{:width 36
|
{:width 36
|
||||||
:height 36
|
:height 36
|
||||||
:border-radius 18}))
|
:border-radius 18
|
||||||
|
:margin 0}))
|
||||||
|
|
||||||
(def chat-icon-message-status
|
(def chat-icon-message-status
|
||||||
{:border-radius 32
|
{:border-radius 32
|
||||||
|
@ -171,3 +172,19 @@
|
||||||
|
|
||||||
(def container-message-status
|
(def container-message-status
|
||||||
{:margin-top 20})
|
{:margin-top 20})
|
||||||
|
|
||||||
|
(def default-border-style
|
||||||
|
{:margin 4})
|
||||||
|
|
||||||
|
(defn border-style [size]
|
||||||
|
{:width size
|
||||||
|
:height size
|
||||||
|
:border-radius (/ size 2)
|
||||||
|
:background-color :#b9c8d6
|
||||||
|
:padding 0.5})
|
||||||
|
|
||||||
|
(defn image-style [size]
|
||||||
|
(let [image-size (dec size)]
|
||||||
|
{:width image-size
|
||||||
|
:height image-size
|
||||||
|
:border-radius (/ image-size 2)}))
|
||||||
|
|
|
@ -19,7 +19,8 @@
|
||||||
[status-im.i18n :refer [label]]
|
[status-im.i18n :refer [label]]
|
||||||
[status-im.components.react :refer [dismiss-keyboard!]]
|
[status-im.components.react :refer [dismiss-keyboard!]]
|
||||||
[clojure.string :as str]
|
[clojure.string :as str]
|
||||||
[cljs.spec :as s]))
|
[cljs.spec :as s]
|
||||||
|
[status-im.components.chat-icon.screen :as ci]))
|
||||||
|
|
||||||
(defonce drawer-atom (atom))
|
(defonce drawer-atom (atom))
|
||||||
|
|
||||||
|
@ -29,12 +30,6 @@
|
||||||
(defn close-drawer []
|
(defn close-drawer []
|
||||||
(.closeDrawer @drawer-atom))
|
(.closeDrawer @drawer-atom))
|
||||||
|
|
||||||
(defn user-photo [{:keys [photo-path]}]
|
|
||||||
[image {:source (if (str/blank? photo-path)
|
|
||||||
res/user-no-photo
|
|
||||||
{:uri photo-path})
|
|
||||||
:style st/user-photo}])
|
|
||||||
|
|
||||||
(defn menu-item [{:keys [name handler]}]
|
(defn menu-item [{:keys [name handler]}]
|
||||||
[touchable-opacity {:style st/menu-item-touchable
|
[touchable-opacity {:style st/menu-item-touchable
|
||||||
:onPress (fn []
|
:onPress (fn []
|
||||||
|
@ -58,7 +53,7 @@
|
||||||
[view st/drawer-menu
|
[view st/drawer-menu
|
||||||
[touchable-opacity {:on-press #(dispatch [:navigate-to :my-profile])}
|
[touchable-opacity {:on-press #(dispatch [:navigate-to :my-profile])}
|
||||||
[view st/user-photo-container
|
[view st/user-photo-container
|
||||||
[user-photo {:photo-path photo-path}]]]
|
[ci/chat-icon photo-path {:size 64}]]]
|
||||||
[view st/name-container
|
[view st/name-container
|
||||||
[text-field
|
[text-field
|
||||||
{:line-color :white
|
{:line-color :white
|
||||||
|
|
|
@ -6,7 +6,8 @@
|
||||||
[status-im.discovery.styles :as st]
|
[status-im.discovery.styles :as st]
|
||||||
[status-im.utils.gfycat.core :refer [generate-gfy]]
|
[status-im.utils.gfycat.core :refer [generate-gfy]]
|
||||||
[status-im.utils.identicon :refer [identicon]]
|
[status-im.utils.identicon :refer [identicon]]
|
||||||
[status-im.i18n :refer [label]]))
|
[status-im.i18n :refer [label]]
|
||||||
|
[status-im.components.chat-icon.screen :as ci]))
|
||||||
|
|
||||||
(defview discovery-list-item [{:keys [name photo-path status whisper-id]}]
|
(defview discovery-list-item [{:keys [name photo-path status whisper-id]}]
|
||||||
[{contact-name :name
|
[{contact-name :name
|
||||||
|
@ -25,8 +26,8 @@
|
||||||
:number-of-lines 2}
|
:number-of-lines 2}
|
||||||
status]]
|
status]]
|
||||||
[view st/popular-list-item-avatar-container
|
[view st/popular-list-item-avatar-container
|
||||||
[image {:style st/popular-list-item-avatar
|
[ci/chat-icon (cond
|
||||||
:source {:uri (cond
|
|
||||||
(not (str/blank? contact-photo-path)) contact-photo-path
|
(not (str/blank? contact-photo-path)) contact-photo-path
|
||||||
(not (str/blank? photo-path)) photo-path
|
(not (str/blank? photo-path)) photo-path
|
||||||
:else (identicon whisper-id))}}]]])
|
:else (identicon whisper-id))
|
||||||
|
{:size 36}]]])
|
||||||
|
|