From 208996000f053828bdf06ca4541aaca3abed7160 Mon Sep 17 00:00:00 2001 From: Andrew Finke Date: Sat, 22 Feb 2020 15:46:52 -0500 Subject: [PATCH 1/2] flashing ready up button --- WikiRaces/Shared/Other/CommonExtensions.swift | 3 +- .../Other/CenteredTableViewController.swift | 2 +- .../ResultsViewController.swift | 32 ++++++++++++++++++- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/WikiRaces/Shared/Other/CommonExtensions.swift b/WikiRaces/Shared/Other/CommonExtensions.swift index 3643141..7dd3c92 100644 --- a/WikiRaces/Shared/Other/CommonExtensions.swift +++ b/WikiRaces/Shared/Other/CommonExtensions.swift @@ -57,11 +57,12 @@ extension UIView { } static func animateFlash(withDuration duration: TimeInterval, + toAlpha alpha: CGFloat = 0, items: [UIView], whenHidden: (() -> Void)?, completion: (() -> Void)?) { UIView.animate(withDuration: duration / 2.0, animations: { - items.forEach { $0.alpha = 0.0 } + items.forEach { $0.alpha = alpha } }, completion: { _ in whenHidden?() UIView.animate(withDuration: duration / 2.0, animations: { diff --git a/WikiRaces/Shared/Race View Controllers/Other/CenteredTableViewController.swift b/WikiRaces/Shared/Race View Controllers/Other/CenteredTableViewController.swift index c9acd1d..623b95e 100644 --- a/WikiRaces/Shared/Race View Controllers/Other/CenteredTableViewController.swift +++ b/WikiRaces/Shared/Race View Controllers/Other/CenteredTableViewController.swift @@ -43,7 +43,7 @@ internal class CenteredTableViewController: UIViewController { let reuseIdentifier = "cell" let tableView = WKRUICenteredTableView() - private let overlayButton = WKRUIButton() + let overlayButton = WKRUIButton() var contentView: UIView! private var overlayBottomConstraint: NSLayoutConstraint! diff --git a/WikiRaces/Shared/Race View Controllers/ResultsViewController/ResultsViewController.swift b/WikiRaces/Shared/Race View Controllers/ResultsViewController/ResultsViewController.swift index f961fc2..79bfecb 100644 --- a/WikiRaces/Shared/Race View Controllers/ResultsViewController/ResultsViewController.swift +++ b/WikiRaces/Shared/Race View Controllers/ResultsViewController/ResultsViewController.swift @@ -31,6 +31,7 @@ internal class ResultsViewController: CenteredTableViewController { var shareResultsBarButtonItem: UIBarButtonItem? var isAnimatingToPointsStandings = false + var isPulsingReadyButton = false var hasAnimatedToPointsStandings = false let resultRenderer = ResultRenderer() @@ -236,14 +237,43 @@ internal class ResultsViewController: CenteredTableViewController { return } + var isAnotherPlayerReady = false + var isLocalPlayerReady = false for index in 0.. Date: Sat, 22 Feb 2020 15:47:10 -0500 Subject: [PATCH 2/2] project settings --- WKRKit/WKRKit/Info.plist | 2 +- WKRUIKit/WKRUIKit/Info.plist | 2 +- WikiRaces/WikiRaces.xcodeproj/project.pbxproj | 8 ++++++-- WikiRaces/WikiRaces/Info.plist | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/WKRKit/WKRKit/Info.plist b/WKRKit/WKRKit/Info.plist index ef6254c..d3fba04 100644 --- a/WKRKit/WKRKit/Info.plist +++ b/WKRKit/WKRKit/Info.plist @@ -17,7 +17,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 9558 + 9593 NSPrincipalClass diff --git a/WKRUIKit/WKRUIKit/Info.plist b/WKRUIKit/WKRUIKit/Info.plist index 9c99299..5a014a7 100644 --- a/WKRUIKit/WKRUIKit/Info.plist +++ b/WKRUIKit/WKRUIKit/Info.plist @@ -17,7 +17,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 10193 + 10228 NSPrincipalClass diff --git a/WikiRaces/WikiRaces.xcodeproj/project.pbxproj b/WikiRaces/WikiRaces.xcodeproj/project.pbxproj index 496ae54..6fd8ad6 100644 --- a/WikiRaces/WikiRaces.xcodeproj/project.pbxproj +++ b/WikiRaces/WikiRaces.xcodeproj/project.pbxproj @@ -39,6 +39,7 @@ 143BB7181F60BDC000D00541 /* MenuViewController+GameKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 143BB7171F60BDC000D00541 /* MenuViewController+GameKit.swift */; }; 143BB7191F60BDC000D00541 /* MenuViewController+GameKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 143BB7171F60BDC000D00541 /* MenuViewController+GameKit.swift */; }; 143BB7351F60DF4A00D00541 /* MPCConnectViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 143BB7341F60DF4A00D00541 /* MPCConnectViewController.swift */; }; + 143FC31C2401BB0900AB313A /* MPCHostAutoInviteCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 141854DE2373666A008C988A /* MPCHostAutoInviteCell.swift */; }; 14495D8821FF9A0500CAA129 /* ResultRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14495D8721FF9A0500CAA129 /* ResultRenderer.swift */; }; 14495D8921FF9A0500CAA129 /* ResultRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14495D8721FF9A0500CAA129 /* ResultRenderer.swift */; }; 14495D8A21FF9A0500CAA129 /* ResultRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14495D8721FF9A0500CAA129 /* ResultRenderer.swift */; }; @@ -1497,6 +1498,7 @@ 14C260061F6F02A500CD7373 /* VotingTableViewCell.swift in Sources */, 14DF31BB21169372005BA432 /* MPCConnectViewController+Invite.swift in Sources */, 14B2DD4E22213A07009B8AB3 /* GlobalRacesHelper.swift in Sources */, + 143FC31C2401BB0900AB313A /* MPCHostAutoInviteCell.swift in Sources */, 144A102D202FC7A2003DB51A /* CenteredTableViewController.swift in Sources */, 14BA538921FE3B1400A8CB01 /* ConnectViewController.swift in Sources */, 14C6B1F51FF2EABD00F6B422 /* MPCHostViewController.swift in Sources */, @@ -1724,6 +1726,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = WikiRaces/WikiRaces.entitlements; + CURRENT_PROJECT_VERSION = 6344; DEFINES_MODULE = YES; DERIVE_UIKITFORMAC_PRODUCT_BUNDLE_IDENTIFIER = YES; DEVELOPMENT_TEAM = 72S993BNAV; @@ -1740,7 +1743,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2020.01; + MARKETING_VERSION = 2020.02; OTHER_LDFLAGS = " -ObjC"; OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-function-bodies=300 -Xfrontend -warn-long-expression-type-checking=150"; PRODUCT_BUNDLE_IDENTIFIER = com.andrewfinke.wikiraces; @@ -1758,6 +1761,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = WikiRaces/WikiRaces.entitlements; + CURRENT_PROJECT_VERSION = 6344; DEFINES_MODULE = YES; DERIVE_UIKITFORMAC_PRODUCT_BUNDLE_IDENTIFIER = YES; DEVELOPMENT_TEAM = 72S993BNAV; @@ -1774,7 +1778,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2020.01; + MARKETING_VERSION = 2020.02; OTHER_LDFLAGS = " -ObjC"; PRODUCT_BUNDLE_IDENTIFIER = com.andrewfinke.wikiraces; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/WikiRaces/WikiRaces/Info.plist b/WikiRaces/WikiRaces/Info.plist index 11479d2..d8c8385 100644 --- a/WikiRaces/WikiRaces/Info.plist +++ b/WikiRaces/WikiRaces/Info.plist @@ -17,7 +17,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 6330 + $(CURRENT_PROJECT_VERSION) Fabric APIKey