add circular type to main view top small roll up header thingy

Shared/views/ContentView.swift

@@ -11,7 +11,7 @@ import Charts
 
 struct ContentViewConstants {
     static let maxHeaderHeight = 200.0
-    static let minHeaderHeight = 88.0
+    static let minHeaderHeight = 120.0
 }
 
 struct ContentView: View {
@@ -345,7 +345,7 @@ struct ContentView: View {
                     .opacity(headerOpacity)
                     
                     VStack {
-                        SmallRollUpHeaderView(fakeData: false, backDays: 30)
+                        SmallRollUpHeaderView(fakeData: false, backDays: 30, type: .circular)
                             .background(
                                 Color(theme.currentTheme.secondaryBGColor)
                             )

Shared/views/SmallRollUpHeaderView.swift

@@ -7,11 +7,18 @@
 
 import SwiftUI
 
+enum SmallRollUpHeaderViewType {
+    case text
+    case circular
+}
+
 struct SmallRollUpHeaderView: View {
     var entries = [(Mood, Int)]()
     let backDays: Int
+    let type: SmallRollUpHeaderViewType
     
-    init(fakeData: Bool, backDays: Int) {
+    init(fakeData: Bool, backDays: Int, type: SmallRollUpHeaderViewType) {
+        self.type = type
         self.backDays = backDays
         var moodEntries: [MoodEntry]?
         
@@ -36,29 +43,56 @@ struct SmallRollUpHeaderView: View {
         })
     }
     
+    private var textViews: some View {
+        HStack {
+            ForEach(entries, id: \.0) { (mood, value) in
+                Text(String(value))
+                    .font(.title)
+                    .fontWeight(.bold)
+                    .foregroundColor(mood.color)
+                    .frame(maxWidth: .infinity)
+            }
+        }
+    }
+    
+    private var circularViews: some View {
+        HStack {
+            ForEach(entries, id: \.0) { (mood, value) in
+                Text(String(value))
+                    .font(.title)
+                    .fontWeight(.bold)
+                    .frame(maxWidth: .infinity)
+                    .padding()
+                    .background(Circle().fill(mood.color))
+                    .foregroundColor(Color(UIColor.white))
+            }
+        }
+    }
+    
     var body: some View {
         VStack {
-            HStack {
+            switch self.type {
-                ForEach(entries, id: \.0) { (mood, value) in
+            case .text:
-                    Text(String(value))
+                textViews
-                        .font(.title)
+                    .padding([.trailing, .leading, .top])
-                        .fontWeight(.bold)
+            case .circular:
-                        .foregroundColor(mood.color)
+                circularViews
-                        .frame(maxWidth: .infinity)
+                    .padding([.trailing, .leading, .top])
-                }
             }
             
             Text(String(format: String(localized: "content_view_header_title"), self.backDays))
                 .font(.body)
                 .foregroundColor(Color(UIColor.systemGray))
                 .frame(maxWidth: .infinity, alignment: .center)
-                .padding(.top, 2)
+                .padding(.top, 1)
         }
     }
 }
 
 struct SmallHeaderView_Previews: PreviewProvider {
     static var previews: some View {
-        SmallRollUpHeaderView(fakeData: true, backDays: 30)
+        SmallRollUpHeaderView(fakeData: true, backDays: 30, type: .text)
+        
+        SmallRollUpHeaderView(fakeData: true, backDays: 30, type: .circular)
     }
 }