Upgrade to v2 API via Twift

.gitignore

@@ -1 +1,2 @@
 TwitterAPI-Info.plist
+**/*.xcuserstate

Broadcast/BroadcastApp.swift

@@ -11,7 +11,7 @@ import SwiftUI
 struct BroadcastApp: App {
   @Environment(\.scenePhase) var scenePhase
   @StateObject var themeHelper = ThemeHelper.shared
-  @StateObject var twitterClient = TwitterClient()
+  @StateObject var twitterClient = TwitterClientManager()
   let persistenceController = PersistanceController.shared
 
   var body: some Scene {
@@ -24,16 +24,12 @@ struct BroadcastApp: App {
             .environment(\.managedObjectContext, persistenceController.container.viewContext)
             .accentColor(themeHelper.color)
             .onChange(of: scenePhase) { newPhase in
-              if newPhase == .active {
-                twitterClient.revalidateAccount()
-              }
-
               persistenceController.save()
             }
 
           VisualEffectView(effect: UIBlurEffect(style: .regular))
             .frame(height: geom.safeAreaInsets.top)
-            .ignoresSafeArea(.all, edges: .top)
+            .ignoresSafeArea(.container, edges: .top)
         }
       }
     }

Broadcast/ContentView.swift

@@ -8,32 +8,33 @@
 import SwiftUI
 import Introspect
 import TwitterText
+import Twift
 
 struct ContentView: View {
-  @ScaledMetric private var captionSize: CGFloat = 14
+  @Environment(\.cornerRadius) var cornerRadius: Double
+  @ScaledMetric private var captionSize: CGFloat = 20
   @ScaledMetric private var bottomPadding: CGFloat = 80
   @ScaledMetric private var replyBoxLimit: CGFloat = 96
 
-  @EnvironmentObject var twitterClient: TwitterClient
+  @EnvironmentObject var twitterClient: TwitterClientManager
 
   @State private var photoPickerIsPresented = false
-  @State private var signOutScreenIsPresented = false
   @State private var repliesSheetIsPresented = false
 
   @State private var sendingTweet = false
   @State private var replying = false
   @State private var replyBoxHeight: CGFloat = 0
 
   private var imageHeightCompensation: CGFloat {
-    (twitterClient.draft.media == nil ? 0 : bottomPadding) +
+    (twitterClient.selectedMedia.isEmpty ? 0 : bottomPadding) +
       (replying ? min(replyBoxHeight, replyBoxLimit) : 0)
   }
 
   var body: some View {
     GeometryReader { geom in
       ZStack(alignment: .bottom) {
         ScrollView {
-          VStack {
+          VStack(spacing: captionSize / 2) {
             if replying, let lastTweet = twitterClient.lastTweet {
               LastTweetReplyView(lastTweet: lastTweet)
                 .background(GeometryReader { geometry in
@@ -54,68 +55,69 @@ struct ContentView: View {
                 .padding()
                 .frame(maxWidth: .infinity)
                 .background(Color(.systemRed).opacity(0.2))
-                .cornerRadius(captionSize)
+                .cornerRadius(cornerRadius)
                 .onTapGesture {
                   withAnimation {
                     twitterClient.state = .idle
                   }
                 }
             }
 
-            if $twitterClient.user.wrappedValue != nil {
-              ComposerView(signOutScreenIsPresented: $signOutScreenIsPresented)
+            if twitterClient.user != nil {
+              ComposerView()
                 .frame(
                   height: geom.size.height - (bottomPadding + (captionSize * 2)) - imageHeightCompensation,
                   alignment: .topLeading
                 )
+                .animation(.springAnimation, value: imageHeightCompensation)
 
-              AttachmentThumbnail(image: $twitterClient.draft.media)
+              AttachmentThumbnail(media: $twitterClient.selectedMedia)
+                .disabled(twitterClient.state.isBusy)
             } else {
               WelcomeView()
             }
           }
-          .padding()
-          .padding(.bottom, bottomPadding)
+          .padding(.top, captionSize)
+          .padding(.horizontal)
           .frame(maxWidth: geom.size.width)
         }
-
-        VStack {
-          if twitterClient.user != nil {
-            ActionBarView(replying: $replying)
-          } else {
-            Button(action: { twitterClient.signIn() }) {
-              Label("Sign In With Twitter", image: "twitter.fill")
-                .font(.broadcastHeadline)
+        .safeAreaInset(edge: .bottom, content: {
+          Group {
+            if twitterClient.user != nil {
+              ActionBarView(replying: $replying)
+            } else {
+              Button(action: { Task { await twitterClient.signIn() } }) {
+                Label("Sign In With Twitter", image: "twitter.fill")
+                  .font(.broadcastHeadline)
+              }
+              .accessibilityIdentifier("loginButton")
             }
-            .buttonStyle(BroadcastButtonStyle())
-            .accessibilityIdentifier("loginButton")
           }
-        }
-        .padding()
-        .animation(.springAnimation)
-        .background(
-          VisualEffectView(effect: UIBlurEffect(style: .regular))
-            .ignoresSafeArea()
-            .opacity(twitterClient.user == nil ? 0 : 1)
-        )
-        .gesture(DragGesture().onEnded({ _ in UIApplication.shared.endEditing() }))
-      }
-      .sheet(isPresented: $signOutScreenIsPresented) {
-        SignOutView()
+          .buttonStyle(BroadcastButtonStyle(isLoading: twitterClient.state != .idle))
+          .padding()
+          .background(VisualEffectView(effect: UIBlurEffect(style: .regular)).ignoresSafeArea())
+          .gesture(DragGesture().onEnded({ _ in UIApplication.shared.endEditing() }))
+        })
       }
       .sheet(isPresented: $repliesSheetIsPresented) {
         RepliesListView(tweet: twitterClient.lastTweet)
           .accentColor(ThemeHelper.shared.color)
           .font(.broadcastBody)
+          .environmentObject(twitterClient)
       }
       .onAppear {
         UITextView.appearance().backgroundColor = .clear
       }
-      .onChange(of: replying) { _ in
-        twitterClient.revalidateAccount()
-      }
       .onPreferenceChange(ReplyBoxSizePreferenceKey.self) { newValue in
-        withAnimation(.easeInOut(duration: 0.1)) { replyBoxHeight = newValue }
+        withAnimation(.springAnimation) { replyBoxHeight = newValue + (captionSize / 2) }
+      }
+      .overlay {
+        if twitterClient.state == .initializing {
+          ZStack {
+            ProgressView()
+              .frame(maxWidth: .infinity, maxHeight: .infinity)
+          }.background(.background)
+        }
       }
     }
   }

Broadcast/DraftsModel.xcdatamodeld/DraftsModel.xcdatamodel/contents

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="18154" systemVersion="20F71" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="19574" systemVersion="21C52" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="Draft" representedClassName="Draft" syncable="YES" codeGenerationType="class">
         <attribute name="date" attributeType="Date" usesScalarValueType="NO"/>
         <attribute name="id" attributeType="UUID" usesScalarValueType="NO"/>
-        <attribute name="media" optional="YES" attributeType="Binary" allowsExternalBinaryDataStorage="YES"/>
+        <attribute name="mediaId" optional="YES" attributeType="String"/>
         <attribute name="text" optional="YES" attributeType="String"/>
     </entity>
     <elements>
-        <element name="Draft" positionX="-63" positionY="-18" width="128" height="103"/>
+        <element name="Draft" positionX="-63" positionY="-18" width="128" height="89"/>
     </elements>
 </model>

Broadcast/Extensions/EnvironmentKeys+CornerRadius.swift

@@ -0,0 +1,20 @@
+//
+//  EnvironmentKeys+CornerRadius.swift
+//  Broadcast
+//
+//  Created by Daniel Eden on 13/02/2022.
+//
+
+import Foundation
+import SwiftUI
+
+struct CornerRadiusKey: EnvironmentKey {
+  static let defaultValue: Double = 12
+}
+
+extension EnvironmentValues {
+  var cornerRadius: Double {
+    get { self[CornerRadiusKey.self] }
+    set { self[CornerRadiusKey.self] = newValue }
+  }
+}

Broadcast/Extensions/TwitterClient+MockTweet.swift

@@ -6,27 +6,32 @@
 //
 
 import Foundation
+import Twift
 
-extension TwitterClient.Tweet {
-  static var mockTweet: TwitterClient.Tweet {
-    TwitterClient.Tweet(
-      numericId: 0,
-      id: "0",
-      text: "just setting up my twttr",
-      likes: 420,
-      retweets: 69,
-      date: Date(),
-      author: .mockUser
-    )
+extension Tweet {
+  static var mockTweet: Tweet {
+    let jsonString = """
+{
+  "id": "0",
+"text": "just setting up my twttr",
+"createdAt": \(Date().timeIntervalSince1970),
+"authorId": "0"
+}
+"""
+    return try! JSONDecoder().decode(Tweet.self, from: jsonString.data(using: .utf8)!)
   }
 }
 
-extension TwitterClient.User {
-  static var mockUser: TwitterClient.User {
-    TwitterClient.User(
-      id: "0",
-      screenName: "_dte",
-      originalProfileImageURL: URL(string: "https://pbs.twimg.com/profile_images/1337359860409790469/javRMXyG_x96.jpg")!
-    )
+extension User {
+  static var mockUser: User {
+    let jsonString = """
+{
+  "id": "0",
+"name": "Daniel Eden",
+"username": "_dte",
+"profileImageUrl": "https://pbs.twimg.com/profile_images/1337359860409790469/javRMXyG_x96.jpg"
+}
+"""
+    return try! JSONDecoder().decode(User.self, from: jsonString.data(using: .utf8)!)
   }
 }

Broadcast/Extensions/TwitterClientManager+CompressMedia.swift

@@ -0,0 +1,31 @@
+//
+//  TwitterClientManager+CompressMedia.swift
+//  Broadcast
+//
+//  Created by Daniel Eden on 11/02/2022.
+//
+
+import Foundation
+import AVFoundation
+
+extension TwitterClientManager {
+  func compressVideo(
+    inputURL: URL,
+    outputURL: URL
+  ) async -> AVAssetExportSession? {
+    let urlAsset = AVURLAsset(url: inputURL, options: nil)
+
+    guard let exportSession = AVAssetExportSession(asset: urlAsset, presetName: AVAssetExportPresetHighestQuality) else {
+      return nil
+    }
+
+    exportSession.fileLengthLimit = 14 * 2^20 // 15mb limit
+    exportSession.timeRange = CMTimeRange(start: CMTime.zero, duration: urlAsset.duration)
+    exportSession.outputURL = outputURL
+    exportSession.outputFileType = AVFileType.mp4
+    exportSession.shouldOptimizeForNetworkUse = true
+
+    await exportSession.export()
+    return exportSession
+  }
+}