-
Notifications
You must be signed in to change notification settings - Fork 169
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.
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
Main.storyboard deleted from the project. #33
Open
vadimrn
wants to merge
207
commits into
Yandex-Practicum:main
Choose a base branch
from
Kolesnikov-Eugene:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
info.plist and build settings reconfigured for developing the project without storyboard. TabBarController configured as rootviewcontroller programmatically. Assets from Figma added to the project. Constants struct created with assets names and for storing constants which will be created later.
CatalogTableViewCell - UI ready. AlertPresenter and AlertPresenter model ready - to show alert when sort button in CatalogVC tapped.
…ch data from server. CatalogResult and Catalog structs to process data. func configureCell created to display received data. Using Combine to update state. Filters are working properly.
…d from server. CatalogFilter storage - to keep last filter chosen by user.
Refactoring, code clean up. CatalogAssembly class to build Catalog view.
…ata are being fetched from server. Loading indicator stops animating when data is loaded and gradient animation of table view cell begins until photos for cells are loaded and presented.
- реализована загрузка данных с сервера - реализована логика пустой корзины
- чистка кода
private init() in CatalogAssembly, AlertPresenter and CatalogFilterStorage.
Changed logic of updating state of CatalogViewModel. Activity indicator while fetching data from server.
…ами представления через панель вкладок в нижней части экрана. На архитектуре MVVM
…х профиля пользователя
…odel отвечает за взаимодействие с сетевым слоем для получения и обновления этих данных.
-перезалита часть файлов из-за ошибок компиляции
Исправлено: обработка ошибок при обнаружении NFT. Теперь, когда происходит ошибка, пользователь получает сообщение об ошибке, а не просто выводится в консоль. Это улучшает пользовательский опыт и делает отладку более понятной.
Добавлен показ алерта при возникновении ошибок в методе observeState класса FavoritesNFTViewController, улучшая обратную связь для пользователя.
…роекта в ветке develop
# Conflicts: # FakeNFT.xcodeproj/project.pbxproj # FakeNFT/AppDelegate.swift # FakeNFT/Assets.xcassets/AccentColor.colorset/Contents.json # FakeNFT/Assets.xcassets/AppIcon.appiconset/Contents.json # FakeNFT/Assets.xcassets/Profile/Contents.json # FakeNFT/Assets.xcassets/Profile/emptyStars.imageset/Contents.json # FakeNFT/Assets.xcassets/Profile/nullImage.imageset/Contents.json # FakeNFT/Assets.xcassets/Profile/plus.imageset/Contents.json # FakeNFT/Assets.xcassets/Profile/sort.imageset/Contents.json # FakeNFT/Assets.xcassets/Profile/stars.imageset/Contents.json # FakeNFT/Assets.xcassets/colors/Contents.json # FakeNFT/Assets.xcassets/images/AppIcon.appiconset/Contents.json # FakeNFT/Assets.xcassets/images/AppIcon.appiconset/image 1.png # FakeNFT/Assets.xcassets/images/Contents.json # FakeNFT/Assets.xcassets/images/add_plus_button.imageset/[email protected] # FakeNFT/Assets.xcassets/images/add_plus_button.imageset/[email protected] # FakeNFT/Assets.xcassets/images/add_plus_button.imageset/[email protected] # FakeNFT/Assets.xcassets/images/add_plus_button.imageset/Contents.json # FakeNFT/Assets.xcassets/images/backward.imageset/Contents.json # FakeNFT/Assets.xcassets/images/cell_stub.imageset/Contents.json # FakeNFT/Assets.xcassets/images/close.imageset/Contents.json # FakeNFT/Assets.xcassets/images/close.imageset/[email protected] # FakeNFT/Assets.xcassets/images/close.imageset/[email protected] # FakeNFT/Assets.xcassets/images/close.imageset/[email protected] # FakeNFT/Assets.xcassets/images/closeWhite.imageset/Contents.json # FakeNFT/Assets.xcassets/images/done_button.imageset/Contents.json # FakeNFT/Assets.xcassets/images/done_button.imageset/[email protected] # FakeNFT/Assets.xcassets/images/done_button.imageset/[email protected] # FakeNFT/Assets.xcassets/images/done_button.imageset/[email protected] # FakeNFT/Assets.xcassets/images/edit.imageset/Contents.json # FakeNFT/Assets.xcassets/images/edit.imageset/[email protected] # FakeNFT/Assets.xcassets/images/edit.imageset/[email protected] # FakeNFT/Assets.xcassets/images/edit.imageset/[email protected] # FakeNFT/Assets.xcassets/images/like_active.imageset/[email protected] # FakeNFT/Assets.xcassets/images/like_active.imageset/Contents.json # FakeNFT/Assets.xcassets/images/like_inactive.imageset/Contents.json # FakeNFT/Assets.xcassets/images/like_inactive.imageset/No [email protected] # FakeNFT/Assets.xcassets/images/profile_stub.imageset/Contents.json # FakeNFT/Assets.xcassets/images/profile_stub.imageset/Property 1=Stub.pdf # FakeNFT/Assets.xcassets/images/star_active.imageset/Contents.json # FakeNFT/Assets.xcassets/images/star_active.imageset/Property 1=12x12, Property 2=Star, Property 3=Active.pdf # FakeNFT/Assets.xcassets/images/star_inactive.imageset/Contents.json # FakeNFT/Assets.xcassets/images/star_inactive.imageset/No Active.pdf # FakeNFT/Assets.xcassets/images/tabbar_basket.imageset/Contents.json # FakeNFT/Assets.xcassets/images/tabbar_basket.imageset/No Active.pdf # FakeNFT/Assets.xcassets/images/tabbar_catalogue.imageset/Contents.json # FakeNFT/Assets.xcassets/images/tabbar_catalogue.imageset/No Active.pdf # FakeNFT/Assets.xcassets/images/tabbar_profile.imageset/Contents.json # FakeNFT/Assets.xcassets/images/tabbar_profile.imageset/No Active.pdf # FakeNFT/Assets.xcassets/images/tabbar_statistics.imageset/Contents.json # FakeNFT/Assets.xcassets/images/tabbar_statistics.imageset/No Active.pdf # FakeNFT/DesignSystem/Colors.swift # FakeNFT/Foundation/MemoryStorage/NftStorage.swift # FakeNFT/Models/Network/Nft.swift # FakeNFT/Resources/Assets.xcassets/AccentColor.colorset/Contents.json # FakeNFT/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json # FakeNFT/Resources/Assets.xcassets/images/Contents.json # FakeNFT/Resources/Assets.xcassets/images/add_plus_button.imageset/Contents.json # FakeNFT/Resources/Assets.xcassets/images/backward.imageset/Contents.json # FakeNFT/Resources/Assets.xcassets/images/close.imageset/Contents.json # FakeNFT/Resources/Assets.xcassets/images/done_button.imageset/Contents.json # FakeNFT/Resources/Assets.xcassets/images/edit.imageset/Contents.json # FakeNFT/Resources/en.lproj/Localizable.strings # FakeNFT/Resources/ru.lproj/Localizable.strings # FakeNFT/SceneDelegate.swift # FakeNFT/Scenes /Common/Protocols/LoadingView.swift # FakeNFT/Scenes /Common/Views/LinePageControl.swift # FakeNFT/Scenes /NftDetails/NftDetailViewController.swift # FakeNFT/Scenes /TabBarController/TabBarController.swift # FakeNFT/Services/NftService.swift # FakeNFT/Services/Requests/RequestConstants.swift # FakeNFT/Services/ServicesAssemly.swift
Vadinur/profile
Добавлена ссылка на скринкаст с демонстрацией профиля на симуляторе
- Исправлены ошибки сборки, возникшие после слияния веток. Проблемы включали Sandbox: swiftlint deny file-read-data и Command PhaseScriptExecution failed. - Добавлена проверка типа процессора в скрипт сборки. Это обеспечивает совместимость SwiftLint с процессорами Apple M1 (arm64), предотвращая возникновение ошибок, связанных с различиями в архитектуре процессоров. - Улучшена стабильность и совместимость проекта на различных платформах.
- пере залита часть файлов из-за ошибок
Vadinur/profile
налажена кнопка likebutton в избранных NFT
добавлен файл readme
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
info.plist and build settings reconfigured for developing the project without storyboard. TabBarController configured as rootviewcontroller programmatically. Assets from Figma added to the project.
Constants struct created with assets names and for storing constants which will be created later.