FIAM Consolidation (#4705)

* Move display SDK source and resources into FIAM SDK

* Change files prefixed with FID to be prefixed FIRIAM

* Restructure example apps in firebase-ios-sdk directory

* Fix directory structure for FIAM

* Move proto files into base directory

* Fix up proto files

* Move unit test files to Firebase/InAppMessaging/Tests

* Move FIRIAMSDKModeManagerTests and require app host in podspec

* Move sample apps to tests folder

* Add empty repo for FIAMDisplay that generates a warning

* Fix up functional tests app

* Fix up default UI test app

* Re-generate protos

* Add warning to remove display pod

* Remove display podspec from .travis.yml

* Remove trailing whitespace

* Fix import in test app

* Add changes to point to the default test app

* Wrap iOS version conditionals

* Add line in podspec about deprecation

* Delete whitespace in podspec

* Delete pods section in project file

* Update changelog with consolidation info

* Fix indentation in podspecs

* Fix some import issues

* Fix indent on FirebaseInAppMessaging.podspec

* Delete FirebaseInAppMessagingDisplay, update podfile for external test app

* Update podfiles, bump iOS min version to 9, remove iOS 9 checks in FIRIAMActionUrlFollowerTests

*  Add line in CHANGELOG referencing deletion of display sdk pod

* Remove unused podfile

* Update min version on Podfiles to iOS 9

* Add back FirebaseInAppMessagingDisplay.h

* Add iOS support message to CHANGELOG.md

* Wrap necessary deprecated iOS 9 call

.travis.yml

@@ -461,7 +461,6 @@ jobs:
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseAuthInterop.podspec
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseCoreDiagnosticsInterop.podspec
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseInAppMessaging.podspec
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseInAppMessagingDisplay.podspec
 
     - stage: test
       env:
@@ -480,8 +479,6 @@ jobs:
       script:
         - travis_retry ./scripts/pod_lib_lint.rb FirebaseInAppMessaging.podspec --use-libraries
         - travis_retry ./scripts/pod_lib_lint.rb FirebaseInAppMessaging.podspec --use-modular-headers
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseInAppMessagingDisplay.podspec --use-libraries
-        - travis_retry ./scripts/pod_lib_lint.rb FirebaseInAppMessagingDisplay.podspec --use-modular-headers
 
     - stage: test
       if: type = cron

Dangerfile

@@ -80,11 +80,7 @@ has_license_changes = didModify(["LICENSE"])
 @has_dynamiclinks_changes = hasChangesIn("Firebase/DynamicLinks/")
 @has_firestore_changes = hasChangesIn("Firestore/")
 @has_functions_changes = hasChangesIn("Functions/")
-@has_inappmessaging_changes = hasChangesIn([
-  "Firebase/InAppMessaging/",
-  "Firebase/InAppMessagingDisplay/",
-  "InAppMessaging/Example/",
-  "InAppMessagingDisplay/"])
+@has_inappmessaging_changes = hasChangesIn(["FirebaseInAppMessaging/"])
 @has_installations_changes = hasChangesIn("FirebaseInstallations/Source/")
 @has_instanceid_changes = hasChangesIn("Firebase/InstanceID/")
 @has_messaging_changes = hasChangesIn("Firebase/Messaging/")

FirebaseInAppMessaging.podspec

@@ -17,15 +17,22 @@ See more product details at https://firebase.google.com/products/in-app-messagin
     :tag => 'InAppMessaging-' + s.version.to_s
   }
   s.social_media_url = 'https://twitter.com/Firebase'
-  s.ios.deployment_target = '8.0'
+  s.ios.deployment_target = '9.0'
 
   s.cocoapods_version = '>= 1.4.0'
   s.static_framework = true
   s.prefix_header_file = false
 
-  base_dir = "Firebase/InAppMessaging/"
-  s.source_files = base_dir + '**/*.[cmh]'
-  s.public_header_files = base_dir + 'Public/*.h'
+  base_dir = "FirebaseInAppMessaging/"
+  s.source_files = base_dir + "Sources/**/*.[cmh]"
+  s.public_header_files = base_dir + 'Sources/Public/*.h'
+  s.private_header_files = base_dir + 'Sources/Private/**/*.h'
+
+  s.resource_bundles = {
+    'InAppMessagingDisplayResources' => [ base_dir + 'Resources/*.xib',
+                                   base_dir + 'Resources/*.storyboard',
+                                   base_dir + 'Resources/*.png']
+  }
 
   s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' =>
       '$(inherited) ' +
@@ -37,5 +44,12 @@ See more product details at https://firebase.google.com/products/in-app-messagin
   s.ios.dependency 'FirebaseAnalyticsInterop', '~> 1.3'
   s.dependency 'FirebaseInstanceID', '~> 4.0'
   s.dependency 'GoogleDataTransportCCTSupport', '~> 1.0'
+	
+  s.test_spec 'unit' do |unit_tests|
+      unit_tests.source_files = 'FirebaseInAppMessaging/Tests/Unit/*.[mh]'
+      unit_tests.resources = 'FirebaseInAppMessaging/Tests/Unit/*.txt'
+      unit_tests.requires_app_host = true
+      unit_tests.dependency 'OCMock'
+   end
 
 end

Firebase/InAppMessaging/Analytics/Protogen/nanopb/fiam.nanopb.c → FirebaseInAppMessaging/Analytics/Protogen/nanopb/fiam.nanopb.c

