From f4b9959f7cd5131ed7ad634101f891608d2e46ad Mon Sep 17 00:00:00 2001 From: Rizwan Mohamed Ibrahim Date: Thu, 25 Oct 2018 13:01:31 +0530 Subject: [PATCH 1/2] [ADD] On Tap "Try Beta", show Squawk message when user is already on beta --- Classes/Settings/SettingsViewController.swift | 4 ++++ Classes/Systems/Squawk+GitHawk.swift | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/Classes/Settings/SettingsViewController.swift b/Classes/Settings/SettingsViewController.swift index 33da7442d..fb7b742d2 100644 --- a/Classes/Settings/SettingsViewController.swift +++ b/Classes/Settings/SettingsViewController.swift @@ -195,9 +195,13 @@ NewIssueTableViewControllerDelegate { } func onTryTestFlightBeta() { + #if TESTFLIGHT + Squawk.showAlreadyOnBeta() + #else guard let url = URL(string: "https://testflight.apple.com/join/QIVXLkkn") else { fatalError("Failed to decode testflight beta URL") } presentSafari(url: url) + #endif } func onSignOut() { diff --git a/Classes/Systems/Squawk+GitHawk.swift b/Classes/Systems/Squawk+GitHawk.swift index 02cc4312b..3eefc4d5d 100644 --- a/Classes/Systems/Squawk+GitHawk.swift +++ b/Classes/Systems/Squawk+GitHawk.swift @@ -27,6 +27,17 @@ extension Squawk { ) } + static func showAlreadyOnBeta(view: UIView? = window) { + let config = Squawk.Configuration( + text: NSLocalizedString("You're Already on Beta.👌", comment: ""), + backgroundColor: UIColor.black.withAlphaComponent(0.5), + insets: UIEdgeInsets(top: Styles.Sizes.rowSpacing, left: Styles.Sizes.gutter, bottom: Styles.Sizes.rowSpacing, right: Styles.Sizes.gutter), + hintMargin: Styles.Sizes.rowSpacing + ) + Squawk.shared.show(in: view, config: config) + triggerHaptic() + } + static func showRevokeError(view: UIView? = window) { Squawk.shared.show(in: view, config: errorConfig(text: NSLocalizedString("Your access token was revoked.", comment: ""))) triggerHaptic() From 4c04fe4df7e09deb11ee11af89f1b8082bf524a3 Mon Sep 17 00:00:00 2001 From: Ryan Nystrom Date: Sat, 27 Oct 2018 15:40:27 -0400 Subject: [PATCH 2/2] Update Squawk+GitHawk.swift --- Classes/Systems/Squawk+GitHawk.swift | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Classes/Systems/Squawk+GitHawk.swift b/Classes/Systems/Squawk+GitHawk.swift index 3eefc4d5d..8d76e4d53 100644 --- a/Classes/Systems/Squawk+GitHawk.swift +++ b/Classes/Systems/Squawk+GitHawk.swift @@ -29,9 +29,14 @@ extension Squawk { static func showAlreadyOnBeta(view: UIView? = window) { let config = Squawk.Configuration( - text: NSLocalizedString("You're Already on Beta.👌", comment: ""), + text: NSLocalizedString("You're are already using a TestFlight build. 👌", comment: ""), backgroundColor: UIColor.black.withAlphaComponent(0.5), - insets: UIEdgeInsets(top: Styles.Sizes.rowSpacing, left: Styles.Sizes.gutter, bottom: Styles.Sizes.rowSpacing, right: Styles.Sizes.gutter), + insets: UIEdgeInsets( + top: Styles.Sizes.rowSpacing, + left: Styles.Sizes.gutter, + bottom: Styles.Sizes.rowSpacing, + right: Styles.Sizes.gutter + ), hintMargin: Styles.Sizes.rowSpacing ) Squawk.shared.show(in: view, config: config)