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

Add the vector ExtraInfoView

Browse source
This commit is contained in:
yannick 2015-11-18 14:42:25 +01:00
parent 68709837d2
commit b63d07c32b
5 changed files with 136 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Vector.xcodeproj/project.pbxproj
View file

@ -7,6 +7,8 @@
objects = {
/* Begin PBXBuildFile section */
71BE02361BFCA5E800D0B1DA /* RoomExtraInfosInfoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BE02341BFCA5E800D0B1DA /* RoomExtraInfosInfoView.m */; settings = {ASSET_TAGS = (); }; };
71BE02371BFCA5E800D0B1DA /* RoomExtraInfosInfoView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 71BE02351BFCA5E800D0B1DA /* RoomExtraInfosInfoView.xib */; settings = {ASSET_TAGS = (); }; };
F001D75E1B8207C000A162C3 /* RoomIncomingBubbleTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F001D7551B8207C000A162C3 /* RoomIncomingBubbleTableViewCell.m */; };
F001D75F1B8207C000A162C3 /* RoomIncomingBubbleTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F001D7561B8207C000A162C3 /* RoomIncomingBubbleTableViewCell.xib */; };
F001D7601B8207C000A162C3 /* RoomOutgoingBubbleTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F001D7581B8207C000A162C3 /* RoomOutgoingBubbleTableViewCell.m */; };
@ -100,6 +102,9 @@
/* Begin PBXFileReference section */
11865E69C29698A4179E1F3F /* Pods-Vector.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Vector.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Vector/Pods-Vector.debug.xcconfig"; sourceTree = "<group>"; };
435C7E1A9BC3DE28D526540F /* Pods-Vector.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Vector.release.xcconfig"; path = "Pods/Target Support Files/Pods-Vector/Pods-Vector.release.xcconfig"; sourceTree = "<group>"; };
71BE02331BFCA5E800D0B1DA /* RoomExtraInfosInfoView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RoomExtraInfosInfoView.h; path = RoomExtraInfosInfoView/RoomExtraInfosInfoView.h; sourceTree = "<group>"; };
71BE02341BFCA5E800D0B1DA /* RoomExtraInfosInfoView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RoomExtraInfosInfoView.m; path = RoomExtraInfosInfoView/RoomExtraInfosInfoView.m; sourceTree = "<group>"; };
71BE02351BFCA5E800D0B1DA /* RoomExtraInfosInfoView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = RoomExtraInfosInfoView.xib; path = RoomExtraInfosInfoView/RoomExtraInfosInfoView.xib; sourceTree = "<group>"; };
9B179239B79688A61A3F465F /* libPods-Vector.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Vector.a"; sourceTree = BUILT_PRODUCTS_DIR; };
F001D7541B8207C000A162C3 /* RoomIncomingBubbleTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoomIncomingBubbleTableViewCell.h; sourceTree = "<group>"; };
F001D7551B8207C000A162C3 /* RoomIncomingBubbleTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RoomIncomingBubbleTableViewCell.m; sourceTree = "<group>"; };
@ -232,6 +237,16 @@
name = Frameworks;
sourceTree = "<group>";
};
71BE02321BFCA54800D0B1DA /* RoomExtraInfosInfoView */ = {
isa = PBXGroup;
children = (
71BE02331BFCA5E800D0B1DA /* RoomExtraInfosInfoView.h */,
71BE02341BFCA5E800D0B1DA /* RoomExtraInfosInfoView.m */,
71BE02351BFCA5E800D0B1DA /* RoomExtraInfosInfoView.xib */,
);
name = RoomExtraInfosInfoView;
sourceTree = "<group>";
};
E1451F540F8BC02A7FB7AA31 /* Pods */ = {
isa = PBXGroup;
children = (
@ -246,6 +261,7 @@
children = (
F084DAAA1BB57BD100B4C530 /* Authentication */,
F001D7531B8207C000A162C3 /* RoomBubbleList */,
71BE02321BFCA54800D0B1DA /* RoomExtraInfosInfoView */,
F001D75A1B8207C000A162C3 /* RoomInputToolbar */,
);
path = Views;
@ -499,7 +515,6 @@
F094A99F1B78D8F000B1FBBF /* Frameworks */,
F094A9A01B78D8F000B1FBBF /* Resources */,
44C35695CFA4F9799C449367 /* Copy Pods Resources */,
CE74DDBF8318D6A2441D715E /* Embed Pods Frameworks */,
);
buildRules = (
);
@ -620,6 +635,7 @@
F00E08411B8380CF0057012C /* settings@2x.png in Resources */,
F00E08401B8380CF0057012C /* settings.png in Resources */,
F0E956C81B836CCD004C1699 /* icon_menu.png in Resources */,
71BE02371BFCA5E800D0B1DA /* RoomExtraInfosInfoView.xib in Resources */,
F0DD7D6C1B7AA8C900C4BE02 /* search.png in Resources */,
F00B1BD01B95D22E001806E3 /* camera_switch.png in Resources */,
F094AA2C1B78E42600B1FBBF /* Vector.strings in Resources */,
@ -666,21 +682,6 @@
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
CE74DDBF8318D6A2441D715E /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Vector/Pods-Vector-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
@ -698,6 +699,7 @@
F001D75E1B8207C000A162C3 /* RoomIncomingBubbleTableViewCell.m in Sources */,
F094AA321B78E42600B1FBBF /* GlobalNotificationSettingsViewController.m in Sources */,
F094A9A81B78D8F000B1FBBF /* main.m in Sources */,
71BE02361BFCA5E800D0B1DA /* RoomExtraInfosInfoView.m in Sources */,
F0DD7D881B7B507100C4BE02 /* RoomCreationStep2ViewController.m in Sources */,
F094AA2D1B78E42600B1FBBF /* RecentListDataSource.m in Sources */,
F094AA2A1B78E42600B1FBBF /* RageShakeManager.m in Sources */,

5
Vector/ViewController/RoomViewController.m
View file

@ -21,6 +21,8 @@
#import "RoomInputToolbarView.h"
#import "RoomExtraInfosInfoView.h"
#import "RoomParticipantsViewController.h"
@interface RoomViewController ()
@ -55,6 +57,9 @@
[self setRoomInputToolbarViewClass:RoomInputToolbarView.class];
[self roomInputToolbarView:self.inputToolbarView heightDidChanged:((RoomInputToolbarView*)self.inputToolbarView).mainToolbarHeightConstraint.constant completion:nil];
// set extra area
[self setRoomExtraInfoViewClass:RoomExtraInfosInfoView.class];
// Set rageShake handler
self.rageShakeManager = [RageShakeManager sharedManager];

25
Vector/Views/RoomExtraInfosInfoView/RoomExtraInfosInfoView.h Normal file
View file

@ -0,0 +1,25 @@
/*
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 <MatrixKit/MatrixKit.h>
/**
`RoomExtraInfosInfoView` instance is a view used to display extra information
*/
@interface RoomExtraInfosInfoView : MXKRoomExtraInfoView
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *mainHeightConstraint;
@end

51
Vector/Views/RoomExtraInfosInfoView/RoomExtraInfosInfoView.m Normal file
View file

@ -0,0 +1,51 @@
/*
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 "RoomExtraInfosInfoView.h"
@implementation RoomExtraInfosInfoView
+ (UINib *)nib
{
return [UINib nibWithNibName:NSStringFromClass([RoomExtraInfosInfoView class])
bundle:[NSBundle bundleForClass:[RoomExtraInfosInfoView class]]];
}
+ (instancetype)roomExtraInfoView
{
if ([[self class] nib])
{
return [[[self class] nib] instantiateWithOwner:nil options:nil].firstObject;
}
else
{
return [[self alloc] init];
}
}
- (CGFloat)height
{
return self.mainHeightConstraint.constant;
}
- (void)awakeFromNib
{
[super awakeFromNib];
// Remove default toolbar background color
self.backgroundColor = [UIColor whiteColor];
}
@end

37
Vector/Views/RoomExtraInfosInfoView/RoomExtraInfosInfoView.xib Normal file
View file

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8191"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB" userLabel="Room Extras Infos View" customClass="RoomExtraInfosInfoView">
<rect key="frame" x="0.0" y="0.0" width="600" height="50"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qhJ-5H-64e" userLabel="Container">
<rect key="frame" x="0.0" y="0.0" width="600" height="50"/>
<color key="backgroundColor" red="0.75890770890000003" green="1" blue="0.29818001440000003" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="xPK-Yw-hQ9"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="qhJ-5H-64e" firstAttribute="width" secondItem="iN0-l3-epB" secondAttribute="width" id="4o2-V9-a4L"/>
<constraint firstItem="qhJ-5H-64e" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="wDi-7P-36c"/>
<constraint firstItem="qhJ-5H-64e" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="wsu-Zi-OE6"/>
</constraints>
<nil key="simulatedStatusBarMetrics"/>
<nil key="simulatedTopBarMetrics"/>
<nil key="simulatedBottomBarMetrics"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<connections>
<outlet property="mainHeightConstraint" destination="xPK-Yw-hQ9" id="dJ5-pI-KyT"/>
</connections>
</view>
</objects>
</document>