diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer.xcodeproj/project.pbxproj b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer.xcodeproj/project.pbxproj index b8b8287e..22fa3178 100644 --- a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer.xcodeproj/project.pbxproj +++ b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer.xcodeproj/project.pbxproj @@ -17,7 +17,6 @@ 3AF70F3B2A951C2E008E9CAB /* Keys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AF70F3A2A951C2E008E9CAB /* Keys.swift */; }; 4696CA042A95415D0027F3F6 /* StudyMemberSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4696CA032A95415D0027F3F6 /* StudyMemberSheetView.swift */; }; 46C816AE2A949593003B2944 /* StudyDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46C816AD2A949593003B2944 /* StudyDetailView.swift */; }; - 54FEB2782A9691860083A33F /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 54FEB2772A9691860083A33F /* GoogleService-Info.plist */; }; 54FEB27C2A9693940083A33F /* InquiryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54FEB27A2A9693940083A33F /* InquiryView.swift */; }; 54FEB27D2A9693940083A33F /* InquiryRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54FEB27B2A9693940083A33F /* InquiryRow.swift */; }; 54FEB27F2A9694070083A33F /* Inquiry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54FEB27E2A9694070083A33F /* Inquiry.swift */; }; @@ -95,6 +94,7 @@ D55D36652A95E17800A7BE14 /* StudyImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55D36642A95E17800A7BE14 /* StudyImageView.swift */; }; D55D36692A95E19200A7BE14 /* StudyMapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55D36682A95E19200A7BE14 /* StudyMapView.swift */; }; D55D366D2A95E1CD00A7BE14 /* StudyLocationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55D366C2A95E1CD00A7BE14 /* StudyLocationManager.swift */; }; + FA435A6E2A972FC7000A2A11 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = FA435A6D2A972FC7000A2A11 /* GoogleService-Info.plist */; }; FA63F0412A9513550010B0FE /* FeedRecruitView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA63F03F2A9513550010B0FE /* FeedRecruitView.swift */; }; FA63F0422A9513550010B0FE /* FeedRecruitPhotoAddView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA63F0402A9513550010B0FE /* FeedRecruitPhotoAddView.swift */; }; FA63F0442A9513610010B0FE /* FeedRecruitPHPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA63F0432A9513610010B0FE /* FeedRecruitPHPicker.swift */; }; @@ -140,7 +140,6 @@ 3AF70F3A2A951C2E008E9CAB /* Keys.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Keys.swift; sourceTree = ""; }; 4696CA032A95415D0027F3F6 /* StudyMemberSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StudyMemberSheetView.swift; sourceTree = ""; }; 46C816AD2A949593003B2944 /* StudyDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StudyDetailView.swift; sourceTree = ""; }; - 54FEB2772A9691860083A33F /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../../../Downloads/GoogleService-Info.plist"; sourceTree = ""; }; 54FEB27A2A9693940083A33F /* InquiryView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InquiryView.swift; sourceTree = ""; }; 54FEB27B2A9693940083A33F /* InquiryRow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InquiryRow.swift; sourceTree = ""; }; 54FEB27E2A9694070083A33F /* Inquiry.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Inquiry.swift; sourceTree = ""; }; @@ -219,6 +218,7 @@ D55D36642A95E17800A7BE14 /* StudyImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StudyImageView.swift; sourceTree = ""; }; D55D36682A95E19200A7BE14 /* StudyMapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StudyMapView.swift; sourceTree = ""; }; D55D366C2A95E1CD00A7BE14 /* StudyLocationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StudyLocationManager.swift; sourceTree = ""; }; + FA435A6D2A972FC7000A2A11 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../../../../Downloads/GoogleService-Info.plist"; sourceTree = ""; }; FA63F03F2A9513550010B0FE /* FeedRecruitView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeedRecruitView.swift; sourceTree = ""; }; FA63F0402A9513550010B0FE /* FeedRecruitPhotoAddView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeedRecruitPhotoAddView.swift; sourceTree = ""; }; FA63F0432A9513610010B0FE /* FeedRecruitPHPicker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeedRecruitPHPicker.swift; sourceTree = ""; }; @@ -475,9 +475,9 @@ 9E99CCEC2A944A5700699B6A /* project02-teamB-OUR-consumer */ = { isa = PBXGroup; children = ( + FA435A6D2A972FC7000A2A11 /* GoogleService-Info.plist */, 3AF70F382A95199B008E9CAB /* Info.plist */, 9E99CCED2A944A5700699B6A /* project02_teamB_OUR_consumerApp.swift */, - 54FEB2772A9691860083A33F /* GoogleService-Info.plist */, B77A48722A95AAC9002BA95F /* FeedRecruitModel+Extension */, FAB51C772A9676720047A725 /* Extension */, 842192092A95DB3C007224EE /* Views */, @@ -630,7 +630,7 @@ buildActionMask = 2147483647; files = ( 9E99CCF52A944A5A00699B6A /* Preview Assets.xcassets in Resources */, - 54FEB2782A9691860083A33F /* GoogleService-Info.plist in Resources */, + FA435A6E2A972FC7000A2A11 /* GoogleService-Info.plist in Resources */, 9E99CCF22A944A5A00699B6A /* Assets.xcassets in Resources */, FAB51C1B2A96568D0047A725 /* (null) in Resources */, ); @@ -896,7 +896,6 @@ INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "Please Allow Your Location"; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; - INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; IPHONEOS_DEPLOYMENT_TARGET = 16.0; @@ -928,7 +927,6 @@ INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "Please Allow Your Location"; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; - INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; IPHONEOS_DEPLOYMENT_TARGET = 16.0; diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AccentColor.colorset/Contents.json b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AccentColor.colorset/Contents.json index eb878970..59b298a9 100644 --- a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AccentColor.colorset/Contents.json +++ b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AccentColor.colorset/Contents.json @@ -1,6 +1,15 @@ { "colors" : [ { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x80", + "green" : "0x05", + "red" : "0x09" + } + }, "idiom" : "universal" } ], diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/100.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/100.png new file mode 100644 index 00000000..6a86e0dc Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/100.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/1024.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/1024.png new file mode 100644 index 00000000..1634b33a Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/1024.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/114.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/114.png new file mode 100644 index 00000000..e3c897a4 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/114.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/120.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/120.png new file mode 100644 index 00000000..3ae0a48f Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/120.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/128.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/128.png new file mode 100644 index 00000000..6ca4bb31 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/128.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/144.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/144.png new file mode 100644 index 00000000..4c72dbe3 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/144.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/152.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/152.png new file mode 100644 index 00000000..56974150 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/152.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/16.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/16.png new file mode 100644 index 00000000..69ce3897 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/16.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/167.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/167.png new file mode 100644 index 00000000..cf00aadc Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/167.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/172.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/172.png new file mode 100644 index 00000000..9c1df611 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/172.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/180.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/180.png new file mode 100644 index 00000000..7ff5246b Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/180.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/196.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/196.png new file mode 100644 index 00000000..1585c6d8 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/196.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/20.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/20.png new file mode 100644 index 00000000..dd870fc0 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/20.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/216.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/216.png new file mode 100644 index 00000000..246b76c6 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/216.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/256.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/256.png new file mode 100644 index 00000000..61a3c291 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/256.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/29.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/29.png new file mode 100644 index 00000000..ce629d8e Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/29.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/32.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/32.png new file mode 100644 index 00000000..0d08c43f Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/32.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/40.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/40.png new file mode 100644 index 00000000..3cd7a361 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/40.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/48.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/48.png new file mode 100644 index 00000000..acea3e27 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/48.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/50.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/50.png new file mode 100644 index 00000000..5da4222e Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/50.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/512.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/512.png new file mode 100644 index 00000000..afdc8967 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/512.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/55.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/55.png new file mode 100644 index 00000000..64b538cb Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/55.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/57.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/57.png new file mode 100644 index 00000000..f95dd948 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/57.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/58.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/58.png new file mode 100644 index 00000000..4b997ba3 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/58.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/60.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/60.png new file mode 100644 index 00000000..db11a4b6 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/60.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/64.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/64.png new file mode 100644 index 00000000..88ce91b9 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/64.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/66.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/66.png new file mode 100644 index 00000000..461c8ccf Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/66.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/72.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/72.png new file mode 100644 index 00000000..d968872f Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/72.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/76.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/76.png new file mode 100644 index 00000000..d03bd9b0 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/76.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/80.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/80.png new file mode 100644 index 00000000..fabc0b18 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/80.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/87.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/87.png new file mode 100644 index 00000000..065c7b10 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/87.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/88.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/88.png new file mode 100644 index 00000000..ab3cd671 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/88.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/92.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/92.png new file mode 100644 index 00000000..2b4c7fc8 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/92.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/Contents.json b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/Contents.json index 13613e3e..8e70699a 100644 --- a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,8 +1,341 @@ { "images" : [ { - "idiom" : "universal", - "platform" : "ios", + "filename" : "40.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "60.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "29.png", + "idiom" : "iphone", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "58.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "87.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "80.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "120.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "57.png", + "idiom" : "iphone", + "scale" : "1x", + "size" : "57x57" + }, + { + "filename" : "114.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "57x57" + }, + { + "filename" : "120.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "180.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "20.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "40.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "29.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "58.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "40.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "80.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "50.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "50x50" + }, + { + "filename" : "100.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "50x50" + }, + { + "filename" : "72.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "72x72" + }, + { + "filename" : "144.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "72x72" + }, + { + "filename" : "76.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "152.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "167.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "1024.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + }, + { + "filename" : "16.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "16x16" + }, + { + "filename" : "32.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "16x16" + }, + { + "filename" : "32.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "32x32" + }, + { + "filename" : "64.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "32x32" + }, + { + "filename" : "128.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "128x128" + }, + { + "filename" : "256.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "128x128" + }, + { + "filename" : "256.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "256x256" + }, + { + "filename" : "512.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "256x256" + }, + { + "filename" : "512.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "512x512" + }, + { + "filename" : "1024.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "512x512" + }, + { + "filename" : "48.png", + "idiom" : "watch", + "role" : "notificationCenter", + "scale" : "2x", + "size" : "24x24", + "subtype" : "38mm" + }, + { + "filename" : "55.png", + "idiom" : "watch", + "role" : "notificationCenter", + "scale" : "2x", + "size" : "27.5x27.5", + "subtype" : "42mm" + }, + { + "filename" : "58.png", + "idiom" : "watch", + "role" : "companionSettings", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "87.png", + "idiom" : "watch", + "role" : "companionSettings", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "66.png", + "idiom" : "watch", + "role" : "notificationCenter", + "scale" : "2x", + "size" : "33x33", + "subtype" : "45mm" + }, + { + "filename" : "80.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "40x40", + "subtype" : "38mm" + }, + { + "filename" : "88.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "44x44", + "subtype" : "40mm" + }, + { + "filename" : "92.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "46x46", + "subtype" : "41mm" + }, + { + "filename" : "100.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "50x50", + "subtype" : "44mm" + }, + { + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "51x51", + "subtype" : "45mm" + }, + { + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "54x54", + "subtype" : "49mm" + }, + { + "filename" : "172.png", + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "86x86", + "subtype" : "38mm" + }, + { + "filename" : "196.png", + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "98x98", + "subtype" : "42mm" + }, + { + "filename" : "216.png", + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "108x108", + "subtype" : "44mm" + }, + { + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "117x117", + "subtype" : "45mm" + }, + { + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "129x129", + "subtype" : "49mm" + }, + { + "filename" : "1024.png", + "idiom" : "watch-marketing", + "scale" : "1x", "size" : "1024x1024" } ], diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/MainColor.colorset/Contents.json b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/MainColor.colorset/Contents.json deleted file mode 100644 index b57002a3..00000000 --- a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/MainColor.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x80", - "green" : "0x05", - "red" : "0x09" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xFF", - "green" : "0xFF", - "red" : "0xFF" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/OUR_Logo.imageset/Contents.json b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/OUR_Logo.imageset/Contents.json index 17f6fd94..c95296f8 100644 --- a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/OUR_Logo.imageset/Contents.json +++ b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/OUR_Logo.imageset/Contents.json @@ -6,10 +6,12 @@ "scale" : "1x" }, { + "filename" : "LaunchImage.png", "idiom" : "universal", "scale" : "2x" }, { + "filename" : "LaunchImage 1.png", "idiom" : "universal", "scale" : "3x" } diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/OUR_Logo.imageset/LaunchImage 1.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/OUR_Logo.imageset/LaunchImage 1.png new file mode 100644 index 00000000..13b62aa8 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/OUR_Logo.imageset/LaunchImage 1.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/OUR_Logo.imageset/LaunchImage.png b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/OUR_Logo.imageset/LaunchImage.png new file mode 100644 index 00000000..13b62aa8 Binary files /dev/null and b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Assets.xcassets/OUR_Logo.imageset/LaunchImage.png differ diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/ContentView.swift b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/ContentView.swift index e276aee5..c4fe8e36 100644 --- a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/ContentView.swift +++ b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/ContentView.swift @@ -9,66 +9,8 @@ import SwiftUI struct ContentView: View { - enum TabItem { - case feed, studyFeed, recruitAdd, alarm, myPage - } - - @State private var selectedTab: TabItem = .feed - @State private var mainLogoToggle: Bool = true - - let hexColor: String = "#090580" //메인컬러로 변경 - var body: some View { - NavigationStack { - TabView(selection: $selectedTab) { - FeedTabView() - .tag(TabItem.feed) - .tabItem { - Label("피드", systemImage: "house.fill") - } - StudyListView() - .tag(TabItem.studyFeed) - .tabItem { - Label("스터디모집", systemImage: "book.fill") - } - Image(systemName: "love") -// RecruitMainSheet(isShowingSheet: <#Binding#>) - .tag(TabItem.recruitAdd) - .tabItem { - Label("작성하기", systemImage: "plus.app.fill") - } - //AlarmView - AlarmContainer() - .tag(TabItem.alarm) - .tabItem { - Label("알림", systemImage: "bell.fill") - } - MyMain() - .tag(TabItem.myPage) - .tabItem { - Label("마이페이지", systemImage: "person.fill") - } - } - .tint(AColor.main.color) // 메인컬러로 변경 - .navigationBarBackButtonHidden() - .navigationBarItems(leading: leadingBarItem) -// .navigationBarItems(leading: Button(action: { -// //FeedView로 돌아가기 -// }, label: { -// Image("OUR_Logo") -// .resizable() -// .aspectRatio(contentMode: .fit) -// })) - } - } - - @ViewBuilder - var leadingBarItem: some View { - if mainLogoToggle && selectedTab != .alarm && selectedTab != .myPage { - Image("OUR_Logo") - .resizable() - .aspectRatio(contentMode: .fit) - } + LoginView() } } diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Info.plist b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Info.plist index 0699fb8b..3c8be5f3 100644 --- a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Info.plist +++ b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Info.plist @@ -13,5 +13,12 @@ + UILaunchScreen + + UIColorName + AccentColor + UIImageName + OUR_Logo + diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Views/CustomModalTabView/CustomTabBar/CustomTabBarView.swift b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Views/CustomModalTabView/CustomTabBar/CustomTabBarView.swift index 9d3e23b7..f6450852 100644 --- a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Views/CustomModalTabView/CustomTabBar/CustomTabBarView.swift +++ b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Views/CustomModalTabView/CustomTabBar/CustomTabBarView.swift @@ -33,14 +33,15 @@ struct CustomTabBarView: View { Spacer() ZStack { Rectangle() - .frame(width: 350, height: 80) + .frame(width: 350, height: 60) +// .aspectRatio(contentMode: .fit) .foregroundColor(Color.white) .cornerRadius(20) .shadow(radius: 15) HStack { Spacer() // 0 ..< tabBarImageNames.count - ForEach(0 ..< tabBarImageNames.endIndex) { image in + ForEach(0 ..< tabBarImageNames.endIndex, id:\.self) { image in VStack { if image == 2 { VStack { @@ -62,7 +63,7 @@ struct CustomTabBarView: View { } else { Image(systemName: tabBarImageNames[image]) .font(.system(size: 30, weight: .light)) - .foregroundColor(selectedIndex == image ? Color(.black) : Color(.tertiaryLabel)) + .foregroundColor(selectedIndex == image ? Color(hex: "#090580") : Color(.tertiaryLabel)) } } diff --git a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Views/CustomModalTabView/CustomTabBar/PostButton.swift b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Views/CustomModalTabView/CustomTabBar/PostButton.swift index e9aa645f..95737f27 100644 --- a/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Views/CustomModalTabView/CustomTabBar/PostButton.swift +++ b/project02-teamB-OUR-consumer/project02-teamB-OUR-consumer/Views/CustomModalTabView/CustomTabBar/PostButton.swift @@ -13,9 +13,9 @@ struct PostButton: View { var body: some View { ZStack { Circle() - .frame(width: 55) - .foregroundColor(Color.gray) - .shadow(radius: 6) + .frame(width: 40) + .foregroundColor(Color.white) + .shadow(radius: 3) Image(systemName: "plus") .foregroundColor(selectedIndex == 2 ? Color(.black) : Color(.tertiaryLabel))