Show donation in onboarding flow

ChatSecure · Aug 7, 2021 · f8b7360 · f8b7360
1 parent c81e2d1
commit f8b7360
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 11 deletions.
diff --git a/ChatSecureCore/Classes/View Controllers/OTRInviteViewController.m b/ChatSecureCore/Classes/View Controllers/OTRInviteViewController.m
@@ -196,7 +196,13 @@ - (void)setShareButtons:(NSArray<BButton *> *)shareButtons
 
 - (void)skipPressed:(id)sender
 {
-    [self dismissViewControllerAnimated:YES completion:nil];
+    if (OTRBranding.allowsDonation) {
+        PurchaseViewController *purchaseVC = [PurchaseViewController fromBundle];
+        [self.navigationController setNavigationBarHidden:YES animated:YES];
+        [self.navigationController pushViewController:purchaseVC animated:YES];
+    } else {
+        [self dismissViewControllerAnimated:YES completion:nil];
+    }
 }
 
 - (void)shareSMSPressed:(id)sender

diff --git a/ChatSecureCore/Classes/View Controllers/OTRLogListViewController.swift b/ChatSecureCore/Classes/View Controllers/OTRLogListViewController.swift
@@ -38,7 +38,7 @@ import LumberjackConsole
         #if DEBUG
             debugPrint("Enabling os_log logger...")
             DDLog.add(DDOSLogger.sharedInstance)
-            DDLogVerbose("os_log logger enabled.")
+        debugPrint("os_log logger enabled.")
         #endif
 
         // allow file-based debug logging if user has enabled it
@@ -49,12 +49,12 @@ import LumberjackConsole
             fileLogger.doNotReuseLogFiles = true
             DDLog.add(fileLogger)
             self.fileLogger = fileLogger
-            DDLogVerbose("File logger enabled.")
+            debugPrint("File logger enabled.")
 
             let consoleLogger = PTEConsoleLogger()
             DDLog.add(consoleLogger)
             self.consoleLogger = consoleLogger
-            DDLogVerbose("Console logger enabled.")
+            debugPrint("Console logger enabled.")
         } else {
             self.fileLogger = nil
             self.consoleLogger = nil
@@ -86,7 +86,7 @@ import LumberjackConsole
                 do {
                     try FileManager.default.removeItem(atPath: logsDirectory)
                 } catch {
-                    DDLogError("Error deleting log files! \(error)")
+                    debugPrint("Error deleting log files! \(error)")
                 }
             }
             setupLogging()

diff --git a/ChatSecureCore/Classes/View Controllers/Previews/OTRInviteViewController_Previews.swift b/ChatSecureCore/Classes/View Controllers/Previews/OTRInviteViewController_Previews.swift
@@ -10,14 +10,16 @@
 import SwiftUI
 
 /// Unfortunately Xcode cannot seem to create Previews with our current build configuration
+/// seems related to using `MACH_O_TYPE=staticlib` for our frameworks
+/// https://twitter.com/_andersha/status/1405925636565262341
 @available(iOS 13.0, *)
 struct OTRInviteViewController_Previews: PreviewProvider {
     static var previews: some View {
         Group {
             UIViewControllerPreview {
-                OTRInviteViewController(account: OTRAccount(username: "[email protected]", accountType: .jabber)!)
+                OTRInviteViewController(account: OTRXMPPAccount(username: "[email protected]", accountType: .jabber)!)
             }
-            .previewDevice("iPhone 11 Pro Max")
+            .previewDevice("iPhone 12 Pro Max")
             .previewLayout(.sizeThatFits)
         }
     }

diff --git a/ChatSecureCore/Classes/View Controllers/PurchaseViewController.swift b/ChatSecureCore/Classes/View Controllers/PurchaseViewController.swift
@@ -14,10 +14,17 @@ import OTRAssets
 import Kvitto
 
 extension PurchaseViewController {
-    @objc public class func show(from viewController: UIViewController) {
+    @objc public class func fromBundle() -> Self {
         let assets = OTRAssets.resourcesBundle
         let storyboard = UIStoryboard(name: "Purchase", bundle: assets)
-        guard let vc = storyboard.instantiateInitialViewController() else { return }
+        guard let vc = storyboard.instantiateInitialViewController() as? Self else {
+            fatalError("Could not create PurchaseViewController from storyboard!")
+        }
+        return vc
+    }
+
+    @objc public class func show(from viewController: UIViewController) {
+        let vc = fromBundle()
         vc.modalPresentationStyle = .formSheet
         let nav = UINavigationController(rootViewController: vc)
         nav.isNavigationBarHidden = true
@@ -36,6 +43,7 @@ extension Bundle {
     }
 }
 
+@objc
 public class PurchaseViewController: UIViewController {
     @IBOutlet weak var bigMoneyButton: UIButton!
     @IBOutlet weak var smallMoneyButton: UIButton!

diff --git a/README.md b/README.md
@@ -21,8 +21,6 @@ However, developing and supporting this project is hard work and costs real mone
 
 * [GitHub Sponsors](https://github.com/sponsors/chrisballinger)
 * [PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=F9SM36SQY5EN8)
-* [Bitcoin](bitcoin:bc1qrpswdcrga6w74sm08wy9mult6jp7zt5vjtx0zx?message=ChatSecure%20Donations) `bc1qrpswdcrga6w74sm08wy9mult6jp7zt5vjtx0zx`
-
 
 ## Localization