Skip to content

Rename resources #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BytePixelMelody wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Rename resources #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions PokemonInfo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
11557B8A2AD734770050EDFF /* UI */,
112B49B32AD53E7100E54E5B /* Services */,
11557B8B2AD734D50050EDFF /* Extentions */,
112B49B22AD53DC900E54E5B /* Resourses */,
112B49B22AD53DC900E54E5B /* Resources */,
112B49B12AD53DA100E54E5B /* Application */,
);
path = PokemonInfo;
Expand All @@ -114,15 +114,15 @@
path = Application;
sourceTree = "<group>";
};
112B49B22AD53DC900E54E5B /* Resourses */ = {
112B49B22AD53DC900E54E5B /* Resources */ = {
isa = PBXGroup;
children = (
11557B982AD810140050EDFF /* Settings.swift */,
112B49A62AD4606200E54E5B /* Assets.xcassets */,
112B49A82AD4606200E54E5B /* LaunchScreen.storyboard */,
112B49AB2AD4606200E54E5B /* Info.plist */,
);
path = Resourses;
path = Resources;
sourceTree = "<group>";
};
112B49B32AD53E7100E54E5B /* Services */ = {
Expand Down
0 ...assets/AccentColor.colorset/Contents.json → ...assets/AccentColor.colorset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...ssets/AppIcon.appiconset/pokemon-logo.jpg → ...ssets/AppIcon.appiconset/pokemon-logo.jpg
View file
Open in desktop
File renamed without changes
0 ...o/Resourses/Assets.xcassets/Contents.json → ...o/Resources/Assets.xcassets/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...ssets/LaunchScreen.imageset/Contents.json → ...ssets/LaunchScreen.imageset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...ts/LaunchScreen.imageset/LaunchScreen.png → ...ts/LaunchScreen.imageset/LaunchScreen.png
View file
Open in desktop
File renamed without changes
0 ...ourses/Base.lproj/LaunchScreen.storyboard → ...ources/Base.lproj/LaunchScreen.storyboard
View file
Open in desktop
File renamed without changes.
0 PokemonInfo/Resourses/Info.plist → PokemonInfo/Resources/Info.plist
View file
Open in desktop
File renamed without changes.
0 PokemonInfo/Resourses/Settings.swift → PokemonInfo/Resources/Settings.swift
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions PokemonInfo/UI/List/ListInteractor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down Expand Up @@ -109,7 +109,6 @@ extension ListInteractor: ListInteractorProtocol {
nextURL = await swiftDataService.fetchNextURL()?.url ?? nextURL
}


private func isReadyToGetPokemons() async -> Bool {
return loadingURLs.insert(nextURL).inserted
}
Expand Down