Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 00:02:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #730 from vector-im/vector_715

Browse source 
Converting existing rooms to/from DMs #715
This commit is contained in:
giomfo 2016-10-19 11:28:35 +02:00 committed by GitHub
commit 678143fbb5
8 changed files with 43 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Vector.xcodeproj/project.pbxproj
View file

@ -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 = "<group>"; };
F07ECA4B1D2BB0A60060C09F /* TableViewCellWithCheckBoxes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TableViewCellWithCheckBoxes.m; path = TableViewCell/TableViewCellWithCheckBoxes.m; sourceTree = "<group>"; };
F07ECA4C1D2BB0A60060C09F /* TableViewCellWithCheckBoxes.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = TableViewCellWithCheckBoxes.xib; path = TableViewCell/TableViewCellWithCheckBoxes.xib; sourceTree = "<group>"; };
F08294651DB503FE00CEAB63 /* direct_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = direct_icon.png; sourceTree = "<group>"; };
F08294661DB503FE00CEAB63 /* direct_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "direct_icon@2x.png"; sourceTree = "<group>"; };
F08294671DB503FE00CEAB63 /* direct_icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "direct_icon@3x.png"; sourceTree = "<group>"; };
F083C4561D9E982900E5246C /* FilesSearchCellData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilesSearchCellData.h; sourceTree = "<group>"; };
F083C4571D9E982900E5246C /* FilesSearchCellData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FilesSearchCellData.m; sourceTree = "<group>"; };
F083C45A1D9E9C2400E5246C /* FilesSearchTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilesSearchTableViewCell.h; sourceTree = "<group>"; };
@ -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 */,

BIN
Vector/Assets/Images/direct_icon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 451 B

BIN
Vector/Assets/Images/direct_icon@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 919 B

BIN
Vector/Assets/Images/direct_icon@3x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

15
Vector/Views/RoomList/InviteRecentTableViewCell.xib
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
@ -89,10 +89,19 @@
<constraint firstItem="Ztl-w2-d20" firstAttribute="centerY" secondItem="gCG-UR-b2u" secondAttribute="centerY" id="nQM-He-36A"/>
</constraints>
</view>
<imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="direct_icon.png" translatesAutoresizingMaskIntoConstraints="NO" id="09l-aN-CyW">
<rect key="frame" x="50" y="19" width="11" height="13"/>
<constraints>
<constraint firstAttribute="width" constant="11" id="LnK-GM-Hha"/>
<constraint firstAttribute="height" constant="13" id="l9u-Hu-qLp"/>
</constraints>
</imageView>
</subviews>
<constraints>
<constraint firstItem="dQt-mN-T6b" firstAttribute="top" secondItem="Lg1-xQ-AGn" secondAttribute="bottom" constant="4" id="1ka-cr-uZP"/>
<constraint firstItem="RX5-eD-c3c" firstAttribute="leading" secondItem="aXz-IR-jj5" secondAttribute="leading" constant="13" id="3EJ-qT-J8r"/>
<constraint firstItem="09l-aN-CyW" firstAttribute="top" secondItem="aXz-IR-jj5" secondAttribute="top" constant="19" id="Cx2-7s-VlW"/>
<constraint firstItem="09l-aN-CyW" firstAttribute="leading" secondItem="aXz-IR-jj5" secondAttribute="leading" constant="50" id="Ofc-DX-xoh"/>
<constraint firstItem="Lg1-xQ-AGn" firstAttribute="leading" secondItem="RX5-eD-c3c" secondAttribute="trailing" constant="14" id="Pgp-JM-oQd"/>
<constraint firstItem="gCG-UR-b2u" firstAttribute="top" secondItem="aXz-IR-jj5" secondAttribute="top" constant="14" id="Vb6-hc-Bsk"/>
<constraint firstItem="dQt-mN-T6b" firstAttribute="leading" secondItem="RX5-eD-c3c" secondAttribute="trailing" constant="14" id="XFM-LG-4uJ"/>
@ -110,6 +119,7 @@
<constraint firstItem="RX5-eD-c3c" firstAttribute="top" secondItem="L2L-l5-wPx" secondAttribute="top" constant="15" id="uLf-cg-Vge"/>
</constraints>
<connections>
<outlet property="directRoomIcon" destination="09l-aN-CyW" id="yLs-vd-4OO"/>
<outlet property="lastEventDescription" destination="dQt-mN-T6b" id="MSz-h1-cAL"/>
<outlet property="leftButton" destination="Fc3-Id-aaG" id="cx4-98-B32"/>
<outlet property="noticeBadgeView" destination="gCG-UR-b2u" id="hTT-qW-DMa"/>
@ -119,4 +129,7 @@
</connections>
</tableViewCell>
</objects>
<resources>
<image name="direct_icon.png" width="11" height="13"/>
</resources>
</document>

