Properly handle initial start

menubar-apps · Sep 11, 2023 · 55f4b6d · 55f4b6d
1 parent d2d91c0
commit 55f4b6d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 18 deletions.
diff --git a/streak-bar/streak-bar/ViewModel.swift b/streak-bar/streak-bar/ViewModel.swift
@@ -12,7 +12,6 @@ class ViewModel: ObservableObject {
     @Default(.daysBefore) var daysBefore
     @Default(.viewMode) var viewMode
 
-
     private var client = Client()
 
     @Published var contributions: [ContributionWeek] = []
@@ -27,7 +26,7 @@ class ViewModel: ObservableObject {
             case .success(let contributionWeeks):
                 self.contributions = contributionWeeks
             case .failure(_):
-                NSLog("vse ochen ploho")
+                self.contributions = [ContributionWeek(contributionDays: [])]
             }
         }
     }

diff --git a/streak-bar/streak-bar/Views/StatusItemView.swift b/streak-bar/streak-bar/Views/StatusItemView.swift
@@ -17,25 +17,33 @@ struct StatusItemView: View {
     @Default(.viewMode) var viewMode
 
     var body: some View {
-        if viewMode == .week {
-            HStack(alignment: .top, spacing: borders ? 1 : 0) {
-                ForEach(viewModel.contributions, id:\.self) { week in
-                    VStack(alignment: .leading, spacing:  borders ? 1 : 0) {
-                        ForEach(week.contributionDays, id:\.date) { day in
-                            Rectangle()
-                                .fill(Theme.themes[theme]![day.contributionLevel]!.opacity(day.contributionLevel == .NONE && !transparency ? 0.2 : 1))
-                                .frame(width: borders ? 2 : 3, height: borders ? 2 : 3)
+
+        if viewModel.contributions.first?.contributionDays.isEmpty ?? false {
+            RoundedRectangle(cornerRadius: 4)
+                .fill(Theme.themes[theme]![.SECOND_QUARTILE]!.opacity(1))
+                .frame(width: 16, height: 16)
+        }
+        else {
+            if viewMode == .week {
+                HStack(alignment: .top, spacing: borders ? 1 : 0) {
+                    ForEach(viewModel.contributions, id:\.self) { week in
+                        VStack(alignment: .leading, spacing:  borders ? 1 : 0) {
+                            ForEach(week.contributionDays, id:\.date) { day in
+                                Rectangle()
+                                    .fill(Theme.themes[theme]![day.contributionLevel]!.opacity(day.contributionLevel == .NONE && !transparency ? 0.2 : 1))
+                                    .frame(width: borders ? 2 : 3, height: borders ? 2 : 3)
+                            }
                         }
                     }
                 }
-            }
-        } else {
-            HStack(spacing: 1) {
-                ForEach(viewModel.contributions, id:\.self) { week in
-                    ForEach(week.contributionDays, id:\.date) { day in
-                        RoundedRectangle(cornerRadius: 4)
-                            .fill(Theme.themes[theme]![day.contributionLevel]!.opacity(day.contributionLevel == .NONE && !transparency ? 0.2 : 1))
-                            .frame(width: 16, height: 16)
+            } else {
+                HStack(spacing: 1) {
+                    ForEach(viewModel.contributions, id:\.self) { week in
+                        ForEach(week.contributionDays, id:\.date) { day in
+                            RoundedRectangle(cornerRadius: 4)
+                                .fill(Theme.themes[theme]![day.contributionLevel]!.opacity(day.contributionLevel == .NONE && !transparency ? 0.2 : 1))
+                                .frame(width: 16, height: 16)
+                        }
                     }
                 }
             }