From 7123b24665e8210ec419a832930c5275ef14c2db Mon Sep 17 00:00:00 2001 From: Selim Mustafaev Date: Mon, 26 Jul 2021 19:21:18 +0300 Subject: [PATCH] Main screen for iOS --- AutoCat2.xcodeproj/project.pbxproj | 42 ++++++++++++++++++++++++++++++ Shared/Views/CheckView.swift | 13 +++++++++ Shared/Views/MainView.swift | 6 ++++- Shared/Views/MainViewBig.swift | 13 +++++++++ Shared/Views/MainViewSmall.swift | 42 ++++++++++++++++++++++++++++++ Shared/Views/RecordsView.swift | 13 +++++++++ Shared/Views/ReportView.swift | 13 +++++++++ Shared/Views/SearchView.swift | 13 +++++++++ Shared/Views/SettingsView.swift | 13 +++++++++ 9 files changed, 167 insertions(+), 1 deletion(-) create mode 100644 Shared/Views/CheckView.swift create mode 100644 Shared/Views/MainViewBig.swift create mode 100644 Shared/Views/MainViewSmall.swift create mode 100644 Shared/Views/RecordsView.swift create mode 100644 Shared/Views/ReportView.swift create mode 100644 Shared/Views/SearchView.swift create mode 100644 Shared/Views/SettingsView.swift diff --git a/AutoCat2.xcodeproj/project.pbxproj b/AutoCat2.xcodeproj/project.pbxproj index 20183df..a1351e0 100644 --- a/AutoCat2.xcodeproj/project.pbxproj +++ b/AutoCat2.xcodeproj/project.pbxproj @@ -7,6 +7,20 @@ objects = { /* Begin PBXBuildFile section */ + 7A2329B926AF122400264CFA /* MainViewSmall.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2329B826AF122400264CFA /* MainViewSmall.swift */; }; + 7A2329BA26AF122400264CFA /* MainViewSmall.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2329B826AF122400264CFA /* MainViewSmall.swift */; }; + 7A2329BC26AF123300264CFA /* MainViewBig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2329BB26AF123200264CFA /* MainViewBig.swift */; }; + 7A2329BD26AF123300264CFA /* MainViewBig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2329BB26AF123200264CFA /* MainViewBig.swift */; }; + 7A2329BF26AF140F00264CFA /* CheckView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2329BE26AF140F00264CFA /* CheckView.swift */; }; + 7A2329C026AF140F00264CFA /* CheckView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2329BE26AF140F00264CFA /* CheckView.swift */; }; + 7A2329C226AF141E00264CFA /* SearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2329C126AF141E00264CFA /* SearchView.swift */; }; + 7A2329C326AF141E00264CFA /* SearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2329C126AF141E00264CFA /* SearchView.swift */; }; + 7A2329C526AF142900264CFA /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2329C426AF142900264CFA /* SettingsView.swift */; }; + 7A2329C626AF142900264CFA /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2329C426AF142900264CFA /* SettingsView.swift */; }; + 7A2329C826AF143F00264CFA /* RecordsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2329C726AF143F00264CFA /* RecordsView.swift */; }; + 7A2329C926AF143F00264CFA /* RecordsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2329C726AF143F00264CFA /* RecordsView.swift */; }; + 7A2329CB26AF15AC00264CFA /* ReportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2329CA26AF15AC00264CFA /* ReportView.swift */; }; + 7A2329CC26AF15AC00264CFA /* ReportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2329CA26AF15AC00264CFA /* ReportView.swift */; }; 7A40D5932691C6D8009B0BC4 /* Tests_iOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A40D5922691C6D8009B0BC4 /* Tests_iOS.swift */; }; 7A40D59D2691C6D8009B0BC4 /* Tests_macOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A40D59C2691C6D8009B0BC4 /* Tests_macOS.swift */; }; 7A40D59E2691C6D8009B0BC4 /* AutoCat2.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 7A40D5792691C6D7009B0BC4 /* AutoCat2.xcdatamodeld */; }; @@ -110,6 +124,13 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 7A2329B826AF122400264CFA /* MainViewSmall.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewSmall.swift; sourceTree = ""; }; + 7A2329BB26AF123200264CFA /* MainViewBig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewBig.swift; sourceTree = ""; }; + 7A2329BE26AF140F00264CFA /* CheckView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckView.swift; sourceTree = ""; }; + 7A2329C126AF141E00264CFA /* SearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchView.swift; sourceTree = ""; }; + 7A2329C426AF142900264CFA /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = ""; }; + 7A2329C726AF143F00264CFA /* RecordsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecordsView.swift; sourceTree = ""; }; + 7A2329CA26AF15AC00264CFA /* ReportView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportView.swift; sourceTree = ""; }; 7A40D57A2691C6D7009B0BC4 /* Shared.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Shared.xcdatamodel; sourceTree = ""; }; 7A40D57B2691C6D7009B0BC4 /* AutoCat2App.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoCat2App.swift; sourceTree = ""; }; 7A40D57C2691C6D7009B0BC4 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; @@ -278,6 +299,13 @@ 7A40D57C2691C6D7009B0BC4 /* ContentView.swift */, 7A40D5E826938BEC009B0BC4 /* AuthView.swift */, 7A971F2226ADF74B007E527B /* MainView.swift */, + 7A2329B826AF122400264CFA /* MainViewSmall.swift */, + 7A2329BB26AF123200264CFA /* MainViewBig.swift */, + 7A2329BE26AF140F00264CFA /* CheckView.swift */, + 7A2329C126AF141E00264CFA /* SearchView.swift */, + 7A2329C426AF142900264CFA /* SettingsView.swift */, + 7A2329C726AF143F00264CFA /* RecordsView.swift */, + 7A2329CA26AF15AC00264CFA /* ReportView.swift */, ); path = Views; sourceTree = ""; @@ -571,22 +599,29 @@ 7A971F0D26AD7D4C007E527B /* AnyEncodable.swift in Sources */, 7ACD05D72695C08A00557667 /* Constants.swift in Sources */, 7A971F1926AD8AEB007E527B /* JSON.swift in Sources */, + 7A2329BC26AF123300264CFA /* MainViewBig.swift in Sources */, 7A971F1D26AD8AEB007E527B /* Merging.swift in Sources */, 7A40D5E326924B09009B0BC4 /* Settings.swift in Sources */, 7AEFAEED26985A3400ED2C85 /* ACProgressView.swift in Sources */, 7A40D5A02691C6D8009B0BC4 /* AutoCat2App.swift in Sources */, 7A683999269612EA00B2188A /* Response.swift in Sources */, + 7A2329BF26AF140F00264CFA /* CheckView.swift in Sources */, 7A971F1526AD8AEB007E527B /* Initialization.swift in Sources */, 7A971F1726AD8AEB007E527B /* Querying.swift in Sources */, 7A40D60826998DCF009B0BC4 /* Alert.swift in Sources */, + 7A2329C226AF141E00264CFA /* SearchView.swift in Sources */, 7A40D5A42691C6D8009B0BC4 /* Persistence.swift in Sources */, 7A971F2026ADC351007E527B /* ApiError.swift in Sources */, + 7A2329CB26AF15AC00264CFA /* ReportView.swift in Sources */, 7A40D5ED2693A1EA009B0BC4 /* AuthVM.swift in Sources */, 7A40D59E2691C6D8009B0BC4 /* AutoCat2.xcdatamodeld in Sources */, + 7A2329B926AF122400264CFA /* MainViewSmall.swift in Sources */, + 7A2329C826AF143F00264CFA /* RecordsView.swift in Sources */, 7A40D5E126924AEC009B0BC4 /* User.swift in Sources */, 7A40D5FE2693A91F009B0BC4 /* CocoaError.swift in Sources */, 7A40D6022694FF5D009B0BC4 /* Api.swift in Sources */, 7A40D5A22691C6D8009B0BC4 /* ContentView.swift in Sources */, + 7A2329C526AF142900264CFA /* SettingsView.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -599,22 +634,29 @@ 7A971F0E26AD7D4C007E527B /* AnyEncodable.swift in Sources */, 7ACD05D82695C08A00557667 /* Constants.swift in Sources */, 7A971F1A26AD8AEB007E527B /* JSON.swift in Sources */, + 7A2329BD26AF123300264CFA /* MainViewBig.swift in Sources */, 7A971F1E26AD8AEB007E527B /* Merging.swift in Sources */, 7A40D5A12691C6D8009B0BC4 /* AutoCat2App.swift in Sources */, 7AEFAEEE26985A3400ED2C85 /* ACProgressView.swift in Sources */, 7A40D5A52691C6D8009B0BC4 /* Persistence.swift in Sources */, 7A68399A269612EA00B2188A /* Response.swift in Sources */, + 7A2329C026AF140F00264CFA /* CheckView.swift in Sources */, 7A971F1626AD8AEB007E527B /* Initialization.swift in Sources */, 7A971F1826AD8AEB007E527B /* Querying.swift in Sources */, 7A40D60926998DCF009B0BC4 /* Alert.swift in Sources */, + 7A2329C326AF141E00264CFA /* SearchView.swift in Sources */, 7A40D5E526924B0C009B0BC4 /* User.swift in Sources */, 7A971F2126ADC351007E527B /* ApiError.swift in Sources */, + 7A2329CC26AF15AC00264CFA /* ReportView.swift in Sources */, 7A40D5EE2693A1EA009B0BC4 /* AuthVM.swift in Sources */, 7A40D59F2691C6D8009B0BC4 /* AutoCat2.xcdatamodeld in Sources */, + 7A2329BA26AF122400264CFA /* MainViewSmall.swift in Sources */, + 7A2329C926AF143F00264CFA /* RecordsView.swift in Sources */, 7A40D5A32691C6D8009B0BC4 /* ContentView.swift in Sources */, 7A40D5FF2693A91F009B0BC4 /* CocoaError.swift in Sources */, 7A40D6032694FF5D009B0BC4 /* Api.swift in Sources */, 7A40D5E426924B09009B0BC4 /* Settings.swift in Sources */, + 7A2329C626AF142900264CFA /* SettingsView.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Shared/Views/CheckView.swift b/Shared/Views/CheckView.swift new file mode 100644 index 0000000..f37bc03 --- /dev/null +++ b/Shared/Views/CheckView.swift @@ -0,0 +1,13 @@ +import SwiftUI + +struct CheckView: View { + var body: some View { + Text("Check view") + } +} + +struct CheckView_Previews: PreviewProvider { + static var previews: some View { + CheckView() + } +} diff --git a/Shared/Views/MainView.swift b/Shared/Views/MainView.swift index 0f696fb..5abb5de 100644 --- a/Shared/Views/MainView.swift +++ b/Shared/Views/MainView.swift @@ -2,7 +2,11 @@ import SwiftUI struct MainView: View { var body: some View { - Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/) + #if os(iOS) + MainViewSmall() + #else + MainViewBig() + #endif } } diff --git a/Shared/Views/MainViewBig.swift b/Shared/Views/MainViewBig.swift new file mode 100644 index 0000000..6e5e2b6 --- /dev/null +++ b/Shared/Views/MainViewBig.swift @@ -0,0 +1,13 @@ +import SwiftUI + +struct MainViewBig: View { + var body: some View { + Text("Main view big") + } +} + +struct MainViewBig_Previews: PreviewProvider { + static var previews: some View { + MainViewBig() + } +} diff --git a/Shared/Views/MainViewSmall.swift b/Shared/Views/MainViewSmall.swift new file mode 100644 index 0000000..be42872 --- /dev/null +++ b/Shared/Views/MainViewSmall.swift @@ -0,0 +1,42 @@ +import SwiftUI + +struct MainViewSmall: View { + var body: some View { + NavigationView { + TabView { + CheckView() + .tabItem { + Image(systemName: "eye") + Text("Check") + } + RecordsView() + .tabItem { + Image(systemName: "recordingtape") + Text("Records") + } + SearchView() + .tabItem { + Image(systemName: "magnifyingglass") + Text("Search") + } + SettingsView() + .tabItem { + Image(systemName: "gear") + Text("Settings") + } + } + Text("detail") + } + } +} + +struct MainViewSmall_Previews: PreviewProvider { + static var previews: some View { + Group { + MainViewSmall() + MainViewSmall() + .previewInterfaceOrientation(.landscapeLeft) + .previewDevice("iPad Pro (9.7-inch)") + } + } +} diff --git a/Shared/Views/RecordsView.swift b/Shared/Views/RecordsView.swift new file mode 100644 index 0000000..6b9ade4 --- /dev/null +++ b/Shared/Views/RecordsView.swift @@ -0,0 +1,13 @@ +import SwiftUI + +struct RecordsView: View { + var body: some View { + Text("Records view") + } +} + +struct RecordsView_Previews: PreviewProvider { + static var previews: some View { + RecordsView() + } +} diff --git a/Shared/Views/ReportView.swift b/Shared/Views/ReportView.swift new file mode 100644 index 0000000..2808fdc --- /dev/null +++ b/Shared/Views/ReportView.swift @@ -0,0 +1,13 @@ +import SwiftUI + +struct ReportView: View { + var body: some View { + Text("Report view") + } +} + +struct ReportView_Previews: PreviewProvider { + static var previews: some View { + ReportView() + } +} diff --git a/Shared/Views/SearchView.swift b/Shared/Views/SearchView.swift new file mode 100644 index 0000000..023ae7c --- /dev/null +++ b/Shared/Views/SearchView.swift @@ -0,0 +1,13 @@ +import SwiftUI + +struct SearchView: View { + var body: some View { + Text("Search view") + } +} + +struct SearchView_Previews: PreviewProvider { + static var previews: some View { + SearchView() + } +} diff --git a/Shared/Views/SettingsView.swift b/Shared/Views/SettingsView.swift new file mode 100644 index 0000000..680d1a0 --- /dev/null +++ b/Shared/Views/SettingsView.swift @@ -0,0 +1,13 @@ +import SwiftUI + +struct SettingsView: View { + var body: some View { + Text("Search view") + } +} + +struct SettingsView_Previews: PreviewProvider { + static var previews: some View { + SettingsView() + } +}