From 8595c6a6fa578b1ea0368f2e3ded87f6c3f18b69 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Wed, 1 Oct 2014 14:29:00 +0200 Subject: [PATCH] Specify if the background is dark through the UICompositeDescription --- Classes/DialerViewController.m | 1 + Classes/InCallViewController.m | 1 + Classes/IncomingCallViewController.m | 1 + Classes/LinphoneUI/UICompositeViewController.h | 1 + Classes/LinphoneUI/UICompositeViewController.m | 5 ++++- Classes/WizardViewController.m | 1 + 6 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Classes/DialerViewController.m b/Classes/DialerViewController.m index 2f809a90f..42472a630 100644 --- a/Classes/DialerViewController.m +++ b/Classes/DialerViewController.m @@ -115,6 +115,7 @@ static UICompositeViewDescription *compositeDescription = nil; fullscreen:false landscapeMode:[LinphoneManager runningOnIpad] portraitMode:true]; + compositeDescription.darkBackground = true; } return compositeDescription; } diff --git a/Classes/InCallViewController.m b/Classes/InCallViewController.m index 2009b3463..0e983a347 100644 --- a/Classes/InCallViewController.m +++ b/Classes/InCallViewController.m @@ -105,6 +105,7 @@ static UICompositeViewDescription *compositeDescription = nil; fullscreen:false landscapeMode:true portraitMode:true]; + compositeDescription.darkBackground = true; } return compositeDescription; } diff --git a/Classes/IncomingCallViewController.m b/Classes/IncomingCallViewController.m index e008d5c09..5c7519c92 100644 --- a/Classes/IncomingCallViewController.m +++ b/Classes/IncomingCallViewController.m @@ -81,6 +81,7 @@ static UICompositeViewDescription *compositeDescription = nil; fullscreen:false landscapeMode:[LinphoneManager runningOnIpad] portraitMode:true]; + compositeDescription.darkBackground = true; } return compositeDescription; } diff --git a/Classes/LinphoneUI/UICompositeViewController.h b/Classes/LinphoneUI/UICompositeViewController.h index 9a227c6b6..3af7e6741 100644 --- a/Classes/LinphoneUI/UICompositeViewController.h +++ b/Classes/LinphoneUI/UICompositeViewController.h @@ -35,6 +35,7 @@ @property (assign) BOOL fullscreen; @property (assign) BOOL landscapeMode; @property (assign) BOOL portraitMode; +@property (assign) BOOL darkBackground; - (id)copy; - (BOOL)equal:(UICompositeViewDescription*) description; diff --git a/Classes/LinphoneUI/UICompositeViewController.m b/Classes/LinphoneUI/UICompositeViewController.m index 6cc84de74..3578ea3d8 100644 --- a/Classes/LinphoneUI/UICompositeViewController.m +++ b/Classes/LinphoneUI/UICompositeViewController.m @@ -33,6 +33,7 @@ @synthesize landscapeMode; @synthesize portraitMode; + - (id)copy { UICompositeViewDescription *copy = [UICompositeViewDescription alloc]; copy.content = self.content; @@ -43,6 +44,7 @@ copy.fullscreen = self.fullscreen; copy.landscapeMode = self.landscapeMode; copy.portraitMode = self.portraitMode; + copy.darkBackground = self.darkBackground; return copy; } @@ -56,7 +58,7 @@ tabBarEnabled:(BOOL) atabBarEnabled fullscreen:(BOOL) afullscreen landscapeMode:(BOOL) alandscapeMode - portraitMode:(BOOL) aportraitMode { + portraitMode:(BOOL) aportraitMode{ self.name = aname; self.content = acontent; self.stateBar = astateBar; @@ -66,6 +68,7 @@ self.fullscreen = afullscreen; self.landscapeMode = alandscapeMode; self.portraitMode = aportraitMode; + self.darkBackground = false; return self; } diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m index 268800a29..5e3313f13 100644 --- a/Classes/WizardViewController.m +++ b/Classes/WizardViewController.m @@ -129,6 +129,7 @@ static UICompositeViewDescription *compositeDescription = nil; fullscreen:false landscapeMode:[LinphoneManager runningOnIpad] portraitMode:true]; + compositeDescription.darkBackground = true; } return compositeDescription; }