@@ -54,7 +54,7 @@ const pb_field_t logs_proto_firebase_inappmessaging_ClientAppInfo_fields[3] = {
 #if !defined(PB_FIELD_32BIT)
 /* If you get an error here, it means that you need to define PB_FIELD_32BIT
  * compile-time option. You can do that in pb.h or on compiler command line.
- * 
+ *
  * The reason you need to do this is that some of your messages contain tag
  * numbers or field sizes that are larger than what can fit in 8 or 16 bit
  * field descriptors.
@@ -65,7 +65,7 @@ PB_STATIC_ASSERT((pb_membersize(logs_proto_firebase_inappmessaging_CampaignAnaly
 #if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)
 /* If you get an error here, it means that you need to define PB_FIELD_16BIT
  * compile-time option. You can do that in pb.h or on compiler command line.
- * 
+ *
  * The reason you need to do this is that some of your messages contain tag
  * numbers or field sizes that are larger than what can fit in the default
  * 8 bit descriptors.

Firebase/InAppMessaging/CHANGELOG.md → FirebaseInAppMessaging/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2020-01-28 -- v0.16.0
+- [changed] Consolidated backend and UI SDKs under `FirebaseInAppMessaging`. Developers should now use `pod Firebase/InAppMessaging` in their Podfile.
+- [changed] `FIRIAMDefaultDisplayImpl` is no longer public.
+- [changed] `FirebaseInAppMessagingDisplay` is now deprecated and should be removed from developers' Podfiles.
+- [changed] Minimum iOS version is now 9.0.
+
 # 2019-12-17 -- v0.15.6
 - [fixed] Issues with nullability in card message (#4435).
 - [fixed] Unit test failure with OCMock 3.5.0 (#4420).

Firebase/InAppMessaging/ProtoSupport/generate_nanopb_protos.sh → FirebaseInAppMessaging/ProtoSupport/generate_nanopb_protos.sh

@@ -26,8 +26,8 @@ readonly REPO_DIR="$( git rev-parse --show-toplevel )"
 readonly NANOPB_VERSION="0.3.9.3"
 readonly NANOPB_TEMPDIR="$(mktemp -d)"
 
-readonly PROTO_DIR="${REPO_DIR}/Firebase/InAppMessaging/ProtoSupport/Protos"
-readonly PROTOGEN_DIR="${REPO_DIR}/Firebase/InAppMessaging/Analytics/Protogen"
+readonly PROTO_DIR="${REPO_DIR}/FirebaseInAppMessaging/ProtoSupport/Protos"
+readonly PROTOGEN_DIR="${REPO_DIR}/FirebaseInAppMessaging/Analytics/Protogen"
 
 rm -rf "${NANOPB_TEMPDIR}"
 
@@ -45,11 +45,11 @@ echo "Removing existing generated protos..."
 rm -rf "${PROTOGEN_DIR}/*"
 
 echo "Generating nanopb protos..."
-python "${REPO_DIR}/Firebase/InAppMessaging/ProtoSupport/nanopb_build_protos.py" \
+python "${REPO_DIR}/FirebaseInAppMessaging/ProtoSupport/nanopb_build_protos.py" \
   --nanopb \
   --protos_dir="${PROTO_DIR}" \
   --pythonpath="${NANOPB_TEMPDIR}/${NANOPB_BIN_DIR}/generator" \
   --output_dir="${PROTOGEN_DIR}" \
   --include="${PROTO_DIR}"
 
-rm -rf "${NANOPB_TEMPDIR}"
+rm -rf "${NANOPB_TEMPDIR}"

Firebase/InAppMessaging/ProtoSupport/nanopb_proto_generator.py → FirebaseInAppMessaging/ProtoSupport/nanopb_proto_generator.py

@@ -129,7 +129,7 @@ def nanopb_parse_options(request):
   # Force certain options
   options.extension = '.nanopb'
   options.verbose = True
-  
+
   # Replicate options setup from nanopb_generator.main_plugin.
   nanopb.Globals.verbose_options = options.verbose
 

Firebase/InAppMessagingDisplay/Resources/FIRInAppMessageDisplayStoryboard.storyboard → FirebaseInAppMessaging/Resources/FIRInAppMessageDisplayStoryboard.storyboard

@@ -10,7 +10,7 @@
         <!--Image Only View Controller-->
         <scene sceneID="Uc0-ks-ER1">
             <objects>
-                <viewController storyboardIdentifier="image-only-vc" id="lGH-bl-7Xw" customClass="FIDImageOnlyViewController" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="image-only-vc" id="lGH-bl-7Xw" customClass="FIRIAMImageOnlyViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="LA8-MJ-IeW"/>
                         <viewControllerLayoutGuide type="bottom" id="8Ta-Lb-9Rg"/>
@@ -51,7 +51,7 @@
         <!--Banner View Controller-->
         <scene sceneID="zJa-hc-tKk">
             <objects>
-                <viewController storyboardIdentifier="banner-view-vc" id="lbb-HM-tHJ" customClass="FIDBannerViewController" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="banner-view-vc" id="lbb-HM-tHJ" customClass="FIRIAMBannerViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="lHf-Ux-dEc"/>
                         <viewControllerLayoutGuide type="bottom" id="K7E-8I-Yw5"/>
@@ -121,7 +121,7 @@
         <!--Modal View Controller-->
         <scene sceneID="hvu-tO-txi">
             <objects>
-                <viewController storyboardIdentifier="modal-view-vc" id="x01-lq-3r6" customClass="FIDModalViewController" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="modal-view-vc" id="x01-lq-3r6" customClass="FIRIAMModalViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="42w-41-Nyy"/>
                         <viewControllerLayoutGuide type="bottom" id="1nT-S0-O8H"/>
@@ -378,7 +378,7 @@
         <!--Card View Controller-->
         <scene sceneID="5eQ-Ln-que">
             <objects>
-                <viewController storyboardIdentifier="card-view-vc" id="oTF-1C-LZP" customClass="FIDCardViewController" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="card-view-vc" id="oTF-1C-LZP" customClass="FIRIAMCardViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="1Sy-cb-zoy"/>
                         <viewControllerLayoutGuide type="bottom" id="I6y-sz-UcT"/>

FirebaseInAppMessaging/Sources/Analytics/Protogen/nanopb/fiam.nanopb.c

@@ -0,0 +1,77 @@
+/*
+ * 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.
+ */
+
+/* Automatically generated nanopb constant definitions */
+/* Generated by nanopb-0.3.9.3 */
+
+#include "fiam.nanopb.h"
+
+/* @@protoc_insertion_point(includes) */
+#if PB_PROTO_HEADER_VERSION != 30
+#error Regenerate this file with the current version of nanopb generator.
+#endif
+
+
+
+const pb_field_t logs_proto_firebase_inappmessaging_CampaignAnalytics_fields[10] = {
+    PB_FIELD(  1, BYTES   , OPTIONAL, POINTER , FIRST, logs_proto_firebase_inappmessaging_CampaignAnalytics, project_number, project_number, 0),
+    PB_FIELD(  2, BYTES   , OPTIONAL, POINTER , OTHER, logs_proto_firebase_inappmessaging_CampaignAnalytics, campaign_id, project_number, 0),
+    PB_FIELD(  3, MESSAGE , OPTIONAL, STATIC  , OTHER, logs_proto_firebase_inappmessaging_CampaignAnalytics, client_app, campaign_id, &logs_proto_firebase_inappmessaging_ClientAppInfo_fields),
+    PB_FIELD(  4, INT64   , OPTIONAL, STATIC  , OTHER, logs_proto_firebase_inappmessaging_CampaignAnalytics, client_timestamp_millis, client_app, 0),
+    PB_ANONYMOUS_ONEOF_FIELD(event,   5, ENUM    , ONEOF, STATIC  , OTHER, logs_proto_firebase_inappmessaging_CampaignAnalytics, event_type, client_timestamp_millis, 0),
+    PB_ANONYMOUS_ONEOF_FIELD(event,   6, ENUM    , ONEOF, STATIC  , UNION, logs_proto_firebase_inappmessaging_CampaignAnalytics, dismiss_type, client_timestamp_millis, 0),
+    PB_ANONYMOUS_ONEOF_FIELD(event,   7, ENUM    , ONEOF, STATIC  , UNION, logs_proto_firebase_inappmessaging_CampaignAnalytics, render_error_reason, client_timestamp_millis, 0),
+    PB_ANONYMOUS_ONEOF_FIELD(event,   8, ENUM    , ONEOF, STATIC  , UNION, logs_proto_firebase_inappmessaging_CampaignAnalytics, fetch_error_reason, client_timestamp_millis, 0),
+    PB_FIELD(  9, BYTES   , OPTIONAL, POINTER , OTHER, logs_proto_firebase_inappmessaging_CampaignAnalytics, fiam_sdk_version, fetch_error_reason, 0),
+    PB_LAST_FIELD
+};
+
+const pb_field_t logs_proto_firebase_inappmessaging_ClientAppInfo_fields[3] = {
+    PB_FIELD(  1, BYTES   , OPTIONAL, POINTER , FIRST, logs_proto_firebase_inappmessaging_ClientAppInfo, google_app_id, google_app_id, 0),
+    PB_FIELD(  2, BYTES   , OPTIONAL, POINTER , OTHER, logs_proto_firebase_inappmessaging_ClientAppInfo, firebase_instance_id, google_app_id, 0),
+    PB_LAST_FIELD
+};
+
+
+
+
+
+
+/* Check that field information fits in pb_field_t */
+#if !defined(PB_FIELD_32BIT)
+/* If you get an error here, it means that you need to define PB_FIELD_32BIT
+ * compile-time option. You can do that in pb.h or on compiler command line.
+ *
+ * The reason you need to do this is that some of your messages contain tag
+ * numbers or field sizes that are larger than what can fit in 8 or 16 bit
+ * field descriptors.
+ */
+PB_STATIC_ASSERT((pb_membersize(logs_proto_firebase_inappmessaging_CampaignAnalytics, client_app) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_logs_proto_firebase_inappmessaging_CampaignAnalytics_logs_proto_firebase_inappmessaging_ClientAppInfo)
+#endif
+
+#if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)
+/* If you get an error here, it means that you need to define PB_FIELD_16BIT
+ * compile-time option. You can do that in pb.h or on compiler command line.
+ *
+ * The reason you need to do this is that some of your messages contain tag
+ * numbers or field sizes that are larger than what can fit in the default
+ * 8 bit descriptors.
+ */
+PB_STATIC_ASSERT((pb_membersize(logs_proto_firebase_inappmessaging_CampaignAnalytics, client_app) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_logs_proto_firebase_inappmessaging_CampaignAnalytics_logs_proto_firebase_inappmessaging_ClientAppInfo)
+#endif
+
+
+/* @@protoc_insertion_point(eof) */

FirebaseInAppMessaging/Sources/Analytics/Protogen/nanopb/fiam.nanopb.h

@@ -0,0 +1,136 @@
+/*
+ * 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.
+ */
+
+/* Automatically generated nanopb header */
+/* Generated by nanopb-0.3.9.3 */
+
+#ifndef PB_LOGS_PROTO_FIREBASE_INAPPMESSAGING_FIAM_NANOPB_H_INCLUDED
+#define PB_LOGS_PROTO_FIREBASE_INAPPMESSAGING_FIAM_NANOPB_H_INCLUDED
+#include <nanopb/pb.h>
+
+/* @@protoc_insertion_point(includes) */
+#if PB_PROTO_HEADER_VERSION != 30
+#error Regenerate this file with the current version of nanopb generator.
+#endif
+
+
+/* Enum definitions */
+typedef enum _logs_proto_firebase_inappmessaging_EventType {
+    logs_proto_firebase_inappmessaging_EventType_UNKNOWN_EVENT_TYPE = 0,
+    logs_proto_firebase_inappmessaging_EventType_IMPRESSION_EVENT_TYPE = 1,
+    logs_proto_firebase_inappmessaging_EventType_CLICK_EVENT_TYPE = 2,
+    logs_proto_firebase_inappmessaging_EventType_TEST_MESSAGE_IMPRESSION_EVENT_TYPE = 3,
+    logs_proto_firebase_inappmessaging_EventType_TEST_MESSAGE_CLICK_EVENT_TYPE = 4
+} logs_proto_firebase_inappmessaging_EventType;
+#define _logs_proto_firebase_inappmessaging_EventType_MIN logs_proto_firebase_inappmessaging_EventType_UNKNOWN_EVENT_TYPE
+#define _logs_proto_firebase_inappmessaging_EventType_MAX logs_proto_firebase_inappmessaging_EventType_TEST_MESSAGE_CLICK_EVENT_TYPE
+#define _logs_proto_firebase_inappmessaging_EventType_ARRAYSIZE ((logs_proto_firebase_inappmessaging_EventType)(logs_proto_firebase_inappmessaging_EventType_TEST_MESSAGE_CLICK_EVENT_TYPE+1))
+
+typedef enum _logs_proto_firebase_inappmessaging_DismissType {
+    logs_proto_firebase_inappmessaging_DismissType_UNKNOWN_DISMISS_TYPE = 0,
+    logs_proto_firebase_inappmessaging_DismissType_AUTO = 1,
+    logs_proto_firebase_inappmessaging_DismissType_CLICK = 2,
+    logs_proto_firebase_inappmessaging_DismissType_SWIPE = 3
+} logs_proto_firebase_inappmessaging_DismissType;
+#define _logs_proto_firebase_inappmessaging_DismissType_MIN logs_proto_firebase_inappmessaging_DismissType_UNKNOWN_DISMISS_TYPE
+#define _logs_proto_firebase_inappmessaging_DismissType_MAX logs_proto_firebase_inappmessaging_DismissType_SWIPE
+#define _logs_proto_firebase_inappmessaging_DismissType_ARRAYSIZE ((logs_proto_firebase_inappmessaging_DismissType)(logs_proto_firebase_inappmessaging_DismissType_SWIPE+1))
+
+typedef enum _logs_proto_firebase_inappmessaging_RenderErrorReason {
+    logs_proto_firebase_inappmessaging_RenderErrorReason_UNSPECIFIED_RENDER_ERROR = 0,
+    logs_proto_firebase_inappmessaging_RenderErrorReason_IMAGE_FETCH_ERROR = 1,
+    logs_proto_firebase_inappmessaging_RenderErrorReason_IMAGE_DISPLAY_ERROR = 2,
+    logs_proto_firebase_inappmessaging_RenderErrorReason_IMAGE_UNSUPPORTED_FORMAT = 3
+} logs_proto_firebase_inappmessaging_RenderErrorReason;
+#define _logs_proto_firebase_inappmessaging_RenderErrorReason_MIN logs_proto_firebase_inappmessaging_RenderErrorReason_UNSPECIFIED_RENDER_ERROR
+#define _logs_proto_firebase_inappmessaging_RenderErrorReason_MAX logs_proto_firebase_inappmessaging_RenderErrorReason_IMAGE_UNSUPPORTED_FORMAT
+#define _logs_proto_firebase_inappmessaging_RenderErrorReason_ARRAYSIZE ((logs_proto_firebase_inappmessaging_RenderErrorReason)(logs_proto_firebase_inappmessaging_RenderErrorReason_IMAGE_UNSUPPORTED_FORMAT+1))
+
+typedef enum _logs_proto_firebase_inappmessaging_FetchErrorReason {
+    logs_proto_firebase_inappmessaging_FetchErrorReason_UNSPECIFIED_FETCH_ERROR = 0,
+    logs_proto_firebase_inappmessaging_FetchErrorReason_SERVER_ERROR = 1,
+    logs_proto_firebase_inappmessaging_FetchErrorReason_CLIENT_ERROR = 2,
+    logs_proto_firebase_inappmessaging_FetchErrorReason_NETWORK_ERROR = 3
+} logs_proto_firebase_inappmessaging_FetchErrorReason;
+#define _logs_proto_firebase_inappmessaging_FetchErrorReason_MIN logs_proto_firebase_inappmessaging_FetchErrorReason_UNSPECIFIED_FETCH_ERROR
+#define _logs_proto_firebase_inappmessaging_FetchErrorReason_MAX logs_proto_firebase_inappmessaging_FetchErrorReason_NETWORK_ERROR
+#define _logs_proto_firebase_inappmessaging_FetchErrorReason_ARRAYSIZE ((logs_proto_firebase_inappmessaging_FetchErrorReason)(logs_proto_firebase_inappmessaging_FetchErrorReason_NETWORK_ERROR+1))
+
+/* Struct definitions */
+typedef struct _logs_proto_firebase_inappmessaging_ClientAppInfo {
+    pb_bytes_array_t *google_app_id;
+    pb_bytes_array_t *firebase_instance_id;
+/* @@protoc_insertion_point(struct:logs_proto_firebase_inappmessaging_ClientAppInfo) */
+} logs_proto_firebase_inappmessaging_ClientAppInfo;
+
+typedef struct _logs_proto_firebase_inappmessaging_CampaignAnalytics {
+    pb_bytes_array_t *project_number;
+    pb_bytes_array_t *campaign_id;
+    bool has_client_app;
+    logs_proto_firebase_inappmessaging_ClientAppInfo client_app;
+    bool has_client_timestamp_millis;
+    int64_t client_timestamp_millis;
+    pb_size_t which_event;
+    union {
+        logs_proto_firebase_inappmessaging_EventType event_type;
+        logs_proto_firebase_inappmessaging_DismissType dismiss_type;
+        logs_proto_firebase_inappmessaging_RenderErrorReason render_error_reason;
+        logs_proto_firebase_inappmessaging_FetchErrorReason fetch_error_reason;
+    };
+    pb_bytes_array_t *fiam_sdk_version;
+/* @@protoc_insertion_point(struct:logs_proto_firebase_inappmessaging_CampaignAnalytics) */
+} logs_proto_firebase_inappmessaging_CampaignAnalytics;
+
+/* Default values for struct fields */
+
+/* Initializer values for message structs */
+#define logs_proto_firebase_inappmessaging_CampaignAnalytics_init_default {NULL, NULL, false, logs_proto_firebase_inappmessaging_ClientAppInfo_init_default, false, 0, 0, {_logs_proto_firebase_inappmessaging_EventType_MIN}, NULL}
+#define logs_proto_firebase_inappmessaging_ClientAppInfo_init_default {NULL, NULL}
+#define logs_proto_firebase_inappmessaging_CampaignAnalytics_init_zero {NULL, NULL, false, logs_proto_firebase_inappmessaging_ClientAppInfo_init_zero, false, 0, 0, {_logs_proto_firebase_inappmessaging_EventType_MIN}, NULL}
+#define logs_proto_firebase_inappmessaging_ClientAppInfo_init_zero {NULL, NULL}
+
+/* Field tags (for use in manual encoding/decoding) */
+#define logs_proto_firebase_inappmessaging_ClientAppInfo_google_app_id_tag 1
+#define logs_proto_firebase_inappmessaging_ClientAppInfo_firebase_instance_id_tag 2
+#define logs_proto_firebase_inappmessaging_CampaignAnalytics_event_type_tag 5
+#define logs_proto_firebase_inappmessaging_CampaignAnalytics_dismiss_type_tag 6
+#define logs_proto_firebase_inappmessaging_CampaignAnalytics_render_error_reason_tag 7
+#define logs_proto_firebase_inappmessaging_CampaignAnalytics_fetch_error_reason_tag 8
+#define logs_proto_firebase_inappmessaging_CampaignAnalytics_project_number_tag 1
+#define logs_proto_firebase_inappmessaging_CampaignAnalytics_campaign_id_tag 2
+#define logs_proto_firebase_inappmessaging_CampaignAnalytics_client_app_tag 3
+#define logs_proto_firebase_inappmessaging_CampaignAnalytics_client_timestamp_millis_tag 4
+#define logs_proto_firebase_inappmessaging_CampaignAnalytics_fiam_sdk_version_tag 9
+
+/* Struct field encoding specification for nanopb */
+extern const pb_field_t logs_proto_firebase_inappmessaging_CampaignAnalytics_fields[10];
+extern const pb_field_t logs_proto_firebase_inappmessaging_ClientAppInfo_fields[3];
+
+/* Maximum encoded size of messages (where known) */
+/* logs_proto_firebase_inappmessaging_CampaignAnalytics_size depends on runtime parameters */
+/* logs_proto_firebase_inappmessaging_ClientAppInfo_size depends on runtime parameters */
+
+/* Message IDs (where set with "msgid" option) */
+#ifdef PB_MSGID
+
+#define FIAM_MESSAGES \
+
+
+#endif
+
+/* @@protoc_insertion_point(eof) */
+
+#endif

Firebase/InAppMessagingDisplay/Banner/FIDBannerViewController.h → FirebaseInAppMessaging/Sources/DefaultUI/Banner/FIRIAMBannerViewController.h

@@ -16,16 +16,16 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIDBaseRenderingViewController.h"
+#import "FIRIAMBaseRenderingViewController.h"
 
 @class FIRInAppMessagingBannerDisplay;
-@class FIDBaseRenderingViewController;
+@class FIRIAMBaseRenderingViewController;
 @protocol FIDTimeFetcher;
 @protocol FIRInAppMessagingDisplayDelegate;
 
 NS_ASSUME_NONNULL_BEGIN
-@interface FIDBannerViewController : FIDBaseRenderingViewController
-+ (FIDBannerViewController *)
+@interface FIRIAMBannerViewController : FIRIAMBaseRenderingViewController
++ (FIRIAMBannerViewController *)
     instantiateViewControllerWithResourceBundle:(NSBundle *)resourceBundle
                                  displayMessage:(FIRInAppMessagingBannerDisplay *)bannerMessage
                                 displayDelegate:

Firebase/InAppMessagingDisplay/Banner/FIDBannerViewController.m → FirebaseInAppMessaging/Sources/DefaultUI/Banner/FIRIAMBannerViewController.m

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#import "FIDBannerViewController.h"
+#import "FIRIAMBannerViewController.h"
 #import "FIRCore+InAppMessagingDisplay.h"
 
-@interface FIDBannerViewController ()
+@interface FIRIAMBannerViewController ()
 
 @property(nonatomic, readwrite) FIRInAppMessagingBannerDisplay *bannerDisplayMessage;
 
@@ -57,9 +57,9 @@ static const CGFloat kBannerViewMaxWidth = 736;
 
 static const CGFloat kSwipeUpThreshold = -10.0f;
 
-@implementation FIDBannerViewController
+@implementation FIRIAMBannerViewController
 
-+ (FIDBannerViewController *)
++ (FIRIAMBannerViewController *)
     instantiateViewControllerWithResourceBundle:(NSBundle *)resourceBundle
                                  displayMessage:(FIRInAppMessagingBannerDisplay *)bannerMessage
                                 displayDelegate:
@@ -75,7 +75,7 @@ static const CGFloat kSwipeUpThreshold = -10.0f;
                 resourceBundle);
     return nil;
   }
-  FIDBannerViewController *bannerVC = (FIDBannerViewController *)[storyboard
+  FIRIAMBannerViewController *bannerVC = (FIRIAMBannerViewController *)[storyboard
       instantiateViewControllerWithIdentifier:@"banner-view-vc"];
   bannerVC.displayDelegate = displayDelegate;
   bannerVC.bannerDisplayMessage = bannerMessage;

Firebase/InAppMessagingDisplay/Banner/FIDBannerViewUIWindow.h → FirebaseInAppMessaging/Sources/DefaultUI/Banner/FIRIAMBannerViewUIWindow.h

@@ -17,7 +17,7 @@
 #import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
-@interface FIDBannerViewUIWindow : UIWindow
+@interface FIRIAMBannerViewUIWindow : UIWindow
 
 @end
 NS_ASSUME_NONNULL_END

Firebase/InAppMessagingDisplay/Banner/FIDBannerViewUIWindow.m → FirebaseInAppMessaging/Sources/DefaultUI/Banner/FIRIAMBannerViewUIWindow.m

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#import "FIDBannerViewUIWindow.h"
+#import "FIRIAMBannerViewUIWindow.h"
 
-@implementation FIDBannerViewUIWindow
+@implementation FIRIAMBannerViewUIWindow
 
 // For banner view message, we still allow the user to interact with the app's underlying view
 // outside banner view's visible area.

Firebase/InAppMessagingDisplay/Card/FIDCardViewController.h → FirebaseInAppMessaging/Sources/DefaultUI/Card/FIRIAMCardViewController.h

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#import "FIDBaseRenderingViewController.h"
+#import "FIRIAMBaseRenderingViewController.h"
 
 @class FIRInAppMessagingCardDisplay;
 @protocol FIRInAppMessagingDisplayDelegate;
 
 NS_ASSUME_NONNULL_BEGIN
-@interface FIDCardViewController : FIDBaseRenderingViewController
+@interface FIRIAMCardViewController : FIRIAMBaseRenderingViewController
 
-+ (FIDCardViewController *)
++ (FIRIAMCardViewController *)
     instantiateViewControllerWithResourceBundle:(NSBundle *)resourceBundle
                                  displayMessage:(FIRInAppMessagingCardDisplay *)cardMessage
                                 displayDelegate:

Firebase/InAppMessagingDisplay/Card/FIDCardViewController.m → FirebaseInAppMessaging/Sources/DefaultUI/Card/FIRIAMCardViewController.m

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#import "FIDCardViewController.h"
+#import "FIRIAMCardViewController.h"
 #import "FIRCore+InAppMessagingDisplay.h"
 
-@interface FIDCardViewController ()
+@interface FIRIAMCardViewController ()
 
 @property(nonatomic, readwrite) FIRInAppMessagingCardDisplay *cardDisplayMessage;
 
@@ -31,9 +31,9 @@
 
 @end
 
-@implementation FIDCardViewController
+@implementation FIRIAMCardViewController
 
-+ (FIDCardViewController *)
++ (FIRIAMCardViewController *)
     instantiateViewControllerWithResourceBundle:(NSBundle *)resourceBundle
                                  displayMessage:(FIRInAppMessagingCardDisplay *)cardMessage
                                 displayDelegate:
@@ -49,8 +49,8 @@
                 resourceBundle);
     return nil;
   }
