Sprint 06 #712
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| // | ||
| // Float+Extensions.swift | ||
| // MovieQuiz | ||
| // | ||
| // Created by Сергей Баскаков on 06.02.2024. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| public extension Float { | ||
| static var randomMovieRating: Float { | ||
| let randomFloat = Float.random(in: 1.0...10.0) | ||
| let intVal:Int = Int(randomFloat*10) | ||
| return Float(intVal)/10.0 | ||
| } | ||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,11 @@ | ||
| import UIKit | ||
|
|
||
| extension UIColor { | ||
| static var ypBlack: UIColor { UIColor(named: "YP Black") ?? UIColor.black } | ||
| static var ypGray: UIColor { UIColor(named: "YP Gray") ?? UIColor.gray } | ||
| static var ypGreen: UIColor { UIColor(named: "YP Green") ?? UIColor.green } | ||
| static var ypRed: UIColor { UIColor(named: "YP Red") ?? UIColor.red } | ||
| static var ypWhite: UIColor { UIColor(named: "YP White") ?? UIColor.white } | ||
| static var ypBackground: UIColor { UIColor(named: "YP Background") ?? UIColor.systemBackground } | ||
|
|
||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| // | ||
| // AlertModel.swift | ||
| // MovieQuiz | ||
| // | ||
| // Created by Сергей Баскаков on 24.01.2024. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| struct AlertModel { | ||
| let title: String | ||
| let message: String | ||
| let buttonText: String | ||
| var buttonAction: (()->Void)? | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| // | ||
| // GameRecord.swift | ||
| // MovieQuiz | ||
| // | ||
| // Created by Сергей Баскаков on 24.01.2024. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| struct GameRecord: Codable { | ||
| let correct: Int | ||
| let total: Int | ||
| let date: Date | ||
|
|
||
| func isBetterThan(_ another: GameRecord) -> Bool { | ||
| correct > another.correct | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| // | ||
| // MostPopularMovies.swift | ||
| // MovieQuiz | ||
| // | ||
| // Created by Сергей Баскаков on 05.02.2024. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| struct MostPopularMovies: Codable { | ||
| let errorMessage: String | ||
| let items: [MostPopularMovie] | ||
| } | ||
|
|
||
| struct MostPopularMovie: Codable { | ||
| let title: String | ||
| let rating: String | ||
| let imageURL: URL | ||
|
|
||
| var resizedImageURL: URL { | ||
| // создаем строку из адреса | ||
| let urlString = imageURL.absoluteString | ||
| // обрезаем лишнюю часть и добавляем модификатор желаемого качества | ||
| let imageUrlString = urlString.components(separatedBy: "._")[0] + "._V0_UX600_.jpg" | ||
|
|
||
| // пытаемся создать новый адрес, если не получается возвращаем старый | ||
| guard let newURL = URL(string: imageUrlString) else { | ||
| return imageURL | ||
| } | ||
|
|
||
| return newURL | ||
| } | ||
|
|
||
| private enum CodingKeys: String, CodingKey { | ||
| case title = "fullTitle" | ||
| case rating = "imDbRating" | ||
| case imageURL = "image" | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| // | ||
| // QuizQuestion.swift | ||
| // MovieQuiz | ||
| // | ||
| // Created by Сергей Баскаков on 24.01.2024. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| struct QuizQuestion { | ||
| let image: Data | ||
| let text: String | ||
| let correctAnswer: Bool | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| // | ||
| // QuizResultsViewModel.swift | ||
| // MovieQuiz | ||
| // | ||
| // Created by Сергей Баскаков on 24.01.2024. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| struct QuizResultsViewModel { | ||
| let title: String | ||
| let text: String | ||
| let buttonText: String | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| // | ||
| // QuizStepViewModel.swift | ||
| // MovieQuiz | ||
| // | ||
| // Created by Сергей Баскаков on 24.01.2024. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| struct QuizStepViewModel { | ||
| let image: UIImage | ||
| let question: String | ||
| let questionNumber: String | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| // | ||
| // AlertPresenter.swift | ||
| // MovieQuiz | ||
| // | ||
| // Created by Сергей Баскаков on 24.01.2024. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| import UIKit | ||
|
|
||
|
There was a problem hiding this comment. UIKit включает в себя Foundation, поэтому можно импортировать только UIKit :) |
||
| final class AlertPresenter: AlertPresenterProtocol { | ||
|
|
||
| weak var delegate: AlertPresenterDelegate? | ||
|
|
||
| func show(alertModel: AlertModel) { | ||
| let alert = UIAlertController( | ||
| title: alertModel.title, | ||
| message: alertModel.message, | ||
| preferredStyle: .alert) | ||
|
|
||
| let action = UIAlertAction( | ||
| title: alertModel.buttonText, | ||
| style: .default, | ||
| handler: { _ in | ||
| alertModel.buttonAction?() | ||
| }) | ||
|
|
||
| alert.addAction(action) | ||
| delegate?.show(alert: alert) | ||
| } | ||
|
|
||
| init(delegate: AlertPresenterDelegate?) { | ||
| self.delegate = delegate | ||
| } | ||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| // | ||
| // AlertPresenterDelegate.swift | ||
| // MovieQuiz | ||
| // | ||
| // Created by Сергей Баскаков on 24.01.2024. | ||
| // | ||
|
|
||
| import Foundation | ||
| import UIKit | ||
|
|
||
| protocol AlertPresenterDelegate: AnyObject { | ||
| func show(alert: UIAlertController) | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| // | ||
| // AlertPresenterProtocol.swift | ||
| // MovieQuiz | ||
| // | ||
| // Created by Сергей Баскаков on 24.01.2024. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| protocol AlertPresenterProtocol: AnyObject { | ||
| var delegate: AlertPresenterDelegate? { get set } | ||
| func show(alertModel: AlertModel) | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
extension не обязательно делать public, так как проект состоит из одного модуля и расширение Float используется только в рамках этого модуля.