Skip to content

change first weekday possibility #2

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: main
Choose a base branch
from
Open

change first weekday possibility #2

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
17 changes: 15 additions & 2 deletions MultiDatePickerApp/MultiDatePicker Source/Components/MDPModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,16 @@ class MDPModel: NSObject, ObservableObject {
@Published var selections = [Date]()

// the localized days of the week
let dayNames = Calendar.current.shortWeekdaySymbols
var dayNames: [String] {
if Calendar.current.firstWeekday == 2 {
var array = Calendar.current.shortWeekdaySymbols
let fDay = array.removeFirst()
array.append(fDay)
return array
} else {
return Calendar.current.shortWeekdaySymbols
}
}

// MARK: - PRIVATE VARS

Expand Down Expand Up @@ -232,7 +241,11 @@ extension MDPModel {
let range = calendar.range(of: .day, in: .month, for: date)!
let numDays = range.count

let ord = calendar.component(.weekday, from: date)
var ord: Int {
let tmp = calendar.firstWeekday == 2 ? calendar.component(.weekday, from: date) - 1 : calendar.component(.weekday, from: date)
return tmp == 0 ? 7 : tmp
}

var index = 0

let today = Date()
Expand Down