-  FIDCardViewController *cardVC =
-      (FIDCardViewController *)[storyboard instantiateViewControllerWithIdentifier:@"card-view-vc"];
+  FIRIAMCardViewController *cardVC = (FIRIAMCardViewController *)[storyboard
+      instantiateViewControllerWithIdentifier:@"card-view-vc"];
   cardVC.displayDelegate = displayDelegate;
   cardVC.cardDisplayMessage = cardMessage;
   cardVC.timeFetcher = timeFetcher;

Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.h → FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMBaseRenderingViewController.h

@@ -22,7 +22,7 @@
 @protocol FIRInAppMessagingDisplayDelegate;
 
 NS_ASSUME_NONNULL_BEGIN
-@interface FIDBaseRenderingViewController : UIViewController
+@interface FIRIAMBaseRenderingViewController : UIViewController
 @property(nonatomic, readwrite) id<FIDTimeFetcher> timeFetcher;
 
 @property(nonatomic, readwrite) id<FIRInAppMessagingDisplayDelegate> displayDelegate;

Firebase/InAppMessagingDisplay/FIDBaseRenderingViewController.m → FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMBaseRenderingViewController.m

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#import "FIDBaseRenderingViewController.h"
+#import "FIRIAMBaseRenderingViewController.h"
 #import "FIDTimeFetcher.h"
 #import "FIRCore+InAppMessagingDisplay.h"
 
