Merge pull request #2 from blu-Fox/main

artemnovichkov · web-flow · commit 7e11b315f5b8 · 2025-01-04T09:41:35.000+05:00
Fixed aspect ratio error
diff --git a/GithubContributionGraphExample/ContentView.swift b/GithubContributionGraphExample/ContentView.swift
@@ -73,9 +73,8 @@ struct ContentView: View {
         }
         let firstDate = contributions.first!.date
         let lastDate = contributions.last!.date
-        let firstWeek = Calendar.current.component(.weekOfYear, from: firstDate)
-        let lastWeek = Calendar.current.component(.weekOfYear, from: lastDate)
-        return Double(lastWeek - firstWeek + 1) / 7
+        let weeksCount = Calendar.current.dateComponents([.weekOfYear], from: firstDate, to: lastDate).weekOfYear!
+        return Double(weeksCount + 1) / 7
     }
 
     private var colors: [Color] {

Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,8 @@ struct ContentView: View {`
`73`	`73`	`}`
`74`	`74`	`let firstDate = contributions.first!.date`
`75`	`75`	`let lastDate = contributions.last!.date`
`76`		`- let firstWeek = Calendar.current.component(.weekOfYear, from: firstDate)`
`77`		`- let lastWeek = Calendar.current.component(.weekOfYear, from: lastDate)`
`78`		`- return Double(lastWeek - firstWeek + 1) / 7`
	`76`	`+ let weeksCount = Calendar.current.dateComponents([.weekOfYear], from: firstDate, to: lastDate).weekOfYear!`
	`77`	`+ return Double(weeksCount + 1) / 7`
`79`	`78`	`}`
`80`	`79`
`81`	`80`	`private var colors: [Color] {`