Commit graph

353 commits

Author SHA1 Message Date
giomfo
77850c20dd Fix compilation error
syntax error
2015-12-16 16:50:51 +01:00
manuroe
2082bcc7e0 Public rooms search: Start 2015-12-16 16:29:34 +01:00
yannick
9ddd479772 Merge remote-tracking branch 'origin/develop' into room_photo_selection 2015-12-16 15:53:42 +01:00
giomfo
ed1877282b Chat Screen implementation
Apply Ribot design on bubble cell (Pagination display is not correct yet).
2015-12-16 15:16:37 +01:00
yannick
e50c1dbc5c room_photo_selection
-> update to have the same room displayname as the webclient.
2015-12-16 14:24:09 +01:00
yannick
7512760387 room_photo_selection
Factorize the room notifications management.
2015-12-16 10:47:15 +01:00
yannick
cdf8623b80 room_photo_selection
-> add the public / private status
-> factorize the room avatar management.
-> the room avatar was rendered in scaleToFit instead of scaleToFill.
2015-12-16 10:28:58 +01:00
giomfo
a321ffc9f7 Update Vector assets 2015-12-16 09:52:28 +01:00
yannick
f426356da4 Merge remote-tracking branch 'origin/develop' into develop 2015-12-16 09:17:44 +01:00
yannick
d081a58930 Add the recents drag & drop feature
-> to be able to drag in favourites / low priority sections, they must exist (created with the swipe menu)
2015-12-16 09:17:28 +01:00
giomfo
e6863c1ff1 Merge pull request #26 from vector-im/chat_screen_implementation
Chat screen implementation
2015-12-16 09:08:04 +01:00
yannick
4bb827480a recents_category_drag_drop
Updates after internal reviews
2015-12-16 08:59:40 +01:00
manuroe
d6e66cb0e8 SegmentedVC improvement: Oops. Fixed buggy renaming. 2015-12-15 18:22:38 +01:00
yannick
4b38e1f286 room_photo_selection
-> add the room rules management
-> fix issues while updating the topic.
2015-12-15 18:17:20 +01:00
giomfo
09623a5d47 Chat screen: implementation
Handle read receipt display
2015-12-15 17:45:16 +01:00
manuroe
7fdd6ed6e6 SegmentedVC improvement: Improve animation when quitting searh in HomeVC 2015-12-15 17:43:32 +01:00
manuroe
39e57199c5 SegmentedVC improvement: Renamed displayedViewController to selectedViewController to be uniform with selectedIndex 2015-12-15 17:31:16 +01:00
giomfo
d445c1bc5e Chat Screen: Bug Fix: Pagination title is missing for incoming bubble 2015-12-15 17:20:44 +01:00
manuroe
b74975cf49 SegmentedVC improvement: Made selectedIndex public so that it can be changed outside.
Use it from the HomeVC
2015-12-15 17:13:59 +01:00
manuroe
c1402cc7e4 SegmentedVC improvement: Make SegmentedVC call viewWillAppear on the currently selected child.
This fixes the handling of keyboard which is centrally managed in [MXKViewController viewWillAppear]
2015-12-15 16:20:21 +01:00
yannick
ae1757ff79 room_photo_selection
The room photo can be updated when saving.
2015-12-15 13:14:37 +01:00
yannick
0c104c6991 room_photo_selection
add the PHAsset management.
2015-12-15 13:13:50 +01:00
yannick
d2c5611a26 room_photo_selection
Display the room photo in the settings
2015-12-15 10:46:34 +01:00
yannick
2010554782 recents_category_drag_drop
-> the moving room was not always the expected one
-> update after SDK update (room tag order computation)
2015-12-15 08:34:46 +01:00
yannick
b8a340ff45 recents_category_drap_drop
fix a crash when the move is cancelled.
2015-12-14 13:06:25 +01:00
yannick
00c0cc9a5c recents_category_drag_drop
remove the debug background color.
2015-12-14 11:14:58 +01:00
yannick
644996aa1e recents_category_drag_drop
fix a refresh issue / crash after updating the room order.
2015-12-14 11:08:57 +01:00
yannick
513a54f7a0 recents_category_drag_drop
Hide the moving cell.
2015-12-14 10:47:10 +01:00
giomfo
acb48e5e15 Merge pull request #21 from vector-im/chat_screen_implementation
Chat screen implementation
2015-12-14 10:21:09 +01:00
yannick
ef03fba63d didMXSessionInviteRoomUpdate
Refresh the sections indexes before refreshing the list.
2015-12-14 08:29:01 +01:00
yannick
3ed9696716 recents_category_drag_drop
fix some crashes
2015-12-11 16:20:26 +01:00
yannick
26fe1ba0ba recents_category_drag_drop
fix a refresh issue.
2015-12-11 15:30:26 +01:00
yannick
922607d521 recents_category_drag_drop
Add the cell drag and drop.
2015-12-11 14:59:55 +01:00
giomfo
3b5db63660 Chat screen implementation
Handle event selection when user taps on text message view.

