Merge pull request #492 from pennlabs/anli/09-17-refactor

Refactor the core of the app using SwiftUI

PennMobile/About/Privacy/PrivacyPreference.swift

@@ -43,10 +43,10 @@ enum PrivacyOption: String, CaseIterable {
 
  var cellTitle: String {
  switch self {
- case .anonymizedCourseSchedule: return "Anonymized course schedule"
- case .diningBalanceAndHistory: return "Dining balance & transaction history"
- case .collegeHouse: return "College house"
- case .academicIdentity: return "Academic identity"
+ case .anonymizedCourseSchedule: return "Anonymized Course Schedule"
+ case .diningBalanceAndHistory: return "Dining Balance & Transaction History"
+ case .collegeHouse: return "College House"
+ case .academicIdentity: return "Academic Identity"
  }
  }
 

PennMobile/Assets.xcassets/Color/UI Palette/Contents.json

@@ -1,6 +1,6 @@
 {
  "info" : {
- "version" : 1,
- "author" : "xcode"
+ "author" : "xcode",
+ "version" : 1
  }
-}
+}

PennMobile/Assets.xcassets/Color/UI Palette/login1.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+ "colors" : [
+ {
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "204",
+ "green" : "138",
+ "red" : "11"
+ }
+ },
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}

PennMobile/Assets.xcassets/Color/UI Palette/login2.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+ "colors" : [
+ {
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "221",
+ "green" : "142",
+ "red" : "26"
+ }
+ },
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}

PennMobile/Assets.xcassets/Color/UI Palette/login3.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+ "colors" : [
+ {
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "206",
+ "green" : "120",
+ "red" : "31"
+ }
+ },
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}

PennMobile/Assets.xcassets/Navigation/Calendar_Grey.imageset/Contents.json

@@ -19,5 +19,8 @@
  "info" : {
  "author" : "xcode",
  "version" : 1
+ },
+ "properties" : {
+ "template-rendering-intent" : "template"
  }
 }

PennMobile/Assets.xcassets/Navigation/Contacts_Grey.imageset/Contents.json

@@ -19,5 +19,8 @@
  "info" : {
  "author" : "xcode",
  "version" : 1
+ },
+ "properties" : {
+ "template-rendering-intent" : "template"
  }
 }

PennMobile/Assets.xcassets/Navigation/Dining_Grey.imageset/Contents.json

@@ -1,23 +1,26 @@
 {
  "images" : [
  {
- "idiom" : "universal",
  "filename" : "Dining - Gray.png",
+ "idiom" : "universal",
  "scale" : "1x"
  },
  {
- "idiom" : "universal",
  "filename" : "Dining - Gray@2x.png",
+ "idiom" : "universal",
  "scale" : "2x"
  },
  {
- "idiom" : "universal",
  "filename" : "Dining - Gray@3x.png",
+ "idiom" : "universal",
  "scale" : "3x"
  }
  ],
  "info" : {
- "version" : 1,
- "author" : "xcode"
+ "author" : "xcode",
+ "version" : 1
+ },
+ "properties" : {
+ "template-rendering-intent" : "template"
  }
-}
+}

PennMobile/Assets.xcassets/Navigation/Events_Grey.imageset/Contents.json

@@ -19,5 +19,8 @@
  "info" : {
  "author" : "xcode",
  "version" : 1
+ },
+ "properties" : {
+ "template-rendering-intent" : "template"
  }
 }

PennMobile/Assets.xcassets/Navigation/Fitness_Grey.imageset/Contents.json

@@ -1,23 +1,26 @@
 {
  "images" : [
  {
- "idiom" : "universal",
  "filename" : "Fitness_Grey.png",
+ "idiom" : "universal",
  "scale" : "1x"
  },
  {
- "idiom" : "universal",
  "filename" : "Fitness_Grey@2x.png",
+ "idiom" : "universal",
  "scale" : "2x"
  },
  {
- "idiom" : "universal",
  "filename" : "Fitness_Grey@3x.png",
+ "idiom" : "universal",
  "scale" : "3x"
  }
  ],
  "info" : {
- "version" : 1,
- "author" : "xcode"
+ "author" : "xcode",
+ "version" : 1
+ },
+ "properties" : {
+ "template-rendering-intent" : "template"
  }
-}
+}

PennMobile/Assets.xcassets/Navigation/GSR_Grey.imageset/Contents.json

@@ -1,23 +1,26 @@
 {
  "images" : [
  {
- "idiom" : "universal",
  "filename" : "GSR - Gray.png",
+ "idiom" : "universal",
  "scale" : "1x"
  },
  {
- "idiom" : "universal",
  "filename" : "GSR - Gray@2x.png",
+ "idiom" : "universal",
  "scale" : "2x"
  },
  {
- "idiom" : "universal",
  "filename" : "GSR - Gray@3x.png",
+ "idiom" : "universal",
  "scale" : "3x"
  }
  ],
  "info" : {
- "version" : 1,
- "author" : "xcode"
+ "author" : "xcode",
+ "version" : 1
+ },
+ "properties" : {
+ "template-rendering-intent" : "template"
  }
-}
+}

PennMobile/Assets.xcassets/Navigation/Home_Grey.imageset/Contents.json

