Mercurial > public > lazybear

changeset 131:0299ad98b4de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename ApiAccess to ApiManager
author Dennis Concepción Martín <66180929+denniscm190@users.noreply.github.com>
date Mon, 08 Feb 2021 18:14:04 +0100
parents 012148730331
children 2f579fa8fd19
files LazyBear.xcodeproj/project.pbxproj LazyBear.xcodeproj/project.xcworkspace/xcuserdata/dennis.xcuserdatad/UserInterfaceState.xcuserstate lazybear/ApiAccess.swift lazybear/ApiManager.swift lazybear/AppView.swift lazybear/ContentView.swift lazybear/LazyBearApp.swift lazybear/Views/CompanyList.swift lazybear/Views/News.swift lazybear/Views/Price.swift lazybear/Views/Stock.swift lazybear/Views/Transactions.swift lazybear/Views/WatchlistRow.swift
diffstat 13 files changed, 45 insertions(+), 45 deletions(-) [+]
line wrap: on
line diff
--- a/LazyBear.xcodeproj/project.pbxproj	Sun Feb 07 20:19:34 2021 +0100
+++ b/LazyBear.xcodeproj/project.pbxproj	Mon Feb 08 18:14:04 2021 +0100
@@ -20,7 +20,7 @@
 		95825AFC25C7255600465409 /* NormalizeData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95825AFB25C7255600465409 /* NormalizeData.swift */; };
 		9589C94525CE03B20045DFF3 /* SPAlert in Frameworks */ = {isa = PBXBuildFile; productRef = 9589C94425CE03B20045DFF3 /* SPAlert */; };
 		9589C94D25CE0B4C0045DFF3 /* AddWatchlist.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9589C94C25CE0B4C0045DFF3 /* AddWatchlist.swift */; };
-		958B678525C42B2400BF9F89 /* ApiAccess.swift in Sources */ = {isa = PBXBuildFile; fileRef = 958B678425C42B2400BF9F89 /* ApiAccess.swift */; };
+		958B678525C42B2400BF9F89 /* ApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 958B678425C42B2400BF9F89 /* ApiManager.swift */; };
 		9597CE0425C1DFE7004DDFED /* LogoPlaceholder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9597CE0325C1DFE7004DDFED /* LogoPlaceholder.swift */; };
 		9598CFE325D06A6D00FA9E1B /* CreateButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9598CFE225D06A6C00FA9E1B /* CreateButton.swift */; };
 		959D28DC25CC99710029F689 /* NewsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 959D28DB25CC99710029F689 /* NewsModel.swift */; };
@@ -77,7 +77,7 @@
 		95621AD825BF2EDB00BB17FC /* CloudKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CloudKit.framework; path = System/Library/Frameworks/CloudKit.framework; sourceTree = SDKROOT; };
 		95825AFB25C7255600465409 /* NormalizeData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = NormalizeData.swift; path = lazybear/Jobs/NormalizeData.swift; sourceTree = SOURCE_ROOT; };
 		9589C94C25CE0B4C0045DFF3 /* AddWatchlist.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AddWatchlist.swift; path = LazyBear/Views/AddWatchlist.swift; sourceTree = SOURCE_ROOT; };
-		958B678425C42B2400BF9F89 /* ApiAccess.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ApiAccess.swift; path = lazybear/ApiAccess.swift; sourceTree = SOURCE_ROOT; };
+		958B678425C42B2400BF9F89 /* ApiManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ApiManager.swift; path = lazybear/ApiManager.swift; sourceTree = SOURCE_ROOT; };
 		9597CE0325C1DFE7004DDFED /* LogoPlaceholder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogoPlaceholder.swift; sourceTree = "<group>"; };
 		9598CFE225D06A6C00FA9E1B /* CreateButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = CreateButton.swift; path = lazybear/Views/CreateButton.swift; sourceTree = SOURCE_ROOT; };
 		959D28DB25CC99710029F689 /* NewsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = NewsModel.swift; path = lazybear/Models/NewsModel.swift; sourceTree = SOURCE_ROOT; };
@@ -254,7 +254,7 @@
 				95F7CAF425ADC7B7009E0E7C /* LazyBear.xcdatamodeld */,
 				95D1BF4825ADCF7700E5D063 /* Persistence.swift */,
 				95078FD025BF4E640004FA75 /* CloudKitManager.swift */,
