From 6cac4e2de0cf06f40351b57e0420d2d895927a36 Mon Sep 17 00:00:00 2001 From: Trey t Date: Sat, 2 Apr 2022 11:06:26 -0500 Subject: [PATCH] add text to day picker --- .../SubViews/DayFilterPickerView.swift | 36 +++++++++++-------- en.lproj/Localizable.strings | 1 + 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/Shared/views/CustomizeView/SubViews/DayFilterPickerView.swift b/Shared/views/CustomizeView/SubViews/DayFilterPickerView.swift index fc962d7..eff7d29 100644 --- a/Shared/views/CustomizeView/SubViews/DayFilterPickerView.swift +++ b/Shared/views/CustomizeView/SubViews/DayFilterPickerView.swift @@ -9,6 +9,7 @@ import SwiftUI struct DayFilterPickerView: View { @AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system + @AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = DefaultTextColor.textColor @StateObject private var filteredDays = DaysFilterClass.shared let weekdays = [("Sun", 1), @@ -23,22 +24,27 @@ struct DayFilterPickerView: View { ZStack { theme.currentTheme.secondaryBGColor - HStack { - ForEach(weekdays.indices, id: \.self) { dayIdx in - let day = String(weekdays[dayIdx].0) - let value = weekdays[dayIdx].1 - Button(day.capitalized, action: { - if filteredDays.currentFilters.contains(value) { - filteredDays.removeFilter(filter: value) - } else { - filteredDays.addFilter(newFilter: value) - } - let impactMed = UIImpactFeedbackGenerator(style: .heavy) - impactMed.impactOccurred() - }) - .frame(maxWidth: .infinity) - .foregroundColor(filteredDays.currentFilters.contains(value) ? .green : .red) + VStack { + HStack { + ForEach(weekdays.indices, id: \.self) { dayIdx in + let day = String(weekdays[dayIdx].0) + let value = weekdays[dayIdx].1 + Button(day.capitalized, action: { + if filteredDays.currentFilters.contains(value) { + filteredDays.removeFilter(filter: value) + } else { + filteredDays.addFilter(newFilter: value) + } + let impactMed = UIImpactFeedbackGenerator(style: .heavy) + impactMed.impactOccurred() + }) + .frame(maxWidth: .infinity) + .foregroundColor(filteredDays.currentFilters.contains(value) ? .green : .red) + } } + Text(String(localized: "day_picker_view_text")) + .padding(.top) + .foregroundColor(textColor) } .padding() } diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings index ca0b39b..87a2883 100644 --- a/en.lproj/Localizable.strings +++ b/en.lproj/Localizable.strings @@ -97,3 +97,4 @@ "create_widget_use" = "Use"; "month_view_no_data" = "There are no entries to display."; +"day_picker_view_text" = "Only shows these days";