From c00ccbf87d4840bd11cd120a02a54209559bd093 Mon Sep 17 00:00:00 2001 From: ryoya ito Date: Thu, 13 Jul 2023 19:46:52 +0900 Subject: [PATCH] initialize each tab pages --- app-ios/Modules/Package.swift | 42 +++++++++++++++++++ app-ios/Modules/Sources/About/AboutView.swift | 12 ++++++ .../Sources/About/AboutViewModel.swift | 1 + .../Sources/FloorMap/FloorMapView.swift | 13 ++++++ .../Sources/FloorMap/FloorMapViewModel.swift | 1 + .../Modules/Sources/Navigation/RootView.swift | 29 ++++++++++--- .../Modules/Sources/Stamps/StampsView.swift | 12 ++++++ .../Sources/Stamps/StampsViewModel.swift | 1 + .../Modules/Tests/AboutTests/AboutTests.swift | 11 +++++ .../Tests/FloorMapTests/FloorMapTests.swift | 7 ++++ .../Tests/StampsTests/StampsTests.swift | 7 ++++ 11 files changed, 131 insertions(+), 5 deletions(-) create mode 100644 app-ios/Modules/Sources/About/AboutView.swift create mode 100644 app-ios/Modules/Sources/About/AboutViewModel.swift create mode 100644 app-ios/Modules/Sources/FloorMap/FloorMapView.swift create mode 100644 app-ios/Modules/Sources/FloorMap/FloorMapViewModel.swift create mode 100644 app-ios/Modules/Sources/Stamps/StampsView.swift create mode 100644 app-ios/Modules/Sources/Stamps/StampsViewModel.swift create mode 100644 app-ios/Modules/Tests/AboutTests/AboutTests.swift create mode 100644 app-ios/Modules/Tests/FloorMapTests/FloorMapTests.swift create mode 100644 app-ios/Modules/Tests/StampsTests/StampsTests.swift diff --git a/app-ios/Modules/Package.swift b/app-ios/Modules/Package.swift index ca660419e..930dc1863 100644 --- a/app-ios/Modules/Package.swift +++ b/app-ios/Modules/Package.swift @@ -20,6 +20,32 @@ var package = Package( .package(url: "https://github.com/realm/SwiftLint", from: "0.52.2"), ], targets: [ + .target( + name: "About", + dependencies: [ + "shared", + ] + ), + .testTarget( + name: "AboutTests", + dependencies: [ + "About", + ] + ), + + .target( + name: "FloorMap", + dependencies: [ + "shared", + ] + ), + .testTarget( + name: "FloorMapTests", + dependencies: [ + "FloorMap", + ] + ), + .target( name: "Session", dependencies: [ @@ -33,6 +59,19 @@ var package = Package( ] ), + .target( + name: "Stamps", + dependencies: [ + "shared", + ] + ), + .testTarget( + name: "StampsTests", + dependencies: [ + "Stamps" + ] + ), + .target( name: "Timetable", dependencies: [ @@ -50,7 +89,10 @@ var package = Package( .target( name: "Navigation", dependencies: [ + "About", + "FloorMap", "Session", + "Stamps", "Timetable", ] ), diff --git a/app-ios/Modules/Sources/About/AboutView.swift b/app-ios/Modules/Sources/About/AboutView.swift new file mode 100644 index 000000000..523aaff43 --- /dev/null +++ b/app-ios/Modules/Sources/About/AboutView.swift @@ -0,0 +1,12 @@ +import SwiftUI + +public struct AboutView: View { + public init() {} + public var body: some View { + Text("About View") + } +} + +// #Preview { +// AboutView() +// } diff --git a/app-ios/Modules/Sources/About/AboutViewModel.swift b/app-ios/Modules/Sources/About/AboutViewModel.swift new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/app-ios/Modules/Sources/About/AboutViewModel.swift @@ -0,0 +1 @@ + diff --git a/app-ios/Modules/Sources/FloorMap/FloorMapView.swift b/app-ios/Modules/Sources/FloorMap/FloorMapView.swift new file mode 100644 index 000000000..5a8f2dfe5 --- /dev/null +++ b/app-ios/Modules/Sources/FloorMap/FloorMapView.swift @@ -0,0 +1,13 @@ +import SwiftUI + +public struct FloorMapView: View { + public init() {} + + public var body: some View { + Text("Floor Map") + } +} + +// #Preview { +// FloorMapView() +// } diff --git a/app-ios/Modules/Sources/FloorMap/FloorMapViewModel.swift b/app-ios/Modules/Sources/FloorMap/FloorMapViewModel.swift new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/app-ios/Modules/Sources/FloorMap/FloorMapViewModel.swift @@ -0,0 +1 @@ + diff --git a/app-ios/Modules/Sources/Navigation/RootView.swift b/app-ios/Modules/Sources/Navigation/RootView.swift index 639e379dd..53f714084 100644 --- a/app-ios/Modules/Sources/Navigation/RootView.swift +++ b/app-ios/Modules/Sources/Navigation/RootView.swift @@ -1,9 +1,15 @@ +import About +import FloorMap import Session +import Stamps import SwiftUI import Timetable enum Tab { case timeline + case floorMap + case stamps + case about } public struct RootView: View { @@ -22,12 +28,25 @@ public struct RootView: View { .tabItem { Label("Timeline", systemImage: "circle") } + FloorMapView() + .tag(Tab.floorMap) + .tabItem { + Label("FloorMap", systemImage: "circle") + } + StampsView() + .tag(Tab.stamps) + .tabItem { + Label("Stamps", systemImage: "circle") + } + AboutView() + .tag(Tab.about) + .tabItem { + Label("About", systemImage: "circle") + } } } } -struct RootView_Previews: PreviewProvider { - static var previews: some View { - RootView() - } -} +// #Preview { +// RootView() +// } diff --git a/app-ios/Modules/Sources/Stamps/StampsView.swift b/app-ios/Modules/Sources/Stamps/StampsView.swift new file mode 100644 index 000000000..0c3231261 --- /dev/null +++ b/app-ios/Modules/Sources/Stamps/StampsView.swift @@ -0,0 +1,12 @@ +import SwiftUI + +public struct StampsView: View { + public init() {} + public var body: some View { + Text("Stamps View") + } +} + +// #Preview { +// StampsView() +// } diff --git a/app-ios/Modules/Sources/Stamps/StampsViewModel.swift b/app-ios/Modules/Sources/Stamps/StampsViewModel.swift new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/app-ios/Modules/Sources/Stamps/StampsViewModel.swift @@ -0,0 +1 @@ + diff --git a/app-ios/Modules/Tests/AboutTests/AboutTests.swift b/app-ios/Modules/Tests/AboutTests/AboutTests.swift new file mode 100644 index 000000000..036ced72d --- /dev/null +++ b/app-ios/Modules/Tests/AboutTests/AboutTests.swift @@ -0,0 +1,11 @@ +@testable import About +import XCTest + +final class AboutTests: XCTestCase { + func testExample() throws { + // This is an example of a functional test case. + // Use XCTAssert and related functions to verify your tests produce the correct + // results. + XCTAssertEqual(Core().text, "Hello, World!") + } +} diff --git a/app-ios/Modules/Tests/FloorMapTests/FloorMapTests.swift b/app-ios/Modules/Tests/FloorMapTests/FloorMapTests.swift new file mode 100644 index 000000000..af953d9fd --- /dev/null +++ b/app-ios/Modules/Tests/FloorMapTests/FloorMapTests.swift @@ -0,0 +1,7 @@ +@testable import FloorMap +import XCTest + +final class FloorMapTests: XCTestCase { + func testExample() throws { + } +} diff --git a/app-ios/Modules/Tests/StampsTests/StampsTests.swift b/app-ios/Modules/Tests/StampsTests/StampsTests.swift new file mode 100644 index 000000000..1d8a2be2d --- /dev/null +++ b/app-ios/Modules/Tests/StampsTests/StampsTests.swift @@ -0,0 +1,7 @@ +@testable import Stamps +import XCTest + +final class StampsTests: XCTestCase { + func testExample() throws { + } +}