Note: The read receipts are still displayed by MatrixKit, they may overlap timestamp until Vector handle them correctly.
2015-12-11 14:01:56 +01:00
giomfo
f35e08ccdc Chat screen implementation
Disable identicon use in Vector.
2015-12-11 13:51:48 +01:00
yannick
7d790e4a2f recents_category_drag_drop
add traces.
2015-12-11 12:03:05 +01:00
yannick
27a72ae7db recents_category_drag_drop
the drag and drop is implemented : the cell can be move in the recents sections.
2015-12-11 11:50:13 +01:00
yannick
5e8e81d019 recents_category_drag_drop
Implement the cell selection and its moving (with tableview);
2015-12-11 09:11:44 +01:00
giomfo
bc0aedab89 Define Vector text black color 2015-12-10 22:02:40 +01:00
Yannick LE COLLEN
c54b69a2b0 Merge pull request #20 from vector-im/add_invite_rooms_section
Add invite rooms section
2015-12-10 17:08:42 +01:00
yannick
1b7f4e3939 add_invite_rooms_section
Update after Giom's review
2015-12-10 17:08:09 +01:00
giomfo
82f82edf76 Messages screen: Apply Ribot layout for Create Room button 2015-12-10 14:38:20 +01:00
yannick
dd1b9c92e6 Update to the latest UI design 2015-12-10 14:17:02 +01:00
yannick
2a84654014 Merge remote-tracking branch 'origin/develop' into add_invite_rooms_section
Conflicts:
	Vector/Views/RoomList/RecentTableViewCell.xib
2015-12-10 13:52:20 +01:00
yannick
8d2bede598 add_invite_rooms_section
Fix a crash when selected a recent cells.
2015-12-10 13:41:03 +01:00
giomfo
c9467cc73f RecentTableViewCell: Apply Ribot layout: Update avatar position 2015-12-10 13:19:30 +01:00
giomfo
3d1ef7fc7f RecentTableViewCell: Apply Ribot layout (TODO set the right font). 2015-12-10 13:06:16 +01:00
yannick
362772a476 Merge remote-tracking branch 'origin/develop' into add_invite_rooms_section 2015-12-10 12:44:17 +01:00
yannick
6c9784e40a add_invite_rooms_section
fix some UI issues.
2015-12-10 10:16:22 +01:00
yannick
09567f1c29 add_invite_rooms_section
Plug the join/reject button
The join does not refresh properly the recents.
2015-12-10 09:00:57 +01:00
manuroe
e99b575968 Merge remote-tracking branch 'origin/develop' into search_api_support
Conflicts:
	Vector.xcodeproj/project.pbxproj
