Skip to content

Commit

Permalink
Merge pull request #12 from arunaharsa/master
Browse files Browse the repository at this point in the history
fix wrong month components
  • Loading branch information
leverdeterre committed Nov 27, 2014
2 parents 49d0857 + 6def691 commit 7207612
Show file tree
Hide file tree
Showing 5 changed files with 142 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,35 +11,23 @@
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>90DBE7B9464F65CE56F0F72EF9595FADBE306C50</key>
<string>https://github.com/leverdeterre/CalendarIOS7.git</string>
<key>AF35A7A83FF9099F4AF74D1E16D71D18D0829CE0</key>
<string>https://github.com/leverdeterre/JMAnimatedImageView.git</string>
<string>https://github.com/arunaharsa/CalendarIOS7.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>CalendarIOS7/CalendarIOS7.xcodeproj/project.xcworkspace</string>
<string>CalendarIOS7/CalendarIOS7.xcodeproj</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>90DBE7B9464F65CE56F0F72EF9595FADBE306C50</key>
<string>../../..</string>
<key>AF35A7A83FF9099F4AF74D1E16D71D18D0829CE0</key>
<string>../../../..</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>https://github.com/leverdeterre/CalendarIOS7.git</string>
<string>https://github.com/arunaharsa/CalendarIOS7.git</string>
<key>IDESourceControlProjectVersion</key>
<integer>111</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
<string>90DBE7B9464F65CE56F0F72EF9595FADBE306C50</string>
<key>IDESourceControlProjectWCConfigurations</key>
<array>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>AF35A7A83FF9099F4AF74D1E16D71D18D0829CE0</string>
<key>IDESourceControlWCCName</key>
<string></string>
</dict>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0610"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C296444818CC4EDF00D45987"
BuildableName = "CalendarIOS7.app"
BlueprintName = "CalendarIOS7"
ReferencedContainer = "container:CalendarIOS7.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C296446918CC4EE000D45987"
BuildableName = "CalendarIOS7Tests.xctest"
BlueprintName = "CalendarIOS7Tests"
ReferencedContainer = "container:CalendarIOS7.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C296446918CC4EE000D45987"
BuildableName = "CalendarIOS7Tests.xctest"
BlueprintName = "CalendarIOS7Tests"
ReferencedContainer = "container:CalendarIOS7.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C296444818CC4EDF00D45987"
BuildableName = "CalendarIOS7.app"
BlueprintName = "CalendarIOS7"
ReferencedContainer = "container:CalendarIOS7.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C296444818CC4EDF00D45987"
BuildableName = "CalendarIOS7.app"
BlueprintName = "CalendarIOS7"
ReferencedContainer = "container:CalendarIOS7.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C296444818CC4EDF00D45987"
BuildableName = "CalendarIOS7.app"
BlueprintName = "CalendarIOS7"
ReferencedContainer = "container:CalendarIOS7.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>CalendarIOS7.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>C296444818CC4EDF00D45987</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>C296446918CC4EE000D45987</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
4 changes: 2 additions & 2 deletions CalendarIOS7/CalendarIOS7/CalendarIOS7/NSDate+Agenda.m
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ - (NSInteger)dayComponents
- (NSInteger)monthComponents
{
NSCalendar *calendar = [self.class gregorianCalendar];
NSDateComponents *comps = [calendar components: NSDayCalendarUnit fromDate:self];
return comps.day;
NSDateComponents *comps = [calendar components: NSMonthCalendarUnit fromDate:self];
return comps.month;
}

- (NSDate *)startingDate
Expand Down

0 comments on commit 7207612

Please sign in to comment.