Skip to content
This repository was archived by the owner on Oct 12, 2025. It is now read-only.

Commit 59b2b8b

Browse files
anushkasankarananushkasankaran
authored
Merge pull request #625 from HackIllinois/anushka/onboarding
Onboarding
2 parents 1e86b2c + 913fa8d commit 59b2b8b

File tree

97 files changed

+201
-131
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+201
-131
lines changed

‎HackIllinois.xcodeproj/project.pbxproj‎

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@
153153
D1D3351D2B81E11500BBB596 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = D1D3351C2B81E11500BBB596 /* GoogleService-Info.plist */; };
154154
D1D3351E2B81E11500BBB596 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = D1D3351C2B81E11500BBB596 /* GoogleService-Info.plist */; };
155155
D1D3351F2B81E11500BBB596 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = D1D3351C2B81E11500BBB596 /* GoogleService-Info.plist */; };
156-
D1F1463A2B605C57004E7FC9 /* Hack_Mushroom_Loading.json in Resources */ = {isa = PBXBuildFile; fileRef = D1F146392B605C57004E7FC9 /* Hack_Mushroom_Loading.json */; };
157156
D3A309BC2211175200CBA351 /* PassKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3A309BB2211175200CBA351 /* PassKit.framework */; };
158157
D704DB322C73A8E200355019 /* URLImage in Frameworks */ = {isa = PBXBuildFile; productRef = D704DB312C73A8E200355019 /* URLImage */; };
158+
D75837902D65B10000B37D10 /* Hack25 Loading 2.json in Resources */ = {isa = PBXBuildFile; fileRef = D758378F2D65B10000B37D10 /* Hack25 Loading 2.json */; };
159159
D7713B5D2D5FDEAA00389128 /* CartItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7713B5C2D5FDEA100389128 /* CartItem.swift */; };
160160
DAACDC322D3B8F5E00D15118 /* HIEventListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAACDC312D3B8F5E00D15118 /* HIEventListViewController.swift */; };
161161
DF3706382925DDAA000B4278 /* GoogleMapsBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF3706372925DDAA000B4278 /* GoogleMapsBase.framework */; };
@@ -373,9 +373,9 @@
373373
D1D335182B81DEF600BBB596 /* Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notification.swift; sourceTree = "<group>"; };
374374
D1D3351A2B81DF0300BBB596 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
375375
D1D3351C2B81E11500BBB596 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
376-
D1F146392B605C57004E7FC9 /* Hack_Mushroom_Loading.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = Hack_Mushroom_Loading.json; sourceTree = "<group>"; };
377376
D3A309BA221116A600CBA351 /* HackIllinois.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = HackIllinois.entitlements; sourceTree = "<group>"; };
378377
D3A309BB2211175200CBA351 /* PassKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PassKit.framework; path = System/Library/Frameworks/PassKit.framework; sourceTree = SDKROOT; };
378+
D758378F2D65B10000B37D10 /* Hack25 Loading 2.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "Hack25 Loading 2.json"; sourceTree = "<group>"; };
379379
D7713B5C2D5FDEA100389128 /* CartItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CartItem.swift; sourceTree = "<group>"; };
380380
DAACDC312D3B8F5E00D15118 /* HIEventListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HIEventListViewController.swift; sourceTree = "<group>"; };
381381
DF3706372925DDAA000B4278 /* GoogleMapsBase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = GoogleMapsBase.framework; sourceTree = "<group>"; };
@@ -842,7 +842,7 @@
842842
E1E4A5D5291C9BF700780BA1 /* UI */ = {
843843
isa = PBXGroup;
844844
children = (
845-
D1F146392B605C57004E7FC9 /* Hack_Mushroom_Loading.json */,
845+
D758378F2D65B10000B37D10 /* Hack25 Loading 2.json */,
846846
E1E4A5D6291C9BF700780BA1 /* HICarouselSwiftUIView.swift */,
847847
);
848848
path = UI;
@@ -1022,8 +1022,8 @@
10221022
1C7561A3278E96600004D739 /* DarkVespaText.json in Resources */,
10231023
951827A91EA35DB800049F79 /* Assets.xcassets in Resources */,
10241024
952D1542220D453D0041383A /* countdown-60.json in Resources */,
1025-
D1F1463A2B605C57004E7FC9 /* Hack_Mushroom_Loading.json in Resources */,
10261025
951827B41EA35E8B00049F79 /* LaunchScreen.storyboard in Resources */,
1026+
D75837902D65B10000B37D10 /* Hack25 Loading 2.json in Resources */,
10271027
1C7561A5278E96750004D739 /* LightVespaText.json in Resources */,
10281028
D134D30F296B3F56006EA589 /* Montserrat-VariableFont_wght.ttf in Resources */,
10291029
D1D3351D2B81E11500BBB596 /* GoogleService-Info.plist in Resources */,
@@ -1385,8 +1385,13 @@
13851385
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -Xfrontend -warn-long-expression-type-checking=150";
13861386
PRODUCT_BUNDLE_IDENTIFIER = org.hackillinois.ios;
13871387
PRODUCT_NAME = "$(TARGET_NAME)";
1388+
REGISTER_APP_GROUPS = NO;
1389+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
1390+
SUPPORTS_MACCATALYST = NO;
1391+
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
1392+
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
13881393
SWIFT_VERSION = 5.0;
1389-
TARGETED_DEVICE_FAMILY = "1,2";
1394+
TARGETED_DEVICE_FAMILY = 1;
13901395
};
13911396
name = Debug;
13921397
};
@@ -1416,8 +1421,13 @@
14161421
ONLY_ACTIVE_ARCH = YES;
14171422
PRODUCT_BUNDLE_IDENTIFIER = org.hackillinois.ios;
14181423
PRODUCT_NAME = "$(TARGET_NAME)";
1424+
REGISTER_APP_GROUPS = NO;
1425+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
1426+
SUPPORTS_MACCATALYST = NO;
1427+
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
1428+
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
14191429
SWIFT_VERSION = 5.0;
1420-
TARGETED_DEVICE_FAMILY = "1,2";
1430+
TARGETED_DEVICE_FAMILY = 1;
14211431
};
14221432
name = Release;
14231433
};
@@ -1453,10 +1463,13 @@
14531463
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
14541464
PROVISIONING_PROFILE_SPECIFIER = "";
14551465
SKIP_INSTALL = YES;
1466+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
14561467
SUPPORTS_MACCATALYST = NO;
1468+
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
1469+
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
14571470
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
14581471
SWIFT_VERSION = 5.0;
1459-
TARGETED_DEVICE_FAMILY = "1,2";
1472+
TARGETED_DEVICE_FAMILY = 1;
14601473
VERSIONING_SYSTEM = "apple-generic";
14611474
VERSION_INFO_PREFIX = "";
14621475
};
@@ -1493,9 +1506,12 @@
14931506
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
14941507
PROVISIONING_PROFILE_SPECIFIER = "";
14951508
SKIP_INSTALL = YES;
1509+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
14961510
SUPPORTS_MACCATALYST = NO;
1511+
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
1512+
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
14971513
SWIFT_VERSION = 5.0;
1498-
TARGETED_DEVICE_FAMILY = "1,2";
1514+
TARGETED_DEVICE_FAMILY = 1;
14991515
VERSIONING_SYSTEM = "apple-generic";
15001516
VERSION_INFO_PREFIX = "";
15011517
};
@@ -1524,7 +1540,11 @@
15241540
PRODUCT_BUNDLE_IDENTIFIER = org.hackillinois.ios.Stickers;
15251541
PRODUCT_NAME = "$(TARGET_NAME)";
15261542
SKIP_INSTALL = YES;
1527-
TARGETED_DEVICE_FAMILY = "1,2";
1543+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
1544+
SUPPORTS_MACCATALYST = NO;
1545+
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
1546+
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
1547+
TARGETED_DEVICE_FAMILY = 1;
15281548
};
15291549
name = Debug;
15301550
};
@@ -1550,7 +1570,11 @@
15501570
PRODUCT_BUNDLE_IDENTIFIER = org.hackillinois.ios.Stickers;
15511571
PRODUCT_NAME = "$(TARGET_NAME)";
15521572
SKIP_INSTALL = YES;
1553-
TARGETED_DEVICE_FAMILY = "1,2";
1573+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
1574+
SUPPORTS_MACCATALYST = NO;
1575+
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
1576+
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
1577+
TARGETED_DEVICE_FAMILY = 1;
15541578
};
15551579
name = Release;
15561580
};

