mirror of
https://github.com/FBukovina/Atoll.git
synced 2026-10-27 15:14:33 +00:00
Working stuff with revamped UI
This commit is contained in:
parent
8659a338dd
commit
5a8c592157
11 changed files with 646 additions and 279 deletions
|
|
@ -21,6 +21,7 @@ struct DynamicIslandHeader: View {
|
|||
@State private var showColorPickerPopover = false
|
||||
@State private var showTimerPopover = false
|
||||
@Default(.enableTimerFeature) var enableTimerFeature
|
||||
@Default(.timerDisplayMode) var timerDisplayMode
|
||||
|
||||
var body: some View {
|
||||
HStack(spacing: 0) {
|
||||
|
|
@ -144,7 +145,7 @@ struct DynamicIslandHeader: View {
|
|||
}
|
||||
}
|
||||
|
||||
if Defaults[.enableTimerFeature] {
|
||||
if Defaults[.enableTimerFeature] && timerDisplayMode == .popover {
|
||||
Button(action: {
|
||||
withAnimation(.smooth) {
|
||||
showTimerPopover.toggle()
|
||||
|
|
@ -252,6 +253,12 @@ struct DynamicIslandHeader: View {
|
|||
vm.isTimerPopoverActive = false
|
||||
}
|
||||
}
|
||||
.onChange(of: timerDisplayMode) { _, mode in
|
||||
if mode == .tab {
|
||||
showTimerPopover = false
|
||||
vm.isTimerPopoverActive = false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue