diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 275b8e08d3..a6695ed53c 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -262,9 +262,11 @@ 4A300ED51C6DCFD400140018 /* countries-strings in Resources */ = {isa = PBXBuildFile; fileRef = 4A300ED31C6DCFD400140018 /* countries-strings */; }; 4B4153B52BF9695500EE4B02 /* MWMTextToSpeechTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B4153B42BF9695500EE4B02 /* MWMTextToSpeechTests.mm */; }; 5236A36F2C525A0A00E3A7AD /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5236A36E2C525A0A00E3A7AD /* HomeViewController.swift */; }; - 5236A3712C525A3400E3A7AD /* WelcomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5236A3702C525A3400E3A7AD /* WelcomeViewController.swift */; }; + 5236A3712C525A3400E3A7AD /* AuthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5236A3702C525A3400E3A7AD /* AuthViewController.swift */; }; 524634C62C53BC3100FDCABA /* Auth.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 524634C22C53BB3A00FDCABA /* Auth.storyboard */; }; 524634CD2C57232400FDCABA /* TourismMain.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 524634CC2C57232400FDCABA /* TourismMain.storyboard */; }; + 52E2D39D2C58E74100A8843A /* HomeScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52E2D39C2C58E74100A8843A /* HomeScreen.swift */; }; + 52E2D3A02C58E7A300A8843A /* WelcomeScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52E2D39F2C58E7A300A8843A /* WelcomeScreen.swift */; }; 6741A9421BF340DE002C974C /* sound-strings in Resources */ = {isa = PBXBuildFile; fileRef = 5605022E1B6211E100169CAD /* sound-strings */; }; 6741A9451BF340DE002C974C /* classificator.txt in Resources */ = {isa = PBXBuildFile; fileRef = EE026F0511D6AC0D00645242 /* classificator.txt */; }; 6741A9491BF340DE002C974C /* countries.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA46DA2B12D4166E00968C36 /* countries.txt */; }; @@ -1186,9 +1188,11 @@ 4A7D89C41B2EBF3B00AC843E /* resources-xxhdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xxhdpi_dark"; path = "../../data/resources-xxhdpi_dark"; sourceTree = ""; }; 4B4153B42BF9695500EE4B02 /* MWMTextToSpeechTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTextToSpeechTests.mm; sourceTree = ""; }; 5236A36E2C525A0A00E3A7AD /* HomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = ""; }; - 5236A3702C525A3400E3A7AD /* WelcomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeViewController.swift; sourceTree = ""; }; + 5236A3702C525A3400E3A7AD /* AuthViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthViewController.swift; sourceTree = ""; }; 524634C22C53BB3A00FDCABA /* Auth.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Auth.storyboard; sourceTree = ""; }; 524634CC2C57232400FDCABA /* TourismMain.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = TourismMain.storyboard; sourceTree = ""; }; + 52E2D39C2C58E74100A8843A /* HomeScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeScreen.swift; sourceTree = ""; }; + 52E2D39F2C58E7A300A8843A /* WelcomeScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeScreen.swift; sourceTree = ""; }; 5605022E1B6211E100169CAD /* sound-strings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "sound-strings"; path = "../../data/sound-strings"; sourceTree = ""; }; 6741AA5D1BF340DE002C974C /* Organic Maps (Debug).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Organic Maps (Debug).app"; sourceTree = BUILT_PRODUCTS_DIR; }; 6B15907026623AE500944BBA /* 00_NotoSansThai-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "00_NotoSansThai-Regular.ttf"; path = "../../data/00_NotoSansThai-Regular.ttf"; sourceTree = ""; }; @@ -2695,25 +2699,18 @@ sourceTree = ""; }; 5236A36C2C5258AC00E3A7AD /* Presentation */ = { - isa = PBXGroup; - children = ( - 5236A36D2C5258B700E3A7AD /* Screens */, - ); - path = Presentation; - sourceTree = ""; - }; - 5236A36D2C5258B700E3A7AD /* Screens */ = { isa = PBXGroup; children = ( 52B189982C53B9FD00B5B6F9 /* Auth */, 52B189972C53B9E900B5B6F9 /* Home */, ); - path = Screens; + path = Presentation; sourceTree = ""; }; 52B189972C53B9E900B5B6F9 /* Home */ = { isa = PBXGroup; children = ( + 52E2D39B2C58E72900A8843A /* Screens */, 5236A36E2C525A0A00E3A7AD /* HomeViewController.swift */, 524634CC2C57232400FDCABA /* TourismMain.storyboard */, ); @@ -2723,12 +2720,29 @@ 52B189982C53B9FD00B5B6F9 /* Auth */ = { isa = PBXGroup; children = ( - 5236A3702C525A3400E3A7AD /* WelcomeViewController.swift */, + 52E2D39E2C58E78700A8843A /* Screens */, + 5236A3702C525A3400E3A7AD /* AuthViewController.swift */, 524634C22C53BB3A00FDCABA /* Auth.storyboard */, ); path = Auth; sourceTree = ""; }; + 52E2D39B2C58E72900A8843A /* Screens */ = { + isa = PBXGroup; + children = ( + 52E2D39C2C58E74100A8843A /* HomeScreen.swift */, + ); + path = Screens; + sourceTree = ""; + }; + 52E2D39E2C58E78700A8843A /* Screens */ = { + isa = PBXGroup; + children = ( + 52E2D39F2C58E7A300A8843A /* WelcomeScreen.swift */, + ); + path = Screens; + sourceTree = ""; + }; 97B4E9271851DAB300BEC5D7 /* Custom Views */ = { isa = PBXGroup; children = ( @@ -4411,6 +4425,7 @@ F6E2FD561E097BA00083EBEC /* MWMMapDownloaderButtonTableViewCell.m in Sources */, 9901284F244732DB00C72B10 /* BottomTabBarPresenter.swift in Sources */, CDB4D5002231412900104869 /* MapTemplateBuilder.swift in Sources */, + 52E2D39D2C58E74100A8843A /* HomeScreen.swift in Sources */, 34AB66171FC5AA320078E451 /* MWMiPhoneRoutePreview.m in Sources */, 99A906EA23F6F7030005872B /* PlacePageInfoViewController.swift in Sources */, 993DF11723F6BDB100AC231A /* UINavigationBarRenderer.swift in Sources */, @@ -4490,7 +4505,7 @@ F6E2FD6B1E097BA00083EBEC /* MWMMapDownloaderSubplaceTableViewCell.m in Sources */, CDCA27842245090900167D87 /* ListenerContainer.swift in Sources */, 47E3C7252111E41B008B3B27 /* DimmedModalPresentationController.swift in Sources */, - 5236A3712C525A3400E3A7AD /* WelcomeViewController.swift in Sources */, + 5236A3712C525A3400E3A7AD /* AuthViewController.swift in Sources */, 3472B5CB200F43EF00DC6CD5 /* BackgroundFetchScheduler.swift in Sources */, 34FE5A6F1F18F30F00BCA729 /* TrafficButtonArea.swift in Sources */, 993DF10D23F6BDB100AC231A /* UIPageControlRenderer.swift in Sources */, @@ -4633,6 +4648,7 @@ 3444DFDE1F18A5AF00E73099 /* SideButtonsArea.swift in Sources */, CDCA278622451F5000167D87 /* RouteInfo.swift in Sources */, 3467CEB6202C6FA900D3C670 /* BMCNotificationsCell.swift in Sources */, + 52E2D3A02C58E7A300A8843A /* WelcomeScreen.swift in Sources */, 337F98B221D3BAE600C8AC27 /* SearchCategoriesViewController.swift in Sources */, F6E2FE0A1E097BA00083EBEC /* MWMOpeningHoursDeleteScheduleTableViewCell.mm in Sources */, 3454D7DA1E07F045004AF2AD /* UILabel+RuntimeAttributes.m in Sources */, diff --git a/iphone/Maps/Tourism/Presentation/Screens/Auth/Auth.storyboard b/iphone/Maps/Tourism/Presentation/Auth/Auth.storyboard similarity index 56% rename from iphone/Maps/Tourism/Presentation/Screens/Auth/Auth.storyboard rename to iphone/Maps/Tourism/Presentation/Auth/Auth.storyboard index aa0c4e23bd..0c1c98cc6d 100644 --- a/iphone/Maps/Tourism/Presentation/Screens/Auth/Auth.storyboard +++ b/iphone/Maps/Tourism/Presentation/Auth/Auth.storyboard @@ -9,40 +9,56 @@ - - - - - - - - - - - - - - - - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Tourism/Presentation/Auth/AuthViewController.swift b/iphone/Maps/Tourism/Presentation/Auth/AuthViewController.swift new file mode 100644 index 0000000000..e99c84f774 --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Auth/AuthViewController.swift @@ -0,0 +1,12 @@ +import UIKit +import SwiftUI + +class AuthViewController: UIViewController { + override func viewDidLoad() { + super.viewDidLoad() + } + + @IBSegueAction func embedSwiftUIView(_ coder: NSCoder) -> UIViewController? { + return UIHostingController(coder: coder, rootView: WelcomeScreen()) + } +} diff --git a/iphone/Maps/Tourism/Presentation/Auth/Screens/WelcomeScreen.swift b/iphone/Maps/Tourism/Presentation/Auth/Screens/WelcomeScreen.swift new file mode 100644 index 0000000000..38c6391a3e --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Auth/Screens/WelcomeScreen.swift @@ -0,0 +1,17 @@ +import SwiftUI + +struct WelcomeScreen: View { + var body: some View { + NavigationView{ + VStack { + Text("Welcome!") + } + } + } +} + +struct WelcomeScreen_Previews: PreviewProvider { + static var previews: some View { + WelcomeScreen() + } +} diff --git a/iphone/Maps/Tourism/Presentation/Home/HomeViewController.swift b/iphone/Maps/Tourism/Presentation/Home/HomeViewController.swift new file mode 100644 index 0000000000..944eee5507 --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Home/HomeViewController.swift @@ -0,0 +1,12 @@ +import UIKit +import SwiftUI + +class HomeViewController: UIViewController { + override func viewDidLoad() { + super.viewDidLoad() + } + + @IBSegueAction func embedSwiftUIView(_ coder: NSCoder) -> UIViewController? { + return UIHostingController(coder: coder, rootView: HomeScreen()) + } +} diff --git a/iphone/Maps/Tourism/Presentation/Home/Screens/HomeScreen.swift b/iphone/Maps/Tourism/Presentation/Home/Screens/HomeScreen.swift new file mode 100644 index 0000000000..47e237e70c --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Home/Screens/HomeScreen.swift @@ -0,0 +1,13 @@ +import SwiftUI + +struct HomeScreen: View { + var body: some View { + Text("Home!") + } +} + +struct HomeScreen_Previews: PreviewProvider { + static var previews: some View { + HomeScreen() + } +} diff --git a/iphone/Maps/Tourism/Presentation/Screens/Home/TourismMain.storyboard b/iphone/Maps/Tourism/Presentation/Home/TourismMain.storyboard similarity index 73% rename from iphone/Maps/Tourism/Presentation/Screens/Home/TourismMain.storyboard rename to iphone/Maps/Tourism/Presentation/Home/TourismMain.storyboard index 93a1a51cab..3d0d64bdb0 100644 --- a/iphone/Maps/Tourism/Presentation/Screens/Home/TourismMain.storyboard +++ b/iphone/Maps/Tourism/Presentation/Home/TourismMain.storyboard @@ -17,13 +17,13 @@ - + + + + + + + @@ -37,10 +37,9 @@ - + - @@ -52,6 +51,14 @@ + + + + + + + + diff --git a/iphone/Maps/Tourism/Presentation/Screens/Auth/WelcomeViewController.swift b/iphone/Maps/Tourism/Presentation/Screens/Auth/WelcomeViewController.swift deleted file mode 100644 index dcff6a562f..0000000000 --- a/iphone/Maps/Tourism/Presentation/Screens/Auth/WelcomeViewController.swift +++ /dev/null @@ -1,30 +0,0 @@ -// -// AnotherViewController.swift -// OMaps -// -// Created by Macbook Pro on 25/07/24. -// Copyright © 2024 Organic Maps. All rights reserved. -// - -import UIKit - -class AnotherViewController: UIViewController { - - override func viewDidLoad() { - super.viewDidLoad() - - // Do any additional setup after loading the view. - } - - - /* - // MARK: - Navigation - - // In a storyboard-based application, you will often want to do a little preparation before navigation - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - // Get the new view controller using segue.destination. - // Pass the selected object to the new view controller. - } - */ - -} diff --git a/iphone/Maps/Tourism/Presentation/Screens/Home/HomeViewController.swift b/iphone/Maps/Tourism/Presentation/Screens/Home/HomeViewController.swift deleted file mode 100644 index 4cd40fea44..0000000000 --- a/iphone/Maps/Tourism/Presentation/Screens/Home/HomeViewController.swift +++ /dev/null @@ -1,30 +0,0 @@ -// -// TourismViewController.swift -// OMaps -// -// Created by Macbook Pro on 25/07/24. -// Copyright © 2024 Organic Maps. All rights reserved. -// - -import UIKit - -class HomeViewController: UIViewController { - - override func viewDidLoad() { - super.viewDidLoad() - - // Do any additional setup after loading the view. - } - - - /* - // MARK: - Navigation - - // In a storyboard-based application, you will often want to do a little preparation before navigation - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - // Get the new view controller using segue.destination. - // Pass the selected object to the new view controller. - } - */ - -} diff --git a/iphone/Maps/UI/Storyboard/Main.storyboard b/iphone/Maps/UI/Storyboard/Main.storyboard index 2737ba4625..c4cc79649d 100644 --- a/iphone/Maps/UI/Storyboard/Main.storyboard +++ b/iphone/Maps/UI/Storyboard/Main.storyboard @@ -17,7 +17,7 @@ - + @@ -313,6 +313,7 @@ + @@ -1148,6 +1149,16 @@ + + + + + + + + + +