Commit Graph

681 Commits

Author SHA1 Message Date
virvar 950251a281 Single input
Former-commit-id: 583f424e93
2016-05-24 16:36:27 +03:00
virvar 02e9365bdf Start single input
Former-commit-id: 5a901e3b9a
2016-05-24 16:36:27 +03:00
virvar 870d8d4026 Fix suggestions tapping issue. Fix command input position.
Former-commit-id: 00145a8c6f
2016-05-24 16:36:27 +03:00
Jarrad 91bdb515a7 Merge pull request #97 from status-im/utf8-hex
utf8 over whisper

Former-commit-id: 9a8a5e0ddd
2016-05-24 12:58:52 +02:00
Roman Volosovskyi 4bef3a0428 utf8 over whisper
Former-commit-id: 6b78d9eee2
2016-05-24 12:05:47 +03:00
Adrian Tiberius 6ab889152c merge develop
Former-commit-id: 98f22d9a13
2016-05-24 12:01:26 +03:00
virvar 49a9ae3ba1 Merge remote-tracking branch 'origin/develop' into real-data. Fix contacts synchronization.
# Conflicts:
#	.re-natal
#	android/app/build.gradle
#	android/app/src/main/java/com/statusim/MainActivity.java
#	android/settings.gradle
#	src/status_im/chat/handlers.cljs
#	src/status_im/chat/screen.cljs
#	src/status_im/chats_list/views/chat_list_item.cljs
#	src/status_im/db.cljs
#	src/status_im/group_settings/screen.cljs


Former-commit-id: dcc607022f
2016-05-24 11:08:54 +03:00
Adrian Tiberius 9064021247 merge develop
Former-commit-id: 979ce25f2a
2016-05-23 19:53:07 +03:00
Jarrad ef205d2d78 Merge pull request #92 from status-im/group-chat
Group chat

Former-commit-id: 7fb60472d5
2016-05-23 15:28:49 +02:00
Adrian Tiberius 56c1248a6d fixes #88
Former-commit-id: b1bc93b782
2016-05-23 15:13:52 +03:00
virvar 5142ffc4c3 Fix new chat icon
Former-commit-id: fc5bb416af
2016-05-23 13:50:46 +03:00
Adrian Tiberius 2e49994c86 small code clean
Former-commit-id: 45c35733be
2016-05-23 13:13:06 +03:00
Adrian Tiberius 563e0d69c7 fix last element scroll
Former-commit-id: ff0307d4ce
2016-05-22 23:36:43 +03:00
Roman Volosovskyi 2b70ed56f4 fix typo in ns
Former-commit-id: 547ececac3
2016-05-22 18:17:22 +03:00
Roman Volosovskyi 322622ae52 rename main-tabs.cljs
Former-commit-id: ebe61c9d95
2016-05-22 10:22:22 +03:00
Roman Volosovskyi c6de5075fe remove println
Former-commit-id: 86f80dc525
2016-05-21 16:34:06 +03:00
Roman Volosovskyi ec1439943d fix loading of chat's messages
Former-commit-id: 8bda739201
2016-05-21 16:32:04 +03:00
Roman Volosovskyi 7d2371afec Merge branch 'develop' into group-chat
Conflicts:
	src/status_im/android/core.cljs
	src/status_im/chat/handlers.cljs
	src/status_im/group_settings/handlers.cljs
	src/status_im/group_settings/screen.cljs
	src/status_im/group_settings/styles/chat_name_edit.cljs
	src/status_im/group_settings/subs.cljs
	src/status_im/group_settings/views/chat_name_edit.cljs
	src/status_im/handlers.cljs
	src/status_im/navigation.cljs
	src/status_im/participants/views/contact.cljs
	src/status_im/participants/views/create.cljs
	src/status_im/participants/views/remove.cljs
	src/syng_im/subs.cljs


