Merge branch 'develop' into feature/#138

This commit is contained in:
Roman Volosovskyi 2016-06-21 18:54:52 +03:00
commit 4be203bcd3
15 changed files with 368 additions and 99 deletions

View File

@ -18,7 +18,8 @@
"react-native-linear-gradient", "react-native-linear-gradient",
"react-native-android-sms-listener", "react-native-android-sms-listener",
"react-native-camera", "react-native-camera",
"react-native-qrcode" "react-native-qrcode",
"identicon.js"
], ],
"imageDirs": [ "imageDirs": [
"images" "images"

View File

@ -22,6 +22,11 @@
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<service
android:name=".GethService"
android:enabled="true"
android:exported="true"
android:process=":geth_process"/>
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" /> <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
</application> </application>

View File

@ -0,0 +1,136 @@
package com.statusim;
import android.app.Service;
import android.content.Intent;
import android.os.Handler;
import android.os.AsyncTask;
import android.os.IBinder;
import android.os.Looper;
import android.os.Message;
import android.os.Messenger;
import android.support.annotation.Nullable;
import android.util.Log;
import android.os.Environment;
import java.lang.ref.WeakReference;
import com.github.ethereum.go_ethereum.cmd.Geth;
import java.io.File;
public class GethService extends Service {
private static final String TAG = "GethService";
private static boolean isGethStarted = false;
private static boolean isGethInitialized = false;
private final Handler handler = new Handler();
static class IncomingHandler extends Handler {
private final WeakReference<GethService> service;
IncomingHandler(GethService service) {
this.service = new WeakReference<GethService>(service);
}
@Override
public void handleMessage(Message message) {
GethService service = this.service.get();
if (service != null) {
if (!service.handleMessage(message)) {
super.handleMessage(message);
}
}
}
}
final Messenger serviceMessenger = new Messenger(new IncomingHandler(this));
protected class StartTask extends AsyncTask<Void, Void, Void> {
public StartTask() {
}
protected Void doInBackground(Void... args) {
startGeth();
return null;
}
protected void onPostExecute(Void results) {
onGethStarted();
}
}
protected void onGethStarted() {
Log.d(TAG, "Geth Service started");
isGethStarted = true;
}
protected void startGeth() {
Log.d(TAG, "Starting background Geth Service");
File extStore = Environment.getExternalStorageDirectory();
final String dataFolder = extStore.exists() ?
extStore.getAbsolutePath() :
getApplicationInfo().dataDir;
final Runnable addPeer = new Runnable() {
public void run() {
Log.w("Geth", "adding peer");
Geth.run("--exec admin.addPeer(\"enode://e2f28126720452aa82f7d3083e49e6b3945502cb94d9750a15e27ee310eed6991618199f878e5fbc7dfa0e20f0af9554b41f491dc8f1dbae8f0f2d37a3a613aa@139.162.13.89:55555\") attach http://localhost:8545");
}
};
new Thread(new Runnable() {
public void run() {
Geth.run("--shh --ipcdisable --nodiscover --rpc --rpcapi db,eth,net,web3,shh,admin --fast --datadir=" + dataFolder);
}
}).start();
handler.postDelayed(addPeer, 5000);
}
@Nullable
@Override
public IBinder onBind(Intent intent) {
return serviceMessenger.getBinder();
}
@Override
public void onCreate() {
super.onCreate();
System.loadLibrary("gethraw");
System.loadLibrary("geth");
if (!isGethInitialized) {
isGethInitialized = true;
new StartTask().execute();
}
}
@Override
public void onDestroy() {
super.onDestroy();
//TODO: stop geth
isGethStarted = false;
isGethInitialized = false;
Log.d(TAG, "Geth Service stopped !");
}
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
return Service.START_STICKY;
}
protected boolean handleMessage(Message message) {
return false;
}
public static boolean isRunning() {
return isGethInitialized;
}
}

View File

@ -7,17 +7,24 @@ import com.facebook.react.ReactPackage;
import com.facebook.react.shell.MainReactPackage; import com.facebook.react.shell.MainReactPackage;
import com.rt2zz.reactnativecontacts.ReactNativeContacts; import com.rt2zz.reactnativecontacts.ReactNativeContacts;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment; import android.os.Handler;
import android.os.IBinder;
import android.os.Message;
import android.os.Messenger;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener; import android.content.DialogInterface.OnClickListener;
import android.content.DialogInterface.OnCancelListener; import android.content.DialogInterface.OnCancelListener;
import com.github.ethereum.go_ethereum.cmd.Geth; import android.content.ComponentName;
import android.content.ServiceConnection;
import android.content.Intent;
import android.content.Context;
import com.bitgo.randombytes.RandomBytesPackage; import com.bitgo.randombytes.RandomBytesPackage;
import com.BV.LinearGradient.LinearGradientPackage; import com.BV.LinearGradient.LinearGradientPackage;
import com.centaurwarchief.smslistener.SmsListener; import com.centaurwarchief.smslistener.SmsListener;
import android.os.Handler;
import android.util.Log; import android.util.Log;
import java.util.Arrays; import java.util.Arrays;
@ -32,45 +39,69 @@ import io.realm.react.RealmReactPackage;
public class MainActivity extends ReactActivity { public class MainActivity extends ReactActivity {
final Handler handler = new Handler(); private static final String TAG = "MainActivity";
/**
* Incoming message handler. Calls to its binder are sequential!
*/
protected final IncomingHandler handler = new IncomingHandler();
/** Flag indicating if the service is bound. */
protected boolean isBound;
/** Sends messages to the service. */
protected Messenger serviceMessenger = null;
/** Receives messages from the service. */
protected Messenger clientMessenger = new Messenger(handler);
class IncomingHandler extends Handler {
@Override
public void handleMessage(Message message) {
boolean isClaimed = false;
Log.d(TAG, "!!!!!!!!!!!!!! Received Service Message !!!!!!!!!!!!!!");
super.handleMessage(message);
}
}
protected ServiceConnection serviceConnection = new ServiceConnection() {
public void onServiceConnected(ComponentName className, IBinder service) {
// This is called when the connection with the service has been
// established, giving us the object we can use to
// interact with the service. We are communicating with the
// service using a Messenger, so here we get a client-side
// representation of that from the raw IBinder object.
serviceMessenger = new Messenger(service);
isBound = true;
onConnected();
}
public void onServiceDisconnected(ComponentName className) {
// This is called when the connection with the service has been
// unexpectedly disconnected -- that is, its process crashed.
serviceMessenger = null;
isBound = false;
Log.d(TAG, "!!!!!!!!!!!!!! Geth Service Disconnected !!!!!!!!!!!!!!");
}
};
protected void onConnected() {
Log.d(TAG, "!!!!!!!!!!!!!! Geth Service Connected !!!!!!!!!!!!!!");
}
protected void startStatus() { protected void startStatus() {
// Required because of crazy APN settings redirecting localhost (found in GB) // Required because of crazy APN settings redirecting localhost (found in GB)
Properties properties = System.getProperties(); Properties properties = System.getProperties();
properties.setProperty("http.nonProxyHosts", "localhost|127.0.0.1"); properties.setProperty("http.nonProxyHosts", "localhost|127.0.0.1");
properties.setProperty("https.nonProxyHosts", "localhost|127.0.0.1"); properties.setProperty("https.nonProxyHosts", "localhost|127.0.0.1");
File extStore = Environment.getExternalStorageDirectory();
final String dataFolder = extStore.exists() ?
extStore.getAbsolutePath() :
getApplicationInfo().dataDir;
// Launch!
final Runnable addPeer = new Runnable() {
public void run() {
Log.w("Geth", "adding peer");
Geth.run("--exec admin.addPeer(\"enode://e2f28126720452aa82f7d3083e49e6b3945502cb94d9750a15e27ee310eed6991618199f878e5fbc7dfa0e20f0af9554b41f491dc8f1dbae8f0f2d37a3a613aa@139.162.13.89:55555\") attach http://localhost:8545");
}
};
new Thread(new Runnable() {
public void run() {
Geth.run("--shh --ipcdisable --nodiscover --rpc --rpcapi db,eth,net,web3,shh,admin --fast --datadir=" + dataFolder);
}
}).start();
handler.postDelayed(addPeer, 5000);
} }
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
// Required for android-16 (???)
// Crash if put in startStatus() ?
System.loadLibrary("gethraw");
System.loadLibrary("geth");
if(!RootUtil.isDeviceRooted()) { if(!RootUtil.isDeviceRooted()) {
startStatus(); startStatus();
} else { } else {
@ -96,9 +127,27 @@ public class MainActivity extends ReactActivity {
}).create(); }).create();
dialog.show(); dialog.show();
} }
Intent intent = new Intent(this, GethService.class);
if (!GethService.isRunning()) {
startService(intent);
}
if (serviceConnection != null && GethService.isRunning()) {
bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE);
}
} }
@Override
protected void onDestroy() {
super.onDestroy();
try {
unbindService(serviceConnection);
}
catch (Throwable t) {
Log.e(TAG, "Failed to unbind from the geth service", t);
}
}
/** /**
* Returns the name of the main component registered from JavaScript. * Returns the name of the main component registered from JavaScript.
* This is used to schedule rendering of the component. * This is used to schedule rendering of the component.

View File

@ -7,6 +7,7 @@
}, },
"dependencies": { "dependencies": {
"awesome-phonenumber": "^1.0.13", "awesome-phonenumber": "^1.0.13",
"identicon.js": "github:status-im/identicon.js",
"react": "^0.14.5", "react": "^0.14.5",
"react-native": "^0.24.1", "react-native": "^0.24.1",
"react-native-action-button": "^1.1.4", "react-native-action-button": "^1.1.4",
@ -16,7 +17,7 @@
"react-native-contacts": "^0.2.4", "react-native-contacts": "^0.2.4",
"react-native-i18n": "0.0.8", "react-native-i18n": "0.0.8",
"react-native-invertible-scroll-view": "^1.0.0", "react-native-invertible-scroll-view": "^1.0.0",
"react-native-linear-gradient": "^1.5.7", "react-native-linear-gradient": "1.5.7",
"react-native-loading-spinner-overlay": "0.0.8", "react-native-loading-spinner-overlay": "0.0.8",
"react-native-qrcode": "^0.2.2", "react-native-qrcode": "^0.2.2",
"react-native-randombytes": "^2.1.0", "react-native-randombytes": "^2.1.0",

View File

@ -6,8 +6,7 @@
animated-view animated-view
icon icon
touchable-highlight touchable-highlight
text-input text-input]]
dismiss-keyboard!]]
[status-im.components.animation :as anim] [status-im.components.animation :as anim]
[status-im.chat.views.plain-message :as plain-message] [status-im.chat.views.plain-message :as plain-message]
[status-im.chat.views.command :as command] [status-im.chat.views.command :as command]
@ -61,8 +60,7 @@
staged-commands [:get-chat-staged-commands] staged-commands [:get-chat-staged-commands]
typing-command? [:typing-command?] typing-command? [:typing-command?]
commands-input-is-switching? [:animations :commands-input-is-switching?]] commands-input-is-switching? [:animations :commands-input-is-switching?]]
(let [dismiss-keyboard (not (or command typing-command?)) (let [response? (and command to-msg-id)
response? (and command to-msg-id)
message-input? (or (not command) commands-input-is-switching?) message-input? (or (not command) commands-input-is-switching?)
animation? commands-input-is-switching?] animation? commands-input-is-switching?]
[text-input (merge {:style (cond [text-input (merge {:style (cond
@ -72,7 +70,7 @@
:ref (fn [input] :ref (fn [input]
(dispatch [:set-message-input input])) (dispatch [:set-message-input input]))
:autoFocus false :autoFocus false
:blurOnSubmit dismiss-keyboard :blurOnSubmit false
:onChangeText (fn [text] :onChangeText (fn [text]
(when-not animation? (when-not animation?
((if message-input? ((if message-input?
@ -82,8 +80,7 @@
:onSubmitEditing #(when-not animation? :onSubmitEditing #(when-not animation?
(if message-input? (if message-input?
(plain-message/try-send staged-commands (plain-message/try-send staged-commands
input-message input-message)
dismiss-keyboard)
(command/try-send input-command validator)))} (command/try-send input-command validator)))}
(when command (when command
{:accessibility-label :command-input}) {:accessibility-label :command-input})
@ -100,8 +97,7 @@
staged-commands [:get-chat-staged-commands] staged-commands [:get-chat-staged-commands]
typing-command? [:typing-command?] typing-command? [:typing-command?]
commands-input-is-switching? [:animations :commands-input-is-switching?]] commands-input-is-switching? [:animations :commands-input-is-switching?]]
(let [dismiss-keyboard (not (or command typing-command?)) (let [response? (and command to-msg-id)
response? (and command to-msg-id)
message-input? (or (not command) commands-input-is-switching?)] message-input? (or (not command) commands-input-is-switching?)]
[view st/input-container [view st/input-container
[view st/input-view [view st/input-view
@ -117,8 +113,7 @@
(if message-input? (if message-input?
(when (plain-message/message-valid? staged-commands input-message) (when (plain-message/message-valid? staged-commands input-message)
[send-button {:on-press #(plain-message/try-send staged-commands [send-button {:on-press #(plain-message/try-send staged-commands
input-message input-message)
dismiss-keyboard)
:accessibility-label :send-message}]) :accessibility-label :send-message}])
(if (command/valid? input-command validator) (if (command/valid? input-command validator)
[send-button {:on-press command/send-command [send-button {:on-press command/send-command

View File

@ -5,8 +5,7 @@
[status-im.components.react :refer [view [status-im.components.react :refer [view
animated-view animated-view
icon icon
touchable-highlight touchable-highlight]]
dismiss-keyboard!]]
[status-im.components.animation :as anim] [status-im.components.animation :as anim]
[status-im.chat.styles.plain-message :as st] [status-im.chat.styles.plain-message :as st]
[status-im.constants :refer [response-input-hiding-duration]])) [status-im.constants :refer [response-input-hiding-duration]]))
@ -14,19 +13,14 @@
(defn set-input-message [message] (defn set-input-message [message]
(dispatch [:set-chat-input-text message])) (dispatch [:set-chat-input-text message]))
(defn send [dismiss-keyboard]
(when dismiss-keyboard
(dismiss-keyboard!))
(dispatch [:send-chat-msg]))
(defn message-valid? [staged-commands message] (defn message-valid? [staged-commands message]
(or (and (pos? (count message)) (or (and (pos? (count message))
(not= "!" message)) (not= "!" message))
(pos? (count staged-commands)))) (pos? (count staged-commands))))
(defn try-send [staged-commands message dismiss-keyboard] (defn try-send [staged-commands message]
(when (message-valid? staged-commands message) (when (message-valid? staged-commands message)
(send dismiss-keyboard))) (dispatch [:send-chat-msg])))
(defn prepare-message-input [message-input] (defn prepare-message-input [message-input]
(when message-input (when message-input

View File

@ -1,8 +1,10 @@
(ns status-im.chats-list.screen (ns status-im.chats-list.screen
(:require-macros [status-im.utils.views :refer [defview]])
(:require [re-frame.core :refer [subscribe dispatch]] (:require [re-frame.core :refer [subscribe dispatch]]
[status-im.components.react :refer [list-view [status-im.components.react :refer [list-view
list-item list-item
view view
animated-view
text text
image image
touchable-highlight]] touchable-highlight]]
@ -13,25 +15,36 @@
action-button-item]] action-button-item]]
[status-im.components.drawer.view :refer [drawer-view open-drawer]] [status-im.components.drawer.view :refer [drawer-view open-drawer]]
[status-im.components.styles :refer [color-blue [status-im.components.styles :refer [color-blue
toolbar-background1
toolbar-background2]] toolbar-background2]]
[status-im.components.toolbar :refer [toolbar]] [status-im.components.toolbar :refer [toolbar]]
[status-im.components.icons.ionicons :refer [icon]] [status-im.components.icons.ionicons :refer [icon]]
[status-im.i18n :refer [label]] [status-im.i18n :refer [label]]
[status-im.chats-list.styles :as st])) [status-im.chats-list.styles :as st]
[status-im.components.tabs.styles :refer [tabs-height]]))
(defn chats-list-toolbar [] (defview chats-list-toolbar []
[chats-scrolled? [:get :chats-scrolled?]]
[toolbar {:nav-action {:image {:source {:uri :icon_hamburger} [toolbar {:nav-action {:image {:source {:uri :icon_hamburger}
:style st/hamburger-icon} :style st/hamburger-icon}
:handler open-drawer} :handler open-drawer}
:title (label :t/chats) :title (label :t/chats)
:background-color toolbar-background2 :background-color (if chats-scrolled?
toolbar-background1
toolbar-background2)
;; TODO implement search ;; TODO implement search
:action {:image {:source {:uri :icon_search} :action {:image {:source {:uri :icon_search}
:style st/search-icon} :style st/search-icon}
:handler (fn [])}}]) :handler (fn [])}}])
(defn chats-list [] (defn chats-list []
(let [chats (subscribe [:get :chats])] (let [chats (subscribe [:get :chats])
chats-scrolled? (subscribe [:get :chats-scrolled?])
animation? (subscribe [:animations :tabs-bar-animation?])
tabs-bar-value (subscribe [:animations :tabs-bar-value])
container-height (r/atom 0)
content-height (r/atom 0)]
(dispatch [:set :chats-scrolled? false])
(fn [] (fn []
[drawer-view [drawer-view
[view st/chats-container [view st/chats-container
@ -39,7 +52,23 @@
[list-view {:dataSource (to-datasource @chats) [list-view {:dataSource (to-datasource @chats)
:renderRow (fn [row _ _] :renderRow (fn [row _ _]
(list-item [chat-list-item row])) (list-item [chat-list-item row]))
:style st/list-container}] :style st/list-container
;;; if "maximazing" chat list will make scroll to 0,
;;; then disable maximazing
:onLayout (fn [event]
(when-not @chats-scrolled?
(let [height (.. event -nativeEvent -layout -height)]
(reset! container-height height))))
:onContentSizeChange (fn [width height]
(reset! content-height height))
:onScroll (fn [e]
(let [offset (.. e -nativeEvent -contentOffset -y)
min-content-height (+ @container-height tabs-height)
scrolled? (and (< 0 offset) (< min-content-height @content-height))]
(dispatch [:set :chats-scrolled? scrolled?])
(dispatch [:set-animation :tabs-bar-animation? true])))}]
[animated-view {:style (st/action-buttons-container @animation? (or @tabs-bar-value 0))
:pointerEvents :box-none}
[action-button {:buttonColor color-blue [action-button {:buttonColor color-blue
:offsetY 16 :offsetY 16
:offsetX 16} :offsetX 16}
@ -54,4 +83,4 @@
:buttonColor :#1abc9c :buttonColor :#1abc9c
:onPress #(dispatch [:show-group-new])} :onPress #(dispatch [:show-group-new])}
[icon {:name :person-stalker [icon {:name :person-stalker
:style st/person-stalker-icon}]]]]]))) :style st/person-stalker-icon}]]]]]])))

View File

@ -6,7 +6,8 @@
online-color online-color
text1-color text1-color
text2-color text2-color
new-messages-count-color]])) new-messages-count-color]]
[status-im.components.tabs.styles :refer [tabs-height]]))
(def chat-container (def chat-container
{:flexDirection :row {:flexDirection :row
@ -113,3 +114,11 @@
{:fontSize 20 {:fontSize 20
:height 22 :height 22
:color :white}) :color :white})
(defn action-buttons-container [animation? offset-y]
{:position :absolute
:left 0
:right 0
:top 0
:bottom 0
:transform [{:translateY (if animation? offset-y 1)}]})

View File

@ -10,21 +10,21 @@
text2-color text2-color
toolbar-background1]])) toolbar-background1]]))
(def tabs-height 59)
(def tab-height 56) (def tab-height 56)
(def tabs (defn tabs-container [hidden? animation? offset-y]
{:flex 1 {:height tabs-height
:position :absolute :backgroundColor color-white
:bottom 0 :marginBottom (if (or hidden? animation?)
:right 0 (- tabs-height) 0)
:left 0 :transform [{:translateY (if animation? offset-y 1)}]})
})
(def top-gradient (def top-gradient
{:flexDirection :row {:flexDirection :row
:height 3}) :height 3})
(def tabs-container (def tabs-inner-container
{:flexDirection :row {:flexDirection :row
:height tab-height :height tab-height
:opacity 1 :opacity 1
@ -55,10 +55,9 @@
:alignItems :center}) :alignItems :center})
(defn tab-view-container [offset-x] (defn tab-view-container [offset-x]
{:flex 1 {:position :absolute
:position :absolute
:top 0 :top 0
:left 0 :left 0
:right 0 :right 0
:bottom tab-height :bottom 0
:transform [{:translateX offset-x}]}) :transform [{:translateX offset-x}]})

View File

@ -2,6 +2,7 @@
(:require-macros [status-im.utils.views :refer [defview]]) (:require-macros [status-im.utils.views :refer [defview]])
(:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]]
[status-im.components.react :refer [view [status-im.components.react :refer [view
animated-view
text-input text-input
text text
image image
@ -9,7 +10,8 @@
linear-gradient]] linear-gradient]]
[reagent.core :as r] [reagent.core :as r]
[status-im.components.tabs.styles :as st] [status-im.components.tabs.styles :as st]
[status-im.components.tabs.tab :refer [tab]])) [status-im.components.tabs.tab :refer [tab]]
[status-im.components.animation :as anim]))
(defn create-tab [index data selected-view-id] (defn create-tab [index data selected-view-id]
(let [data (merge data {:key index (let [data (merge data {:key index
@ -17,10 +19,43 @@
:selected-view-id selected-view-id})] :selected-view-id selected-view-id})]
[tab data])) [tab data]))
(defview tabs [{:keys [style tab-list selected-view-id]}] (defn animation-logic [{:keys [hidden? val]}]
(let [style (merge st/tabs style)] (let [was-hidden? (atom (not @hidden?))]
[view {:style style} (fn [_]
(when (not= @was-hidden? @hidden?)
(let [to-value (if @hidden? 0 (- st/tabs-height))]
(swap! was-hidden? not)
(anim/start
(anim/timing val {:toValue to-value
:duration 300})
(fn [e]
;; if to-value was changed, then new animation has started
(when (= to-value (if @hidden? 0 (- st/tabs-height)))
(dispatch [:set-animation :tabs-bar-animation? false])))))))))
(defn tabs-container [& children]
(let [chats-scrolled? (subscribe [:get :chats-scrolled?])
animation? (subscribe [:animations :tabs-bar-animation?])
tabs-bar-value (subscribe [:animations :tabs-bar-value])
context {:hidden? chats-scrolled?
:val @tabs-bar-value}
on-update (animation-logic context)]
(anim/set-value @tabs-bar-value 0)
(r/create-class
{:component-did-mount
on-update
:component-did-update
on-update
:reagent-render
(fn [& children]
@chats-scrolled?
(into [animated-view {:style (st/tabs-container @chats-scrolled? @animation? @tabs-bar-value)
:pointerEvents (if @chats-scrolled? :none :auto)}]
children))})))
(defn tabs [{:keys [tab-list selected-view-id]}]
[tabs-container
[linear-gradient {:colors ["rgba(24, 52, 76, 0.01)" "rgba(24, 52, 76, 0.085)" "rgba(24, 52, 76, 0.165)"] [linear-gradient {:colors ["rgba(24, 52, 76, 0.01)" "rgba(24, 52, 76, 0.085)" "rgba(24, 52, 76, 0.165)"]
:style st/top-gradient}] :style st/top-gradient}]
[view st/tabs-container [view st/tabs-inner-container
(doall (map-indexed #(create-tab %1 %2 selected-view-id) tab-list))]])) (doall (map-indexed #(create-tab %1 %2 selected-view-id) tab-list))]])

View File

@ -7,6 +7,7 @@
image image
linear-gradient linear-gradient
touchable-highlight]] touchable-highlight]]
[status-im.utils.identicon :refer [identicon]]
[status-im.components.toolbar :refer [toolbar]] [status-im.components.toolbar :refer [toolbar]]
[status-im.components.drawer.view :refer [drawer-view open-drawer]] [status-im.components.drawer.view :refer [drawer-view open-drawer]]
[status-im.components.styles :refer [color-purple [status-im.components.styles :refer [color-purple
@ -71,7 +72,7 @@
:custom-content toolbar-title :custom-content toolbar-title
:action {:image {:source {:uri :icon_add} :action {:image {:source {:uri :icon_add}
:style icon-search} :style icon-search}
:handler #(dispatch [:add-new-contact new-contact])}}] :handler #(dispatch [:add-new-contact (merge {:photo-path (identicon whisper-identity)} new-contact)])}}]
[view st/form-container [view st/form-container
[contact-whisper-id-input whisper-identity] [contact-whisper-id-input whisper-identity]
[contact-name-input name] [contact-name-input name]

View File

@ -44,7 +44,8 @@
:message-input-buttons-scale 1 :message-input-buttons-scale 1
:messages-offset 0 :messages-offset 0
:commands-input-is-switching? false :commands-input-is-switching? false
:response-resize? false}}) :response-resize? false
:tabs-bar-value (anim/create-value 0)}})
(def protocol-initialized-path [:protocol-initialized]) (def protocol-initialized-path [:protocol-initialized])
(defn chat-input-text-path [chat-id] (defn chat-input-text-path [chat-id]

View File

@ -1,5 +1,6 @@
(ns status-im.models.contacts (ns status-im.models.contacts
(:require [status-im.persistence.realm :as r] (:require [status-im.persistence.realm :as r]
[status-im.utils.identicon :refer [identicon]]
[status-im.persistence.realm-queries :refer [include-query [status-im.persistence.realm-queries :refer [include-query
exclude-query]])) exclude-query]]))
@ -8,9 +9,9 @@
(r/sorted :name :asc) (r/sorted :name :asc)
r/collection->map)) r/collection->map))
(defn create-contact [{:keys [name photo-path] :as contact}] (defn create-contact [{:keys [name photo-path whisper-identity] :as contact}]
(->> {:name (or name "") (->> {:name (or name "")
:photo-path (or photo-path "")} :photo-path (or photo-path (identicon whisper-identity))}
(merge contact) (merge contact)
(r/create :contacts))) (r/create :contacts)))

View File

@ -0,0 +1,13 @@
(ns status-im.utils.identicon
(:require [clojure.string :as s]
[status-im.utils.utils :as u]))
(def default-size 40)
(def identicon-js (u/require "identicon.js"))
(defn identicon
([hash] (identicon hash default-size))
([hash options]
(str "data:image/png;base64," (.toString (new identicon-js hash options)))))