mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-07 14:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

UI changes

Browse source
This commit is contained in:
Joerg Platte 2013-01-16 15:36:16 +01:00
parent b67078e9b9
commit 4fb0b7ec04
8 changed files with 244 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Classes/BuschJaegerCallView.m
View file

@ -23,6 +23,7 @@
#include "linphonecore.h"
#import <QuartzCore/QuartzCore.h>
#import <AudioToolbox/AudioToolbox.h>
#import "UIView+RoundUIView.h"
@implementation BuschJaegerCallView
@ -108,6 +109,7 @@
UIColor* col1 = BUSCHJAEGER_NORMAL_COLOR;
UIColor* col2 = BUSCHJAEGER_NORMAL_COLOR2;
[BuschJaegerUtils createGradientForButton:microButton withTopColor:col1 bottomColor:col2];
[microButton makeRoundWithCorner:(UIRectCornerBottomLeft|UIRectCornerTopLeft) radius:(microButton.bounds.size.height/2.0)];
}
{
UIColor* col1 = BUSCHJAEGER_RED_COLOR;
@ -115,12 +117,16 @@
[BuschJaegerUtils createGradientForButton:endOrRejectCallButton withTopColor:col1 bottomColor:col2];
[BuschJaegerUtils createGradientForButton:declineButton withTopColor:col1 bottomColor:col2];
[endOrRejectCallButton makeRoundWithCorner:(UIRectCornerBottomLeft|UIRectCornerTopLeft) radius:(endOrRejectCallButton.bounds.size.height/2.0)];
[declineButton makeRoundWithCorner:(UIRectCornerBottomLeft|UIRectCornerTopLeft) radius:(declineButton.bounds.size.height/2.0)];
}
{
UIColor* col1 = BUSCHJAEGER_GREEN_COLOR;
UIColor* col2 = BUSCHJAEGER_GREEN_COLOR;
[BuschJaegerUtils createGradientForButton:takeCallButton withTopColor:col1 bottomColor:col2];
[takeCallButton makeRoundWithCorner:(UIRectCornerBottomRight|UIRectCornerTopRight) radius:(takeCallButton.bounds.size.height/2.0)];
}
linphone_core_set_native_video_window_id([LinphoneManager getLc], (unsigned long)videoView);

144
Classes/BuschJaegerCallView.xib
View file