2015-12-09 18:28:53 +01:00
manuroe
c1e96f7cfa HomeVC: Added missing comments 2015-12-09 18:20:00 +01:00
manuroe
12dda5379b HomeVC: Use it from the AppDelegate
Fixed [AppDelegate restoreInitialDisplay] to be async: this avoids "while a presentation is in progress" warning
HomeVC now support adding and removing of MXSessions
2015-12-09 18:12:42 +01:00
yannick
6169b39ae5 Improve the invite room display. 2015-12-09 17:38:39 +01:00
manuroe
adf8fed893 HomeVC: storyboard: connected HomeVC to AuthVC and killed RecentsVC as HomeVC can do everything now 2015-12-09 17:28:39 +01:00
yannick
c96d6fb9cd add_invite_rooms_section
-> add the customized invite cell.
not yet plugged.
2015-12-09 17:01:29 +01:00
manuroe
4a491a0478 HomeVC: Moved code (opening room and maintaining the current one) from RecentsVC to HomeVC - Part 2/2 2015-12-09 16:48:43 +01:00
yannick
2ff73cded1 add_invite_rooms_section
-> reduce the recent cell height
2015-12-09 16:09:46 +01:00
manuroe
ef63d90f93 HomeVC: Moved code (opening room and maintaining the current one) from RecentsVC to HomeVC - Part 1 2015-12-09 14:39:37 +01:00
manuroe
b009ca8110 HomeVC: Moved code (createNewRoom button and transparency mask) from RecentsVC to HomeVC 2015-12-09 12:44:19 +01:00
manuroe
a0ca77c770 HomeVC: Killed SearchVC as HomeVC fully replaces it now 2015-12-09 12:35:53 +01:00
manuroe
be9fad2bfa HomeVC: Moved code (createNewRoom button and transparency mask) from RecentsVC to HomeVC 2015-12-09 12:28:25 +01:00
manuroe
5e7e551224 HomeVC: Show an image if there is nothing to search 2015-12-09 12:02:43 +01:00
manuroe
5eb404424a HomeVC: Show one loading wheel at a time: the one of the recents VC 2015-12-09 10:48:40 +01:00
manuroe
e6e086d9fc HomeVC: Started HomeViewController that will replace RecentsVC as the main app page 2015-12-09 10:20:05 +01:00
yannick
e39746369d The read receipts are displayed for incoming messages.
In vector applciation, the outgoing and the imcoming messages are displayed in the same screen side.
2015-12-09 09:50:03 +01:00
yannick
a111f44d7d Fix a crash in refreshTypingView 2015-12-08 17:45:03 +01:00
yannick
9da0bdc9d0 user_settings_page
update after reviewing.
2015-12-08 17:37:59 +01:00
yannick
948a58405a user_settings_page
Hide some unsupported account settings
2015-12-08 16:51:49 +01:00
yannick
49b9266582 Add a comment. 2015-12-08 16:37:52 +01:00
yannick
efafa49293 Merge remote-tracking branch 'origin/vector_user_settings' into user_settings_page 2015-12-08 16:09:26 +01:00
yannick
7fba0003c7 Fix some texts 2015-12-08 15:53:12 +01:00
yannick
da7b8bd88a user_settings_page
push rules
Make the difference between my user name and my display name rules.
2015-12-08 15:52:54 +01:00
yannick
5340584a8f user_settings_page
-> add password update dialog. (it works only on IOS 8 and above).
2015-12-08 15:39:53 +01:00
manuroe
aad25ca2a7 HomeVC: made selectionContainerHeightConstraint accessible 2015-12-08 14:28:53 +01:00
giomfo
ebf58876f3 Chat screen: rename cell view classes 2015-12-08 10:54:48 +01:00
giomfo
7c6057bfed Chat screen: Update bubble layout
-Define all required cell view classes
-Disable timestamp display (TODO display timestamp for last message, and selected message if any).
2015-12-08 10:10:59 +01:00
yannick
8f56adb196 The profile can be updated with the save button. 2015-12-07 17:45:19 +01:00
yannick
d4854cafe2 Fix a compilation warning. 2015-12-07 17:40:16 +01:00
yannick
922382f512 user_settings_page
-> first implementation
--> the tableview is the same as the screenshot we have
--> the push rules can be toggled

Need to manage the account updates.
2015-12-07 16:05:50 +01:00
manuroe
e73e4bb554 Merge remote-tracking branch 'origin/develop' into search_api_support 2015-12-07 15:51:18 +01:00
manuroe
08a43cd465 Search: Show only an image if the search text field is empty 2015-12-07 15:26:06 +01:00
manuroe
d410f18aa5 Search: SegmentedViewController: Added a customisable background image 2015-12-07 15:08:17 +01:00
manuroe
d39a7f7ebe Search: Reuse RecentsViewController with its search capabilities to make search under the "rooms" tab 2015-12-07 14:03:34 +01:00
giomfo
1ed9058be6 Chat screen: Bug Fix - App crashes when user selects a room in recents.
This crash was systematic when the user opened for the second time the same room.
2015-12-07 13:57:21 +01:00
manuroe
899c654832 Search: SegmentedViewController: Made displayedViewController public 2015-12-07 13:52:38 +01:00
manuroe
db6eb145bd Merge remote-tracking branch 'origin/develop' into search_api_support 2015-12-07 13:02:14 +01:00
giomfo
ef69af9adb MXKDataSource refactoring
Table view cell are now defined at view controller level.
2015-12-07 11:50:13 +01:00
manuroe
452152ca20 Merge remote-tracking branch 'origin/develop' into search_api_support
Conflicts:
	Vector/Base.lproj/Main.storyboard
	Vector/ViewController/RecentsViewController.m