-				958B678425C42B2400BF9F89 /* ApiAccess.swift */,
+				958B678425C42B2400BF9F89 /* ApiManager.swift */,
 				95B04EB225212369000AD27F /* LazyBearApp.swift */,
 				95E07B6A25CE9398001718AB /* AppView.swift */,
 				95B04EB425212369000AD27F /* ContentView.swift */,
@@ -370,7 +370,7 @@
 				95F6C2F025BAE2ED003CF389 /* Company.swift in Sources */,
 				95ED8CE025D03D8900B6B605 /* StockAndNews.swift in Sources */,
 				95D1BF4925ADCF7700E5D063 /* Persistence.swift in Sources */,
-				958B678525C42B2400BF9F89 /* ApiAccess.swift in Sources */,
+				958B678525C42B2400BF9F89 /* ApiManager.swift in Sources */,
 				95B04EB325212369000AD27F /* LazyBearApp.swift in Sources */,
 				9598CFE325D06A6D00FA9E1B /* CreateButton.swift in Sources */,
 				95E07B6B25CE9398001718AB /* AppView.swift in Sources */,
Binary file LazyBear.xcodeproj/project.xcworkspace/xcuserdata/dennis.xcuserdatad/UserInterfaceState.xcuserstate has changed
--- a/lazybear/ApiAccess.swift	Sun Feb 07 20:19:34 2021 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-//
-//  EnvEndpoints.swift
-//  LazyBear
-//
-//  Created by Dennis Concepción Martín on 29/1/21.
-//
-
-import SwiftUI
-import CloudKit
-
-class ApiAccess: ObservableObject {
-    @Published var results = [ApiModel]()
-    @Published var showingView = false
-    @Published var option = 2  // 1 -> Sandbox / 2 -> Production
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lazybear/ApiManager.swift	Mon Feb 08 18:14:04 2021 +0100
@@ -0,0 +1,15 @@
+//
+//  EnvEndpoints.swift
+//  LazyBear
+//
+//  Created by Dennis Concepción Martín on 29/1/21.
+//
+
+import SwiftUI
+import CloudKit
+
+class ApiManager: ObservableObject {
+    @Published var results = [ApiModel]()
+    @Published var showingView = false
+    @Published var option = 2  // 1 -> Sandbox / 2 -> Production
+}
--- a/lazybear/AppView.swift	Sun Feb 07 20:19:34 2021 +0100
+++ b/lazybear/AppView.swift	Mon Feb 08 18:14:04 2021 +0100
@@ -13,16 +13,16 @@
     
     // <--------- CloudKit --------->
     let cloud = CloudKitManager()
-    @EnvironmentObject var apiAccess: ApiAccess  // Env apis info
+    @EnvironmentObject var apiManager: ApiManager  // Env apis info
     @State var cloudFetch = [CKRecord]() { didSet { cloudValues() }}  // Fetch arrives here
     // <--------- CloudKit --------->
     
     var body: some View {
         VStack {
-            if apiAccess.showingView {
+            if apiManager.showingView {
                 ContentView()
                     .environment(\.managedObjectContext, persistenceController.container.viewContext)
-                    .environmentObject(apiAccess)  // Api info (url and token)
+                    .environmentObject(apiManager)  // Api info (url and token)
             }
         }.onAppear { cloud.query(recordType: "API") { cloudFetch = $0 } }  // Request CloudKit
     }
@@ -40,8 +40,8 @@
         })
         // Main thread
         DispatchQueue.main.async {
-            apiAccess.results = results
-            apiAccess.showingView = true
+            apiManager.results = results
+            apiManager.showingView = true
         }
     }
 }
