closed #93
This commit is contained in:
@@ -121,6 +121,13 @@ struct CustomizeView: View {
|
|||||||
Text(aTheme.title)
|
Text(aTheme.title)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
.contentShape(Rectangle())
|
||||||
|
.background(
|
||||||
|
RoundedRectangle(cornerRadius: 10, style: .continuous)
|
||||||
|
.fill(theme == aTheme ? theme.currentTheme.bgColor : .clear)
|
||||||
|
.padding(-5)
|
||||||
|
|
||||||
|
)
|
||||||
Spacer()
|
Spacer()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -173,25 +180,36 @@ struct CustomizeView: View {
|
|||||||
theme.currentTheme.secondaryBGColor
|
theme.currentTheme.secondaryBGColor
|
||||||
VStack {
|
VStack {
|
||||||
ForEach(MoodImages.allCases, id: \.rawValue) { images in
|
ForEach(MoodImages.allCases, id: \.rawValue) { images in
|
||||||
HStack {
|
ZStack {
|
||||||
ForEach(Mood.allValues, id: \.self) { mood in
|
VStack {
|
||||||
images.icon(forMood: mood)
|
HStack {
|
||||||
.resizable()
|
ForEach(Mood.allValues, id: \.self) { mood in
|
||||||
.aspectRatio(contentMode: .fit)
|
images.icon(forMood: mood)
|
||||||
.frame(width: 35, height: 35)
|
.resizable()
|
||||||
.foregroundColor(
|
.aspectRatio(contentMode: .fit)
|
||||||
moodTint.color(forMood: mood)
|
.frame(width: 35, height: 35)
|
||||||
)
|
.foregroundColor(
|
||||||
|
moodTint.color(forMood: mood)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
.frame(minWidth: 0, maxWidth: .infinity)
|
||||||
|
}
|
||||||
|
.contentShape(Rectangle())
|
||||||
|
.background(
|
||||||
|
RoundedRectangle(cornerRadius: 10, style: .continuous)
|
||||||
|
.fill(imagePack == images ? theme.currentTheme.bgColor : .clear)
|
||||||
|
.padding([.top, .bottom], -3)
|
||||||
|
|
||||||
|
)
|
||||||
|
.onTapGesture {
|
||||||
|
let impactMed = UIImpactFeedbackGenerator(style: .heavy)
|
||||||
|
impactMed.impactOccurred()
|
||||||
|
imagePack = images
|
||||||
|
}
|
||||||
|
if images.rawValue != (MoodImages.allCases.sorted(by: { $0.rawValue > $1.rawValue }).first?.rawValue) ?? 0 {
|
||||||
|
Divider()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.frame(minWidth: 0, maxWidth: .infinity)
|
|
||||||
.onTapGesture {
|
|
||||||
let impactMed = UIImpactFeedbackGenerator(style: .heavy)
|
|
||||||
impactMed.impactOccurred()
|
|
||||||
imagePack = images
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if images.rawValue != (MoodImages.allCases.sorted(by: { $0.rawValue > $1.rawValue }).first?.rawValue) ?? 0 {
|
|
||||||
Divider()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -215,11 +233,18 @@ struct CustomizeView: View {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
.frame(minWidth: 0, maxWidth: .infinity)
|
.frame(minWidth: 0, maxWidth: .infinity)
|
||||||
.onTapGesture {
|
}
|
||||||
let impactMed = UIImpactFeedbackGenerator(style: .heavy)
|
.contentShape(Rectangle())
|
||||||
impactMed.impactOccurred()
|
.background(
|
||||||
moodTint = tint
|
RoundedRectangle(cornerRadius: 10, style: .continuous)
|
||||||
}
|
.fill(moodTint == tint ? theme.currentTheme.bgColor : .clear)
|
||||||
|
.padding([.top, .bottom], -3)
|
||||||
|
|
||||||
|
)
|
||||||
|
.onTapGesture {
|
||||||
|
let impactMed = UIImpactFeedbackGenerator(style: .heavy)
|
||||||
|
impactMed.impactOccurred()
|
||||||
|
moodTint = tint
|
||||||
}
|
}
|
||||||
if tint.rawValue != (MoodTints.allCases.sorted(by: { $0.rawValue > $1.rawValue }).first?.rawValue) ?? 0 {
|
if tint.rawValue != (MoodTints.allCases.sorted(by: { $0.rawValue > $1.rawValue }).first?.rawValue) ?? 0 {
|
||||||
Divider()
|
Divider()
|
||||||
@@ -249,6 +274,13 @@ struct CustomizeView: View {
|
|||||||
}
|
}
|
||||||
.frame(minWidth: 0, maxWidth: .infinity)
|
.frame(minWidth: 0, maxWidth: .infinity)
|
||||||
.padding()
|
.padding()
|
||||||
|
.contentShape(Rectangle())
|
||||||
|
.background(
|
||||||
|
RoundedRectangle(cornerRadius: 10, style: .continuous)
|
||||||
|
.fill(personalityPack == aPack ? theme.currentTheme.bgColor : .clear)
|
||||||
|
.padding(5)
|
||||||
|
|
||||||
|
)
|
||||||
.onTapGesture {
|
.onTapGesture {
|
||||||
let impactMed = UIImpactFeedbackGenerator(style: .heavy)
|
let impactMed = UIImpactFeedbackGenerator(style: .heavy)
|
||||||
impactMed.impactOccurred()
|
impactMed.impactOccurred()
|
||||||
|
|||||||
Reference in New Issue
Block a user