Former-commit-id: 277905124d
2016-05-21 16:07:37 +03:00
Roman Volosovskyi c086162f68 leave group/ clear history/ add-remove participants
Former-commit-id: 01d1ccdab8
2016-05-21 15:23:24 +03:00
Adrian Tiberius c7a9f13733 merged develop
Former-commit-id: 4a35a06b8c
2016-05-20 22:12:08 +03:00
Roman Volosovskyi 97b4ba8653 add/remove participants
Former-commit-id: cd45d3420e
2016-05-20 19:58:07 +03:00
Roman Volosovskyi 227f22eb48 chat name/load messages on [:navigate-to :chat id]/ other
Former-commit-id: ae1918a2ae
2016-05-20 19:12:04 +03:00
virvar 585baa9d71 Truncate chat name
Former-commit-id: c3496957ff
2016-05-20 16:36:00 +03:00
virvar 615cc4d73a Chat members names menu item
Former-commit-id: 34f5ab31a1
2016-05-20 16:18:12 +03:00
virvar be0d7e2614 Add TODO comments
Former-commit-id: 3af6d2f369
2016-05-20 15:37:24 +03:00
virvar 19c11ec370 Fix group members count
Former-commit-id: df2d2b02ca
2016-05-20 14:38:20 +03:00
virvar 844ff739af Merge 'develop' into 'real-data'
Former-commit-id: ff5898b0a1
2016-05-20 14:20:48 +03:00
virvar 98d0afd034 Last message date
Former-commit-id: a782cf0726
2016-05-20 12:41:55 +03:00
virvar eab6dd79c8 Handle empty photo path
Former-commit-id: 62fb91fba6
2016-05-20 10:55:17 +03:00
virvar 06534cfd5d Profile icon
Former-commit-id: d9a44d9c0b
2016-05-20 10:22:14 +03:00
Adrian Tiberius 6e53d72acb add gradient
Former-commit-id: 799808965d
2016-05-19 20:05:04 +03:00
Jarrad 5aa61b1de4 Syng to Status
Former-commit-id: 134c040c3e
2016-05-19 18:32:38 +02:00
Jarrad b5763bb8ad syng to status
Former-commit-id: 6a5250247c
2016-05-19 18:31:56 +02:00
Roman Volosovskyi 02fb65516b disable 'create button' until new chat will be opened
Former-commit-id: 6e52fca420
2016-05-19 19:29:17 +03:00
Adrian Tiberius aba7d4fae0 fix padding
Former-commit-id: 0556e299d6
2016-05-19 18:41:25 +03:00
Roman Volosovskyi f613dbd2dc add group chat/ messages in group chat
Former-commit-id: a5f153bb66
2016-05-19 18:03:15 +03:00
virvar ee28404ef6 Chat icon component
Former-commit-id: 4ce65b37f9
2016-05-19 16:46:42 +03:00
virvar c015d260e8 Real last message, chat icon
Former-commit-id: a5350f9b9b
2016-05-19 11:51:13 +03:00
Adrian Tiberius 97f1a4bafa change icon names to keywords
Former-commit-id: 74e5c4128d
2016-05-18 21:42:40 +03:00
virvar a1e47ce00f Listen and send confirmation code
Former-commit-id: 476d36f555
2016-05-18 18:40:01 +03:00
virvar d1ef5e7e32 Setup sms-listener
Former-commit-id: 1f5dad71e8
2016-05-18 17:40:26 +03:00
virvar 11c08f1e01 Send international phone number to server. Send confirmation code.
Former-commit-id: 9274ba0ebb
2016-05-18 16:45:03 +03:00
Adrian Tiberius 8d8170d9ab fix discovery tag title
Former-commit-id: ea63b1df68
2016-05-17 17:09:19 +03:00
Adrian Tiberius a03b1a0357 use the new defview
Former-commit-id: dfc772d0cd
2016-05-17 17:03:21 +03:00
virvar 389e5013dd Merge branch 'develop' of https://github.com/syng-im/syng-react into group-chat-settings
Former-commit-id: 981912cd2c
2016-05-17 16:58:02 +03:00
virvar 9f61a21a98 Update with new structure
Former-commit-id: 1512b6de9d
2016-05-17 16:57:45 +03:00
Roman Volosovskyi e327c013f8 fix #43
Former-commit-id: 6a084b0876
2016-05-17 16:53:27 +03:00
Adrian Tiberius daf75759fc merged develop
Former-commit-id: 3881da9156
2016-05-17 16:02:55 +03:00
virvar 8d2532eb46 Merge develop into group-chat-settings
Former-commit-id: e93e7724e2
2016-05-17 14:38:55 +03:00
virvar 1dd00819db Rename group-settings to screen
Former-commit-id: 9ad014a509
2016-05-17 14:26:45 +03:00
Roman Volosovskyi f7bb988954 more cleanup in handlers/subs
Former-commit-id: 4752643ed7
2016-05-17 13:32:20 +03:00
virvar 4eba7c0cd9 Fix group chat
Former-commit-id: 69b0dbdb8d
2016-05-17 13:26:20 +03:00
virvar 2d32a5c507 Group settings handler/sub
Former-commit-id: 1059c47826
2016-05-16 19:38:35 +03:00
virvar a0b0e1e8c6 Merge develop to group-chat-settings
Former-commit-id: 977b010a07
2016-05-16 19:24:17 +03:00
Roman Volosovskyi 21f96ae2fb fix giant 'type'
Former-commit-id: c2b4a1ec33
2016-05-16 16:04:07 +03:00
Roman Volosovskyi 5c2bc27feb discoveries toolbar
Former-commit-id: 5f0862e3b7
2016-05-16 15:50:06 +03:00
Roman Volosovskyi 60b2dc9c63 empty sections
Former-commit-id: 739ca7cb1b
2016-05-16 15:38:27 +03:00
virvar 435d11eb2a 'Clear history', 'Leave chat' handlers
Former-commit-id: 1fe23fe57c
2016-05-16 15:36:52 +03:00
Roman Volosovskyi d8ae553f89 profiles/drawer structure
Former-commit-id: 1977d29b72
2016-05-16 14:38:07 +03:00
Roman Volosovskyi 1e17930295 content-suggestions
Former-commit-id: c833764e22
2016-05-16 14:05:43 +03:00
virvar 8919410735 Chat color
Former-commit-id: 14e69f9369
2016-05-16 13:47:34 +03:00
Roman Volosovskyi b893cce7bb drawer
Former-commit-id: ac4548f63b
2016-05-16 13:40:43 +03:00
Roman Volosovskyi 4d9b81edf5 Merge branch 'develop' into structure
Conflicts:
	src/syng_im/android/core.cljs
	src/syng_im/chat/screen.cljs
	src/syng_im/chat/styles/suggestions.cljs
	src/syng_im/chat/suggestions.cljs
	src/syng_im/chat/views/command.cljs
	src/syng_im/chat/views/phone.cljs
	src/syng_im/chat/views/suggestions.cljs
	src/syng_im/components/chat/input/money.cljs
	src/syng_im/components/chats/chats_list.cljs
	src/syng_im/components/contact_list/contact.cljs
	src/syng_im/components/contact_list/contact_list.cljs
	src/syng_im/components/discovery/discovery.cljs
	src/syng_im/components/toolbar.cljs
	src/syng_im/db.cljs
	src/syng_im/discovery/styles.cljs
	src/syng_im/handlers.cljs
	src/syng_im/models/chat.cljs
	src/syng_im/models/contacts.cljs
	src/syng_im/subs.cljs


