Merge pull request #28 from vector-im/room_photo_selection

Room photo selection

Improve the room settings page
-> add the room photo management 
-> display if a room is public or private
-> enable / disable the room notification

Else
Improve the room naming.
This commit is contained in:
Yannick LE COLLEN
2015-12-17 12:05:20 +01:00
20 changed files with 1125 additions and 70 deletions
+26
View File
@@ -0,0 +1,26 @@
/*
Copyright 2015 OpenMarket Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
#import <Foundation/Foundation.h>
#import <MatrixSDK/MatrixSDK.h>
#import "MXKRecentCellData.h"
/**
`RecentCellData` is Vector cuustomized MXKRecentCellData` cell.
*/
@interface RecentCellData : MXKRecentCellData
@end
+32
View File
@@ -0,0 +1,32 @@
/*
Copyright 2015 OpenMarket Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
#import "RecentCellData.h"
#import "MXRoom+Vector.h"
@implementation RecentCellData
// trick to hide the mother class property as it is readonly one.
// self.roomDisplayname returns this value instead of the mother class.
@synthesize roomDisplayname;
- (void)update
{
[super update];
roomDisplayname = self.roomDataSource.room.vectorDisplayname;
}
@end
+31
View File
@@ -22,6 +22,10 @@
#import "InviteRecentTableViewCell.h"
#import "MXRoom+Vector.h"
#import "RecentCellData.h"
@interface RecentsDataSource()
{
NSMutableArray* invitesCellDataArray;
@@ -62,10 +66,15 @@
sectionsCount = 0;
roomTagsListenerByUserId = [[NSMutableDictionary alloc] init];
// Set default data and view classes
[self registerCellDataClass:RecentCellData.class forCellIdentifier:kMXKRecentCellIdentifier];
}
return self;
}
- (void)removeMatrixSession:(MXSession*)matrixSession
{
[super removeMatrixSession:matrixSession];
@@ -109,6 +118,28 @@
}
}
- (BOOL)isRoomNotifiedAtIndexPath:(NSIndexPath *)indexPath
{
MXRoom* room = [self getRoomAtIndexPath:indexPath];
if (room)
{
return !room.areRoomNotificationsMuted;
}
return YES;
}
- (void)muteRoomNotifications:(BOOL)mute atIndexPath:(NSIndexPath *)indexPath
{
MXRoom* room = [self getRoomAtIndexPath:indexPath];
// sanity check
if (room)
{
[room toggleRoomNotifications:mute];
}
}
- (void)refreshRoomsSectionsAndReload
{