HackIllinois/Assets.xcassets/Image.imageset/Contents.json renamed to HackIllinois/Assets.xcassets/LoadingBackground.imageset/Contents.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
{
22
"images" : [
33
{
4+
"filename" : "loading screen.png",
45
"idiom" : "universal",
56
"scale" : "1x"
67
},
78
{
9+
"filename" : "loading screen (1).png",
810
"idiom" : "universal",
911
"scale" : "2x"
1012
},
1113
{
14+
"filename" : "loading screen (2).png",
1215
"idiom" : "universal",
1316
"scale" : "3x"
1417
}

‎HackIllinois/Assets.xcassets/LoadingBackground.imageset/loading screen (1).png‎

797 KB

‎HackIllinois/Assets.xcassets/LoadingBackground.imageset/loading screen (2).png‎

1.67 MB

‎HackIllinois/Assets.xcassets/LoadingBackground.imageset/loading screen.png‎

217 KB

‎HackIllinois/Assets.xcassets/Login.imageset/Contents.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"images" : [
33
{
4-
"filename" : "Purple Background-1.png",
4+
"filename" : "Onboarding.png",
55
"idiom" : "universal",
66
"scale" : "1x"
77
},
88
{
9-
"filename" : "Purple Background@2x.png",
9+
"filename" : "Onboarding (1).png",
1010
"idiom" : "universal",
1111
"scale" : "2x"
1212
},
1313
{
14-
"filename" : "Purple Background.png",
14+
"filename" : "Onboarding (2).png",
1515
"idiom" : "universal",
1616
"scale" : "3x"
1717
}

‎HackIllinois/Assets.xcassets/Login.imageset/Onboarding (1).png‎

585 KB

‎HackIllinois/Assets.xcassets/Login.imageset/Onboarding (2).png‎

1.06 MB

‎HackIllinois/Assets.xcassets/Login.imageset/Onboarding.png‎

210 KB

‎HackIllinois/Assets.xcassets/Login.imageset/Purple Background-1.png‎

-28.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)