Former-commit-id: 473604d859
2016-05-16 12:31:08 +03:00
Roman Volosovskyi becdb591d9 start chat with contact
Former-commit-id: af0ed4c3a9
2016-05-16 10:45:59 +03:00
Roman Volosovskyi a24cdd293e defview suggestion
Former-commit-id: 780b12049e
2016-05-14 12:39:01 +03:00
Roman Volosovskyi 8de3be1f6f replace to-datasource2
Former-commit-id: 85e05a451d
2016-05-13 19:03:14 +03:00
Roman Volosovskyi 96821edf6b remove to-realm-datasource
Former-commit-id: f484b190fd
2016-05-13 18:56:52 +03:00
virvar b4e8adc951 Chat name edit form. Fix styles.
Former-commit-id: bf6c419c5d
2016-05-13 18:03:45 +03:00
Roman Volosovskyi ee5a169c8e move discoveries model
Former-commit-id: c27fddfe18
2016-05-13 17:34:04 +03:00
Roman Volosovskyi 9031ab5144 some missed styles
Former-commit-id: c62feb0159
2016-05-13 16:58:14 +03:00
Roman Volosovskyi 4fd5bd6f00 tag screen
Former-commit-id: 83e4c584cb
2016-05-13 16:52:42 +03:00
Roman Volosovskyi 3fc884db25 discoveries order
Former-commit-id: 74249dc717
2016-05-13 15:52:02 +03:00
virvar 8ab611f5c5 Group settings refactoring
Former-commit-id: 6b54767b98
2016-05-13 15:15:40 +03:00
Roman Volosovskyi f9cee873d1 discoveries
Former-commit-id: 748abd40e4
2016-05-13 14:58:58 +03:00
virvar 470191d9b3 Add/remove group chat members
Former-commit-id: b2737d42f7
2016-05-13 14:17:03 +03:00
Adrian Tiberius 0842396d85 fixed discovery tag navigation
Former-commit-id: 897ee3dcd6
2016-05-12 23:46:17 +03:00
Adrian Tiberius 2b0bf554e4 added tabs component
Former-commit-id: 1fd3f86e23
2016-05-12 22:47:32 +03:00
virvar b62b758c60 Group settings to new structure
Former-commit-id: 5283256804
2016-05-12 16:31:27 +03:00
virvar 70e9e2155b Group settings members
Former-commit-id: 344f64b9f2
2016-05-12 15:32:40 +03:00
virvar 84bb1b80b5 Group settings styles
Former-commit-id: 240569434c
2016-05-12 14:15:09 +03:00
virvar 798aab0f72 Read/save group chat settings
Former-commit-id: 14be588ca2
2016-05-12 13:26:13 +03:00
Roman Volosovskyi 8fb71e46b7 contacts handlers
Former-commit-id: 73d3fdb3e6
2016-05-12 12:56:47 +03:00
Roman Volosovskyi a2467348e3 contacts styles
Former-commit-id: c5c71691c3
2016-05-11 16:06:37 +03:00
virvar a3effe4f3d Merge branch 'develop' into my-profile
Former-commit-id: 13205348ed
2016-05-11 15:49:05 +03:00
Jarrad e9029d1130 Merge pull request #64 from status-im/commands-button
Commands button. Phone number validation. Drawer and Profile views.

Former-commit-id: 3d8adf840e
2016-05-11 14:42:12 +02:00
Roman Volosovskyi d3cfaa7196 chats-list screen styles
Former-commit-id: bb0a6c848f
2016-05-11 14:58:03 +03:00
Roman Volosovskyi fc6926cbfd chats-list & new-group views/styles
Former-commit-id: 0b3469cd64
2016-05-11 14:47:40 +03:00
virvar ad65b798b5 Profile menu item of chat view
Former-commit-id: 249ea85201
2016-05-11 14:37:31 +03:00
virvar 251931e794 Chat view toolbar refactoring
Former-commit-id: 0e2cd2f653
2016-05-11 14:36:40 +03:00
virvar 5a63f527d3 Add my profile view
Former-commit-id: 3dfc461924
2016-05-11 13:05:33 +03:00
virvar d4f666eff0 Microrefactoring
Former-commit-id: 3264bbfac9
2016-05-11 10:42:04 +03:00
virvar 0d237b53d4 Fix back navigation. Add 'discovery' drawer item.
Former-commit-id: c89f2820aa
2016-05-11 10:36:13 +03:00
Roman Volosovskyi 5cdf182192 Merge branch 'develop' into structure
Former-commit-id: eae67bd400
2016-05-10 19:07:58 +03:00
Roman Volosovskyi 6e2809e270 contacts screen/views
Former-commit-id: f1584b8342
2016-05-10 19:06:36 +03:00
Roman Volosovskyi fb22a08b79 remove chat model
Former-commit-id: 544571e3a7
2016-05-10 17:40:21 +03:00
Adrian Tiberius 30b9298478 replace avatar placeholder in discovery and remove unused image resources
Former-commit-id: 5fe774faee
2016-05-10 17:39:52 +03:00
virvar bdc9b6e5e0 Merge with 'develop'
Former-commit-id: 6f2acb0f65
2016-05-10 16:39:09 +03:00
virvar d285fcd6e0 Suggestions style. Add close commands button.
Former-commit-id: 6f5dade40f
2016-05-10 16:16:07 +03:00
Roman Volosovskyi b0dd67ac91 Merge branch 'develop' into structure
Former-commit-id: bc494dcacd
2016-05-10 15:32:47 +03:00
Roman Volosovskyi 39772b41f7 more navigation handlers
Former-commit-id: 38161d9e10
2016-05-10 15:25:36 +03:00
Jarrad 3c7c91b745 Merge pull request #58 from status-im/feature-discover
Feature discover

