Commit graph

1693 commits

Author SHA1 Message Date
giomfo
3f53daca11 Room Activities view: Reduce view height (44 instead of 50). 2015-12-23 12:29:35 +01:00
manuroe
dec0f76652 Merge pull request #35 from vector-im/segmented_child_viewWillAppear
SegmentedVC: Notify its child on viewWillAppear/viewDidAppear.
2015-12-23 12:29:08 +01:00
manuroe
3f4d44f330 SegmentedVC: Notify its child on viewWillAppear/viewDidAppear.
This fixes the room selection in master when playing when doing screen rotation with the splitVC.
2015-12-23 11:46:27 +01:00
manuroe
cebcdc472e Public rooms search: Force hiding the keyboard too when clicking on the directory search result cell 2015-12-23 11:21:12 +01:00
manuroe
3fe34f7e1d Public rooms search: Fixed compilation 2015-12-23 11:15:04 +01:00
manuroe
34986e8c8d Merge pull request #34 from vector-im/public_rooms_search
Public rooms search
2015-12-23 11:10:29 +01:00
manuroe
4ec9d21924 Merge remote-tracking branch 'origin/develop' into public_rooms_search
Conflicts:
	Vector/Utils/AvatarGenerator.m
	Vector/ViewController/HomeViewController.m
2015-12-23 11:05:46 +01:00
manuroe
cbc86ecdd4 Update PublicRoomsDirectoryDataSource.m
Public rooms search: Removed obsolete dev TODO
2015-12-23 10:29:47 +01:00
manuroe
bace02e839 Public rooms search: Fixed bad animation when selecting a room with the keyboard open 2015-12-22 18:22:05 +01:00
manuroe
d893905fcf Merge remote-tracking branch 'origin/develop' into public_rooms_search
Conflicts:
	Vector.xcodeproj/project.pbxproj
	Vector/AppDelegate.m
	Vector/Categories/MXRoom+Vector.m
	Vector/Model/RoomList/RecentsDataSource.m
	Vector/Utils/AvatarGenerator.m
