closed #60
This commit is contained in:
Trey t
2022-02-04 16:49:56 -06:00
parent b3785fac2c
commit a1f70edec2
10 changed files with 150 additions and 29 deletions

View File

@@ -19,6 +19,7 @@ struct ContentView: View {
@AppStorage(UserDefaultsStore.Keys.needsOnboarding.rawValue, store: GroupUserDefaults.groupDefaults) private var needsOnboarding = true
@AppStorage(UserDefaultsStore.Keys.deleteEnable.rawValue, store: GroupUserDefaults.groupDefaults) private var deleteEnabled = true
@AppStorage(UserDefaultsStore.Keys.mainViewTopHeaderIndex.rawValue, store: GroupUserDefaults.groupDefaults) private var mainViewTopHeaderIndex = 0
@AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system
@State private var showingSheet = false
@State private var showTodayInput = true
@@ -33,7 +34,8 @@ struct ContentView: View {
@ObservedObject var viewModel = ContentModeViewModel()
init(){
UITabBar.appearance().backgroundColor = UIColor.systemBackground
UITabBar.appearance().backgroundColor = theme.secondaryBGColor
print(theme)
}
var body: some View {
@@ -180,7 +182,7 @@ struct ContentView: View {
)
}
.background(
Color(UIColor.systemBackground)
Color(theme.secondaryBGColor)
)
.coordinateSpace(name: "scroll")
.onPreferenceChange(ViewOffsetKey.self) { value in
@@ -200,7 +202,7 @@ struct ContentView: View {
.frame(maxWidth: .infinity, alignment: .leading)
.padding()
.background(
Color(UIColor.systemBackground)
Color(theme.secondaryBGColor)
)
}
@@ -285,7 +287,7 @@ struct ContentView: View {
private var emptyView: some View {
ZStack {
Color(UIColor.systemBackground)
Color(theme.secondaryBGColor)
VStack {
Text(String(localized: "content_view_empty_title"))
@@ -327,7 +329,7 @@ struct ContentView: View {
VStack {
SmallRollUpHeaderView(fakeData: false, backDays: 30)
.background(
Color(UIColor.systemBackground)
Color(theme.secondaryBGColor)
)
.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous))
.padding()
@@ -342,7 +344,8 @@ struct ContentView: View {
.padding([.leading, .trailing, .bottom])
}
}.background(
BGView().equatable()
theme.bg
.edgesIgnoringSafeArea(.all)
)
}
}