Former-commit-id: bda5ce32ab
2016-05-10 13:21:58 +02:00
Roman Volosovskyi 8a99e2a614 chat & navigation handlers/subs
Former-commit-id: f429a15be8
2016-05-10 13:58:37 +03:00
virvar 7ecce32a86 Start command input on button click
Former-commit-id: 6bbd5bf92d
2016-05-10 13:12:49 +03:00
virvar 4a5623285a Set signed-up at init db
Former-commit-id: 8324cf4109
2016-05-10 12:31:48 +03:00
virvar d0f7dc8539 Fix navigation. Change image to icon.
Former-commit-id: ee7de39274
2016-05-10 11:15:39 +03:00
virvar 386ba0051f Merge with 'develop'
Former-commit-id: ee4a4a6f65
2016-05-10 09:45:59 +03:00
Adrian Tiberius da535c025b refactored carousel component
Former-commit-id: d68e078130
2016-05-09 21:22:02 +03:00
Roman Volosovskyi 3be2f2c06c chat inputs/suggestions/commands
Former-commit-id: 4b1b5a9449
2016-05-09 19:28:40 +03:00
Roman Volosovskyi 5fcfd12473 Merge branch 'develop' into structure
Former-commit-id: 410a06c07c
2016-05-09 18:46:50 +03:00
Roman Volosovskyi 42503f1491 fix :navigation-stack sub
Former-commit-id: 4eac55e756
2016-05-09 18:41:42 +03:00
Roman Volosovskyi 4b29cb4070 fix :chat-properties
Former-commit-id: 4c4e27267a
2016-05-09 18:39:10 +03:00
Roman Volosovskyi 0c1ec9a56e chat's views & styles
Former-commit-id: 6932f1c103
2016-05-09 18:17:40 +03:00
virvar 9bd9847138 Fixes
Former-commit-id: 4e7bdd4742
2016-05-09 17:33:41 +03:00
virvar 653cbc133b Merge with develop
Former-commit-id: 03d719edaf
2016-05-09 17:30:01 +03:00
Adrian Tiberius 4ff9e34121 merge develop
Former-commit-id: 96957039c3
2016-05-09 16:58:03 +03:00
Adrian Tiberius fba1bffd08 merge develop
Former-commit-id: 5b6c077b66
2016-05-09 16:40:45 +03:00
Roman Volosovskyi 7a791627d3 chat inputs styles
Former-commit-id: 867e5392ad
2016-05-09 15:44:06 +03:00
virvar 26a2c5053e Remove extra :style
Former-commit-id: 509748888f
2016-05-09 15:41:51 +03:00
virvar 59e6126572 Show suggestions as hint for phone number format
Former-commit-id: 6eeaab5c28
2016-05-09 15:29:08 +03:00
Roman Volosovskyi 1622d58f82 Merge branch 'refactoring-rebase' into styles
Former-commit-id: ede2ca40ee
2016-05-09 14:11:08 +03:00
Roman Volosovskyi 853a6a41b6 Merge branch 'develop' into refactoring-rebase
Former-commit-id: ab5f3e3c6d
2016-05-09 14:05:20 +03:00
Roman Volosovskyi 8d2af93015 chat elements styles
Former-commit-id: 7019d7033f
2016-05-09 13:59:55 +03:00
virvar 65210893fe Validate phone number
Former-commit-id: 152626da18
2016-05-09 12:26:42 +03:00
virvar a077b29f9e 'Message' button on profile view
Former-commit-id: 252452f5b0
2016-05-09 10:28:29 +03:00
virvar 52ff320c23 Profile and Drawer styles refactoring
Former-commit-id: 547c9031be
2016-05-09 10:07:54 +03:00
Roman Volosovskyi 48ef39ae33 fix typo & postfixes
Former-commit-id: 060a6d40d1
2016-05-08 23:14:03 +03:00
Roman Volosovskyi 98321167fe chat message styles
Former-commit-id: 27302d9027
2016-05-08 23:06:38 +03:00
Adrian Tiberius 5b8adc04ce moved handlers and subs to component folder
Former-commit-id: 2f11811d55
2016-05-07 18:04:19 +03:00
Adrian Tiberius ae547a56ac moved styles to separate file
Former-commit-id: 3976ea6c70
2016-05-07 17:53:39 +03:00
Roman Volosovskyi 2e8d87322d styles
Former-commit-id: 1ce4c1d459
2016-05-07 16:39:03 +03:00
Adrian Tiberius 765e80f0a1 Revert figwheel-bridge.js. Applied suggestions.
Former-commit-id: d009f038e5
2016-05-07 15:13:03 +03:00
Adrian Tiberius 04cc73b068 add scroll threshold to carousel
Former-commit-id: 4eaeb4c477
2016-05-07 12:58:06 +03:00
Roman Volosovskyi 62188134c8 rename subscribers folder
Former-commit-id: 4b41ff8507
2016-05-07 12:15:48 +03:00
virvar 34bd8bebe7 Show contact profile from chat menu. Fix chat creation.
Former-commit-id: e4e9bcfc1a
2016-05-06 17:12:24 +03:00
Roman Volosovskyi 459893a95c same-author/direction
Former-commit-id: 357249a49b
2016-05-06 16:11:45 +03:00
Roman Volosovskyi b7ddf69d78 same-author/direction
Former-commit-id: 827a354c1e
2016-05-06 15:17:17 +03:00
virvar 21eaa78878 Close drawer on 'switch users' click
Former-commit-id: 9ec8f70cfe
2016-05-06 14:37:57 +03:00
Roman Volosovskyi ed5fc9a20d background color
Former-commit-id: 9548dd23ee
2016-05-06 14:30:34 +03:00
virvar 088d20ebf0 Fix profile styles
Former-commit-id: 7ddd90e2dc
2016-05-06 14:25:29 +03:00
Roman Volosovskyi c8890a545c refactoring
Former-commit-id: 319bb656ec
2016-05-06 14:06:58 +03:00
virvar 3c788b4d4b Fix drawer styles. Rename
Former-commit-id: b76a3d4afd
2016-05-06 11:49:51 +03:00
Adrian Tiberius 47c3f01bd5 replaced android toolbar with new custom toolbar
Former-commit-id: c11da58c50
2016-05-05 18:04:17 +03:00
virvar ce53fec09c Add drawer
Former-commit-id: 55dc64f6e6
2016-05-05 17:03:34 +03:00
Adrian Tiberius b4243aa2cc merged develop branch
Former-commit-id: 2c9174af63
2016-05-05 16:33:48 +03:00
Adrian Tiberius 997d0bd4d8 added discover tag screen
Former-commit-id: 69df1ad3ef
2016-05-05 15:55:11 +03:00
Adrian Tiberius 6ed1d24098 fix empty section header warning
Former-commit-id: 36db3b8374
2016-05-05 14:40:40 +03:00
virvar 02f08e6b99 Merge with 'design'
Former-commit-id: f06cdee11b
2016-05-05 13:30:12 +03:00
virvar 99456f7b1b Custom toolbar refactoring
Former-commit-id: 161356928c
2016-05-04 15:13:31 +03:00
virvar 3b9c738714 Custom toolbar for group chat views
Former-commit-id: cadf1b2a0b
2016-05-04 14:35:35 +03:00
virvar 0d10422897 Toolbar for contacts view
Former-commit-id: 902daf3963
2016-05-03 17:17:52 +03:00
virvar 421b93fc92 Delete unnecessary view nesting
Former-commit-id: bbaff31570
2016-05-03 16:47:36 +03:00
virvar 968def8a3f Menu items icons. Hide actions menu on click outside.
Former-commit-id: ac11508703
2016-05-03 16:39:08 +03:00
Adrian Tiberius ee3800897d fixed discovery screen design styles
Former-commit-id: f402fc9b6e
2016-05-03 16:00:44 +03:00
Jarrad ea34c72c00 Merge pull request #47 from status-im/protocol-integration-bugfixes
Protocol integration bugfixes

