closed #38

Shared/views/ContentView.swift

@@ -18,8 +18,6 @@ struct ContentView: View {
     
     @ObservedObject var viewModel = ContentModeViewModel()
 
-    @AppStorage("savedOnboardingData") private var savedOnboardingData = OnboardingData()
-
     init(){
         UITabBar.appearance().backgroundColor = UIColor.systemBackground
     }
@@ -43,10 +41,10 @@ struct ContentView: View {
         }.sheet(isPresented: $needsOnboarding, onDismiss: {
             
         }, content: {
-            OnboardingMain(onboardingData: savedOnboardingData,
-                           completionClosure: { onboardingData in
+            OnboardingMain(onboardingData: viewModel.savedOnboardingData,
+                           updateBoardingDataClosure: { onboardingData in
                 needsOnboarding = false
-                savedOnboardingData = onboardingData
+                viewModel.updateOnboardingData(onboardingData: onboardingData)
             })
         })
     }
@@ -65,6 +63,8 @@ struct ContentView: View {
                     withAnimation{
                         viewModel.updateData()
                     }
+                }, updateBoardingDataClosure: { onboardingData in
+                    viewModel.updateOnboardingData(onboardingData: onboardingData)
                 })
             }.padding(.trailing)
         }
@@ -170,8 +170,8 @@ struct ContentView: View {
             BGView()
             VStack{
                 settingsButtonView
-                if viewModel.shouldShowTodayInput() && savedOnboardingData.ableToVoteBasedOnCurentTime() {
-                    AddMoodHeaderView(addItemClosure: { (mood, date) in
+                if viewModel.shouldShowVotingHeader() {
+                    AddMoodHeaderView(addItemHeaderClosure: { (mood, date) in
                         withAnimation {
                             viewModel.add(mood: mood, forDate: date)
                         }