Change Callbar

Show video on background
This commit is contained in:
Yann Diorcet 2012-07-12 12:32:32 +02:00
parent 6de8b68597
commit 050b216fd0
11 changed files with 73 additions and 248 deletions

View file

@ -264,6 +264,9 @@ const NSInteger SECURE_BUTTON_TAG=5;
[UIView beginAnimations:nil context:nil];
[UIView setAnimationDuration:0.3];
[[PhoneMainView instance] showTabBar: true];
/* MODIFICATION show video in background */
[callTableView setAlpha:1.0];
/* */
if ([LinphoneManager instance].frontCamId !=nil ) {
// only show camera switch button if we have more than 1 camera
[videoCameraSwitch setAlpha:1.0];
@ -284,9 +287,12 @@ const NSInteger SECURE_BUTTON_TAG=5;
[videoCameraSwitch setAlpha:0.0];
[UIView commitAnimations];
if([[PhoneMainView instance] currentView] == PhoneView_InCall && videoShown)
if([[PhoneMainView instance] currentView] == PhoneView_InCall && videoShown) {
[[PhoneMainView instance] showTabBar: false];
/* MODIFICATION show video in background */
[callTableView setAlpha:0.0];
/* */
}
if (hideControlsTimer) {
[hideControlsTimer invalidate];
hideControlsTimer = nil;
@ -322,6 +328,10 @@ const NSInteger SECURE_BUTTON_TAG=5;
[videoGroup setAlpha:1.0];
[callTableView setAlpha:0.0];
/* MODIFICATION show video in background */
[callTableController minimizeAll];
/* */
if(animation) {
[UIView commitAnimations];
}
@ -358,6 +368,7 @@ const NSInteger SECURE_BUTTON_TAG=5;
[videoGroup setAlpha:0.0];
[[PhoneMainView instance] showTabBar: true];
[callTableView setAlpha:1.0];
[videoCameraSwitch setAlpha:0.0];

View file

@ -43,6 +43,7 @@
<string key="NSFrame">{{0, 335}, {320, 125}}</string>
<reference key="NSSuperview" ref="931774220"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
@ -59,12 +60,13 @@
<reference key="NSNextResponder" ref="931774220"/>
<int key="NSvFlags">-2147483360</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIImageView" id="650366159">
<object class="IBUIImageView" id="526430587">
<reference key="NSNextResponder" ref="556199520"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{320, 460}</string>
<reference key="NSSuperview" ref="556199520"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="291142801"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@ -384,7 +386,7 @@
<string key="NSFrameSize">{320, 460}</string>
<reference key="NSSuperview" ref="931774220"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="291142801"/>
<reference key="NSNextKeyView" ref="526430587"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
@ -395,89 +397,6 @@
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="1070539677">
<reference key="NSNextResponder" ref="931774220"/>
<int key="NSvFlags">-2147483356</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIButton" id="322088049">
<reference key="NSNextResponder" ref="1070539677"/>
<int key="NSvFlags">-2147483356</int>
<string key="NSFrameSize">{80, 67}</string>
<reference key="NSSuperview" ref="1070539677"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="471717543"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
<string key="IBUIAccessibilityLabel">Add call</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<reference key="IBUINormalTitleShadowColor" ref="838911807"/>
<object class="NSCustomResource" key="IBUIHighlightedImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">options_transfer_over.png</string>
</object>
<object class="NSCustomResource" key="IBUIDisabledImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">options_transfer_disabled.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">options_transfer_default.png</string>
</object>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="794091713">
<int key="type">2</int>
<double key="pointSize">15</double>
</object>
<reference key="IBUIFont" ref="315645433"/>
</object>
<object class="IBUIButton" id="471717543">
<reference key="NSNextResponder" ref="1070539677"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{0, 58}, {80, 75}}</string>
<reference key="NSSuperview" ref="1070539677"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="464536687"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
<string key="IBUIAccessibilityLabel">Add call</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<reference key="IBUINormalTitleShadowColor" ref="838911807"/>
<object class="NSCustomResource" key="IBUIHighlightedImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">options_add_over.png</string>
</object>
<object class="NSCustomResource" key="IBUIDisabledImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">options_add_disabled.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">options_add_default.png</string>
</object>
<reference key="IBUIFontDescription" ref="794091713"/>
<reference key="IBUIFont" ref="315645433"/>
</object>
</array>
<string key="NSFrame">{{240, 201}, {80, 134}}</string>
<reference key="NSSuperview" ref="931774220"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="322088049"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor" id="67221425">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIView" id="143533231">
<reference key="NSNextResponder" ref="931774220"/>
<int key="NSvFlags">292</int>
@ -516,7 +435,10 @@
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">video_off_default.png</string>
</object>
<reference key="IBUIFontDescription" ref="794091713"/>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="794091713">
<int key="type">2</int>
<double key="pointSize">15</double>
</object>
<reference key="IBUIFont" ref="315645433"/>
</object>
<object class="IBUIActivityIndicatorView" id="1016105438">
@ -574,7 +496,7 @@
<string key="NSFrame">{{160, 0}, {80, 67}}</string>
<reference key="NSSuperview" ref="143533231"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="62185125"/>
<reference key="NSNextKeyView" ref="471717543"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@ -605,7 +527,7 @@
<reference key="IBUIFontDescription" ref="794091713"/>
<reference key="IBUIFont" ref="315645433"/>
</object>
<object class="IBUIButton" id="62185125">
<object class="IBUIButton" id="471717543">
<reference key="NSNextResponder" ref="143533231"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{240, 0}, {80, 67}}</string>
@ -621,23 +543,18 @@
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
<reference key="IBUINormalTitleShadowColor" ref="838911807"/>
<object class="NSCustomResource" key="IBUIHighlightedImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">options_over.png</string>
<string key="NSResourceName">options_add_over.png</string>
</object>
<object class="NSCustomResource" key="IBUIDisabledImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">options_disabled.png</string>
</object>
<object class="NSCustomResource" key="IBUISelectedImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">options_selected.png</string>
<string key="NSResourceName">options_add_disabled.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">options_default.png</string>
<string key="NSResourceName">options_add_default.png</string>
</object>
<reference key="IBUIFontDescription" ref="794091713"/>
<reference key="IBUIFont" ref="315645433"/>
@ -739,7 +656,7 @@
<string key="NSFrame">{{215, 67}, {105, 68}}</string>
<reference key="NSSuperview" ref="143533231"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1070539677"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@ -768,7 +685,10 @@
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="262544423"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="IBUIBackgroundColor" ref="67221425"/>
<object class="NSColor" key="IBUIBackgroundColor" id="67221425">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</array>
@ -816,14 +736,6 @@
</object>
<int key="connectionID">15</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">optionsButton</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="62185125"/>
</object>
<int key="connectionID">19</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">speakerButton</string>
@ -952,14 +864,6 @@
</object>
<int key="connectionID">86</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">optionsView</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="1070539677"/>
</object>
<int key="connectionID">92</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">optionsAddButton</string>
@ -968,14 +872,6 @@
</object>
<int key="connectionID">96</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">optionsTransferButton</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="322088049"/>
</object>
<int key="connectionID">97</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onPadClick:</string>
@ -985,15 +881,6 @@
</object>
<int key="connectionID">46</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onOptionsClick:</string>
<reference key="source" ref="62185125"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">20</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">waitView</string>
@ -1011,15 +898,6 @@
</object>
<int key="connectionID">28</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onOptionsClick:</string>
<reference key="source" ref="471717543"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">89</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onOptionsAddClick:</string>
@ -1032,20 +910,11 @@
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onOptionsClick:</string>
<reference key="source" ref="322088049"/>
<reference key="source" ref="471717543"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">91</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onOptionsTransferClick:</string>
<reference key="source" ref="322088049"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">98</int>
<int key="connectionID">89</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
@ -1074,7 +943,6 @@
<reference ref="464536687"/>
<reference ref="143533231"/>
<reference ref="556199520"/>
<reference ref="1070539677"/>
</array>
<reference key="parent" ref="0"/>
<string key="objectName">callTabBar</string>
@ -1093,12 +961,12 @@
<reference ref="262544423"/>
<reference ref="693636558"/>
<reference ref="264394465"/>
<reference ref="62185125"/>
<reference ref="542459126"/>
<reference ref="351323248"/>
<reference ref="99607181"/>
<reference ref="976589610"/>
<reference ref="1016105438"/>
<reference ref="471717543"/>
</array>
<reference key="parent" ref="931774220"/>
<string key="objectName">buttons</string>
@ -1127,12 +995,6 @@
<reference key="parent" ref="143533231"/>
<string key="objectName">pauseButton</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">10</int>
<reference key="object" ref="62185125"/>
<reference key="parent" ref="143533231"/>
<string key="objectName">optionsButton</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">9</int>
<reference key="object" ref="264394465"/>
@ -1167,7 +1029,7 @@
<reference ref="843780954"/>
<reference ref="612787992"/>
<reference ref="291142801"/>
<reference ref="650366159"/>
<reference ref="526430587"/>
</array>
<reference key="parent" ref="931774220"/>
<string key="objectName">pad</string>
@ -1251,33 +1113,17 @@
<string key="objectName">#</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">87</int>
<reference key="object" ref="1070539677"/>
<array class="NSMutableArray" key="children">
<reference ref="471717543"/>
<reference ref="322088049"/>
</array>
<reference key="parent" ref="931774220"/>
<string key="objectName">optionsView</string>
<int key="objectID">99</int>
<reference key="object" ref="526430587"/>
<reference key="parent" ref="556199520"/>
<string key="objectName">background</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">88</int>
<reference key="object" ref="471717543"/>
<reference key="parent" ref="1070539677"/>
<reference key="parent" ref="143533231"/>
<string key="objectName">optionsAddButton</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">90</int>
<reference key="object" ref="322088049"/>
<reference key="parent" ref="1070539677"/>
<string key="objectName">optionsTansferButton</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">99</int>
<reference key="object" ref="650366159"/>
<reference key="parent" ref="556199520"/>
<string key="objectName">background</string>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@ -1285,8 +1131,6 @@
<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="-2.CustomClassName">UIResponder</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="2" key="10.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="11.CustomClassName">UIMicroButton</string>
<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="3" key="11.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
@ -1345,14 +1189,11 @@
<string key="8.CustomClassName">UIPauseButton</string>
<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="2" key="8.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="87.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="88.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="3" key="88.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="9.CustomClassName">UISpeakerButton</string>
<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="3" key="9.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="90.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="3" key="90.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="99.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
@ -1662,13 +1503,6 @@
<string key="options_add_default.png">{160, 134}</string>
<string key="options_add_disabled.png">{160, 134}</string>
<string key="options_add_over.png">{160, 134}</string>
<string key="options_default.png">{160, 134}</string>
<string key="options_disabled.png">{160, 134}</string>
<string key="options_over.png">{160, 134}</string>
<string key="options_selected.png">{160, 134}</string>
<string key="options_transfer_default.png">{155, 137}</string>
<string key="options_transfer_disabled.png">{155, 137}</string>
<string key="options_transfer_over.png">{155, 137}</string>
<string key="pause_off_default.png">{209, 136}</string>
<string key="pause_off_over.png">{209, 136}</string>
<string key="pause_on_default.png">{209, 136}</string>

