mirror of
https://github.com/firebase/firebase-ios-sdk
synced 2026-11-10 22:45:59 +05:45
Support card template display in FIAM iOS SDK (#2947)
* 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
This commit is contained in:
christibbs authored and GitHub committed
1 parent
26a34155b4
commit
4a33b267d9
39 files changed
+2099
-416
No files matched your search
+321
@@ -0,0 +1,321 @@
|
||||
/*
|
||||
* 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 UIKit
|
||||
|
||||
class CardMessageViewController: CommonMessageTestVC {
|
||||
class TestableCardMessage: InAppMessagingCardDisplay {
|
||||
var writableTitle: String
|
||||
var writableBody: String?
|
||||
var writableTextColor: UIColor
|
||||
var writablePortraitImageData: InAppMessagingImageData
|
||||
var writableLandscapeImageData: InAppMessagingImageData?
|
||||
var writableBackgroundColor: UIColor
|
||||
var writablePrimaryActionButton: InAppMessagingActionButton
|
||||
var writablePrimaryActionURL: URL
|
||||
var writableSecondaryActionButton: InAppMessagingActionButton?
|
||||
var writableSecondaryActionURL: URL?
|
||||
|
||||
override var title: String {
|
||||
return writableTitle
|
||||
}
|
||||
|
||||
override var body: String? {
|
||||
return writableBody
|
||||
}
|
||||
|
||||
override var textColor: UIColor {
|
||||
return writableTextColor
|
||||
}
|
||||
|
||||
override var portraitImageData: InAppMessagingImageData {
|
||||
return writablePortraitImageData
|
||||
}
|
||||
|
||||
override var landscapeImageData: InAppMessagingImageData? {
|
||||
return writableLandscapeImageData
|
||||
}
|
||||
|
||||
override var displayBackgroundColor: UIColor {
|
||||
return writableBackgroundColor
|
||||
}
|
||||
|
||||
override var primaryActionButton: InAppMessagingActionButton {
|
||||
return writablePrimaryActionButton
|
||||
}
|
||||
|
||||
override var primaryActionURL: URL {
|
||||
return writablePrimaryActionURL
|
||||
}
|
||||
|
||||
override var secondaryActionButton: InAppMessagingActionButton? {
|
||||
return writablePrimaryActionButton
|
||||
}
|
||||
|
||||
override var secondaryActionURL: URL? {
|
||||
return writableSecondaryActionURL
|
||||
}
|
||||
|
||||
init(titleText: String,
|
||||
body: String?,
|
||||
textColor: UIColor,
|
||||
portraitImageData: InAppMessagingImageData,
|
||||
landscapeImageData: InAppMessagingImageData?,
|
||||
backgroundColor: UIColor,
|
||||
primaryActionButton: InAppMessagingActionButton,
|
||||
primaryActionURL: URL,
|
||||
secondaryActionButton: InAppMessagingActionButton?,
|
||||
secondaryActionURL: URL?) {
|
||||
writableTitle = titleText
|
||||
writableBody = body
|
||||
writableTextColor = textColor
|
||||
writablePortraitImageData = portraitImageData
|
||||
writableLandscapeImageData = landscapeImageData
|
||||
writableBackgroundColor = backgroundColor
|
||||
writablePrimaryActionButton = primaryActionButton
|
||||
writablePrimaryActionURL = primaryActionURL
|
||||
writableSecondaryActionButton = secondaryActionButton
|
||||
writableSecondaryActionURL = secondaryActionURL
|
||||
super.init(messageID: "testID",
|
||||
campaignName: "testCampaign",
|
||||
renderAsTestMessage: false,
|
||||
messageType: .card,
|
||||
triggerType: .onAnalyticsEvent)
|
||||
}
|
||||
}
|
||||
|
||||
let displayImpl = InAppMessagingDefaultDisplayImpl()
|
||||
|
||||
@IBOutlet var verifyLabel: UILabel!
|
||||
|
||||
override func messageClicked(_ inAppMessage: InAppMessagingDisplayMessage,
|
||||
with action: InAppMessagingAction) {
|
||||
super.messageClicked(inAppMessage, with: action)
|
||||
verifyLabel.text = "message clicked!"
|
||||
}
|
||||
|
||||
override func messageDismissed(_ inAppMessage: InAppMessagingDisplayMessage,
|
||||
dismissType: FIRInAppMessagingDismissType) {
|
||||
super.messageDismissed(inAppMessage, dismissType: dismissType)
|
||||
verifyLabel.text = "message dismissed!"
|
||||
}
|
||||
|
||||
@IBAction func showRegularOneButtonWithBothImages(_ sender: Any) {
|
||||
let portraitImageRawData = produceImageOfSize(size: CGSize(width: 300, height: 200))
|
||||
let portraitImageData = InAppMessagingImageData(imageURL: "url not important", imageData: portraitImageRawData!)
|
||||
|
||||
let landscapeImageRawData = produceImageOfSize(size: CGSize(width: 200, height: 200))
|
||||
let landscapeImageData = InAppMessagingImageData(imageURL: "url not important", imageData: landscapeImageRawData!)
|
||||
|
||||
let cardMessage = TestableCardMessage(
|
||||
titleText: normalMessageTitle,
|
||||
body: normalMessageBody,
|
||||
textColor: UIColor.black,
|
||||
portraitImageData: portraitImageData,
|
||||
landscapeImageData: landscapeImageData,
|
||||
backgroundColor: UIColor.white,
|
||||
primaryActionButton: defaultActionButton,
|
||||
primaryActionURL: URL(string: "http://google.com")!,
|
||||
secondaryActionButton: nil,
|
||||
secondaryActionURL: nil
|
||||
)
|
||||
|
||||
displayImpl.displayMessage(cardMessage, displayDelegate: self)
|
||||
}
|
||||
|
||||
@IBAction func showRegularOneButtonWithOnlyPortrait(_ sender: Any) {
|
||||
let portraitImageRawData = produceImageOfSize(size: CGSize(width: 300, height: 200))
|
||||
let portraitImageData = InAppMessagingImageData(imageURL: "url not important", imageData: portraitImageRawData!)
|
||||
|
||||
let cardMessage = TestableCardMessage(
|
||||
titleText: normalMessageTitle,
|
||||
body: nil,
|
||||
textColor: UIColor.black,
|
||||
portraitImageData: portraitImageData,
|
||||
landscapeImageData: nil,
|
||||
backgroundColor: UIColor.white,
|
||||
primaryActionButton: defaultActionButton,
|
||||
primaryActionURL: URL(string: "http://google.com")!,
|
||||
secondaryActionButton: nil,
|
||||
secondaryActionURL: nil
|
||||
)
|
||||
|
||||
displayImpl.displayMessage(cardMessage, displayDelegate: self)
|
||||
}
|
||||
|
||||
@IBAction func showRegularTwoButtonWithBothImages(_ sender: Any) {
|
||||
let portraitImageRawData = produceImageOfSize(size: CGSize(width: 300, height: 200))
|
||||
let portraitImageData = InAppMessagingImageData(imageURL: "url not important", imageData: portraitImageRawData!)
|
||||
|
||||
let landscapeImageRawData = produceImageOfSize(size: CGSize(width: 300, height: 300))
|
||||
let landscapeImageData = InAppMessagingImageData(imageURL: "url not important", imageData: landscapeImageRawData!)
|
||||
|
||||
let cardMessage = TestableCardMessage(
|
||||
titleText: normalMessageTitle,
|
||||
body: normalMessageBody,
|
||||
textColor: UIColor.black,
|
||||
portraitImageData: portraitImageData,
|
||||
landscapeImageData: landscapeImageData,
|
||||
backgroundColor: UIColor.white,
|
||||
primaryActionButton: defaultActionButton,
|
||||
primaryActionURL: URL(string: "http://google.com")!,
|
||||
secondaryActionButton: defaultSecondaryActionButton,
|
||||
secondaryActionURL: nil
|
||||
)
|
||||
|
||||
displayImpl.displayMessage(cardMessage, displayDelegate: self)
|
||||
}
|
||||
|
||||
@IBAction func showLongTitleRegularBody(_ sender: Any) {
|
||||
let portraitImageRawData = produceImageOfSize(size: CGSize(width: 300, height: 200))
|
||||
let portraitImageData = InAppMessagingImageData(imageURL: "url not important", imageData: portraitImageRawData!)
|
||||
|
||||
let cardMessage = TestableCardMessage(
|
||||
titleText: longTitleText,
|
||||
body: normalMessageBody,
|
||||
textColor: UIColor.black,
|
||||
portraitImageData: portraitImageData,
|
||||
landscapeImageData: nil,
|
||||
backgroundColor: UIColor.white,
|
||||
primaryActionButton: defaultActionButton,
|
||||
primaryActionURL: URL(string: "http://google.com")!,
|
||||
secondaryActionButton: defaultSecondaryActionButton,
|
||||
secondaryActionURL: nil
|
||||
)
|
||||
|
||||
displayImpl.displayMessage(cardMessage, displayDelegate: self)
|
||||
}
|
||||
|
||||
@IBAction func showRegularTitleLongBody(_ sender: Any) {
|
||||
let portraitImageRawData = produceImageOfSize(size: CGSize(width: 300, height: 200))
|
||||
let portraitImageData = InAppMessagingImageData(imageURL: "url not important", imageData: portraitImageRawData!)
|
||||
|
||||
let cardMessage = TestableCardMessage(
|
||||
titleText: normalMessageTitle,
|
||||
body: longBodyText,
|
||||
textColor: UIColor.black,
|
||||
portraitImageData: portraitImageData,
|
||||
landscapeImageData: nil,
|
||||
backgroundColor: UIColor.white,
|
||||
primaryActionButton: defaultActionButton,
|
||||
primaryActionURL: URL(string: "http://google.com")!,
|
||||
secondaryActionButton: defaultSecondaryActionButton,
|
||||
secondaryActionURL: nil
|
||||
)
|
||||
|
||||
displayImpl.displayMessage(cardMessage, displayDelegate: self)
|
||||
}
|
||||
|
||||
@IBAction func showLongTitleNoBody(_ sender: Any) {
|
||||
let portraitImageRawData = produceImageOfSize(size: CGSize(width: 300, height: 200))
|
||||
let portraitImageData = InAppMessagingImageData(imageURL: "url not important", imageData: portraitImageRawData!)
|
||||
|
||||
let cardMessage = TestableCardMessage(
|
||||
titleText: longTitleText,
|
||||
body: nil,
|
||||
textColor: UIColor.black,
|
||||
portraitImageData: portraitImageData,
|
||||
landscapeImageData: nil,
|
||||
backgroundColor: UIColor.white,
|
||||
primaryActionButton: defaultActionButton,
|
||||
primaryActionURL: URL(string: "http://google.com")!,
|
||||
secondaryActionButton: defaultSecondaryActionButton,
|
||||
secondaryActionURL: nil
|
||||
)
|
||||
|
||||
displayImpl.displayMessage(cardMessage, displayDelegate: self)
|
||||
}
|
||||
|
||||
@IBAction func showLongPrimaryButton(_ sender: Any) {
|
||||
let portraitImageRawData = produceImageOfSize(size: CGSize(width: 300, height: 200))
|
||||
let portraitImageData = InAppMessagingImageData(imageURL: "url not important", imageData: portraitImageRawData!)
|
||||
|
||||
let cardMessage = TestableCardMessage(
|
||||
titleText: longTitleText,
|
||||
body: normalMessageBody,
|
||||
textColor: UIColor.black,
|
||||
portraitImageData: portraitImageData,
|
||||
landscapeImageData: nil,
|
||||
backgroundColor: UIColor.white,
|
||||
primaryActionButton: longTextButton,
|
||||
primaryActionURL: URL(string: "http://google.com")!,
|
||||
secondaryActionButton: defaultSecondaryActionButton,
|
||||
secondaryActionURL: nil
|
||||
)
|
||||
|
||||
displayImpl.displayMessage(cardMessage, displayDelegate: self)
|
||||
}
|
||||
|
||||
@IBAction func showLongSecondaryButton(_ sender: Any) {
|
||||
let portraitImageRawData = produceImageOfSize(size: CGSize(width: 300, height: 200))
|
||||
let portraitImageData = InAppMessagingImageData(imageURL: "url not important", imageData: portraitImageRawData!)
|
||||
|
||||
let cardMessage = TestableCardMessage(
|
||||
titleText: longTitleText,
|
||||
body: normalMessageBody,
|
||||
textColor: UIColor.black,
|
||||
portraitImageData: portraitImageData,
|
||||
landscapeImageData: nil,
|
||||
backgroundColor: UIColor.white,
|
||||
primaryActionButton: defaultActionButton,
|
||||
primaryActionURL: URL(string: "http://google.com")!,
|
||||
secondaryActionButton: longTextButton,
|
||||
secondaryActionURL: nil
|
||||
)
|
||||
|
||||
displayImpl.displayMessage(cardMessage, displayDelegate: self)
|
||||
}
|
||||
|
||||
@IBAction func showSmallImage(_ sender: Any) {
|
||||
let portraitImageRawData = produceImageOfSize(size: CGSize(width: 30, height: 20))
|
||||
let portraitImageData = InAppMessagingImageData(imageURL: "url not important", imageData: portraitImageRawData!)
|
||||
|
||||
let cardMessage = TestableCardMessage(
|
||||
titleText: normalMessageTitle,
|
||||
body: normalMessageBody,
|
||||
textColor: UIColor.black,
|
||||
portraitImageData: portraitImageData,
|
||||
landscapeImageData: nil,
|
||||
backgroundColor: UIColor.white,
|
||||
primaryActionButton: defaultActionButton,
|
||||
primaryActionURL: URL(string: "http://google.com")!,
|
||||
secondaryActionButton: nil,
|
||||
secondaryActionURL: nil
|
||||
)
|
||||
|
||||
displayImpl.displayMessage(cardMessage, displayDelegate: self)
|
||||
}
|
||||
|
||||
@IBAction func showHugeImage(_ sender: Any) {
|
||||
let portraitImageRawData = produceImageOfSize(size: CGSize(width: 3000, height: 2000))
|
||||
let portraitImageData = InAppMessagingImageData(imageURL: "url not important", imageData: portraitImageRawData!)
|
||||
|
||||
let cardMessage = TestableCardMessage(
|
||||
titleText: normalMessageTitle,
|
||||
body: normalMessageBody,
|
||||
textColor: UIColor.black,
|
||||
portraitImageData: portraitImageData,
|
||||
landscapeImageData: nil,
|
||||
backgroundColor: UIColor.white,
|
||||
primaryActionButton: defaultActionButton,
|
||||
primaryActionURL: URL(string: "http://google.com")!,
|
||||
secondaryActionButton: nil,
|
||||
secondaryActionURL: nil
|
||||
)
|
||||
|
||||
displayImpl.displayMessage(cardMessage, displayDelegate: self)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user