Former-commit-id: e4c6f6d531
2016-05-03 12:01:25 +02:00
virvar 5415896efe Start custom toolbar
Former-commit-id: 1b3c788ec7
2016-05-02 16:56:42 +03:00
virvar 086f9d826f Revert
This reverts commit 88238ed2c8 [formerly 71cb0fde6c].


Former-commit-id: b65c71bbb5
2016-05-02 13:56:25 +03:00
virvar b9a51912fd Store last chat msg id in chat entity
Former-commit-id: c81b0dfc8c
2016-05-02 13:43:13 +03:00
Adrian Tiberius 38f7ea1ebf cleaned logging and changed it to use utils.logging; splitted carousel to multiple functions
Former-commit-id: 5aef032c59
2016-04-30 22:48:30 +03:00
virvar 539605634c Save adjacent message info to realm
Former-commit-id: a50c973e92
2016-04-29 22:55:54 +03:00
virvar 58644aacca Add status message on open empty chat. Add last chat message to db. Fix 'typing' view. Fix chat background.
Former-commit-id: 7fb2d74003
2016-04-29 22:38:19 +03:00
virvar 88238ed2c8 Add status message on open empty chat. Add last chat message to db. Fix 'typing' view. Fix chat background.
Former-commit-id: 71cb0fde6c
2016-04-29 22:34:33 +03:00
michaelr eb10272bdb improved system messages for edge cases
Former-commit-id: a555c57bcc
2016-04-29 16:24:03 +03:00
virvar 4802396003 Fix invertible scrollview scrolling
Former-commit-id: 84cfddb3e8
2016-04-29 13:36:30 +03:00
michaelr de14071c06 remove participants colors, re-join chat, update contacts instead of remove
Former-commit-id: 8f04104cc0
2016-04-29 02:06:15 +03:00
virvar bc924d5ee0 Fix chat view indents
Former-commit-id: 953bc66223
2016-04-28 16:53:41 +03:00
michaelr ff8dc7a4f7 idempotent joined chat msg
Former-commit-id: dbfbd18eaf
2016-04-28 14:37:33 +03:00
Adrian Tiberius bce474e857 merge master
Former-commit-id: a87ed22db8
2016-04-28 04:12:30 +03:00
Adrian Tiberius 1d633930d9 code cleaning
Former-commit-id: 71aef771d8
2016-04-28 03:33:58 +03:00
Adrian Tiberius 500645e0aa linked discovery search to status change for testing and updated react-native
Former-commit-id: ca656906c1
2016-04-28 01:03:24 +03:00
virvar 5a2f28b940 Fix message text input position
Former-commit-id: b28076f5b8
2016-04-26 16:35:48 +03:00
virvar 1b23b406d8 Use phone contacts instead of fake
Former-commit-id: fbc001fcb9
2016-04-26 14:07:56 +03:00
Roman Volosovskyi 0a293ee74d lein-kibit suggestions
Former-commit-id: 529148c101
2016-04-26 12:42:08 +03:00
Jarrad 56fa8214cb Merge pull request #37 from status-im/icons_resolution
Fix Icons resolution #25

