From 670f9d900a53bf797594d87e711f3ac5bd8e0355 Mon Sep 17 00:00:00 2001 From: Chuan Ren Date: Fri, 15 Mar 2019 17:41:30 -0700 Subject: [PATCH 1/4] Fix pravicy policy view alignment --- .../FUIAuthPickerViewController.m | 59 +++++--- .../FUIPrivacyAndTermsOfServiceView.m | 2 +- Gemfile.lock | 46 +++--- .../project.pbxproj | 136 ++++++++++++++++++ 4 files changed, 196 insertions(+), 47 deletions(-) diff --git a/Auth/FirebaseAuthUI/FUIAuthPickerViewController.m b/Auth/FirebaseAuthUI/FUIAuthPickerViewController.m index 4f27af36380..48c7eaeddfd 100644 --- a/Auth/FirebaseAuthUI/FUIAuthPickerViewController.m +++ b/Auth/FirebaseAuthUI/FUIAuthPickerViewController.m @@ -25,37 +25,47 @@ #import "FUIPrivacyAndTermsOfServiceView.h" /** @var kSignInButtonWidth - @brief The width of the sign in buttons. + @brief The width of the sign in buttons. */ static const CGFloat kSignInButtonWidth = 220.0f; /** @var kSignInButtonHeight - @brief The height of the sign in buttons. + @brief The height of the sign in buttons. */ static const CGFloat kSignInButtonHeight = 40.0f; /** @var kSignInButtonVerticalMargin - @brief The vertical margin between sign in buttons. + @brief The vertical margin between sign in buttons. */ static const CGFloat kSignInButtonVerticalMargin = 24.0f; /** @var kButtonContainerBottomMargin - @brief The magin between sign in buttons and the bottom of the content view. + @brief The magin between sign in buttons and the bottom of the content view. */ -static const CGFloat kButtonContainerBottomMargin = 56.0f; +static const CGFloat kButtonContainerBottomMargin = 48.0f; /** @var kButtonContainerTopMargin - @brief The margin between sign in buttons and the top of the content view. + @brief The margin between sign in buttons and the top of the content view. */ static const CGFloat kButtonContainerTopMargin = 16.0f; +/** @var kTOSViewBottomMargin + @brief The margin between privacy policy and TOS view and the bottom of the content view. + */ +static const CGFloat kTOSViewBottomMargin = 24.0f; + +/** @var kTOSViewHorizontalMargin + @brief The margin between privacy policy and TOS view and the left or right of the content view. + */ +static const CGFloat kTOSViewHorizontalMargin = 16.0f; + @implementation FUIAuthPickerViewController { UIView *_buttonContainerView; IBOutlet FUIPrivacyAndTermsOfServiceView *_privacyPolicyAndTOSView; IBOutlet UIView *_contentView; - + IBOutlet UIScrollView *_scrollView; } @@ -83,21 +93,21 @@ - (void)viewDidLoad { if (!self.authUI.shouldHideCancelButton) { UIBarButtonItem *cancelBarButton = - [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel - target:self - action:@selector(cancelAuthorization)]; + [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel + target:self + action:@selector(cancelAuthorization)]; self.navigationItem.leftBarButtonItem = cancelBarButton; } self.navigationItem.backBarButtonItem = - [[UIBarButtonItem alloc] initWithTitle:FUILocalizedString(kStr_Back) - style:UIBarButtonItemStylePlain - target:nil - action:nil]; + [[UIBarButtonItem alloc] initWithTitle:FUILocalizedString(kStr_Back) + style:UIBarButtonItemStylePlain + target:nil + action:nil]; NSInteger numberOfButtons = self.authUI.providers.count; CGFloat buttonContainerViewHeight = - kSignInButtonHeight * numberOfButtons + kSignInButtonVerticalMargin * (numberOfButtons); + kSignInButtonHeight * numberOfButtons + kSignInButtonVerticalMargin * (numberOfButtons); CGRect buttonContainerViewFrame = CGRectMake(0, 0, kSignInButtonWidth, buttonContainerViewHeight); _buttonContainerView = [[UIView alloc] initWithFrame:buttonContainerViewFrame]; if (_scrollView) { @@ -111,7 +121,7 @@ - (void)viewDidLoad { CGRect buttonFrame = CGRectMake(0, 0, kSignInButtonWidth, kSignInButtonHeight); for (id providerUI in self.authUI.providers) { UIButton *providerButton = - [[FUIAuthSignInButton alloc] initWithFrame:buttonFrame providerUI:providerUI]; + [[FUIAuthSignInButton alloc] initWithFrame:buttonFrame providerUI:providerUI]; [providerButton addTarget:self action:@selector(didTapSignInButton:) forControlEvents:UIControlEventTouchUpInside]; @@ -134,18 +144,18 @@ - (void)viewDidLayoutSubviews { // old layout behavior. if (!_scrollView) { CGFloat distanceFromCenterToBottom = - CGRectGetHeight(_buttonContainerView.frame) / 2.0f + kButtonContainerBottomMargin; + CGRectGetHeight(_buttonContainerView.frame) / 2.0f + kButtonContainerBottomMargin + kTOSViewBottomMargin; CGFloat centerY = CGRectGetHeight(self.view.bounds) - distanceFromCenterToBottom; // Compensate for bounds adjustment if any. centerY += self.view.bounds.origin.y; _buttonContainerView.center = CGPointMake(self.view.center.x, centerY); return; } - + CGFloat buttonContainerHeight = CGRectGetHeight(_buttonContainerView.frame); CGFloat buttonContainerWidth = CGRectGetWidth(_buttonContainerView.frame); - CGFloat contentViewHeight = kButtonContainerTopMargin + - buttonContainerHeight + kButtonContainerBottomMargin; + CGFloat contentViewHeight = kButtonContainerTopMargin + buttonContainerHeight + + kButtonContainerBottomMargin + kTOSViewBottomMargin; CGFloat contentViewWidth = CGRectGetWidth(self.view.bounds); _scrollView.frame = self.view.frame; CGFloat scrollViewHeight; @@ -153,8 +163,8 @@ - (void)viewDidLayoutSubviews { scrollViewHeight = CGRectGetHeight(_scrollView.frame) - _scrollView.safeAreaInsets.top; } else { scrollViewHeight = CGRectGetHeight(_scrollView.frame) - - CGRectGetHeight(self.navigationController.navigationBar.frame) - - CGRectGetHeight([UIApplication sharedApplication].statusBarFrame); + - CGRectGetHeight(self.navigationController.navigationBar.frame) + - CGRectGetHeight([UIApplication sharedApplication].statusBarFrame); } CGFloat contentViewY = scrollViewHeight - contentViewHeight; if (contentViewY < 0) { @@ -168,7 +178,10 @@ - (void)viewDidLayoutSubviews { buttonContainerWidth, buttonContainerHeight); CGFloat privacyViewHeight = CGRectGetHeight(_privacyPolicyAndTOSView.frame); - _privacyPolicyAndTOSView.frame = CGRectMake(0, contentViewHeight - privacyViewHeight, contentViewWidth, privacyViewHeight); + _privacyPolicyAndTOSView.frame = CGRectMake(kTOSViewHorizontalMargin, contentViewHeight + - privacyViewHeight - kTOSViewBottomMargin, + contentViewWidth - kTOSViewHorizontalMargin*2, + privacyViewHeight); } #pragma mark - Actions diff --git a/Auth/FirebaseAuthUI/FUIPrivacyAndTermsOfServiceView.m b/Auth/FirebaseAuthUI/FUIPrivacyAndTermsOfServiceView.m index e585a539f31..a291acfa31d 100644 --- a/Auth/FirebaseAuthUI/FUIPrivacyAndTermsOfServiceView.m +++ b/Auth/FirebaseAuthUI/FUIPrivacyAndTermsOfServiceView.m @@ -35,7 +35,7 @@ - (void)useFullMessage { - (void)useFooterMessage { NSAttributedString *footerMessage = [self footerPrivacyPolicyAndTOSMessage]; self.attributedText = footerMessage; - self.textAlignment = NSTextAlignmentRight; + self.textAlignment = NSTextAlignmentCenter; } #pragma mark - Protected diff --git a/Gemfile.lock b/Gemfile.lock index 54453456dd2..7936110eac9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,69 +2,69 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.0) - activesupport (4.2.10) + activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - atomos (0.1.2) + atomos (0.1.3) claide (1.0.2) - cocoapods (1.5.3) + cocoapods (1.6.1) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.5.3) + cocoapods-core (= 1.6.1) cocoapods-deintegrate (>= 1.0.2, < 2.0) - cocoapods-downloader (>= 1.2.0, < 2.0) + cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-stats (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.3.0, < 2.0) + cocoapods-trunk (>= 1.3.1, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) - fourflusher (~> 2.0.1) + fourflusher (>= 2.2.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.6.5) + molinillo (~> 0.6.6) nap (~> 1.0) - ruby-macho (~> 1.1) - xcodeproj (>= 1.5.7, < 2.0) - cocoapods-core (1.5.3) + ruby-macho (~> 1.4) + xcodeproj (>= 1.8.1, < 2.0) + cocoapods-core (1.6.1) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) - cocoapods-deintegrate (1.0.2) - cocoapods-downloader (1.2.1) + cocoapods-deintegrate (1.0.3) + cocoapods-downloader (1.2.2) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) - cocoapods-stats (1.0.0) - cocoapods-trunk (1.3.0) + cocoapods-stats (1.1.0) + cocoapods-trunk (1.3.1) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.1.0) colored2 (3.1.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.5) escape (0.0.4) - fourflusher (2.0.1) + fourflusher (2.2.0) fuzzy_match (2.0.4) gh_inspector (1.1.3) i18n (0.9.5) concurrent-ruby (~> 1.0) minitest (5.11.3) - molinillo (0.6.5) + molinillo (0.6.6) nanaimo (0.2.6) nap (1.1.0) netrc (0.11.0) - ruby-macho (1.2.0) + ruby-macho (1.4.0) thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.5.9) + xcodeproj (1.8.1) CFPropertyList (>= 2.3.3, < 4.0) - atomos (~> 0.1.2) + atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.2.5) + nanaimo (~> 0.2.6) PLATFORMS ruby @@ -75,4 +75,4 @@ DEPENDENCIES xcodeproj BUNDLED WITH - 1.16.1 + 1.17.2 diff --git a/samples/objc/FirebaseUI-demo-objc.xcodeproj/project.pbxproj b/samples/objc/FirebaseUI-demo-objc.xcodeproj/project.pbxproj index 48db5ab76a6..768df2f85da 100644 --- a/samples/objc/FirebaseUI-demo-objc.xcodeproj/project.pbxproj +++ b/samples/objc/FirebaseUI-demo-objc.xcodeproj/project.pbxproj @@ -33,12 +33,16 @@ C3AC67631D81FE6B00FC956D /* FUIChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC675D1D81FE6B00FC956D /* FUIChatViewController.m */; }; C3AC67661D82002F00FC956D /* FUISample.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC67651D82002F00FC956D /* FUISample.m */; }; C3F23ED01D80F58A0020509F /* FUISamplesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3F23ECF1D80F58A0020509F /* FUISamplesViewController.m */; }; + D6D934931095F3F1729FA0A8 /* Pods_FirebaseUI_demo_objc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76EAC6E4BC6C0D6169B401F9 /* Pods_FirebaseUI_demo_objc.framework */; }; D81A05F61B86A78700498183 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D81A05F51B86A78700498183 /* main.m */; }; D81A05F91B86A78700498183 /* FUIAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D81A05F81B86A78700498183 /* FUIAppDelegate.m */; }; D81A06011B86A78700498183 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D81A06001B86A78700498183 /* Images.xcassets */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 1AB18C16635CBC43B54C2CE5 /* Pods-FirebaseUI-demo-objc.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseUI-demo-objc.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc.debug.xcconfig"; sourceTree = ""; }; + 74ACC32DC007657FC6345853 /* Pods-FirebaseUI-demo-objc.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseUI-demo-objc.release.xcconfig"; path = "Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc.release.xcconfig"; sourceTree = ""; }; + 76EAC6E4BC6C0D6169B401F9 /* Pods_FirebaseUI_demo_objc.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseUI_demo_objc.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 896400F6222F583100CEF7D7 /* mssymbol.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = mssymbol.png; sourceTree = ""; }; 8D7D5DC01D9D9536006C1857 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 8D7F86B31D9DAA0100C2A122 /* FUIStorageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FUIStorageViewController.h; path = Storage/FUIStorageViewController.h; sourceTree = ""; }; @@ -177,6 +181,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D6D934931095F3F1729FA0A8 /* Pods_FirebaseUI_demo_objc.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -186,10 +191,20 @@ 54B9F7E49B62231ABC826A36 /* Pods */ = { isa = PBXGroup; children = ( + 1AB18C16635CBC43B54C2CE5 /* Pods-FirebaseUI-demo-objc.debug.xcconfig */, + 74ACC32DC007657FC6345853 /* Pods-FirebaseUI-demo-objc.release.xcconfig */, ); path = Pods; sourceTree = ""; }; + 5D2D62DC0A6CCD409E3F9112 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 76EAC6E4BC6C0D6169B401F9 /* Pods_FirebaseUI_demo_objc.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; 896400F5222F580400CEF7D7 /* Resources */ = { isa = PBXGroup; children = ( @@ -279,6 +294,7 @@ D81A05F21B86A78700498183 /* FirebaseUI-demo-objc */, D81A05F11B86A78700498183 /* Products */, 54B9F7E49B62231ABC826A36 /* Pods */, + 5D2D62DC0A6CCD409E3F9112 /* Frameworks */, ); sourceTree = ""; }; @@ -324,9 +340,12 @@ isa = PBXNativeTarget; buildConfigurationList = D81A06131B86A78700498183 /* Build configuration list for PBXNativeTarget "FirebaseUI-demo-objc" */; buildPhases = ( + 137B22A88E687B02875349DB /* [CP] Check Pods Manifest.lock */, D81A05EC1B86A78700498183 /* Sources */, D81A05ED1B86A78700498183 /* Frameworks */, D81A05EE1B86A78700498183 /* Resources */, + 3513E893C4D12602E050D86D /* [CP] Embed Pods Frameworks */, + 47AAE7F30029E275361974D7 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -482,6 +501,121 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 137B22A88E687B02875349DB /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-FirebaseUI-demo-objc-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + 3513E893C4D12602E050D86D /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/Bolts/Bolts.framework", + "${BUILT_PRODUCTS_DIR}/BoringSSL-GRPC/openssl_grpc.framework", + "${BUILT_PRODUCTS_DIR}/FBSDKCoreKit/FBSDKCoreKit.framework", + "${BUILT_PRODUCTS_DIR}/FBSDKLoginKit/FBSDKLoginKit.framework", + "${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework", + "${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac/GoogleToolboxForMac.framework", + "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", + "${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework", + "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", + "${PODS_ROOT}/TwitterCore/iOS/TwitterCore.framework", + "${PODS_ROOT}/TwitterKit/iOS/TwitterKit.framework", + "${BUILT_PRODUCTS_DIR}/gRPC-C++/grpcpp.framework", + "${BUILT_PRODUCTS_DIR}/gRPC-Core/grpc.framework", + "${BUILT_PRODUCTS_DIR}/leveldb-library/leveldb.framework", + "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + ); + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Bolts.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl_grpc.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKCoreKit.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKLoginKit.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TwitterCore.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TwitterKit.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpcpp.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpc.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/leveldb.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + 47AAE7F30029E275361974D7 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseAnonymousAuthUI.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseAuthUI.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseEmailAuthUI.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseFacebookAuthUI.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseGoogleAuthUI.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseOAuthUI.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebasePhoneAuthUI.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseTwitterAuthUI.bundle", + "${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle", + "${PODS_ROOT}/TwitterKit/iOS/TwitterKit.framework/TwitterKitResources.bundle", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + ); + outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseAnonymousAuthUI.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseAuthUI.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseEmailAuthUI.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseFacebookAuthUI.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseGoogleAuthUI.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseOAuthUI.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebasePhoneAuthUI.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseTwitterAuthUI.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TwitterKitResources.bundle", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ D81A05EC1B86A78700498183 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -709,6 +843,7 @@ }; D81A06141B86A78700498183 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 1AB18C16635CBC43B54C2CE5 /* Pods-FirebaseUI-demo-objc.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = "FirebaseUI-demo-objc/FirebaseUI-demo-objc.entitlements"; @@ -742,6 +877,7 @@ }; D81A06151B86A78700498183 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 74ACC32DC007657FC6345853 /* Pods-FirebaseUI-demo-objc.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = "FirebaseUI-demo-objc/FirebaseUI-demo-objc.entitlements"; From 01682033b4a21960e38bc3d3ec2dd637e507e0d8 Mon Sep 17 00:00:00 2001 From: Chuan Ren Date: Fri, 15 Mar 2019 17:43:54 -0700 Subject: [PATCH 2/4] Fix indent --- .../FUIAuthPickerViewController.m | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Auth/FirebaseAuthUI/FUIAuthPickerViewController.m b/Auth/FirebaseAuthUI/FUIAuthPickerViewController.m index 48c7eaeddfd..cbf6b50be15 100644 --- a/Auth/FirebaseAuthUI/FUIAuthPickerViewController.m +++ b/Auth/FirebaseAuthUI/FUIAuthPickerViewController.m @@ -25,37 +25,37 @@ #import "FUIPrivacyAndTermsOfServiceView.h" /** @var kSignInButtonWidth - @brief The width of the sign in buttons. + @brief The width of the sign in buttons. */ static const CGFloat kSignInButtonWidth = 220.0f; /** @var kSignInButtonHeight - @brief The height of the sign in buttons. + @brief The height of the sign in buttons. */ static const CGFloat kSignInButtonHeight = 40.0f; /** @var kSignInButtonVerticalMargin - @brief The vertical margin between sign in buttons. + @brief The vertical margin between sign in buttons. */ static const CGFloat kSignInButtonVerticalMargin = 24.0f; /** @var kButtonContainerBottomMargin - @brief The magin between sign in buttons and the bottom of the content view. + @brief The magin between sign in buttons and the bottom of the content view. */ static const CGFloat kButtonContainerBottomMargin = 48.0f; /** @var kButtonContainerTopMargin - @brief The margin between sign in buttons and the top of the content view. + @brief The margin between sign in buttons and the top of the content view. */ static const CGFloat kButtonContainerTopMargin = 16.0f; /** @var kTOSViewBottomMargin - @brief The margin between privacy policy and TOS view and the bottom of the content view. + @brief The margin between privacy policy and TOS view and the bottom of the content view. */ static const CGFloat kTOSViewBottomMargin = 24.0f; /** @var kTOSViewHorizontalMargin - @brief The margin between privacy policy and TOS view and the left or right of the content view. + @brief The margin between privacy policy and TOS view and the left or right of the content view. */ static const CGFloat kTOSViewHorizontalMargin = 16.0f; @@ -93,21 +93,21 @@ - (void)viewDidLoad { if (!self.authUI.shouldHideCancelButton) { UIBarButtonItem *cancelBarButton = - [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel - target:self - action:@selector(cancelAuthorization)]; + [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel + target:self + action:@selector(cancelAuthorization)]; self.navigationItem.leftBarButtonItem = cancelBarButton; } self.navigationItem.backBarButtonItem = - [[UIBarButtonItem alloc] initWithTitle:FUILocalizedString(kStr_Back) - style:UIBarButtonItemStylePlain - target:nil - action:nil]; + [[UIBarButtonItem alloc] initWithTitle:FUILocalizedString(kStr_Back) + style:UIBarButtonItemStylePlain + target:nil + action:nil]; NSInteger numberOfButtons = self.authUI.providers.count; CGFloat buttonContainerViewHeight = - kSignInButtonHeight * numberOfButtons + kSignInButtonVerticalMargin * (numberOfButtons); + kSignInButtonHeight * numberOfButtons + kSignInButtonVerticalMargin * (numberOfButtons); CGRect buttonContainerViewFrame = CGRectMake(0, 0, kSignInButtonWidth, buttonContainerViewHeight); _buttonContainerView = [[UIView alloc] initWithFrame:buttonContainerViewFrame]; if (_scrollView) { @@ -121,7 +121,7 @@ - (void)viewDidLoad { CGRect buttonFrame = CGRectMake(0, 0, kSignInButtonWidth, kSignInButtonHeight); for (id providerUI in self.authUI.providers) { UIButton *providerButton = - [[FUIAuthSignInButton alloc] initWithFrame:buttonFrame providerUI:providerUI]; + [[FUIAuthSignInButton alloc] initWithFrame:buttonFrame providerUI:providerUI]; [providerButton addTarget:self action:@selector(didTapSignInButton:) forControlEvents:UIControlEventTouchUpInside]; @@ -144,7 +144,7 @@ - (void)viewDidLayoutSubviews { // old layout behavior. if (!_scrollView) { CGFloat distanceFromCenterToBottom = - CGRectGetHeight(_buttonContainerView.frame) / 2.0f + kButtonContainerBottomMargin + kTOSViewBottomMargin; + CGRectGetHeight(_buttonContainerView.frame) / 2.0f + kButtonContainerBottomMargin + kTOSViewBottomMargin; CGFloat centerY = CGRectGetHeight(self.view.bounds) - distanceFromCenterToBottom; // Compensate for bounds adjustment if any. centerY += self.view.bounds.origin.y; @@ -155,7 +155,7 @@ - (void)viewDidLayoutSubviews { CGFloat buttonContainerHeight = CGRectGetHeight(_buttonContainerView.frame); CGFloat buttonContainerWidth = CGRectGetWidth(_buttonContainerView.frame); CGFloat contentViewHeight = kButtonContainerTopMargin + buttonContainerHeight - + kButtonContainerBottomMargin + kTOSViewBottomMargin; + + kButtonContainerBottomMargin + kTOSViewBottomMargin; CGFloat contentViewWidth = CGRectGetWidth(self.view.bounds); _scrollView.frame = self.view.frame; CGFloat scrollViewHeight; @@ -163,8 +163,8 @@ - (void)viewDidLayoutSubviews { scrollViewHeight = CGRectGetHeight(_scrollView.frame) - _scrollView.safeAreaInsets.top; } else { scrollViewHeight = CGRectGetHeight(_scrollView.frame) - - CGRectGetHeight(self.navigationController.navigationBar.frame) - - CGRectGetHeight([UIApplication sharedApplication].statusBarFrame); + - CGRectGetHeight(self.navigationController.navigationBar.frame) + - CGRectGetHeight([UIApplication sharedApplication].statusBarFrame); } CGFloat contentViewY = scrollViewHeight - contentViewHeight; if (contentViewY < 0) { From af88d721ac07709ccde353d9765b3cab3745859d Mon Sep 17 00:00:00 2001 From: Chuan Ren Date: Mon, 18 Mar 2019 11:20:37 -0700 Subject: [PATCH 3/4] Align tos to right --- Auth/FirebaseAuthUI/FUIPrivacyAndTermsOfServiceView.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Auth/FirebaseAuthUI/FUIPrivacyAndTermsOfServiceView.m b/Auth/FirebaseAuthUI/FUIPrivacyAndTermsOfServiceView.m index a291acfa31d..e585a539f31 100644 --- a/Auth/FirebaseAuthUI/FUIPrivacyAndTermsOfServiceView.m +++ b/Auth/FirebaseAuthUI/FUIPrivacyAndTermsOfServiceView.m @@ -35,7 +35,7 @@ - (void)useFullMessage { - (void)useFooterMessage { NSAttributedString *footerMessage = [self footerPrivacyPolicyAndTOSMessage]; self.attributedText = footerMessage; - self.textAlignment = NSTextAlignmentCenter; + self.textAlignment = NSTextAlignmentRight; } #pragma mark - Protected From 67b74cdb2b8bd1b566d9087ff2b6dd7a2d92ab8d Mon Sep 17 00:00:00 2001 From: Chuan Ren Date: Mon, 18 Mar 2019 11:21:02 -0700 Subject: [PATCH 4/4] pod deintegrate --- .../project.pbxproj | 136 ------------------ 1 file changed, 136 deletions(-) diff --git a/samples/objc/FirebaseUI-demo-objc.xcodeproj/project.pbxproj b/samples/objc/FirebaseUI-demo-objc.xcodeproj/project.pbxproj index 768df2f85da..48db5ab76a6 100644 --- a/samples/objc/FirebaseUI-demo-objc.xcodeproj/project.pbxproj +++ b/samples/objc/FirebaseUI-demo-objc.xcodeproj/project.pbxproj @@ -33,16 +33,12 @@ C3AC67631D81FE6B00FC956D /* FUIChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC675D1D81FE6B00FC956D /* FUIChatViewController.m */; }; C3AC67661D82002F00FC956D /* FUISample.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC67651D82002F00FC956D /* FUISample.m */; }; C3F23ED01D80F58A0020509F /* FUISamplesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3F23ECF1D80F58A0020509F /* FUISamplesViewController.m */; }; - D6D934931095F3F1729FA0A8 /* Pods_FirebaseUI_demo_objc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76EAC6E4BC6C0D6169B401F9 /* Pods_FirebaseUI_demo_objc.framework */; }; D81A05F61B86A78700498183 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D81A05F51B86A78700498183 /* main.m */; }; D81A05F91B86A78700498183 /* FUIAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D81A05F81B86A78700498183 /* FUIAppDelegate.m */; }; D81A06011B86A78700498183 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D81A06001B86A78700498183 /* Images.xcassets */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 1AB18C16635CBC43B54C2CE5 /* Pods-FirebaseUI-demo-objc.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseUI-demo-objc.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc.debug.xcconfig"; sourceTree = ""; }; - 74ACC32DC007657FC6345853 /* Pods-FirebaseUI-demo-objc.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseUI-demo-objc.release.xcconfig"; path = "Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc.release.xcconfig"; sourceTree = ""; }; - 76EAC6E4BC6C0D6169B401F9 /* Pods_FirebaseUI_demo_objc.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseUI_demo_objc.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 896400F6222F583100CEF7D7 /* mssymbol.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = mssymbol.png; sourceTree = ""; }; 8D7D5DC01D9D9536006C1857 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 8D7F86B31D9DAA0100C2A122 /* FUIStorageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FUIStorageViewController.h; path = Storage/FUIStorageViewController.h; sourceTree = ""; }; @@ -181,7 +177,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D6D934931095F3F1729FA0A8 /* Pods_FirebaseUI_demo_objc.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -191,20 +186,10 @@ 54B9F7E49B62231ABC826A36 /* Pods */ = { isa = PBXGroup; children = ( - 1AB18C16635CBC43B54C2CE5 /* Pods-FirebaseUI-demo-objc.debug.xcconfig */, - 74ACC32DC007657FC6345853 /* Pods-FirebaseUI-demo-objc.release.xcconfig */, ); path = Pods; sourceTree = ""; }; - 5D2D62DC0A6CCD409E3F9112 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 76EAC6E4BC6C0D6169B401F9 /* Pods_FirebaseUI_demo_objc.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; 896400F5222F580400CEF7D7 /* Resources */ = { isa = PBXGroup; children = ( @@ -294,7 +279,6 @@ D81A05F21B86A78700498183 /* FirebaseUI-demo-objc */, D81A05F11B86A78700498183 /* Products */, 54B9F7E49B62231ABC826A36 /* Pods */, - 5D2D62DC0A6CCD409E3F9112 /* Frameworks */, ); sourceTree = ""; }; @@ -340,12 +324,9 @@ isa = PBXNativeTarget; buildConfigurationList = D81A06131B86A78700498183 /* Build configuration list for PBXNativeTarget "FirebaseUI-demo-objc" */; buildPhases = ( - 137B22A88E687B02875349DB /* [CP] Check Pods Manifest.lock */, D81A05EC1B86A78700498183 /* Sources */, D81A05ED1B86A78700498183 /* Frameworks */, D81A05EE1B86A78700498183 /* Resources */, - 3513E893C4D12602E050D86D /* [CP] Embed Pods Frameworks */, - 47AAE7F30029E275361974D7 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -501,121 +482,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 137B22A88E687B02875349DB /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-FirebaseUI-demo-objc-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - 3513E893C4D12602E050D86D /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/Bolts/Bolts.framework", - "${BUILT_PRODUCTS_DIR}/BoringSSL-GRPC/openssl_grpc.framework", - "${BUILT_PRODUCTS_DIR}/FBSDKCoreKit/FBSDKCoreKit.framework", - "${BUILT_PRODUCTS_DIR}/FBSDKLoginKit/FBSDKLoginKit.framework", - "${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework", - "${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac/GoogleToolboxForMac.framework", - "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", - "${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework", - "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", - "${PODS_ROOT}/TwitterCore/iOS/TwitterCore.framework", - "${PODS_ROOT}/TwitterKit/iOS/TwitterKit.framework", - "${BUILT_PRODUCTS_DIR}/gRPC-C++/grpcpp.framework", - "${BUILT_PRODUCTS_DIR}/gRPC-Core/grpc.framework", - "${BUILT_PRODUCTS_DIR}/leveldb-library/leveldb.framework", - "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Bolts.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl_grpc.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKCoreKit.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKLoginKit.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TwitterCore.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TwitterKit.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpcpp.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpc.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/leveldb.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 47AAE7F30029E275361974D7 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseAnonymousAuthUI.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseAuthUI.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseEmailAuthUI.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseFacebookAuthUI.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseGoogleAuthUI.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseOAuthUI.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebasePhoneAuthUI.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseTwitterAuthUI.bundle", - "${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle", - "${PODS_ROOT}/TwitterKit/iOS/TwitterKit.framework/TwitterKitResources.bundle", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseAnonymousAuthUI.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseAuthUI.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseEmailAuthUI.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseFacebookAuthUI.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseGoogleAuthUI.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseOAuthUI.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebasePhoneAuthUI.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseTwitterAuthUI.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TwitterKitResources.bundle", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ D81A05EC1B86A78700498183 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -843,7 +709,6 @@ }; D81A06141B86A78700498183 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1AB18C16635CBC43B54C2CE5 /* Pods-FirebaseUI-demo-objc.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = "FirebaseUI-demo-objc/FirebaseUI-demo-objc.entitlements"; @@ -877,7 +742,6 @@ }; D81A06151B86A78700498183 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 74ACC32DC007657FC6345853 /* Pods-FirebaseUI-demo-objc.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = "FirebaseUI-demo-objc/FirebaseUI-demo-objc.entitlements";