Skip to content

Do not modally animate the presenting of app check loading UI #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mdmathias merged 3 commits into from
Sep 15, 2023
Merged

Do not modally animate the presenting of app check loading UI #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
988c3ef
Do not modally animate the presenting of app check loading UI
mdmathias Sep 14, 2023
c1e75c1
Use cross dissolve animation to present loading UI
mdmathias Sep 14, 2023
6970e70
Add comment clarifying loading UI color
mdmathias Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions GoogleSignIn/Sources/GIDAppCheck/UI/GIDActivityIndicatorViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, *)) {
Expand All @@ -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];
Expand Down
3 changes: 3 additions & 0 deletions GoogleSignIn/Sources/GIDTimedLoader/GIDTimedLoader.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 5 additions & 8 deletions Samples/Swift/AppAttestExample/AppAttestExampleForPod.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand All @@ -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 = "<group>"; };
73443A232A55F56900A4932E /* AppAttestExample.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = AppAttestExample.entitlements; sourceTree = "<group>"; };
7345556D2AB142B40068F2B0 /* AppCheckDefaultSecrets.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = AppCheckDefaultSecrets.json; sourceTree = "<group>"; };
7345556E2AB142B40068F2B0 /* AppCheckSecrets.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = AppCheckSecrets.json; sourceTree = "<group>"; };
7345559F2AB39FBF0068F2B0 /* AppCheckDefaultSecrets.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = AppCheckDefaultSecrets.xcconfig; sourceTree = "<group>"; };
738B4A312AA8FE800056885D /* AppCheckSecretReader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCheckSecretReader.swift; sourceTree = "<group>"; };
738D5F722A26BC3B00A7F11B /* BirthdayLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BirthdayLoader.swift; sourceTree = "<group>"; };
73A065612A786D10007BC7FC /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand Down Expand Up @@ -71,8 +69,7 @@
7345556C2AB142B40068F2B0 /* Secrets */ = {
isa = PBXGroup;
children = (
7345556D2AB142B40068F2B0 /* AppCheckDefaultSecrets.json */,
7345556E2AB142B40068F2B0 /* AppCheckSecrets.json */,
7345559F2AB39FBF0068F2B0 /* AppCheckDefaultSecrets.xcconfig */,
);
path = Secrets;
sourceTree = "<group>";
Expand Down Expand Up @@ -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;
};
Expand Down Expand Up @@ -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;
Expand Down