-@interface FIDBaseRenderingViewController ()
+@interface FIRIAMBaseRenderingViewController ()
 // For fiam messages, it's required to be kMinValidImpressionTime to
 // be considered as a valid impression help. If the app is closed before that's reached,
 // SDK may try to render the same message again in the future.
@@ -31,7 +31,7 @@
 
 static const NSTimeInterval kMinValidImpressionTime = 3.0;
 
-@implementation FIDBaseRenderingViewController
+@implementation FIRIAMBaseRenderingViewController
 
 - (nullable FIRInAppMessagingDisplayMessage *)inAppMessage {
   return nil;

Firebase/InAppMessagingDisplay/FIRIAMDefaultDisplayImpl.m → FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMDefaultDisplayImpl.m

@@ -20,14 +20,14 @@
 
 #import <FirebaseInAppMessaging/FIRInAppMessaging.h>
 #import <FirebaseInAppMessaging/FIRInAppMessagingRendering.h>
-#import "FIDBannerViewController.h"
-#import "FIDCardViewController.h"
-#import "FIDImageOnlyViewController.h"
-#import "FIDModalViewController.h"
-#import "FIDRenderingWindowHelper.h"
 #import "FIDTimeFetcher.h"
 #import "FIRCore+InAppMessagingDisplay.h"
+#import "FIRIAMBannerViewController.h"
+#import "FIRIAMCardViewController.h"
 #import "FIRIAMDefaultDisplayImpl.h"
+#import "FIRIAMImageOnlyViewController.h"
+#import "FIRIAMModalViewController.h"
+#import "FIRIAMRenderingWindowHelper.h"
 
 @implementation FIRIAMDefaultDisplayImpl
 
@@ -92,12 +92,12 @@
       return;
     }
 
