built out themes a bit more
This commit is contained in:
@@ -59,7 +59,7 @@ struct SettingsView: View {
|
||||
})
|
||||
}
|
||||
.background(
|
||||
theme.bg
|
||||
theme.currentTheme.bg
|
||||
.edgesIgnoringSafeArea(.all)
|
||||
)
|
||||
}
|
||||
@@ -79,7 +79,7 @@ struct SettingsView: View {
|
||||
|
||||
private var specialThanksCell: some View {
|
||||
ZStack {
|
||||
Color(theme.secondaryBGColor)
|
||||
Color(theme.currentTheme.secondaryBGColor)
|
||||
VStack {
|
||||
Button(action: {
|
||||
withAnimation{
|
||||
@@ -102,7 +102,7 @@ struct SettingsView: View {
|
||||
|
||||
private var addTestDataCell: some View {
|
||||
ZStack {
|
||||
Color(theme.secondaryBGColor)
|
||||
Color(theme.currentTheme.secondaryBGColor)
|
||||
Button(action: {
|
||||
PersistenceController.shared.populateTestData()
|
||||
editedDataClosure()
|
||||
@@ -117,7 +117,7 @@ struct SettingsView: View {
|
||||
|
||||
private var clearDB: some View {
|
||||
ZStack {
|
||||
Color(theme.secondaryBGColor)
|
||||
Color(theme.currentTheme.secondaryBGColor)
|
||||
Button(action: {
|
||||
PersistenceController.shared.clearDB()
|
||||
editedDataClosure()
|
||||
@@ -132,7 +132,7 @@ struct SettingsView: View {
|
||||
|
||||
private var whyBackgroundMode: some View {
|
||||
ZStack {
|
||||
Color(theme.secondaryBGColor)
|
||||
Color(theme.currentTheme.secondaryBGColor)
|
||||
VStack {
|
||||
Button(action: {
|
||||
withAnimation{
|
||||
@@ -159,7 +159,7 @@ struct SettingsView: View {
|
||||
|
||||
private var changeIcon: some View {
|
||||
ZStack {
|
||||
Color(theme.secondaryBGColor)
|
||||
Color(theme.currentTheme.secondaryBGColor)
|
||||
VStack {
|
||||
Text(String(localized: "settings_view_change_icon"))
|
||||
HStack {
|
||||
@@ -196,7 +196,7 @@ struct SettingsView: View {
|
||||
|
||||
private var showOnboardingButton: some View {
|
||||
ZStack {
|
||||
Color(theme.secondaryBGColor)
|
||||
Color(theme.currentTheme.secondaryBGColor)
|
||||
Button(action: {
|
||||
showOnboarding.toggle()
|
||||
}, label: {
|
||||
@@ -210,7 +210,7 @@ struct SettingsView: View {
|
||||
|
||||
private var cloudKitEnable: some View {
|
||||
ZStack {
|
||||
Color(theme.secondaryBGColor)
|
||||
Color(theme.currentTheme.secondaryBGColor)
|
||||
VStack {
|
||||
Toggle(String(localized: "settings_use_cloudkit_title"),
|
||||
isOn: $useCloudKit)
|
||||
@@ -228,7 +228,7 @@ struct SettingsView: View {
|
||||
|
||||
private var cloudKitStatus: some View {
|
||||
ZStack {
|
||||
Color(theme.secondaryBGColor)
|
||||
Color(theme.currentTheme.secondaryBGColor)
|
||||
VStack {
|
||||
Image(systemName: syncMonitor.syncStateSummary.symbolName)
|
||||
.foregroundColor(syncMonitor.syncStateSummary.symbolColor)
|
||||
@@ -242,7 +242,7 @@ struct SettingsView: View {
|
||||
|
||||
private var canDelete: some View {
|
||||
ZStack {
|
||||
Color(theme.secondaryBGColor)
|
||||
Color(theme.currentTheme.secondaryBGColor)
|
||||
VStack {
|
||||
Toggle(String(localized: "settings_use_delete_enable"),
|
||||
isOn: $deleteEnabled)
|
||||
@@ -255,7 +255,7 @@ struct SettingsView: View {
|
||||
|
||||
private var themePicker: some View {
|
||||
ZStack {
|
||||
Color(theme.secondaryBGColor)
|
||||
Color(theme.currentTheme.secondaryBGColor)
|
||||
VStack {
|
||||
Text(String(localized: "settings_background_title"))
|
||||
HStack {
|
||||
@@ -265,7 +265,7 @@ struct SettingsView: View {
|
||||
theme = aTheme
|
||||
}, label: {
|
||||
VStack {
|
||||
aTheme.preview
|
||||
aTheme.currentTheme.preview
|
||||
.overlay(
|
||||
Circle()
|
||||
.stroke(Color(UIColor.systemGray), style: StrokeStyle(lineWidth: 2))
|
||||
|
||||
Reference in New Issue
Block a user