From 6be8ce19333e0902370242776ccee59356119554 Mon Sep 17 00:00:00 2001 From: LLC Rebus Date: Mon, 2 Sep 2024 09:34:15 +0500 Subject: [PATCH] backup --- .../Db/CurrencyPersistenceController.swift | 84 ++++++ .../CurrencyRates.xcdatamodel/contents | 6 + .../Data/Db/DataModels/PersonalData.swift | 9 + .../PersonalData.xcdatamodel/contents | 2 + .../Tourism/Data/Db/EntitiesMapping.swift | 5 + .../PersonalDataPersistenceController.swift | 9 + .../SingleEntityCoreDataController.swift | 72 +++++ .../Network/DTO/Auth/SignUpRequestDTO.swift | 9 + .../DTO/Profile/CurrencyRatesDTO.swift | 9 + .../Network/DTO/Profile/PersonalDataDTO.swift | 9 + .../Network/Services/CurrencyService.swift | 13 + .../Network/Services/ProfileService.swift | 12 + .../CombineNetworkHelper.swift | 33 +-- .../Tourism/Data/Prefs/UserPreferences.swift | 9 + .../Repositories/CurrencyRepositoryImpl.swift | 9 + .../Repositories/ProfileRepositoryImpl.swift | 9 + ...NetworkError.swift => ResourceError.swift} | 5 +- .../Models/Currency/CurrencyRates.swift | 9 + .../Domain/Models/Profile/CurrencyRates.swift | 11 + .../Domain/Models/Profile/PersonalData.swift | 11 + .../Models/Profile/PersonalDataToSend.swift | 9 + .../Domain/Models/SimpleResponse.swift | 9 + .../Repositories/CurrencyRepository.swift | 9 + .../Repositories/ProfileRepository.swift | 9 + .../Components/Buttons/PrimaryButton.swift | 9 + .../Components/Buttons/SecondaryButton.swift | 37 +++ .../Components/CountryAsLabel.swift | 9 + .../Presentation/Components/LoadImg.swift | 9 + .../Components/Nav/AppBackButton.swift | 15 + .../Components/Nav/AppTopBar.swift | 9 + .../Components/Nav/BackButtonWithText.swift | 19 ++ .../{ => New Group}/AppButton.swift | 4 +- .../Components/PhotoPickerView.swift | 9 + .../Presentation/Components/Spacers.swift | 9 + .../Extensions/UIScreenExtensions.swift | 5 + .../Home/Screens/HomeScreen.swift | 14 + .../Home/Screens/HomeViewController.swift | 40 --- .../New Group/HomeViewController.swift | 20 ++ .../Home/Screens/Profile/AppTextField.swift | 9 + .../Profile/PersonalDataViewController.swift | 9 + .../Profile/ProfileViewController.swift | 264 ++++++++++++++++++ .../Screens/Profile/ProfileViewModel.swift | 126 +++++++++ .../Presentation/Home/TabBarController.swift | 27 ++ .../Presentation/Home/ThemeViewMode.swift | 9 + .../Contents.json | 0 .../Tourism/Presentation/Theme/Font.swift | 124 +++++++- .../Presentation/Utils/changeTheme.swift | 9 + 47 files changed, 1085 insertions(+), 71 deletions(-) create mode 100644 iphone/Maps/Tourism/Data/Db/CurrencyPersistenceController.swift create mode 100644 iphone/Maps/Tourism/Data/Db/DataModels/Currency.xcdatamodeld/CurrencyRates.xcdatamodel/contents create mode 100644 iphone/Maps/Tourism/Data/Db/DataModels/PersonalData.swift create mode 100644 iphone/Maps/Tourism/Data/Db/DataModels/PersonalData.xcdatamodeld/PersonalData.xcdatamodel/contents create mode 100644 iphone/Maps/Tourism/Data/Db/EntitiesMapping.swift create mode 100644 iphone/Maps/Tourism/Data/Db/PersonalDataPersistenceController.swift create mode 100644 iphone/Maps/Tourism/Data/Db/Utils/SingleEntityCoreDataController.swift create mode 100644 iphone/Maps/Tourism/Data/Network/DTO/Auth/SignUpRequestDTO.swift create mode 100644 iphone/Maps/Tourism/Data/Network/DTO/Profile/CurrencyRatesDTO.swift create mode 100644 iphone/Maps/Tourism/Data/Network/DTO/Profile/PersonalDataDTO.swift create mode 100644 iphone/Maps/Tourism/Data/Network/Services/CurrencyService.swift create mode 100644 iphone/Maps/Tourism/Data/Network/Services/ProfileService.swift rename iphone/Maps/Tourism/Data/Network/{EminoFire => Utils}/CombineNetworkHelper.swift (75%) create mode 100644 iphone/Maps/Tourism/Data/Prefs/UserPreferences.swift create mode 100644 iphone/Maps/Tourism/Data/Repositories/CurrencyRepositoryImpl.swift create mode 100644 iphone/Maps/Tourism/Data/Repositories/ProfileRepositoryImpl.swift rename iphone/Maps/Tourism/Data/{Network/EminoFire/NetworkError.swift => ResourceError.swift} (78%) create mode 100644 iphone/Maps/Tourism/Domain/Models/Currency/CurrencyRates.swift create mode 100644 iphone/Maps/Tourism/Domain/Models/Profile/CurrencyRates.swift create mode 100644 iphone/Maps/Tourism/Domain/Models/Profile/PersonalData.swift create mode 100644 iphone/Maps/Tourism/Domain/Models/Profile/PersonalDataToSend.swift create mode 100644 iphone/Maps/Tourism/Domain/Models/SimpleResponse.swift create mode 100644 iphone/Maps/Tourism/Domain/Repositories/CurrencyRepository.swift create mode 100644 iphone/Maps/Tourism/Domain/Repositories/ProfileRepository.swift create mode 100644 iphone/Maps/Tourism/Presentation/Components/Buttons/PrimaryButton.swift create mode 100644 iphone/Maps/Tourism/Presentation/Components/Buttons/SecondaryButton.swift create mode 100644 iphone/Maps/Tourism/Presentation/Components/CountryAsLabel.swift create mode 100644 iphone/Maps/Tourism/Presentation/Components/LoadImg.swift create mode 100644 iphone/Maps/Tourism/Presentation/Components/Nav/AppBackButton.swift create mode 100644 iphone/Maps/Tourism/Presentation/Components/Nav/AppTopBar.swift create mode 100644 iphone/Maps/Tourism/Presentation/Components/Nav/BackButtonWithText.swift rename iphone/Maps/Tourism/Presentation/Components/{ => New Group}/AppButton.swift (96%) create mode 100644 iphone/Maps/Tourism/Presentation/Components/PhotoPickerView.swift create mode 100644 iphone/Maps/Tourism/Presentation/Components/Spacers.swift create mode 100644 iphone/Maps/Tourism/Presentation/Extensions/UIScreenExtensions.swift create mode 100644 iphone/Maps/Tourism/Presentation/Home/Screens/HomeScreen.swift delete mode 100644 iphone/Maps/Tourism/Presentation/Home/Screens/HomeViewController.swift create mode 100644 iphone/Maps/Tourism/Presentation/Home/Screens/New Group/HomeViewController.swift create mode 100644 iphone/Maps/Tourism/Presentation/Home/Screens/Profile/AppTextField.swift create mode 100644 iphone/Maps/Tourism/Presentation/Home/Screens/Profile/PersonalDataViewController.swift create mode 100644 iphone/Maps/Tourism/Presentation/Home/Screens/Profile/ProfileViewController.swift create mode 100644 iphone/Maps/Tourism/Presentation/Home/Screens/Profile/ProfileViewModel.swift create mode 100644 iphone/Maps/Tourism/Presentation/Home/TabBarController.swift create mode 100644 iphone/Maps/Tourism/Presentation/Home/ThemeViewMode.swift rename iphone/Maps/Tourism/Presentation/Theme/Colors.xcassets/{OnSuface.colorset => OnSurface.colorset}/Contents.json (100%) create mode 100644 iphone/Maps/Tourism/Presentation/Utils/changeTheme.swift diff --git a/iphone/Maps/Tourism/Data/Db/CurrencyPersistenceController.swift b/iphone/Maps/Tourism/Data/Db/CurrencyPersistenceController.swift new file mode 100644 index 0000000000..c1a54bcbb4 --- /dev/null +++ b/iphone/Maps/Tourism/Data/Db/CurrencyPersistenceController.swift @@ -0,0 +1,84 @@ +import CoreData +import Combine + +class CurrencyPersistenceController: NSObject { + static let shared = CurrencyPersistenceController() + + let container: NSPersistentContainer + + private var currencyRatesSubject = PassthroughSubject() + + private override init() { + container = NSPersistentContainer(name: "Currency") + super.init() + container.loadPersistentStores { (description, error) in + if let error = error { + fatalError("Failed to load Core Data stack: \(error)") + } + } + } + + var context: NSManagedObjectContext { + return container.viewContext + } + + func observeCurrencyRates() -> AnyPublisher { + // Use NSFetchedResultsController to observe changes + let fetchRequest: NSFetchRequest = CurrencyRatesEntity.fetchRequest() + + let fetchedResultsController = NSFetchedResultsController( + fetchRequest: fetchRequest, + managedObjectContext: context, + sectionNameKeyPath: nil, + cacheName: nil + ) + + fetchedResultsController.delegate = self + + do { + try fetchedResultsController.performFetch() + if let fetchedEntity = fetchedResultsController.fetchedObjects?.first { + currencyRatesSubject.send(fetchedEntity) + } else { + debugPrint("No data") + currencyRatesSubject.send(completion: .failure(ResourceError.cacheError)) + } + } catch { + debugPrint("Failed to fetch initial data: \(error)") + currencyRatesSubject.send(completion: .failure(ResourceError.cacheError)) + } + + return currencyRatesSubject.eraseToAnyPublisher() + } + + func updateCurrencyRates(entity: CurrencyRates) -> AnyPublisher { + Future { promise in + let fetchRequest: NSFetchRequest = CurrencyRatesEntity.fetchRequest() + do { + let entityToUpdate = try self.context.fetch(fetchRequest).first ?? CurrencyRatesEntity(context: self.context) + entityToUpdate.usd = entity.usd + entityToUpdate.eur = entity.eur + entityToUpdate.rub = entity.rub + try self.context.save() + + promise(.success(())) + } catch { + promise(.failure(ResourceError.cacheError)) + } + } + .eraseToAnyPublisher() + } +} + +extension CurrencyPersistenceController: NSFetchedResultsControllerDelegate { + func controllerDidChangeContent(_ controller: NSFetchedResultsController) { + guard let fetchedObjects = controller.fetchedObjects as? [CurrencyRatesEntity], + let updatedEntity = fetchedObjects.first else { + currencyRatesSubject.send(nil) + return + } + + // Emit the updated entity through the Combine subject + currencyRatesSubject.send(updatedEntity) + } +} diff --git a/iphone/Maps/Tourism/Data/Db/DataModels/Currency.xcdatamodeld/CurrencyRates.xcdatamodel/contents b/iphone/Maps/Tourism/Data/Db/DataModels/Currency.xcdatamodeld/CurrencyRates.xcdatamodel/contents new file mode 100644 index 0000000000..d8ca9f3f81 --- /dev/null +++ b/iphone/Maps/Tourism/Data/Db/DataModels/Currency.xcdatamodeld/CurrencyRates.xcdatamodel/contents @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/iphone/Maps/Tourism/Data/Db/DataModels/PersonalData.swift b/iphone/Maps/Tourism/Data/Db/DataModels/PersonalData.swift new file mode 100644 index 0000000000..e92d715f59 --- /dev/null +++ b/iphone/Maps/Tourism/Data/Db/DataModels/PersonalData.swift @@ -0,0 +1,9 @@ +// +// PersonalData.swift +// OMaps +// +// Created by LLC Rebus on 26/08/24. +// Copyright © 2024 Organic Maps. All rights reserved. +// + +import Foundation diff --git a/iphone/Maps/Tourism/Data/Db/DataModels/PersonalData.xcdatamodeld/PersonalData.xcdatamodel/contents b/iphone/Maps/Tourism/Data/Db/DataModels/PersonalData.xcdatamodeld/PersonalData.xcdatamodel/contents new file mode 100644 index 0000000000..660e645131 --- /dev/null +++ b/iphone/Maps/Tourism/Data/Db/DataModels/PersonalData.xcdatamodeld/PersonalData.xcdatamodel/contents @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/iphone/Maps/Tourism/Data/Db/EntitiesMapping.swift b/iphone/Maps/Tourism/Data/Db/EntitiesMapping.swift new file mode 100644 index 0000000000..ff0cba9a94 --- /dev/null +++ b/iphone/Maps/Tourism/Data/Db/EntitiesMapping.swift @@ -0,0 +1,5 @@ +extension CurrencyRatesEntity { + func toCurrencyRates() -> CurrencyRates { + return CurrencyRates(usd: usd, eur: eur, rub: rub) + } +} diff --git a/iphone/Maps/Tourism/Data/Db/PersonalDataPersistenceController.swift b/iphone/Maps/Tourism/Data/Db/PersonalDataPersistenceController.swift new file mode 100644 index 0000000000..1e2b8ef38c --- /dev/null +++ b/iphone/Maps/Tourism/Data/Db/PersonalDataPersistenceController.swift @@ -0,0 +1,9 @@ +// +// PersonalDataPersistenceController.swift +// OMaps +// +// Created by LLC Rebus on 26/08/24. +// Copyright © 2024 Organic Maps. All rights reserved. +// + +import Foundation diff --git a/iphone/Maps/Tourism/Data/Db/Utils/SingleEntityCoreDataController.swift b/iphone/Maps/Tourism/Data/Db/Utils/SingleEntityCoreDataController.swift new file mode 100644 index 0000000000..a94b2cdcf7 --- /dev/null +++ b/iphone/Maps/Tourism/Data/Db/Utils/SingleEntityCoreDataController.swift @@ -0,0 +1,72 @@ +import CoreData +import Combine + +class SingleEntityCoreDataController: NSObject, NSFetchedResultsControllerDelegate { + private let container: NSPersistentContainer + private var fetchedResultsController: NSFetchedResultsController? + var entitySubject = PassthroughSubject() + + init(modelName: String) { + container = NSPersistentContainer(name: modelName) + super.init() + container.loadPersistentStores { (description, error) in + if let error = error { + fatalError("Failed to load Core Data stack: \(error)") + } + } + } + + var context: NSManagedObjectContext { + return container.viewContext + } + + func observeEntity(fetchRequest: NSFetchRequest, sortDescriptor: NSSortDescriptor) { + fetchRequest.sortDescriptors = [sortDescriptor] + + fetchedResultsController = NSFetchedResultsController( + fetchRequest: fetchRequest, + managedObjectContext: context, + sectionNameKeyPath: nil, + cacheName: nil + ) + + fetchedResultsController?.delegate = self + + do { + try fetchedResultsController?.performFetch() + if let fetchedEntity = fetchedResultsController?.fetchedObjects?.first { + entitySubject.send(fetchedEntity) + } else { + entitySubject.send(nil) + } + } catch { + entitySubject.send(completion: .failure(ResourceError.cacheError)) + } + } + + func updateEntity(updateBlock: @escaping (Entity) -> Void, fetchRequest: NSFetchRequest) -> AnyPublisher { + Future { promise in + do { + let entityToUpdate = try self.context.fetch(fetchRequest).first ?? Entity(context: self.context) + updateBlock(entityToUpdate) + try self.context.save() + + promise(.success(())) + } catch { + promise(.failure(ResourceError.cacheError)) + } + } + .eraseToAnyPublisher() + } + + + // NSFetchedResultsControllerDelegate + func controllerDidChangeContent(_ controller: NSFetchedResultsController) { + guard let fetchedObjects = controller.fetchedObjects as? [Entity], + let updatedEntity = fetchedObjects.first else { + entitySubject.send(completion: .failure(ResourceError.cacheError)) + return + } + entitySubject.send(updatedEntity) + } +} diff --git a/iphone/Maps/Tourism/Data/Network/DTO/Auth/SignUpRequestDTO.swift b/iphone/Maps/Tourism/Data/Network/DTO/Auth/SignUpRequestDTO.swift new file mode 100644 index 0000000000..0595b7300f --- /dev/null +++ b/iphone/Maps/Tourism/Data/Network/DTO/Auth/SignUpRequestDTO.swift @@ -0,0 +1,9 @@ +// +// SignUpRequestDTO.swift +// OMaps +// +// Created by Macbook Pro on 18/08/24. +// Copyright © 2024 Organic Maps. All rights reserved. +// + +import Foundation diff --git a/iphone/Maps/Tourism/Data/Network/DTO/Profile/CurrencyRatesDTO.swift b/iphone/Maps/Tourism/Data/Network/DTO/Profile/CurrencyRatesDTO.swift new file mode 100644 index 0000000000..ddcb70bd05 --- /dev/null +++ b/iphone/Maps/Tourism/Data/Network/DTO/Profile/CurrencyRatesDTO.swift @@ -0,0 +1,9 @@ +// +// CurrencyRatesDTO.swift +// OMaps +// +// Created by Macbook Pro on 19/08/24. +// Copyright © 2024 Organic Maps. All rights reserved. +// + +import Foundation diff --git a/iphone/Maps/Tourism/Data/Network/DTO/Profile/PersonalDataDTO.swift b/iphone/Maps/Tourism/Data/Network/DTO/Profile/PersonalDataDTO.swift new file mode 100644 index 0000000000..23b08adc17 --- /dev/null +++ b/iphone/Maps/Tourism/Data/Network/DTO/Profile/PersonalDataDTO.swift @@ -0,0 +1,9 @@ +// +// PersonalDataDTO.swift +// OMaps +// +// Created by Macbook Pro on 19/08/24. +// Copyright © 2024 Organic Maps. All rights reserved. +// + +import Foundation diff --git a/iphone/Maps/Tourism/Data/Network/Services/CurrencyService.swift b/iphone/Maps/Tourism/Data/Network/Services/CurrencyService.swift new file mode 100644 index 0000000000..e2258cb237 --- /dev/null +++ b/iphone/Maps/Tourism/Data/Network/Services/CurrencyService.swift @@ -0,0 +1,13 @@ +import Combine +import Foundation + +protocol CurrencyService { + func getCurrencyRates() -> AnyPublisher +} + +class CurrencyServiceImpl: CurrencyService { + + func getCurrencyRates() -> AnyPublisher { + return CombineNetworkHelper.get(path: APIEndpoints.currencyUrl) + } +} diff --git a/iphone/Maps/Tourism/Data/Network/Services/ProfileService.swift b/iphone/Maps/Tourism/Data/Network/Services/ProfileService.swift new file mode 100644 index 0000000000..c2ea34132e --- /dev/null +++ b/iphone/Maps/Tourism/Data/Network/Services/ProfileService.swift @@ -0,0 +1,12 @@ +import Combine + +protocol ProfileService { + func getPersonalData() -> AnyPublisher +} + +class PersonalDataServiceImpl: ProfileService { + + func getPersonalData() -> AnyPublisher { + return CombineNetworkHelper.get(path: APIEndpoints.getUserUrl) + } +} diff --git a/iphone/Maps/Tourism/Data/Network/EminoFire/CombineNetworkHelper.swift b/iphone/Maps/Tourism/Data/Network/Utils/CombineNetworkHelper.swift similarity index 75% rename from iphone/Maps/Tourism/Data/Network/EminoFire/CombineNetworkHelper.swift rename to iphone/Maps/Tourism/Data/Network/Utils/CombineNetworkHelper.swift index 45316805de..6715f922c4 100644 --- a/iphone/Maps/Tourism/Data/Network/EminoFire/CombineNetworkHelper.swift +++ b/iphone/Maps/Tourism/Data/Network/Utils/CombineNetworkHelper.swift @@ -1,11 +1,11 @@ import Foundation import Combine -// EminoFire is kinda "library" for the abstraction of http code. -// It is named after the inventor of this piece Emin +// EminoFire is a kind of "library" for the abstraction of http code. +// It is named after the inventor of this piece - Emin class CombineNetworkHelper { - + // MARK: - Lower level code static func createRequest(url: URL, method: String, headers: [String: String] = [:], body: Data? = nil) -> URLRequest { var request = URLRequest(url: url) request.httpMethod = method @@ -34,7 +34,7 @@ class CombineNetworkHelper { static func handleResponse(data: Data, response: URLResponse, decoder: JSONDecoder = JSONDecoder()) throws -> T { guard let httpResponse = response as? HTTPURLResponse else { - throw NetworkError.other(message: "Network request error") + throw ResourceError.other(message: "Network request error") } debugPrint("Status Code: \(httpResponse.statusCode)") @@ -44,24 +44,24 @@ class CombineNetworkHelper { return try decodeResponse(data: data, as: T.self) case 422: let decodedResponse = try decodeResponse(data: data, as: ErrorResponse.self) - throw NetworkError.errorToUser(message: decodedResponse.message) + throw ResourceError.errorToUser(message: decodedResponse.message) case 500...599: - throw NetworkError.serverError(message: "Server Error: \(httpResponse.statusCode)") + throw ResourceError.serverError(message: "Server Error: \(httpResponse.statusCode)") default: - throw NetworkError.other(message: "Unknown error") + throw ResourceError.other(message: "Unknown error") } } - static func handleMappingError(_ error: Error) -> NetworkError { + static func handleMappingError(_ error: Error) -> ResourceError { debugPrint("Mapping error: \(error)") - return error as? NetworkError ?? NetworkError.other(message: "\(error)") + return error as? ResourceError ?? ResourceError.other(message: "\(error)") } static func performRequest(url: URL, method: String, body: Data? = nil, headers: [String: String] = [:], - decoder: JSONDecoder = JSONDecoder()) -> AnyPublisher { + decoder: JSONDecoder = JSONDecoder()) -> AnyPublisher { let request = createRequest(url: url, method: method, headers: headers, body: body) return URLSession.shared.dataTaskPublisher(for: request) @@ -75,28 +75,29 @@ class CombineNetworkHelper { .eraseToAnyPublisher() } - static func get(url: URL, headers: [String: String] = [:], decoder: JSONDecoder = JSONDecoder()) -> AnyPublisher { + // MARK: - HTTP requests + static func get(url: URL, headers: [String: String] = [:], decoder: JSONDecoder = JSONDecoder()) -> AnyPublisher { return performRequest(url: url, method: "GET", headers: headers, decoder: decoder) } - static func post(path: String, body: U, headers: [String: String] = [:], decoder: JSONDecoder = JSONDecoder()) -> AnyPublisher { + static func post(path: String, body: U, headers: [String: String] = [:], decoder: JSONDecoder = JSONDecoder()) -> AnyPublisher { guard let url = URL(string: path) else { debugPrint("Invalid url") - return Fail(error: NetworkError.other(message: "Invalid url")).eraseToAnyPublisher() + return Fail(error: ResourceError.other(message: "Invalid url")).eraseToAnyPublisher() } do { let jsonData = try encodeRequestBody(body) return performRequest(url: url, method: "POST", body: jsonData, headers: headers, decoder: decoder) } catch { - return Fail(error: NetworkError.other(message: "Encoding error: \(error)")).eraseToAnyPublisher() + return Fail(error: ResourceError.other(message: "Encoding error: \(error)")).eraseToAnyPublisher() } } - static func postWithoutBody(path: String, headers: [String: String] = [:], decoder: JSONDecoder = JSONDecoder()) -> AnyPublisher { + static func postWithoutBody(path: String, headers: [String: String] = [:], decoder: JSONDecoder = JSONDecoder()) -> AnyPublisher { guard let url = URL(string: path) else { debugPrint("Invalid url") - return Fail(error: NetworkError.other(message: "Invalid url")).eraseToAnyPublisher() + return Fail(error: ResourceError.other(message: "Invalid url")).eraseToAnyPublisher() } return performRequest(url: url, method: "POST", headers: headers, decoder: decoder) diff --git a/iphone/Maps/Tourism/Data/Prefs/UserPreferences.swift b/iphone/Maps/Tourism/Data/Prefs/UserPreferences.swift new file mode 100644 index 0000000000..116b2a5de8 --- /dev/null +++ b/iphone/Maps/Tourism/Data/Prefs/UserPreferences.swift @@ -0,0 +1,9 @@ +// +// UserPreferences.swift +// OMaps +// +// Created by Macbook Pro on 14/08/24. +// Copyright © 2024 Organic Maps. All rights reserved. +// + +import Foundation diff --git a/iphone/Maps/Tourism/Data/Repositories/CurrencyRepositoryImpl.swift b/iphone/Maps/Tourism/Data/Repositories/CurrencyRepositoryImpl.swift new file mode 100644 index 0000000000..42244cbe7d --- /dev/null +++ b/iphone/Maps/Tourism/Data/Repositories/CurrencyRepositoryImpl.swift @@ -0,0 +1,9 @@ +// +// CurrencyRepositoryImpl.swift +// OMaps +// +// Created by Macbook Pro on 19/08/24. +// Copyright © 2024 Organic Maps. All rights reserved. +// + +import Foundation diff --git a/iphone/Maps/Tourism/Data/Repositories/ProfileRepositoryImpl.swift b/iphone/Maps/Tourism/Data/Repositories/ProfileRepositoryImpl.swift new file mode 100644 index 0000000000..dafd45de55 --- /dev/null +++ b/iphone/Maps/Tourism/Data/Repositories/ProfileRepositoryImpl.swift @@ -0,0 +1,9 @@ +// +// ProfileRepositoryImpl.swift +// OMaps +// +// Created by LLC Rebus on 26/08/24. +// Copyright © 2024 Organic Maps. All rights reserved. +// + +import Foundation diff --git a/iphone/Maps/Tourism/Data/Network/EminoFire/NetworkError.swift b/iphone/Maps/Tourism/Data/ResourceError.swift similarity index 78% rename from iphone/Maps/Tourism/Data/Network/EminoFire/NetworkError.swift rename to iphone/Maps/Tourism/Data/ResourceError.swift index b55c385137..5dac7f9235 100644 --- a/iphone/Maps/Tourism/Data/Network/EminoFire/NetworkError.swift +++ b/iphone/Maps/Tourism/Data/ResourceError.swift @@ -1,7 +1,8 @@ import Foundation -enum NetworkError: LocalizedError { +enum ResourceError: Error { case serverError(message: String) + case cacheError case other(message: String) case errorToUser(message: String) @@ -9,6 +10,8 @@ enum NetworkError: LocalizedError { switch self { case .serverError: return L("server_error") + case .cacheError: + return L("cache_error") case .other: return L("smth_went_wrong") case .errorToUser(let message): diff --git a/iphone/Maps/Tourism/Domain/Models/Currency/CurrencyRates.swift b/iphone/Maps/Tourism/Domain/Models/Currency/CurrencyRates.swift new file mode 100644 index 0000000000..b5a7db5ad7 --- /dev/null +++ b/iphone/Maps/Tourism/Domain/Models/Currency/CurrencyRates.swift @@ -0,0 +1,9 @@ +// +// CurrencyRates.swift +// OMaps +// +// Created by Macbook Pro on 19/08/24. +// Copyright © 2024 Organic Maps. All rights reserved. +// + +import Foundation diff --git a/iphone/Maps/Tourism/Domain/Models/Profile/CurrencyRates.swift b/iphone/Maps/Tourism/Domain/Models/Profile/CurrencyRates.swift new file mode 100644 index 0000000000..1ac8e853f7 --- /dev/null +++ b/iphone/Maps/Tourism/Domain/Models/Profile/CurrencyRates.swift @@ -0,0 +1,11 @@ +import Foundation + +struct PersonalData: Identifiable { + let id: Int64 + let fullName: String + let country: String + let pfpUrl: String? + let email: String + let language: String? + let theme: String? +} diff --git a/iphone/Maps/Tourism/Domain/Models/Profile/PersonalData.swift b/iphone/Maps/Tourism/Domain/Models/Profile/PersonalData.swift new file mode 100644 index 0000000000..1ac8e853f7 --- /dev/null +++ b/iphone/Maps/Tourism/Domain/Models/Profile/PersonalData.swift @@ -0,0 +1,11 @@ +import Foundation + +struct PersonalData: Identifiable { + let id: Int64 + let fullName: String + let country: String + let pfpUrl: String? + let email: String + let language: String? + let theme: String? +} diff --git a/iphone/Maps/Tourism/Domain/Models/Profile/PersonalDataToSend.swift b/iphone/Maps/Tourism/Domain/Models/Profile/PersonalDataToSend.swift new file mode 100644 index 0000000000..42e11e5276 --- /dev/null +++ b/iphone/Maps/Tourism/Domain/Models/Profile/PersonalDataToSend.swift @@ -0,0 +1,9 @@ +// +// PersonalDataToSend.swift +// OMaps +// +// Created by LLC Rebus on 28/08/24. +// Copyright © 2024 Organic Maps. All rights reserved. +// + +import Foundation diff --git a/iphone/Maps/Tourism/Domain/Models/SimpleResponse.swift b/iphone/Maps/Tourism/Domain/Models/SimpleResponse.swift new file mode 100644 index 0000000000..ab389feaa5 --- /dev/null +++ b/iphone/Maps/Tourism/Domain/Models/SimpleResponse.swift @@ -0,0 +1,9 @@ +// +// SImpleResponse.swift +// OMaps +// +// Created by Macbook Pro on 18/08/24. +// Copyright © 2024 Organic Maps. All rights reserved. +// + +import Foundation diff --git a/iphone/Maps/Tourism/Domain/Repositories/CurrencyRepository.swift b/iphone/Maps/Tourism/Domain/Repositories/CurrencyRepository.swift new file mode 100644 index 0000000000..3b3e34cd16 --- /dev/null +++ b/iphone/Maps/Tourism/Domain/Repositories/CurrencyRepository.swift @@ -0,0 +1,9 @@ +// +// CurrencyRepository.swift +// OMaps +// +// Created by Macbook Pro on 16/08/24. +// Copyright © 2024 Organic Maps. All rights reserved. +// + +import Foundation diff --git a/iphone/Maps/Tourism/Domain/Repositories/ProfileRepository.swift b/iphone/Maps/Tourism/Domain/Repositories/ProfileRepository.swift new file mode 100644 index 0000000000..d9e0846b4f --- /dev/null +++ b/iphone/Maps/Tourism/Domain/Repositories/ProfileRepository.swift @@ -0,0 +1,9 @@ +// +// ProfileRepository.swift +// OMaps +// +// Created by Macbook Pro on 16/08/24. +// Copyright © 2024 Organic Maps. All rights reserved. +// + +import Foundation diff --git a/iphone/Maps/Tourism/Presentation/Components/Buttons/PrimaryButton.swift b/iphone/Maps/Tourism/Presentation/Components/Buttons/PrimaryButton.swift new file mode 100644 index 0000000000..6810daa3f9 --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Components/Buttons/PrimaryButton.swift @@ -0,0 +1,9 @@ +// +// PrimaryButton.swift +// OMaps +// +// Created by LLC Rebus on 27/08/24. +// Copyright © 2024 Organic Maps. All rights reserved. +// + +import Foundation diff --git a/iphone/Maps/Tourism/Presentation/Components/Buttons/SecondaryButton.swift b/iphone/Maps/Tourism/Presentation/Components/Buttons/SecondaryButton.swift new file mode 100644 index 0000000000..329e7e2c72 --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Components/Buttons/SecondaryButton.swift @@ -0,0 +1,37 @@ +import SwiftUI + +struct SecondaryButton: View { + var label: String + var loading: Bool = false + var icon: (() -> AnyView)? = nil + var onClick: () -> Void + + var body: some View { + Button(action: onClick) { + HStack { + if loading { + // Loading indicator (you can customize this part) + ProgressView() + .progressViewStyle(CircularProgressViewStyle()) + } else { + if let icon = icon { + icon() + .frame(width: 30, height: 30) + } + Text(label) + .font(.headline) + .fontWeight(.semibold) + .foregroundColor(Color.primary) + .padding() + } + } + .padding() + .background(Color.clear) + .overlay( + RoundedRectangle(cornerRadius: 16) + .stroke(Color.primary, lineWidth: 1) + ) + } + .padding() + } +} diff --git a/iphone/Maps/Tourism/Presentation/Components/CountryAsLabel.swift b/iphone/Maps/Tourism/Presentation/Components/CountryAsLabel.swift new file mode 100644 index 0000000000..8432f4ba4e --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Components/CountryAsLabel.swift @@ -0,0 +1,9 @@ +// +// CountryAsLabel.swift +// OMaps +// +// Created by LLC Rebus on 26/08/24. +// Copyright © 2024 Organic Maps. All rights reserved. +// + +import Foundation diff --git a/iphone/Maps/Tourism/Presentation/Components/LoadImg.swift b/iphone/Maps/Tourism/Presentation/Components/LoadImg.swift new file mode 100644 index 0000000000..631c33a204 --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Components/LoadImg.swift @@ -0,0 +1,9 @@ +// +// LoadImg.swift +// OMaps +// +// Created by Macbook Pro on 15/08/24. +// Copyright © 2024 Organic Maps. All rights reserved. +// + +import Foundation diff --git a/iphone/Maps/Tourism/Presentation/Components/Nav/AppBackButton.swift b/iphone/Maps/Tourism/Presentation/Components/Nav/AppBackButton.swift new file mode 100644 index 0000000000..7809abe12c --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Components/Nav/AppBackButton.swift @@ -0,0 +1,15 @@ +import SwiftUI + +struct AppBackButton: View { + var onBackClick: () -> Void + var tint: SwiftUI.Color = .primary + + var body: some View { + Button(action: onBackClick) { + Image(systemName: "chevron.left") + .resizable() + .frame(width: 24, height: 24) + .foregroundColor(tint) + } + } +} diff --git a/iphone/Maps/Tourism/Presentation/Components/Nav/AppTopBar.swift b/iphone/Maps/Tourism/Presentation/Components/Nav/AppTopBar.swift new file mode 100644 index 0000000000..7d74150738 --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Components/Nav/AppTopBar.swift @@ -0,0 +1,9 @@ +// +// AppTopBar.swift +// OMaps +// +// Created by Macbook Pro on 15/08/24. +// Copyright © 2024 Organic Maps. All rights reserved. +// + +import Foundation diff --git a/iphone/Maps/Tourism/Presentation/Components/Nav/BackButtonWithText.swift b/iphone/Maps/Tourism/Presentation/Components/Nav/BackButtonWithText.swift new file mode 100644 index 0000000000..da5f9d613b --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Components/Nav/BackButtonWithText.swift @@ -0,0 +1,19 @@ +import SwiftUI + +struct BackButtonWithText: View { + var onBackClick: () -> Void + + var body: some View { + Button(action: onBackClick) { + HStack { + Image(systemName: "chevron.left") + .resizable() + .frame(width: 16, height: 16) + Text("Back") + .font(.body) + } + .padding(.horizontal, 16) + .padding(.vertical, 8) + } + } +} diff --git a/iphone/Maps/Tourism/Presentation/Components/AppButton.swift b/iphone/Maps/Tourism/Presentation/Components/New Group/AppButton.swift similarity index 96% rename from iphone/Maps/Tourism/Presentation/Components/AppButton.swift rename to iphone/Maps/Tourism/Presentation/Components/New Group/AppButton.swift index f222c51895..cd0e8dcfc1 100644 --- a/iphone/Maps/Tourism/Presentation/Components/AppButton.swift +++ b/iphone/Maps/Tourism/Presentation/Components/New Group/AppButton.swift @@ -44,9 +44,9 @@ class AppButton: UIButton { // MARK: Styles private func setPrimaryAppearance() { setTitleColor(.white, for: .normal) - self.backgroundColor = Color.primary + self.backgroundColor = UIKitColor.primary if let lab = self.titleLabel { - Font.applyStyle(to: lab, style: Font.h4) + UIKitFont.applyStyle(to: lab, style: UIKitFont.h4) } layer.cornerRadius = 16 } diff --git a/iphone/Maps/Tourism/Presentation/Components/PhotoPickerView.swift b/iphone/Maps/Tourism/Presentation/Components/PhotoPickerView.swift new file mode 100644 index 0000000000..f69c835834 --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Components/PhotoPickerView.swift @@ -0,0 +1,9 @@ +// +// PhotoPickerView.swift +// OMaps +// +// Created by LLC Rebus on 27/08/24. +// Copyright © 2024 Organic Maps. All rights reserved. +// + +import Foundation diff --git a/iphone/Maps/Tourism/Presentation/Components/Spacers.swift b/iphone/Maps/Tourism/Presentation/Components/Spacers.swift new file mode 100644 index 0000000000..9ee24cf9ca --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Components/Spacers.swift @@ -0,0 +1,9 @@ +// +// Spacers.swift +// OMaps +// +// Created by LLC Rebus on 26/08/24. +// Copyright © 2024 Organic Maps. All rights reserved. +// + +import Foundation diff --git a/iphone/Maps/Tourism/Presentation/Extensions/UIScreenExtensions.swift b/iphone/Maps/Tourism/Presentation/Extensions/UIScreenExtensions.swift new file mode 100644 index 0000000000..3e539835d6 --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Extensions/UIScreenExtensions.swift @@ -0,0 +1,5 @@ +extension UIScreen{ + static let screenWidth = UIScreen.main.bounds.size.width + static let screenHeight = UIScreen.main.bounds.size.height + static let screenSize = UIScreen.main.bounds.size +} 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..08f01bc5d4 --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Home/Screens/HomeScreen.swift @@ -0,0 +1,14 @@ + +import SwiftUI + +struct HomeScreen: View { + var body: some View { + Text("Oh, Hi Mark!") + } +} + +struct HomeScreen_Previews: PreviewProvider { + static var previews: some View { + HomeScreen() + } +} diff --git a/iphone/Maps/Tourism/Presentation/Home/Screens/HomeViewController.swift b/iphone/Maps/Tourism/Presentation/Home/Screens/HomeViewController.swift deleted file mode 100644 index 519ec7c1a1..0000000000 --- a/iphone/Maps/Tourism/Presentation/Home/Screens/HomeViewController.swift +++ /dev/null @@ -1,40 +0,0 @@ -import UIKit - -class HomeViewController: UIViewController { - - private let label1: UILabel = { - let label = UILabel() - label.text = L("bookmark_list_description_hint") - label.textAlignment = .center - label.translatesAutoresizingMaskIntoConstraints = false - label.textColor = Color.primary - Font.applyStyle(to: label, style: Font.h1) - return label - }() - - private let label2: UILabel = { - let label = UILabel() - label.text = L("welcome_to_tjk") - label.textAlignment = .center - label.translatesAutoresizingMaskIntoConstraints = false - label.textColor = Color.onBackground - Font.applyStyle(to: label, style: Font.b1) - return label - }() - - override func viewDidLoad() { - super.viewDidLoad() - - view.backgroundColor = Color.background - - view.addSubview(label1) - view.addSubview(label2) - - NSLayoutConstraint.activate([ - label1.centerXAnchor.constraint(equalTo: view.centerXAnchor), - label1.centerYAnchor.constraint(equalTo: view.centerYAnchor), - label2.centerXAnchor.constraint(equalTo: view.centerXAnchor), - label2.topAnchor.constraint(equalTo: label1.bottomAnchor, constant: 20) - ]) - } -} diff --git a/iphone/Maps/Tourism/Presentation/Home/Screens/New Group/HomeViewController.swift b/iphone/Maps/Tourism/Presentation/Home/Screens/New Group/HomeViewController.swift new file mode 100644 index 0000000000..b705b22a73 --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Home/Screens/New Group/HomeViewController.swift @@ -0,0 +1,20 @@ +import SwiftUI + +class HomeViewController: UIViewController { + override func viewDidLoad() { + super.viewDidLoad() + + let hostingController = UIHostingController(rootView: HomeScreen()) + + addChild(hostingController) + hostingController.view.frame = view.frame + view.addSubview(hostingController.view) + hostingController.didMove(toParent: self) + } +} + +struct HomeScreen: View { + var body: some View { + Text("kdfal;ksjf") + } +} diff --git a/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/AppTextField.swift b/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/AppTextField.swift new file mode 100644 index 0000000000..44d1d7e190 --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/AppTextField.swift @@ -0,0 +1,9 @@ +// +// AppTextField.swift +// OMaps +// +// Created by LLC Rebus on 27/08/24. +// Copyright © 2024 Organic Maps. All rights reserved. +// + +import Foundation diff --git a/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/PersonalDataViewController.swift b/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/PersonalDataViewController.swift new file mode 100644 index 0000000000..d215dd9b25 --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/PersonalDataViewController.swift @@ -0,0 +1,9 @@ +// +// PersonalDataController.swift +// OMaps +// +// Created by LLC Rebus on 26/08/24. +// Copyright © 2024 Organic Maps. All rights reserved. +// + +import Foundation diff --git a/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/ProfileViewController.swift b/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/ProfileViewController.swift new file mode 100644 index 0000000000..337bcbf2b3 --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/ProfileViewController.swift @@ -0,0 +1,264 @@ +import UIKit +import SwiftUI + +class ProfileViewController: UIViewController { + override func viewDidLoad() { + super.viewDidLoad() + + integrateSwiftUIScreen(ProfileScreen()) + } +} + +struct ProfileScreen: View { + @ObservedObject var profileVM: ProfileViewModel = ProfileViewModel( + currencyRepository: CurrencyRepositoryImpl( + currencyService: CurrencyServiceImpl(), + currencyPersistenceController: CurrencyPersistenceController.shared + ), + profileRepository: ProfileRepositoryImpl( + personalDataService: PersonalDataServiceImpl(), + personalDataPersistenceController: PersonalDataPersistenceController.shared + ), + authRepository: AuthRepositoryImpl(authService: AuthServiceImpl()), + userPreferences: UserPreferences.shared + ) + + @ObservedObject var themeVM: ThemeViewModel = ThemeViewModel(userPreferences: UserPreferences.shared) + @State private var isSheetOpen = false + @State private var signOutLoading = false + + @State private var showToast = false + + func onPersonalDataClick() { + // TODO: cmon + } + + func onLanguageClick () { + navigateToLanguageSettings() + } + + var body: some View { + ScrollView { + VStack (alignment: .leading) { + AppTopBar(title: L("tourism_profile")) + Spacer().frame(height: 16) + + if let personalData = profileVM.personalData { + ProfileBar(personalData: personalData) + } + Spacer().frame(height: 32) + + if let currencyRates = profileVM.currencyRates { + CurrencyRatesView(currencyRates: currencyRates) + Spacer().frame(height: 20) + } + + GenericProfileItem( + label: L("personal_data"), + icon: "person.circle", + onClick: { + onPersonalDataClick() + } + ) + Spacer().frame(height: 20) + + GenericProfileItem( + label: L("language"), + icon: "globe", + onClick: { + onLanguageClick() + } + ) + Spacer().frame(height: 20) + ThemeSwitch(themeViewModel: themeVM) + Spacer().frame(height: 20) + + GenericProfileItem( + label: L("sign_out"), + icon: "rectangle.portrait.and.arrow.right", + isLoading: signOutLoading, + onClick: { + isSheetOpen = true + } + ) + } + .padding(16) + } + .overlay( + Group { + if showToast { + ToastView(message: "This is a toast message", isPresented: $showToast) + .padding(.bottom) + } + }, + alignment: .bottom + ) + .sheet(isPresented: $isSheetOpen) { + SignOutWarning( + onSignOutClick: { + signOutLoading = true + profileVM.signOut() + }, + onCancelClick: { + isSheetOpen = false + } + ) + } + } +} + +struct ProfileBar: View { + var personalData: PersonalData + + var body: some View { + HStack(alignment: .center) { + LoadImageView(url: personalData.pfpUrl) + .frame(width: 100, height: 100) + .clipShape(Circle()) + + Spacer().frame(width: 16) + + VStack(alignment: .leading) { + Text(personalData.fullName) + .textStyle(TextStyle.h2) + + UICountryAsLabelView(code: personalData.country) + .frame(height: 30) + } + } + } +} + + +struct CurrencyRatesView: View { + var currencyRates: CurrencyRates + + var body: some View { + HStack(spacing: 16) { + CurrencyRatesItem(countryCode: "US", flagEmoji: "🇺🇸", value: String(format: "%.2f", currencyRates.usd)) + CurrencyRatesItem(countryCode: "EU", flagEmoji: "🇪🇺", value: String(format: "%.2f", currencyRates.eur)) + CurrencyRatesItem(countryCode: "RU", flagEmoji: "🇷🇺", value: String(format: "%.2f", currencyRates.rub)) + } + .frame(maxWidth: .infinity, maxHeight: profileItemHeight) + .padding(16) + .overlay( + RoundedRectangle(cornerRadius: 20) + .stroke(Color.border, lineWidth: 2) + ) + .cornerRadius(20) + } +} + +struct CurrencyRatesItem: View { + var countryCode: String + var flagEmoji: String + var value: String + + var body: some View { + HStack { + Text(flagEmoji) + .font(.system(size: 33)) + + Text(value) + } + } +} + +struct GenericProfileItem: View { + var label: String + var icon: String + var isLoading: Bool = false + var onClick: () -> Void + + var body: some View { + HStack { + Text(label) + .textStyle(TextStyle.b1) + + Spacer() + + if isLoading { + ProgressView() + } else { + Image(systemName: icon) + .foregroundColor(Color.border) + } + } + .contentShape(Rectangle()) + .onTapGesture { + onClick() + } + .frame(height: profileItemHeight) + .padding() + .overlay( + RoundedRectangle(cornerRadius: 20) + .stroke(Color.border, lineWidth: 2) + ) + .cornerRadius(20) + } +} + +struct ThemeSwitch: View { + @Environment(\.colorScheme) var colorScheme + @ObservedObject var themeViewModel: ThemeViewModel + + var body: some View { + HStack { + Text("Dark Theme") + .textStyle(TextStyle.b1) + + Spacer() + + Toggle(isOn: Binding( + get: { + colorScheme == .dark + }, + set: { isDark in + let themeCode = isDark ? "dark" : "light" + themeViewModel.setTheme(themeCode: themeCode) + changeTheme(themeCode: themeCode) + themeViewModel.updateThemeOnServer(themeCode: themeCode) + } + )) { + Text("") + } + .labelsHidden() + .frame(height: 10) + } + .frame(height: profileItemHeight) + .padding() + .overlay( + RoundedRectangle(cornerRadius: 20) + .stroke(Color.border, lineWidth: 2) + ) + .cornerRadius(20) + } +} + +struct SignOutWarning: View { + var onSignOutClick: () -> Void + var onCancelClick: () -> Void + + var body: some View { + VStack(spacing: 16) { + Text("Are you sure you want to sign out?") + .font(.headline) + + HStack { + Button("Cancel", action: onCancelClick) + .padding() + .background(SwiftUI.Color.clear) + .cornerRadius(8) + + Button("Sign Out", action: onSignOutClick) + .padding() + .background(Color.heartRed) + .foregroundColor(Color.onBackground) + .cornerRadius(8) + } + } + .padding() + } +} + +let profileItemHeight: CGFloat = 25 diff --git a/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/ProfileViewModel.swift b/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/ProfileViewModel.swift new file mode 100644 index 0000000000..173294534f --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/ProfileViewModel.swift @@ -0,0 +1,126 @@ +import Foundation +import Combine +import SwiftUI + +class ProfileViewModel: ObservableObject { + private let currencyRepository: CurrencyRepository + private let profileRepository: ProfileRepository + private let authRepository: AuthRepository + private let userPreferences: UserPreferences + var onMessageToUserRequested: ((String) -> Void)? = nil + var onSignOutCompleted: (() -> Void)? = nil + + @Published var pfpFile: URL? = nil + @Published var fullName: String = "" + @Published var email: String = "" + @Published var countryCodeName: String? = nil + @Published var personalData: PersonalData? = nil + @Published var signOutResponse: SimpleResponse? = nil + @Published var currencyRates: CurrencyRates? = nil + + private var cancellables = Set() + + init( + currencyRepository: CurrencyRepository, + profileRepository: ProfileRepository, + authRepository: AuthRepository, + userPreferences: UserPreferences + ) { + self.currencyRepository = currencyRepository + self.profileRepository = profileRepository + self.authRepository = authRepository + self.userPreferences = userPreferences + // Automatically fetch data when initialized + getPersonalData() + getCurrency() + } + + // MARK: - Methods + + func setPfpFile(pfpFile: URL) { + self.pfpFile = pfpFile + } + + func setFullName(_ value: String) { + self.fullName = value + } + + func setEmail(_ value: String) { + self.email = value + } + + func setCountryCodeName(_ value: String?) { + self.countryCodeName = value + } + + func getPersonalData() { + profileRepository.personalDataPassThroughSubject + .sink { completion in + if case let .failure(error) = completion { + self.onMessageToUserRequested?(error.errorDescription) + } + } receiveValue: { resource in + self.personalData = resource + } + .store(in: &cancellables) + + profileRepository.getPersonalData() + } + + // func save() { + // guard case let .success(personalData) = personalDataResource else { return } + //1 + // profileRepository.updateProfile( + // fullName: fullName, + // country: countryCodeName ?? "", + // email: email != personalData.email ? email : nil, + // pfpUrl: pfpFile + // ) + // .sink { completion in + // if case let .failure(error) = completion { + // self.showToast(message: error.localizedDescription) + // } + // } receiveValue: { resource in + // if case let .success(personalData) = resource { + // self.updatePersonalDataInMemory(personalData: personalData) + // self.showToast(message: "Saved") + // } + // } + // .store(in: &cancellables) + // } + // + // private func updatePersonalDataInMemory(personalData: PersonalData) { + // self.fullName = personalData.fullName + // self.email = personalData.email + // self.countryCodeName = personalData.country + // } + + func getCurrency() { + currencyRepository.currencyPassThroughSubject + .sink { completion in + if case let .failure(error) = completion { + self.onMessageToUserRequested?(error.errorDescription) + } + } receiveValue: { resource in + self.currencyRates = resource + } + .store(in: &cancellables) + + currencyRepository.getCurrency() + } + + func signOut() { + authRepository.signOut() + .sink { completion in + if case let .failure(error) = completion { + self.onMessageToUserRequested?(error.errorDescription) + } + } receiveValue: { response in + self.signOutResponse = response + self.userPreferences.setToken(value: nil) + self.onSignOutCompleted?() + self.onMessageToUserRequested?(response.message) + } + .store(in: &cancellables) + } +} diff --git a/iphone/Maps/Tourism/Presentation/Home/TabBarController.swift b/iphone/Maps/Tourism/Presentation/Home/TabBarController.swift new file mode 100644 index 0000000000..96dce38c14 --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Home/TabBarController.swift @@ -0,0 +1,27 @@ +import UIKit +import SwiftUI + +class TabBarController: UITabBarController { + + override func viewDidLoad() { + super.viewDidLoad() + + let firstTab = UITabBarItem(title: L("home"), image: UIImage(systemName: "house"), selectedImage: UIImage(systemName: "house.fill")) + let secondTab = UITabBarItem(title: L("profile"), image: UIImage(systemName: "person"), selectedImage: UIImage(systemName: "person.fill")) + + let homeNav = UINavigationController() + let profileNav = UINavigationController() + + let homeVC = HomeViewController() + let profileVC = ProfileViewController() + + homeNav.viewControllers = [homeVC] + profileNav.viewControllers = [profileVC] + + homeNav.tabBarItem = firstTab + profileNav.tabBarItem = secondTab + + viewControllers = [homeNav, profileNav] + } +} + diff --git a/iphone/Maps/Tourism/Presentation/Home/ThemeViewMode.swift b/iphone/Maps/Tourism/Presentation/Home/ThemeViewMode.swift new file mode 100644 index 0000000000..3f77c7961f --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Home/ThemeViewMode.swift @@ -0,0 +1,9 @@ +// +// ThemeViewMode.swift +// OMaps +// +// Created by Macbook Pro on 15/08/24. +// Copyright © 2024 Organic Maps. All rights reserved. +// + +import Foundation diff --git a/iphone/Maps/Tourism/Presentation/Theme/Colors.xcassets/OnSuface.colorset/Contents.json b/iphone/Maps/Tourism/Presentation/Theme/Colors.xcassets/OnSurface.colorset/Contents.json similarity index 100% rename from iphone/Maps/Tourism/Presentation/Theme/Colors.xcassets/OnSuface.colorset/Contents.json rename to iphone/Maps/Tourism/Presentation/Theme/Colors.xcassets/OnSurface.colorset/Contents.json diff --git a/iphone/Maps/Tourism/Presentation/Theme/Font.swift b/iphone/Maps/Tourism/Presentation/Theme/Font.swift index fa069f5f73..01a665e2a7 100644 --- a/iphone/Maps/Tourism/Presentation/Theme/Font.swift +++ b/iphone/Maps/Tourism/Presentation/Theme/Font.swift @@ -1,4 +1,104 @@ -class Font { +import SwiftUI +// MARK: - used in SwiftUI +extension Font { + static func black(size: CGFloat) -> Font { + return Font.custom("Gilroy-Black", size: size) + } + + static func bold(size: CGFloat) -> Font { + return Font.custom("Gilroy-Bold", size: size) + } + + static func extraBold(size: CGFloat) -> Font { + return Font.custom("Gilroy-ExtraBold", size: size) + } + + static func heavy(size: CGFloat) -> Font { + return Font.custom("Gilroy-Heavy", size: size) + } + + static func light(size: CGFloat) -> Font { + return Font.custom("Gilroy-Light", size: size) + } + + static func medium(size: CGFloat) -> Font { + return Font.custom("Gilroy-Medium", size: size) + } + + static func regular(size: CGFloat) -> Font { + return Font.custom("Gilroy-Regular", size: size) + } + + static func semiBold(size: CGFloat) -> Font { + return Font.custom("Gilroy-SemiBold", size: size) + } + + static func thin(size: CGFloat) -> Font { + return Font.custom("Gilroy-Thin", size: size) + } + + static func ultraLight(size: CGFloat) -> Font { + return Font.custom("Gilroy-UltraLight", size: size) + } +} + +extension TextStyle { + static let genericStyle = TextStyle( + font: .regular(size: 16.0), + lineHeight: 18 + ) + + static let humongous = TextStyle( + font: .extraBold(size: 36.0), + lineHeight: 40 + ) + + static let h1 = TextStyle( + font: .semiBold(size: 32.0), + lineHeight: 36 + ) + + static let h2 = TextStyle( + font: .semiBold(size: 24.0), + lineHeight: 36 + ) + + static let h3 = TextStyle( + font: .semiBold(size: 20.0), + lineHeight: 22 + ) + + static let h4 = TextStyle( + font: .medium(size: 16.0), + lineHeight: 18 + ) + + static let b1 = TextStyle( + font: .regular(size: 14.0), + lineHeight: 16 + ) + + static let b2 = TextStyle( + font: .regular(size: 12.0), + lineHeight: 14 + ) + + static let b3 = TextStyle( + font: .regular(size: 10.0), + lineHeight: 12 + ) +} + + +struct TextStyle { + let font: Font + let lineHeight: CGFloat +} + + +// MARK: - used in UIKit + +class UIKitFont { // MARK: - Font by Weights class func black(size: CGFloat) -> UIFont { return getCustomFont(withName: "Gilroy-Black", size: size) @@ -41,47 +141,47 @@ class Font { } // MARK: - Font by Styles - static let genericStyle = TextStyle( + static let genericStyle = UIKitTextStyle( font: regular(size: 16.0), lineHeight: 18 ) - static let humongous = TextStyle( + static let humongous = UIKitTextStyle( font: extraBold(size: 36.0), lineHeight: 40 ) - static let h1 = TextStyle( + static let h1 = UIKitTextStyle( font: semiBold(size: 32.0), lineHeight: 36 ) - static let h2 = TextStyle( + static let h2 = UIKitTextStyle( font: semiBold(size: 24.0), lineHeight: 36 ) - static let h3 = TextStyle( + static let h3 = UIKitTextStyle( font: semiBold(size: 20.0), lineHeight: 22 ) - static let h4 = TextStyle( + static let h4 = UIKitTextStyle( font: medium(size: 16.0), lineHeight: 18 ) - static let b1 = TextStyle( + static let b1 = UIKitTextStyle( font: regular(size: 14.0), lineHeight: 16 ) - static let b2 = TextStyle( + static let b2 = UIKitTextStyle( font: regular(size: 12.0), lineHeight: 14 ) - static let b3 = TextStyle( + static let b3 = UIKitTextStyle( font: regular(size: 10.0), lineHeight: 12 ) @@ -94,7 +194,7 @@ class Font { return UIFont.systemFont(ofSize: size) } - static func applyStyle(to label: UILabel, style: TextStyle) { + static func applyStyle(to label: UILabel, style: UIKitTextStyle) { label.font = style.font label.adjustsFontForContentSizeCategory = true let lineHeight = style.lineHeight @@ -107,7 +207,7 @@ class Font { } } -struct TextStyle { +struct UIKitTextStyle { let font: UIFont let lineHeight: CGFloat } diff --git a/iphone/Maps/Tourism/Presentation/Utils/changeTheme.swift b/iphone/Maps/Tourism/Presentation/Utils/changeTheme.swift new file mode 100644 index 0000000000..cbc3423973 --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Utils/changeTheme.swift @@ -0,0 +1,9 @@ +// +// changeTheme.swift +// OMaps +// +// Created by LLC Rebus on 21/08/24. +// Copyright © 2024 Organic Maps. All rights reserved. +// + +import Foundation