-    FIDTimerWithNSDate *timeFetcher = [[FIDTimerWithNSDate alloc] init];
-    FIDCardViewController *cardVC =
-        [FIDCardViewController instantiateViewControllerWithResourceBundle:resourceBundle
-                                                            displayMessage:cardMessage
-                                                           displayDelegate:displayDelegate
-                                                               timeFetcher:timeFetcher];
+    FIRIAMTimerWithNSDate *timeFetcher = [[FIRIAMTimerWithNSDate alloc] init];
+    FIRIAMCardViewController *cardVC =
+        [FIRIAMCardViewController instantiateViewControllerWithResourceBundle:resourceBundle
+                                                               displayMessage:cardMessage
+                                                              displayDelegate:displayDelegate
+                                                                  timeFetcher:timeFetcher];
 
     if (cardVC == nil) {
       FIRLogWarning(kFIRLoggerInAppMessagingDisplay, @"I-FID100011",
@@ -110,7 +110,7 @@
       return;
     }
 
-    UIWindow *displayUIWindow = [FIDRenderingWindowHelper UIWindowForModalView];
+    UIWindow *displayUIWindow = [FIRIAMRenderingWindowHelper UIWindowForModalView];
     displayUIWindow.rootViewController = cardVC;
     [displayUIWindow setHidden:NO];
   });
