From 731cb1007fe719e8f79276bdc155fc1e8049d035 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 23 Oct 2014 11:05:44 +0200 Subject: [PATCH] Hide voice mail icon on "1" button if it is not configured yet --- .../LinphoneUI/UIDigitButtonLongVoiceMail.h | 6 +++ .../LinphoneUI/UIDigitButtonLongVoiceMail.m | 35 +++++++++++++----- Resources/numpad_one_voicemail_default.png | Bin 0 -> 3432 bytes Resources/numpad_one_voicemail_over.png | Bin 0 -> 6908 bytes 4 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 Resources/numpad_one_voicemail_default.png create mode 100644 Resources/numpad_one_voicemail_over.png diff --git a/Classes/LinphoneUI/UIDigitButtonLongVoiceMail.h b/Classes/LinphoneUI/UIDigitButtonLongVoiceMail.h index 8117a66a7..2bfaf7b64 100644 --- a/Classes/LinphoneUI/UIDigitButtonLongVoiceMail.h +++ b/Classes/LinphoneUI/UIDigitButtonLongVoiceMail.h @@ -26,4 +26,10 @@ @interface UIDigitButtonLongVoiceMail : UIDigitButton { } +/* Returns TRUE if voice mail is configured in LinphoneCore */ +- (BOOL) voiceMailEnabled; + +/*! Automatically chooses the right icon depending on voice mail configured or not */ +- (void) refreshUI; + @end diff --git a/Classes/LinphoneUI/UIDigitButtonLongVoiceMail.m b/Classes/LinphoneUI/UIDigitButtonLongVoiceMail.m index ba412557e..87a551ee9 100644 --- a/Classes/LinphoneUI/UIDigitButtonLongVoiceMail.m +++ b/Classes/LinphoneUI/UIDigitButtonLongVoiceMail.m @@ -29,17 +29,32 @@ } - (void)onLongTouch { - if(![LinphoneManager isLcReady]) { - [LinphoneLogger log:LinphoneLoggerWarning format:@"Cannot call voice mail: Linphone core not ready"]; - return; - } - LinphoneManager* lm = [LinphoneManager instance]; - - NSString * voiceMailUri = [lm lpConfigStringForKey:@"voice_mail_uri" withDefault:NULL]; - - if (voiceMailUri != NULL) { - [lm call:voiceMailUri displayName:NSLocalizedString(@"Voice mail",nil) transfer:FALSE]; + if ([self voiceMailEnabled]) { + LinphoneManager *lm = [LinphoneManager instance]; + [lm call:[lm lpConfigStringForKey:@"voice_mail_uri"] displayName:NSLocalizedString(@"Voice mail",nil) transfer:FALSE]; } } +- (BOOL) voiceMailEnabled { + if(![LinphoneManager isLcReady]) { + [LinphoneLogger log:LinphoneLoggerWarning format:@"Cannot call voice mail: Linphone core not ready"]; + return FALSE; + } + + NSString * voiceMailUri = [[LinphoneManager instance] lpConfigStringForKey:@"voice_mail_uri" withDefault:NULL]; + + return (voiceMailUri != NULL); +} + +- (void)refreshUI { + NSMutableString *name = [[NSMutableString alloc] initWithString:@"numpad_one_"]; + + if ([self voiceMailEnabled]) { + [name appendString:@"voicemail_"]; + } + + [self setImage:[UIImage imageNamed:[name stringByAppendingString:@"default.png"]] forState: UIControlStateNormal]; + [self setImage:[UIImage imageNamed:[name stringByAppendingString:@"over.png"]] forState: UIControlStateHighlighted]; +} + @end diff --git a/Resources/numpad_one_voicemail_default.png b/Resources/numpad_one_voicemail_default.png new file mode 100644 index 0000000000000000000000000000000000000000..07f8d0ecff323f1abf6f946fdc39a059a5414f97 GIT binary patch literal 3432 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 BND}}6 literal 0 HcmV?d00001