@@ -1,23 +1,26 @@
 {
  "images" : [
  {
- "idiom" : "universal",
  "filename" : "Home - Gray.png",
+ "idiom" : "universal",
  "scale" : "1x"
  },
  {
- "idiom" : "universal",
  "filename" : "Home - Gray@2x.png",
+ "idiom" : "universal",
  "scale" : "2x"
  },
  {
- "idiom" : "universal",
  "filename" : "Home - Gray@3x.png",
+ "idiom" : "universal",
  "scale" : "3x"
  }
  ],
  "info" : {
- "version" : 1,
- "author" : "xcode"
+ "author" : "xcode",
+ "version" : 1
+ },
+ "properties" : {
+ "template-rendering-intent" : "template"
  }
-}
+}

PennMobile/Assets.xcassets/Navigation/Laundry_Grey.imageset/Contents.json

@@ -1,23 +1,26 @@
 {
  "images" : [
  {
- "idiom" : "universal",
  "filename" : "Laundry - Gray.png",
+ "idiom" : "universal",
  "scale" : "1x"
  },
  {
- "idiom" : "universal",
  "filename" : "Laundry - Gray@2x.png",
+ "idiom" : "universal",
  "scale" : "2x"
  },
  {
- "idiom" : "universal",
  "filename" : "Laundry - Gray@3x.png",
+ "idiom" : "universal",
  "scale" : "3x"
  }
  ],
  "info" : {
- "version" : 1,
- "author" : "xcode"
+ "author" : "xcode",
+ "version" : 1
+ },
+ "properties" : {
+ "template-rendering-intent" : "template"
  }
-}
+}

PennMobile/Assets.xcassets/Navigation/More_Grey.imageset/Contents.json

@@ -1,23 +1,26 @@
 {
  "images" : [
  {
- "idiom" : "universal",
  "filename" : "More - Gray.png",
+ "idiom" : "universal",
  "scale" : "1x"
  },
  {
- "idiom" : "universal",
  "filename" : "More - Gray@2x.png",
+ "idiom" : "universal",
  "scale" : "2x"
  },
  {
- "idiom" : "universal",
  "filename" : "More - Gray@3x.png",
+ "idiom" : "universal",
  "scale" : "3x"
  }
  ],
  "info" : {
- "version" : 1,
- "author" : "xcode"
+ "author" : "xcode",
+ "version" : 1
+ },
+ "properties" : {
+ "template-rendering-intent" : "template"
  }
-}
+}

PennMobile/Assets.xcassets/Navigation/News_Grey.imageset/Contents.json

@@ -19,5 +19,8 @@
  "info" : {
  "author" : "xcode",
  "version" : 1
+ },
+ "properties" : {
+ "template-rendering-intent" : "template"
  }
 }

PennMobile/Assets.xcassets/Navigation/Polls_Grey.imageset/Contents.json

@@ -19,5 +19,8 @@
  "info" : {
  "author" : "xcode",
  "version" : 1
+ },
+ "properties" : {
+ "template-rendering-intent" : "template"
  }
 }

PennMobile/Auth/OAuth2NetworkManager.swift

@@ -35,6 +35,8 @@ class OAuth2NetworkManager: NSObject {
  private var clientID = InfoPlistEnvironment.labsOauthClientId
 
  private var currentAccessToken: AccessToken?
+ var isRefreshingToken = false
+ var accessTokenCallbacks = [(AccessToken?) -> Void]()
 
  static let authQueue = DispatchQueue(label: "org.pennlabs.PennMobile.authqueue")
 }
@@ -90,8 +92,11 @@ extension OAuth2NetworkManager {
  if let accessToken = self.currentAccessToken, Date() < accessToken.expiration {
  callback(accessToken)
  } else {
- self.currentAccessToken = nil
- self.refreshAccessToken(callback)
+ self.accessTokenCallbacks.append(callback)
+ if !self.isRefreshingToken {
+ self.currentAccessToken = nil
+ self.refreshAccessToken()
+ }
  }
  }
  }
@@ -110,7 +115,12 @@ extension OAuth2NetworkManager {
  }
  }
 
- fileprivate func refreshAccessToken(_ callback: @escaping (_ accessToken: AccessToken?) -> Void ) {
+ fileprivate func refreshAccessToken() {
+ func callback(_ token: AccessToken?) {
+ accessTokenCallbacks.forEach { $0(token) }
+ accessTokenCallbacks.removeAll()
+ }
+
  guard let refreshToken = self.getRefreshToken() else {
  callback(nil)
  return
@@ -127,9 +137,12 @@ extension OAuth2NetworkManager {
 
  request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
  request.httpBody = String.getPostString(params: params).data(using: String.Encoding.utf8)
+
+ isRefreshingToken = true
 
  let task = URLSession.shared.dataTask(with: request) { (data, response, _) in
  OAuth2NetworkManager.authQueue.async {
+ self.isRefreshingToken = false
  if let httpResponse = response as? HTTPURLResponse, let data = data {
  if httpResponse.statusCode == 200 {
  let json = JSON(data)

PennMobile/Dining/SwiftUI/DiningAnalyticsView.swift

@@ -94,7 +94,7 @@ struct DiningAnalyticsView: View {
  DiningLoginNavigationView()
  .environmentObject(diningAnalyticsViewModel)
  }
- .navigationTitle("Analytics")
+ .navigationTitle(Text("Dining Analytics"))
  .sheet(isPresented: $showSettingsSheet) {
  DiningSettingsView(viewModel: diningAnalyticsViewModel) // Replace with your settings view
  }