Merge pull request #16 from beatflux-app/ios-app

Stable
beatflux-app · Sep 20, 2023 · 44d662c · 44d662c
2 parents 1ad82e3 + ec52c3f
commit 44d662c
Show file tree

Hide file tree

Showing 26 changed files with 2,015 additions and 934 deletions.
diff --git a/.gitignore b/.gitignore
@@ -120,4 +120,3 @@ iOSInjectionProject/
 # End of https://www.toptal.com/developers/gitignore/api/swift,macos
 
 # To hide api keys
-Config.xcconfig

diff --git a/BeatFlux.xcodeproj/project.pbxproj b/BeatFlux.xcodeproj/project.pbxproj
diff --git a/BeatFlux.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/BeatFlux.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -23,35 +23,35 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/firebase/firebase-ios-sdk",
       "state" : {
-        "revision" : "5034479ca0c4f32f299677fb0ba1fe4d3e3e20b4",
-        "version" : "10.10.0"
+        "revision" : "2bfe6abe1014aafe5cf28401708f7d39f9926a76",
+        "version" : "10.14.0"
       }
     },
     {
       "identity" : "googleappmeasurement",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/GoogleAppMeasurement.git",
       "state" : {
-        "revision" : "69f5b8425dd473d2f2475bba7f88f82cd9da0e36",
-        "version" : "10.10.0"
+        "revision" : "03b9beee1a61f62d32c521e172e192a1663a5e8b",
+        "version" : "10.13.0"
       }
     },
     {
       "identity" : "googledatatransport",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/GoogleDataTransport.git",
       "state" : {
-        "revision" : "cc7265b8e3906304e6e81f32c1662a94bbae2357",
-        "version" : "9.2.2"
+        "revision" : "aae45a320fd0d11811820335b1eabc8753902a40",
+        "version" : "9.2.5"
       }
     },
     {
       "identity" : "googleutilities",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/GoogleUtilities.git",
       "state" : {
-        "revision" : "871d43135925cde39ef7421d8723ce47edfdcc39",
-        "version" : "7.11.1"
+        "revision" : "c38ce365d77b04a9a300c31061c5227589e5597b",
+        "version" : "7.11.5"
       }
     },
     {
@@ -68,17 +68,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/gtm-session-fetcher.git",
       "state" : {
-        "revision" : "5ccda3981422a84186387dbb763ba739178b529c",
-        "version" : "2.3.0"
+        "revision" : "d415594121c9e8a4f9d79cecee0965cf35e74dbd",
+        "version" : "3.1.1"
       }
     },
     {
-      "identity" : "keychainaccess",
+      "identity" : "interop-ios-for-google-sdks",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/kishikawakatsumi/KeychainAccess",
+      "location" : "https://github.com/google/interop-ios-for-google-sdks.git",
       "state" : {
-        "branch" : "master",
-        "revision" : "ecb18d8ce4d88277cc4fb103973352d91e18c535"
+        "revision" : "2d12673670417654f08f5f90fdd62926dc3a2648",
+        "version" : "100.0.0"
       }
     },
     {
@@ -99,6 +99,15 @@
         "version" : "2.30909.0"
       }
     },
+    {
+      "identity" : "nuke",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/kean/Nuke.git",
+      "state" : {
+        "revision" : "3f666f120b63ea7de57d42e9a7c9b47f8e7a290b",
+        "version" : "12.1.6"
+      }
+    },
     {
       "identity" : "opencombine",
       "kind" : "remoteSourceControl",
@@ -113,8 +122,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/promises.git",
       "state" : {
-        "revision" : "ec957ccddbcc710ccc64c9dcbd4c7006fcf8b73a",
-        "version" : "2.2.0"
+        "revision" : "e70e889c0196c76d22759eb50d6a0270ca9f1d9e",
+        "version" : "2.3.1"
       }
     },
     {
@@ -149,17 +158,44 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-log.git",
       "state" : {
-        "revision" : "32e8d724467f8fe623624570367e3d50c5638e46",
-        "version" : "1.5.2"
+        "revision" : "532d8b529501fb73a2455b179e0bbb6d49b652ed",
+        "version" : "1.5.3"
       }
     },
     {
       "identity" : "swift-protobuf",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-protobuf.git",
       "state" : {
-        "revision" : "0af9125c4eae12a4973fb66574c53a54962a9e1e",
-        "version" : "1.21.0"
+        "revision" : "cf62cdaea48b77f1a631e5cb3aeda6047c2cba1d",
+        "version" : "1.23.0"
+      }
+    },
+    {
+      "identity" : "swiftui-introspect",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/siteline/SwiftUI-Introspect.git",
+      "state" : {
+        "revision" : "121c146fe591b1320238d054ae35c81ffa45f45a",
+        "version" : "0.12.0"
+      }
+    },
+    {
+      "identity" : "swiftui-refresher",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/gh123man/SwiftUI-Refresher.git",
+      "state" : {
+        "revision" : "1dd007d02d98b2cd871829f19c8ef683e47305c4",
+        "version" : "1.1.0"
+      }
+    },
+    {
+      "identity" : "swiftui-shimmer",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/markiv/SwiftUI-Shimmer.git",
+      "state" : {
+        "revision" : "1f3a620e4abe890d00008cb2af7023d810b433a7",
+        "version" : "1.4.0"
       }
     }
   ],

diff --git a/BeatFlux.xcodeproj/xcshareddata/xcschemes/BeatFlux.xcscheme b/BeatFlux.xcodeproj/xcshareddata/xcschemes/BeatFlux.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/BeatFlux/BeatFluxApp.swift b/BeatFlux/BeatFluxApp.swift
@@ -30,6 +30,7 @@ struct BeatFluxApp: App {
                 .environmentObject(beatFluxViewModel)
                 .environmentObject(spotify)
         }
+
     }
 }
 
diff --git a/BeatFlux/Config.xcconfig b/BeatFlux/Config.xcconfig
@@ -0,0 +1,13 @@
+//
+//  Config.xcconfig
+//  BeatFlux
+//
+//  Created by Ari Reitman on 6/1/23.
+//
+
+// Configuration settings file format documentation can be found at:
+// https://help.apple.com/xcode/#/dev745c5c974
+
+CLIENT_ID = 75706410f2a24590b90d6f2e443aac42
+CLIENT_SECRET = 27554a67347b473f8aa875218396fcf3
+
diff --git a/BeatFlux/Extensions/Extensions.swift b/BeatFlux/Extensions/Extensions.swift
@@ -19,6 +19,15 @@ extension View {
     func border(_ color: Color, width: CGFloat, cornerRadius: CGFloat) -> some View {
         overlay(RoundedRectangle(cornerRadius: cornerRadius).stroke(color, lineWidth: width))
     }
+
+    func formPlaylistTitle(font: Font = .title3, fontWeight: Font.Weight = .semibold) -> some View {
+        modifier(FormTitle(font: font, fontWeight: fontWeight))
+    }
+}
+
+extension URLCache {
+
+    static let imageCache = URLCache(memoryCapacity: 512*1000*1000, diskCapacity: 10*1000*1000*1000)
 }
 
 extension String {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -120,4 +120,3 @@ iOSInjectionProject/
		# End of https://www.toptal.com/developers/gitignore/api/swift,macos

		# To hide api keys
		Config.xcconfig
Expand Down
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ struct BeatFluxApp: App { @@
                     .environmentObject(beatFluxViewModel)
                     .environmentObject(spotify)
             }
         }
     }