@ -166,7 +166,6 @@
<int key="NSvFlags">-2147483356</int>
<string key="NSFrame">{{207, 0}, {73, 58}}</string>
<reference key="NSSuperview" ref="903884486"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:225</string>
<reference key="IBUIBackgroundColor" ref="666829842"/>
<bool key="IBUIOpaque">NO</bool>
@ -259,7 +258,6 @@
<reference key="NSSuperview" ref="935863454"/>
<reference key="NSNextKeyView" ref="317702958"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -565,7 +563,147 @@
<nil key="sourceID"/>
<int key="maxID">91</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes"/>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">BuschJaegerCallView</string>
<string key="superclassName">UIViewController</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="onSnapshotClick:">id</string>
<string key="takeCall:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="onSnapshotClick:">
<string key="name">onSnapshotClick:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="takeCall:">
<string key="name">takeCall:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="cameraLeftSwipeGestureRecognizer">UISwipeGestureRecognizer</string>
<string key="cameraRightSwipeGestureRecognizer">UISwipeGestureRecognizer</string>
<string key="contactLabel">UILabel</string>
<string key="declineButton">UIHangUpButton</string>
<string key="endOrRejectCallButton">UIHangUpButton</string>
<string key="incomingView">UIView</string>
<string key="lightsButton">UIDigitButton</string>
<string key="microButton">UIToggleButton</string>
<string key="openDoorButton">UIDigitButton</string>
<string key="snapshotButton">UIButton</string>
<string key="takeCallButton">UIButton</string>
<string key="videoView">UIView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="cameraLeftSwipeGestureRecognizer">
<string key="name">cameraLeftSwipeGestureRecognizer</string>
<string key="candidateClassName">UISwipeGestureRecognizer</string>
</object>
<object class="IBToOneOutletInfo" key="cameraRightSwipeGestureRecognizer">
<string key="name">cameraRightSwipeGestureRecognizer</string>
<string key="candidateClassName">UISwipeGestureRecognizer</string>
</object>
<object class="IBToOneOutletInfo" key="contactLabel">
<string key="name">contactLabel</string>
<string key="candidateClassName">UILabel</string>
</object>
<object class="IBToOneOutletInfo" key="declineButton">
<string key="name">declineButton</string>
<string key="candidateClassName">UIHangUpButton</string>
</object>
<object class="IBToOneOutletInfo" key="endOrRejectCallButton">
<string key="name">endOrRejectCallButton</string>
<string key="candidateClassName">UIHangUpButton</string>
</object>
<object class="IBToOneOutletInfo" key="incomingView">
<string key="name">incomingView</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo" key="lightsButton">
<string key="name">lightsButton</string>
<string key="candidateClassName">UIDigitButton</string>
</object>
<object class="IBToOneOutletInfo" key="microButton">
<string key="name">microButton</string>
<string key="candidateClassName">UIToggleButton</string>
</object>
<object class="IBToOneOutletInfo" key="openDoorButton">
<string key="name">openDoorButton</string>
<string key="candidateClassName">UIDigitButton</string>
</object>
<object class="IBToOneOutletInfo" key="snapshotButton">
<string key="name">snapshotButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="takeCallButton">
<string key="name">takeCallButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="videoView">
<string key="name">videoView</string>
<string key="candidateClassName">UIView</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/BuschJaegerCallView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIDigitButton</string>
<string key="superclassName">UILongTouchButton</string>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">addressField</string>
<string key="NS.object.0">UITextField</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">addressField</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">addressField</string>
<string key="candidateClassName">UITextField</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/UIDigitButton.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIHangUpButton</string>
<string key="superclassName">UIButton</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/UIHangUpButton.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UILongTouchButton</string>
<string key="superclassName">UIButton</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/UILongTouchButton.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIMicroButton</string>
<string key="superclassName">UIToggleButton</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/UIMicroButton.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIToggleButton</string>
<string key="superclassName">UIButton</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/UIToggleButton.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">

2
Classes/BuschJaegerWelcomeView.xib
View file

@ -41,7 +41,7 @@
<object class="IBUILabel" id="324231259">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">293</int>
<string key="NSFrame">{{82, 17}, {156, 50}}</string>
<string key="NSFrame">{{65, 17}, {156, 50}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView" ref="606095570"/>
<string key="NSReuseIdentifierKey">_NS:9</string>

1
Classes/LinphoneUI/UIHangUpButton.m
View file

@ -20,7 +20,6 @@
#import "UIHangUpButton.h"
#import "LinphoneManager.h"
@implementation UIHangUpButton

57
Classes/LinphoneUI/UIHistoryCell.xib
View file

@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1536</int>
<string key="IBDocument.SystemVersion">11G63</string>
<string key="IBDocument.InterfaceBuilderVersion">2840</string>
<string key="IBDocument.AppKitVersion">1138.51</string>
<string key="IBDocument.HIToolboxVersion">569.00</string>
<string key="IBDocument.SystemVersion">12C60</string>
<string key="IBDocument.InterfaceBuilderVersion">2844</string>
<string key="IBDocument.AppKitVersion">1187.34</string>
<string key="IBDocument.HIToolboxVersion">625.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">1926</string>
<string key="NS.object.0">1930</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBProxyObject</string>
@ -42,6 +42,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{5, 5}, {32, 32}}</string>
<reference key="NSSuperview" ref="1038390791"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="942147892"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -52,6 +53,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{45, 10}, {120, 21}}</string>
<reference key="NSSuperview" ref="1038390791"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="661666265"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
@ -82,6 +84,7 @@
<int key="NSvFlags">289</int>
<string key="NSFrame">{{173, 10}, {103, 21}}</string>
<reference key="NSSuperview" ref="1038390791"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="509979453"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
@ -109,6 +112,7 @@
<int key="NSvFlags">289</int>
<string key="NSFrame">{{276, 0}, {44, 44}}</string>
<reference key="NSSuperview" ref="1038390791"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -140,6 +144,7 @@
</array>
<string key="NSFrameSize">{320, 42}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="171265463"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
@ -261,7 +266,45 @@
<nil key="sourceID"/>
<int key="maxID">13</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes"/>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">UIHistoryCell</string>
<string key="superclassName">UITableViewCell</string>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="dateLabel">UILabel</string>
<string key="iconImage">UIRemoteImageView</string>
<string key="stationLabel">UILabel</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="dateLabel">
<string key="name">dateLabel</string>
<string key="candidateClassName">UILabel</string>
</object>
<object class="IBToOneOutletInfo" key="iconImage">
<string key="name">iconImage</string>
<string key="candidateClassName">UIRemoteImageView</string>
</object>
<object class="IBToOneOutletInfo" key="stationLabel">
<string key="name">stationLabel</string>
<string key="candidateClassName">UILabel</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/UIHistoryCell.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIRemoteImageView</string>
<string key="superclassName">UIImageView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/UIRemoteImageView.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
@ -274,6 +317,6 @@
<string key="NS.key.0">trash.png</string>
<string key="NS.object.0">{26, 26}</string>
</object>
<string key="IBCocoaTouchPluginVersion">1926</string>
<string key="IBCocoaTouchPluginVersion">1930</string>
</data>
</archive>

