Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RoomInputToolBar: Prevent long placeholder to be displayed on small devices #3788

Merged
merged 4 commits into from
Nov 5, 2020
Merged

RoomInputToolBar: Prevent long placeholder to be displayed on small devices #3788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0cda132
RoomInputToolBar: Prevent placeholder to be display on two lines on s…
SBiOSoftWhare Nov 5, 2020
4c122ff
Update changes
SBiOSoftWhare Nov 5, 2020
1121fbd
Update changes
SBiOSoftWhare Nov 5, 2020
b9acb8f
Update CHANGES.rst
SBiOSoftWhare Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Changes to be released in next version

🐛 Bugfix
* Fix analytics in order to track performance improvements.
* Fix long placeholder cropping in room input toolbar. Prevent long placeholder to be displayed on small devices (#3790).

⚠️ API Changes
* Xcode 12 is now mandatory to build the project.
Expand Down
25 changes: 2 additions & 23 deletions Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,28 +132,7 @@ - (void)setIsEncryptionEnabled:(BOOL)isEncryptionEnabled
{
_isEncryptionEnabled = isEncryptionEnabled;

// Consider the default placeholder
NSString *placeholder= NSLocalizedStringFromTable(@"room_message_short_placeholder", @"Vector", nil);

if (_isEncryptionEnabled)
{
// 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
{
// 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);
}
}


self.placeholder = placeholder;
[self updatePlaceholder];
}

- (void)setSendMode:(RoomInputToolbarViewSendMode)sendMode
Expand Down Expand Up @@ -192,7 +171,7 @@ - (void)updatePlaceholder
NSString *placeholder;

// Check the device screen size before using large placeholder
BOOL shouldDisplayLargePlaceholder = [GBDeviceInfo deviceInfo].family == GBDeviceFamilyiPad || [GBDeviceInfo deviceInfo].displayInfo.display >= GBDeviceDisplay4p7Inch;
BOOL shouldDisplayLargePlaceholder = [GBDeviceInfo deviceInfo].family == GBDeviceFamilyiPad || [GBDeviceInfo deviceInfo].displayInfo.display >= GBDeviceDisplay5p8Inch;

if (!shouldDisplayLargePlaceholder)
{
Expand Down