--- a/lazybear/ContentView.swift	Sun Feb 07 20:19:34 2021 +0100
+++ b/lazybear/ContentView.swift	Mon Feb 08 18:14:04 2021 +0100
@@ -8,7 +8,7 @@
 import SwiftUI
 
 struct ContentView: View {
-    @EnvironmentObject var apiAccess: ApiAccess  // Env apis info
+    @EnvironmentObject var apiManager: ApiManager  // Env apis info
     let persistenceController = PersistenceController.shared // Core Data
 
     var body: some View {
@@ -16,7 +16,7 @@
         // First view
             Search()
                 .environment(\.managedObjectContext, persistenceController.container.viewContext)
-                .environmentObject(apiAccess)  // Api info (url and token)
+                .environmentObject(apiManager)  // Api info (url and token)
                 
             .tabItem {
                 Image(systemName: "magnifyingglass")
--- a/lazybear/LazyBearApp.swift	Sun Feb 07 20:19:34 2021 +0100
+++ b/lazybear/LazyBearApp.swift	Mon Feb 08 18:14:04 2021 +0100
@@ -10,13 +10,13 @@
 @main
 struct LazyBearApp: App {
     let persistenceController = PersistenceController.shared // Core Data
-    var apiAccess = ApiAccess() // Environment data
+    var apiManager = ApiManager() // Environment data
 
     var body: some Scene {
         WindowGroup {
             AppView()
                 .environment(\.managedObjectContext, persistenceController.container.viewContext)
-                .environmentObject(apiAccess)  // Api info (url and token)
+                .environmentObject(apiManager)  // Api info (url and token)
         }
     }
 }
--- a/lazybear/Views/CompanyList.swift	Sun Feb 07 20:19:34 2021 +0100
+++ b/lazybear/Views/CompanyList.swift	Mon Feb 08 18:14:04 2021 +0100
@@ -23,7 +23,7 @@
     static var previews: some View {
         //NavigationView {
             CompanyList(searchedCompany: "apple inc")
-                .environmentObject(ApiAccess())
+                .environmentObject(ApiManager())
         //}
     }
 }
--- a/lazybear/Views/News.swift	Sun Feb 07 20:19:34 2021 +0100
+++ b/lazybear/Views/News.swift	Mon Feb 08 18:14:04 2021 +0100
@@ -9,7 +9,7 @@
 
 struct News: View {
     var symbol: String
-    @EnvironmentObject var apiAccess: ApiAccess
+    @EnvironmentObject var apiManager: ApiManager
     
     // <--------- API Job --------->
     @State private var url = String() {
@@ -35,8 +35,8 @@
     
     
     private func getUrl() {
-        let baseUrl = apiAccess.results[apiAccess.option].url ?? ""
-        let token = apiAccess.results[apiAccess.option].key ?? ""
+        let baseUrl = apiManager.results[apiManager.option].url ?? ""
+        let token = apiManager.results[apiManager.option].key ?? ""
         let path = "/stable/stock/\(symbol)/news/last/10?token="
         
         self.url = baseUrl + path + token
@@ -46,6 +46,6 @@
 struct News_Previews: PreviewProvider {
     static var previews: some View {
         News(symbol: "aapl")
-            .environmentObject(ApiAccess())
+            .environmentObject(ApiManager())
     }
 }
--- a/lazybear/Views/Price.swift	Sun Feb 07 20:19:34 2021 +0100
+++ b/lazybear/Views/Price.swift	Mon Feb 08 18:14:04 2021 +0100
@@ -11,7 +11,7 @@
 struct Price: View {
     @State var symbol: String
     @State var showHorizontal: Bool
-    @EnvironmentObject var apiAccess: ApiAccess
+    @EnvironmentObject var apiManager: ApiManager
     
     // <--------- API Job --------->
     @State private var showingView = false
@@ -45,8 +45,8 @@
     }
     
      private func getUrl() {
-        let baseUrl = apiAccess.results[apiAccess.option].url ?? ""
-        let token = apiAccess.results[apiAccess.option].key ?? ""
+        let baseUrl = apiManager.results[apiManager.option].url ?? ""
+        let token = apiManager.results[apiManager.option].key ?? ""
         let path = "/stable/stock/\(symbol)/quote?token="
         
         self.url = baseUrl + path + token
@@ -84,6 +84,6 @@
 struct Price_Previews: PreviewProvider {
     static var previews: some View {
         Price(symbol: "AAPL", showHorizontal: false)
-            .environmentObject(ApiAccess())
+            .environmentObject(ApiManager())
     }
 }
--- a/lazybear/Views/Stock.swift	Sun Feb 07 20:19:34 2021 +0100
+++ b/lazybear/Views/Stock.swift	Mon Feb 08 18:14:04 2021 +0100
@@ -11,7 +11,7 @@
     var name: String
     var symbol: String
     var lineChartHeight: CGFloat
-    @EnvironmentObject var apiAccess: ApiAccess
+    @EnvironmentObject var apiManager: ApiManager
 
     // <--------- Picker --------->
     @State var periods = ["1W", "1M", "3M", "6M", "1Y", "2Y", "5Y"]
@@ -53,8 +53,8 @@
     
     private func getUrl(range: String) {
         var range = range
-        let baseUrl = apiAccess.results[apiAccess.option].url ?? ""
-        let token = apiAccess.results[apiAccess.option].key ?? ""
+        let baseUrl = apiManager.results[apiManager.option].url ?? ""
+        let token = apiManager.results[apiManager.option].key ?? ""
         if periods[selectedPeriod] == "1W" { range = "5dm" }
         if periods[selectedPeriod] == "1M" { range = "1mm" }
         let path = "/stable/stock/\(symbol)/chart/\(range)?chartCloseOnly=true&includeToday=false&token="
--- a/lazybear/Views/Transactions.swift	Sun Feb 07 20:19:34 2021 +0100
+++ b/lazybear/Views/Transactions.swift	Mon Feb 08 18:14:04 2021 +0100
@@ -9,7 +9,7 @@
 
 struct Transactions: View {
     var symbol: String
-    @EnvironmentObject var apiAccess: ApiAccess
+    @EnvironmentObject var apiManager: ApiManager
     
     // <--------- API Job --------->
     @State private var url = String() {
@@ -34,8 +34,8 @@
     }
     
     private func getUrl() {
-        let baseUrl = apiAccess.results[apiAccess.option].url ?? ""
-        let token = apiAccess.results[apiAccess.option].key ?? ""
+        let baseUrl = apiManager.results[apiManager.option].url ?? ""
+        let token = apiManager.results[apiManager.option].key ?? ""
         let path = "/stable/stock/\(symbol)/insider-transactions?token="
         
         self.url = baseUrl + path + token
--- a/lazybear/Views/WatchlistRow.swift	Sun Feb 07 20:19:34 2021 +0100
+++ b/lazybear/Views/WatchlistRow.swift	Mon Feb 08 18:14:04 2021 +0100
@@ -12,7 +12,7 @@
 struct WatchlistRow: View {
     var company: WatchlistCompany
     @Environment(\.editMode) var editMode  // EditButton list
-    @EnvironmentObject var apiAccess: ApiAccess
+    @EnvironmentObject var apiManager: ApiManager
     
     var body: some View {
         NavigationLink(destination: Company(name: company.name ?? "", symbol: company.symbol ?? "")) {
@@ -41,7 +41,7 @@
     }
     
     private func endpoint() -> String {
-        let url = apiAccess.results[0].url
+        let url = apiManager.results[0].url
         let path = "/iex/api/logos/\(company.symbol ?? "").png"
         let endpoint = url! + path