diff --git a/VITTY/GoogleService-Info.plist b/VITTY/GoogleService-Info.plist new file mode 100644 index 0000000..57973b4 --- /dev/null +++ b/VITTY/GoogleService-Info.plist @@ -0,0 +1,36 @@ + + + + + CLIENT_ID + 272763363329-i8n51oo9m30h9it7qq9ufmd0lahnmm63.apps.googleusercontent.com + REVERSED_CLIENT_ID + com.googleusercontent.apps.272763363329-i8n51oo9m30h9it7qq9ufmd0lahnmm63 + ANDROID_CLIENT_ID + 272763363329-143lqjkb0i5a75lc0iglc26jlb61po0c.apps.googleusercontent.com + API_KEY + AIzaSyCJYYDMdzQiNiY0pxqbrglEw85BSlGgHBc + GCM_SENDER_ID + 272763363329 + PLIST_VERSION + 1 + BUNDLE_ID + com.gdscvit.vittyios + PROJECT_ID + vitty-dscvit + STORAGE_BUCKET + vitty-dscvit.appspot.com + IS_ADS_ENABLED + + IS_ANALYTICS_ENABLED + + IS_APPINVITE_ENABLED + + IS_GCM_ENABLED + + IS_SIGNIN_ENABLED + + GOOGLE_APP_ID + 1:272763363329:ios:3b020b67f7527e83e2e000 + + \ No newline at end of file diff --git a/VITTY/VITTY.xcodeproj/project.pbxproj b/VITTY/VITTY.xcodeproj/project.pbxproj index 070abed..4a7fb3c 100644 --- a/VITTY/VITTY.xcodeproj/project.pbxproj +++ b/VITTY/VITTY.xcodeproj/project.pbxproj @@ -28,10 +28,8 @@ 4B183EEA2D7C793800C9D801 /* RemindersData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B183EE92D7C791400C9D801 /* RemindersData.swift */; }; 4B183EEC2D7CB15800C9D801 /* CourseRefs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B183EEB2D7CB11500C9D801 /* CourseRefs.swift */; }; 4B1BDBCC2E1396B1008C2DE9 /* ToolTip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B1BDBCB2E1396A9008C2DE9 /* ToolTip.swift */; }; - 4B2D1F0F2E26060C002AFD25 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B2D1F0E2E26060C002AFD25 /* GoogleService-Info.plist */; }; 4B2D648F2E20BA6300412CB7 /* NetworkMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B2D648E2E20BA5A00412CB7 /* NetworkMonitor.swift */; }; 4B2D64902E20BA6300412CB7 /* NetworkMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B2D648E2E20BA5A00412CB7 /* NetworkMonitor.swift */; }; - 4B2D64922E20C1AC00412CB7 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B2D64912E20C1AC00412CB7 /* GoogleService-Info.plist */; }; 4B2DD6952E0A703300BC3B67 /* CircleRequests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B2DD6942E0A702D00BC3B67 /* CircleRequests.swift */; }; 4B341C0E2E1802910073906B /* FreindRequestModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B341C0D2E18028A0073906B /* FreindRequestModel.swift */; }; 4B341C102E1803070073906B /* FreindRequestViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B341C0F2E1802FC0073906B /* FreindRequestViewModel.swift */; }; @@ -66,6 +64,7 @@ 4B8B32DC2D6D75F6004F01BA /* VittyWidgetExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 4B8B32C82D6D75F4004F01BA /* VittyWidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 4B8B33752D7029AA004F01BA /* SideBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B8B33742D7029A3004F01BA /* SideBar.swift */; }; 4B8FB2C42E374A6700E50AE2 /* AppStorageConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3109639E27824F6F0009A29C /* AppStorageConstants.swift */; }; + 4B8FB2C82E39D29F00E50AE2 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B8FB2C72E39D29F00E50AE2 /* GoogleService-Info.plist */; }; 4BA03C1D2D7584F3000756B0 /* AddFriend.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BA03C1C2D7584EA000756B0 /* AddFriend.swift */; }; 4BA6DFE92E33D5CE00B0411A /* NotesModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BBB00322D957A6A003B8FE2 /* NotesModel.swift */; }; 4BBB00312D955163003B8FE2 /* AcademicsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BBB00302D95515C003B8FE2 /* AcademicsViewModel.swift */; }; @@ -145,7 +144,6 @@ 52D5AB912B6FE90100B2E66D /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52D5AB902B6FE90100B2E66D /* Constants.swift */; }; 52D5AB972B6FFC8F00B2E66D /* LoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52D5AB962B6FFC8F00B2E66D /* LoginView.swift */; }; 52DBBE882B47B6B30014C57A /* FriendCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52DBBE872B47B6B30014C57A /* FriendCard.swift */; }; - 52EE849E2CB9CD1F00CD864C /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 52EE849D2CB9CD1F00CD864C /* GoogleService-Info.plist */; }; 5D72EDD82AB98D6D00704BF5 /* URLSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D72EDD72AB98D6D00704BF5 /* URLSession.swift */; }; 5D72EDDD2AB990BB00704BF5 /* AuthRequestBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D72EDDC2AB990BB00704BF5 /* AuthRequestBody.swift */; }; 5D7F04F72AAB9E9900ECED15 /* APIConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D7F04F62AAB9E9900ECED15 /* APIConstants.swift */; }; @@ -200,9 +198,7 @@ 4B183EE92D7C791400C9D801 /* RemindersData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemindersData.swift; sourceTree = ""; }; 4B183EEB2D7CB11500C9D801 /* CourseRefs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseRefs.swift; sourceTree = ""; }; 4B1BDBCB2E1396A9008C2DE9 /* ToolTip.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToolTip.swift; sourceTree = ""; }; - 4B2D1F0E2E26060C002AFD25 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 4B2D648E2E20BA5A00412CB7 /* NetworkMonitor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkMonitor.swift; sourceTree = ""; }; - 4B2D64912E20C1AC00412CB7 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 4B2DD6942E0A702D00BC3B67 /* CircleRequests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CircleRequests.swift; sourceTree = ""; }; 4B341C0D2E18028A0073906B /* FreindRequestModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FreindRequestModel.swift; sourceTree = ""; }; 4B341C0F2E1802FC0073906B /* FreindRequestViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FreindRequestViewModel.swift; sourceTree = ""; }; @@ -233,6 +229,7 @@ 4B8B32C82D6D75F4004F01BA /* VittyWidgetExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = VittyWidgetExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; 4B8B32C92D6D75F4004F01BA /* WidgetKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WidgetKit.framework; path = System/Library/Frameworks/WidgetKit.framework; sourceTree = SDKROOT; }; 4B8B33742D7029A3004F01BA /* SideBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideBar.swift; sourceTree = ""; }; + 4B8FB2C72E39D29F00E50AE2 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 4BA03C1C2D7584EA000756B0 /* AddFriend.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddFriend.swift; sourceTree = ""; }; 4BBB00302D95515C003B8FE2 /* AcademicsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AcademicsViewModel.swift; sourceTree = ""; }; 4BBB00322D957A6A003B8FE2 /* NotesModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotesModel.swift; sourceTree = ""; }; @@ -279,7 +276,6 @@ 52D5AB902B6FE90100B2E66D /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = ""; }; 52D5AB962B6FFC8F00B2E66D /* LoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginView.swift; sourceTree = ""; }; 52DBBE872B47B6B30014C57A /* FriendCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FriendCard.swift; sourceTree = ""; }; - 52EE849D2CB9CD1F00CD864C /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 5D72EDD72AB98D6D00704BF5 /* URLSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLSession.swift; sourceTree = ""; }; 5D72EDDC2AB990BB00704BF5 /* AuthRequestBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthRequestBody.swift; sourceTree = ""; }; 5D7F04F62AAB9E9900ECED15 /* APIConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIConstants.swift; sourceTree = ""; }; @@ -418,9 +414,7 @@ isa = PBXGroup; children = ( 4BC853C52DF6F71B0092B2E2 /* VittyWidgetExtension.entitlements */, - 4B2D64912E20C1AC00412CB7 /* GoogleService-Info.plist */, - 52EE849D2CB9CD1F00CD864C /* GoogleService-Info.plist */, - 4B2D1F0E2E26060C002AFD25 /* GoogleService-Info.plist */, + 4B8FB2C72E39D29F00E50AE2 /* GoogleService-Info.plist */, 5251A7FF2B46E3C000D44CFE /* .swift-format */, 314A408E27383BEC0058082F /* VITTYApp.swift */, 314A409027383BEC0058082F /* ContentView.swift */, @@ -1125,11 +1119,9 @@ 31128CFE2772F57E0084C9EA /* Poppins-MediumItalic.ttf in Resources */, 31128CFD2772F57E0084C9EA /* Poppins-SemiBold.ttf in Resources */, 31128CF92772F57E0084C9EA /* Poppins-Medium.ttf in Resources */, - 4B2D1F0F2E26060C002AFD25 /* GoogleService-Info.plist in Resources */, 31128CFA2772F57E0084C9EA /* Poppins-SemiBoldItalic.ttf in Resources */, 31128CFC2772F57E0084C9EA /* Poppins-Regular.ttf in Resources */, - 52EE849E2CB9CD1F00CD864C /* GoogleService-Info.plist in Resources */, - 4B2D64922E20C1AC00412CB7 /* GoogleService-Info.plist in Resources */, + 4B8FB2C82E39D29F00E50AE2 /* GoogleService-Info.plist in Resources */, 314A409627383BEE0058082F /* Preview Assets.xcassets in Resources */, 314A409327383BEE0058082F /* Assets.xcassets in Resources */, ); diff --git a/VITTY/VITTY.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/VITTY/VITTY.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 898596b..3afd24c 100644 --- a/VITTY/VITTY.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/VITTY/VITTY.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,8 +6,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/google/abseil-cpp-binary.git", "state" : { - "revision" : "748c7837511d0e6a507737353af268484e1745e2", - "version" : "1.2024011601.1" + "revision" : "194a6706acbd25e4ef639bcaddea16e8758a3e27", + "version" : "1.2024011602.0" } }, { @@ -15,8 +15,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Alamofire/Alamofire.git", "state" : { - "revision" : "f455c2975872ccd2d9c81594c658af65716e9b9a", - "version" : "5.9.1" + "revision" : "513364f870f6bfc468f9d2ff0a95caccc10044c5", + "version" : "5.10.2" } }, { @@ -33,8 +33,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/openid/AppAuth-iOS.git", "state" : { - "revision" : "c89ed571ae140f8eb1142735e6e23d7bb8c34cb2", - "version" : "1.7.5" + "revision" : "2781038865a80e2c425a1da12cc1327bcd56501f", + "version" : "1.7.6" } }, { @@ -51,8 +51,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/firebase/firebase-ios-sdk", "state" : { - "revision" : "e57841b296d04370ea23580f908881b0ccab17b9", - "version" : "10.28.1" + "revision" : "eca84fd638116dd6adb633b5a3f31cc7befcbb7d", + "version" : "10.29.0" } }, { @@ -159,17 +159,17 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-argument-parser.git", "state" : { - "revision" : "0fbc8848e389af3bb55c182bc19ca9d5dc2f255b", - "version" : "1.4.0" + "revision" : "309a47b2b1d9b5e991f36961c983ecec72275be3", + "version" : "1.6.1" } }, { "identity" : "swift-cmark", "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-cmark.git", + "location" : "https://github.com/swiftlang/swift-cmark.git", "state" : { - "revision" : "3bc2f3e25df0cecc5dc269f7ccae65d0f386f06a", - "version" : "0.4.0" + "revision" : "b022b08312decdc46585e0b3440d97f6f22ef703", + "version" : "0.6.0" } }, { @@ -186,8 +186,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-markdown.git", "state" : { - "revision" : "4aae40bf6fff5286e0e1672329d17824ce16e081", - "version" : "0.4.0" + "revision" : "ea79e83c8744d2b50b0dc2d5bbd1e857e1253bf9", + "version" : "0.6.0" } }, { @@ -195,8 +195,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-protobuf.git", "state" : { - "revision" : "9f0c76544701845ad98716f3f6a774a892152bcb", - "version" : "1.26.0" + "revision" : "102a647b573f60f73afdce5613a51d71349fe507", + "version" : "1.30.0" } }, { diff --git a/VITTY/VITTY/Academics/View/CourseRefs.swift b/VITTY/VITTY/Academics/View/CourseRefs.swift index 926a3a6..4a38753 100644 --- a/VITTY/VITTY/Academics/View/CourseRefs.swift +++ b/VITTY/VITTY/Academics/View/CourseRefs.swift @@ -610,7 +610,7 @@ struct CompactFileCard: View { if let image = fileImage { Image(uiImage: image) .resizable() - .aspectRatio(contentMode: .fill) + .aspectRatio(contentMode: .fit) } else if isLoading { Rectangle() .fill(Color.gray.opacity(0.3)) diff --git a/VITTY/VITTY/Connect/View/Freinds/View/FriendRow.swift b/VITTY/VITTY/Connect/View/Freinds/View/FriendRow.swift index 28ddae7..7845b90 100644 --- a/VITTY/VITTY/Connect/View/Freinds/View/FriendRow.swift +++ b/VITTY/VITTY/Connect/View/Freinds/View/FriendRow.swift @@ -71,6 +71,7 @@ struct ActionResultAlert: View { .foregroundColor(.white) .multilineTextAlignment(.center) + Button(action: { onDismiss() }) { @@ -79,7 +80,7 @@ struct ActionResultAlert: View { .padding(.vertical, 8) .frame(maxWidth: .infinity) .background(Color("Accent")) - .foregroundColor(.white) + .foregroundColor(.black) .cornerRadius(8) } } diff --git a/VITTY/VITTY/Info.plist b/VITTY/VITTY/Info.plist index 827548b..260984c 100644 --- a/VITTY/VITTY/Info.plist +++ b/VITTY/VITTY/Info.plist @@ -13,7 +13,7 @@ Google SignIn CFBundleURLSchemes - com.googleusercontent.apps.266303676876-77duk9tr18717lspccrvjuqcnuv0dp2s + com.googleusercontent.apps.272763363329-i8n51oo9m30h9it7qq9ufmd0lahnmm63 @@ -30,7 +30,7 @@ FirebaseAppDelegateProxyEnabled GIDClientID - 266303676876-77duk9tr18717lspccrvjuqcnuv0dp2s.apps.googleusercontent.com + 272763363329-i8n51oo9m30h9it7qq9ufmd0lahnmm63.apps.googleusercontent.com LSApplicationQueriesSchemes comgooglemaps @@ -63,5 +63,10 @@ Allow photo library access to save or attach notes, files . UIViewControllerBasedStatusBarAppearance + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + diff --git a/VITTY/VITTY/Utilities/Constants/APIConstants.swift b/VITTY/VITTY/Utilities/Constants/APIConstants.swift index 74bf1c7..cf063ff 100644 --- a/VITTY/VITTY/Utilities/Constants/APIConstants.swift +++ b/VITTY/VITTY/Utilities/Constants/APIConstants.swift @@ -13,10 +13,13 @@ struct APIConstants { - static let base_url = "https://visiting-eba-vitty-d61856bb.koyeb.app/api/v2/" +// static let base_url = "https://visiting-eba-vitty-d61856bb.koyeb.app/api/v2/" +// +// static let base_urlv3 = "https://visiting-eba-vitty-d61856bb.koyeb.app/api/v3/" - static let base_urlv3 = "https://visiting-eba-vitty-d61856bb.koyeb.app/api/v3/" + static let base_url = "http://68.233.117.217:3000/api/v2/" + static let base_urlv3 = "http://68.233.117.217:3000/api/v3/" static let createCircle = "circles/create/" diff --git a/VITTY/VITTY/Utilities/Constants/AppStorageConstants.swift b/VITTY/VITTY/Utilities/Constants/AppStorageConstants.swift index 043692e..bc1333d 100644 --- a/VITTY/VITTY/Utilities/Constants/AppStorageConstants.swift +++ b/VITTY/VITTY/Utilities/Constants/AppStorageConstants.swift @@ -8,7 +8,5 @@ import Foundation struct AppConstants { - - static let VITTYappgroup = "group.com.gdscvit.vittyios.shared" - + static let VITTYappgroup = "group.com.gdscvit.vittyios.shared" } diff --git a/VITTY/VITTY/VITTY.entitlements b/VITTY/VITTY/VITTY.entitlements index 20abe12..f808008 100644 --- a/VITTY/VITTY/VITTY.entitlements +++ b/VITTY/VITTY/VITTY.entitlements @@ -4,7 +4,7 @@ com.apple.security.application-groups - group.com.gdscvit.vittyios.shared + group.com.gdscvit.vittyioswidget keychain-access-groups diff --git a/VITTY/VITTY/VITTYRelease.entitlements b/VITTY/VITTY/VITTYRelease.entitlements index 20abe12..f808008 100644 --- a/VITTY/VITTY/VITTYRelease.entitlements +++ b/VITTY/VITTY/VITTYRelease.entitlements @@ -4,7 +4,7 @@ com.apple.security.application-groups - group.com.gdscvit.vittyios.shared + group.com.gdscvit.vittyioswidget keychain-access-groups diff --git a/VITTY/VittyWidgetExtension.entitlements b/VITTY/VittyWidgetExtension.entitlements index 94339c6..f7c7be3 100644 --- a/VITTY/VittyWidgetExtension.entitlements +++ b/VITTY/VittyWidgetExtension.entitlements @@ -4,7 +4,7 @@ com.apple.security.application-groups - group.com.gdscvit.vittyios.shared + group.com.gdscvit.vittyioswidget