diff --git a/GoogleSignIn/Sources/GIDAppCheck/UI/GIDActivityIndicatorViewController.m b/GoogleSignIn/Sources/GIDAppCheck/UI/GIDActivityIndicatorViewController.m index fa9888e6..b3f34db5 100644 --- a/GoogleSignIn/Sources/GIDAppCheck/UI/GIDActivityIndicatorViewController.m +++ b/GoogleSignIn/Sources/GIDAppCheck/UI/GIDActivityIndicatorViewController.m @@ -24,6 +24,8 @@ @implementation GIDActivityIndicatorViewController - (void)viewDidLoad { [super viewDidLoad]; + // Medium gray with transparency + self.view.backgroundColor = [UIColor colorWithRed:0.1 green:0.1 blue:0.1 alpha:0.25]; UIActivityIndicatorViewStyle style; if (@available(iOS 13.0, *)) { @@ -32,6 +34,7 @@ - (void)viewDidLoad { style = UIActivityIndicatorViewStyleGray; } _activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:style]; + _activityIndicator.color = UIColor.whiteColor; self.activityIndicator.translatesAutoresizingMaskIntoConstraints = NO; [self.activityIndicator startAnimating]; [self.view addSubview:self.activityIndicator]; diff --git a/GoogleSignIn/Sources/GIDTimedLoader/GIDTimedLoader.m b/GoogleSignIn/Sources/GIDTimedLoader/GIDTimedLoader.m index c009dccf..02bad80d 100644 --- a/GoogleSignIn/Sources/GIDTimedLoader/GIDTimedLoader.m +++ b/GoogleSignIn/Sources/GIDTimedLoader/GIDTimedLoader.m @@ -68,6 +68,9 @@ - (void)presentLoadingViewController { self.loadingTimeStamp = CACurrentMediaTime(); dispatch_async(dispatch_get_main_queue(), ^{ // Since this loading VC may be reused, the activity indicator may have been stopped; restart it + self.loadingViewController.modalPresentationStyle = UIModalPresentationOverCurrentContext; + self.loadingViewController.modalTransitionStyle = UIModalTransitionStyleCrossDissolve; + self.presentingViewController.definesPresentationContext = YES; [self.loadingViewController.activityIndicator startAnimating]; [self.presentingViewController presentViewController:self.loadingViewController animated:YES diff --git a/Samples/Swift/AppAttestExample/AppAttestExampleForPod.xcodeproj/project.pbxproj b/Samples/Swift/AppAttestExample/AppAttestExampleForPod.xcodeproj/project.pbxproj index a951a7e8..bfbccbf2 100644 --- a/Samples/Swift/AppAttestExample/AppAttestExampleForPod.xcodeproj/project.pbxproj +++ b/Samples/Swift/AppAttestExample/AppAttestExampleForPod.xcodeproj/project.pbxproj @@ -7,8 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 7345556F2AB142B40068F2B0 /* AppCheckDefaultSecrets.json in Resources */ = {isa = PBXBuildFile; fileRef = 7345556D2AB142B40068F2B0 /* AppCheckDefaultSecrets.json */; }; - 734555702AB142B40068F2B0 /* AppCheckSecrets.json in Resources */ = {isa = PBXBuildFile; fileRef = 7345556E2AB142B40068F2B0 /* AppCheckSecrets.json */; }; + 734555A02AB39FBF0068F2B0 /* AppCheckDefaultSecrets.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 7345559F2AB39FBF0068F2B0 /* AppCheckDefaultSecrets.xcconfig */; }; 738B4A322AA8FE800056885D /* AppCheckSecretReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 738B4A312AA8FE800056885D /* AppCheckSecretReader.swift */; }; 738D5F732A26BC3B00A7F11B /* BirthdayLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 738D5F722A26BC3B00A7F11B /* BirthdayLoader.swift */; }; 73A464042A1C3B3400BA8528 /* AppAttestExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73A464032A1C3B3400BA8528 /* AppAttestExampleApp.swift */; }; @@ -22,8 +21,7 @@ 4728D878D216B7D622E237DA /* Pods_AppAttestExampleForPod.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AppAttestExampleForPod.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 73080B2A2AAF9BDE00DEF667 /* AppAttestExampleTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppAttestExampleTests.swift; sourceTree = ""; }; 73443A232A55F56900A4932E /* AppAttestExample.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = AppAttestExample.entitlements; sourceTree = ""; }; - 7345556D2AB142B40068F2B0 /* AppCheckDefaultSecrets.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = AppCheckDefaultSecrets.json; sourceTree = ""; }; - 7345556E2AB142B40068F2B0 /* AppCheckSecrets.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = AppCheckSecrets.json; sourceTree = ""; }; + 7345559F2AB39FBF0068F2B0 /* AppCheckDefaultSecrets.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = AppCheckDefaultSecrets.xcconfig; sourceTree = ""; }; 738B4A312AA8FE800056885D /* AppCheckSecretReader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCheckSecretReader.swift; sourceTree = ""; }; 738D5F722A26BC3B00A7F11B /* BirthdayLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BirthdayLoader.swift; sourceTree = ""; }; 73A065612A786D10007BC7FC /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -71,8 +69,7 @@ 7345556C2AB142B40068F2B0 /* Secrets */ = { isa = PBXGroup; children = ( - 7345556D2AB142B40068F2B0 /* AppCheckDefaultSecrets.json */, - 7345556E2AB142B40068F2B0 /* AppCheckSecrets.json */, + 7345559F2AB39FBF0068F2B0 /* AppCheckDefaultSecrets.xcconfig */, ); path = Secrets; sourceTree = ""; @@ -188,9 +185,8 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 7345556F2AB142B40068F2B0 /* AppCheckDefaultSecrets.json in Resources */, 73A4640B2A1C3B3500BA8528 /* Preview Assets.xcassets in Resources */, - 734555702AB142B40068F2B0 /* AppCheckSecrets.json in Resources */, + 734555A02AB39FBF0068F2B0 /* AppCheckDefaultSecrets.xcconfig in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -255,6 +251,7 @@ /* Begin XCBuildConfiguration section */ 73A4640C2A1C3B3500BA8528 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 7345559F2AB39FBF0068F2B0 /* AppCheckDefaultSecrets.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES;