From 91c544bfeb0f711b344c6f9e28d7282b36b199a9 Mon Sep 17 00:00:00 2001 From: LLC Rebus Date: Mon, 2 Sep 2024 09:50:59 +0500 Subject: [PATCH] backup --- indexer/indexer_tests/jni/Application.mk | 1 - iphone/Maps/Classes/MapsAppDelegate.mm | 2 +- .../Renderers/UINavigationBarRenderer.swift | 35 +- .../en-GB.lproj/Localizable.strings | 6 + .../en.lproj/Localizable.strings | 6 + .../ru.lproj/Localizable.strings | 6 + iphone/Maps/Maps.xcodeproj/project.pbxproj | 313 ++++++++++++++++-- iphone/Maps/OMaps-Debug.entitlements | 2 - .../Db/CurrencyPersistenceController.swift | 98 ++---- .../CurrencyRates.xcdatamodel/contents | 7 +- .../PersonalData.xcdatamodel/contents | 12 +- .../Tourism/Data/Db/EntitiesMapping.swift | 14 + .../PersonalDataPersistenceController.swift | 41 ++- .../Network/DTO/Auth/SignUpRequestDTO.swift | 24 +- .../DTO/Profile/CurrencyRatesDTO.swift | 33 +- .../Network/DTO/Profile/PersonalDataDTO.swift | 34 +- .../Data/Network/Services/AuthService.swift | 14 +- .../Network/Services/ProfileService.swift | 79 ++++- .../Network/Utils/CombineNetworkHelper.swift | 19 +- .../Tourism/Data/Prefs/UserPreferences.swift | 70 +++- .../Repositories/AuthRepositoryImpl.swift | 22 +- .../Repositories/CurrencyRepositoryImpl.swift | 69 +++- .../Repositories/ProfileRepositoryImpl.swift | 93 +++++- .../Domain/Models/Auth/AuthResponse.swift | 8 +- .../Domain/Models/Auth/SignInRequest.swift | 4 +- .../Domain/Models/Auth/SignUpRequest.swift | 10 +- .../Models/Currency/CurrencyRates.swift | 8 - .../Domain/Models/Profile/CurrencyRates.swift | 12 +- .../Domain/Models/Profile/PersonalData.swift | 2 +- .../Models/Profile/PersonalDataToSend.swift | 14 +- .../Domain/Models/SimpleResponse.swift | 12 +- .../Domain/Repositories/AuthRepository.swift | 6 +- .../Repositories/CurrencyRepository.swift | 14 +- .../Repositories/ProfileRepository.swift | 26 +- .../Auth/Screens/SignInViewController.swift | 2 +- .../Auth/Screens/SignUpViewController.swift | 2 +- .../Auth/Screens/WelcomeViewController.swift | 8 +- .../Components/Buttons/PrimaryButton.swift | 40 ++- .../Components/Buttons/SecondaryButton.swift | 62 ++-- .../Components/CountryAsLabel.swift | 10 +- .../Components/CountryPickerUtils.swift | 62 +++- .../Presentation/Components/LoadImg.swift | 49 ++- .../Components/Nav/AppBackButton.swift | 6 +- .../Components/Nav/AppTopBar.swift | 65 +++- .../Components/PhotoPickerView.swift | 51 ++- .../Presentation/Components/Spacers.swift | 24 +- .../Extensions/UIScreenExtensions.swift | 8 +- .../UIViewControllerExtensions.swift | 28 ++ .../Home/Screens/HomeScreen.swift | 8 +- .../New Group/HomeViewController.swift | 7 +- .../Home/Screens/Profile/AppTextField.swift | 73 +++- .../Profile/PersonalDataViewController.swift | 119 ++++++- .../Profile/ProfileViewController.swift | 77 +++-- .../Screens/Profile/ProfileViewModel.swift | 74 +++-- .../Presentation/Home/TabBarController.swift | 8 +- .../Presentation/Home/ThemeViewMode.swift | 9 - .../Presentation/Home/ThemeViewModel.swift | 40 +++ .../Presentation/Home/TourismMain.storyboard | 22 +- .../Tourism/Presentation/Theme/Color.swift | 61 ++++ .../Tourism/Presentation/Theme/Font.swift | 8 + .../Presentation/Utils/changeTheme.swift | 13 +- .../jni/Application.mk | 1 - 62 files changed, 1543 insertions(+), 510 deletions(-) delete mode 120000 indexer/indexer_tests/jni/Application.mk delete mode 100644 iphone/Maps/Tourism/Presentation/Home/ThemeViewMode.swift create mode 100644 iphone/Maps/Tourism/Presentation/Home/ThemeViewModel.swift delete mode 120000 routing/routing_integration_tests/jni/Application.mk diff --git a/indexer/indexer_tests/jni/Application.mk b/indexer/indexer_tests/jni/Application.mk deleted file mode 120000 index 43a1529450..0000000000 --- a/indexer/indexer_tests/jni/Application.mk +++ /dev/null @@ -1 +0,0 @@ -../../../android/UnitTests/jni/Application.mk \ No newline at end of file diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index 655096d9d4..ec3c456a86 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -209,7 +209,7 @@ using namespace osm_auth_ios; - (void)applicationDidBecomeActive:(UIApplication *)application { LOG(LINFO, ("applicationDidBecomeActive - begin")); - [[MapViewController sharedController]performSegueWithIdentifier:@"Map2Auth" sender:nil]; + [[MapViewController sharedController]performSegueWithIdentifier:@"Map2TourismMain" sender:nil]; auto & f = GetFramework(); f.EnterForeground(); diff --git a/iphone/Maps/Core/Theme/Renderers/UINavigationBarRenderer.swift b/iphone/Maps/Core/Theme/Renderers/UINavigationBarRenderer.swift index 67fb830589..94c3894f7b 100644 --- a/iphone/Maps/Core/Theme/Renderers/UINavigationBarRenderer.swift +++ b/iphone/Maps/Core/Theme/Renderers/UINavigationBarRenderer.swift @@ -14,38 +14,7 @@ extension UINavigationBar { class UINavigationBarRenderer: UIViewRenderer { class func render(_ control: UINavigationBar, style: Style) { super.render(control, style: style) - if let barTintColor = style.barTintColor { - if #available(iOS 13.0, *) { - let appearance = UINavigationBarAppearance() - appearance.configureWithOpaqueBackground() - appearance.backgroundColor = barTintColor - control.standardAppearance = appearance - control.scrollEdgeAppearance = appearance - } else { - control.barTintColor = barTintColor - } - } - if let shadowImage = style.shadowImage { - if #available(iOS 13.0, *) { - control.standardAppearance.shadowImage = shadowImage - control.scrollEdgeAppearance!.shadowImage = shadowImage - } else { - control.shadowImage = shadowImage - } - } - - var attributes = [NSAttributedString.Key: Any]() - if let font = style.font { - attributes[NSAttributedString.Key.font] = font - } - if let fontColor = style.fontColor { - attributes[NSAttributedString.Key.foregroundColor] = fontColor - } - if #available(iOS 13.0, *) { - control.standardAppearance.titleTextAttributes = attributes - control.scrollEdgeAppearance!.titleTextAttributes = attributes - } else { - control.titleTextAttributes = attributes - } + // there were some codes here that were forcing to show navigation bar on other storyboards + control.isHidden = true } } diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings index 5ea251ce80..a3934747a3 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings @@ -3949,6 +3949,8 @@ "server_error" = "Server error, try later"; +"cache_error" = "Cache error, try to clean cache"; + "wait_tjk_map_downloading" = "Please wait, the map of Tajikistan is loading, stay in the app"; "welcome_to_tjk" = "Welcome to Tajikistan"; @@ -3983,6 +3985,8 @@ "account" = "Account"; +"tourism_profile" = "Profile"; + "change" = "Edit"; "found" = "Found it"; @@ -4071,6 +4075,8 @@ "wrong_email_format" = "Wrong email format"; +"please_fill_all_fields" = "Please fill all of the fields"; + "saved" = "Saved"; "great_success" = "Great successπŸ˜„"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings index e690c44e76..c78d524cad 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings @@ -3949,6 +3949,8 @@ "server_error" = "Server error, try later"; +"cache_error" = "Cache error, try to clean cache"; + "wait_tjk_map_downloading" = "Please wait, the map of Tajikistan is loading, stay in the app"; "welcome_to_tjk" = "Welcome to Tajikistan"; @@ -3983,6 +3985,8 @@ "account" = "Account"; +"tourism_profile" = "Profile"; + "change" = "Edit"; "found" = "Found it"; @@ -4071,6 +4075,8 @@ "wrong_email_format" = "Wrong email format"; +"please_fill_all_fields" = "Please fill all of the fields"; + "saved" = "Saved"; "great_success" = "Great successπŸ˜„"; diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings index b2262de455..835777dc41 100644 --- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings @@ -3947,6 +3947,8 @@ "server_error" = "Ошибка сСрвСра, ΠΏΠΎΠΏΡ€ΠΎΠ±ΡƒΠΉΡ‚Π΅ ΠΏΠΎΠ·ΠΆΠ΅"; +"cache_error" = "Ошибка кСша, ΠΏΠΎΠΏΡ€ΠΎΠ±ΡƒΠΉΡ‚Π΅ ΠΎΡ‡ΠΈΡΡ‚ΠΈΡ‚ΡŒ кСш"; + "error" = "Ошибка"; "wait_tjk_map_downloading" = "ΠŸΠΎΠΆΠ°Π»ΡƒΠΉΡΡ‚Π°, ΠΏΠΎΠ΄ΠΎΠΆΠ΄ΠΈΡ‚Π΅, ΠΈΠ΄Π΅Ρ‚ Π·Π°Π³Ρ€ΡƒΠ·ΠΊΠ° ΠΊΠ°Ρ€Ρ‚Ρ‹ ВадТикистана. ΠžΡΡ‚Π°Π²Π°ΠΉΡ‚Π΅ΡΡŒ Π² ΠΏΡ€ΠΈΠ»ΠΎΠΆΠ΅Π½ΠΈΠΈ"; @@ -3983,6 +3985,8 @@ "account" = "Аккаунт"; +"tourism_profile" = "ΠŸΡ€ΠΎΡ„ΠΈΠ»ΡŒ"; + "change" = "Π˜Π·ΠΌΠ΅Π½ΠΈΡ‚ΡŒ"; "found" = "НайдСно"; @@ -4071,6 +4075,8 @@ "wrong_email_format" = "ΠΠ΅ΠΏΡ€Π°Π²ΠΈΠ»ΡŒΠ½Ρ‹ΠΉ Ρ„ΠΎΡ€ΠΌΠ°Ρ‚ ΠΈΠΌΠ΅ΠΉΠ»Π°"; +"please_fill_all_fields" = "ΠŸΠΎΠΆΠ°Π»ΡƒΠΉΡΡ‚Π°, Π·Π°ΠΏΠΎΠ»Π½ΠΈΡ‚Π΅ всС Π΄Π°Π½Π½Ρ‹Π΅"; + "saved" = "Π‘ΠΎΡ…Ρ€Π°Π½Π΅Π½ΠΎ"; "great_success" = "МнС Π½Ρ€Π°ΠΈΡ‚ΡΡπŸ˜„"; diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index f1de19bae0..9a85622bdc 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -179,6 +179,20 @@ 34F742321E0834F400AC1FD6 /* UIViewController+Navigation.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F742301E0834F400AC1FD6 /* UIViewController+Navigation.m */; }; 34FE5A6F1F18F30F00BCA729 /* TrafficButtonArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34FE5A6D1F18F30F00BCA729 /* TrafficButtonArea.swift */; }; 3D15ACEE2155117000F725D5 /* MWMObjectsCategorySelectorDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D15ACED2155117000F725D5 /* MWMObjectsCategorySelectorDataSource.mm */; }; + 3D2D79BA2C7C508E0062BC3D /* SingleEntityCoreDataController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D2D79B92C7C508E0062BC3D /* SingleEntityCoreDataController.swift */; }; + 3D2D79BC2C7C5E300062BC3D /* ProfileRepositoryImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D2D79BB2C7C5E300062BC3D /* ProfileRepositoryImpl.swift */; }; + 3D2D79C12C7C7EA00062BC3D /* PersonalData.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 3D2D79BF2C7C7EA00062BC3D /* PersonalData.xcdatamodeld */; }; + 3D2D79C32C7C80E60062BC3D /* PersonalDataPersistenceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D2D79C22C7C80E60062BC3D /* PersonalDataPersistenceController.swift */; }; + 3D2D79CC2C7C8C350062BC3D /* ProfileService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D2D79CB2C7C8C350062BC3D /* ProfileService.swift */; }; + 3D2D79D32C7CF4F70062BC3D /* PersonalDataViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D2D79D22C7CF4F70062BC3D /* PersonalDataViewController.swift */; }; + 3D2D79D52C7CF6970062BC3D /* Spacers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D2D79D42C7CF6970062BC3D /* Spacers.swift */; }; + 3D2D79D72C7D0AC00062BC3D /* AppTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D2D79D62C7D0ABF0062BC3D /* AppTextField.swift */; }; + 3D2D79D92C7D15190062BC3D /* PrimaryButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D2D79D82C7D15190062BC3D /* PrimaryButton.swift */; }; + 3D2D79DB2C7D15410062BC3D /* SecondaryButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D2D79DA2C7D15410062BC3D /* SecondaryButton.swift */; }; + 3D2D79DD2C7DE34B0062BC3D /* PhotoPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D2D79DC2C7DE34B0062BC3D /* PhotoPickerView.swift */; }; + 3D585BF42C760850005DF71F /* UIScreenExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D585BF32C760850005DF71F /* UIScreenExtensions.swift */; }; + 3D585BFA2C768C3A005DF71F /* ToastView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D585BF92C768C3A005DF71F /* ToastView.swift */; }; + 3DA3FC992C75ED2A0065E4D6 /* changeTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DA3FC982C75ED2A0065E4D6 /* changeTheme.swift */; }; 3DBD7BE42425015C00ED9FE8 /* ParntersStyleSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7BE32425015C00ED9FE8 /* ParntersStyleSheet.swift */; }; 3DEE1AEB21F72CD300054A91 /* MWMPowerManagmentViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3DEE1AEA21F72CD300054A91 /* MWMPowerManagmentViewController.mm */; }; 408645FC21495EB1000A4A1D /* categories_cuisines.txt in Resources */ = {isa = PBXBuildFile; fileRef = 408645FB21495EB1000A4A1D /* categories_cuisines.txt */; }; @@ -263,30 +277,43 @@ 4B4153B52BF9695500EE4B02 /* MWMTextToSpeechTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B4153B42BF9695500EE4B02 /* MWMTextToSpeechTests.mm */; }; 524634C62C53BC3100FDCABA /* Auth.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 524634C22C53BB3A00FDCABA /* Auth.storyboard */; }; 524634CD2C57232400FDCABA /* TourismMain.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 524634CC2C57232400FDCABA /* TourismMain.storyboard */; }; + 52522F2E2C6C9E070015709C /* UserPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52522F2D2C6C9E060015709C /* UserPreferences.swift */; }; + 52522F312C6CC87C0015709C /* TabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52522F302C6CC87B0015709C /* TabBarController.swift */; }; + 52522F332C6DC7A40015709C /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52522F322C6DC7A40015709C /* HomeViewController.swift */; }; + 52522F392C6DD9DA0015709C /* ProfileViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52522F382C6DD9DA0015709C /* ProfileViewModel.swift */; }; + 52522F3B2C6DDA750015709C /* ThemeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52522F3A2C6DDA750015709C /* ThemeViewModel.swift */; }; + 52522F3E2C6DDF190015709C /* PersonalData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52522F3D2C6DDF190015709C /* PersonalData.swift */; }; + 52522F402C6DDF290015709C /* CurrencyRates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52522F3F2C6DDF290015709C /* CurrencyRates.swift */; }; + 52522F462C6DFE060015709C /* AppTopBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52522F452C6DFE060015709C /* AppTopBar.swift */; }; + 52522F482C6DFE460015709C /* AppBackButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52522F472C6DFE460015709C /* AppBackButton.swift */; }; + 52522F4A2C6DFE580015709C /* BackButtonWithText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52522F492C6DFE580015709C /* BackButtonWithText.swift */; }; + 52522F4C2C6E10FD0015709C /* LoadImg.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52522F4B2C6E10FD0015709C /* LoadImg.swift */; }; 5260D3CE2C64F60200C673B4 /* APIEndpoints.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5260D3CD2C64F60200C673B4 /* APIEndpoints.swift */; }; 5260D3D12C64F7F100C673B4 /* SignInRequestDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5260D3D02C64F7F100C673B4 /* SignInRequestDTO.swift */; }; 5260D3D82C64F8BC00C673B4 /* AuthResponseDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5260D3D72C64F8BC00C673B4 /* AuthResponseDTO.swift */; }; - 5260D3DA2C661FF000C673B4 /* NetworkError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5260D3D92C661FF000C673B4 /* NetworkError.swift */; }; + 5260D3DA2C661FF000C673B4 /* ResourceError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5260D3D92C661FF000C673B4 /* ResourceError.swift */; }; 5260D3DE2C66237700C673B4 /* AuthService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5260D3DD2C66237700C673B4 /* AuthService.swift */; }; 5260D3E02C6624B900C673B4 /* AuthRepositoryImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5260D3DF2C6624B900C673B4 /* AuthRepositoryImpl.swift */; }; 5260D3E32C66289900C673B4 /* SignInRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5260D3E22C66289900C673B4 /* SignInRequest.swift */; }; 5260D3E52C66290500C673B4 /* AuthResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5260D3E42C66290500C673B4 /* AuthResponse.swift */; }; 5260D3E82C66439400C673B4 /* AuthRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5260D3E72C66439400C673B4 /* AuthRepository.swift */; }; - 5260D3EB2C6967DD00C673B4 /* UITextFieldExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5260D3EA2C6967DD00C673B4 /* UITextFieldExtensions.swift */; }; 527D5E752C60A1F800736A85 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 527D5E742C60A1F800736A85 /* Images.xcassets */; }; 527D5E782C60D94B00736A85 /* AppButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 527D5E772C60D94B00736A85 /* AppButton.swift */; }; 527D5E7B2C60E05D00736A85 /* LanguageUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 527D5E7A2C60E05D00736A85 /* LanguageUtils.swift */; }; 527D5E7F2C60E69C00736A85 /* Layouting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 527D5E7E2C60E69C00736A85 /* Layouting.swift */; }; 527D5E822C60EFEE00736A85 /* UIViewExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 527D5E812C60EFEE00736A85 /* UIViewExtensions.swift */; }; 528D72A12C5BBBF700D53210 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 528D72A02C5BBBF700D53210 /* Colors.xcassets */; }; + 5292123D2C7359FC007B97E1 /* CountryPickerView in Frameworks */ = {isa = PBXBuildFile; productRef = 5292123C2C7359FC007B97E1 /* CountryPickerView */; }; + 529212422C735A61007B97E1 /* SDWebImageSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = 529212412C735A61007B97E1 /* SDWebImageSwiftUI */; }; 52B573EC2C61E1C10047FAC9 /* SignInViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52B573EB2C61E1C10047FAC9 /* SignInViewController.swift */; }; 52B573F02C61E4110047FAC9 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52B573EF2C61E4110047FAC9 /* Constants.swift */; }; 52B573F22C61E8980047FAC9 /* SignUpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52B573F12C61E8980047FAC9 /* SignUpViewController.swift */; }; 52B573F52C61F11E0047FAC9 /* AuhtTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52B573F42C61F11E0047FAC9 /* AuhtTextField.swift */; }; 52B573F72C61F4D00047FAC9 /* PasswordTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52B573F62C61F4D00047FAC9 /* PasswordTextField.swift */; }; 52B573F92C6223CE0047FAC9 /* AuthBackButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52B573F82C6223CE0047FAC9 /* AuthBackButton.swift */; }; - 52B573FC2C623ECF0047FAC9 /* CountryPickerView in Frameworks */ = {isa = PBXBuildFile; productRef = 52B573FB2C623ECF0047FAC9 /* CountryPickerView */; }; 52B573FE2C624A520047FAC9 /* CountryPickerUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52B573FD2C624A520047FAC9 /* CountryPickerUtils.swift */; }; + 52CD2D852C6F093B00CCC439 /* CurrencyRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52CD2D842C6F093A00CCC439 /* CurrencyRepository.swift */; }; + 52CD2D892C6F0AF200CCC439 /* ProfileRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52CD2D882C6F0AF200CCC439 /* ProfileRepository.swift */; }; 52D588A92C5CD56200AB96B3 /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52D588A82C5CD56200AB96B3 /* Color.swift */; }; 52D588BA2C5CE2E800AB96B3 /* Font.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52D588B92C5CE2E800AB96B3 /* Font.swift */; }; 52D588C52C5CEAF900AB96B3 /* Gilroy-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 52D588BB2C5CEAF800AB96B3 /* Gilroy-Thin.ttf */; }; @@ -300,11 +327,20 @@ 52D588CD2C5CEAF900AB96B3 /* Gilroy-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 52D588C32C5CEAF800AB96B3 /* Gilroy-Light.ttf */; }; 52D588CE2C5CEAF900AB96B3 /* Gilroy-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 52D588C42C5CEAF900AB96B3 /* Gilroy-ExtraBold.ttf */; }; 52E2D3A42C59F9CE00A8843A /* WelcomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52E2D3A32C59F9CE00A8843A /* WelcomeViewController.swift */; }; - 52E2D3A62C5A017400A8843A /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52E2D3A52C5A017400A8843A /* HomeViewController.swift */; }; 52E95F022C6B32E500A3FE2E /* ErrorResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52E95F012C6B32E500A3FE2E /* ErrorResponse.swift */; }; 52E95F042C6B71B900A3FE2E /* CombineNetworkHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52E95F032C6B71B900A3FE2E /* CombineNetworkHelper.swift */; }; 52E95F072C6B7E2400A3FE2E /* SignUpRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52E95F062C6B7E2400A3FE2E /* SignUpRequest.swift */; }; 52E95F0B2C6B8CC800A3FE2E /* UIViewControllerExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52E95F0A2C6B8CC800A3FE2E /* UIViewControllerExtensions.swift */; }; + 52E95F0D2C6C797B00A3FE2E /* ProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52E95F0C2C6C797B00A3FE2E /* ProfileViewController.swift */; }; + 52ED919D2C71F639000EE25B /* SimpleResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52ED919C2C71F639000EE25B /* SimpleResponse.swift */; }; + 52ED919F2C71F718000EE25B /* SignUpRequestDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52ED919E2C71F718000EE25B /* SignUpRequestDTO.swift */; }; + 52ED91A32C7200C4000EE25B /* Currency.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 52ED91A12C7200C4000EE25B /* Currency.xcdatamodeld */; }; + 52ED91A52C72C50F000EE25B /* CurrencyRepositoryImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52ED91A42C72C50F000EE25B /* CurrencyRepositoryImpl.swift */; }; + 52ED91A72C72C58A000EE25B /* CurrencyPersistenceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52ED91A62C72C58A000EE25B /* CurrencyPersistenceController.swift */; }; + 52ED91A92C73020A000EE25B /* CurrencyService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52ED91A82C73020A000EE25B /* CurrencyService.swift */; }; + 52ED91AB2C7302A7000EE25B /* CurrencyRatesDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52ED91AA2C7302A7000EE25B /* CurrencyRatesDTO.swift */; }; + 52ED91B02C73030D000EE25B /* PersonalDataDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52ED91AF2C73030D000EE25B /* PersonalDataDTO.swift */; }; + 52ED91B32C73211F000EE25B /* EntitiesMapping.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52ED91B22C73211F000EE25B /* EntitiesMapping.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 */; }; @@ -1111,6 +1147,20 @@ 34FE5A6D1F18F30F00BCA729 /* TrafficButtonArea.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TrafficButtonArea.swift; sourceTree = ""; }; 3D15ACED2155117000F725D5 /* MWMObjectsCategorySelectorDataSource.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMObjectsCategorySelectorDataSource.mm; sourceTree = ""; }; 3D15ACEF2155118800F725D5 /* MWMObjectsCategorySelectorDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMObjectsCategorySelectorDataSource.h; sourceTree = ""; }; + 3D2D79B92C7C508E0062BC3D /* SingleEntityCoreDataController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingleEntityCoreDataController.swift; sourceTree = ""; }; + 3D2D79BB2C7C5E300062BC3D /* ProfileRepositoryImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileRepositoryImpl.swift; sourceTree = ""; }; + 3D2D79C02C7C7EA00062BC3D /* PersonalData.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = PersonalData.xcdatamodel; sourceTree = ""; }; + 3D2D79C22C7C80E60062BC3D /* PersonalDataPersistenceController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonalDataPersistenceController.swift; sourceTree = ""; }; + 3D2D79CB2C7C8C350062BC3D /* ProfileService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileService.swift; sourceTree = ""; }; + 3D2D79D22C7CF4F70062BC3D /* PersonalDataViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonalDataViewController.swift; sourceTree = ""; }; + 3D2D79D42C7CF6970062BC3D /* Spacers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Spacers.swift; sourceTree = ""; }; + 3D2D79D62C7D0ABF0062BC3D /* AppTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppTextField.swift; sourceTree = ""; }; + 3D2D79D82C7D15190062BC3D /* PrimaryButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrimaryButton.swift; sourceTree = ""; }; + 3D2D79DA2C7D15410062BC3D /* SecondaryButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecondaryButton.swift; sourceTree = ""; }; + 3D2D79DC2C7DE34B0062BC3D /* PhotoPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoPickerView.swift; sourceTree = ""; }; + 3D585BF32C760850005DF71F /* UIScreenExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIScreenExtensions.swift; sourceTree = ""; }; + 3D585BF92C768C3A005DF71F /* ToastView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ToastView.swift; path = ../../../../../../../../Documents/ToastView.swift; sourceTree = ""; }; + 3DA3FC982C75ED2A0065E4D6 /* changeTheme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = changeTheme.swift; sourceTree = ""; }; 3DBD7BE32425015C00ED9FE8 /* ParntersStyleSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParntersStyleSheet.swift; sourceTree = ""; }; 3DEE1AE921F72CD300054A91 /* MWMPowerManagmentViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMPowerManagmentViewController.h; sourceTree = ""; }; 3DEE1AEA21F72CD300054A91 /* MWMPowerManagmentViewController.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMPowerManagmentViewController.mm; sourceTree = ""; }; @@ -1227,18 +1277,28 @@ 4B4153B42BF9695500EE4B02 /* MWMTextToSpeechTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTextToSpeechTests.mm; 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 = ""; }; + 52522F2D2C6C9E060015709C /* UserPreferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPreferences.swift; sourceTree = ""; }; + 52522F302C6CC87B0015709C /* TabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarController.swift; sourceTree = ""; }; + 52522F322C6DC7A40015709C /* HomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = HomeViewController.swift; path = "../New Group/HomeViewController.swift"; sourceTree = ""; }; + 52522F382C6DD9DA0015709C /* ProfileViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViewModel.swift; sourceTree = ""; }; + 52522F3A2C6DDA750015709C /* ThemeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeViewModel.swift; sourceTree = ""; }; + 52522F3D2C6DDF190015709C /* PersonalData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonalData.swift; sourceTree = ""; }; + 52522F3F2C6DDF290015709C /* CurrencyRates.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrencyRates.swift; sourceTree = ""; }; + 52522F452C6DFE060015709C /* AppTopBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppTopBar.swift; sourceTree = ""; }; + 52522F472C6DFE460015709C /* AppBackButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppBackButton.swift; sourceTree = ""; }; + 52522F492C6DFE580015709C /* BackButtonWithText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackButtonWithText.swift; sourceTree = ""; }; + 52522F4B2C6E10FD0015709C /* LoadImg.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadImg.swift; sourceTree = ""; }; 5260D3CD2C64F60200C673B4 /* APIEndpoints.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIEndpoints.swift; sourceTree = ""; }; 5260D3D02C64F7F100C673B4 /* SignInRequestDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInRequestDTO.swift; sourceTree = ""; }; 5260D3D72C64F8BC00C673B4 /* AuthResponseDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthResponseDTO.swift; sourceTree = ""; }; - 5260D3D92C661FF000C673B4 /* NetworkError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkError.swift; sourceTree = ""; }; + 5260D3D92C661FF000C673B4 /* ResourceError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResourceError.swift; sourceTree = ""; }; 5260D3DD2C66237700C673B4 /* AuthService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthService.swift; sourceTree = ""; }; 5260D3DF2C6624B900C673B4 /* AuthRepositoryImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthRepositoryImpl.swift; sourceTree = ""; }; 5260D3E22C66289900C673B4 /* SignInRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInRequest.swift; sourceTree = ""; }; 5260D3E42C66290500C673B4 /* AuthResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthResponse.swift; sourceTree = ""; }; 5260D3E72C66439400C673B4 /* AuthRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthRepository.swift; sourceTree = ""; }; - 5260D3EA2C6967DD00C673B4 /* UITextFieldExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITextFieldExtensions.swift; sourceTree = ""; }; 527D5E742C60A1F800736A85 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - 527D5E772C60D94B00736A85 /* AppButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppButton.swift; sourceTree = ""; }; + 527D5E772C60D94B00736A85 /* AppButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppButton.swift; path = "../New Group/AppButton.swift"; sourceTree = ""; }; 527D5E7A2C60E05D00736A85 /* LanguageUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LanguageUtils.swift; sourceTree = ""; }; 527D5E7E2C60E69C00736A85 /* Layouting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Layouting.swift; sourceTree = ""; }; 527D5E812C60EFEE00736A85 /* UIViewExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIViewExtensions.swift; sourceTree = ""; }; @@ -1250,6 +1310,8 @@ 52B573F62C61F4D00047FAC9 /* PasswordTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasswordTextField.swift; sourceTree = ""; }; 52B573F82C6223CE0047FAC9 /* AuthBackButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthBackButton.swift; sourceTree = ""; }; 52B573FD2C624A520047FAC9 /* CountryPickerUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CountryPickerUtils.swift; sourceTree = ""; }; + 52CD2D842C6F093A00CCC439 /* CurrencyRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrencyRepository.swift; sourceTree = ""; }; + 52CD2D882C6F0AF200CCC439 /* ProfileRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileRepository.swift; sourceTree = ""; }; 52D588A82C5CD56200AB96B3 /* Color.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Color.swift; sourceTree = ""; }; 52D588B92C5CE2E800AB96B3 /* Font.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Font.swift; sourceTree = ""; }; 52D588BB2C5CEAF800AB96B3 /* Gilroy-Thin.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Gilroy-Thin.ttf"; sourceTree = ""; }; @@ -1263,11 +1325,20 @@ 52D588C32C5CEAF800AB96B3 /* Gilroy-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Gilroy-Light.ttf"; sourceTree = ""; }; 52D588C42C5CEAF900AB96B3 /* Gilroy-ExtraBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Gilroy-ExtraBold.ttf"; sourceTree = ""; }; 52E2D3A32C59F9CE00A8843A /* WelcomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeViewController.swift; sourceTree = ""; }; - 52E2D3A52C5A017400A8843A /* HomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = ""; }; 52E95F012C6B32E500A3FE2E /* ErrorResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorResponse.swift; sourceTree = ""; }; 52E95F032C6B71B900A3FE2E /* CombineNetworkHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CombineNetworkHelper.swift; sourceTree = ""; }; 52E95F062C6B7E2400A3FE2E /* SignUpRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpRequest.swift; sourceTree = ""; }; 52E95F0A2C6B8CC800A3FE2E /* UIViewControllerExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIViewControllerExtensions.swift; sourceTree = ""; }; + 52E95F0C2C6C797B00A3FE2E /* ProfileViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViewController.swift; sourceTree = ""; }; + 52ED919C2C71F639000EE25B /* SimpleResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimpleResponse.swift; sourceTree = ""; }; + 52ED919E2C71F718000EE25B /* SignUpRequestDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpRequestDTO.swift; sourceTree = ""; }; + 52ED91A22C7200C4000EE25B /* CurrencyRates.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = CurrencyRates.xcdatamodel; sourceTree = ""; }; + 52ED91A42C72C50F000EE25B /* CurrencyRepositoryImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrencyRepositoryImpl.swift; sourceTree = ""; }; + 52ED91A62C72C58A000EE25B /* CurrencyPersistenceController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrencyPersistenceController.swift; sourceTree = ""; }; + 52ED91A82C73020A000EE25B /* CurrencyService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrencyService.swift; sourceTree = ""; }; + 52ED91AA2C7302A7000EE25B /* CurrencyRatesDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrencyRatesDTO.swift; sourceTree = ""; }; + 52ED91AF2C73030D000EE25B /* PersonalDataDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonalDataDTO.swift; sourceTree = ""; }; + 52ED91B22C73211F000EE25B /* EntitiesMapping.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EntitiesMapping.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 = ""; }; @@ -1813,7 +1884,7 @@ FA853BEF26BC5BA40026D455 /* libdescriptions.a in Frameworks */, FA853BEB26BC5B9E0026D455 /* libbsdiff.a in Frameworks */, FA853BED26BC5B9E0026D455 /* libmwm_diff.a in Frameworks */, - 52B573FC2C623ECF0047FAC9 /* CountryPickerView in Frameworks */, + 5292123D2C7359FC007B97E1 /* CountryPickerView in Frameworks */, FA853BE926BC5B8B0026D455 /* libopen_location_code.a in Frameworks */, FA853BE726BC5B820026D455 /* libstb_image.a in Frameworks */, FA853BE526BC5B660026D455 /* libvulkan_wrapper.a in Frameworks */, @@ -1823,6 +1894,7 @@ FA853BDB26BC54CD0026D455 /* libtraffic.a in Frameworks */, FA853BD926BC54C80026D455 /* libexpat.a in Frameworks */, FA853BD726BC54650026D455 /* libpugixml.a in Frameworks */, + 529212422C735A61007B97E1 /* SDWebImageSwiftUI in Frameworks */, FA853BD526BC545D0026D455 /* libagg.a in Frameworks */, FA853BD326BC54530026D455 /* libtransit.a in Frameworks */, FA853BA926BC3B8A0026D455 /* libbase.a in Frameworks */, @@ -2628,6 +2700,32 @@ path = Widgets; sourceTree = ""; }; + 3D2D79B82C7C4FC30062BC3D /* Utils */ = { + isa = PBXGroup; + children = ( + 3D2D79B92C7C508E0062BC3D /* SingleEntityCoreDataController.swift */, + ); + path = Utils; + sourceTree = ""; + }; + 3D585BF72C768BED005DF71F /* Buttons */ = { + isa = PBXGroup; + children = ( + 527D5E772C60D94B00736A85 /* AppButton.swift */, + 3D2D79D82C7D15190062BC3D /* PrimaryButton.swift */, + 3D2D79DA2C7D15410062BC3D /* SecondaryButton.swift */, + ); + path = Buttons; + sourceTree = ""; + }; + 3D585BF82C768C2C005DF71F /* Toast */ = { + isa = PBXGroup; + children = ( + 3D585BF92C768C3A005DF71F /* ToastView.swift */, + ); + path = Toast; + sourceTree = ""; + }; 447DB4B72BA7826D000DF4C2 /* ReauthAlert */ = { isa = PBXGroup; children = ( @@ -2792,9 +2890,48 @@ path = Presentation; sourceTree = ""; }; + 52522F342C6DD9480015709C /* Profile */ = { + isa = PBXGroup; + children = ( + 52522F382C6DD9DA0015709C /* ProfileViewModel.swift */, + 52E95F0C2C6C797B00A3FE2E /* ProfileViewController.swift */, + 3D2D79D22C7CF4F70062BC3D /* PersonalDataViewController.swift */, + 3D2D79D62C7D0ABF0062BC3D /* AppTextField.swift */, + ); + path = Profile; + sourceTree = ""; + }; + 52522F352C6DD9860015709C /* Home */ = { + isa = PBXGroup; + children = ( + 52522F322C6DC7A40015709C /* HomeViewController.swift */, + ); + path = Home; + sourceTree = ""; + }; + 52522F3C2C6DDF040015709C /* Profile */ = { + isa = PBXGroup; + children = ( + 52522F3D2C6DDF190015709C /* PersonalData.swift */, + 52522F3F2C6DDF290015709C /* CurrencyRates.swift */, + ); + path = Profile; + sourceTree = ""; + }; + 52522F442C6DFD220015709C /* Nav */ = { + isa = PBXGroup; + children = ( + 52522F452C6DFE060015709C /* AppTopBar.swift */, + 52522F472C6DFE460015709C /* AppBackButton.swift */, + 52522F492C6DFE580015709C /* BackButtonWithText.swift */, + ); + path = Nav; + sourceTree = ""; + }; 5260D3C42C64B84600C673B4 /* Data */ = { isa = PBXGroup; children = ( + 5260D3D92C661FF000C673B4 /* ResourceError.swift */, 5260D3DB2C66205700C673B4 /* Repositories */, 5260D3CA2C64F59700C673B4 /* Prefs */, 5260D3C92C64F58A00C673B4 /* Db */, @@ -2815,8 +2952,10 @@ 5260D3C62C64B87D00C673B4 /* Models */ = { isa = PBXGroup; children = ( + 52522F3C2C6DDF040015709C /* Profile */, 52E95EFE2C6B32D900A3FE2E /* Responses */, 5260D3E12C66287D00C673B4 /* Auth */, + 52ED919C2C71F639000EE25B /* SimpleResponse.swift */, ); path = Models; sourceTree = ""; @@ -2833,7 +2972,7 @@ 5260D3C82C64F58300C673B4 /* Network */ = { isa = PBXGroup; children = ( - 52E95F052C6B797E00A3FE2E /* EminoFire */, + 52E95F052C6B797E00A3FE2E /* Utils */, 5260D3DC2C66236500C673B4 /* Services */, 5260D3CF2C64F7E200C673B4 /* DTO */, 5260D3CD2C64F60200C673B4 /* APIEndpoints.swift */, @@ -2844,6 +2983,11 @@ 5260D3C92C64F58A00C673B4 /* Db */ = { isa = PBXGroup; children = ( + 3D2D79B82C7C4FC30062BC3D /* Utils */, + 52ED91A02C72007C000EE25B /* DataModels */, + 52ED91A62C72C58A000EE25B /* CurrencyPersistenceController.swift */, + 52ED91B22C73211F000EE25B /* EntitiesMapping.swift */, + 3D2D79C22C7C80E60062BC3D /* PersonalDataPersistenceController.swift */, ); path = Db; sourceTree = ""; @@ -2851,6 +2995,7 @@ 5260D3CA2C64F59700C673B4 /* Prefs */ = { isa = PBXGroup; children = ( + 52522F2D2C6C9E060015709C /* UserPreferences.swift */, ); path = Prefs; sourceTree = ""; @@ -2858,7 +3003,6 @@ 5260D3CF2C64F7E200C673B4 /* DTO */ = { isa = PBXGroup; children = ( - 5260D3D62C64F87800C673B4 /* Currency */, 5260D3D52C64F87500C673B4 /* Place */, 5260D3D42C64F87200C673B4 /* Profile */, 5260D3D22C64F84700C673B4 /* Auth */, @@ -2871,6 +3015,7 @@ children = ( 5260D3D02C64F7F100C673B4 /* SignInRequestDTO.swift */, 5260D3D72C64F8BC00C673B4 /* AuthResponseDTO.swift */, + 52ED919E2C71F718000EE25B /* SignUpRequestDTO.swift */, ); path = Auth; sourceTree = ""; @@ -2878,6 +3023,8 @@ 5260D3D42C64F87200C673B4 /* Profile */ = { isa = PBXGroup; children = ( + 52ED91AA2C7302A7000EE25B /* CurrencyRatesDTO.swift */, + 52ED91AF2C73030D000EE25B /* PersonalDataDTO.swift */, ); path = Profile; sourceTree = ""; @@ -2889,17 +3036,12 @@ path = Place; sourceTree = ""; }; - 5260D3D62C64F87800C673B4 /* Currency */ = { - isa = PBXGroup; - children = ( - ); - path = Currency; - sourceTree = ""; - }; 5260D3DB2C66205700C673B4 /* Repositories */ = { isa = PBXGroup; children = ( 5260D3DF2C6624B900C673B4 /* AuthRepositoryImpl.swift */, + 52ED91A42C72C50F000EE25B /* CurrencyRepositoryImpl.swift */, + 3D2D79BB2C7C5E300062BC3D /* ProfileRepositoryImpl.swift */, ); path = Repositories; sourceTree = ""; @@ -2908,6 +3050,8 @@ isa = PBXGroup; children = ( 5260D3DD2C66237700C673B4 /* AuthService.swift */, + 52ED91A82C73020A000EE25B /* CurrencyService.swift */, + 3D2D79CB2C7C8C350062BC3D /* ProfileService.swift */, ); path = Services; sourceTree = ""; @@ -2926,6 +3070,8 @@ isa = PBXGroup; children = ( 5260D3E72C66439400C673B4 /* AuthRepository.swift */, + 52CD2D842C6F093A00CCC439 /* CurrencyRepository.swift */, + 52CD2D882C6F0AF200CCC439 /* ProfileRepository.swift */, ); path = Repositories; sourceTree = ""; @@ -2933,9 +3079,9 @@ 5260D3E92C6967AF00C673B4 /* Extensions */ = { isa = PBXGroup; children = ( - 5260D3EA2C6967DD00C673B4 /* UITextFieldExtensions.swift */, 527D5E812C60EFEE00736A85 /* UIViewExtensions.swift */, 52E95F0A2C6B8CC800A3FE2E /* UIViewControllerExtensions.swift */, + 3D585BF32C760850005DF71F /* UIScreenExtensions.swift */, ); path = Extensions; sourceTree = ""; @@ -2943,10 +3089,15 @@ 527D5E762C60D92900736A85 /* Components */ = { isa = PBXGroup; children = ( + 3D585BF82C768C2C005DF71F /* Toast */, + 3D585BF72C768BED005DF71F /* Buttons */, + 52522F442C6DFD220015709C /* Nav */, 52B573F32C61F10B0047FAC9 /* TextFields */, - 527D5E772C60D94B00736A85 /* AppButton.swift */, 52B573F82C6223CE0047FAC9 /* AuthBackButton.swift */, 52B573FD2C624A520047FAC9 /* CountryPickerUtils.swift */, + 52522F4B2C6E10FD0015709C /* LoadImg.swift */, + 3D2D79D42C7CF6970062BC3D /* Spacers.swift */, + 3D2D79DC2C7DE34B0062BC3D /* PhotoPickerView.swift */, ); path = Components; sourceTree = ""; @@ -2963,6 +3114,7 @@ isa = PBXGroup; children = ( 527D5E7E2C60E69C00736A85 /* Layouting.swift */, + 3DA3FC982C75ED2A0065E4D6 /* changeTheme.swift */, ); path = Utils; sourceTree = ""; @@ -2980,8 +3132,10 @@ 52B189972C53B9E900B5B6F9 /* Home */ = { isa = PBXGroup; children = ( + 52522F302C6CC87B0015709C /* TabBarController.swift */, 52E2D39B2C58E72900A8843A /* Screens */, 524634CC2C57232400FDCABA /* TourismMain.storyboard */, + 52522F3A2C6DDA750015709C /* ThemeViewModel.swift */, ); path = Home; sourceTree = ""; @@ -3024,7 +3178,8 @@ 52E2D39B2C58E72900A8843A /* Screens */ = { isa = PBXGroup; children = ( - 52E2D3A52C5A017400A8843A /* HomeViewController.swift */, + 52522F352C6DD9860015709C /* Home */, + 52522F342C6DD9480015709C /* Profile */, ); path = Screens; sourceTree = ""; @@ -3047,13 +3202,21 @@ path = Responses; sourceTree = ""; }; - 52E95F052C6B797E00A3FE2E /* EminoFire */ = { + 52E95F052C6B797E00A3FE2E /* Utils */ = { isa = PBXGroup; children = ( - 5260D3D92C661FF000C673B4 /* NetworkError.swift */, 52E95F032C6B71B900A3FE2E /* CombineNetworkHelper.swift */, ); - path = EminoFire; + path = Utils; + sourceTree = ""; + }; + 52ED91A02C72007C000EE25B /* DataModels */ = { + isa = PBXGroup; + children = ( + 52ED91A12C7200C4000EE25B /* Currency.xcdatamodeld */, + 3D2D79BF2C7C7EA00062BC3D /* PersonalData.xcdatamodeld */, + ); + path = DataModels; sourceTree = ""; }; 97B4E9271851DAB300BEC5D7 /* Custom Views */ = { @@ -4209,7 +4372,8 @@ ); name = OMaps; packageProductDependencies = ( - 52B573FB2C623ECF0047FAC9 /* CountryPickerView */, + 5292123C2C7359FC007B97E1 /* CountryPickerView */, + 529212412C735A61007B97E1 /* SDWebImageSwiftUI */, ); productName = Maps; productReference = 6741AA5D1BF340DE002C974C /* Organic Maps (Debug).app */; @@ -4308,7 +4472,8 @@ ); mainGroup = 29B97314FDCFA39411CA2CEA /* Maps */; packageReferences = ( - 52B573FA2C623ECF0047FAC9 /* XCRemoteSwiftPackageReference "CountryPickerView" */, + 5292123B2C7359FC007B97E1 /* XCRemoteSwiftPackageReference "CountryPickerView" */, + 529212402C735A61007B97E1 /* XCRemoteSwiftPackageReference "SDWebImageSwiftUI" */, ); productRefGroup = 19C28FACFE9D520D11CA2CBB /* Products */; projectDirPath = ""; @@ -4552,6 +4717,7 @@ 6741A9A31BF340DE002C974C /* main.mm in Sources */, 34D3B04F1E38A20C004100F9 /* Bundle+Init.swift in Sources */, 34AB666E1FC5AA330078E451 /* TransportTransitStepsCollectionView.swift in Sources */, + 3D2D79D52C7CF6970062BC3D /* Spacers.swift in Sources */, 993DF11E23F6BDB100AC231A /* UITextViewRenderer.swift in Sources */, F6E2FF5A1E097BA00083EBEC /* MWMNightModeController.m in Sources */, 471A7BB8247FE3C300A0D4C1 /* URL+Query.swift in Sources */, @@ -4580,6 +4746,7 @@ 340708781F2B5D6C00029ECC /* DimBackground.swift in Sources */, 3490D2DF1CE9DD2500D0B838 /* MWMSideButtons.mm in Sources */, 99AAEA76244DA7BF0039D110 /* BottomMenuTransitioning.swift in Sources */, + 52522F482C6DFE460015709C /* AppBackButton.swift in Sources */, F6E2FDF81E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.mm in Sources */, 340B33C61F3AEFDB00A8C1B4 /* MWMRouter+RouteManager.mm in Sources */, F6E2FE191E097BA00083EBEC /* MWMOpeningHoursTimeSpanTableViewCell.mm in Sources */, @@ -4607,14 +4774,18 @@ 337F98B421D3C9F200C8AC27 /* SearchHistoryViewController.swift in Sources */, 3404F49D2028A2430090E401 /* BMCActionsCell.swift in Sources */, F6E2FD8F1E097BA00083EBEC /* MWMNoMapsViewController.mm in Sources */, + 52522F332C6DC7A40015709C /* HomeViewController.swift in Sources */, 993DF12C23F6BDB100AC231A /* Theme.swift in Sources */, 47CA68D8250044C500671019 /* BookmarksListRouter.swift in Sources */, + 52ED91AB2C7302A7000EE25B /* CurrencyRatesDTO.swift in Sources */, 34D3B0421E389D05004100F9 /* MWMEditorTextTableViewCell.m in Sources */, 99F3EB1223F418C900C713F8 /* PlacePageInteractor.swift in Sources */, + 52522F3B2C6DDA750015709C /* ThemeViewModel.swift in Sources */, 340708651F2905A500029ECC /* NavigationInfoArea.swift in Sources */, 993DF0CC23F6BD0600AC231A /* ElevationDetailsPresenter.swift in Sources */, 34AB666B1FC5AA330078E451 /* TransportTransitCell.swift in Sources */, 47E8163323B17734008FD836 /* MWMStorage+UI.m in Sources */, + 3D2D79BA2C7C508E0062BC3D /* SingleEntityCoreDataController.swift in Sources */, 993DF11123F6BDB100AC231A /* UILabelRenderer.swift in Sources */, 34AB66471FC5AA330078E451 /* RouteManagerTableView.swift in Sources */, 52D588BA2C5CE2E800AB96B3 /* Font.swift in Sources */, @@ -4654,6 +4825,8 @@ F6E2FEE51E097BA00083EBEC /* MWMSearchNoResults.m in Sources */, 3DBD7BE42425015C00ED9FE8 /* ParntersStyleSheet.swift in Sources */, F6E2FF631E097BA00083EBEC /* MWMTTSLanguageViewController.mm in Sources */, + 52ED91A32C7200C4000EE25B /* Currency.xcdatamodeld in Sources */, + 52522F462C6DFE060015709C /* AppTopBar.swift in Sources */, 52E2D3A42C59F9CE00A8843A /* WelcomeViewController.swift in Sources */, 4715273524907F8200E91BBA /* BookmarkColorViewController.swift in Sources */, 47E3C7292111E614008B3B27 /* FadeInAnimatedTransitioning.swift in Sources */, @@ -4670,6 +4843,7 @@ CD6E8677226774C700D1EDF7 /* CPConstants.swift in Sources */, 99A906DE23F6F7030005872B /* PlacePageBookmarkViewController.swift in Sources */, 52B573F92C6223CE0047FAC9 /* AuthBackButton.swift in Sources */, + 52522F4A2C6DFE580015709C /* BackButtonWithText.swift in Sources */, F6791B141C43DF0B007A8A6E /* MWMStartButton.m in Sources */, 9977E6A12480E1EE0073780C /* BottomMenuLayerButton.swift in Sources */, 471527372491C20500E91BBA /* SelectBookmarkGroupViewController.swift in Sources */, @@ -4678,6 +4852,7 @@ 34AC8FD11EFC02C000E7F910 /* MWMRoutePoint.mm in Sources */, CDB4D5012231412900104869 /* ListTemplateBuilder.swift in Sources */, 99A906F323FA95AB0005872B /* PlacePageStyleSheet.swift in Sources */, + 52522F2E2C6C9E070015709C /* UserPreferences.swift in Sources */, 6741A9CF1BF340DE002C974C /* MWMLocationAlert.m in Sources */, F6E2FDA11E097BA00083EBEC /* MWMEditorAdditionalNamesTableViewController.mm in Sources */, 4767CDA620AB1F6200BD8166 /* LeftAlignedIconButton.swift in Sources */, @@ -4689,7 +4864,7 @@ 993DF11023F6BDB100AC231A /* MWMButtonRenderer.swift in Sources */, 3463BA671DE81DB90082417F /* MWMTrafficButtonViewController.mm in Sources */, ED79A5D52BDF8D6100952D1F /* SynchronizationError.swift in Sources */, - 5260D3DA2C661FF000C673B4 /* NetworkError.swift in Sources */, + 5260D3DA2C661FF000C673B4 /* ResourceError.swift in Sources */, 993DF10323F6BDB100AC231A /* MainTheme.swift in Sources */, 34AB66051FC5AA320078E451 /* MWMNavigationDashboardManager+Entity.mm in Sources */, 993DF12A23F6BDB100AC231A /* Style.swift in Sources */, @@ -4722,6 +4897,7 @@ F6E2FF481E097BA00083EBEC /* SettingsTableViewSelectableCell.swift in Sources */, ED63CEB92BDF8F9D006155C4 /* SettingsTableViewiCloudSwitchCell.swift in Sources */, 47CA68D4250043C000671019 /* BookmarksListPresenter.swift in Sources */, + 3D2D79D72C7D0AC00062BC3D /* AppTextField.swift in Sources */, 527D5E7F2C60E69C00736A85 /* Layouting.swift in Sources */, F6E2FF451E097BA00083EBEC /* SettingsTableViewLinkCell.swift in Sources */, 34C9BD0A1C6DBCDA000DC38D /* MWMNavigationController.m in Sources */, @@ -4735,11 +4911,13 @@ 99AAEA74244DA5ED0039D110 /* BottomMenuPresentationController.swift in Sources */, 99514BB823E82B450085D3A7 /* ElevationProfilePresenter.swift in Sources */, 34C9BD031C6DB693000DC38D /* MWMTableViewController.m in Sources */, + 52E95F0D2C6C797B00A3FE2E /* ProfileViewController.swift in Sources */, F6E2FD8C1E097BA00083EBEC /* MWMNoMapsView.m in Sources */, 34D3B0361E389D05004100F9 /* MWMEditorSelectTableViewCell.m in Sources */, 990128562449A82500C72B10 /* BottomTabBarView.swift in Sources */, F6E2FD711E097BA00083EBEC /* MWMMapDownloaderTableViewCell.m in Sources */, F6E2FE4F1E097BA00083EBEC /* MWMActionBarButton.m in Sources */, + 3D2D79C12C7C7EA00062BC3D /* PersonalData.xcdatamodeld in Sources */, 47F86CFF20C936FC00FEE291 /* TabView.swift in Sources */, 5260D3CE2C64F60200C673B4 /* APIEndpoints.swift in Sources */, 34AB66741FC5AA330078E451 /* BaseRoutePreviewStatus.swift in Sources */, @@ -4749,11 +4927,13 @@ 8CB13C3B2BF1276A004288F2 /* CarplayPlaceholderView.swift in Sources */, CDB4D4E1222D70DF00104869 /* CarPlayMapViewController.swift in Sources */, 471AB98923AA8A3500F56D49 /* IDownloaderDataSource.swift in Sources */, + 52ED91B02C73030D000EE25B /* PersonalDataDTO.swift in Sources */, EDE243E72B6D55610057369B /* InfoView.swift in Sources */, F692F3831EA0FAF5001E82EB /* MWMAutoupdateController.mm in Sources */, 34BF0CC71C31304A00D097EB /* MWMAuthorizationCommon.mm in Sources */, 527D5E822C60EFEE00736A85 /* UIViewExtensions.swift in Sources */, 34AB664D1FC5AA330078E451 /* RouteManagerFooterView.swift in Sources */, + 3D2D79D32C7CF4F70062BC3D /* PersonalDataViewController.swift in Sources */, 6741A9E01BF340DE002C974C /* MWMDownloaderDialogHeader.mm in Sources */, CDCA2748223FD24600167D87 /* MWMCarPlaySearchResultObject.mm in Sources */, 475ED78824C7D0F30063ADC7 /* ValueStepperView.swift in Sources */, @@ -4764,6 +4944,7 @@ 9989273B2449E60200260CE2 /* BottomMenuBuilder.swift in Sources */, 993DF10F23F6BDB100AC231A /* UIActivityIndicatorRenderer.swift in Sources */, 99A614E423CDD1D900D8D8D0 /* UIButton+RuntimeAttributes.m in Sources */, + 52CD2D852C6F093B00CCC439 /* CurrencyRepository.swift in Sources */, 343E75981E5B1EE20041226A /* MWMCollectionViewController.m in Sources */, 34E776141F14B17F003040B3 /* AvailableArea.swift in Sources */, 34AB66081FC5AA320078E451 /* MWMNavigationDashboardManager.mm in Sources */, @@ -4774,8 +4955,10 @@ 34AB66171FC5AA320078E451 /* MWMiPhoneRoutePreview.m in Sources */, 99A906EA23F6F7030005872B /* PlacePageInfoViewController.swift in Sources */, 993DF11723F6BDB100AC231A /* UINavigationBarRenderer.swift in Sources */, + 52522F312C6CC87C0015709C /* TabBarController.swift in Sources */, 6741A9E71BF340DE002C974C /* MWMCircularProgressView.m in Sources */, 34AC8FDB1EFC07FE00E7F910 /* UILabel+NumberOfVisibleLines.swift in Sources */, + 52ED91A52C72C50F000EE25B /* CurrencyRepositoryImpl.swift in Sources */, ED79A5AD2BD7BA0F00952D1F /* UIApplication+LoadingOverlay.swift in Sources */, 9959C75C24599CCD008FD4FD /* DirectionView.swift in Sources */, 47CA68D62500448D00671019 /* BookmarksListInteractor.swift in Sources */, @@ -4783,6 +4966,7 @@ CDCA2745223FCFD200167D87 /* SearchResultInfo.swift in Sources */, 349A13831DEC138C00C7DB60 /* MWMMobileInternetAlert.m in Sources */, 6741A9EC1BF340DE002C974C /* MWMCircularProgress.m in Sources */, + 3D585BF42C760850005DF71F /* UIScreenExtensions.swift in Sources */, 993DF11923F6BDB100AC231A /* UITextFieldRenderer.swift in Sources */, 5260D3E82C66439400C673B4 /* AuthRepository.swift in Sources */, 342CC5F21C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.mm in Sources */, @@ -4790,10 +4974,15 @@ 3404F4992028A20D0090E401 /* BMCCategoryCell.swift in Sources */, F62607FD207B790300176C5A /* SpinnerAlert.swift in Sources */, 3444DFD21F17620C00E73099 /* MWMMapWidgetsHelper.mm in Sources */, + 3D585BFA2C768C3A005DF71F /* ToastView.swift in Sources */, 3472B5E1200F86C800DC6CD5 /* MWMEditorHelper.mm in Sources */, + 3D2D79CC2C7C8C350062BC3D /* ProfileService.swift in Sources */, 99F3EB1123F418C900C713F8 /* PlacePageBuilder.swift in Sources */, + 52522F402C6DDF290015709C /* CurrencyRates.swift in Sources */, 4735008A23A83CF700661A95 /* DownloadedMapsDataSource.swift in Sources */, + 3D2D79D92C7D15190062BC3D /* PrimaryButton.swift in Sources */, CD9AD96F2281DF3600EC174A /* CategoryInfo.swift in Sources */, + 3D2D79BC2C7C5E300062BC3D /* ProfileRepositoryImpl.swift in Sources */, 3DEE1AEB21F72CD300054A91 /* MWMPowerManagmentViewController.mm in Sources */, 34AB66771FC5AA330078E451 /* TransportRoutePreviewStatus.swift in Sources */, 34D3AFEA1E378AF1004100F9 /* UINib+Init.swift in Sources */, @@ -4804,6 +4993,7 @@ 34AB662F1FC5AA330078E451 /* RouteManagerPresentationController.swift in Sources */, 993F5508237C622700545511 /* DeepLinkRouteStrategyAdapter.mm in Sources */, FA85D43D27958BF500B858E9 /* FaqController.swift in Sources */, + 52ED919F2C71F718000EE25B /* SignUpRequestDTO.swift in Sources */, 99A906ED23F6F7030005872B /* PlacePagePreviewViewController.swift in Sources */, 993DF10223F6BDB100AC231A /* Colors.swift in Sources */, 34AB66201FC5AA330078E451 /* RouteStartButton.swift in Sources */, @@ -4825,8 +5015,10 @@ 47B9065221C7FA400079C85E /* MWMWebImage.m in Sources */, 47A13CAD24BE9AA500027D4F /* DatePickerViewRenderer.swift in Sources */, F6E2FE7C1E097BA00083EBEC /* MWMPlacePageOpeningHoursCell.mm in Sources */, + 3D2D79DD2C7DE34B0062BC3D /* PhotoPickerView.swift in Sources */, 340E1EFB1E2F614400CE49BF /* Storyboard.swift in Sources */, 34E776331F15FAC2003040B3 /* MWMPlacePageManagerHelper.mm in Sources */, + 52ED919D2C71F639000EE25B /* SimpleResponse.swift in Sources */, 462452E92BD052C0004C85E1 /* MWMEditorSegmentedTableViewCell.mm in Sources */, 993DF12D23F6BDB100AC231A /* GlobalStyleSheet.swift in Sources */, F6E2FF361E097BA00083EBEC /* MWMSearchSuggestionCell.mm in Sources */, @@ -4834,6 +5026,7 @@ 477219052243E79500E5B227 /* DrivingOptionsViewController.swift in Sources */, CDB4D4E4222E8FF600104869 /* CarPlayService.swift in Sources */, F6E2FF3C1E097BA00083EBEC /* MWMSearchTableView.m in Sources */, + 52ED91A72C72C58A000EE25B /* CurrencyPersistenceController.swift in Sources */, F6E2FF661E097BA00083EBEC /* MWMTTSSettingsViewController.mm in Sources */, 3454D7C21E07F045004AF2AD /* NSString+Categories.m in Sources */, 34E7761F1F14DB48003040B3 /* PlacePageArea.swift in Sources */, @@ -4851,6 +5044,7 @@ F6E2FE821E097BA00083EBEC /* MWMPlacePageOpeningHoursDayView.m in Sources */, F6E2FD6B1E097BA00083EBEC /* MWMMapDownloaderSubplaceTableViewCell.m in Sources */, CDCA27842245090900167D87 /* ListenerContainer.swift in Sources */, + 52ED91A92C73020A000EE25B /* CurrencyService.swift in Sources */, 5260D3E52C66290500C673B4 /* AuthResponse.swift in Sources */, 47E3C7252111E41B008B3B27 /* DimmedModalPresentationController.swift in Sources */, 52B573F22C61E8980047FAC9 /* SignUpViewController.swift in Sources */, @@ -4859,10 +5053,10 @@ 993DF10D23F6BDB100AC231A /* UIPageControlRenderer.swift in Sources */, FA8E808925F412E2002A1434 /* FirstSession.mm in Sources */, F6E2FF691E097BA00083EBEC /* MWMUnitsController.mm in Sources */, + 52ED91B32C73211F000EE25B /* EntitiesMapping.swift in Sources */, 6741AA031BF340DE002C974C /* MWMActivityViewController.mm in Sources */, CDCA27382237F1BD00167D87 /* BookmarkInfo.swift in Sources */, 993DF11A23F6BDB100AC231A /* UIBarButtonItemRenderer.swift in Sources */, - 52E2D3A62C5A017400A8843A /* HomeViewController.swift in Sources */, 34AB668C1FC5AA330078E451 /* NavigationStreetNameView.swift in Sources */, 993DF12923F6BDB100AC231A /* ThemeManager.swift in Sources */, 337F98A621D37B7400C8AC27 /* SearchTabViewController.swift in Sources */, @@ -4923,7 +5117,9 @@ 99C6532223F2F506004322F3 /* IPlacePageLayout.swift in Sources */, 5260D3D82C64F8BC00C673B4 /* AuthResponseDTO.swift in Sources */, 99F8B4C623B644A6009FF0B4 /* MapStyleSheet.swift in Sources */, + 52CD2D892C6F0AF200CCC439 /* ProfileRepository.swift in Sources */, 99012851244732DB00C72B10 /* BottomTabBarViewController.swift in Sources */, + 52522F3E2C6DDF190015709C /* PersonalData.swift in Sources */, F63AF5061EA6162400A1DB98 /* FilterTypeCell.swift in Sources */, 993DF10623F6BDB100AC231A /* UIColor+rgba.swift in Sources */, 52E95F042C6B71B900A3FE2E /* CombineNetworkHelper.swift in Sources */, @@ -4932,6 +5128,7 @@ 471AB99423ABA3BD00F56D49 /* SearchMapsDataSource.swift in Sources */, 47CA68F1250B54AF00671019 /* BookmarksListCell.swift in Sources */, 471A7BC02481C82500A0D4C1 /* BookmarkTitleCell.swift in Sources */, + 52522F392C6DD9DA0015709C /* ProfileViewModel.swift in Sources */, 47F67D1521CAB21B0069754E /* MWMImageCoder.m in Sources */, 34AB66861FC5AA330078E451 /* MWMNavigationInfoView.mm in Sources */, 34C9BD051C6DB693000DC38D /* MWMViewController.m in Sources */, @@ -4967,7 +5164,9 @@ 674A7E301C0DB10B003D48E1 /* MWMMapWidgets.mm in Sources */, 34AB66291FC5AA330078E451 /* RouteManagerViewController.swift in Sources */, 5260D3D12C64F7F100C673B4 /* SignInRequestDTO.swift in Sources */, + 3DA3FC992C75ED2A0065E4D6 /* changeTheme.swift in Sources */, 3404754D1E081A4600C92850 /* MWMKeyboard.m in Sources */, + 3D2D79DB2C7D15410062BC3D /* SecondaryButton.swift in Sources */, EDE243E52B6D3F400057369B /* OSMView.swift in Sources */, 993DF10C23F6BDB100AC231A /* MWMTableViewCellRenderer.swift in Sources */, 3457C4261F680F1900028233 /* String+BoundingRect.swift in Sources */, @@ -4977,6 +5176,7 @@ F6D67CDC2062B9C00032FD38 /* BCCreateCategoryAlert.swift in Sources */, F6E2FF601E097BA00083EBEC /* MWMSettingsViewController.mm in Sources */, F6E2FE2B1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.m in Sources */, + 3D2D79C32C7C80E60062BC3D /* PersonalDataPersistenceController.swift in Sources */, 34AB66891FC5AA330078E451 /* NavigationControlView.swift in Sources */, 479EE94A2292FB03009DEBA6 /* ActivityIndicator.swift in Sources */, ED3EAC202B03C88100220A4A /* BottomTabBarButton.swift in Sources */, @@ -4986,6 +5186,7 @@ 34B924431DC8A29C0008D971 /* MWMMailViewController.m in Sources */, 340475651E081A4600C92850 /* MWMRouter.mm in Sources */, 47E3C72F2111F472008B3B27 /* CoverVerticalModalTransitioning.swift in Sources */, + 52522F4C2C6E10FD0015709C /* LoadImg.swift in Sources */, 527D5E7B2C60E05D00736A85 /* LanguageUtils.swift in Sources */, 34E776101F14B165003040B3 /* VisibleArea.swift in Sources */, 995F1613244F0AA50060631D /* BottomMenuLayersCell.swift in Sources */, @@ -5001,7 +5202,6 @@ 6741AA2B1BF340DE002C974C /* CircleView.m in Sources */, 4788739220EE326500F6826B /* VerticallyAlignedButton.swift in Sources */, EDFDFB462B7139490013A44C /* AboutInfo.swift in Sources */, - 5260D3EB2C6967DD00C673B4 /* UITextFieldExtensions.swift in Sources */, 3444DFDE1F18A5AF00E73099 /* SideButtonsArea.swift in Sources */, CDCA278622451F5000167D87 /* RouteInfo.swift in Sources */, 3467CEB6202C6FA900D3C670 /* BMCNotificationsCell.swift in Sources */, @@ -5209,7 +5409,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 0; - DEVELOPMENT_TEAM = TKBXS46493; + DEVELOPMENT_TEAM = ZLDHW678M5; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_KEY_CFBundleDisplayName = "${PRODUCT_NAME}"; INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = NO; @@ -5218,7 +5418,7 @@ INFOPLIST_KEY_UIMainStoryboardFile = Main; INFOPLIST_KEY_UIStatusBarHidden = NO; INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -5227,6 +5427,7 @@ OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = app.tourism.tj; PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -5248,7 +5449,7 @@ INFOPLIST_KEY_UIMainStoryboardFile = Main; INFOPLIST_KEY_UIStatusBarHidden = NO; INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -5257,6 +5458,7 @@ OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = app.tourism.tj; PROVISIONING_PROFILE_SPECIFIER = "CarPlay Release"; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -5269,6 +5471,8 @@ DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 9Z6432XD7L; "DEVELOPMENT_TEAM[sdk=macosx*]" = 9Z6432XD7L; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.debug.tests; PROVISIONING_PROFILE_SPECIFIER = ""; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Organic Maps (Debug).app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Organic Maps (Debug)"; @@ -5283,6 +5487,8 @@ CODE_SIGN_STYLE = Manual; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 9Z6432XD7L; "DEVELOPMENT_TEAM[sdk=macosx*]" = 9Z6432XD7L; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.release.tests; PROVISIONING_PROFILE_SPECIFIER = ""; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Organic Maps (Debug).app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Organic Maps (Debug)"; @@ -5404,7 +5610,7 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - 52B573FA2C623ECF0047FAC9 /* XCRemoteSwiftPackageReference "CountryPickerView" */ = { + 5292123B2C7359FC007B97E1 /* XCRemoteSwiftPackageReference "CountryPickerView" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/kizitonwose/CountryPickerView.git"; requirement = { @@ -5412,15 +5618,52 @@ minimumVersion = 3.0.0; }; }; + 529212402C735A61007B97E1 /* XCRemoteSwiftPackageReference "SDWebImageSwiftUI" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/SDWebImage/SDWebImageSwiftUI.git"; + requirement = { + kind = upToNextMinorVersion; + minimumVersion = 3.0.0; + }; + }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 52B573FB2C623ECF0047FAC9 /* CountryPickerView */ = { + 5292123C2C7359FC007B97E1 /* CountryPickerView */ = { isa = XCSwiftPackageProductDependency; - package = 52B573FA2C623ECF0047FAC9 /* XCRemoteSwiftPackageReference "CountryPickerView" */; + package = 5292123B2C7359FC007B97E1 /* XCRemoteSwiftPackageReference "CountryPickerView" */; productName = CountryPickerView; }; + 529212412C735A61007B97E1 /* SDWebImageSwiftUI */ = { + isa = XCSwiftPackageProductDependency; + package = 529212402C735A61007B97E1 /* XCRemoteSwiftPackageReference "SDWebImageSwiftUI" */; + productName = SDWebImageSwiftUI; + }; /* End XCSwiftPackageProductDependency section */ + +/* Begin XCVersionGroup section */ + 3D2D79BF2C7C7EA00062BC3D /* PersonalData.xcdatamodeld */ = { + isa = XCVersionGroup; + children = ( + 3D2D79C02C7C7EA00062BC3D /* PersonalData.xcdatamodel */, + ); + currentVersion = 3D2D79C02C7C7EA00062BC3D /* PersonalData.xcdatamodel */; + name = PersonalData.xcdatamodeld; + path = /Users/llcrebus/Projects/Tourism/iphone/Maps/Tourism/Data/Db/DataModels/PersonalData.xcdatamodeld; + sourceTree = ""; + versionGroupType = wrapper.xcdatamodel; + }; + 52ED91A12C7200C4000EE25B /* Currency.xcdatamodeld */ = { + isa = XCVersionGroup; + children = ( + 52ED91A22C7200C4000EE25B /* CurrencyRates.xcdatamodel */, + ); + currentVersion = 52ED91A22C7200C4000EE25B /* CurrencyRates.xcdatamodel */; + path = Currency.xcdatamodeld; + sourceTree = ""; + versionGroupType = wrapper.xcdatamodel; + }; +/* End XCVersionGroup section */ }; rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; } diff --git a/iphone/Maps/OMaps-Debug.entitlements b/iphone/Maps/OMaps-Debug.entitlements index 06b83f7169..1c80ed4313 100644 --- a/iphone/Maps/OMaps-Debug.entitlements +++ b/iphone/Maps/OMaps-Debug.entitlements @@ -8,8 +8,6 @@ applinks:omaps.app - com.apple.developer.carplay-maps - com.apple.developer.icloud-container-identifiers iCloud.app.organicmaps.debug diff --git a/iphone/Maps/Tourism/Data/Db/CurrencyPersistenceController.swift b/iphone/Maps/Tourism/Data/Db/CurrencyPersistenceController.swift index c1a54bcbb4..3d2f32ee60 100644 --- a/iphone/Maps/Tourism/Data/Db/CurrencyPersistenceController.swift +++ b/iphone/Maps/Tourism/Data/Db/CurrencyPersistenceController.swift @@ -1,84 +1,30 @@ 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() +class CurrencyPersistenceController { + static let shared = CurrencyPersistenceController() + private let coreDataController: SingleEntityCoreDataController - 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)) + private init() { + coreDataController = SingleEntityCoreDataController(modelName: "Currency") } - 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)) - } + var currencyRatesSubject: PassthroughSubject { + return coreDataController.entitySubject + } + + func observeCurrencyRates() { + let fetchRequest: NSFetchRequest = CurrencyRatesEntity.fetchRequest() + let sortDescriptor = NSSortDescriptor(key: "id", ascending: true) + coreDataController.observeEntity(fetchRequest: fetchRequest, sortDescriptor: sortDescriptor) + } + + func updateCurrencyRates(entity: CurrencyRates) -> AnyPublisher { + let fetchRequest: NSFetchRequest = CurrencyRatesEntity.fetchRequest() + return coreDataController.updateEntity(updateBlock: { entityToUpdate in + entityToUpdate.usd = entity.usd + entityToUpdate.eur = entity.eur + entityToUpdate.rub = entity.rub + }, fetchRequest: fetchRequest) } - .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 index d8ca9f3f81..1fb14e28a3 100644 --- a/iphone/Maps/Tourism/Data/Db/DataModels/Currency.xcdatamodeld/CurrencyRates.xcdatamodel/contents +++ b/iphone/Maps/Tourism/Data/Db/DataModels/Currency.xcdatamodeld/CurrencyRates.xcdatamodel/contents @@ -1,6 +1,9 @@ - - + + + + + \ No newline at end of file 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 index 660e645131..9fa30123e4 100644 --- a/iphone/Maps/Tourism/Data/Db/DataModels/PersonalData.xcdatamodeld/PersonalData.xcdatamodel/contents +++ b/iphone/Maps/Tourism/Data/Db/DataModels/PersonalData.xcdatamodeld/PersonalData.xcdatamodel/contents @@ -1,2 +1,12 @@ - \ No newline at end of file + + + + + + + + + + + \ No newline at end of file diff --git a/iphone/Maps/Tourism/Data/Db/EntitiesMapping.swift b/iphone/Maps/Tourism/Data/Db/EntitiesMapping.swift index ff0cba9a94..e91bbb50c4 100644 --- a/iphone/Maps/Tourism/Data/Db/EntitiesMapping.swift +++ b/iphone/Maps/Tourism/Data/Db/EntitiesMapping.swift @@ -3,3 +3,17 @@ extension CurrencyRatesEntity { return CurrencyRates(usd: usd, eur: eur, rub: rub) } } + +extension PersonalDataEntity { + func toPersonalData() -> PersonalData { + return PersonalData( + id: self.id, + fullName: self.fullName ?? "", + country: self.country ?? "", + pfpUrl: self.pfpUrl, + email: self.email ?? "", + language: self.language, + theme: self.theme + ) + } +} diff --git a/iphone/Maps/Tourism/Data/Db/PersonalDataPersistenceController.swift b/iphone/Maps/Tourism/Data/Db/PersonalDataPersistenceController.swift index 1e2b8ef38c..ed265413a2 100644 --- a/iphone/Maps/Tourism/Data/Db/PersonalDataPersistenceController.swift +++ b/iphone/Maps/Tourism/Data/Db/PersonalDataPersistenceController.swift @@ -1,9 +1,34 @@ -// -// PersonalDataPersistenceController.swift -// OMaps -// -// Created by LLC Rebus on 26/08/24. -// Copyright Β© 2024 Organic Maps. All rights reserved. -// +import CoreData +import Combine -import Foundation +class PersonalDataPersistenceController { + static let shared = PersonalDataPersistenceController() + private let coreDataController: SingleEntityCoreDataController + + private init() { + coreDataController = SingleEntityCoreDataController(modelName: "PersonalData") + } + + var personalDataSubject: PassthroughSubject { + return coreDataController.entitySubject + } + + func observePersonalData() { + let fetchRequest: NSFetchRequest = PersonalDataEntity.fetchRequest() + let sortDescriptor = NSSortDescriptor(key: "id", ascending: true) + coreDataController.observeEntity(fetchRequest: fetchRequest, sortDescriptor: sortDescriptor) + } + + func updatePersonalData(personalData: PersonalData) -> AnyPublisher { + let fetchRequest: NSFetchRequest = PersonalDataEntity.fetchRequest() + return coreDataController.updateEntity(updateBlock: { entityToUpdate in + entityToUpdate.id = personalData.id + entityToUpdate.fullName = personalData.fullName + entityToUpdate.country = personalData.country + entityToUpdate.pfpUrl = personalData.pfpUrl + entityToUpdate.email = personalData.email + entityToUpdate.language = personalData.language + entityToUpdate.theme = personalData.theme + }, fetchRequest: fetchRequest) + } +} diff --git a/iphone/Maps/Tourism/Data/Network/DTO/Auth/SignUpRequestDTO.swift b/iphone/Maps/Tourism/Data/Network/DTO/Auth/SignUpRequestDTO.swift index 0595b7300f..47579a2750 100644 --- a/iphone/Maps/Tourism/Data/Network/DTO/Auth/SignUpRequestDTO.swift +++ b/iphone/Maps/Tourism/Data/Network/DTO/Auth/SignUpRequestDTO.swift @@ -1,9 +1,17 @@ -// -// SignUpRequestDTO.swift -// OMaps -// -// Created by Macbook Pro on 18/08/24. -// Copyright Β© 2024 Organic Maps. All rights reserved. -// +struct SignUpRequestDTO: Codable { + let fullName: String + let email: String + let password: String + let passwordConfirmation: String + let country: String +} -import Foundation +extension SignUpRequestDTO { + init(from domainModel: SignUpRequest) { + self.fullName = domainModel.fullName + self.email = domainModel.email + self.password = domainModel.password + self.passwordConfirmation = domainModel.passwordConfirmation + self.country = domainModel.country + } +} diff --git a/iphone/Maps/Tourism/Data/Network/DTO/Profile/CurrencyRatesDTO.swift b/iphone/Maps/Tourism/Data/Network/DTO/Profile/CurrencyRatesDTO.swift index ddcb70bd05..38cbd8c948 100644 --- a/iphone/Maps/Tourism/Data/Network/DTO/Profile/CurrencyRatesDTO.swift +++ b/iphone/Maps/Tourism/Data/Network/DTO/Profile/CurrencyRatesDTO.swift @@ -1,9 +1,26 @@ -// -// CurrencyRatesDTO.swift -// OMaps -// -// Created by Macbook Pro on 19/08/24. -// Copyright Β© 2024 Organic Maps. All rights reserved. -// - import Foundation + +enum CurrencyConversionError: Error { + case invalidData +} + +struct CurrencyRatesDTO: Codable { + let data: CurrencyDataDTO + + struct CurrencyDataDTO: Codable { + let usd: String + let eur: String + let rub: String + } +} + +extension CurrencyRatesDTO { + func toCurrencyRates() throws -> CurrencyRates { + guard let usd = Double(data.usd), + let eur = Double(data.eur), + let rub = Double(data.rub) else { + throw CurrencyConversionError.invalidData + } + return CurrencyRates(usd: usd, eur: eur, rub: rub) + } +} diff --git a/iphone/Maps/Tourism/Data/Network/DTO/Profile/PersonalDataDTO.swift b/iphone/Maps/Tourism/Data/Network/DTO/Profile/PersonalDataDTO.swift index 23b08adc17..13b4517e93 100644 --- a/iphone/Maps/Tourism/Data/Network/DTO/Profile/PersonalDataDTO.swift +++ b/iphone/Maps/Tourism/Data/Network/DTO/Profile/PersonalDataDTO.swift @@ -1,9 +1,27 @@ -// -// PersonalDataDTO.swift -// OMaps -// -// Created by Macbook Pro on 19/08/24. -// Copyright Β© 2024 Organic Maps. All rights reserved. -// - import Foundation + +struct PersonalDataDTO: Codable { + let data: DataDTO + + struct DataDTO: Codable { + let id: Int64 + let fullName: String + let country: String + let avatar: String? + let email: String + let language: String? + let theme: String? + } + + func toPersonalData() -> PersonalData { + return PersonalData( + id: data.id, + fullName: data.fullName, + country: data.country, + pfpUrl: data.avatar, + email: data.email, + language: data.language, + theme: data.theme + ) + } +} diff --git a/iphone/Maps/Tourism/Data/Network/Services/AuthService.swift b/iphone/Maps/Tourism/Data/Network/Services/AuthService.swift index 95ee3de37f..2055376142 100644 --- a/iphone/Maps/Tourism/Data/Network/Services/AuthService.swift +++ b/iphone/Maps/Tourism/Data/Network/Services/AuthService.swift @@ -2,24 +2,22 @@ import Combine import Foundation protocol AuthService { - func signIn(body: SignInRequest) -> AnyPublisher - func signUp(body: SignUpRequest) -> AnyPublisher - func signOut() -> AnyPublisher + func signIn(body: SignInRequestDTO) -> AnyPublisher + func signUp(body: SignUpRequestDTO) -> AnyPublisher + func signOut() -> AnyPublisher } class AuthServiceImpl: AuthService { - private let baseURL = BASE_URL - - func signIn(body: SignInRequest) -> AnyPublisher { + func signIn(body: SignInRequestDTO) -> AnyPublisher { return CombineNetworkHelper.post(path: APIEndpoints.signInUrl, body: body) } - func signUp(body: SignUpRequest) -> AnyPublisher { + func signUp(body: SignUpRequestDTO) -> AnyPublisher { return CombineNetworkHelper.post(path: APIEndpoints.signUpUrl, body: body) } - func signOut() -> AnyPublisher { + func signOut() -> AnyPublisher { return CombineNetworkHelper.postWithoutBody(path: APIEndpoints.signOutUrl) } } diff --git a/iphone/Maps/Tourism/Data/Network/Services/ProfileService.swift b/iphone/Maps/Tourism/Data/Network/Services/ProfileService.swift index c2ea34132e..3b68a9d89d 100644 --- a/iphone/Maps/Tourism/Data/Network/Services/ProfileService.swift +++ b/iphone/Maps/Tourism/Data/Network/Services/ProfileService.swift @@ -1,12 +1,87 @@ import Combine +import Foundation +import UIKit protocol ProfileService { func getPersonalData() -> AnyPublisher + + func updateProfile( + fullName: String, + country: String, + email: String, + pfpUrl: UIImage? + ) -> AnyPublisher + + func updateLanguage(code: String) + + func updateTheme(code: String) } -class PersonalDataServiceImpl: ProfileService { - +class ProfileServiceImpl: ProfileService { func getPersonalData() -> AnyPublisher { return CombineNetworkHelper.get(path: APIEndpoints.getUserUrl) } + + func updateProfile( + fullName: String, + country: String, + email: String, + pfpUrl: UIImage? + ) -> AnyPublisher { + let body = createMultipartFormData(fullName: fullName, country: country, email: email, pfpUrl: pfpUrl) + + let boundary = UUID().uuidString + let headers = ["Content-Type": "multipart/form-data; boundary=\(boundary)"] + + return CombineNetworkHelper.post(path: APIEndpoints.updateProfileUrl, body: body, headers: headers) + } + + func updateLanguage(code: String) { + // TODO: cmon + } + + func updateTheme(code: String) { + // TODO: cmon + } +} + + +func createMultipartFormData(fullName: String, country: String, email: String?, pfpUrl: UIImage?) -> Data { + let boundary = UUID().uuidString + var body = Data() + + let boundaryPrefix = "--\(boundary)\r\n" + + body.appendString(boundaryPrefix) + body.appendString("Content-Disposition: form-data; name=\"fullName\"\r\n\r\n") + body.appendString("\(fullName)\r\n") + + body.appendString(boundaryPrefix) + body.appendString("Content-Disposition: form-data; name=\"country\"\r\n\r\n") + body.appendString("\(country)\r\n") + + if let email = email { + body.appendString(boundaryPrefix) + body.appendString("Content-Disposition: form-data; name=\"email\"\r\n\r\n") + body.appendString("\(email)\r\n") + } + + if let image = pfpUrl, let imageData = image.jpegData(compressionQuality: 0.5) { + body.appendString(boundaryPrefix) + body.appendString("Content-Disposition: form-data; name=\"pfpUrl\"; filename=\"profile.jpg\"\r\n") + body.appendString("Content-Type: image/jpeg\r\n\r\n") + body.append(imageData) + body.appendString("\r\n") + } + + body.appendString("--\(boundary)--\r\n") + return body +} + +extension Data { + mutating func appendString(_ string: String) { + if let data = string.data(using: .utf8) { + append(data) + } + } } diff --git a/iphone/Maps/Tourism/Data/Network/Utils/CombineNetworkHelper.swift b/iphone/Maps/Tourism/Data/Network/Utils/CombineNetworkHelper.swift index 6715f922c4..e477453832 100644 --- a/iphone/Maps/Tourism/Data/Network/Utils/CombineNetworkHelper.swift +++ b/iphone/Maps/Tourism/Data/Network/Utils/CombineNetworkHelper.swift @@ -11,6 +11,9 @@ class CombineNetworkHelper { request.httpMethod = method request.addValue("application/json", forHTTPHeaderField: "Accept") request.setValue("application/json", forHTTPHeaderField: "Content-Type") + if let token = UserPreferences.shared.getToken() { + request.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization") + } headers.forEach { key, value in request.addValue(value, forHTTPHeaderField: key) @@ -29,6 +32,7 @@ class CombineNetworkHelper { static func decodeResponse(data: Data, as type: T.Type = T.self) throws -> T { let decoder = JSONDecoder() + decoder.keyDecodingStrategy = .convertFromSnakeCase return try decoder.decode(type, from: data) } @@ -37,7 +41,7 @@ class CombineNetworkHelper { throw ResourceError.other(message: "Network request error") } - debugPrint("Status Code: \(httpResponse.statusCode)") + print("Status Code: \(httpResponse.statusCode)") switch httpResponse.statusCode { case 200...299: @@ -53,7 +57,7 @@ class CombineNetworkHelper { } static func handleMappingError(_ error: Error) -> ResourceError { - debugPrint("Mapping error: \(error)") + print("Mapping error: \(error)") return error as? ResourceError ?? ResourceError.other(message: "\(error)") } @@ -76,13 +80,18 @@ class CombineNetworkHelper { } // MARK: - HTTP requests - static func get(url: URL, headers: [String: String] = [:], decoder: JSONDecoder = JSONDecoder()) -> AnyPublisher { + static func get(path: String, headers: [String: String] = [:], decoder: JSONDecoder = JSONDecoder()) -> AnyPublisher { + guard let url = URL(string: path) else { + print("Invalid url") + return Fail(error: ResourceError.other(message: "Invalid url")).eraseToAnyPublisher() + } + return performRequest(url: url, method: "GET", headers: headers, decoder: decoder) } static func post(path: String, body: U, headers: [String: String] = [:], decoder: JSONDecoder = JSONDecoder()) -> AnyPublisher { guard let url = URL(string: path) else { - debugPrint("Invalid url") + print("Invalid url") return Fail(error: ResourceError.other(message: "Invalid url")).eraseToAnyPublisher() } @@ -96,7 +105,7 @@ class CombineNetworkHelper { static func postWithoutBody(path: String, headers: [String: String] = [:], decoder: JSONDecoder = JSONDecoder()) -> AnyPublisher { guard let url = URL(string: path) else { - debugPrint("Invalid url") + print("Invalid url") return Fail(error: ResourceError.other(message: "Invalid url")).eraseToAnyPublisher() } diff --git a/iphone/Maps/Tourism/Data/Prefs/UserPreferences.swift b/iphone/Maps/Tourism/Data/Prefs/UserPreferences.swift index 116b2a5de8..83b5a19308 100644 --- a/iphone/Maps/Tourism/Data/Prefs/UserPreferences.swift +++ b/iphone/Maps/Tourism/Data/Prefs/UserPreferences.swift @@ -1,9 +1,63 @@ -// -// UserPreferences.swift -// OMaps -// -// Created by Macbook Pro on 14/08/24. -// Copyright Β© 2024 Organic Maps. All rights reserved. -// - import Foundation + +class UserPreferences { + static let shared = UserPreferences() + + private init() {} + + private let userDefaults = UserDefaults.standard + + struct Language { + let code: String + let name: String + } + + struct Theme { + let code: String + let name: String + } + + var languages: [Language] = [ + Language(code: "ru", name: "Русский"), + Language(code: "en", name: "English") + ] + + var themes: [Theme] = [ + Theme(code: "dark", name: L("dark_theme")), + Theme(code: "light", name: L("light_theme")) + ] + + func getLanguage() -> Language? { + guard let languageCode = userDefaults.string(forKey: "language") else { return nil } + return languages.first { $0.code == languageCode } + } + + func setLanguage(value: String) { + userDefaults.set(value, forKey: "language") + } + + func getTheme() -> Theme? { + guard let themeCode = userDefaults.string(forKey: "theme") else { return nil } + return themes.first { $0.code == themeCode } + } + + func setTheme(value: String?) { + userDefaults.set(value, forKey: "theme") + } + + func getToken() -> String? { + return userDefaults.string(forKey: "token") + } + + func setToken(value: String?) { + userDefaults.set(value, forKey: "token") + } + + func getUserId() -> String? { + return userDefaults.string(forKey: "user_id") + } + + func setUserId(value: String?) { + userDefaults.set(value, forKey: "user_id") + } +} diff --git a/iphone/Maps/Tourism/Data/Repositories/AuthRepositoryImpl.swift b/iphone/Maps/Tourism/Data/Repositories/AuthRepositoryImpl.swift index eefc370382..8b0c4bc2fb 100644 --- a/iphone/Maps/Tourism/Data/Repositories/AuthRepositoryImpl.swift +++ b/iphone/Maps/Tourism/Data/Repositories/AuthRepositoryImpl.swift @@ -7,20 +7,20 @@ class AuthRepositoryImpl: AuthRepository { self.authService = authService } - func signIn(body: SignInRequest) -> AnyPublisher { - return authService.signIn(body: body).map { dto in - AuthResponse.init(from: dto) - } - .eraseToAnyPublisher() + func signIn(body: SignInRequest) -> AnyPublisher { + return authService.signIn(body: SignInRequestDTO.init(from: body)) + .map { dto in AuthResponse.init(from: dto) } + .eraseToAnyPublisher() } - func signUp(body: SignUpRequest) -> AnyPublisher { - return authService.signUp(body: body).map { dto in AuthResponse.init(from: dto) } - .eraseToAnyPublisher() + func signUp(body: SignUpRequest) -> AnyPublisher { + return authService.signUp(body: SignUpRequestDTO.init(from: body)) + .map { dto in AuthResponse.init(from: dto) } + .eraseToAnyPublisher() } - func signOut() -> AnyPublisher { - return authService.signOut().map { dto in AuthResponse.init(from: dto) } - .eraseToAnyPublisher() + func signOut() -> AnyPublisher { + return authService.signOut() + .eraseToAnyPublisher() } } diff --git a/iphone/Maps/Tourism/Data/Repositories/CurrencyRepositoryImpl.swift b/iphone/Maps/Tourism/Data/Repositories/CurrencyRepositoryImpl.swift index 42244cbe7d..6b133ed238 100644 --- a/iphone/Maps/Tourism/Data/Repositories/CurrencyRepositoryImpl.swift +++ b/iphone/Maps/Tourism/Data/Repositories/CurrencyRepositoryImpl.swift @@ -1,9 +1,62 @@ -// -// CurrencyRepositoryImpl.swift -// OMaps -// -// Created by Macbook Pro on 19/08/24. -// Copyright Β© 2024 Organic Maps. All rights reserved. -// - +import Combine import Foundation + +class CurrencyRepositoryImpl: CurrencyRepository { + private let currencyService: CurrencyService + private let persistenceController: CurrencyPersistenceController + + let currencyPassThroughSubject = PassthroughSubject() + + private var cancellables = Set() + + init(currencyService: CurrencyService, currencyPersistenceController: CurrencyPersistenceController) { + self.currencyService = currencyService + self.persistenceController = currencyPersistenceController + } + + func getCurrency() { + // Local persistence subscription + persistenceController.currencyRatesSubject + .compactMap { $0?.toCurrencyRates() } + .sink { completion in + if case let .failure(error) = completion { + print(error.localizedDescription) + self.currencyPassThroughSubject.send(completion: .failure(error)) + } + } receiveValue: { currencyRates in + self.currencyPassThroughSubject.send(currencyRates) + } + .store(in: &cancellables) // Store the cancellable + + persistenceController.observeCurrencyRates() + + // Remote service subscription + currencyService.getCurrencyRates() + .flatMap { [weak self] remoteRates -> AnyPublisher in + guard let self = self else { + print("CurrencyRepositoryImpl/getCurrency/ self was null") + return Fail(error: ResourceError.other(message: "")).eraseToAnyPublisher() + } + + // Update the local database with the fetched remote rates + do { + let newCurrencyRates = try remoteRates.toCurrencyRates() + return self.persistenceController.updateCurrencyRates(entity: newCurrencyRates) + .map { newCurrencyRates } + .eraseToAnyPublisher() + } catch { + print("CurrencyRepositoryImpl/getCurrency/ failed to convert dto to domain model") + return Fail(error: ResourceError.other(message: "")).eraseToAnyPublisher() + } + } + .sink { completion in + if case let .failure(error) = completion { + print(error.localizedDescription) + self.currencyPassThroughSubject.send(completion: .failure(error)) + } + } receiveValue: { currencyRates in + // yes, nothing, we observe anyway + } + .store(in: &cancellables) // Store the cancellable + } +} diff --git a/iphone/Maps/Tourism/Data/Repositories/ProfileRepositoryImpl.swift b/iphone/Maps/Tourism/Data/Repositories/ProfileRepositoryImpl.swift index dafd45de55..2142f72338 100644 --- a/iphone/Maps/Tourism/Data/Repositories/ProfileRepositoryImpl.swift +++ b/iphone/Maps/Tourism/Data/Repositories/ProfileRepositoryImpl.swift @@ -1,9 +1,86 @@ -// -// ProfileRepositoryImpl.swift -// OMaps -// -// Created by LLC Rebus on 26/08/24. -// Copyright Β© 2024 Organic Maps. All rights reserved. -// - import Foundation +import Combine + +class ProfileRepositoryImpl: ProfileRepository { + private let profileService: ProfileService + private let persistenceController: PersonalDataPersistenceController + + let personalDataPassThroughSubject = PassthroughSubject() + + private var cancellables = Set() + + init(personalDataService: ProfileService, personalDataPersistenceController: PersonalDataPersistenceController) { + self.profileService = personalDataService + self.persistenceController = personalDataPersistenceController + } + + func getPersonalData() { + // Local persistence subscription + persistenceController.personalDataSubject + .compactMap { $0?.toPersonalData() } + .sink { completion in + if case let .failure(error) = completion { + print(error.localizedDescription) + self.personalDataPassThroughSubject.send(completion: .failure(error)) + } + } receiveValue: { personalData in + self.personalDataPassThroughSubject.send(personalData) + } + .store(in: &cancellables) // Store the cancellable + + persistenceController.observePersonalData() + + // Remote service subscription + profileService.getPersonalData() + .flatMap { [weak self] remotePersonalData -> AnyPublisher in + guard let self = self else { + print("ProfileRepositoryImpl/getPersonalData/ self was null") + return Fail(error: ResourceError.other(message: "")).eraseToAnyPublisher() + } + + let newPersonalData = remotePersonalData.toPersonalData() + return self.persistenceController.updatePersonalData(personalData: newPersonalData) + .map { newPersonalData } + .eraseToAnyPublisher() + } + .sink { completion in + if case let .failure(error) = completion { + print(error.localizedDescription) + self.personalDataPassThroughSubject.send(completion: .failure(error)) + } + } receiveValue: { personalData in + // Yes, nothing, we observe anyway + } + .store(in: &cancellables) // Store the cancellable + } + + func updateProfile( + fullName: String, + country: String, + email: String, + pfpUrl: UIImage? + ) -> AnyPublisher { + return profileService.updateProfile( + fullName: fullName, + country: country, + email: email, + pfpUrl: pfpUrl + ) + .flatMap{ dto in + let personalData = dto.toPersonalData() + + return self.persistenceController.updatePersonalData(personalData: personalData) + .map { personalData } + .eraseToAnyPublisher() + } + .eraseToAnyPublisher() + } + + func updateLanguage(code: String) { + // TODO: cmon + } + + func updateTheme(code: String) { + // TODO: cmon + } +} diff --git a/iphone/Maps/Tourism/Domain/Models/Auth/AuthResponse.swift b/iphone/Maps/Tourism/Domain/Models/Auth/AuthResponse.swift index b9fab0e135..c988d8341f 100644 --- a/iphone/Maps/Tourism/Domain/Models/Auth/AuthResponse.swift +++ b/iphone/Maps/Tourism/Domain/Models/Auth/AuthResponse.swift @@ -1,9 +1,9 @@ struct AuthResponse: Codable { - let token: String + let token: String } extension AuthResponse { - init(from dto: AuthResponseDTO) { - self.token = dto.token - } + init(from dto: AuthResponseDTO) { + self.token = dto.token + } } diff --git a/iphone/Maps/Tourism/Domain/Models/Auth/SignInRequest.swift b/iphone/Maps/Tourism/Domain/Models/Auth/SignInRequest.swift index 4443bce136..05f1fa0d9d 100644 --- a/iphone/Maps/Tourism/Domain/Models/Auth/SignInRequest.swift +++ b/iphone/Maps/Tourism/Domain/Models/Auth/SignInRequest.swift @@ -1,4 +1,4 @@ struct SignInRequest : Codable { - let email: String - let password: String + let email: String + let password: String } diff --git a/iphone/Maps/Tourism/Domain/Models/Auth/SignUpRequest.swift b/iphone/Maps/Tourism/Domain/Models/Auth/SignUpRequest.swift index 0c0a5b8d85..37759d46ca 100644 --- a/iphone/Maps/Tourism/Domain/Models/Auth/SignUpRequest.swift +++ b/iphone/Maps/Tourism/Domain/Models/Auth/SignUpRequest.swift @@ -1,7 +1,7 @@ struct SignUpRequest: Codable { - let fullName: String - let email: String - let password: String - let passwordConfirmation: String - let country: String + let fullName: String + let email: String + let password: String + let passwordConfirmation: String + let country: String } diff --git a/iphone/Maps/Tourism/Domain/Models/Currency/CurrencyRates.swift b/iphone/Maps/Tourism/Domain/Models/Currency/CurrencyRates.swift index b5a7db5ad7..8b13789179 100644 --- a/iphone/Maps/Tourism/Domain/Models/Currency/CurrencyRates.swift +++ b/iphone/Maps/Tourism/Domain/Models/Currency/CurrencyRates.swift @@ -1,9 +1 @@ -// -// 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 index 1ac8e853f7..be38349817 100644 --- a/iphone/Maps/Tourism/Domain/Models/Profile/CurrencyRates.swift +++ b/iphone/Maps/Tourism/Domain/Models/Profile/CurrencyRates.swift @@ -1,11 +1,7 @@ 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? +struct CurrencyRates { + let usd: Double + let eur: Double + let rub: Double } diff --git a/iphone/Maps/Tourism/Domain/Models/Profile/PersonalData.swift b/iphone/Maps/Tourism/Domain/Models/Profile/PersonalData.swift index 1ac8e853f7..8a3328c7c8 100644 --- a/iphone/Maps/Tourism/Domain/Models/Profile/PersonalData.swift +++ b/iphone/Maps/Tourism/Domain/Models/Profile/PersonalData.swift @@ -1,6 +1,6 @@ import Foundation -struct PersonalData: Identifiable { +struct PersonalData: Identifiable, Codable { let id: Int64 let fullName: String let country: String diff --git a/iphone/Maps/Tourism/Domain/Models/Profile/PersonalDataToSend.swift b/iphone/Maps/Tourism/Domain/Models/Profile/PersonalDataToSend.swift index 42e11e5276..7cb81cd519 100644 --- a/iphone/Maps/Tourism/Domain/Models/Profile/PersonalDataToSend.swift +++ b/iphone/Maps/Tourism/Domain/Models/Profile/PersonalDataToSend.swift @@ -1,9 +1,5 @@ -// -// PersonalDataToSend.swift -// OMaps -// -// Created by LLC Rebus on 28/08/24. -// Copyright Β© 2024 Organic Maps. All rights reserved. -// - -import Foundation +struct PersonalDataToSend : Codable { + let fullName: String + let country: String + let email: String +} diff --git a/iphone/Maps/Tourism/Domain/Models/SimpleResponse.swift b/iphone/Maps/Tourism/Domain/Models/SimpleResponse.swift index ab389feaa5..2b53d95d76 100644 --- a/iphone/Maps/Tourism/Domain/Models/SimpleResponse.swift +++ b/iphone/Maps/Tourism/Domain/Models/SimpleResponse.swift @@ -1,9 +1,3 @@ -// -// SImpleResponse.swift -// OMaps -// -// Created by Macbook Pro on 18/08/24. -// Copyright Β© 2024 Organic Maps. All rights reserved. -// - -import Foundation +struct SimpleResponse : Codable { + let message: String +} diff --git a/iphone/Maps/Tourism/Domain/Repositories/AuthRepository.swift b/iphone/Maps/Tourism/Domain/Repositories/AuthRepository.swift index 6253ac7c8f..ed7775ab7e 100644 --- a/iphone/Maps/Tourism/Domain/Repositories/AuthRepository.swift +++ b/iphone/Maps/Tourism/Domain/Repositories/AuthRepository.swift @@ -2,7 +2,7 @@ import Foundation import Combine protocol AuthRepository { - func signIn(body: SignInRequest) -> AnyPublisher - func signUp(body: SignUpRequest) -> AnyPublisher - func signOut() -> AnyPublisher + func signIn(body: SignInRequest) -> AnyPublisher + func signUp(body: SignUpRequest) -> AnyPublisher + func signOut() -> AnyPublisher } diff --git a/iphone/Maps/Tourism/Domain/Repositories/CurrencyRepository.swift b/iphone/Maps/Tourism/Domain/Repositories/CurrencyRepository.swift index 3b3e34cd16..30954eac49 100644 --- a/iphone/Maps/Tourism/Domain/Repositories/CurrencyRepository.swift +++ b/iphone/Maps/Tourism/Domain/Repositories/CurrencyRepository.swift @@ -1,9 +1,7 @@ -// -// CurrencyRepository.swift -// OMaps -// -// Created by Macbook Pro on 16/08/24. -// Copyright Β© 2024 Organic Maps. All rights reserved. -// +import Combine -import Foundation +protocol CurrencyRepository { + var currencyPassThroughSubject: PassthroughSubject { get } + + func getCurrency() +} diff --git a/iphone/Maps/Tourism/Domain/Repositories/ProfileRepository.swift b/iphone/Maps/Tourism/Domain/Repositories/ProfileRepository.swift index d9e0846b4f..6ffa35248c 100644 --- a/iphone/Maps/Tourism/Domain/Repositories/ProfileRepository.swift +++ b/iphone/Maps/Tourism/Domain/Repositories/ProfileRepository.swift @@ -1,9 +1,19 @@ -// -// ProfileRepository.swift -// OMaps -// -// Created by Macbook Pro on 16/08/24. -// Copyright Β© 2024 Organic Maps. All rights reserved. -// - import Foundation +import Combine + +protocol ProfileRepository { + var personalDataPassThroughSubject: PassthroughSubject { get } + + func getPersonalData() + + func updateProfile( + fullName: String, + country: String, + email: String, + pfpUrl: UIImage? + ) -> AnyPublisher + + func updateLanguage(code: String) + + func updateTheme(code: String) +} diff --git a/iphone/Maps/Tourism/Presentation/Auth/Screens/SignInViewController.swift b/iphone/Maps/Tourism/Presentation/Auth/Screens/SignInViewController.swift index 4111eaba6e..7790ae3da9 100644 --- a/iphone/Maps/Tourism/Presentation/Auth/Screens/SignInViewController.swift +++ b/iphone/Maps/Tourism/Presentation/Auth/Screens/SignInViewController.swift @@ -156,7 +156,7 @@ class SignInViewController: UIViewController { self?.showError(message: error.errorDescription) } }, receiveValue: { response in - self.view.showToast(message: "token: \(response.token)}", duration: 4) + UserPreferences.shared.setToken(value: response.token) } ) .store(in: &cancellables) diff --git a/iphone/Maps/Tourism/Presentation/Auth/Screens/SignUpViewController.swift b/iphone/Maps/Tourism/Presentation/Auth/Screens/SignUpViewController.swift index 1a732b5bc9..04e46a73e3 100644 --- a/iphone/Maps/Tourism/Presentation/Auth/Screens/SignUpViewController.swift +++ b/iphone/Maps/Tourism/Presentation/Auth/Screens/SignUpViewController.swift @@ -216,7 +216,7 @@ class SignUpViewController: UIViewController { self?.showError(message: error.errorDescription) } }, receiveValue: { response in - self.view.showToast(message: "token: \(response.token)}", duration: 4) + UserPreferences.shared.setToken(value: response.token) } ) .store(in: &cancellables) diff --git a/iphone/Maps/Tourism/Presentation/Auth/Screens/WelcomeViewController.swift b/iphone/Maps/Tourism/Presentation/Auth/Screens/WelcomeViewController.swift index 2bd874ecb5..4d30267329 100644 --- a/iphone/Maps/Tourism/Presentation/Auth/Screens/WelcomeViewController.swift +++ b/iphone/Maps/Tourism/Presentation/Auth/Screens/WelcomeViewController.swift @@ -16,7 +16,7 @@ class WelcomeViewController: UIViewController { let label = UILabel() label.text = L("current_language") label.textColor = .white - Font.applyStyle(to: label, style: Font.h4) + UIKitFont.applyStyle(to: label, style: UIKitFont.h4) label.translatesAutoresizingMaskIntoConstraints = false return label }() @@ -33,7 +33,7 @@ class WelcomeViewController: UIViewController { let label = UILabel() label.text = L("welcome_to_tjk") label.textColor = .white - Font.applyStyle(to: label, style: Font.h1) + UIKitFont.applyStyle(to: label, style: UIKitFont.h1) applyWrapContent(label: label) label.translatesAutoresizingMaskIntoConstraints = false return label @@ -63,7 +63,7 @@ class WelcomeViewController: UIViewController { let label = UILabel() label.text = "Β©" label.textColor = .white - Font.applyStyle(to: label, style: Font.h1) + UIKitFont.applyStyle(to: label, style: UIKitFont.h1) label.translatesAutoresizingMaskIntoConstraints = false return label }() @@ -72,7 +72,7 @@ class WelcomeViewController: UIViewController { let label = UILabel() label.text = L("organization_name") label.textColor = .white - Font.applyStyle(to: label, style: Font.h4) + UIKitFont.applyStyle(to: label, style: UIKitFont.h4) applyWrapContent(label: label) label.translatesAutoresizingMaskIntoConstraints = false return label diff --git a/iphone/Maps/Tourism/Presentation/Components/Buttons/PrimaryButton.swift b/iphone/Maps/Tourism/Presentation/Components/Buttons/PrimaryButton.swift index 6810daa3f9..8bbbbd36dd 100644 --- a/iphone/Maps/Tourism/Presentation/Components/Buttons/PrimaryButton.swift +++ b/iphone/Maps/Tourism/Presentation/Components/Buttons/PrimaryButton.swift @@ -1,9 +1,33 @@ -// -// PrimaryButton.swift -// OMaps -// -// Created by LLC Rebus on 27/08/24. -// Copyright Β© 2024 Organic Maps. All rights reserved. -// +import SwiftUI -import Foundation +struct PrimaryButton: View { + var label: String + var onClick: () -> Void + var isLoading: Bool = false + var enabled: Bool = true + + var body: some View { + Button(action: onClick) { + HStack { + if isLoading { + ProgressView() + .progressViewStyle(CircularProgressViewStyle()) + } else { + Text(label) + .font(.headline) + .fontWeight(.bold) + .foregroundColor(Color.onPrimary) + .padding() + .frame(maxWidth: .infinity) + } + } + .frame( + maxWidth: .infinity, + minHeight: 50 + ) + .background(Color.primary) + .cornerRadius(16) + } + .disabled(!enabled || isLoading) + } +} diff --git a/iphone/Maps/Tourism/Presentation/Components/Buttons/SecondaryButton.swift b/iphone/Maps/Tourism/Presentation/Components/Buttons/SecondaryButton.swift index 329e7e2c72..9bb57ad0c0 100644 --- a/iphone/Maps/Tourism/Presentation/Components/Buttons/SecondaryButton.swift +++ b/iphone/Maps/Tourism/Presentation/Components/Buttons/SecondaryButton.swift @@ -1,37 +1,39 @@ 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() - } - } + var label: String + var loading: Bool = false + var icon: (() -> AnyView)? = nil + var onClick: () -> Void + + var body: some View { + Button(action: onClick) { + HStack(alignment: .center) { + 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() - .background(Color.clear) - .overlay( - RoundedRectangle(cornerRadius: 16) - .stroke(Color.primary, lineWidth: 1) - ) } - .padding() + } + .frame( + maxWidth: .infinity, + minHeight: 50 + ) + .background(SwiftUI.Color.clear) + .overlay( + RoundedRectangle(cornerRadius: 16) + .stroke(Color.primary, lineWidth: 1) + ) } + } } diff --git a/iphone/Maps/Tourism/Presentation/Components/CountryAsLabel.swift b/iphone/Maps/Tourism/Presentation/Components/CountryAsLabel.swift index 8432f4ba4e..fb7ef88c41 100644 --- a/iphone/Maps/Tourism/Presentation/Components/CountryAsLabel.swift +++ b/iphone/Maps/Tourism/Presentation/Components/CountryAsLabel.swift @@ -1,9 +1,3 @@ -// -// CountryAsLabel.swift -// OMaps -// -// Created by LLC Rebus on 26/08/24. -// Copyright Β© 2024 Organic Maps. All rights reserved. -// +import UIKit +import CountryPickerView -import Foundation diff --git a/iphone/Maps/Tourism/Presentation/Components/CountryPickerUtils.swift b/iphone/Maps/Tourism/Presentation/Components/CountryPickerUtils.swift index 62e4b479ff..13cd42c81f 100644 --- a/iphone/Maps/Tourism/Presentation/Components/CountryPickerUtils.swift +++ b/iphone/Maps/Tourism/Presentation/Components/CountryPickerUtils.swift @@ -1,12 +1,72 @@ import UIKit +import SwiftUI import CountryPickerView func getCountryPickerView() -> CountryPickerView { let cpv = CountryPickerView() cpv.translatesAutoresizingMaskIntoConstraints = false - cpv.textColor = .white + cpv.textColor = UIKitColor.onBackground cpv.showCountryNameInView = true cpv.showPhoneCodeInView = false cpv.showCountryCodeInView = false return cpv } + +struct UICountryPickerView: UIViewRepresentable { + @State var prevValue: String = "" + let cpv = getCountryPickerView() + let onCountryChanged: (String) -> Void + + init(code: String, onCountryChanged: @escaping (String) -> Void) { + prevValue = code + cpv.setCountryByCode(code) + self.onCountryChanged = onCountryChanged + observeCodeAndUpdate() + } + + func observeCodeAndUpdate() { + Timer.scheduledTimer(withTimeInterval: 0.1, repeats: true) { _ in + if cpv.selectedCountry.code != prevValue { + self.prevValue = cpv.selectedCountry.code + onCountryChanged(cpv.selectedCountry.code) + } + } + } + + func makeUIView(context: Context) -> CountryPickerView { + return cpv + } + + func updateUIView(_ uiView: CountryPickerView, context: Context) { + + } +} + + +func getCountryAsLabel(code: String) -> CountryPickerView { + let cpv = CountryPickerView() + cpv.translatesAutoresizingMaskIntoConstraints = false + cpv.textColor = UIKitColor.onBackground + cpv.font = UIKitFont.h4.font + cpv.showCountryNameInView = true + cpv.showPhoneCodeInView = false + cpv.showCountryCodeInView = false + cpv.isUserInteractionEnabled = false + cpv.setCountryByCode(code) + return cpv +} + +struct UICountryAsLabelView: UIViewRepresentable { + let code: String + init(code: String) { + self.code = code + } + + func makeUIView(context: Context) -> CountryPickerView { + return getCountryAsLabel(code: code) + } + + func updateUIView(_ uiView: CountryPickerView, context: Context) { + // nothing, go home + } +} diff --git a/iphone/Maps/Tourism/Presentation/Components/LoadImg.swift b/iphone/Maps/Tourism/Presentation/Components/LoadImg.swift index 631c33a204..58c7ae83e1 100644 --- a/iphone/Maps/Tourism/Presentation/Components/LoadImg.swift +++ b/iphone/Maps/Tourism/Presentation/Components/LoadImg.swift @@ -1,9 +1,42 @@ -// -// LoadImg.swift -// OMaps -// -// Created by Macbook Pro on 15/08/24. -// Copyright Β© 2024 Organic Maps. All rights reserved. -// +import SwiftUI +import SDWebImageSwiftUI -import Foundation +struct LoadImageView: View { + let url: String? + + @State var isError = false + + var body: some View { + if let urlString = url { + let errorImage = Image(systemName: "error_centered") + WebImage(url: URL(string: urlString)) { image in + image.image?.resizable() + } + .onSuccess(perform: { image, data, cacheType in + isError = false + }) + .onFailure(perform: { error in + isError = true + }) + .indicator(.activity).scaledToFill() + .transition(.fade(duration: 0.2)) + } else { + Text(L("no_image")) + .foregroundColor(Color.surface) + } + } +} + +struct ContentView: View { + let imageUrl = Constants.imageUrlExample + + var body: some View { + LoadImageView(url: imageUrl) + } +} + +struct ContentView_Previews: PreviewProvider { + static var previews: some View { + ContentView() + } +} diff --git a/iphone/Maps/Tourism/Presentation/Components/Nav/AppBackButton.swift b/iphone/Maps/Tourism/Presentation/Components/Nav/AppBackButton.swift index 7809abe12c..d1ffe5c330 100644 --- a/iphone/Maps/Tourism/Presentation/Components/Nav/AppBackButton.swift +++ b/iphone/Maps/Tourism/Presentation/Components/Nav/AppBackButton.swift @@ -6,10 +6,10 @@ struct AppBackButton: View { var body: some View { Button(action: onBackClick) { - Image(systemName: "chevron.left") - .resizable() - .frame(width: 24, height: 24) + Image(systemName: "arrow.left") + .scaleEffect(1.5) .foregroundColor(tint) + .padding(4) } } } diff --git a/iphone/Maps/Tourism/Presentation/Components/Nav/AppTopBar.swift b/iphone/Maps/Tourism/Presentation/Components/Nav/AppTopBar.swift index 7d74150738..4963664207 100644 --- a/iphone/Maps/Tourism/Presentation/Components/Nav/AppTopBar.swift +++ b/iphone/Maps/Tourism/Presentation/Components/Nav/AppTopBar.swift @@ -1,9 +1,58 @@ -// -// AppTopBar.swift -// OMaps -// -// Created by Macbook Pro on 15/08/24. -// Copyright Β© 2024 Organic Maps. All rights reserved. -// +import SwiftUI -import Foundation +struct AppTopBar: View { + var title: String + var onBackClick: (() -> Void)? + var actions: [TopBarActionData] = [] + + var body: some View { + VStack(alignment: .leading) { + HStack { + if let onBackClick = onBackClick { + AppBackButton(onBackClick: onBackClick) + } + + Spacer() + + HStack { + ForEach(actions, id: \.id) { action in + TopBarAction( + iconName: action.iconName, + color: action.color, + onClick: action.onClick + ) + } + } + } + + Text(title) + .textStyle(TextStyle.h1) + .foregroundColor(.primary) + .padding(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 16)) + + Spacer(minLength: 12) + } + } +} + +struct TopBarActionData { + let id = UUID() + let iconName: String + let color: SwiftUI.Color? = nil + let onClick: () -> Void +} + +struct TopBarAction: View { + var iconName: String + var color: SwiftUI.Color? = nil + var onClick: () -> Void + + var body: some View { + Button(action: onClick) { + Image(systemName: iconName) + .resizable() + .frame(width: 24, height: 24) + .foregroundColor(color ?? .primary) + } + } +} diff --git a/iphone/Maps/Tourism/Presentation/Components/PhotoPickerView.swift b/iphone/Maps/Tourism/Presentation/Components/PhotoPickerView.swift index f69c835834..7b986370c7 100644 --- a/iphone/Maps/Tourism/Presentation/Components/PhotoPickerView.swift +++ b/iphone/Maps/Tourism/Presentation/Components/PhotoPickerView.swift @@ -1,9 +1,44 @@ -// -// PhotoPickerView.swift -// OMaps -// -// Created by LLC Rebus on 27/08/24. -// Copyright Β© 2024 Organic Maps. All rights reserved. -// +import SwiftUI -import Foundation +struct ImagePicker: UIViewControllerRepresentable { + @Environment(\.presentationMode) private var presentationMode + var sourceType: UIImagePickerController.SourceType = .photoLibrary + @Binding var selectedImage: UIImage + + func makeUIViewController(context: UIViewControllerRepresentableContext) -> UIImagePickerController { + + let imagePicker = UIImagePickerController() + imagePicker.allowsEditing = false + imagePicker.sourceType = sourceType + imagePicker.delegate = context.coordinator + + return imagePicker + } + + func updateUIViewController(_ uiViewController: UIImagePickerController, context: UIViewControllerRepresentableContext) { + + } + + func makeCoordinator() -> Coordinator { + Coordinator(self) + } + + final class Coordinator: NSObject, UIImagePickerControllerDelegate, UINavigationControllerDelegate { + + var parent: ImagePicker + + init(_ parent: ImagePicker) { + self.parent = parent + } + + func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) { + + if let image = info[UIImagePickerController.InfoKey.originalImage] as? UIImage { + parent.selectedImage = image + } + + parent.presentationMode.wrappedValue.dismiss() + } + + } +} diff --git a/iphone/Maps/Tourism/Presentation/Components/Spacers.swift b/iphone/Maps/Tourism/Presentation/Components/Spacers.swift index 9ee24cf9ca..bee6031e15 100644 --- a/iphone/Maps/Tourism/Presentation/Components/Spacers.swift +++ b/iphone/Maps/Tourism/Presentation/Components/Spacers.swift @@ -1,9 +1,17 @@ -// -// Spacers.swift -// OMaps -// -// Created by LLC Rebus on 26/08/24. -// Copyright Β© 2024 Organic Maps. All rights reserved. -// +import SwiftUI -import Foundation +struct HorizontalSpace: View { + let width: CGFloat + + var body: some View { + Spacer().frame(width: width) + } +} + +struct VerticalSpace: View { + let height: CGFloat + + var body: some View { + Spacer().frame(height: height) + } +} diff --git a/iphone/Maps/Tourism/Presentation/Extensions/UIScreenExtensions.swift b/iphone/Maps/Tourism/Presentation/Extensions/UIScreenExtensions.swift index 3e539835d6..feb312a1fc 100644 --- a/iphone/Maps/Tourism/Presentation/Extensions/UIScreenExtensions.swift +++ b/iphone/Maps/Tourism/Presentation/Extensions/UIScreenExtensions.swift @@ -1,5 +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 +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/Extensions/UIViewControllerExtensions.swift b/iphone/Maps/Tourism/Presentation/Extensions/UIViewControllerExtensions.swift index 92fb270946..a1032f1f20 100644 --- a/iphone/Maps/Tourism/Presentation/Extensions/UIViewControllerExtensions.swift +++ b/iphone/Maps/Tourism/Presentation/Extensions/UIViewControllerExtensions.swift @@ -1,9 +1,37 @@ import UIKit +import SwiftUI extension UIViewController { + func integrateSwiftUIScreen(_ screen: Content) { + let hostingController = UIHostingController(rootView: screen) + + addChild(hostingController) + hostingController.view.frame = view.frame + hostingController.view.backgroundColor = UIKitColor.background + view.addSubview(hostingController.view) + hostingController.didMove(toParent: self) + } + func showAlert(title: String, message: String) { let alert = UIAlertController(title: title, message: message, preferredStyle: .alert) alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil)) present(alert, animated: true, completion: nil) } + + func showToast(message : String) { + let toastLabel = UILabel(frame: CGRect(x: self.view.frame.size.width/2 - 75, y: self.view.frame.size.height-100, width: 150, height: 35)) + toastLabel.backgroundColor = UIColor.black.withAlphaComponent(0.6) + toastLabel.textColor = UIColor.white + toastLabel.textAlignment = .center; + toastLabel.text = message + toastLabel.alpha = 1.0 + toastLabel.layer.cornerRadius = 10; + toastLabel.clipsToBounds = true + self.view.addSubview(toastLabel) + UIView.animate(withDuration: 4.0, delay: 0.1, options: .curveEaseOut, animations: { + toastLabel.alpha = 0.0 + }, completion: {(isCompleted) in + toastLabel.removeFromSuperview() + }) + } } diff --git a/iphone/Maps/Tourism/Presentation/Home/Screens/HomeScreen.swift b/iphone/Maps/Tourism/Presentation/Home/Screens/HomeScreen.swift index 08f01bc5d4..a635996398 100644 --- a/iphone/Maps/Tourism/Presentation/Home/Screens/HomeScreen.swift +++ b/iphone/Maps/Tourism/Presentation/Home/Screens/HomeScreen.swift @@ -1,9 +1,13 @@ - import SwiftUI struct HomeScreen: View { var body: some View { - Text("Oh, Hi Mark!") + VStack() { + VStack(spacing: 10) { + Text("Oh, Hi Mark!") + } + Spacer() + } } } diff --git a/iphone/Maps/Tourism/Presentation/Home/Screens/New Group/HomeViewController.swift b/iphone/Maps/Tourism/Presentation/Home/Screens/New Group/HomeViewController.swift index b705b22a73..457b570614 100644 --- a/iphone/Maps/Tourism/Presentation/Home/Screens/New Group/HomeViewController.swift +++ b/iphone/Maps/Tourism/Presentation/Home/Screens/New Group/HomeViewController.swift @@ -4,12 +4,7 @@ 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) + integrateSwiftUIScreen(HomeScreen()) } } diff --git a/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/AppTextField.swift b/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/AppTextField.swift index 44d1d7e190..d8f32ead57 100644 --- a/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/AppTextField.swift +++ b/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/AppTextField.swift @@ -1,9 +1,66 @@ -// -// AppTextField.swift -// OMaps -// -// Created by LLC Rebus on 27/08/24. -// Copyright Β© 2024 Organic Maps. All rights reserved. -// +import SwiftUI -import Foundation +struct AppTextField: View { + @Binding var value: String + var hint: String + var isError: Bool? = nil + var textFieldHeight: CGFloat = 50 + var hintFontSize: CGFloat = 15 + var textSize: CGFloat = 17 + var errorColor: SwiftUI.Color = SwiftUI.Color.red + var maxLines: Int = 1 + var leadingIcon: (() -> AnyView)? = nil + var trailingIcon: (() -> AnyView)? = nil + + @State private var isFocused: Bool = false + + var body: some View { + VStack(alignment: .leading) { + ZStack(alignment: .leading) { + // Main text field + TextField("", text: $value, onEditingChanged: { isEditing in + isFocused = isEditing + }, onCommit: { + isFocused = false + }) + .font(.system(size: textSize)) + .frame(height: textFieldHeight) + .padding(.leading, leadingIcon != nil ? 40 : 0) + .padding(.trailing, trailingIcon != nil ? 40 : 0) + .background(Color.background) + .padding(.bottom, 5) + .overlay( + // Underline + Rectangle() + .frame(height: 1) + .foregroundColor(colorForState()) + .padding(.top, textFieldHeight / 2) + ) + + // Hint text + Text(hint) + .font(.system(size: hintFontSize)) + .foregroundColor(value.isEmpty ? Color.hint : SwiftUI.Color.clear) + .padding(.bottom, 5) + + if let leadingIcon = leadingIcon { + leadingIcon() + .frame(width: 30, height: 30) + .padding(.leading, 10) + } + + if let trailingIcon = trailingIcon { + trailingIcon() + .frame(width: 30, height: 30) + .padding(.trailing, 10) + } + } + .frame(height: textFieldHeight) + } + } + + private func colorForState() -> SwiftUI.Color { + if isError != nil { return errorColor } + return isFocused ? Color.primary : Color.onBackground + } +} diff --git a/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/PersonalDataViewController.swift b/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/PersonalDataViewController.swift index d215dd9b25..63ecd91670 100644 --- a/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/PersonalDataViewController.swift +++ b/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/PersonalDataViewController.swift @@ -1,9 +1,112 @@ -// -// PersonalDataController.swift -// OMaps -// -// Created by LLC Rebus on 26/08/24. -// Copyright Β© 2024 Organic Maps. All rights reserved. -// +import UIKit +import SwiftUI +import PhotosUI + +class PersonalDataViewController: UIViewController { + private var profileVM: ProfileViewModel + + init(profileVM: ProfileViewModel) { + self.profileVM = profileVM + super.init( + nibName: nil, + bundle: nil + ) + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + override func viewDidLoad() { + super.viewDidLoad() + integrateSwiftUIScreen(PersonalDataScreen(profileVM: profileVM)) + } +} + +struct PersonalDataScreen: View { + @ObservedObject var profileVM: ProfileViewModel + @Environment(\.presentationMode) var presentationMode: Binding + + @State private var showSheet = false + + var body: some View { + ScrollView { + VStack(alignment: .leading) { + AppTopBar( + title: L("personal_data"), + onBackClick: { + presentationMode.wrappedValue.dismiss() + } + ) + VerticalSpace(height: 24) + + HStack(alignment: .center) { + // pfp + Group { + if profileVM.isImagePickerUsed { + Image(uiImage: profileVM.pfpToUpload).resizable() + } else { + LoadImageView(url: profileVM.pfpFromRemote?.absoluteString) + } + } + .scaledToFill() + .frame(width: 100, height: 100) + .clipShape(Circle()) + + Spacer().frame(width: 32) + + // upload photo button + Group { + Image(systemName: "photo.badge.arrow.down") + .foregroundColor(Color.onBackground) + Spacer().frame(width: 8) + + Text(L("upload_photo")) + .textStyle(TextStyle.h4) + } + .onTapGesture { + showSheet = true + } + } + + VerticalSpace(height: 24) + + AppTextField( + value: $profileVM.fullName, + hint: L("full_name") + ) + VerticalSpace(height: 16) + + AppTextField( + value: $profileVM.email, + hint: L("email") + ) + VerticalSpace(height: 24) + + if let code = profileVM.countryCodeName { + UICountryPickerView( + code: code, + onCountryChanged: { code in + profileVM.setCountryCodeName(code) + } + ) + .frame(height: 56) + VerticalSpace(height: 32) + } + + PrimaryButton( + label: L("save"), + onClick: { + + } + ) + } + .padding() + .sheet(isPresented: $showSheet) { + ImagePicker(sourceType: .photoLibrary, selectedImage: $profileVM.pfpToUpload) + } + } + .background(Color.background) + } +} -import Foundation diff --git a/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/ProfileViewController.swift b/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/ProfileViewController.swift index 337bcbf2b3..5d2264b33f 100644 --- a/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/ProfileViewController.swift +++ b/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/ProfileViewController.swift @@ -5,52 +5,62 @@ class ProfileViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - integrateSwiftUIScreen(ProfileScreen()) + let profileVM = ProfileViewModel( + currencyRepository: CurrencyRepositoryImpl( + currencyService: CurrencyServiceImpl(), + currencyPersistenceController: CurrencyPersistenceController.shared + ), + profileRepository: ProfileRepositoryImpl( + personalDataService: ProfileServiceImpl(), + personalDataPersistenceController: PersonalDataPersistenceController.shared + ), + authRepository: AuthRepositoryImpl(authService: AuthServiceImpl()), + userPreferences: UserPreferences.shared + ) + integrateSwiftUIScreen( + ProfileScreen( + profileVM: profileVM, + onPersonalDataClick: { + let destinationVC = PersonalDataViewController(profileVM: profileVM) + self.navigationController?.pushViewController(destinationVC, animated: true) + } + ) + ) } } 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 profileVM: ProfileViewModel + let onPersonalDataClick: () -> Void @ObservedObject var themeVM: ThemeViewModel = ThemeViewModel(userPreferences: UserPreferences.shared) @State private var isSheetOpen = false @State private var signOutLoading = false + @State private var navigateToPersonalData = false @State private var showToast = false - func onPersonalDataClick() { - // TODO: cmon - } - func onLanguageClick () { navigateToLanguageSettings() } var body: some View { + NavigationLink(destination: PersonalDataScreen(profileVM: profileVM), isActive: $navigateToPersonalData) { + EmptyView() + }.hidden() + ScrollView { VStack (alignment: .leading) { AppTopBar(title: L("tourism_profile")) - Spacer().frame(height: 16) + VerticalSpace(height: 16) if let personalData = profileVM.personalData { ProfileBar(personalData: personalData) } - Spacer().frame(height: 32) + VerticalSpace(height: 32) if let currencyRates = profileVM.currencyRates { CurrencyRatesView(currencyRates: currencyRates) - Spacer().frame(height: 20) + VerticalSpace(height: 20) } GenericProfileItem( @@ -60,7 +70,7 @@ struct ProfileScreen: View { onPersonalDataClick() } ) - Spacer().frame(height: 20) + VerticalSpace(height: 20) GenericProfileItem( label: L("language"), @@ -69,9 +79,9 @@ struct ProfileScreen: View { onLanguageClick() } ) - Spacer().frame(height: 20) + VerticalSpace(height: 20) ThemeSwitch(themeViewModel: themeVM) - Spacer().frame(height: 20) + VerticalSpace(height: 20) GenericProfileItem( label: L("sign_out"), @@ -116,7 +126,7 @@ struct ProfileBar: View { .frame(width: 100, height: 100) .clipShape(Circle()) - Spacer().frame(width: 16) + HorizontalSpace(width: 16) VStack(alignment: .leading) { Text(personalData.fullName) @@ -245,16 +255,15 @@ struct SignOutWarning: View { .font(.headline) HStack { - Button("Cancel", action: onCancelClick) - .padding() - .background(SwiftUI.Color.clear) - .cornerRadius(8) + SecondaryButton( + label: L("cancel"), + onClick: onCancelClick + ) - Button("Sign Out", action: onSignOutClick) - .padding() - .background(Color.heartRed) - .foregroundColor(Color.onBackground) - .cornerRadius(8) + PrimaryButton( + label: L("sign_out"), + onClick: onSignOutClick + ) } } .padding() diff --git a/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/ProfileViewModel.swift b/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/ProfileViewModel.swift index 173294534f..479662892a 100644 --- a/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/ProfileViewModel.swift +++ b/iphone/Maps/Tourism/Presentation/Home/Screens/Profile/ProfileViewModel.swift @@ -10,7 +10,10 @@ class ProfileViewModel: ObservableObject { var onMessageToUserRequested: ((String) -> Void)? = nil var onSignOutCompleted: (() -> Void)? = nil - @Published var pfpFile: URL? = nil + @Published var pfpFromRemote: URL? = nil + @Published var pfpToUpload = UIImage() + @Published var isImagePickerUsed: Bool = false + @Published var fullName: String = "" @Published var email: String = "" @Published var countryCodeName: String? = nil @@ -33,12 +36,17 @@ class ProfileViewModel: ObservableObject { // Automatically fetch data when initialized getPersonalData() getCurrency() + $pfpToUpload.sink { image in + if image != self.pfpToUpload { + self.isImagePickerUsed = true + } + }.store(in: &cancellables) } // MARK: - Methods - func setPfpFile(pfpFile: URL) { - self.pfpFile = pfpFile + func setPfp(_ pfp: URL) { + self.pfpFromRemote = pfp } func setFullName(_ value: String) { @@ -61,39 +69,45 @@ class ProfileViewModel: ObservableObject { } } receiveValue: { resource in self.personalData = resource + if let pfpUrl = resource.pfpUrl { + self.pfpFromRemote = URL(string: pfpUrl) + } + self.fullName = resource.fullName + self.email = resource.email + self.countryCodeName = resource.country } .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 save() { + if(!fullName.isEmpty && ((countryCodeName?.isEmpty) != nil) && !email.isEmpty) { + profileRepository.updateProfile( + fullName: fullName, + country: countryCodeName!, + email: email, + pfpUrl: pfpToUpload + ) + .sink { completion in + if case let .failure(error) = completion { + self.onMessageToUserRequested?(error.errorDescription) + } + } receiveValue: { resource in + self.updatePersonalDataInMemory(personalData: resource) + self.onMessageToUserRequested?(L("saved")) + } + .store(in: &cancellables) + } else { + self.onMessageToUserRequested?(L("please_fill_all_fields")) + } + } + + private func updatePersonalDataInMemory(personalData: PersonalData) { + self.fullName = personalData.fullName + self.email = personalData.email + self.countryCodeName = personalData.country + } func getCurrency() { currencyRepository.currencyPassThroughSubject diff --git a/iphone/Maps/Tourism/Presentation/Home/TabBarController.swift b/iphone/Maps/Tourism/Presentation/Home/TabBarController.swift index 96dce38c14..d7dd922f6c 100644 --- a/iphone/Maps/Tourism/Presentation/Home/TabBarController.swift +++ b/iphone/Maps/Tourism/Presentation/Home/TabBarController.swift @@ -6,8 +6,8 @@ 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 homeTab = UITabBarItem(title: L("home"), image: UIImage(systemName: "house"), selectedImage: UIImage(systemName: "house.fill")) + let profileTab = UITabBarItem(title: L("tourism_profile"), image: UIImage(systemName: "person"), selectedImage: UIImage(systemName: "person.fill")) let homeNav = UINavigationController() let profileNav = UINavigationController() @@ -18,8 +18,8 @@ class TabBarController: UITabBarController { homeNav.viewControllers = [homeVC] profileNav.viewControllers = [profileVC] - homeNav.tabBarItem = firstTab - profileNav.tabBarItem = secondTab + homeNav.tabBarItem = homeTab + profileNav.tabBarItem = profileTab viewControllers = [homeNav, profileNav] } diff --git a/iphone/Maps/Tourism/Presentation/Home/ThemeViewMode.swift b/iphone/Maps/Tourism/Presentation/Home/ThemeViewMode.swift deleted file mode 100644 index 3f77c7961f..0000000000 --- a/iphone/Maps/Tourism/Presentation/Home/ThemeViewMode.swift +++ /dev/null @@ -1,9 +0,0 @@ -// -// 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/Home/ThemeViewModel.swift b/iphone/Maps/Tourism/Presentation/Home/ThemeViewModel.swift new file mode 100644 index 0000000000..60bab5bb2f --- /dev/null +++ b/iphone/Maps/Tourism/Presentation/Home/ThemeViewModel.swift @@ -0,0 +1,40 @@ +import Foundation +import Combine + +class ThemeViewModel: ObservableObject { +// private let profileRepository: ProfileRepository + private let userPreferences: UserPreferences + + @Published var theme: UserPreferences.Theme? + + private var cancellables = Set() + + init( +// profileRepository: ProfileRepository, + userPreferences: UserPreferences) { +// self.profileRepository = profileRepository + self.userPreferences = userPreferences + + self.theme = userPreferences.getTheme() + } + + func setTheme(themeCode: String) { + if let newTheme = userPreferences.themes.first(where: { $0.code == themeCode }) { + self.theme = newTheme + userPreferences.setTheme(value: themeCode) + } + } + + func updateThemeOnServer(themeCode: String) { +// profileRepository.updateTheme(themeCode) +// .sink { completion in +// if case let .failure(error) = completion { +// // Handle error if needed +// } +// } receiveValue: { response in +// // Handle success if needed +// } +// .store(in: &cancellables) + } +} + diff --git a/iphone/Maps/Tourism/Presentation/Home/TourismMain.storyboard b/iphone/Maps/Tourism/Presentation/Home/TourismMain.storyboard index 100945f36e..618480fd01 100644 --- a/iphone/Maps/Tourism/Presentation/Home/TourismMain.storyboard +++ b/iphone/Maps/Tourism/Presentation/Home/TourismMain.storyboard @@ -1,23 +1,23 @@ - + - + + - - + - + - + @@ -32,6 +32,7 @@ + @@ -44,8 +45,11 @@ - - - + + + + + + diff --git a/iphone/Maps/Tourism/Presentation/Theme/Color.swift b/iphone/Maps/Tourism/Presentation/Theme/Color.swift index c88548bb5b..0ad515faf3 100644 --- a/iphone/Maps/Tourism/Presentation/Theme/Color.swift +++ b/iphone/Maps/Tourism/Presentation/Theme/Color.swift @@ -1,4 +1,65 @@ +import SwiftUI + class Color { + class var background: SwiftUI.Color { + return SwiftUI.Color("Background") + } + + class var border: SwiftUI.Color { + return SwiftUI.Color("Border") + } + + class var error: SwiftUI.Color { + return SwiftUI.Color("Error") + } + + class var heartRed: SwiftUI.Color { + return SwiftUI.Color("HeartRed") + } + + class var hint: SwiftUI.Color { + return SwiftUI.Color("Hint") + } + + class var onBackground: SwiftUI.Color { + return SwiftUI.Color("OnBackground") + } + + class var onError: SwiftUI.Color { + return SwiftUI.Color("OnError") + } + + class var onPrimary: SwiftUI.Color { + return SwiftUI.Color("OnPrimary") + } + + class var onSelected: SwiftUI.Color { + return SwiftUI.Color("OnSelected") + } + + class var onSurface: SwiftUI.Color { + return SwiftUI.Color("OnSurface") + } + + class var primary: SwiftUI.Color { + return SwiftUI.Color("Primary") + } + + class var selected: SwiftUI.Color { + return SwiftUI.Color("Selected") + } + + class var starYellow: SwiftUI.Color { + return SwiftUI.Color("StarYellow") + } + + class var surface: SwiftUI.Color { + return SwiftUI.Color("Surface") + } +} + + +class UIKitColor { class var background: UIColor { return UIColor(named: "Background")! } diff --git a/iphone/Maps/Tourism/Presentation/Theme/Font.swift b/iphone/Maps/Tourism/Presentation/Theme/Font.swift index 01a665e2a7..8b82cf21cd 100644 --- a/iphone/Maps/Tourism/Presentation/Theme/Font.swift +++ b/iphone/Maps/Tourism/Presentation/Theme/Font.swift @@ -95,6 +95,14 @@ struct TextStyle { let lineHeight: CGFloat } +extension Text { + func textStyle(_ style: TextStyle) -> some View { + self + .font(style.font) + .lineSpacing(style.lineHeight) + } +} + // MARK: - used in UIKit diff --git a/iphone/Maps/Tourism/Presentation/Utils/changeTheme.swift b/iphone/Maps/Tourism/Presentation/Utils/changeTheme.swift index cbc3423973..7d021c03b6 100644 --- a/iphone/Maps/Tourism/Presentation/Utils/changeTheme.swift +++ b/iphone/Maps/Tourism/Presentation/Utils/changeTheme.swift @@ -1,9 +1,4 @@ -// -// changeTheme.swift -// OMaps -// -// Created by LLC Rebus on 21/08/24. -// Copyright Β© 2024 Organic Maps. All rights reserved. -// - -import Foundation +func changeTheme(themeCode: String) { + let style: UIUserInterfaceStyle = (themeCode == "light") ? .light : (themeCode == "dark") ? .dark : .unspecified + UIApplication.shared.keyWindow?.overrideUserInterfaceStyle = style +} diff --git a/routing/routing_integration_tests/jni/Application.mk b/routing/routing_integration_tests/jni/Application.mk deleted file mode 120000 index 43a1529450..0000000000 --- a/routing/routing_integration_tests/jni/Application.mk +++ /dev/null @@ -1 +0,0 @@ -../../../android/UnitTests/jni/Application.mk \ No newline at end of file