diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index 278c96ee83..29e7370af7 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -31,6 +31,8 @@ #include "base/assert.hpp" +//#include "storage/storage.hpp" + #include "private.h" // If you have a "missing header error" here, then please run configure.sh script in the root repo // folder. @@ -107,6 +109,12 @@ using namespace osm_auth_ios; - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { NSLog(@"application:didFinishLaunchingWithOptions: %@", launchOptions); + [FileManagerHelper copyProjectFileToDocumentsWithFileName:@"Tajikistan" + fileExtension:@"mwm" + toSubdirectory:@"240429"]; + + GetFramework().LoadMapsSync(); + [HttpThreadImpl setDownloadIndicatorProtocol:self]; InitLocalizedStrings(); diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 94b7662547..f3f1c4a85f 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -614,6 +614,9 @@ CED0E04E2C91A702008C61CA /* UserEntity.swift in Sources */ = {isa = PBXBuildFile; fileRef = CED0E04D2C91A702008C61CA /* UserEntity.swift */; }; E11202462D744BFA001B3B24 /* TourismDB.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = E11202442D744BFA001B3B24 /* TourismDB.xcdatamodeld */; }; E112024A2D7454F3001B3B24 /* CoreDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = E11202492D7454EF001B3B24 /* CoreDataManager.swift */; }; + E153EE3D2D80B3830065233D /* FileManagerUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = E153EE3A2D80B3780065233D /* FileManagerUtils.swift */; }; + E153EE3F2D80C5AC0065233D /* FileManagerBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = E153EE3E2D80C59E0065233D /* FileManagerBridge.mm */; }; + E1E3F8482D7ACCB7002E7BDD /* Tajikistan.mwm in Resources */ = {isa = PBXBuildFile; fileRef = E1E3F8472D7ACCB7002E7BDD /* Tajikistan.mwm */; }; ED0B1C312BC2951F00FB8EDD /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = ED0B1C302BC2951F00FB8EDD /* PrivacyInfo.xcprivacy */; }; ED1080A72B791CFE0023F27E /* SocialMediaCollectionViewHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED1080A62B791CFE0023F27E /* SocialMediaCollectionViewHeader.swift */; }; ED1263AB2B6F99F900AD99F3 /* UIView+AddSeparator.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED1263AA2B6F99F900AD99F3 /* UIView+AddSeparator.swift */; }; @@ -1666,6 +1669,10 @@ CED0E04D2C91A702008C61CA /* UserEntity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserEntity.swift; sourceTree = ""; }; E11202452D744BFA001B3B24 /* TourismDB.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = TourismDB.xcdatamodel; sourceTree = ""; }; E11202492D7454EF001B3B24 /* CoreDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataManager.swift; sourceTree = ""; }; + E153EE3A2D80B3780065233D /* FileManagerUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileManagerUtils.swift; sourceTree = ""; }; + E153EE3E2D80C59E0065233D /* FileManagerBridge.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FileManagerBridge.mm; sourceTree = ""; }; + E153EE402D80C5BE0065233D /* FileManagerBridge.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FileManagerBridge.h; sourceTree = ""; }; + E1E3F8472D7ACCB7002E7BDD /* Tajikistan.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; path = Tajikistan.mwm; sourceTree = ""; }; ED097E762BB80C320006ED01 /* OMapsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OMapsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; ED0B1C302BC2951F00FB8EDD /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; ED1080A62B791CFE0023F27E /* SocialMediaCollectionViewHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SocialMediaCollectionViewHeader.swift; sourceTree = ""; }; @@ -3098,6 +3105,7 @@ 5260D3C72C64F52C00C673B4 /* Resources */ = { isa = PBXGroup; children = ( + E1E3F8472D7ACCB7002E7BDD /* Tajikistan.mwm */, 52D588B62C5CE10200AB96B3 /* Fonts */, 527D5E742C60A1F800736A85 /* Images.xcassets */, ); @@ -3265,6 +3273,9 @@ 527D5E792C60E04900736A85 /* Utils */ = { isa = PBXGroup; children = ( + E153EE402D80C5BE0065233D /* FileManagerBridge.h */, + E153EE3E2D80C59E0065233D /* FileManagerBridge.mm */, + E153EE3A2D80B3780065233D /* FileManagerUtils.swift */, 527D5E7A2C60E05D00736A85 /* LanguageUtils.swift */, CE6450272C99572F0075A59B /* ImageStoreUtils.swift */, ); @@ -4916,6 +4927,7 @@ ED0B1C312BC2951F00FB8EDD /* PrivacyInfo.xcprivacy in Resources */, F64D9CA31C899C760063FA30 /* MWMEditorViralAlert.xib in Resources */, 6741A96D1BF340DE002C974C /* MWMLocationAlert.xib in Resources */, + E1E3F8482D7ACCB7002E7BDD /* Tajikistan.mwm in Resources */, 3406FA191C6E0D8F00E9FAD2 /* MWMMapDownloadDialog.xib in Resources */, A630D1EA207CA95900976DEA /* Localizable.stringsdict in Resources */, 52D588C92C5CEAF900AB96B3 /* Gilroy-Medium.ttf in Resources */, @@ -5077,6 +5089,7 @@ F6E2FDF81E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.mm in Sources */, 340B33C61F3AEFDB00A8C1B4 /* MWMRouter+RouteManager.mm in Sources */, F6E2FE191E097BA00083EBEC /* MWMOpeningHoursTimeSpanTableViewCell.mm in Sources */, + E153EE3D2D80B3830065233D /* FileManagerUtils.swift in Sources */, 4757D6212535BB6E0062364F /* BookmarksListInterfaces.swift in Sources */, F6E2FDEC1E097BA00083EBEC /* MWMOpeningHoursAddClosedTableViewCell.mm in Sources */, 99C964292428C0F700E41723 /* PlacePageHeaderPresenter.swift in Sources */, @@ -5448,6 +5461,7 @@ 6741AA0B1BF340DE002C974C /* MWMMapViewControlsManager.mm in Sources */, F6E2FED91E097BA00083EBEC /* MWMSearchContentView.m in Sources */, EDFDFB4C2B722C9C0013A44C /* InfoTableViewCell.swift in Sources */, + E153EE3F2D80C5AC0065233D /* FileManagerBridge.mm in Sources */, 5260D3DE2C66237700C673B4 /* AuthService.swift in Sources */, 47CA68F8250F8AB700671019 /* BookmarksListSectionHeader.swift in Sources */, CED0E0172C8ACF0D008C61CA /* RoundedCornerShape.swift in Sources */, diff --git a/iphone/Maps/Tourism/Resources/Tajikistan.mwm b/iphone/Maps/Tourism/Resources/Tajikistan.mwm new file mode 100644 index 0000000000..c8be6efb1a Binary files /dev/null and b/iphone/Maps/Tourism/Resources/Tajikistan.mwm differ diff --git a/iphone/Maps/Tourism/Utils/FileManagerBridge.h b/iphone/Maps/Tourism/Utils/FileManagerBridge.h new file mode 100644 index 0000000000..49b19d9d6d --- /dev/null +++ b/iphone/Maps/Tourism/Utils/FileManagerBridge.h @@ -0,0 +1,14 @@ +#ifndef FileManagerBridge_h +#define FileManagerBridge_h + +#ifdef __cplusplus +extern "C" { +#endif + +void copyFileToDocuments(const char* fileName, const char* fileExtension, const char* subdirectory); + +#ifdef __cplusplus +} +#endif + +#endif /* FileManagerBridge_h */ diff --git a/iphone/Maps/Tourism/Utils/FileManagerBridge.mm b/iphone/Maps/Tourism/Utils/FileManagerBridge.mm new file mode 100644 index 0000000000..2250ccc327 --- /dev/null +++ b/iphone/Maps/Tourism/Utils/FileManagerBridge.mm @@ -0,0 +1,13 @@ +#import "FileManagerBridge.h" +#import "SwiftBridge.h" + +void copyFileToDocuments(const char* fileName, const char* fileExtension, const char* subdirectory) { + NSString *nsFileName = [NSString stringWithUTF8String:fileName]; + NSString *nsFileExtension = [NSString stringWithUTF8String:fileExtension]; + NSString *nsSubdirectory = [NSString stringWithUTF8String:subdirectory]; + + [FileManagerHelper copyProjectFileToDocumentsWithFileName:nsFileName + fileExtension:nsFileExtension + toSubdirectory:nsSubdirectory]; +} + diff --git a/iphone/Maps/Tourism/Utils/FileManagerUtils.swift b/iphone/Maps/Tourism/Utils/FileManagerUtils.swift new file mode 100644 index 0000000000..cdd65287f8 --- /dev/null +++ b/iphone/Maps/Tourism/Utils/FileManagerUtils.swift @@ -0,0 +1,42 @@ +import Foundation + +@objc class FileManagerHelper: NSObject { + + + @objc static func copyProjectFileToDocuments(fileName: String, fileExtension: String, toSubdirectory subdirectory: String) { + let fileManager = FileManager.default + + guard let bundleURL = Bundle.main.url(forResource: fileName, withExtension: fileExtension) else { + print("File not found in bundle.") + return + } + + if let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask).first { + let subdirectoryURL = documentsDirectory.appendingPathComponent(subdirectory) + + if !fileManager.fileExists(atPath: subdirectoryURL.path) { + do { + try fileManager.createDirectory(at: subdirectoryURL, withIntermediateDirectories: true, attributes: nil) + print("Created directory: \(subdirectoryURL.path)") + } catch { + print("Error creating directory: \(error.localizedDescription)") + return + } + } + + let destinationURL = subdirectoryURL.appendingPathComponent("\(fileName).\(fileExtension)") + + do { + if fileManager.fileExists(atPath: destinationURL.path) { + print("File already exists at: \(destinationURL.path)") + } else { + try fileManager.copyItem(at: bundleURL, to: destinationURL) + print("File copied successfully to: \(destinationURL.path)") + } + } catch { + print("Error copying file: \(error.localizedDescription)") + } + } + } +} +