felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-21 17:12:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bug Fix: iOS should have 'Send a message (encrypted)' in placeholder

Browse Source 
#1207
This commit is contained in:
Giom Foret
2017-05-19 14:46:30 +02:00
parent dfa45625f6
commit b34797525c
3 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Views/RoomInputToolbar/RoomInputToolbarView.m
+23 -3
View File
@@ -19,6 +19,8 @@
#import "RiotDesignValues.h"
#import "GBDeviceInfo_iOS.h"
#import "UINavigationController+Riot.h"
#import <MediaPlayer/MediaPlayer.h>
@@ -82,7 +84,7 @@
growingTextView.textColor = kRiotTextColorBlack;
growingTextView.tintColor = kRiotColorGreen;
self.placeholder = NSLocalizedStringFromTable(@"room_message_placeholder", @"Vector", nil);
self.isEncryptionEnabled = _isEncryptionEnabled;
}
- (void)setSupportCallOption:(BOOL)supportCallOption
@@ -106,16 +108,34 @@
- (void)setIsEncryptionEnabled:(BOOL)isEncryptionEnabled
{
if (isEncryptionEnabled)
_isEncryptionEnabled = isEncryptionEnabled;
// Consider the default placeholder
NSString *placeholder= NSLocalizedStringFromTable(@"room_message_short_placeholder", @"Vector", nil);
if (_isEncryptionEnabled)
{
self.encryptedRoomIcon.image = [UIImage imageNamed:@"e2e_verified"];
// Check the device screen size before using large placeholder
if ([GBDeviceInfo deviceInfo].family == GBDeviceFamilyiPad || [GBDeviceInfo deviceInfo].displayInfo.display >= GBDeviceDisplay4p7Inch)
{
placeholder = NSLocalizedStringFromTable(@"encrypted_room_message_placeholder", @"Vector", nil);
}
}
else
{
self.encryptedRoomIcon.image = [UIImage imageNamed:@"e2e_unencrypted"];
// Check the device screen size before using large placeholder
if ([GBDeviceInfo deviceInfo].family == GBDeviceFamilyiPad || [GBDeviceInfo deviceInfo].displayInfo.display >= GBDeviceDisplay4p7Inch)
{
placeholder = NSLocalizedStringFromTable(@"room_message_placeholder", @"Vector", nil);
}
}
_isEncryptionEnabled = isEncryptionEnabled;
self.placeholder = placeholder;
}
- (void)setActiveCall:(BOOL)activeCall