2015-12-22 18:20:49 +01:00
manuroe
7534e6207b Public rooms search: In case of /publicRoom failure, do not wait for 10s before doing a new search 2015-12-22 18:06:09 +01:00
manuroe
f2d847ea4d Public rooms search: Made sure the room is no more selected when leaving the rooom page 2015-12-22 17:43:25 +01:00
manuroe
0caeb839c6 Public rooms search: Changed UX when selecting a public room from the directory.
The directory screen now stays in the navigation stack.
Do things to select the right room when moving from detail-only to master-detail
2015-12-22 17:23:59 +01:00
manuroe
5d92132713 Public rooms search: auto join selected public room from the directory screen 2015-12-22 16:23:43 +01:00
manuroe
33664a9617 Public rooms search: Improved animations when selecting a public room from the directory 2015-12-22 15:42:53 +01:00
giomfo
5995b94453 Chat screen: Bug Fix: typing notif is not displayed
Typing notification was not displayed for member without display name.
2015-12-22 12:52:18 +01:00
manuroe
4c148f0d27 Public rooms search: PublicRoomTableViewCell: Show room avatar and display the room name as expected in Vector 2015-12-22 11:49:08 +01:00
manuroe
33bd9f40fb Public rooms search: AvatarGenerator: made generateRoomAvatar more generic to be used for public rooms 2015-12-22 11:37:52 +01:00
manuroe
6bee305057 Public rooms search: Created PublicRoomTableViewCell 2015-12-22 09:26:08 +01:00
Yannick LE COLLEN
722a9d788a Merge pull request #32 from vector-im/room_members_search
Room members search
2015-12-22 08:44:54 +01:00
yannick
badbc956a3 room_member_search
Updates after MatrixKit update and review
2015-12-22 08:43:55 +01:00
manuroe
d65efac3d5 Public rooms search: Do a AND search on public rooms 2015-12-21 16:41:41 +01:00
manuroe
94fbcc076f Public rooms search: Replace the PublicRoomsDirectoryDataSource.filter by an array of strings PublicRoomsDirectoryDataSource.searchPatternsList. 2015-12-21 15:29:57 +01:00
manuroe
056bf23f4d Public rooms search: Keep the search bar cancel button enabled when the keyboard is not displayed.
Thus, the user can quit the search more quickly
2015-12-21 14:56:01 +01:00
Yannick LE COLLEN
a5fb167434 Merge pull request #33 from vector-im/room_rules_deletion_issue
room_rules_deletion_issue
2015-12-21 14:36:08 +01:00
yannick
5941f2bb0f room_members_search
fix some refresh issues
2015-12-21 14:36:00 +01:00
yannick
fb7c2cf5a1 room_members_search
the session is not anymore provided in the contacttableviewcell.
2015-12-21 14:29:05 +01:00
yannick
4c5ff18b75 room_members_search
remove the session property
2015-12-21 14:28:18 +01:00
manuroe
28b9e01ad3 Public rooms search: Speed up [PublicRoomsDirectoryDataSource refreshFilteredPublicRooms] 2015-12-21 14:00:44 +01:00
yannick
22e253819e room_rules_deletion_issue
-> fix a crash in the rule update observer
2015-12-21 12:04:04 +01:00
giomfo
f25ac8dacf Bug Fix: Selected room is dismissed on iPhone 6+ on screen rotation. 2015-12-21 11:49:55 +01:00
manuroe
8c034bd809 Public rooms search: On new search, forget the previoud user search 2015-12-21 11:45:47 +01:00
manuroe
b9b5372d63 Public rooms search: Do not open directory page if the result count is 0 or if the data source is fetching data 2015-12-21 11:31:30 +01:00
manuroe
342d17e3cc Public rooms search: hide keyboard on scroll 2015-12-21 11:17:38 +01:00
yannick
a41fc1b5f2 room_members_search
-> the search bar is now a section header : it is always displayed during a search.
2015-12-21 11:14:57 +01:00
manuroe
6ff5cadfee Public rooms search: Automatically scroll to the top on each new seach 2015-12-21 11:13:46 +01:00
manuroe
68fd187509 Merge remote-tracking branch 'origin/develop' into public_rooms_search
Conflicts:
	Vector/Base.lproj/Main.storyboard
	Vector/Model/RoomList/RecentsDataSource.m
2015-12-21 10:35:48 +01:00
yannick
f9b8a0d53e room_members_search
-> rename VectorContactTableViewCell to ContactTableViewCell
2015-12-21 10:27:07 +01:00
yannick
6bb821e965 room_members_search
-> improve vectorContactTableViewCell to display a custom accessory view
-> Update the room creation step 2 viewcontroller.
2015-12-21 10:00:49 +01:00
manuroe
92e0fdbe92 Public rooms search: Added selection in the directory screen 2015-12-18 18:25:39 +01:00
manuroe
10d57489ea Public rooms search: sort public rooms by their members count 2015-12-18 18:10:18 +01:00
giomfo
e583a82554 Merge pull request #31 from vector-im/chat_screen_support_event_edition
Chat screen support event edition
2015-12-18 18:02:28 +01:00
manuroe
e71a4a090d Public rooms search: Directory page starts to work (with cells from MatrixKit) 2015-12-18 17:17:03 +01:00
yannick
3a04fae8a1 room_members_search
The creation rooms step2 tableview style is plain instead of group.
2015-12-18 16:57:46 +01:00
yannick
29a3ca8e4e room_members_search
Add a dedicated delete button instead of the sliding menu.
2015-12-18 16:00:38 +01:00
giomfo
c0be7ac0fe Chat screen: update localized string used during event edition 2015-12-18 15:37:28 +01:00
giomfo
623af56397 Chat screen : support event edition 2015-12-18 15:20:57 +01:00
giomfo
db034c8c4a AppDelegate: Customize the localized string table used by MatrixKit 2015-12-18 15:14:34 +01:00
yannick
9c64a33638 room_members_search
-> add the swipe to remove member / to leave the room
-> add member when selecting a cell.
2015-12-18 15:00:20 +01:00
manuroe
10de4757d3 Public rooms search: Fixed compilation warning in the xib 2015-12-18 14:35:34 +01:00