From 773a083682486a2365cfd4ef4e7de9934aa35255 Mon Sep 17 00:00:00 2001 From: neon443 <69979447+neon443@users.noreply.github.com> Date: Wed, 21 May 2025 17:21:04 +0100 Subject: [PATCH] making mac ui --- MacNearFuture/MacNearFutureApp.swift | 3 ++- MacNearFuture/Views/EventListView.swift | 31 ++++++++++++------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/MacNearFuture/MacNearFutureApp.swift b/MacNearFuture/MacNearFutureApp.swift index 0f3ba3d..312e479 100644 --- a/MacNearFuture/MacNearFutureApp.swift +++ b/MacNearFuture/MacNearFutureApp.swift @@ -18,7 +18,8 @@ struct NearFutureApp: App { settingsModel: settingsModel ) .tint(settingsModel.settings.tint.color) + .frame(minWidth: 350, minHeight: 450) } - .windowIdealSize(.fitToContent) + .defaultSize(width: 450, height: 550) } } diff --git a/MacNearFuture/Views/EventListView.swift b/MacNearFuture/Views/EventListView.swift index 740ad5b..4d9b62b 100644 --- a/MacNearFuture/Views/EventListView.swift +++ b/MacNearFuture/Views/EventListView.swift @@ -10,11 +10,12 @@ import SwiftUI struct EventListView: View { @ObservedObject var viewModel: EventViewModel @State var event: Event - @State private var sheetpresented: Bool = false + + @State var largeTick: Bool = false var body: some View { - ZStack { + Color.two HStack { RoundedRectangle(cornerRadius: 5) .frame(width: 7) @@ -36,14 +37,13 @@ struct EventListView: View { ) ) Text("\(event.name)") - .font(.headline) + .bold() .foregroundStyle(.one) .strikethrough(event.complete) .multilineTextAlignment(.leading) } if !event.notes.isEmpty { Text(event.notes) - .font(.subheadline) .foregroundStyle(.one.opacity(0.8)) .multilineTextAlignment(.leading) } @@ -53,7 +53,6 @@ struct EventListView: View { time: .shortened ) ) - .font(.subheadline) .foregroundStyle( .one.opacity( event.complete ? 0.5 : 1 @@ -69,7 +68,6 @@ struct EventListView: View { Spacer() VStack { Text("\(daysUntilEvent(event.date).long)") - .font(.subheadline) .foregroundStyle(event.date.timeIntervalSinceNow < 0 ? .red : .one) } Button() { @@ -102,10 +100,20 @@ struct EventListView: View { .foregroundStyle(event.color.color) } } + .onHover() { hovering in + withAnimation { + largeTick.toggle() + } + } .buttonStyle(.borderless) - .frame(maxWidth: 25, maxHeight: 25) + .scaleEffect(largeTick ? 1.5 : 1) + .frame(maxWidth: 20) .shadow(radius: 5) .padding(.trailing, 5) + .animation( + .spring(response: 0.2, dampingFraction: 0.75, blendDuration: 2), + value: largeTick + ) .apply { if #available(iOS 17, *) { $0.sensoryFeedback(.success, trigger: event.complete) @@ -115,9 +123,6 @@ struct EventListView: View { .transition(.opacity) .padding(.vertical, 5) .background(.ultraThinMaterial) - .clipShape( - RoundedRectangle(cornerRadius: 10) - ) .fixedSize(horizontal: false, vertical: true) } .contextMenu() { @@ -133,12 +138,6 @@ struct EventListView: View { Label("Delete", systemImage: "trash") } } - .sheet(isPresented: $sheetpresented) { - EditEventView( - viewModel: viewModel, - event: $event - ) - } } }