diff --git a/PokemonInfo.xcodeproj/project.pbxproj b/PokemonInfo.xcodeproj/project.pbxproj index af2c017..b40c728 100644 --- a/PokemonInfo.xcodeproj/project.pbxproj +++ b/PokemonInfo.xcodeproj/project.pbxproj @@ -99,7 +99,7 @@ 11557B8A2AD734770050EDFF /* UI */, 112B49B32AD53E7100E54E5B /* Services */, 11557B8B2AD734D50050EDFF /* Extentions */, - 112B49B22AD53DC900E54E5B /* Resourses */, + 112B49B22AD53DC900E54E5B /* Resources */, 112B49B12AD53DA100E54E5B /* Application */, ); path = PokemonInfo; @@ -114,7 +114,7 @@ path = Application; sourceTree = ""; }; - 112B49B22AD53DC900E54E5B /* Resourses */ = { + 112B49B22AD53DC900E54E5B /* Resources */ = { isa = PBXGroup; children = ( 11557B982AD810140050EDFF /* Settings.swift */, @@ -122,7 +122,7 @@ 112B49A82AD4606200E54E5B /* LaunchScreen.storyboard */, 112B49AB2AD4606200E54E5B /* Info.plist */, ); - path = Resourses; + path = Resources; sourceTree = ""; }; 112B49B32AD53E7100E54E5B /* Services */ = { diff --git a/PokemonInfo/Resourses/Assets.xcassets/AccentColor.colorset/Contents.json b/PokemonInfo/Resources/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from PokemonInfo/Resourses/Assets.xcassets/AccentColor.colorset/Contents.json rename to PokemonInfo/Resources/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/PokemonInfo/Resourses/Assets.xcassets/AppIcon.appiconset/Contents.json b/PokemonInfo/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from PokemonInfo/Resourses/Assets.xcassets/AppIcon.appiconset/Contents.json rename to PokemonInfo/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/PokemonInfo/Resourses/Assets.xcassets/AppIcon.appiconset/pokemon-logo.jpg b/PokemonInfo/Resources/Assets.xcassets/AppIcon.appiconset/pokemon-logo.jpg similarity index 100% rename from PokemonInfo/Resourses/Assets.xcassets/AppIcon.appiconset/pokemon-logo.jpg rename to PokemonInfo/Resources/Assets.xcassets/AppIcon.appiconset/pokemon-logo.jpg diff --git a/PokemonInfo/Resourses/Assets.xcassets/Contents.json b/PokemonInfo/Resources/Assets.xcassets/Contents.json similarity index 100% rename from PokemonInfo/Resourses/Assets.xcassets/Contents.json rename to PokemonInfo/Resources/Assets.xcassets/Contents.json diff --git a/PokemonInfo/Resourses/Assets.xcassets/LaunchScreen.imageset/Contents.json b/PokemonInfo/Resources/Assets.xcassets/LaunchScreen.imageset/Contents.json similarity index 100% rename from PokemonInfo/Resourses/Assets.xcassets/LaunchScreen.imageset/Contents.json rename to PokemonInfo/Resources/Assets.xcassets/LaunchScreen.imageset/Contents.json diff --git a/PokemonInfo/Resourses/Assets.xcassets/LaunchScreen.imageset/LaunchScreen.png b/PokemonInfo/Resources/Assets.xcassets/LaunchScreen.imageset/LaunchScreen.png similarity index 100% rename from PokemonInfo/Resourses/Assets.xcassets/LaunchScreen.imageset/LaunchScreen.png rename to PokemonInfo/Resources/Assets.xcassets/LaunchScreen.imageset/LaunchScreen.png diff --git a/PokemonInfo/Resourses/Base.lproj/LaunchScreen.storyboard b/PokemonInfo/Resources/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from PokemonInfo/Resourses/Base.lproj/LaunchScreen.storyboard rename to PokemonInfo/Resources/Base.lproj/LaunchScreen.storyboard diff --git a/PokemonInfo/Resourses/Info.plist b/PokemonInfo/Resources/Info.plist similarity index 100% rename from PokemonInfo/Resourses/Info.plist rename to PokemonInfo/Resources/Info.plist diff --git a/PokemonInfo/Resourses/Settings.swift b/PokemonInfo/Resources/Settings.swift similarity index 100% rename from PokemonInfo/Resourses/Settings.swift rename to PokemonInfo/Resources/Settings.swift diff --git a/PokemonInfo/UI/List/ListInteractor.swift b/PokemonInfo/UI/List/ListInteractor.swift index 52c319f..d369400 100644 --- a/PokemonInfo/UI/List/ListInteractor.swift +++ b/PokemonInfo/UI/List/ListInteractor.swift @@ -51,7 +51,7 @@ final actor ListInteractor { } } } - private var pokemonsDic: [Int: Pokemon] = [:] // TODO: Make actor + private var pokemonsDic: [Int: Pokemon] = [:] private var pokemons: [Pokemon] { return pokemonsDic .sorted { $0.key < $1.key } @@ -109,7 +109,6 @@ extension ListInteractor: ListInteractorProtocol { nextURL = await swiftDataService.fetchNextURL()?.url ?? nextURL } - private func isReadyToGetPokemons() async -> Bool { return loadingURLs.insert(nextURL).inserted }