everything changed

This commit is contained in:
Trey t
2022-02-20 14:33:58 -06:00
parent 1cf38cb854
commit 0035f61204
50 changed files with 2155 additions and 875 deletions

View File

@@ -9,9 +9,10 @@ import SwiftUI
struct SmallRollUpHeaderView: View {
@Binding var viewType: MainSwitchableViewType
@AppStorage(UserDefaultsStore.Keys.moodTint.rawValue, store: GroupUserDefaults.groupDefaults) private var moodTint: MoodTints = .Default
let entries: [MoodEntry]
private var moodMetrics = [MoodGroupingMetrics]()
private var moodMetrics = [MoodMetrics]()
init(entries: [MoodEntry], viewType: Binding<MainSwitchableViewType>) {
self.entries = entries
@@ -20,7 +21,7 @@ struct SmallRollUpHeaderView: View {
moodMetrics = Random.createTotalPerc(fromEntries: entries)
}
private func textView(forModel model: MoodGroupingMetrics) -> Text {
private func textView(forModel model: MoodMetrics) -> Text {
switch viewType {
case .total:
return Text(String(model.total))
@@ -32,24 +33,25 @@ struct SmallRollUpHeaderView: View {
}
private var textViews: some View {
HStack {
ForEach(moodMetrics, id: \.0) { model in
HStack() {
ForEach(moodMetrics, id: \.id) { model in
textView(forModel: model)
.font(.title2)
.fontWeight(.bold)
.lineLimit(1)
.foregroundColor(model.mood.color)
.frame(width: 70, height: 70)
.foregroundColor(moodTint.color(forMood: model.mood))
.frame(maxWidth: .infinity, alignment: .center)
}
}
.frame(maxWidth: .infinity, alignment: .leading)
.padding([.top, .bottom])
}
private var circularViews: some View {
HStack {
ForEach(moodMetrics, id: \.0) { model in
ForEach(moodMetrics, id: \.id) { model in
ZStack {
Circle().fill(model.mood.color)
Circle().fill(moodTint.color(forMood: model.mood))
.frame(minWidth: 5,
maxWidth: 70,
minHeight: 5,
@@ -60,9 +62,9 @@ struct SmallRollUpHeaderView: View {
.font(.title3)
.fontWeight(.bold)
.lineLimit(1)
.clipShape(ContainerRelativeShape()).padding()
.clipShape(ContainerRelativeShape())
.foregroundColor(Color(UIColor.white))
.minimumScaleFactor(0.1)
.minimumScaleFactor(0.7)
)
}
}
@@ -94,8 +96,13 @@ struct SmallHeaderView_Previews: PreviewProvider {
viewType: .constant(.total))
SmallRollUpHeaderView(entries: PersistenceController.shared.randomEntries(count: 10),
viewType: .constant(.total))
.frame(height: 20)
viewType: .constant(.percentageCircle))
.background(.gray)
SmallRollUpHeaderView(entries: PersistenceController.shared.randomEntries(count: 10),
viewType: .constant(.percentage))
.background(.gray)
}
}
}