@@ -130,12 +130,12 @@
       return;
     }
 
-    FIDTimerWithNSDate *timeFetcher = [[FIDTimerWithNSDate alloc] init];
-    FIDModalViewController *modalVC =
-        [FIDModalViewController instantiateViewControllerWithResourceBundle:resourceBundle
-                                                             displayMessage:modalMessage
-                                                            displayDelegate:displayDelegate
-                                                                timeFetcher:timeFetcher];
+    FIRIAMTimerWithNSDate *timeFetcher = [[FIRIAMTimerWithNSDate alloc] init];
+    FIRIAMModalViewController *modalVC =
+        [FIRIAMModalViewController instantiateViewControllerWithResourceBundle:resourceBundle
+                                                                displayMessage:modalMessage
+                                                               displayDelegate:displayDelegate
+                                                                   timeFetcher:timeFetcher];
 
     if (modalVC == nil) {
       FIRLogWarning(kFIRLoggerInAppMessagingDisplay, @"I-FID100004",
@@ -147,7 +147,7 @@
       return;
     }
 
-    UIWindow *displayUIWindow = [FIDRenderingWindowHelper UIWindowForModalView];
+    UIWindow *displayUIWindow = [FIRIAMRenderingWindowHelper UIWindowForModalView];
     displayUIWindow.rootViewController = modalVC;
     [displayUIWindow setHidden:NO];
   });
