mirror of
https://github.com/firebase/firebase-ios-sdk
synced 2026-11-09 22:36:01 +05:45
* Add card scene to storyboard, use IBDesignable rounded corners view * Use IBdesignable rounded corners view for modal message * Add card message type * Parse card message type, add new fields for secondary actions and landscape URLs to view model classes * Display a really basic card message * Naive landscape image loading (needs error handling) * Quick bug fix * Wire up Display to show cards * Wire up Display to show cards * Fix tablet width * Pick right image for orientation * Remove placeholder image sizing constraints at build time * Add more test functionality * Better image sizes * Size message image out * Switch to body text view rather than body label * Make the body text view scrollable. Set correct text color on button. * Hook up buttons and text color * Include action URL in messageClicked callback * Fix action URL * Update pod specs * Update message clicked delegate to pass an action object, not just the actionURL * Change podspec versions back, hook up background color * Don't animate scroll to top on scroll view * Fix text scrolling bug * Fix portrait and landscape fetching code. Fix background color bug * Flesh out FIRIAMMessageContentDataWithImageURLTests * Fix up FIRIAMFetchFlowTests * Fix up FIRIAMMessageClientCacheTests * Fix up FIRIAMMessageDisplayForTesting * Fix fetching in FIRIAMMessageContentDataWithImageURL * Tests for message parsing * Fix up view controllers for banner, modal, image only. Add a view controller for testing card * Add required vertical compression resistance for primary and secondary action button * Add UI tests for card view controller * Add back deprecated messageClicked: method, call it if the newer method isn't implemented. Make all display delegate methods optional. * Run scripts/styles.sh * Documentation cleanup * Fix style in FIRIAMMessageContentDataWithImageURLTests.m * Add missing copyright notices * Bump versions of both FIAM SDKS * Remove default.profraw * Address some logging punctuation nits. Cancel landscape image load if portrait image load fails. * Add missing error flow in image fetch. A few comment nits. * Shorten up init method for CardDisplayMessage * Documentation updates * Deintegrate cocoa pods * Include landscape image data in test image load class * Fix Swift naming for InAppMessagingAction in UItests * Remove card message initializer from public API, place into a private header * Mark some properties on the card object as readonly that should've been already, Find a way to initialize a card message in the UI tests. * Bump dependency on InAppMessaging given changes * Bump versions in podspecs for both SDKs * Make all view model properties for message subclasses readonly * Revert changes to other message subclasses * Make card view model properties readonly * Run styles.sh
141 lines
5.5 KiB
Objective-C
141 lines
5.5 KiB
Objective-C
/*
|
|
* Copyright 2019 Google
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#import "FIDCardViewController.h"
|
|
#import "FIRCore+InAppMessagingDisplay.h"
|
|
|
|
@interface FIDCardViewController ()
|
|
|
|
@property(nonatomic, readwrite) FIRInAppMessagingCardDisplay *cardDisplayMessage;
|
|
|
|
@property(weak, nonatomic) IBOutlet UIView *cardView;
|
|
@property(weak, nonatomic) IBOutlet UIImageView *imageView;
|
|
@property(weak, nonatomic) IBOutlet UILabel *titleLabel;
|
|
@property(weak, nonatomic) IBOutlet UIButton *primaryActionButton;
|
|
@property(weak, nonatomic) IBOutlet UIButton *secondaryActionButton;
|
|
@property(weak, nonatomic) IBOutlet UITextView *bodyTextView;
|
|
@property(weak, nonatomic) IBOutlet UIScrollView *textAreaScrollView;
|
|
|
|
@end
|
|
|
|
@implementation FIDCardViewController
|
|
|
|
+ (FIDCardViewController *)
|
|
instantiateViewControllerWithResourceBundle:(NSBundle *)resourceBundle
|
|
displayMessage:(FIRInAppMessagingCardDisplay *)cardMessage
|
|
displayDelegate:
|
|
(id<FIRInAppMessagingDisplayDelegate>)displayDelegate
|
|
timeFetcher:(id<FIDTimeFetcher>)timeFetcher {
|
|
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"FIRInAppMessageDisplayStoryboard"
|
|
bundle:resourceBundle];
|
|
|
|
if (!storyboard) {
|
|
FIRLogError(kFIRLoggerInAppMessagingDisplay, @"I-FID300001",
|
|
@"Storyboard '"
|
|
"FIRInAppMessageDisplayStoryboard' not found in bundle %@",
|
|
resourceBundle);
|
|
return nil;
|
|
}
|
|
FIDCardViewController *cardVC =
|
|
(FIDCardViewController *)[storyboard instantiateViewControllerWithIdentifier:@"card-view-vc"];
|
|
cardVC.displayDelegate = displayDelegate;
|
|
cardVC.cardDisplayMessage = cardMessage;
|
|
cardVC.timeFetcher = timeFetcher;
|
|
|
|
return cardVC;
|
|
}
|
|
|
|
- (IBAction)primaryActionButtonTapped:(id)sender {
|
|
if (self.cardDisplayMessage.primaryActionURL) {
|
|
FIRInAppMessagingAction *primaryAction = [[FIRInAppMessagingAction alloc]
|
|
initWithActionText:self.cardDisplayMessage.primaryActionButton.buttonText
|
|
actionURL:self.cardDisplayMessage.primaryActionURL];
|
|
[self followAction:primaryAction];
|
|
} else {
|
|
[self dismissView:FIRInAppMessagingDismissTypeUserTapClose];
|
|
}
|
|
}
|
|
|
|
- (IBAction)secondaryActionButtonTapped:(id)sender {
|
|
if (self.cardDisplayMessage.secondaryActionURL) {
|
|
FIRInAppMessagingAction *secondaryAction = [[FIRInAppMessagingAction alloc]
|
|
initWithActionText:self.cardDisplayMessage.secondaryActionButton.buttonText
|
|
actionURL:self.cardDisplayMessage.secondaryActionURL];
|
|
[self followAction:secondaryAction];
|
|
} else {
|
|
[self dismissView:FIRInAppMessagingDismissTypeUserTapClose];
|
|
}
|
|
}
|
|
|
|
- (FIRInAppMessagingDisplayMessage *)inAppMessage {
|
|
return self.cardDisplayMessage;
|
|
}
|
|
|
|
- (void)viewDidLoad {
|
|
[super viewDidLoad];
|
|
|
|
self.cardView.backgroundColor = self.cardDisplayMessage.displayBackgroundColor;
|
|
|
|
self.bodyTextView.contentInset = UIEdgeInsetsZero;
|
|
self.bodyTextView.textContainer.lineFragmentPadding = 0;
|
|
|
|
// Make the background half transparent.
|
|
[self.view setBackgroundColor:[UIColor.grayColor colorWithAlphaComponent:0.5]];
|
|
|
|
self.titleLabel.text = self.cardDisplayMessage.title;
|
|
self.titleLabel.textColor = self.cardDisplayMessage.textColor;
|
|
|
|
self.bodyTextView.text = self.cardDisplayMessage.body;
|
|
|
|
[self.primaryActionButton setTitle:self.cardDisplayMessage.primaryActionButton.buttonText
|
|
forState:UIControlStateNormal];
|
|
[self.primaryActionButton
|
|
setTitleColor:self.cardDisplayMessage.primaryActionButton.buttonTextColor
|
|
forState:UIControlStateNormal];
|
|
|
|
if (self.cardDisplayMessage.secondaryActionButton) {
|
|
self.secondaryActionButton.hidden = NO;
|
|
[self.secondaryActionButton setTitle:self.cardDisplayMessage.secondaryActionButton.buttonText
|
|
forState:UIControlStateNormal];
|
|
[self.secondaryActionButton
|
|
setTitleColor:self.cardDisplayMessage.secondaryActionButton.buttonTextColor
|
|
forState:UIControlStateNormal];
|
|
}
|
|
}
|
|
|
|
- (void)viewDidLayoutSubviews {
|
|
[super viewDidLayoutSubviews];
|
|
|
|
// The landscape image is optional and only displayed if:
|
|
// 1. Landscape image exists.
|
|
// 2. The iOS device is in "landscape" mode (regular width or compact height).
|
|
if (self.traitCollection.horizontalSizeClass == UIUserInterfaceSizeClassRegular ||
|
|
self.traitCollection.verticalSizeClass == UIUserInterfaceSizeClassCompact) {
|
|
NSData *imageData = self.cardDisplayMessage.landscapeImageData
|
|
? self.cardDisplayMessage.landscapeImageData.imageRawData
|
|
: self.cardDisplayMessage.portraitImageData.imageRawData;
|
|
self.imageView.image = [UIImage imageWithData:imageData];
|
|
} else {
|
|
self.imageView.image =
|
|
[UIImage imageWithData:self.cardDisplayMessage.portraitImageData.imageRawData];
|
|
}
|
|
|
|
self.textAreaScrollView.contentSize = self.bodyTextView.frame.size;
|
|
[self.textAreaScrollView setContentOffset:CGPointZero];
|
|
}
|
|
|
|
@end
|