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

@@ -33,7 +33,8 @@ struct LongestStreakTemplate: View, SharingTemplate {
@State var showSharingTemplate = false
@Environment(\.presentationMode) var presentationMode
@AppStorage(UserDefaultsStore.Keys.moodTint.rawValue, store: GroupUserDefaults.groupDefaults) private var moodTint: MoodTints = .Default
@AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system
let columns = [
GridItem(.flexible(minimum: 5, maximum: .infinity), alignment: .center),
@@ -96,7 +97,7 @@ struct LongestStreakTemplate: View, SharingTemplate {
entry.mood.icon
.resizable()
.aspectRatio(contentMode: .fit)
.foregroundColor(entry.mood.color)
.foregroundColor(moodTint.color(forMood: entry.mood))
}
}
}
@@ -112,26 +113,26 @@ struct LongestStreakTemplate: View, SharingTemplate {
VStack {
Text(String(format: String(localized: "share_view_longest_streak_template_title"), self.selectedMood.strValue))
.font(.title)
.foregroundColor(Color(UIColor.label))
.foregroundColor(theme.currentTheme.labelColor)
.frame(maxWidth: .infinity, alignment: .center)
.padding()
HStack {
Text(self.moodEntries.first?.forDate ?? Date(), formatter: itemFormatter)
.font(.title)
.foregroundColor(Color(UIColor.label))
.foregroundColor(theme.currentTheme.labelColor)
.frame(maxWidth: .infinity, alignment: .center)
.padding(.top, 1)
Text("-")
.font(.title)
.foregroundColor(Color(UIColor.label))
.foregroundColor(theme.currentTheme.labelColor)
.frame(maxWidth: .infinity, alignment: .center)
.padding(.top, 1)
Text(self.moodEntries.last?.forDate ?? Date(), formatter: itemFormatter)
.font(.title)
.foregroundColor(Color(UIColor.label))
.foregroundColor(theme.currentTheme.labelColor)
.frame(maxWidth: .infinity, alignment: .center)
.padding(.top, 1)
}
@@ -144,7 +145,7 @@ struct LongestStreakTemplate: View, SharingTemplate {
entry.mood.icon
.resizable()
.aspectRatio(contentMode: .fit)
.foregroundColor(entry.mood.color)
.foregroundColor(moodTint.color(forMood: entry.mood))
}
}
}
@@ -224,7 +225,8 @@ struct LongestStreakTemplate: View, SharingTemplate {
.padding([.leading, .trailing], -20)
} else {
mainView
.padding([.leading, .trailing])
.padding([.leading, .trailing, .top])
}
}
}