View file

@ -115,7 +115,7 @@
}
+ (int)getMinimizedHeight {
return 54;
return 63; //MODIFICATION Change row behaviour
}
- (void)startBlinkAnimation:(NSString *)animationID target:(UIView *)target {

View file

@ -54,7 +54,7 @@
#pragma mark - Static size Functions
+ (int)getHeight {
return 50;
return 68; //MODIFICATION row behaviour
}

View file

@ -24,6 +24,9 @@
UIButton *contactsButton;
UIButton *dialerButton;
UIButton *settingsButton;
/* MODIFICATION Remove chat
UIButton *chatButton;
*/
UIButton *moreButton;
}
@ -31,10 +34,16 @@
@property (nonatomic, retain) IBOutlet UIButton* contactsButton;
@property (nonatomic, retain) IBOutlet UIButton* dialerButton;
@property (nonatomic, retain) IBOutlet UIButton* settingsButton;
/* MODIFICATION Remove chat
@property (nonatomic, retain) IBOutlet UIButton* chatButton;
*/
@property (nonatomic, retain) IBOutlet UIButton* moreButton;
-(IBAction) onHistoryClick: (id) event;
-(IBAction) onContactsClick: (id) event;
-(IBAction) onDialerClick: (id) event;
-(IBAction) onSettingsClick: (id) event;
/* MODIFICATION Remove chat
-(IBAction) onChatClick: (id) event;
*/
-(IBAction) onMoreClick: (id) event;
@end