2015-12-07 11:47:49 +01:00
manuroe
c969859593 Search: Show a search bar 2015-12-07 11:43:11 +01:00
yannick
5d484d9a63 Update the recents section header
-> reduce the font size
-> reduce the header height
2015-12-04 17:45:56 +01:00
yannick
84b56df894 display_room_avatars.
fix a wrong fix in refreshTypingView.
2015-12-04 17:05:40 +01:00
yannick
acf8b11322 display_room_avatars
Update the room avatar management with the updated Matrix Kit
2015-12-04 16:58:18 +01:00
yannick
74de3eeb0f Merge remote-tracking branch 'origin/develop' into display_room_avatars
Conflicts:
	Vector/ViewController/RoomViewController.m
2015-12-04 16:43:11 +01:00
yannick
41e09d59f0 display the
-> swipe menu icons (recents)
-> room creation icon (recents)
2015-12-04 16:32:42 +01:00
giomfo
36eca8d52c RoomInputToolbar: Remove useless items 2015-12-04 16:06:11 +01:00
giomfo
7e5d45f64f EventFormatter: Sender avatar handling
Override senderAvatarURLForEvent to ignore the identicons defined by default in mattrix kit.
2015-12-04 15:37:33 +01:00
Yannick LE COLLEN
6512d36721 Merge pull request #13 from vector-im/mute_room_notifications
mute_room_notifications
2015-12-04 14:47:45 +01:00
yannick
eb371f7d8e display_room_avatars
-> display the room avatars in the chat room
2015-12-04 14:28:15 +01:00
giomfo
8d99a2554c Add some ios Vector assets 2015-12-04 13:56:41 +01:00
manuroe
be8017dedb Search API Support: set up SearchViewController in the storyboard 2015-12-04 13:38:05 +01:00
yannick
4d8b8d2856 mute_room_notifications
The room notification "mute" button is displayed even if there is a "always notify" room rule.
2015-12-04 11:04:18 +01:00
Yannick LE COLLEN
b6bc331b2b Merge pull request #10 from vector-im/fav_recents_display
Fav recents display
2015-12-04 09:02:31 +01:00
yannick
e678f57f3e fav_recents_display
Update after Giom's review
2015-12-04 09:02:02 +01:00
Yannick LE COLLEN
63e6c60eeb Merge pull request #9 from vector-im/recents_swipe_actions2
Recents swipe actions2
2015-12-04 08:32:15 +01:00
yannick
9880bd2224 recents_swipe_actions2
-> MXKTools::resizeImage instead of a local method.
2015-12-04 08:31:33 +01:00
yannick
fa0cb4001b display_room_avatars :
Display the room members avatars in the member lists.
2015-12-03 18:09:32 +01:00
yannick
b12c5d5ebd display_room_avatars :
-> add the room avatars generators
-> display the room avatars in the recents.
2015-12-03 16:21:57 +01:00
yannick
0e6ff54d66 Display the room avatars when it is already known (i.e the room has an avatar or it is a 1:1 room). 2015-12-03 11:39:44 +01:00
yannick
62971d1a76 typing crash issue. 2015-12-03 11:38:37 +01:00
yannick
07e34203a2 fix a crash in refreshTypingView 2015-12-03 10:51:07 +01:00
yannick
3603791ad2 Vector uses only one account by now. 2015-12-03 10:28:45 +01:00
yannick
3edb07f011 Vector manages only one account by now.
We do not have the multi account UI.

