From 775c5f1cbefa957148eec221251048db24ae8f45 Mon Sep 17 00:00:00 2001 From: Chris Tibbs Date: Mon, 11 Feb 2019 17:08:24 -0800 Subject: [PATCH 1/3] Remove redundant imports of FIRInAppMessagingRendering.h --- Firebase/InAppMessagingDisplay/Banner/FIDBannerViewController.m | 1 - Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.m | 1 - .../InAppMessagingDisplay/ImageOnly/FIDImageOnlyViewController.m | 1 - Firebase/InAppMessagingDisplay/Modal/FIDModalViewController.m | 1 - 4 files changed, 4 deletions(-) diff --git a/Firebase/InAppMessagingDisplay/Banner/FIDBannerViewController.m b/Firebase/InAppMessagingDisplay/Banner/FIDBannerViewController.m index 2f46b77099c..80fa0c34708 100644 --- a/Firebase/InAppMessagingDisplay/Banner/FIDBannerViewController.m +++ b/Firebase/InAppMessagingDisplay/Banner/FIDBannerViewController.m @@ -16,7 +16,6 @@ #import "FIDBannerViewController.h" #import "FIRCore+InAppMessagingDisplay.h" -#import "FIRInAppMessagingRendering.h" @interface FIDBannerViewController () diff --git a/Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.m b/Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.m index 953ccf0dfb3..e250dfb634a 100644 --- a/Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.m +++ b/Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.m @@ -17,7 +17,6 @@ #import "FIDBaseRenderingViewController.h" #import "FIDTimeFetcher.h" #import "FIRCore+InAppMessagingDisplay.h" -#import "FIRInAppMessagingRendering.h" @interface FIDBaseRenderingViewController () // For fiam messages, it's required to be kMinValidImpressionTime to diff --git a/Firebase/InAppMessagingDisplay/ImageOnly/FIDImageOnlyViewController.m b/Firebase/InAppMessagingDisplay/ImageOnly/FIDImageOnlyViewController.m index aa87fb31701..e244a18aef4 100644 --- a/Firebase/InAppMessagingDisplay/ImageOnly/FIDImageOnlyViewController.m +++ b/Firebase/InAppMessagingDisplay/ImageOnly/FIDImageOnlyViewController.m @@ -16,7 +16,6 @@ #import "FIDImageOnlyViewController.h" #import "FIRCore+InAppMessagingDisplay.h" -#import "FIRInAppMessagingRendering.h" @interface FIDImageOnlyViewController () diff --git a/Firebase/InAppMessagingDisplay/Modal/FIDModalViewController.m b/Firebase/InAppMessagingDisplay/Modal/FIDModalViewController.m index 40862db032f..0c4b2b4f2a1 100644 --- a/Firebase/InAppMessagingDisplay/Modal/FIDModalViewController.m +++ b/Firebase/InAppMessagingDisplay/Modal/FIDModalViewController.m @@ -18,7 +18,6 @@ #import "FIDModalViewController.h" #import "FIRCore+InAppMessagingDisplay.h" -#import "FIRInAppMessagingRendering.h" @interface FIDModalViewController () From 37f3c954ab1eb6b96ed104f7d392b4eb2ca712f8 Mon Sep 17 00:00:00 2001 From: Chris Tibbs Date: Mon, 11 Feb 2019 17:38:55 -0800 Subject: [PATCH 2/3] Use global header to import FIRInAppMessagingRendering.h --- Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.h b/Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.h index a585ad22501..42eb3426a78 100644 --- a/Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.h +++ b/Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.h @@ -17,7 +17,7 @@ #import #import "FIDTimeFetcher.h" -#import "FIRInAppMessagingRendering.h" +#import @protocol FIRInAppMessagingDisplayDelegate; From 67cb387afe60e0955c1e9cc135aa0beb95ab7206 Mon Sep 17 00:00:00 2001 From: Chris Tibbs Date: Mon, 11 Feb 2019 17:40:04 -0800 Subject: [PATCH 3/3] Fix input order --- Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.h b/Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.h index 42eb3426a78..3d39bfb6faa 100644 --- a/Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.h +++ b/Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.h @@ -16,8 +16,8 @@ #import -#import "FIDTimeFetcher.h" #import +#import "FIDTimeFetcher.h" @protocol FIRInAppMessagingDisplayDelegate;