1
Vector/Views/RoomList/RecentTableViewCell.h
View file

@ -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;

2
Vector/Views/RoomList/RecentTableViewCell.m
View file

@ -127,6 +127,8 @@
self.roomAvatar.backgroundColor = [UIColor clearColor];
self.directRoomIcon.hidden = !roomCellData.roomDataSource.room.isDirect;
[roomCellData.roomDataSource.room setRoomAvatarImageIn:self.roomAvatar];
}
else

15
Vector/Views/RoomList/RecentTableViewCell.xib
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
@ -75,8 +75,17 @@
<constraint firstItem="mbn-A1-1Yw" firstAttribute="centerX" secondItem="OeZ-wN-eil" secondAttribute="centerX" id="ugY-V1-Ooo"/>
</constraints>
</view>
<imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="direct_icon.png" translatesAutoresizingMaskIntoConstraints="NO" id="ZNW-8U-7ma">
<rect key="frame" x="50" y="19" width="11" height="13"/>
<constraints>
<constraint firstAttribute="height" constant="13" id="4Re-7i-8kN"/>
<constraint firstAttribute="width" constant="11" id="aip-1x-C5a"/>
</constraints>
</imageView>
</subviews>
<constraints>
<constraint firstItem="ZNW-8U-7ma" firstAttribute="leading" secondItem="e7r-zL-9bw" secondAttribute="trailing" constant="45" id="4hn-ip-zxD"/>
<constraint firstItem="ZNW-8U-7ma" firstAttribute="top" secondItem="aXz-IR-jj5" secondAttribute="top" constant="19" id="6vJ-61-kfl"/>
<constraint firstItem="360-Go-RcG" firstAttribute="leading" secondItem="OeZ-wN-eil" secondAttribute="trailing" constant="8" id="KuE-8m-e9A"/>
<constraint firstItem="e7r-zL-9bw" firstAttribute="leading" secondItem="aXz-IR-jj5" secondAttribute="leading" id="PUW-if-ewh"/>
<constraint firstItem="Lg1-xQ-AGn" firstAttribute="leading" secondItem="RX5-eD-c3c" secondAttribute="trailing" constant="14" id="Pgp-JM-oQd"/>
@ -95,6 +104,7 @@
</tableViewCellContentView>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<connections>
<outlet property="directRoomIcon" destination="ZNW-8U-7ma" id="e2n-1R-mbc"/>
<outlet property="lastEventDate" destination="360-Go-RcG" id="Y0L-Dj-ZVn"/>
<outlet property="lastEventDescription" destination="dQt-mN-T6b" id="MSz-h1-cAL"/>
<outlet property="missedNotifAndUnreadBadgeBgView" destination="OeZ-wN-eil" id="tVo-8Z-hc2"/>
@ -106,4 +116,7 @@
</connections>
</tableViewCell>
</objects>
<resources>
<image name="direct_icon.png" width="11" height="13"/>
</resources>
</document>