4222 Commits
Author SHA1 Message Date
nixzhu 60df247e15 better cell configure for FeedConversation 2015-11-16 18:17:22 +08:00
nixzhu 297b02bb3a reduce flicker in Feeds, cell configure when display 2015-11-16 17:09:29 +08:00
nixzhu 9e98c993c7 do not dismiss until showFinished 2015-11-16 17:00:53 +08:00
nixzhu e4f179c234 animation detail 2015-11-16 16:50:20 +08:00
nixzhu f1e7820c4a recover transitionView.alpha first; delay move previewImageView to show mediasCollectionView 2015-11-16 16:28:41 +08:00
nixzhu 986ff7a21b use FeedMedia.backgroundColor; avoid FeedMediaCell's imageView have default image to preview 2015-11-16 15:56:02 +08:00
nixzhu a46ab7a48e in NewFeed, make sure dismiss keyboard when begin add photos; make sure when presenting alert, do not show keyboard 2015-11-16 15:21:08 +08:00
nixzhu b11c77c1fc better nicknameLabel layout for FeedCell 2015-11-16 15:00:47 +08:00
nixzhu b8b4eee9c1 fix nicknameLabel's width in FeedView 2015-11-16 14:46:54 +08:00
nixzhu 5d88536be9 Merge branch 'feature/media_played' into develop 2015-11-16 14:39:27 +08:00
nixzhu 484140e81e record mediaPlayed when preview message 2015-11-16 14:38:49 +08:00
nixzhu f58a00db68 try play nextUnplayedAudioMessage after current audio message 2015-11-16 14:28:54 +08:00
nixzhu 60b4035504 mark message.mediaPlayed when playAudioWithMessage 2015-11-16 14:18:33 +08:00
nixzhu f4556d114c add mediaPlayed to Message 2015-11-16 14:12:02 +08:00
nixzhu bb995442c6 rename shared_stuff 2015-11-16 13:51:28 +08:00
nixzhu cc7d824e2f update pod Proposer; turnOn updating location in Conversations if isAuthorized 2015-11-16 13:44:43 +08:00
nixzhu 7ff0fd0425 Merge branch 'feature/v2API' into develop 2015-11-16 13:14:54 +08:00
nixzhu 4453dae452 new logic for create DiscoveredFeed ( <topic> may not have circle in v2 ) 2015-11-16 13:09:16 +08:00
nixzhu bacb5687cd better logic for update location in ProfileHeaderCell, use afterUpdatedLocationAction in YepLocationService; better isMe 2015-11-16 10:42:28 +08:00
nixzhu 9cb96547df use new delegate method for YepLocationService to update location (the last one was deprecated, oldLocation may <uninitialized>)
(lldb) po oldLocation
 <uninitialized>
(lldb) po newLocation
<+23.12230461,+113.31453244> +/- 72.60m (speed -1.00 mps / course -1.00) @ 15/11/16 中国标准时间 10:11:12
2015-11-16 10:29:54 +08:00
nixzhu afcc3c280d all APIs point to /api/v2 2015-11-16 10:01:09 +08:00
nixzhu e73554140b new createFeedWithKind API 2015-11-16 09:28:53 +08:00
nixzhu 2113f066c6 when batchMarkMessagesAsReaded, set conversation.unreadMessagesCount to 0 2015-11-16 09:15:46 +08:00
nixzhu daf8e6d781 use conversation.unreadMessagesCount for badge number in FeedConversationCell 2015-11-16 09:11:23 +08:00
nixzhu 8d9e6b9656 new unreadMessages; save unreadMessagesCount to Conversation 2015-11-16 09:07:05 +08:00
kevinzhow 573c37ec42 make sure music safe 2015-11-14 14:24:24 +08:00
kevinzhow c27557de3b Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-11-14 09:59:58 +08:00
nixzhu 0ac5b3f94f dot in FeedView 2015-11-13 17:51:07 +08:00
nixzhu 522edcf0d8 dot in FeedCell 2015-11-13 17:47:27 +08:00
kevinzhow 69de98949f Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-11-13 16:44:54 +08:00
kevinzhow 1d086a962a Update version 2015-11-13 16:44:35 +08:00
nixzhu aa89a60124 check isAtBottom for MessageToolbarState when show moreMessageTypes 2015-11-13 16:20:54 +08:00
nixzhu 7d020e05b0 new predicate for feedConversations 2015-11-13 15:03:59 +08:00
nixzhu ada5853078 add groupType for Group 2015-11-13 14:57:23 +08:00
kevinzhow b91edb5719 Merge branch 'develop' of https://github.com/CatchChat/Yep into develop 2015-11-13 14:10:53 +08:00
kevinzhow 12ed10362f Update version 2015-11-13 14:10:43 +08:00
nixzhu 84ee1c8e79 when user have 5 skills in DiscoverCardUserCell, the last one show skill name instead of "1 More..." 2015-11-13 11:39:47 +08:00
nixzhu 3ac64ee879 do not delay set mediaPreviewWindow.rootViewController = nil when dismiss Preview (it may cause UI frozen) 2015-11-13 11:25:45 +08:00
nixzhu e24d27ea40 Merge branch 'feature/check_preview' into develop 2015-11-13 10:50:36 +08:00
nixzhu 2838d56cc2 comment some segue 2015-11-13 10:49:47 +08:00
nixzhu 4568f67384 guard image != nil before Preview 2015-11-13 10:44:15 +08:00
nixzhu 124f9a3232 remove newMessagesCountAction, it's not work as expect 2015-11-12 21:02:23 +08:00
nixzhu 097d248bc9 if syncMessages failed, join group and the sync again (reduce join request to server) 2015-11-12 16:33:54 +08:00
nixzhu 99a9b36a0e save read state when recordMessageWithMessageID for reload old messages 2015-11-12 15:18:37 +08:00
nixzhu 5eb94f1bc0 add messageLabelTrailingConstraint, set it's constant with attachments 2015-11-12 12:43:14 +08:00
nixzhu 2b42030cc3 use messageLabel in FeedView for better fold feel 2015-11-12 12:37:34 +08:00
nixzhu bfe2d9f9bd do not change messageToolbar.state when show moreMessageTypesView 2015-11-12 12:13:25 +08:00
nixzhu 4db67babdc use normal activityIndicator (center in avatarImageView) when change avatar in EditProfile 2015-11-12 11:36:04 +08:00
nixzhu f2cdd6a67f not use faye delegate, retest stability of Post Notifications for update in conversation or other vc; we check topViewController in updateConversationCollectionViewWithMessageIDs again; 2015-11-12 09:23:52 +08:00
nixzhu a81345cb0c Merge remote-tracking branch 'origin/develop' into develop 2015-11-12 08:20:00 +08:00