@@ -167,12 +167,12 @@
       return;
     }
 
-    FIDTimerWithNSDate *timeFetcher = [[FIDTimerWithNSDate alloc] init];
-    FIDBannerViewController *bannerVC =
-        [FIDBannerViewController instantiateViewControllerWithResourceBundle:resourceBundle
-                                                              displayMessage:bannerMessage
-                                                             displayDelegate:displayDelegate
-                                                                 timeFetcher:timeFetcher];
+    FIRIAMTimerWithNSDate *timeFetcher = [[FIRIAMTimerWithNSDate alloc] init];
+    FIRIAMBannerViewController *bannerVC =
+        [FIRIAMBannerViewController instantiateViewControllerWithResourceBundle:resourceBundle
+                                                                 displayMessage:bannerMessage
+                                                                displayDelegate:displayDelegate
+                                                                    timeFetcher:timeFetcher];
 
     if (bannerVC == nil) {
       FIRLogWarning(kFIRLoggerInAppMessagingDisplay, @"I-FID100008",
@@ -184,7 +184,7 @@
       return;
     }
 
-    UIWindow *displayUIWindow = [FIDRenderingWindowHelper UIWindowForBannerView];
+    UIWindow *displayUIWindow = [FIRIAMRenderingWindowHelper UIWindowForBannerView];
     displayUIWindow.rootViewController = bannerVC;
     [displayUIWindow setHidden:NO];
   });
@@ -205,12 +205,12 @@
       return;
     }
 
-    FIDTimerWithNSDate *timeFetcher = [[FIDTimerWithNSDate alloc] init];
-    FIDImageOnlyViewController *imageOnlyVC =
-        [FIDImageOnlyViewController instantiateViewControllerWithResourceBundle:resourceBundle
-                                                                 displayMessage:imageOnlyMessage
-                                                                displayDelegate:displayDelegate
-                                                                    timeFetcher:timeFetcher];
+    FIRIAMTimerWithNSDate *timeFetcher = [[FIRIAMTimerWithNSDate alloc] init];
+    FIRIAMImageOnlyViewController *imageOnlyVC =
+        [FIRIAMImageOnlyViewController instantiateViewControllerWithResourceBundle:resourceBundle
+                                                                    displayMessage:imageOnlyMessage
+                                                                   displayDelegate:displayDelegate
+                                                                       timeFetcher:timeFetcher];
 
     if (imageOnlyVC == nil) {
       FIRLogWarning(kFIRLoggerInAppMessagingDisplay, @"I-FID100006",
@@ -222,7 +222,7 @@
       return;
     }
 
-    UIWindow *displayUIWindow = [FIDRenderingWindowHelper UIWindowForImageOnlyView];
+    UIWindow *displayUIWindow = [FIRIAMRenderingWindowHelper UIWindowForImageOnlyView];
     displayUIWindow.rootViewController = imageOnlyVC;
     [displayUIWindow setHidden:NO];
   });

Firebase/InAppMessagingDisplay/FIDRenderingWindowHelper.h → FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMRenderingWindowHelper.h

@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
  * supposed to set the rootViewController to be the appropriate view controller for the in-app
  * message and call setHidden:NO to make it really visible.
  */
-@interface FIDRenderingWindowHelper : NSObject
+@interface FIRIAMRenderingWindowHelper : NSObject
 
 // Return the singleton UIWindow that can be used for rendering modal IAM views
 + (UIWindow *)UIWindowForModalView;

Firebase/InAppMessagingDisplay/FIDRenderingWindowHelper.m → FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMRenderingWindowHelper.m

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#import "FIDRenderingWindowHelper.h"
-#import "FIDBannerViewUIWindow.h"
+#import "FIRIAMRenderingWindowHelper.h"
+#import "FIRIAMBannerViewUIWindow.h"
 
