-
-
Notifications
You must be signed in to change notification settings - Fork 200
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
TRdailyforecast view swift refactor #227
Open
katsuroo
wants to merge
5
commits into
thoughtbot:master
Choose a base branch
from
katsuroo:TRDailyForecastView-swift-refactor
base: master
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.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
f8d3dfe
Refactored TRDailyForecastView to swift
bb1fd07
Removed unused method
df30646
Added DailyForecast to project & view model setter
9edcd22
Renamed TRDailyForecastView.xib to DailyForecastView.xib
4a612a6
Added line to seperate view model from outlets
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
File renamed without changes.
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,35 @@ | ||
| import UIKit | ||
| import TroposCore | ||
|
|
||
| @objc(TRDailyForecastView) public class DailyForecastView: UIView { | ||
| @IBOutlet var dayOfWeekLabel: UILabel! | ||
| @IBOutlet var highTemperatureLabel: UILabel! | ||
| @IBOutlet var lowTemperatureLabel: UILabel! | ||
| @IBOutlet var conditionsImageView: UIImageView! | ||
| @IBOutlet var contentView: DailyForecastView! | ||
|
|
||
| @objc public var viewModel: DailyForecastViewModel? { | ||
| didSet { | ||
| dayOfWeekLabel.text = viewModel?.dayOfWeek | ||
| conditionsImageView.image = viewModel?.conditionsImage | ||
| highTemperatureLabel.text = viewModel?.highTemperature | ||
| lowTemperatureLabel.text = viewModel?.lowTemperature | ||
| } | ||
| } | ||
|
|
||
| required init?(coder aDecoder: NSCoder) { | ||
| super.init(coder: aDecoder) | ||
| } | ||
|
|
||
| public override func awakeFromNib() { | ||
| super.awakeFromNib() | ||
| let mainBundle = Bundle.main | ||
| mainBundle.loadNibNamed(String(describing: DailyForecastView.self), owner: self) | ||
| addSubview(contentView) | ||
| } | ||
|
|
||
| public override func layoutSubviews() { | ||
| super.layoutSubviews() | ||
| contentView.frame = bounds | ||
| } | ||
| } | ||
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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
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.
Maybe leave an extra line above here to separate this property from the group of
@IBOutletproperties?