This repository has been archived by the owner on Jun 23, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 104
Show the actual month of the selected date #48
Open
whoislyuboanyway
wants to merge
5
commits into
shoheiyokoyama:master
Choose a base branch
from
whoislyuboanyway:master
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.
+48
−5
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
fa3582e
Show border instead of filled background
whoislyuboanyway 5b07840
# Show the actual month of the selected date
whoislyuboanyway 5a3fc1f
Merge pull request #1 from whoislyuboanyway/show-border-instead-of-fi…
whoislyuboanyway f17d2a3
Update version
whoislyuboanyway b856797
Update README.md
whoislyuboanyway 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
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
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 |
---|---|---|
|
@@ -8,7 +8,16 @@ | |
|
||
import UIKit | ||
|
||
public enum MonthType { case previous, current, next } | ||
public enum MonthType: Equatable { case previous, current, next, specific(diff: Int) } | ||
public func ==(lhs: MonthType, rhs: MonthType) -> Bool { | ||
switch (lhs, rhs) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You should define this function in |
||
case (.previous, .previous): return true | ||
case (.next, .next): return true | ||
case (.current, .current): return true | ||
case (.specific(let leftFrom), .specific(let rightFrom)): return leftFrom == rightFrom | ||
default: return false | ||
} | ||
} | ||
|
||
final class DateModel: NSObject { | ||
|
||
|
@@ -347,6 +356,7 @@ private extension DateModel { | |
case .previous: return -1 | ||
case .current: return 0 | ||
case .next: return 1 | ||
case .specific(let diff): return diff | ||
} | ||
}() | ||
return calendar.date(byAdding: components, to: currentDate) ?? Date() | ||
|
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
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.
This change shouldn't be included in this pull request.