mirror of
https://github.com/neon443/NearFuture.git
synced 2026-03-11 14:56:15 +00:00
making mac ui
This commit is contained in:
@@ -18,7 +18,8 @@ struct NearFutureApp: App {
|
|||||||
settingsModel: settingsModel
|
settingsModel: settingsModel
|
||||||
)
|
)
|
||||||
.tint(settingsModel.settings.tint.color)
|
.tint(settingsModel.settings.tint.color)
|
||||||
|
.frame(minWidth: 350, minHeight: 450)
|
||||||
}
|
}
|
||||||
.windowIdealSize(.fitToContent)
|
.defaultSize(width: 450, height: 550)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,11 +10,12 @@ import SwiftUI
|
|||||||
struct EventListView: View {
|
struct EventListView: View {
|
||||||
@ObservedObject var viewModel: EventViewModel
|
@ObservedObject var viewModel: EventViewModel
|
||||||
@State var event: Event
|
@State var event: Event
|
||||||
@State private var sheetpresented: Bool = false
|
|
||||||
|
@State var largeTick: Bool = false
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
|
|
||||||
ZStack {
|
ZStack {
|
||||||
|
Color.two
|
||||||
HStack {
|
HStack {
|
||||||
RoundedRectangle(cornerRadius: 5)
|
RoundedRectangle(cornerRadius: 5)
|
||||||
.frame(width: 7)
|
.frame(width: 7)
|
||||||
@@ -36,14 +37,13 @@ struct EventListView: View {
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
Text("\(event.name)")
|
Text("\(event.name)")
|
||||||
.font(.headline)
|
.bold()
|
||||||
.foregroundStyle(.one)
|
.foregroundStyle(.one)
|
||||||
.strikethrough(event.complete)
|
.strikethrough(event.complete)
|
||||||
.multilineTextAlignment(.leading)
|
.multilineTextAlignment(.leading)
|
||||||
}
|
}
|
||||||
if !event.notes.isEmpty {
|
if !event.notes.isEmpty {
|
||||||
Text(event.notes)
|
Text(event.notes)
|
||||||
.font(.subheadline)
|
|
||||||
.foregroundStyle(.one.opacity(0.8))
|
.foregroundStyle(.one.opacity(0.8))
|
||||||
.multilineTextAlignment(.leading)
|
.multilineTextAlignment(.leading)
|
||||||
}
|
}
|
||||||
@@ -53,7 +53,6 @@ struct EventListView: View {
|
|||||||
time: .shortened
|
time: .shortened
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
.font(.subheadline)
|
|
||||||
.foregroundStyle(
|
.foregroundStyle(
|
||||||
.one.opacity(
|
.one.opacity(
|
||||||
event.complete ? 0.5 : 1
|
event.complete ? 0.5 : 1
|
||||||
@@ -69,7 +68,6 @@ struct EventListView: View {
|
|||||||
Spacer()
|
Spacer()
|
||||||
VStack {
|
VStack {
|
||||||
Text("\(daysUntilEvent(event.date).long)")
|
Text("\(daysUntilEvent(event.date).long)")
|
||||||
.font(.subheadline)
|
|
||||||
.foregroundStyle(event.date.timeIntervalSinceNow < 0 ? .red : .one)
|
.foregroundStyle(event.date.timeIntervalSinceNow < 0 ? .red : .one)
|
||||||
}
|
}
|
||||||
Button() {
|
Button() {
|
||||||
@@ -102,10 +100,20 @@ struct EventListView: View {
|
|||||||
.foregroundStyle(event.color.color)
|
.foregroundStyle(event.color.color)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.onHover() { hovering in
|
||||||
|
withAnimation {
|
||||||
|
largeTick.toggle()
|
||||||
|
}
|
||||||
|
}
|
||||||
.buttonStyle(.borderless)
|
.buttonStyle(.borderless)
|
||||||
.frame(maxWidth: 25, maxHeight: 25)
|
.scaleEffect(largeTick ? 1.5 : 1)
|
||||||
|
.frame(maxWidth: 20)
|
||||||
.shadow(radius: 5)
|
.shadow(radius: 5)
|
||||||
.padding(.trailing, 5)
|
.padding(.trailing, 5)
|
||||||
|
.animation(
|
||||||
|
.spring(response: 0.2, dampingFraction: 0.75, blendDuration: 2),
|
||||||
|
value: largeTick
|
||||||
|
)
|
||||||
.apply {
|
.apply {
|
||||||
if #available(iOS 17, *) {
|
if #available(iOS 17, *) {
|
||||||
$0.sensoryFeedback(.success, trigger: event.complete)
|
$0.sensoryFeedback(.success, trigger: event.complete)
|
||||||
@@ -115,9 +123,6 @@ struct EventListView: View {
|
|||||||
.transition(.opacity)
|
.transition(.opacity)
|
||||||
.padding(.vertical, 5)
|
.padding(.vertical, 5)
|
||||||
.background(.ultraThinMaterial)
|
.background(.ultraThinMaterial)
|
||||||
.clipShape(
|
|
||||||
RoundedRectangle(cornerRadius: 10)
|
|
||||||
)
|
|
||||||
.fixedSize(horizontal: false, vertical: true)
|
.fixedSize(horizontal: false, vertical: true)
|
||||||
}
|
}
|
||||||
.contextMenu() {
|
.contextMenu() {
|
||||||
@@ -133,12 +138,6 @@ struct EventListView: View {
|
|||||||
Label("Delete", systemImage: "trash")
|
Label("Delete", systemImage: "trash")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.sheet(isPresented: $sheetpresented) {
|
|
||||||
EditEventView(
|
|
||||||
viewModel: viewModel,
|
|
||||||
event: $event
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user