View file

@ -26,6 +26,9 @@
@synthesize contactsButton;
@synthesize dialerButton;
@synthesize settingsButton;
/* MODIFICATION Remove chat
@synthesize chatButton;
*/
@synthesize moreButton;
@ -101,11 +104,13 @@
} else {
settingsButton.selected = FALSE;
}
/* MODIFICATION Remove chat
if(view == PhoneView_Chat || view == PhoneView_ChatRoom) {
moreButton.selected = TRUE;
} else {
moreButton.selected = FALSE;
}
}*/
}
@ -127,9 +132,15 @@
[[PhoneMainView instance] changeView:PhoneView_Settings];
}
- (IBAction)onMoreClick: (id) event {
/* MODIFICATION Remove chat
- (IBAction)onChatClick: (id) event {
[[PhoneMainView instance] changeView:PhoneView_Chat];
}
*/
- (IBAction)onMoreClick: (id) event {
//[[PhoneMainView instance] changeView:PhoneView_Chat];
}
@end

View file

@ -30,8 +30,10 @@ typedef enum _PhoneView {
PhoneView_Dialer,
PhoneView_History,
PhoneView_Settings,
/* MODIFICATION: Disable Chat
PhoneView_Chat,
PhoneView_ChatRoom,
*/
PhoneView_Contacts,
PhoneView_ContactDetails,
PhoneView_InCall,

View file

@ -24,8 +24,10 @@
#import "FirstLoginViewController.h"
#import "IncomingCallViewController.h"
/* MODIFICATION: Disable Chat
#import "ChatRoomViewController.h"
#import "ChatViewController.h"
*/
#import "DialerViewController.h"
#import "ContactsViewController.h"
#import "HistoryViewController.h"
@ -107,8 +109,10 @@ static PhoneMainView* phoneMainViewInstance=nil;
[[self view] addSubview: mainViewController.view];
// Init descriptions
/* MODIFICATION: Disable Chat
[viewDescriptions setObject:[ChatRoomViewController compositeViewDescription] forKey:[NSNumber numberWithInt: PhoneView_ChatRoom]];
[viewDescriptions setObject:[ChatViewController compositeViewDescription] forKey:[NSNumber numberWithInt: PhoneView_Chat]];
*/
[viewDescriptions setObject:[DialerViewController compositeViewDescription] forKey:[NSNumber numberWithInt: PhoneView_Dialer]];
[viewDescriptions setObject:[ContactsViewController compositeViewDescription] forKey:[NSNumber numberWithInt: PhoneView_Contacts]];
[viewDescriptions setObject:[HistoryViewController compositeViewDescription] forKey:[NSNumber numberWithInt: PhoneView_History]];
@ -283,6 +287,7 @@ static PhoneMainView* phoneMainViewInstance=nil;
+ (CATransition*)getTransition:(PhoneView)old new:(PhoneView)new {
bool left = false;
/* MODIFICATION: Disable Chat
if(old == PhoneView_Chat) {
if(new == PhoneView_Contacts ||
new == PhoneView_Dialer ||
@ -290,7 +295,8 @@ static PhoneMainView* phoneMainViewInstance=nil;
new == PhoneView_History) {
left = true;
}
} else if(old == PhoneView_Settings) {
} else */
if(old == PhoneView_Settings) {
if(new == PhoneView_Dialer ||
new == PhoneView_Contacts ||
new == PhoneView_History) {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View file

@ -240,8 +240,6 @@
D32942A51594C94300556A1C /* SettingsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D32942A31594C94200556A1C /* SettingsViewController.xib */; };
D32B6E2415A5B2020033019F /* chat_send_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D32B6E2315A5B2020033019F /* chat_send_disabled.png */; };
D32B6E2515A5B2020033019F /* chat_send_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D32B6E2315A5B2020033019F /* chat_send_disabled.png */; };
D32B6E2915A5BC440033019F /* ChatRoomTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D32B6E2815A5BC430033019F /* ChatRoomTableViewController.m */; };
D32B6E2A15A5BC440033019F /* ChatRoomTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D32B6E2815A5BC430033019F /* ChatRoomTableViewController.m */; };
D32B6E2C15A5C0800033019F /* database.sqlite in Resources */ = {isa = PBXBuildFile; fileRef = D32B6E2B15A5C0800033019F /* database.sqlite */; };
D32B6E2D15A5C0800033019F /* database.sqlite in Resources */ = {isa = PBXBuildFile; fileRef = D32B6E2B15A5C0800033019F /* database.sqlite */; };
D32B6E2F15A5C0AC0033019F /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D32B6E2E15A5C0AC0033019F /* libsqlite3.dylib */; };
@ -336,10 +334,6 @@
D35E758A15932DE60066B1C1 /* backspace_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D35E758815932DE60066B1C1 /* backspace_disabled.png */; };
D35E758D15934F360066B1C1 /* call_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D35E758C15934F360066B1C1 /* call_disabled.png */; };
D35E758E15934F360066B1C1 /* call_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D35E758C15934F360066B1C1 /* call_disabled.png */; };
D35E7597159460580066B1C1 /* ChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35E7595159460560066B1C1 /* ChatViewController.m */; };
D35E7598159460580066B1C1 /* ChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35E7595159460560066B1C1 /* ChatViewController.m */; };
D35E7599159460580066B1C1 /* ChatViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D35E7596159460570066B1C1 /* ChatViewController.xib */; };
D35E759A159460580066B1C1 /* ChatViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D35E7596159460570066B1C1 /* ChatViewController.xib */; };
D35E759F159460B70066B1C1 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35E759D159460B50066B1C1 /* SettingsViewController.m */; };
D35E75A0159460B70066B1C1 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35E759D159460B50066B1C1 /* SettingsViewController.m */; };
D35EA76315A2DF8D003E025D /* micro_off_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D35EA76115A2DF8D003E025D /* micro_off_disabled.png */; };
@ -478,10 +472,6 @@
D3A55FBD15877E5E003FD403 /* UIContactCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A55FBB15877E5E003FD403 /* UIContactCell.m */; };
D3A55FBF15877E69003FD403 /* UIContactCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3A55FBE15877E69003FD403 /* UIContactCell.xib */; };
D3A55FC015877E69003FD403 /* UIContactCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3A55FBE15877E69003FD403 /* UIContactCell.xib */; };
D3A8BB7015A6C7D500F96BE5 /* UIChatRoomCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A8BB6F15A6C7D500F96BE5 /* UIChatRoomCell.m */; };
D3A8BB7115A6C7D500F96BE5 /* UIChatRoomCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A8BB6F15A6C7D500F96BE5 /* UIChatRoomCell.m */; };
D3A8BB7415A6C81A00F96BE5 /* UIChatRoomCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3A8BB7315A6C81A00F96BE5 /* UIChatRoomCell.xib */; };
D3A8BB7515A6C81A00F96BE5 /* UIChatRoomCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3A8BB7315A6C81A00F96BE5 /* UIChatRoomCell.xib */; };
D3A8BB7B15A6CC3200F96BE5 /* chat_bubble_outgoing.png in Resources */ = {isa = PBXBuildFile; fileRef = D3A8BB7615A6CC3200F96BE5 /* chat_bubble_outgoing.png */; };
D3A8BB7C15A6CC3200F96BE5 /* chat_bubble_outgoing.png in Resources */ = {isa = PBXBuildFile; fileRef = D3A8BB7615A6CC3200F96BE5 /* chat_bubble_outgoing.png */; };
D3A8BB7D15A6CC3200F96BE5 /* chat_bubble_incoming.png in Resources */ = {isa = PBXBuildFile; fileRef = D3A8BB7715A6CC3200F96BE5 /* chat_bubble_incoming.png */; };
@ -514,10 +504,6 @@
D3C6526E15AC228A0092A874 /* contact_ok_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3C6526A15AC228A0092A874 /* contact_ok_over.png */; };
D3C714B3159DB84400705B8E /* toy-mono.wav in Resources */ = {isa = PBXBuildFile; fileRef = D3C714B2159DB84400705B8E /* toy-mono.wav */; };
D3C714B4159DB84400705B8E /* toy-mono.wav in Resources */ = {isa = PBXBuildFile; fileRef = D3C714B2159DB84400705B8E /* toy-mono.wav */; };
D3D14E7715A70EE30074A527 /* UIChatRoomHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = D3D14E7515A70EE20074A527 /* UIChatRoomHeader.m */; };
D3D14E7815A70EE30074A527 /* UIChatRoomHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = D3D14E7515A70EE20074A527 /* UIChatRoomHeader.m */; };
D3D14E7915A70EE30074A527 /* UIChatRoomHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3D14E7615A70EE30074A527 /* UIChatRoomHeader.xib */; };
D3D14E7A15A70EE30074A527 /* UIChatRoomHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3D14E7615A70EE30074A527 /* UIChatRoomHeader.xib */; };
D3D14E7C15A711700074A527 /* avatar_shadow_small.png in Resources */ = {isa = PBXBuildFile; fileRef = D3D14E7B15A711700074A527 /* avatar_shadow_small.png */; };
D3D14E7D15A711700074A527 /* avatar_shadow_small.png in Resources */ = {isa = PBXBuildFile; fileRef = D3D14E7B15A711700074A527 /* avatar_shadow_small.png */; };
D3D6A39E159B0EEF005F692C /* add_call_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3D6A39B159B0EEF005F692C /* add_call_default.png */; };
@ -552,12 +538,6 @@
D3EA5408159852080037DC6B /* chat_add_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3EA5401159852080037DC6B /* chat_add_default.png */; };
D3EA5409159852080037DC6B /* chat_add_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3EA5402159852080037DC6B /* chat_add_over.png */; };
D3EA540A159852080037DC6B /* chat_add_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3EA5402159852080037DC6B /* chat_add_over.png */; };
D3EA540D1598528B0037DC6B /* ChatTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3EA540C1598528B0037DC6B /* ChatTableViewController.m */; };
D3EA540E1598528B0037DC6B /* ChatTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3EA540C1598528B0037DC6B /* ChatTableViewController.m */; };
D3EA5411159853750037DC6B /* UIChatCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3EA5410159853750037DC6B /* UIChatCell.m */; };
D3EA5412159853750037DC6B /* UIChatCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3EA5410159853750037DC6B /* UIChatCell.m */; };
D3EA5414159853C90037DC6B /* UIChatCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3EA5413159853C90037DC6B /* UIChatCell.xib */; };
D3EA5415159853C90037DC6B /* UIChatCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3EA5413159853C90037DC6B /* UIChatCell.xib */; };
D3EA5418159858A80037DC6B /* list_delete_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3EA5416159858A80037DC6B /* list_delete_default.png */; };
D3EA5419159858A80037DC6B /* list_delete_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3EA5416159858A80037DC6B /* list_delete_default.png */; };
D3EA541A159858A80037DC6B /* list_delete_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3EA5417159858A80037DC6B /* list_delete_over.png */; };
@ -620,10 +600,6 @@
D3F34F311599B008005BE94F /* avatar_shadow.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F34F2F1599B008005BE94F /* avatar_shadow.png */; };
D3F34F351599C354005BE94F /* UIModalViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F34F341599C354005BE94F /* UIModalViewController.m */; };
D3F34F361599C354005BE94F /* UIModalViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F34F341599C354005BE94F /* UIModalViewController.m */; };
D3F795D615A582810077328B /* ChatRoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F795D415A582800077328B /* ChatRoomViewController.m */; };
D3F795D715A582810077328B /* ChatRoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F795D415A582800077328B /* ChatRoomViewController.m */; };
D3F795D815A582810077328B /* ChatRoomViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3F795D515A582800077328B /* ChatRoomViewController.xib */; };
D3F795D915A582810077328B /* ChatRoomViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3F795D515A582800077328B /* ChatRoomViewController.xib */; };
D3F795DD15A5831C0077328B /* chat_back_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F795DB15A5831C0077328B /* chat_back_default.png */; };
D3F795DE15A5831C0077328B /* chat_back_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F795DB15A5831C0077328B /* chat_back_default.png */; };
D3F795DF15A5831C0077328B /* chat_back_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F795DC15A5831C0077328B /* chat_back_over.png */; };
@ -2634,7 +2610,6 @@
D35E757A15931E5D0066B1C1 /* switch_camera_over.png in Resources */,
D35E758915932DE60066B1C1 /* backspace_disabled.png in Resources */,
D35E758D15934F360066B1C1 /* call_disabled.png in Resources */,
D35E7599159460580066B1C1 /* ChatViewController.xib in Resources */,
D37DC70B1594AE6F00B2A5EB /* IASKAppSettingsView.xib in Resources */,
D37DC70D1594AE6F00B2A5EB /* IASKAppSettingsWebView.xib in Resources */,
D37DC70F1594AE6F00B2A5EB /* IASKPSSliderSpecifierViewCell.xib in Resources */,
@ -2647,7 +2622,6 @@
D3EA5405159852080037DC6B /* chat_edit_over.png in Resources */,
D3EA5407159852080037DC6B /* chat_add_default.png in Resources */,
D3EA5409159852080037DC6B /* chat_add_over.png in Resources */,
D3EA5414159853C90037DC6B /* UIChatCell.xib in Resources */,
D3EA5418159858A80037DC6B /* list_delete_default.png in Resources */,
D3EA541A159858A80037DC6B /* list_delete_over.png in Resources */,
D3F26BF315986B73005F9CAB /* IncomingCallViewController.xib in Resources */,
@ -2705,7 +2679,6 @@
D350F22C15A43D3400149E54 /* setup_welcome_logo.png in Resources */,
D35406F715A47E9E007E7E81 /* button_background_default.png in Resources */,
D35406F915A47E9E007E7E81 /* button_background_over.png in Resources */,
D3F795D815A582810077328B /* ChatRoomViewController.xib in Resources */,
D3F795DD15A5831C0077328B /* chat_back_default.png in Resources */,
D3F795DF15A5831C0077328B /* chat_back_over.png in Resources */,
D3B9A3DF15A58C450096EA4E /* chat_field.png in Resources */,
@ -2715,7 +2688,6 @@
D3B9A3E715A58C450096EA4E /* chat_send_over.png in Resources */,
D32B6E2415A5B2020033019F /* chat_send_disabled.png in Resources */,
D32B6E2C15A5C0800033019F /* database.sqlite in Resources */,
D3A8BB7415A6C81A00F96BE5 /* UIChatRoomCell.xib in Resources */,
D3A8BB7B15A6CC3200F96BE5 /* chat_bubble_outgoing.png in Resources */,
D3A8BB7D15A6CC3200F96BE5 /* chat_bubble_incoming.png in Resources */,
D3A8BB7F15A6CC3200F96BE5 /* setup_back_disabled.png in Resources */,
@ -2723,7 +2695,6 @@
D3A8BB8315A6CC3200F96BE5 /* setup_start_disabled.png in Resources */,
D389363915A6D53200A3A3AA /* chat_bubble_incoming.9.png in Resources */,
D389363B15A6D53200A3A3AA /* chat_bubble_outgoing.9.png in Resources */,
D3D14E7915A70EE30074A527 /* UIChatRoomHeader.xib in Resources */,
D3D14E7C15A711700074A527 /* avatar_shadow_small.png in Resources */,
D3128FE315AABC7E00A2147A /* ContactDetailsViewController.xib in Resources */,
D3128FEF15AABE4E00A2147A /* contact_back_default.png in Resources */,
@ -2879,7 +2850,6 @@
D35E757B15931E5D0066B1C1 /* switch_camera_over.png in Resources */,
D35E758A15932DE60066B1C1 /* backspace_disabled.png in Resources */,
D35E758E15934F360066B1C1 /* call_disabled.png in Resources */,
D35E759A159460580066B1C1 /* ChatViewController.xib in Resources */,
D37DC70C1594AE6F00B2A5EB /* IASKAppSettingsView.xib in Resources */,
D37DC70E1594AE6F00B2A5EB /* IASKAppSettingsWebView.xib in Resources */,
D37DC7101594AE6F00B2A5EB /* IASKPSSliderSpecifierViewCell.xib in Resources */,
@ -2892,7 +2862,6 @@
D3EA5406159852080037DC6B /* chat_edit_over.png in Resources */,
D3EA5408159852080037DC6B /* chat_add_default.png in Resources */,
D3EA540A159852080037DC6B /* chat_add_over.png in Resources */,
D3EA5415159853C90037DC6B /* UIChatCell.xib in Resources */,
D3EA5419159858A80037DC6B /* list_delete_default.png in Resources */,
D3EA541B159858A80037DC6B /* list_delete_over.png in Resources */,
D3F26BF415986B73005F9CAB /* IncomingCallViewController.xib in Resources */,
@ -2949,7 +2918,6 @@
D350F22D15A43D3400149E54 /* setup_welcome_logo.png in Resources */,
D35406F815A47E9E007E7E81 /* button_background_default.png in Resources */,
D35406FA15A47E9E007E7E81 /* button_background_over.png in Resources */,
D3F795D915A582810077328B /* ChatRoomViewController.xib in Resources */,
D3F795DE15A5831C0077328B /* chat_back_default.png in Resources */,
D3F795E015A5831C0077328B /* chat_back_over.png in Resources */,
D3B9A3E015A58C450096EA4E /* chat_field.png in Resources */,
@ -2959,7 +2927,6 @@
D3B9A3E815A58C450096EA4E /* chat_send_over.png in Resources */,
D32B6E2515A5B2020033019F /* chat_send_disabled.png in Resources */,
D32B6E2D15A5C0800033019F /* database.sqlite in Resources */,
D3A8BB7515A6C81A00F96BE5 /* UIChatRoomCell.xib in Resources */,
D3A8BB7C15A6CC3200F96BE5 /* chat_bubble_outgoing.png in Resources */,
D3A8BB7E15A6CC3200F96BE5 /* chat_bubble_incoming.png in Resources */,
D3A8BB8015A6CC3200F96BE5 /* setup_back_disabled.png in Resources */,
@ -2967,7 +2934,6 @@
D3A8BB8415A6CC3200F96BE5 /* setup_start_disabled.png in Resources */,
D389363A15A6D53200A3A3AA /* chat_bubble_incoming.9.png in Resources */,
D389363C15A6D53200A3A3AA /* chat_bubble_outgoing.9.png in Resources */,
D3D14E7A15A70EE30074A527 /* UIChatRoomHeader.xib in Resources */,
D3D14E7D15A711700074A527 /* avatar_shadow_small.png in Resources */,
D3128FE415AABC7E00A2147A /* ContactDetailsViewController.xib in Resources */,
D3128FF015AABE4E00A2147A /* contact_back_default.png in Resources */,
@ -3041,7 +3007,6 @@
D32409C3158B49A600C8C119 /* UILongTouchButton.m in Sources */,
D36C43C6158F2E5A0048BA40 /* UICallCell.m in Sources */,
D35E7581159328EB0066B1C1 /* UIAddressTextField.m in Sources */,
D35E7597159460580066B1C1 /* ChatViewController.m in Sources */,
D35E759F159460B70066B1C1 /* SettingsViewController.m in Sources */,
D37DC6C11594AE1800B2A5EB /* LinphoneCoreSettingsStore.m in Sources */,
D37DC6ED1594AE6F00B2A5EB /* IASKAppSettingsViewController.m in Sources */,
@ -3060,8 +3025,6 @@
D37DC7071594AE6F00B2A5EB /* IASKSwitch.m in Sources */,
D37DC7091594AE6F00B2A5EB /* IASKTextField.m in Sources */,
D3EA53FD159850E80037DC6B /* LinphoneManager.m in Sources */,
D3EA540D1598528B0037DC6B /* ChatTableViewController.m in Sources */,
D3EA5411159853750037DC6B /* UIChatCell.m in Sources */,
D3F26BEC159869A6005F9CAB /* AbstractCall.m in Sources */,
D3F26BF115986B73005F9CAB /* IncomingCallViewController.m in Sources */,
D31B4B21159876C0002E6C72 /* UICompositeViewController.m in Sources */,
@ -3072,13 +3035,9 @@
D32B9DFC15A2F131000B6DEC /* FastAddressBook.m in Sources */,
D3196D3E15A32BD8007FEEBA /* UITransferButton.m in Sources */,
D350F20E15A43BB100149E54 /* WizardViewController.m in Sources */,
D3F795D615A582810077328B /* ChatRoomViewController.m in Sources */,
D32B6E2915A5BC440033019F /* ChatRoomTableViewController.m in Sources */,
D32B6E3815A5C2430033019F /* ChatModel.m in Sources */,
D3A8BB7015A6C7D500F96BE5 /* UIChatRoomCell.m in Sources */,
D389362615A6D19800A3A3AA /* CPAnimationSequence.m in Sources */,
D389362815A6D19800A3A3AA /* CPAnimationStep.m in Sources */,
D3D14E7715A70EE30074A527 /* UIChatRoomHeader.m in Sources */,
D3128FE115AABC7E00A2147A /* ContactDetailsViewController.m in Sources */,
D37C639515AADDAF009D0BAC /* UIContactDetailsHeader.m in Sources */,
D37C639B15AADEF6009D0BAC /* ContactDetailsTableViewController.m in Sources */,
@ -3127,7 +3086,6 @@
D32409C4158B49A600C8C119 /* UILongTouchButton.m in Sources */,
D36C43C7158F2E5A0048BA40 /* UICallCell.m in Sources */,
D35E7582159328EB0066B1C1 /* UIAddressTextField.m in Sources */,
D35E7598159460580066B1C1 /* ChatViewController.m in Sources */,
D35E75A0159460B70066B1C1 /* SettingsViewController.m in Sources */,
D37DC6C21594AE1800B2A5EB /* LinphoneCoreSettingsStore.m in Sources */,
D37DC6EE1594AE6F00B2A5EB /* IASKAppSettingsViewController.m in Sources */,
@ -3146,8 +3104,6 @@
D37DC7081594AE6F00B2A5EB /* IASKSwitch.m in Sources */,
D37DC70A1594AE6F00B2A5EB /* IASKTextField.m in Sources */,
D3EA53FE159850E80037DC6B /* LinphoneManager.m in Sources */,
D3EA540E1598528B0037DC6B /* ChatTableViewController.m in Sources */,
D3EA5412159853750037DC6B /* UIChatCell.m in Sources */,
D3F26BED159869A6005F9CAB /* AbstractCall.m in Sources */,
D3F26BF215986B73005F9CAB /* IncomingCallViewController.m in Sources */,
D31B4B22159876C0002E6C72 /* UICompositeViewController.m in Sources */,
@ -3158,13 +3114,9 @@
D32B9DFD15A2F131000B6DEC /* FastAddressBook.m in Sources */,
D3196D3F15A32BD8007FEEBA /* UITransferButton.m in Sources */,
D350F20F15A43BB100149E54 /* WizardViewController.m in Sources */,
D3F795D715A582810077328B /* ChatRoomViewController.m in Sources */,
D32B6E2A15A5BC440033019F /* ChatRoomTableViewController.m in Sources */,
D32B6E3915A5C2430033019F /* ChatModel.m in Sources */,
D3A8BB7115A6C7D500F96BE5 /* UIChatRoomCell.m in Sources */,
D389362715A6D19800A3A3AA /* CPAnimationSequence.m in Sources */,
D389362915A6D19800A3A3AA /* CPAnimationStep.m in Sources */,
D3D14E7815A70EE30074A527 /* UIChatRoomHeader.m in Sources */,
D3128FE215AABC7E00A2147A /* ContactDetailsViewController.m in Sources */,
D37C639615AADDAF009D0BAC /* UIContactDetailsHeader.m in Sources */,
D37C639C15AADEF6009D0BAC /* ContactDetailsTableViewController.m in Sources */,