-@implementation FIDRenderingWindowHelper
+@implementation FIRIAMRenderingWindowHelper
 
 + (UIWindow *)UIWindowForModalView {
   static UIWindow *UIWindowForModal;
@@ -47,11 +47,11 @@
 #if defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
     if (@available(iOS 13.0, *)) {
       UIWindowScene *foregroundedScene = [[self class] foregroundedScene];
-      UIWindowForBanner = [[FIDBannerViewUIWindow alloc] initWithWindowScene:foregroundedScene];
+      UIWindowForBanner = [[FIRIAMBannerViewUIWindow alloc] initWithWindowScene:foregroundedScene];
     } else {
 #endif  // defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
       UIWindowForBanner =
-          [[FIDBannerViewUIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+          [[FIRIAMBannerViewUIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
 #if defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
     }
 #endif

Firebase/InAppMessagingDisplay/ImageOnly/FIDImageOnlyViewController.h → FirebaseInAppMessaging/Sources/DefaultUI/ImageOnly/FIRIAMImageOnlyViewController.h

@@ -16,15 +16,15 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIDBaseRenderingViewController.h"
+#import "FIRIAMBaseRenderingViewController.h"
 
 @class FIRInAppMessagingImageOnlyDisplay;
 @protocol FIDTimeFetcher;
 @protocol FIRInAppMessagingDisplayDelegate;
 
 NS_ASSUME_NONNULL_BEGIN
-@interface FIDImageOnlyViewController : FIDBaseRenderingViewController
-+ (FIDImageOnlyViewController *)
+@interface FIRIAMImageOnlyViewController : FIRIAMBaseRenderingViewController
++ (FIRIAMImageOnlyViewController *)
     instantiateViewControllerWithResourceBundle:(NSBundle *)resourceBundle
                                  displayMessage:
                                      (FIRInAppMessagingImageOnlyDisplay *)imageOnlyMessage

Firebase/InAppMessagingDisplay/ImageOnly/FIDImageOnlyViewController.m → FirebaseInAppMessaging/Sources/DefaultUI/ImageOnly/FIRIAMImageOnlyViewController.m

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#import "FIDImageOnlyViewController.h"
+#import "FIRIAMImageOnlyViewController.h"
 #import "FIRCore+InAppMessagingDisplay.h"
 
-@interface FIDImageOnlyViewController ()
+@interface FIRIAMImageOnlyViewController ()
 
 @property(nonatomic, readwrite) FIRInAppMessagingImageOnlyDisplay *imageOnlyMessage;
 
@@ -26,9 +26,9 @@
 @property(nonatomic, assign) CGSize imageOriginalSize;
 @end
 
-@implementation FIDImageOnlyViewController
+@implementation FIRIAMImageOnlyViewController
 
-+ (FIDImageOnlyViewController *)
++ (FIRIAMImageOnlyViewController *)
     instantiateViewControllerWithResourceBundle:(NSBundle *)resourceBundle
                                  displayMessage:
                                      (FIRInAppMessagingImageOnlyDisplay *)imageOnlyMessage
@@ -45,7 +45,7 @@
                 resourceBundle);
     return nil;
   }
-  FIDImageOnlyViewController *imageOnlyVC = (FIDImageOnlyViewController *)[storyboard
+  FIRIAMImageOnlyViewController *imageOnlyVC = (FIRIAMImageOnlyViewController *)[storyboard
       instantiateViewControllerWithIdentifier:@"image-only-vc"];
   imageOnlyVC.displayDelegate = displayDelegate;
   imageOnlyVC.imageOnlyMessage = imageOnlyMessage;

Firebase/InAppMessagingDisplay/Modal/FIDModalViewController.h → FirebaseInAppMessaging/Sources/DefaultUI/Modal/FIRIAMModalViewController.h

@@ -16,14 +16,14 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIDBaseRenderingViewController.h"
+#import "FIRIAMBaseRenderingViewController.h"
 
 @class FIRInAppMessagingModalDisplay;
 @protocol FIRInAppMessagingDisplayDelegate;
 
 NS_ASSUME_NONNULL_BEGIN
-@interface FIDModalViewController : FIDBaseRenderingViewController
-+ (FIDModalViewController *)
+@interface FIRIAMModalViewController : FIRIAMBaseRenderingViewController
++ (FIRIAMModalViewController *)
     instantiateViewControllerWithResourceBundle:(NSBundle *)resourceBundle
                                  displayMessage:(FIRInAppMessagingModalDisplay *)modalMessage
                                 displayDelegate:

Firebase/InAppMessagingDisplay/Modal/FIDModalViewController.m → FirebaseInAppMessaging/Sources/DefaultUI/Modal/FIRIAMModalViewController.m

@@ -16,10 +16,10 @@
 
 #import <UIKit/UIKit.h>
 
-#import "FIDModalViewController.h"
 #import "FIRCore+InAppMessagingDisplay.h"
+#import "FIRIAMModalViewController.h"
 
-@interface FIDModalViewController ()
+@interface FIRIAMModalViewController ()
 
 @property(nonatomic, readwrite) FIRInAppMessagingModalDisplay *modalDisplayMessage;
 
@@ -66,9 +66,9 @@ static CGFloat TopBottomPaddingAroundMsgCard = 30;
 // the horizontal spacing between image column and text/button column in landscape mode
 static CGFloat LandScapePaddingBetweenImageAndTextColumn = 24;
 
-@implementation FIDModalViewController
+@implementation FIRIAMModalViewController
 
-+ (FIDModalViewController *)
++ (FIRIAMModalViewController *)
     instantiateViewControllerWithResourceBundle:(NSBundle *)resourceBundle
                                  displayMessage:(FIRInAppMessagingModalDisplay *)modalMessage
                                 displayDelegate:
@@ -84,7 +84,7 @@ static CGFloat LandScapePaddingBetweenImageAndTextColumn = 24;
                 resourceBundle);
     return nil;
   }
-  FIDModalViewController *modalVC = (FIDModalViewController *)[storyboard
+  FIRIAMModalViewController *modalVC = (FIRIAMModalViewController *)[storyboard
       instantiateViewControllerWithIdentifier:@"modal-view-vc"];
   modalVC.displayDelegate = displayDelegate;
   modalVC.modalDisplayMessage = modalMessage;

Firebase/InAppMessagingDisplay/Util/FIDTimeFetcher.h → FirebaseInAppMessaging/Sources/DefaultUI/Util/FIDTimeFetcher.h

@@ -23,6 +23,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (NSTimeInterval)currentTimestampInSeconds;
 @end
 
-@interface FIDTimerWithNSDate : NSObject <FIDTimeFetcher>
+@interface FIRIAMTimerWithNSDate : NSObject <FIDTimeFetcher>
 @end
 NS_ASSUME_NONNULL_END

Firebase/InAppMessagingDisplay/Util/FIDTimeFetcher.m → FirebaseInAppMessaging/Sources/DefaultUI/Util/FIDTimeFetcher.m

@@ -16,7 +16,7 @@
 
 #import "FIDTimeFetcher.h"
 
-@implementation FIDTimerWithNSDate
+@implementation FIRIAMTimerWithNSDate
 - (NSTimeInterval)currentTimestampInSeconds {
   return [[NSDate date] timeIntervalSince1970];
 }