Skip to content

Fix tablet layout for in-app messaging #2032

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

Merged
merged 8 commits into from
Nov 1, 2018
Merged

Fix tablet layout for in-app messaging #2032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b6e5f11
Rename fine-tuning methods to reflect size class rather than orientation
Oct 26, 2018
679dd1c
Modify existing constraints to de-portrait tablet layout, need a card…
Oct 29, 2018
941aad3
Further constraint tinkering, add identifiers for better auto layout …
Oct 30, 2018
fbfeb6a
More constraints for "landscape" appearance in tablet. Looks good for…
Oct 31, 2018
b21a3a9
Fix fine tune layout methods to correctly fine tune for compact heigh…
Oct 31, 2018
64aae70
Update layout constraint identifiers to match titles in document outl…
Oct 31, 2018
703d127
Merge branch 'master' into fiam-fix-modal-tablet-orientation
Oct 31, 2018
61f948e
Revert superfluous method name changes for layout fine tuning methods
Oct 31, 2018
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
11 changes: 6 additions & 5 deletions Firebase/InAppMessagingDisplay/Modal/FIDModalViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,14 +405,15 @@ - (void)layoutFineTuneInLandscapeMode {
- (void)viewDidLayoutSubviews {
[super viewDidLayoutSubviews];

if (self.buttonBottomToContainerBottomInPortraitMode.active) {
FIRLogDebug(kFIRLoggerInAppMessagingDisplay, @"I-FID300009",
@"Modal view rendered in portrait mode");
[self layoutFineTuneInPortraitMode];
} else {
if (self.traitCollection.horizontalSizeClass == UIUserInterfaceSizeClassRegular ||
self.traitCollection.verticalSizeClass == UIUserInterfaceSizeClassCompact) {
FIRLogDebug(kFIRLoggerInAppMessagingDisplay, @"I-FID300010",
@"Modal view rendered in landscape mode");
[self layoutFineTuneInLandscapeMode];
} else {
FIRLogDebug(kFIRLoggerInAppMessagingDisplay, @"I-FID300009",
@"Modal view rendered in portrait mode");
[self layoutFineTuneInPortraitMode];
}

// always scroll to the top in case the body area is scrollable
Expand Down
Loading