admin/Reflect
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

closed #74

Browse Source 
If looking at totals roll up should be totals, if percentage then percentages should show
This commit is contained in:
Trey t
2022-02-10 16:15:06 -06:00
parent f66caf93dd
commit 97e6e52c8c
4 changed files with 114 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Shared/views/ContentView.swift
View File

@@ -27,6 +27,14 @@ struct ContentView: View {
@State private var showUpdateEntryAlert = false
@State private var headerHeight: CGFloat = ContentViewConstants.maxHeaderHeight
@State private var switchableViewSelectedIndex = 1
@State private var headerViewType: MainSwitchableViewType = .total
@State private var currentSelectedHeaderViewViewType: MainSwitchableViewType = .total
@State private var currentSelectedHeaderViewBackDays: Int = 30
@State private var firstSwichableHeaderViewType: MainSwitchableViewType = .total
@State private var secondSwichableHeaderViewType: MainSwitchableViewType = .total
let minHeaderHeight = ContentViewConstants.minHeaderHeight
let maxHeaderHeight = ContentViewConstants.maxHeaderHeight
@State private var headerOpacity: Double = 1.0
@@ -287,19 +295,38 @@ struct ContentView: View {
.frame(minWidth: 0, maxWidth: .infinity)
} else {
// selection hre doesn't work ...
TabView {
SwitchableView(daysBack: 30)
TabView(selection: $switchableViewSelectedIndex) {
SwitchableView(daysBack: 30, headerTypeChanged: { viewType in
firstSwichableHeaderViewType = viewType
currentSelectedHeaderViewViewType = firstSwichableHeaderViewType
})
.tag(1)
.frame(height: headerHeight)
.frame(minWidth: 0, maxWidth: .infinity)
.contentShape(Rectangle())
SwitchableView(daysBack: 7)
SwitchableView(daysBack: 7, headerTypeChanged: { viewType in
secondSwichableHeaderViewType = viewType
currentSelectedHeaderViewViewType = secondSwichableHeaderViewType
})
.tag(2)
.frame(height: headerHeight)
.frame(minWidth: 0, maxWidth: .infinity)
.contentShape(Rectangle())
}
.tabViewStyle(.page)
.padding([.trailing, .leading])
.onChange(of: switchableViewSelectedIndex) { value in
if value == 1 {
currentSelectedHeaderViewBackDays = 30
currentSelectedHeaderViewViewType = firstSwichableHeaderViewType
}
if value == 2 {
currentSelectedHeaderViewBackDays = 7
currentSelectedHeaderViewViewType = secondSwichableHeaderViewType
}
}
}
}
}
@@ -346,7 +373,9 @@ struct ContentView: View {
.opacity(headerOpacity)
VStack {
SmallRollUpHeaderView(fakeData: false, backDays: 30, type: .circular)
SmallRollUpHeaderView(fakeData: false,
backDays: $currentSelectedHeaderViewBackDays,
viewType: $currentSelectedHeaderViewViewType)
.background(
Color(theme.currentTheme.secondaryBGColor)
)