diff --git a/Vector.xcodeproj/project.pbxproj b/Vector.xcodeproj/project.pbxproj index cfdc80516..479d7aeac 100644 --- a/Vector.xcodeproj/project.pbxproj +++ b/Vector.xcodeproj/project.pbxproj @@ -220,6 +220,9 @@ F07420A31D940FA80043B679 /* UINavigationController+Vector.m in Sources */ = {isa = PBXBuildFile; fileRef = F07420A21D940FA80043B679 /* UINavigationController+Vector.m */; }; F07ECA4D1D2BB0A60060C09F /* TableViewCellWithCheckBoxes.m in Sources */ = {isa = PBXBuildFile; fileRef = F07ECA4B1D2BB0A60060C09F /* TableViewCellWithCheckBoxes.m */; }; F07ECA4E1D2BB0A60060C09F /* TableViewCellWithCheckBoxes.xib in Resources */ = {isa = PBXBuildFile; fileRef = F07ECA4C1D2BB0A60060C09F /* TableViewCellWithCheckBoxes.xib */; }; + F08294681DB503FE00CEAB63 /* direct_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = F08294651DB503FE00CEAB63 /* direct_icon.png */; }; + F08294691DB503FE00CEAB63 /* direct_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F08294661DB503FE00CEAB63 /* direct_icon@2x.png */; }; + F082946A1DB503FE00CEAB63 /* direct_icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = F08294671DB503FE00CEAB63 /* direct_icon@3x.png */; }; F083C4581D9E982900E5246C /* FilesSearchCellData.m in Sources */ = {isa = PBXBuildFile; fileRef = F083C4571D9E982900E5246C /* FilesSearchCellData.m */; }; F083C45D1D9E9C2400E5246C /* FilesSearchTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F083C45B1D9E9C2400E5246C /* FilesSearchTableViewCell.m */; }; F083C45E1D9E9C2400E5246C /* FilesSearchTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F083C45C1D9E9C2400E5246C /* FilesSearchTableViewCell.xib */; }; @@ -591,6 +594,9 @@ F07ECA4A1D2BB0A60060C09F /* TableViewCellWithCheckBoxes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TableViewCellWithCheckBoxes.h; path = TableViewCell/TableViewCellWithCheckBoxes.h; sourceTree = ""; }; F07ECA4B1D2BB0A60060C09F /* TableViewCellWithCheckBoxes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TableViewCellWithCheckBoxes.m; path = TableViewCell/TableViewCellWithCheckBoxes.m; sourceTree = ""; }; F07ECA4C1D2BB0A60060C09F /* TableViewCellWithCheckBoxes.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = TableViewCellWithCheckBoxes.xib; path = TableViewCell/TableViewCellWithCheckBoxes.xib; sourceTree = ""; }; + F08294651DB503FE00CEAB63 /* direct_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = direct_icon.png; sourceTree = ""; }; + F08294661DB503FE00CEAB63 /* direct_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "direct_icon@2x.png"; sourceTree = ""; }; + F08294671DB503FE00CEAB63 /* direct_icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "direct_icon@3x.png"; sourceTree = ""; }; F083C4561D9E982900E5246C /* FilesSearchCellData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilesSearchCellData.h; sourceTree = ""; }; F083C4571D9E982900E5246C /* FilesSearchCellData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FilesSearchCellData.m; sourceTree = ""; }; F083C45A1D9E9C2400E5246C /* FilesSearchTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilesSearchTableViewCell.h; sourceTree = ""; }; @@ -972,6 +978,9 @@ F03BF5B41D8BF5B1002EF6A7 /* Images */ = { isa = PBXGroup; children = ( + F08294651DB503FE00CEAB63 /* direct_icon.png */, + F08294661DB503FE00CEAB63 /* direct_icon@2x.png */, + F08294671DB503FE00CEAB63 /* direct_icon@3x.png */, F083C4811D9EAFC500E5246C /* file_doc_icon.png */, F083C4821D9EAFC500E5246C /* file_doc_icon@2x.png */, F083C4831D9EAFC500E5246C /* file_doc_icon@3x.png */, @@ -1544,6 +1553,7 @@ 7165A25C1C05CD42003635D7 /* SegmentedViewController.xib in Resources */, F03BF65F1D8BF5B1002EF6A7 /* call_speaker_off_icon@2x.png in Resources */, F03BF6B41D8BF5B1002EF6A7 /* priorityLow@2x.png in Resources */, + F08294691DB503FE00CEAB63 /* direct_icon@2x.png in Resources */, F03BF6971D8BF5B1002EF6A7 /* leave@3x.png in Resources */, F03BF69A1D8BF5B1002EF6A7 /* logo@3x.png in Resources */, F03BF67C1D8BF5B1002EF6A7 /* create_room@3x.png in Resources */, @@ -1655,6 +1665,7 @@ F03BF65D1D8BF5B1002EF6A7 /* call_hangup_icon@3x.png in Resources */, F03BF6981D8BF5B1002EF6A7 /* logo.png in Resources */, F03BF6AA1D8BF5B1002EF6A7 /* placeholder.png in Resources */, + F082946A1DB503FE00CEAB63 /* direct_icon@3x.png in Resources */, F03BF6BA1D8BF5B1002EF6A7 /* scrolldown@2x.png in Resources */, F047DBB51C576F2200952DA2 /* AuthenticationViewController.xib in Resources */, F03BF6D91D8BF5B1002EF6A7 /* video_icon@3x.png in Resources */, @@ -1674,6 +1685,7 @@ F023A0241D91382600C517FB /* camera_video_capture@3x.png in Resources */, F083C4911D9EAFC500E5246C /* file_music_icon@2x.png in Resources */, F03BF6491D8BF5B1002EF6A7 /* admin_icon.png in Resources */, + F08294681DB503FE00CEAB63 /* direct_icon.png in Resources */, F03BF6AE1D8BF5B1002EF6A7 /* plus_icon@2x.png in Resources */, F03BF6AB1D8BF5B1002EF6A7 /* placeholder@2x.png in Resources */, F03BF6AC1D8BF5B1002EF6A7 /* placeholder@3x.png in Resources */, diff --git a/Vector/Assets/Images/direct_icon.png b/Vector/Assets/Images/direct_icon.png new file mode 100644 index 000000000..a98ab1a78 Binary files /dev/null and b/Vector/Assets/Images/direct_icon.png differ diff --git a/Vector/Assets/Images/direct_icon@2x.png b/Vector/Assets/Images/direct_icon@2x.png new file mode 100644 index 000000000..0654152f2 Binary files /dev/null and b/Vector/Assets/Images/direct_icon@2x.png differ diff --git a/Vector/Assets/Images/direct_icon@3x.png b/Vector/Assets/Images/direct_icon@3x.png new file mode 100644 index 000000000..668500236 Binary files /dev/null and b/Vector/Assets/Images/direct_icon@3x.png differ diff --git a/Vector/Views/RoomList/InviteRecentTableViewCell.xib b/Vector/Views/RoomList/InviteRecentTableViewCell.xib index 95ca5ab1a..e175c64df 100644 --- a/Vector/Views/RoomList/InviteRecentTableViewCell.xib +++ b/Vector/Views/RoomList/InviteRecentTableViewCell.xib @@ -1,5 +1,5 @@ - + @@ -89,10 +89,19 @@ + + + @@ -110,6 +119,7 @@ + @@ -119,4 +129,7 @@ + + + diff --git a/Vector/Views/RoomList/RecentTableViewCell.h b/Vector/Views/RoomList/RecentTableViewCell.h index a77d434f5..c41404930 100644 --- a/Vector/Views/RoomList/RecentTableViewCell.h +++ b/Vector/Views/RoomList/RecentTableViewCell.h @@ -23,6 +23,7 @@ @property (weak, nonatomic) IBOutlet UIView *missedNotifAndUnreadIndicator; @property (weak, nonatomic) IBOutlet MXKImageView *roomAvatar; +@property (weak, nonatomic) IBOutlet UIImageView *directRoomIcon; @property (weak, nonatomic) IBOutlet UILabel *missedNotifAndUnreadBadgeLabel; @property (weak, nonatomic) IBOutlet UIView *missedNotifAndUnreadBadgeBgView; diff --git a/Vector/Views/RoomList/RecentTableViewCell.m b/Vector/Views/RoomList/RecentTableViewCell.m index ff951d356..c133feaed 100644 --- a/Vector/Views/RoomList/RecentTableViewCell.m +++ b/Vector/Views/RoomList/RecentTableViewCell.m @@ -127,6 +127,8 @@ self.roomAvatar.backgroundColor = [UIColor clearColor]; + self.directRoomIcon.hidden = !roomCellData.roomDataSource.room.isDirect; + [roomCellData.roomDataSource.room setRoomAvatarImageIn:self.roomAvatar]; } else diff --git a/Vector/Views/RoomList/RecentTableViewCell.xib b/Vector/Views/RoomList/RecentTableViewCell.xib index 9843eaeb5..bd94239f6 100644 --- a/Vector/Views/RoomList/RecentTableViewCell.xib +++ b/Vector/Views/RoomList/RecentTableViewCell.xib @@ -1,5 +1,5 @@ - + @@ -75,8 +75,17 @@ + + + @@ -95,6 +104,7 @@ + @@ -106,4 +116,7 @@ + + +