diff --git a/nirvana-ios.xcodeproj/project.pbxproj b/nirvana-ios.xcodeproj/project.pbxproj index 7bbc92c..59bbc47 100644 --- a/nirvana-ios.xcodeproj/project.pbxproj +++ b/nirvana-ios.xcodeproj/project.pbxproj @@ -25,6 +25,7 @@ 892179E62765FECD001E6C60 /* FooterControlsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 892179E52765FECD001E6C60 /* FooterControlsViewModel.swift */; }; 89288EC0276755DF00E962C4 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 89288EBF276755DF00E962C4 /* GoogleService-Info.plist */; }; 89288ECB27675B9F00E962C4 /* OnboardingTemplateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89288ECA27675B9F00E962C4 /* OnboardingTemplateView.swift */; }; + 894E80BE276ED7A700624B72 /* avatars.swift in Sources */ = {isa = PBXBuildFile; fileRef = 894E80BD276ED7A700624B72 /* avatars.swift */; }; 89AD5573276DD790001658E0 /* SplashView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD5572276DD790001658E0 /* SplashView.swift */; }; 89AD5575276DE724001658E0 /* PhoneCodeVerificationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD5574276DE724001658E0 /* PhoneCodeVerificationView.swift */; }; 89AD5578276DEAB3001658E0 /* LogoHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD5577276DEAB3001658E0 /* LogoHeaderView.swift */; }; @@ -90,6 +91,7 @@ 892179E52765FECD001E6C60 /* FooterControlsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FooterControlsViewModel.swift; sourceTree = ""; }; 89288EBF276755DF00E962C4 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 89288ECA27675B9F00E962C4 /* OnboardingTemplateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingTemplateView.swift; sourceTree = ""; }; + 894E80BD276ED7A700624B72 /* avatars.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = avatars.swift; sourceTree = ""; }; 89AD5572276DD790001658E0 /* SplashView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplashView.swift; sourceTree = ""; }; 89AD5574276DE724001658E0 /* PhoneCodeVerificationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhoneCodeVerificationView.swift; sourceTree = ""; }; 89AD5577276DEAB3001658E0 /* LogoHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogoHeaderView.swift; sourceTree = ""; }; @@ -253,6 +255,7 @@ 89BDCDE427695DB900577829 /* NirvanaImage.swift */, 89BDCDE62769616600577829 /* UIImage+Extension.swift */, 89F18AEB276E92BF00115B1E /* CustomExtensions.swift */, + 894E80BD276ED7A700624B72 /* avatars.swift */, ); path = Globals; sourceTree = ""; @@ -486,6 +489,7 @@ files = ( 89BDCDEC2769918D00577829 /* OnboardingTrioView.swift in Sources */, 891A15E327653A7000B26659 /* ContentView.swift in Sources */, + 894E80BE276ED7A700624B72 /* avatars.swift in Sources */, 89F05B9F276A8D360002E9C7 /* Contact.swift in Sources */, 891A160327656FC700B26659 /* HomeView.swift in Sources */, 891A160B2765732700B26659 /* HomeViewModel.swift in Sources */, diff --git a/nirvana-ios/Assets.xcassets/illustrations/undraw_explore_re_8l4v.imageset/Contents.json b/nirvana-ios/Assets.xcassets/illustrations/undraw_explore_re_8l4v.imageset/Contents.json new file mode 100644 index 0000000..f9c63cb --- /dev/null +++ b/nirvana-ios/Assets.xcassets/illustrations/undraw_explore_re_8l4v.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "undraw_explore_re_8l4v.svg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/nirvana-ios/Assets.xcassets/illustrations/undraw_explore_re_8l4v.imageset/undraw_explore_re_8l4v.svg b/nirvana-ios/Assets.xcassets/illustrations/undraw_explore_re_8l4v.imageset/undraw_explore_re_8l4v.svg new file mode 100644 index 0000000..656c70e --- /dev/null +++ b/nirvana-ios/Assets.xcassets/illustrations/undraw_explore_re_8l4v.imageset/undraw_explore_re_8l4v.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/nirvana-ios/Assets.xcassets/illustrations/undraw_fall_is_coming_yl-0-x.imageset/Contents.json b/nirvana-ios/Assets.xcassets/illustrations/undraw_fall_is_coming_yl-0-x.imageset/Contents.json new file mode 100644 index 0000000..e9b84bf --- /dev/null +++ b/nirvana-ios/Assets.xcassets/illustrations/undraw_fall_is_coming_yl-0-x.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "undraw_fall_is_coming_yl-0-x.svg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/nirvana-ios/Assets.xcassets/illustrations/undraw_fall_is_coming_yl-0-x.imageset/undraw_fall_is_coming_yl-0-x.svg b/nirvana-ios/Assets.xcassets/illustrations/undraw_fall_is_coming_yl-0-x.imageset/undraw_fall_is_coming_yl-0-x.svg new file mode 100644 index 0000000..76dba4d --- /dev/null +++ b/nirvana-ios/Assets.xcassets/illustrations/undraw_fall_is_coming_yl-0-x.imageset/undraw_fall_is_coming_yl-0-x.svg @@ -0,0 +1 @@ +Fall is coming \ No newline at end of file diff --git a/nirvana-ios/Assets.xcassets/illustrations/undraw_outdoors_amdn.imageset/Contents.json b/nirvana-ios/Assets.xcassets/illustrations/undraw_outdoors_amdn.imageset/Contents.json new file mode 100644 index 0000000..7cc3af6 --- /dev/null +++ b/nirvana-ios/Assets.xcassets/illustrations/undraw_outdoors_amdn.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "undraw_outdoors_amdn.svg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/nirvana-ios/Assets.xcassets/illustrations/undraw_outdoors_amdn.imageset/undraw_outdoors_amdn.svg b/nirvana-ios/Assets.xcassets/illustrations/undraw_outdoors_amdn.imageset/undraw_outdoors_amdn.svg new file mode 100644 index 0000000..b610ba0 --- /dev/null +++ b/nirvana-ios/Assets.xcassets/illustrations/undraw_outdoors_amdn.imageset/undraw_outdoors_amdn.svg @@ -0,0 +1 @@ +outdoors \ No newline at end of file diff --git a/nirvana-ios/Assets.xcassets/illustrations/undraw_profile_pic_ic-5-t.imageset/Contents.json b/nirvana-ios/Assets.xcassets/illustrations/undraw_profile_pic_ic-5-t.imageset/Contents.json new file mode 100644 index 0000000..c5c592b --- /dev/null +++ b/nirvana-ios/Assets.xcassets/illustrations/undraw_profile_pic_ic-5-t.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "undraw_profile_pic_ic-5-t.svg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/nirvana-ios/Assets.xcassets/illustrations/undraw_profile_pic_ic-5-t.imageset/undraw_profile_pic_ic-5-t.svg b/nirvana-ios/Assets.xcassets/illustrations/undraw_profile_pic_ic-5-t.imageset/undraw_profile_pic_ic-5-t.svg new file mode 100644 index 0000000..3d6d802 --- /dev/null +++ b/nirvana-ios/Assets.xcassets/illustrations/undraw_profile_pic_ic-5-t.imageset/undraw_profile_pic_ic-5-t.svg @@ -0,0 +1 @@ +profile pic \ No newline at end of file diff --git a/nirvana-ios/Assets.xcassets/illustrations/undraw_regain_focus_ecvj.imageset/Contents.json b/nirvana-ios/Assets.xcassets/illustrations/undraw_regain_focus_ecvj.imageset/Contents.json new file mode 100644 index 0000000..9dd051f --- /dev/null +++ b/nirvana-ios/Assets.xcassets/illustrations/undraw_regain_focus_ecvj.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "undraw_regain_focus_ecvj.svg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/nirvana-ios/Assets.xcassets/illustrations/undraw_regain_focus_ecvj.imageset/undraw_regain_focus_ecvj.svg b/nirvana-ios/Assets.xcassets/illustrations/undraw_regain_focus_ecvj.imageset/undraw_regain_focus_ecvj.svg new file mode 100644 index 0000000..ec4a980 --- /dev/null +++ b/nirvana-ios/Assets.xcassets/illustrations/undraw_regain_focus_ecvj.imageset/undraw_regain_focus_ecvj.svg @@ -0,0 +1 @@ +regain_focus \ No newline at end of file diff --git a/nirvana-ios/Globals/avatars.swift b/nirvana-ios/Globals/avatars.swift new file mode 100644 index 0000000..e86dc82 --- /dev/null +++ b/nirvana-ios/Globals/avatars.swift @@ -0,0 +1,75 @@ +// +// avatars.swift +// nirvana-ios +// +// Created by Arjun Patel on 12/18/21. +// + +import Foundation + +struct Avatars { + static let avatarSystemNames = [ + "Artboards_Diversity_Avatars_by_Netguru-1", + "Artboards_Diversity_Avatars_by_Netguru-2", + "Artboards_Diversity_Avatars_by_Netguru-3", + "Artboards_Diversity_Avatars_by_Netguru-4", + "Artboards_Diversity_Avatars_by_Netguru-5", + "Artboards_Diversity_Avatars_by_Netguru-6", + "Artboards_Diversity_Avatars_by_Netguru-7", + "Artboards_Diversity_Avatars_by_Netguru-8", + "Artboards_Diversity_Avatars_by_Netguru-9", + "Artboards_Diversity_Avatars_by_Netguru-10", + "Artboards_Diversity_Avatars_by_Netguru-11", + "Artboards_Diversity_Avatars_by_Netguru-12", + "Artboards_Diversity_Avatars_by_Netguru-13", + "Artboards_Diversity_Avatars_by_Netguru-14", + "Artboards_Diversity_Avatars_by_Netguru-15", + "Artboards_Diversity_Avatars_by_Netguru-16", + + "Artboards_Diversity_Avatars_by_Netguru-17", + "Artboards_Diversity_Avatars_by_Netguru-18", + "Artboards_Diversity_Avatars_by_Netguru-19", + "Artboards_Diversity_Avatars_by_Netguru-20", + "Artboards_Diversity_Avatars_by_Netguru-21", + "Artboards_Diversity_Avatars_by_Netguru-22", + "Artboards_Diversity_Avatars_by_Netguru-23", + + "Artboards_Diversity_Avatars_by_Netguru-24", + "Artboards_Diversity_Avatars_by_Netguru-25", + "Artboards_Diversity_Avatars_by_Netguru-26", + "Artboards_Diversity_Avatars_by_Netguru-27", + "Artboards_Diversity_Avatars_by_Netguru-28", + "Artboards_Diversity_Avatars_by_Netguru-29", + "Artboards_Diversity_Avatars_by_Netguru-30", + + "Artboards_Diversity_Avatars_by_Netguru-31", + "Artboards_Diversity_Avatars_by_Netguru-32", + "Artboards_Diversity_Avatars_by_Netguru-33", + "Artboards_Diversity_Avatars_by_Netguru-34", + "Artboards_Diversity_Avatars_by_Netguru-35", + "Artboards_Diversity_Avatars_by_Netguru-36", + "Artboards_Diversity_Avatars_by_Netguru-37", + + "Artboards_Diversity_Avatars_by_Netguru-38", + "Artboards_Diversity_Avatars_by_Netguru-39", + "Artboards_Diversity_Avatars_by_Netguru-40", + "Artboards_Diversity_Avatars_by_Netguru-41", + "Artboards_Diversity_Avatars_by_Netguru-42", + "Artboards_Diversity_Avatars_by_Netguru-43", + "Artboards_Diversity_Avatars_by_Netguru-44", + "Artboards_Diversity_Avatars_by_Netguru-45", + "Artboards_Diversity_Avatars_by_Netguru-46", + "Artboards_Diversity_Avatars_by_Netguru-47", + "Artboards_Diversity_Avatars_by_Netguru-48", + "Artboards_Diversity_Avatars_by_Netguru-49", + "Artboards_Diversity_Avatars_by_Netguru-50", + "Artboards_Diversity_Avatars_by_Netguru-52", + "Artboards_Diversity_Avatars_by_Netguru-53", + "Artboards_Diversity_Avatars_by_Netguru-54", + "Artboards_Diversity_Avatars_by_Netguru-55", + "Artboards_Diversity_Avatars_by_Netguru-56", + "Artboards_Diversity_Avatars_by_Netguru-57", + "Artboards_Diversity_Avatars_by_Netguru-58", + "Artboards_Diversity_Avatars_by_Netguru-59" + ] +} diff --git a/nirvana-ios/Views/AddBasicInfo/AddBasicInfoView.swift b/nirvana-ios/Views/AddBasicInfo/AddBasicInfoView.swift index f33985d..b7fad7c 100644 --- a/nirvana-ios/Views/AddBasicInfo/AddBasicInfoView.swift +++ b/nirvana-ios/Views/AddBasicInfo/AddBasicInfoView.swift @@ -6,8 +6,16 @@ // import SwiftUI +import NavigationStack struct AddBasicInfoView: View { + @EnvironmentObject var navigationStack : NavigationStack + + @State var firstName = "" + @State var lastName = "" + + @State var selectedAvatarIndex: Int = 0 + var body: some View { ZStack { // bg @@ -18,7 +26,7 @@ struct AddBasicInfoView: View { Color.clear Button { - + self.navigationStack.pop() } label: { Label("back", systemImage:"chevron.left") .labelStyle(.iconOnly) @@ -27,12 +35,76 @@ struct AddBasicInfoView: View { .padding() } - // all content top down + // main content VStack { + // header logo area LogoHeaderView() + Text("Let's Build Your Profile") + .font(.title) + .fontWeight(.medium) + .foregroundColor(NirvanaColor.teal) + .multilineTextAlignment(.center) + + // Horizontal scroll view to allow user to select the avatar he or she wants + ScrollView(.horizontal, showsIndicators: false) { + LazyHStack { + ForEach(0..