Skip to content

update to view current day #133

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update to view current day #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 105 additions & 0 deletions .swiftpm/xcode/xcshareddata/xcschemes/JZCalendarWeekView.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "JZCalendarWeekView"
BuildableName = "JZCalendarWeekView"
BlueprintName = "JZCalendarWeekView"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "JZCalendarWeekViewTests"
BuildableName = "JZCalendarWeekViewTests"
BlueprintName = "JZCalendarWeekViewTests"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "JZCalendarWeekViewExample"
BuildableName = "JZCalendarWeekViewExample"
BlueprintName = "JZCalendarWeekViewExample"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "JZCalendarWeekViewTests"
BuildableName = "JZCalendarWeekViewTests"
BlueprintName = "JZCalendarWeekViewTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "JZCalendarWeekView"
BuildableName = "JZCalendarWeekView"
BlueprintName = "JZCalendarWeekView"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
19 changes: 10 additions & 9 deletions JZCalendarWeekView/JZBaseWeekView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,15 +156,16 @@ open class JZBaseWeekView: UIView {
- visibleTime: WeekView will be scroll to this time, when it appears the **first time**. This visibleTime only determines **y** offset. Defaut value is current time.
- scrollableRange: The scrollable area for this weekView, both start and end dates are included, set nil as unlimited in one side
*/
open func setupCalendar(numOfDays: Int,
setDate: Date,
allEvents: [Date: [JZBaseEvent]],
scrollType: JZScrollType = .pageScroll,
firstDayOfWeek: DayOfWeek? = nil,
currentTimelineType: JZCurrentTimelineType = .section,
visibleTime: Date = Date(),
scrollableRange: (startDate: Date?, endDate: Date?)? = (nil, nil)) {

open func setupCalendar(numOfDays: Int,
setDate: Date,
allEvents: [Date: [JZBaseEvent]],
scrollType: JZScrollType = .pageScroll,
// firstDayOfWeek: DayOfWeek? = nil,
firstDayOfWeek: DayOfWeek? = DayOfWeek(rawValue: Calendar.current.component(.weekday, from: Date())), // Mohamed//firstDayOfWeek: DayOfWeek? = nil,
currentTimelineType: JZCurrentTimelineType = .section,
visibleTime: Date = Date(),
scrollableRange: (startDate: Date?, endDate: Date?)? = (nil, nil)) {

self.numOfDays = numOfDays
if numOfDays == 7 {
updateFirstDayOfWeek(setDate: setDate, firstDayOfWeek: firstDayOfWeek ?? .Sunday)
Expand Down
3 changes: 2 additions & 1 deletion JZCalendarWeekView/JZWeekViewHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ public enum JZHourGridDivision: Int {
}

public enum DayOfWeek: Int {
case Sunday = 1, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday
// case Sunday = 1, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday
case Sunday = 1, Monday = 2 , Tuesday = 3, Wednesday = 4, Thursday = 5, Friday = 6, Saturday = 7
}

public enum JZScrollType {
Expand Down