Commit Graph

530 Commits

Author SHA1 Message Date
virvar 69b0dbdb8d Fix group chat 2016-05-17 13:26:20 +03:00
virvar 1059c47826 Group settings handler/sub 2016-05-16 19:38:35 +03:00
virvar 977b010a07 Merge develop to group-chat-settings 2016-05-16 19:24:17 +03:00
Roman Volosovskyi c2b4a1ec33 fix giant 'type' 2016-05-16 16:04:07 +03:00
Roman Volosovskyi 5f0862e3b7 discoveries toolbar 2016-05-16 15:50:06 +03:00
Roman Volosovskyi 739ca7cb1b empty sections 2016-05-16 15:38:27 +03:00
virvar 1fe23fe57c 'Clear history', 'Leave chat' handlers 2016-05-16 15:36:52 +03:00
Roman Volosovskyi 1977d29b72 profiles/drawer structure 2016-05-16 14:38:07 +03:00
Roman Volosovskyi c833764e22 content-suggestions 2016-05-16 14:05:43 +03:00
virvar 14e69f9369 Chat color 2016-05-16 13:47:34 +03:00
Roman Volosovskyi ac4548f63b drawer 2016-05-16 13:40:43 +03:00
Roman Volosovskyi 473604d859 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
2016-05-16 12:31:08 +03:00
Roman Volosovskyi af0ed4c3a9 start chat with contact 2016-05-16 10:45:59 +03:00
Roman Volosovskyi 780b12049e defview suggestion 2016-05-14 12:39:01 +03:00
Roman Volosovskyi 85e05a451d replace to-datasource2 2016-05-13 19:03:14 +03:00
Roman Volosovskyi f484b190fd remove to-realm-datasource 2016-05-13 18:56:52 +03:00
virvar bf6c419c5d Chat name edit form. Fix styles. 2016-05-13 18:03:45 +03:00
Roman Volosovskyi c27fddfe18 move discoveries model 2016-05-13 17:34:04 +03:00
Roman Volosovskyi c62feb0159 some missed styles 2016-05-13 16:58:14 +03:00
Roman Volosovskyi 83e4c584cb tag screen 2016-05-13 16:52:42 +03:00
Roman Volosovskyi 74249dc717 discoveries order 2016-05-13 15:52:02 +03:00
virvar 6b54767b98 Group settings refactoring 2016-05-13 15:15:40 +03:00
Roman Volosovskyi 748abd40e4 discoveries 2016-05-13 14:58:58 +03:00
virvar b2737d42f7 Add/remove group chat members 2016-05-13 14:17:03 +03:00
Adrian Tiberius 897ee3dcd6 fixed discovery tag navigation 2016-05-12 23:46:17 +03:00
Adrian Tiberius 1fd3f86e23 added tabs component 2016-05-12 22:47:32 +03:00
virvar 5283256804 Group settings to new structure 2016-05-12 16:31:27 +03:00
virvar 344f64b9f2 Group settings members 2016-05-12 15:32:40 +03:00
virvar 240569434c Group settings styles 2016-05-12 14:15:09 +03:00
virvar 14be588ca2 Read/save group chat settings 2016-05-12 13:26:13 +03:00
Roman Volosovskyi 73d3fdb3e6 contacts handlers 2016-05-12 12:56:47 +03:00
Roman Volosovskyi c5c71691c3 contacts styles 2016-05-11 16:06:37 +03:00
virvar 13205348ed Merge branch 'develop' into my-profile 2016-05-11 15:49:05 +03:00
Jarrad 3d8adf840e Merge pull request #64 from status-im/commands-button
Commands button. Phone number validation. Drawer and Profile views.
2016-05-11 14:42:12 +02:00
Roman Volosovskyi bb0a6c848f chats-list screen styles 2016-05-11 14:58:03 +03:00
Roman Volosovskyi 0b3469cd64 chats-list & new-group views/styles 2016-05-11 14:47:40 +03:00
virvar 249ea85201 Profile menu item of chat view 2016-05-11 14:37:31 +03:00
virvar 0e2cd2f653 Chat view toolbar refactoring 2016-05-11 14:36:40 +03:00
virvar 3dfc461924 Add my profile view 2016-05-11 13:05:33 +03:00
virvar 3264bbfac9 Microrefactoring 2016-05-11 10:42:04 +03:00
virvar c89f2820aa Fix back navigation. Add 'discovery' drawer item. 2016-05-11 10:36:13 +03:00
Roman Volosovskyi eae67bd400 Merge branch 'develop' into structure 2016-05-10 19:07:58 +03:00
Roman Volosovskyi f1584b8342 contacts screen/views 2016-05-10 19:06:36 +03:00
Roman Volosovskyi 544571e3a7 remove chat model 2016-05-10 17:40:21 +03:00
Adrian Tiberius 5fe774faee replace avatar placeholder in discovery and remove unused image resources 2016-05-10 17:39:52 +03:00
virvar 6f2acb0f65 Merge with 'develop' 2016-05-10 16:39:09 +03:00
virvar 6f5dade40f Suggestions style. Add close commands button. 2016-05-10 16:16:07 +03:00
Roman Volosovskyi bc494dcacd Merge branch 'develop' into structure 2016-05-10 15:32:47 +03:00
Roman Volosovskyi 38161d9e10 more navigation handlers 2016-05-10 15:25:36 +03:00
Jarrad bda5ce32ab Merge pull request #58 from status-im/feature-discover
Feature discover
2016-05-10 13:21:58 +02:00
Roman Volosovskyi f429a15be8 chat & navigation handlers/subs 2016-05-10 13:58:37 +03:00
virvar 6bbd5bf92d Start command input on button click 2016-05-10 13:12:49 +03:00
virvar 8324cf4109 Set signed-up at init db 2016-05-10 12:31:48 +03:00
virvar ee7de39274 Fix navigation. Change image to icon. 2016-05-10 11:15:39 +03:00
virvar ee4a4a6f65 Merge with 'develop' 2016-05-10 09:45:59 +03:00
Adrian Tiberius d68e078130 refactored carousel component 2016-05-09 21:22:02 +03:00
Roman Volosovskyi 4b1b5a9449 chat inputs/suggestions/commands 2016-05-09 19:28:40 +03:00
Roman Volosovskyi 410a06c07c Merge branch 'develop' into structure 2016-05-09 18:46:50 +03:00
Roman Volosovskyi 4eac55e756 fix :navigation-stack sub 2016-05-09 18:41:42 +03:00
Roman Volosovskyi 4c4e27267a fix :chat-properties 2016-05-09 18:39:10 +03:00
Roman Volosovskyi 6932f1c103 chat's views & styles 2016-05-09 18:17:40 +03:00
virvar 4e7bdd4742 Fixes 2016-05-09 17:33:41 +03:00
virvar 03d719edaf Merge with develop 2016-05-09 17:30:01 +03:00
Adrian Tiberius 96957039c3 merge develop 2016-05-09 16:58:03 +03:00
Adrian Tiberius 5b6c077b66 merge develop 2016-05-09 16:40:45 +03:00
Roman Volosovskyi 867e5392ad chat inputs styles 2016-05-09 15:44:06 +03:00
virvar 509748888f Remove extra :style 2016-05-09 15:41:51 +03:00
virvar 6eeaab5c28 Show suggestions as hint for phone number format 2016-05-09 15:29:08 +03:00
Roman Volosovskyi ede2ca40ee Merge branch 'refactoring-rebase' into styles 2016-05-09 14:11:08 +03:00
Roman Volosovskyi ab5f3e3c6d Merge branch 'develop' into refactoring-rebase 2016-05-09 14:05:20 +03:00
Roman Volosovskyi 7019d7033f chat elements styles 2016-05-09 13:59:55 +03:00
virvar 152626da18 Validate phone number 2016-05-09 12:26:42 +03:00
virvar 252452f5b0 'Message' button on profile view 2016-05-09 10:28:29 +03:00
virvar 547c9031be Profile and Drawer styles refactoring 2016-05-09 10:07:54 +03:00
Roman Volosovskyi 060a6d40d1 fix typo & postfixes 2016-05-08 23:14:03 +03:00
Roman Volosovskyi 27302d9027 chat message styles 2016-05-08 23:06:38 +03:00
Adrian Tiberius 2f11811d55 moved handlers and subs to component folder 2016-05-07 18:04:19 +03:00
Adrian Tiberius 3976ea6c70 moved styles to separate file 2016-05-07 17:53:39 +03:00
Roman Volosovskyi 1ce4c1d459 styles 2016-05-07 16:39:03 +03:00
Adrian Tiberius d009f038e5 Revert figwheel-bridge.js. Applied suggestions. 2016-05-07 15:13:03 +03:00
Adrian Tiberius 4eaeb4c477 add scroll threshold to carousel 2016-05-07 12:58:06 +03:00
Roman Volosovskyi 4b41ff8507 rename subscribers folder 2016-05-07 12:15:48 +03:00
virvar e4e9bcfc1a Show contact profile from chat menu. Fix chat creation. 2016-05-06 17:12:24 +03:00
Roman Volosovskyi 357249a49b same-author/direction 2016-05-06 16:11:45 +03:00
Roman Volosovskyi 827a354c1e same-author/direction 2016-05-06 15:17:17 +03:00
virvar 9ec8f70cfe Close drawer on 'switch users' click 2016-05-06 14:37:57 +03:00
Roman Volosovskyi 9548dd23ee background color 2016-05-06 14:30:34 +03:00
virvar 7ddd90e2dc Fix profile styles 2016-05-06 14:25:29 +03:00
Roman Volosovskyi 319bb656ec refactoring 2016-05-06 14:06:58 +03:00
virvar b76a3d4afd Fix drawer styles. Rename 2016-05-06 11:49:51 +03:00
Adrian Tiberius c11da58c50 replaced android toolbar with new custom toolbar 2016-05-05 18:04:17 +03:00
virvar 55dc64f6e6 Add drawer 2016-05-05 17:03:34 +03:00
Adrian Tiberius 2c9174af63 merged develop branch 2016-05-05 16:33:48 +03:00
Adrian Tiberius 69df1ad3ef added discover tag screen 2016-05-05 15:55:11 +03:00
Adrian Tiberius 36db3b8374 fix empty section header warning 2016-05-05 14:40:40 +03:00
virvar f06cdee11b Merge with 'design' 2016-05-05 13:30:12 +03:00
virvar 161356928c Custom toolbar refactoring 2016-05-04 15:13:31 +03:00
virvar cadf1b2a0b Custom toolbar for group chat views 2016-05-04 14:35:35 +03:00
virvar 902daf3963 Toolbar for contacts view 2016-05-03 17:17:52 +03:00
virvar bbaff31570 Delete unnecessary view nesting 2016-05-03 16:47:36 +03:00
virvar ac11508703 Menu items icons. Hide actions menu on click outside. 2016-05-03 16:39:08 +03:00
Adrian Tiberius f402fc9b6e fixed discovery screen design styles 2016-05-03 16:00:44 +03:00
Jarrad e4c6f6d531 Merge pull request #47 from status-im/protocol-integration-bugfixes
Protocol integration bugfixes
2016-05-03 12:01:25 +02:00
virvar 1b3c788ec7 Start custom toolbar 2016-05-02 16:56:42 +03:00
virvar b65c71bbb5 Revert
This reverts commit 71cb0fde6c.
2016-05-02 13:56:25 +03:00
virvar c81b0dfc8c Store last chat msg id in chat entity 2016-05-02 13:43:13 +03:00
Adrian Tiberius 5aef032c59 cleaned logging and changed it to use utils.logging; splitted carousel to multiple functions 2016-04-30 22:48:30 +03:00
virvar a50c973e92 Save adjacent message info to realm 2016-04-29 22:55:54 +03:00
virvar 7fb2d74003 Add status message on open empty chat. Add last chat message to db. Fix 'typing' view. Fix chat background. 2016-04-29 22:38:19 +03:00
virvar 71cb0fde6c Add status message on open empty chat. Add last chat message to db. Fix 'typing' view. Fix chat background. 2016-04-29 22:34:33 +03:00
michaelr a555c57bcc improved system messages for edge cases 2016-04-29 16:24:03 +03:00
virvar 84cfddb3e8 Fix invertible scrollview scrolling 2016-04-29 13:36:30 +03:00
michaelr 8f04104cc0 remove participants colors, re-join chat, update contacts instead of remove 2016-04-29 02:06:15 +03:00
virvar 953bc66223 Fix chat view indents 2016-04-28 16:53:41 +03:00
michaelr dbfbd18eaf idempotent joined chat msg 2016-04-28 14:37:33 +03:00
Adrian Tiberius a87ed22db8 merge master 2016-04-28 04:12:30 +03:00
Adrian Tiberius 71aef771d8 code cleaning 2016-04-28 03:33:58 +03:00
Adrian Tiberius ca656906c1 linked discovery search to status change for testing and updated react-native 2016-04-28 01:03:24 +03:00
virvar b28076f5b8 Fix message text input position 2016-04-26 16:35:48 +03:00
virvar fbc001fcb9 Use phone contacts instead of fake 2016-04-26 14:07:56 +03:00
Roman Volosovskyi 529148c101 lein-kibit suggestions 2016-04-26 12:42:08 +03:00
Jarrad c45ffd49d6 Merge pull request #37 from status-im/icons_resolution
Fix Icons resolution #25
2016-04-26 12:51:19 +07:00
virvar d9bc6f55f5 Delete obsolete icons 2016-04-25 20:48:01 +03:00
virvar 7ee1625b31 Merge branch 'design' into icons_resolution 2016-04-25 20:33:40 +03:00
virvar 81751b294b Fix #25 Low resolution icons 2016-04-25 20:32:43 +03:00
Roman Volosovskyi a41db711d0 :underlay-color for touchable-highlight component 2016-04-25 18:11:42 +03:00
Roman Volosovskyi 8f7e1d6aa5 fix #24 black 'hit' states on button 2016-04-25 18:04:28 +03:00
Jarrad 393dd19704 Merge pull request #19 from status-im/command-as-non-command
fix command as non-command
2016-04-25 18:16:11 +07:00
virvar 6c40a2dac4 Fix #23 Grey area between staging and text input 2016-04-25 13:21:46 +03:00
virvar 55396a20c4 Fix #27 Confirmation code should be number input 2016-04-25 12:25:33 +03:00
virvar 94660fb812 Fix #22 Confirmation code stops after first try 2016-04-25 12:06:59 +03:00
virvar b4c9c72481 Return status view 2016-04-25 12:05:54 +03:00
Roman Volosovskyi a6072e4c82 msg-id must be string 2016-04-25 11:45:51 +03:00
Roman Volosovskyi 0187bc7bce check for string message 2016-04-25 11:36:37 +03:00
Roman Volosovskyi d1bc2196fa fix command as non-command 2016-04-25 11:27:30 +03:00
Adrian Tiberius 0c88c0556e implemented carousel component 2016-04-24 15:22:24 +03:00
virvar cd3c6e93c9 Hide status message 2016-04-23 23:59:48 +03:00
Jarrad Hope 0bd8ff367f fix android-geth dependency 2016-04-22 23:03:56 +07:00
Adrian Tiberius 78e01fb227 code cleaning 2016-04-22 18:32:42 +03:00
virvar 0633c7912d Contact list item design 2016-04-22 17:10:09 +03:00
virvar 35937c72a0 Hide chat icon for group chat 2016-04-22 16:00:37 +03:00
virvar 9a84baf131 Chat status design 2016-04-22 13:51:14 +03:00
virvar 2a9d6df8d9 Remove temp 2016-04-22 12:40:44 +03:00
virvar 0025d55b05 Start New group view design 2016-04-21 23:08:07 +03:00
virvar 4016767f17 Merge 2016-04-21 22:12:33 +03:00
virvar 3cde44c5cc Send staged commands 2016-04-21 15:33:53 +03:00
virvar 6f1b183fb1 Stage command 2016-04-21 14:19:24 +03:00
virvar 98e03d1ba9 Command input 2016-04-21 10:31:06 +03:00
virvar e6b22cd2e4 Group chat design 2016-04-19 16:44:56 +03:00
virvar 9f1c71c451 Dismiss keyboard on send 2016-04-19 11:07:07 +03:00
virvar 173752ea2c Toolbar style. 'Send' button. 2016-04-18 17:31:25 +03:00
Adrian Tiberius 78cd61041b added missing require 2016-04-17 19:44:59 +03:00
Adrian Tiberius 9a4b8e8b94 fixed realm db usage in listview 2016-04-17 16:49:35 +03:00
virvar 55f90dc040 Chats view design 2016-04-16 00:23:08 +03:00
virvar 256c639cf3 Chat view design 2016-04-15 18:04:03 +03:00
virvar d02af8907d Change font 2016-04-15 14:33:14 +03:00
virvar 6f95b37db1 Start chat design 2016-04-15 12:58:13 +03:00
virvar 223d3ad0b6 Start remote commands 2016-04-14 12:49:50 +03:00
michaelr 4964542146 participant left group 2016-04-11 23:14:14 +03:00
michaelr dd4f55e11f removed from chat & leave chat 2016-04-11 23:14:14 +03:00
michaelr 2da99899cc participant removed from chat 2016-04-11 23:14:14 +03:00
michaelr b8ace7d0ce remove participants 2016-04-11 23:14:14 +03:00
michaelr 16f00678fa participant added to chat 2016-04-11 23:14:13 +03:00
michaelr 19547048c3 add participant to group chat 2016-04-11 23:14:13 +03:00
virvar 6840460ba9 Can response to request message by clicking on message only 2016-04-08 20:08:40 +03:00
virvar c1dd4a9ab9 Handle command input call message 2016-04-08 18:43:09 +03:00
virvar 5e38d5589a Tap on bubble to enable command input 2016-04-08 18:26:58 +03:00
virvar 49a5b82a8c Merge with master 2016-04-08 12:40:51 +03:00
virvar e04a6eec4f Show console chat on first run 2016-04-08 12:17:10 +03:00
Adrian Tiberius 14523c6e18 Added discover screen - part 2 2016-04-08 04:21:07 +03:00
Adrian Tiberius 376241fe38 Added discover screen 2016-04-08 04:15:32 +03:00
virvar c08acdf24a Handle only last requested command 2016-04-07 20:50:53 +03:00
michaelr ad4401a42e handle group chat invite acks 2016-04-07 14:01:41 +03:00
virvar 2c8cfa8212 Delete old sign up forms 2016-04-07 13:28:02 +03:00
virvar d5c7c9b768 Send confirmation code. Synchronize contacts. 2016-04-07 13:24:02 +03:00
virvar f592babca8 Send phone-number to server 2016-04-06 18:24:11 +03:00
virvar a530cbbb65 Add select command button 2016-04-06 16:52:05 +03:00
michaelr 3fe4f44c04 each chat participant gets his own color 2016-04-06 16:16:09 +03:00
virvar b27fdfe96c Move message and command input text to state 2016-04-05 17:00:49 +03:00
michaelr 7db3571508 put autofocus back 2016-04-04 19:51:53 +03:00
michaelr 4ae0236cd0 remove useless block 2016-04-04 19:42:56 +03:00
michaelr cca9868af9 fixed chat-id in new msg is null 2016-04-04 19:29:54 +03:00
michaelr 5a3b923b0c moved re-frame app to root folder 2016-04-04 19:21:10 +03:00
michaelr 77cae2cc42 changed navigation method, send new message 2016-03-23 12:46:41 +02:00
michaelr ef26278908 bring messages to chat view 2016-03-22 12:59:41 +02:00
virvar f32547aaf8 Fix back button navigation 2016-03-21 18:17:10 +03:00
virvar 7c9e8f6105 Move contact list to components 2016-03-21 16:01:20 +03:00
virvar 81b1d6440a Loading spinner for sign up confirmation view 2016-03-21 15:27:50 +03:00
virvar c95ecf5363 Delete database.cljs 2016-03-21 15:20:11 +03:00
virvar b21b4ecc1a Use phone's locale for phone number internationalization 2016-03-21 13:53:21 +03:00
michaelr f8a5237f44 refactored chat component 2016-03-20 15:00:10 +02:00
michaelr ca2fa03e3d fix loaded identity string instead of map 2016-03-20 13:56:41 +02:00
virvar 6d2ac3a99b Merge 2016-03-19 12:33:00 +03:00
virvar 6c6a4df339 User identity load on first run 2016-03-19 11:53:09 +03:00
michaelr a079f00186 encrypt stored identity with password, beginning of msg store 2016-03-18 17:12:53 +02:00
virvar 0da2757450 Components 2016-03-18 16:29:33 +03:00
virvar 797fe3336b Use 'current-identity' 2016-03-18 16:15:03 +03:00
virvar fcba2679f4 Fix contacts sync 2016-03-18 12:53:13 +03:00
virvar b10b44988c Add loading spinner 2016-03-17 23:48:52 +03:00
michaelr 83ab6ad3ef fixed, get would fail when key doesn't exist 2016-03-17 21:32:59 +02:00
michaelr 95d0f566d7 kv store implementation over realm 2016-03-17 20:15:24 +02:00
michaelr 3692c64632 fixed wrong namespace 2016-03-17 19:34:22 +02:00
michaelr 2b6fdaa4e6 wip protocol integration 2016-03-17 19:25:36 +02:00
virvar 33348727a8 Microrefactoring 2016-03-17 10:25:20 +03:00
virvar 3f145c2059 Sign up confirmation view refactoring 2016-03-16 14:42:00 +03:00
virvar 703c6f2d5f Login view refactoring 2016-03-16 00:42:23 +03:00
michaelr 97eee14a45 remove redundunt call 2016-03-15 14:01:45 +02:00
michaelr ea89f9ab2d new code structure 2016-03-15 13:28:48 +02:00
virvar 20edaf4aba Show syng contacts 2016-03-14 14:59:52 +03:00
michaelr b9a6253357 removed redundant deps and changes protocol version to latest 2016-03-14 00:29:07 +02:00
virvar 1a7d089ddc Save whisper identities to db 2016-03-11 19:04:12 +03:00
virvar 7cf1b5b0b9 Receive whisper identities 2016-03-10 22:31:43 +03:00
virvar 56f249e9fb Encrypt contacts to send 2016-03-09 17:08:07 +03:00
virvar fa6e8c913a Send request to server 2016-03-08 17:45:24 +03:00
virvar 681adafdcb Add confirmation code view 2016-03-07 21:19:26 +03:00
virvar 8d7a57e6d4 Setup cljsjs/web dependency 2016-03-07 20:00:30 +03:00
virvar 119c613f8a Use syng-im/protocol to get whisper identity 2016-03-07 11:09:41 +03:00
virvar 22310a3ee8 Add web3 2016-03-04 20:28:06 +03:00
virvar 68ae5ce5a9 User phone number input view 2016-03-04 00:20:37 +03:00
virvar 80a119e2d8 Actionbar shaders 2016-02-26 18:35:55 +03:00
virvar a4a8b888a5 Colors 2016-02-26 18:22:54 +03:00
virvar 22cda3f0fb Chat view design 2016-02-26 16:18:46 +03:00
virvar 995738ba19 Messages scroll direction 2016-02-26 12:22:25 +03:00
virvar 280aa6881b Begin Chat view 2016-02-25 20:55:22 +03:00
virvar 50beafc5a2 Navigation 2016-02-25 19:21:08 +03:00
virvar 29eab3bbb8 Fix 2016-02-24 23:53:12 +03:00
virvar df94cba083 Refactoring 2016-02-24 19:15:06 +03:00
virvar bf31fed4ea Add font 2016-02-24 16:05:21 +03:00
virvar 19206d0ddd Shadows for android 5.0+ 2016-02-23 23:27:34 +03:00
virvar 7c6e7c644a Initial 2016-02-23 01:04:42 +03:00