Former-commit-id: c45ffd49d6
2016-04-26 12:51:19 +07:00
virvar b8ec4eceb9 Delete obsolete icons
Former-commit-id: d9bc6f55f5
2016-04-25 20:48:01 +03:00
virvar df120998cf Merge branch 'design' into icons_resolution
Former-commit-id: 7ee1625b31
2016-04-25 20:33:40 +03:00
virvar 99f5f9caef Fix #25 Low resolution icons
Former-commit-id: 81751b294b
2016-04-25 20:32:43 +03:00
Roman Volosovskyi 2db8ad5c15 :underlay-color for touchable-highlight component
Former-commit-id: a41db711d0
2016-04-25 18:11:42 +03:00
Roman Volosovskyi 248f80df40 fix #24 black 'hit' states on button
Former-commit-id: 8f7e1d6aa5
2016-04-25 18:04:28 +03:00
Jarrad 555da5011e Merge pull request #19 from status-im/command-as-non-command
fix command as non-command

Former-commit-id: 393dd19704
2016-04-25 18:16:11 +07:00
virvar 8df4d5a6f4 Fix #23 Grey area between staging and text input
Former-commit-id: 6c40a2dac4
2016-04-25 13:21:46 +03:00
virvar a714cc9e66 Fix #27 Confirmation code should be number input
Former-commit-id: 55396a20c4
2016-04-25 12:25:33 +03:00
virvar 0b43cbf089 Fix #22 Confirmation code stops after first try
Former-commit-id: 94660fb812
2016-04-25 12:06:59 +03:00
virvar cc8d92193a Return status view
Former-commit-id: b4c9c72481
2016-04-25 12:05:54 +03:00
Roman Volosovskyi 46ed492a49 msg-id must be string
Former-commit-id: a6072e4c82
2016-04-25 11:45:51 +03:00
Roman Volosovskyi 87465e7599 check for string message
Former-commit-id: 0187bc7bce
2016-04-25 11:36:37 +03:00
Roman Volosovskyi ef3668044b fix command as non-command
Former-commit-id: d1bc2196fa
2016-04-25 11:27:30 +03:00
Adrian Tiberius 66b1495e2d implemented carousel component
Former-commit-id: 0c88c0556e
2016-04-24 15:22:24 +03:00
virvar 72550083f9 Hide status message
Former-commit-id: cd3c6e93c9
2016-04-23 23:59:48 +03:00
Jarrad Hope b522302ee8 fix android-geth dependency
Former-commit-id: 0bd8ff367f
2016-04-22 23:03:56 +07:00
Adrian Tiberius 16b71a38f0 code cleaning
Former-commit-id: 78e01fb227
2016-04-22 18:32:42 +03:00
virvar d532cd8c90 Contact list item design
Former-commit-id: 0633c7912d
2016-04-22 17:10:09 +03:00
virvar f8538e53d7 Hide chat icon for group chat
Former-commit-id: 35937c72a0
2016-04-22 16:00:37 +03:00
virvar f0a6fc87e7 Chat status design
Former-commit-id: 9a84baf131
2016-04-22 13:51:14 +03:00
virvar ee48da2797 Remove temp
Former-commit-id: 2a9d6df8d9
2016-04-22 12:40:44 +03:00
virvar 32852ac6ca Start New group view design
Former-commit-id: 0025d55b05
2016-04-21 23:08:07 +03:00
virvar dd50fe0846 Merge
Former-commit-id: 4016767f17
2016-04-21 22:12:33 +03:00
virvar 4bf21fc42c Send staged commands
Former-commit-id: 3cde44c5cc
2016-04-21 15:33:53 +03:00
virvar 7064c2bbd3 Stage command
Former-commit-id: 6f1b183fb1
2016-04-21 14:19:24 +03:00
virvar 6be9a83f5b Command input
Former-commit-id: 98e03d1ba9
2016-04-21 10:31:06 +03:00
virvar 5b431d3a24 Group chat design
Former-commit-id: e6b22cd2e4
2016-04-19 16:44:56 +03:00
virvar 353dd02ce8 Dismiss keyboard on send
Former-commit-id: 9f1c71c451
2016-04-19 11:07:07 +03:00
virvar bb6d36256d Toolbar style. 'Send' button.
Former-commit-id: 173752ea2c
2016-04-18 17:31:25 +03:00
Adrian Tiberius abd85809ed added missing require
Former-commit-id: 78cd61041b
2016-04-17 19:44:59 +03:00
Adrian Tiberius d07937feda fixed realm db usage in listview
Former-commit-id: 9a4b8e8b94
2016-04-17 16:49:35 +03:00
virvar 1667cb85a6 Chats view design
Former-commit-id: 55f90dc040
2016-04-16 00:23:08 +03:00
virvar b88b330ec8 Chat view design
Former-commit-id: 256c639cf3
2016-04-15 18:04:03 +03:00
virvar bd44680981 Change font
Former-commit-id: d02af8907d
2016-04-15 14:33:14 +03:00
virvar 37d7249170 Start chat design
Former-commit-id: 6f95b37db1
2016-04-15 12:58:13 +03:00
virvar 48e67fc0f6 Start remote commands
Former-commit-id: 223d3ad0b6
2016-04-14 12:49:50 +03:00
michaelr a31231554e participant left group
Former-commit-id: 4964542146
2016-04-11 23:14:14 +03:00
michaelr e28add5118 removed from chat & leave chat
Former-commit-id: dd4f55e11f
2016-04-11 23:14:14 +03:00
michaelr 16bf960e3c participant removed from chat
Former-commit-id: 2da99899cc
2016-04-11 23:14:14 +03:00
michaelr d0b8b20ca9 remove participants
Former-commit-id: b8ace7d0ce
2016-04-11 23:14:14 +03:00
michaelr 7db7f9be5d participant added to chat
Former-commit-id: 16f00678fa
2016-04-11 23:14:13 +03:00
michaelr b2d5321104 add participant to group chat
Former-commit-id: 19547048c3
2016-04-11 23:14:13 +03:00
virvar 763eb979b8 Can response to request message by clicking on message only
Former-commit-id: 6840460ba9
2016-04-08 20:08:40 +03:00
virvar 0aa30d8f90 Handle command input call message
Former-commit-id: c1dd4a9ab9
2016-04-08 18:43:09 +03:00
virvar 57fd77eb6b Tap on bubble to enable command input
Former-commit-id: 5e38d5589a
2016-04-08 18:26:58 +03:00
virvar 449ac4fc2d Merge with master
Former-commit-id: 49a5b82a8c
2016-04-08 12:40:51 +03:00
virvar 628827fbdd Show console chat on first run
Former-commit-id: e04a6eec4f
2016-04-08 12:17:10 +03:00
Adrian Tiberius 0f1891f6b0 Added discover screen - part 2
Former-commit-id: 14523c6e18
2016-04-08 04:21:07 +03:00
Adrian Tiberius 4a7bb83f18 Added discover screen
Former-commit-id: 376241fe38
2016-04-08 04:15:32 +03:00
virvar e40439000e Handle only last requested command
Former-commit-id: c08acdf24a
2016-04-07 20:50:53 +03:00
michaelr c1144e1d68 handle group chat invite acks
Former-commit-id: ad4401a42e
2016-04-07 14:01:41 +03:00
virvar a2f50fc904 Delete old sign up forms
Former-commit-id: 2c8cfa8212
2016-04-07 13:28:02 +03:00
virvar c884a17bb1 Send confirmation code. Synchronize contacts.
Former-commit-id: d5c7c9b768
2016-04-07 13:24:02 +03:00
virvar 872dd9a56d Send phone-number to server
Former-commit-id: f592babca8
2016-04-06 18:24:11 +03:00
virvar 756b682d68 Add select command button
Former-commit-id: a530cbbb65
2016-04-06 16:52:05 +03:00
michaelr bb6240d4e8 each chat participant gets his own color
Former-commit-id: 3fe4f44c04
2016-04-06 16:16:09 +03:00
virvar 2d7ae7c478 Move message and command input text to state
Former-commit-id: b27fdfe96c
2016-04-05 17:00:49 +03:00
michaelr e143760b4a put autofocus back
Former-commit-id: 7db3571508
2016-04-04 19:51:53 +03:00
michaelr 78551e0e8d remove useless block
Former-commit-id: 4ae0236cd0
2016-04-04 19:42:56 +03:00
michaelr 4ea142dd43 fixed chat-id in new msg is null
Former-commit-id: cca9868af9
2016-04-04 19:29:54 +03:00
michaelr d54d6555a4 moved re-frame app to root folder
Former-commit-id: 5a3b923b0c
2016-04-04 19:21:10 +03:00
michaelr 95817924d6 changed navigation method, send new message
Former-commit-id: 77cae2cc42
2016-03-23 12:46:41 +02:00
michaelr 0b6cb78336 bring messages to chat view
Former-commit-id: ef26278908
2016-03-22 12:59:41 +02:00
virvar fb4e8e0bdd Fix back button navigation
Former-commit-id: f32547aaf8
2016-03-21 18:17:10 +03:00
virvar b69ddbe651 Move contact list to components
Former-commit-id: 7c9e8f6105
2016-03-21 16:01:20 +03:00
virvar ff91912a7a Loading spinner for sign up confirmation view
Former-commit-id: 81b1d6440a
2016-03-21 15:27:50 +03:00
virvar 1595b0b00c Delete database.cljs
Former-commit-id: c95ecf5363
2016-03-21 15:20:11 +03:00
virvar 4a49dac6cd Use phone's locale for phone number internationalization
Former-commit-id: b21b4ecc1a
2016-03-21 13:53:21 +03:00
michaelr 00c5019dc4 refactored chat component
Former-commit-id: f8a5237f44
2016-03-20 15:00:10 +02:00
michaelr cf4d2e45f5 fix loaded identity string instead of map
Former-commit-id: ca2fa03e3d
2016-03-20 13:56:41 +02:00
virvar c471190c1f Merge
Former-commit-id: 6d2ac3a99b
2016-03-19 12:33:00 +03:00
virvar 05b2966422 User identity load on first run
Former-commit-id: 6c6a4df339
2016-03-19 11:53:09 +03:00
michaelr 90455334c9 encrypt stored identity with password, beginning of msg store
Former-commit-id: a079f00186
2016-03-18 17:12:53 +02:00
virvar 6f2863eae0 Components
Former-commit-id: 0da2757450
2016-03-18 16:29:33 +03:00
virvar 3eb242c539 Use 'current-identity'
Former-commit-id: 797fe3336b
2016-03-18 16:15:03 +03:00
virvar 17065e0f9a Fix contacts sync
Former-commit-id: fcba2679f4
2016-03-18 12:53:13 +03:00
virvar d2aabc81c9 Add loading spinner
Former-commit-id: b10b44988c
2016-03-17 23:48:52 +03:00
michaelr b27e47a91f fixed, get would fail when key doesn't exist
Former-commit-id: 83ab6ad3ef
2016-03-17 21:32:59 +02:00
michaelr 85f7a08380 kv store implementation over realm
Former-commit-id: 95d0f566d7
2016-03-17 20:15:24 +02:00
michaelr 62642eadc1 fixed wrong namespace
Former-commit-id: 3692c64632
2016-03-17 19:34:22 +02:00
michaelr ba87aa9f1d wip protocol integration
Former-commit-id: 2b6fdaa4e6
2016-03-17 19:25:36 +02:00
virvar b4852df7f8 Microrefactoring
Former-commit-id: 33348727a8
2016-03-17 10:25:20 +03:00
virvar 9f249a1da9 Sign up confirmation view refactoring
Former-commit-id: 3f145c2059
2016-03-16 14:42:00 +03:00
virvar ef5c7779fc Login view refactoring
Former-commit-id: 703c6f2d5f
2016-03-16 00:42:23 +03:00
michaelr 5fd20b602f remove redundunt call
Former-commit-id: 97eee14a45
2016-03-15 14:01:45 +02:00
michaelr 0f7f54a8b9 new code structure
Former-commit-id: ea89f9ab2d
2016-03-15 13:28:48 +02:00
virvar fdb3aafdef Show syng contacts
Former-commit-id: 20edaf4aba
2016-03-14 14:59:52 +03:00
michaelr 5ed5e91e2d removed redundant deps and changes protocol version to latest
Former-commit-id: b9a6253357
2016-03-14 00:29:07 +02:00
virvar 3811efeb5e Save whisper identities to db
Former-commit-id: 1a7d089ddc
2016-03-11 19:04:12 +03:00
virvar a3b2590982 Receive whisper identities
Former-commit-id: 7cf1b5b0b9
2016-03-10 22:31:43 +03:00
virvar f62c2fab9a Encrypt contacts to send
Former-commit-id: 56f249e9fb
2016-03-09 17:08:07 +03:00
virvar c5a8f41ffa Send request to server
Former-commit-id: fa6e8c913a
2016-03-08 17:45:24 +03:00
virvar 98cef3b84d Add confirmation code view
Former-commit-id: 681adafdcb
2016-03-07 21:19:26 +03:00
virvar 577cf4e93c Setup cljsjs/web dependency
Former-commit-id: 8d7a57e6d4
2016-03-07 20:00:30 +03:00
virvar 93848fd255 Use syng-im/protocol to get whisper identity
Former-commit-id: 119c613f8a
2016-03-07 11:09:41 +03:00
virvar fe21a4f25f Add web3
Former-commit-id: 22310a3ee8
2016-03-04 20:28:06 +03:00
virvar 76fcd5c3f7 User phone number input view
Former-commit-id: 68ae5ce5a9
2016-03-04 00:20:37 +03:00
virvar 7043f0526f Actionbar shaders
Former-commit-id: 80a119e2d8
2016-02-26 18:35:55 +03:00
virvar 152787d5c6 Colors
Former-commit-id: a4a8b888a5
2016-02-26 18:22:54 +03:00
virvar ada19a9598 Chat view design
Former-commit-id: 22cda3f0fb
2016-02-26 16:18:46 +03:00
virvar 5cd48e241a Messages scroll direction
Former-commit-id: 995738ba19
2016-02-26 12:22:25 +03:00
virvar 8fa81ec0ff Begin Chat view
Former-commit-id: 280aa6881b
2016-02-25 20:55:22 +03:00
virvar 0ed10176b2 Navigation
Former-commit-id: 50beafc5a2
2016-02-25 19:21:08 +03:00
virvar 4adbc18dab Fix
Former-commit-id: 29eab3bbb8
2016-02-24 23:53:12 +03:00
virvar 4e0d6c2883 Refactoring
Former-commit-id: df94cba083
2016-02-24 19:15:06 +03:00
virvar 8766b15d36 Add font
Former-commit-id: bf31fed4ea
2016-02-24 16:05:21 +03:00
virvar c2093b64e9 Shadows for android 5.0+
Former-commit-id: 19206d0ddd
2016-02-23 23:27:34 +03:00
virvar 7c6e7c644a Initial 2016-02-23 01:04:42 +03:00