In card message: set the text color on the body text view (#3286)

christibbs · web-flow · commit c8c99aa46257 · 2019-07-03T14:18:04.000-04:00
* In card message: set the text color on the body text view

* Fix bug where card messages in test app were showing up with two of the same buttons

* Revert change to text color
diff --git a/Firebase/InAppMessagingDisplay/Card/FIDCardViewController.m b/Firebase/InAppMessagingDisplay/Card/FIDCardViewController.m
@@ -105,6 +105,7 @@ - (void)viewDidLoad {
   self.titleLabel.textColor = self.cardDisplayMessage.textColor;
 
   self.bodyTextView.text = self.cardDisplayMessage.body;
+  self.bodyTextView.textColor = self.cardDisplayMessage.textColor;
 
   [self.primaryActionButton setTitle:self.cardDisplayMessage.primaryActionButton.buttonText
                             forState:UIControlStateNormal];
diff --git a/InAppMessagingDisplay/Example/FiamDisplaySwiftExample/CardMessageViewController.swift b/InAppMessagingDisplay/Example/FiamDisplaySwiftExample/CardMessageViewController.swift
@@ -62,7 +62,7 @@ class CardMessageViewController: CommonMessageTestVC {
     }
 
     override var secondaryActionButton: InAppMessagingActionButton? {
-      return writablePrimaryActionButton
+      return writableSecondaryActionButton
     }
 
     override var secondaryActionURL: URL? {

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ class CardMessageViewController: CommonMessageTestVC {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`override var secondaryActionButton: InAppMessagingActionButton? {`
`65`		`- return writablePrimaryActionButton`
	`65`	`+ return writableSecondaryActionButton`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`override var secondaryActionURL: URL? {`