16
Classes/LinphoneUI/UIStationCell.m
View file

@ -20,6 +20,7 @@
#import "UIStationCell.h"
#import "BuschJaegerUtils.h"
#import <QuartzCore/QuartzCore.h>
#import "UIView+RoundUIView.h"
@implementation UIStationCell
@ -30,18 +31,6 @@
#pragma mark - Lifecycle Functions
- (void)roundView:(UIView *)view onCorner:(UIRectCorner)rectCorner radius:(float)radius
{
UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:view.bounds
byRoundingCorners:rectCorner
cornerRadii:CGSizeMake(radius, radius)];
CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
maskLayer.frame = view.bounds;
maskLayer.path = maskPath.CGPath;
[view.layer setMask:maskLayer];
[maskLayer release];
}
- (id)initWithIdentifier:(NSString*)identifier {
if ((self = [super initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier]) != nil) {
NSArray *arrayOfViews = [[NSBundle mainBundle] loadNibNamed:@"UIStationCell"
@ -57,7 +46,8 @@
CAGradientLayer *overlayButtonShineLayer;
[self roundView:cellBackgroundView onCorner:(UIRectCornerBottomLeft|UIRectCornerBottomRight) radius:7.0];
// [self roundView:cellBackgroundView onCorner:(UIRectCornerBottomLeft|UIRectCornerBottomRight) radius:7.0];
[cellBackgroundView makeRoundWithCorner:(UIRectCornerBottomLeft|UIRectCornerBottomRight) radius:7.0];
overlayButtonShineLayer = [CAGradientLayer layer];
overlayButtonShineLayer.name = @"BuschJaegerLayer";

15
Classes/UIView+RoundUIView.h Normal file
View file

@ -0,0 +1,15 @@
//
// UIView+RoundUIView.h
// linphone
//
// Created by Jörg Platte on 16.01.13.
//
//
#import <UIKit/UIKit.h>
@interface UIView (RoundUIView)
- (void)makeRoundWithCorner:(UIRectCorner)rectCorner radius:(float)radius;
@end

28
Classes/UIView+RoundUIView.m Normal file
View file

@ -0,0 +1,28 @@
//
// UIView+RoundUIView.m
// linphone
//
// Created by Jörg Platte on 16.01.13.
//
//
#import "UIView+RoundUIView.h"
#import <UIKit/UIKit.h>
#import <QuartzCore/QuartzCore.h>
@implementation UIView (RoundUIView)
- (void)makeRoundWithCorner:(UIRectCorner)rectCorner radius:(float)radius
{
UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:self.bounds
byRoundingCorners:rectCorner
cornerRadii:CGSizeMake(radius, radius)];
CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
maskLayer.frame = self.bounds;
maskLayer.path = maskPath.CGPath;
[self.layer setMask:maskLayer];
[maskLayer release];
}
@end