-> the low-priority / favorites must be merged ?
-> each account recents must be in a dedicated section / sub-section.
2015-12-03 09:37:45 +01:00
yannick
0431cf654c Fix the search crash. 2015-12-03 09:06:40 +01:00
yannick
ccd57f177f Keep the fav / low priority order 2015-12-02 18:10:22 +01:00
yannick
c4084a4e68 Fix the recents favorites refresh 2015-12-02 17:38:10 +01:00
yannick
66f523a243 ->Display the recents sorted by tags (favorites, converstations, lower priority)
-> the tag event is listened but seems bugged.
2015-12-02 17:18:55 +01:00
yannick
c8fe9d6d20 Add the mute/ummute room notifications in the swipe menu. 2015-12-02 13:12:27 +01:00
yannick
978bce9a59 Add the swipe to update room tag. 2015-12-02 10:09:01 +01:00
Yannick LE COLLEN
fb99a80d46 Merge pull request #8 from vector-im/room_creation_overlay
Room creation overlay
2015-12-02 08:40:26 +01:00
yannick
fc1d49908c Merge remote-tracking branch 'origin/room_settings_viewcontroller_v2' into develop 2015-12-02 08:34:10 +01:00
yannick
cc0d42b2fc Rename addNavBarButtons to setNavBarButtons 2015-12-02 08:32:39 +01:00
giomfo
9c58920897 Fix compilation issue after ios matrix kit update.
TODO: implement correctly chat bubbles.
2015-12-01 19:21:55 +01:00
giomfo
0c501eb93f Room Members: use rounded picture instead of rounded corner picture 2015-12-01 18:43:46 +01:00
yannick
d1d55986de -> Add the generic swipe to delete (UITableViewRowAction)
-> Add the background generation from image (UITableViewRowAction)
2015-12-01 18:08:40 +01:00
manuroe
c6e7643983 SYIOS-177: Clear MXStore if the app systematically crashes at startup
Reported https://github.com/matrix-org/matrix-ios-console/pull/5 on Vector
2015-11-30 17:22:39 +01:00
yannick
5993012c65 Add the green chevron aside the room name. 2015-11-30 14:34:12 +01:00
yannick
762231d0a1 Add the room creation button. 2015-11-30 10:41:49 +01:00
yannick
ae6d8951be Add a gradient view above the recents view. 2015-11-30 09:48:08 +01:00
yannick
dedee1697c update the search title color. 2015-11-27 17:48:09 +01:00
yannick
e113c95e1e Update the roomParticipant text color
-> use vector green color
-> remove useless title
-> add a place holder in the search bar.
2015-11-27 17:14:10 +01:00
yannick
86390b7e5c SegmentedViewController : add the unreachable homeserver management (i.e. the navbar background color becomes red) 2015-11-27 15:53:41 +01:00
yannick
f842ae75aa Cancel the room member search if the view disappears. 2015-11-27 15:29:54 +01:00
yannick
1e85502cb6 Add the update error case management. 2015-11-27 15:16:16 +01:00
yannick
6073b3a949 Update the navbar buttons the room participants & room settings viewcontroller. 2015-11-27 14:02:37 +01:00
yannick
004fdb2491 descrive how to update the navbar items color. 2015-11-27 13:30:14 +01:00
yannick
4256859e0a recentsNavigationController is now a property 2015-11-27 13:29:40 +01:00
yannick
14317412ab The navbar buttons were not properly displayed. 2015-11-27 09:59:51 +01:00
yannick
596b781357 Done button refresh update 2015-11-26 18:23:50 +01:00
yannick
a41d09a625 Define the vector green color as the navigation bar tint color. 2015-11-26 18:23:04 +01:00
yannick
eaaedb6fbf -> add a .h file to define the vector color
-> restore the done button on the roomSettingsViewController.
2015-11-26 18:04:03 +01:00
yannick
71806aaaa8 -> set the roomDetails viewController title
-> the selected section title text was not a bold font.
2015-11-26 17:04:16 +01:00
yannick
e715344144 -> MXKRoomDetailsViewController becomes MXKSettingsDetailsViewController
-> The room details is now properly launched.
2015-11-26 16:47:24 +01:00
giomfo
5a1f3ecffa Chat screen: add a separator at the top of activities view. 2015-11-26 15:01:01 +01:00
yannick
9dd2542ad6 Merge remote-tracking branch 'origin/develop' into room_settings_viewcontroller_v2 2015-11-26 14:41:28 +01:00
giomfo
11c14c9e10 Defaults.plist: define pusher app ids for Vector 2015-11-26 14:27:59 +01:00
giomfo
1ccc1f596f Info.plist: define the vector app bundle id
thanks Dave.
2015-11-26 14:27:28 +01:00
giomfo
8ad028f7af Chat screen: remove username handling from outgoing bubble.
The sender'name is now handled by MXKRoomBubbleTableViewCell
2015-11-26 14:26:31 +01:00
yannick
2927d2bde2 Use the vector green color on the search bar. 2015-11-25 18:22:06 +00:00
giomfo
06e212eb01 Chat screen: Prepare bubble display 2015-11-25 19:11:03 +01:00