diff --git a/ios/circolapp/circolapp.xcodeproj/project.pbxproj b/ios/circolapp/circolapp.xcodeproj/project.pbxproj index 1e491c9..31774fa 100644 --- a/ios/circolapp/circolapp.xcodeproj/project.pbxproj +++ b/ios/circolapp/circolapp.xcodeproj/project.pbxproj @@ -13,6 +13,7 @@ 954E68352574E3890034EBA8 /* iOSServerApi.swift in Sources */ = {isa = PBXBuildFile; fileRef = 954E68342574E3890034EBA8 /* iOSServerApi.swift */; }; 954E683D2574ED9E0034EBA8 /* UserDefaultsExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 954E683C2574ED9E0034EBA8 /* UserDefaultsExtensions.swift */; }; 9553DB09257173ED006AE167 /* iOSRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9553DB08257173ED006AE167 /* iOSRepository.swift */; }; + 9554BDB8257E498F00D8925B /* OnboardingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9554BDB7257E498F00D8925B /* OnboardingView.swift */; }; 955B7A0E257D098C0091B1F9 /* SearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 955B7A0D257D098C0091B1F9 /* SearchBar.swift */; }; 955B7A10257D10A70091B1F9 /* ViewControllerResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 955B7A0F257D10A70091B1F9 /* ViewControllerResolver.swift */; }; 95906F48257508660060F5D0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 95906F47257506360060F5D0 /* Assets.xcassets */; }; @@ -51,6 +52,7 @@ 954E68342574E3890034EBA8 /* iOSServerApi.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSServerApi.swift; sourceTree = ""; }; 954E683C2574ED9E0034EBA8 /* UserDefaultsExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsExtensions.swift; sourceTree = ""; }; 9553DB08257173ED006AE167 /* iOSRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSRepository.swift; sourceTree = ""; }; + 9554BDB7257E498F00D8925B /* OnboardingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingView.swift; sourceTree = ""; }; 955B7A0D257D098C0091B1F9 /* SearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchBar.swift; sourceTree = ""; }; 955B7A0F257D10A70091B1F9 /* ViewControllerResolver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewControllerResolver.swift; sourceTree = ""; }; 95906F47257506360060F5D0 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -106,6 +108,7 @@ 9512D3C0257AB4F60023C3A1 /* NewReminderView.swift */, 955B7A0D257D098C0091B1F9 /* SearchBar.swift */, 955B7A0F257D10A70091B1F9 /* ViewControllerResolver.swift */, + 9554BDB7257E498F00D8925B /* OnboardingView.swift */, ); path = View; sourceTree = ""; @@ -291,6 +294,7 @@ 9512D3C1257AB4F60023C3A1 /* NewReminderView.swift in Sources */, 954E683D2574ED9E0034EBA8 /* UserDefaultsExtensions.swift in Sources */, 955B7A0E257D098C0091B1F9 /* SearchBar.swift in Sources */, + 9554BDB8257E498F00D8925B /* OnboardingView.swift in Sources */, 95C46A51255D3A34007A75E5 /* CircularViewModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/ios/circolapp/circolapp/View/ContentView.swift b/ios/circolapp/circolapp/View/ContentView.swift index 0af4a39..67c8508 100644 --- a/ios/circolapp/circolapp/View/ContentView.swift +++ b/ios/circolapp/circolapp/View/ContentView.swift @@ -23,6 +23,7 @@ import Shared struct ContentView: View { @ObservedObject var circularViewModel = CircularViewModel(repository: iOSRepository.getCircularRepository()) @ObservedObject var searchBar: SearchBar = SearchBar(placeholder: "Search circulars") + @State var showOnboarding = !UserDefaults.standard.bool(forKey: "skipOnboarding") var body: some View { NavigationView { @@ -40,6 +41,10 @@ struct ContentView: View { .onDisappear(perform: { self.circularViewModel.stopObserving() }) + }.sheet(isPresented: self.$showOnboarding, onDismiss: { + UserDefaults.standard.set(true, forKey: "skipOnboarding") + }) { + OnboardingView() } Divider() diff --git a/ios/circolapp/circolapp/View/OnboardingView.swift b/ios/circolapp/circolapp/View/OnboardingView.swift new file mode 100644 index 0000000..f3d66e2 --- /dev/null +++ b/ios/circolapp/circolapp/View/OnboardingView.swift @@ -0,0 +1,60 @@ +/* + * Circolapp + * Copyright (C) 2019-2020 Matteo Schiff + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import SwiftUI +import Combine +import Shared + +struct OnboardingView: View { + @State private var school = 0 + @Environment(\.presentationMode) var presentationMode + private let serverCompanion = ServerAPI.Companion() + + var body: some View { + NavigationView { + VStack { + Text("Choose your school") + .font(.headline) + .padding() + Form { + Picker("School", selection: $school) { + ForEach(0..