diff --git a/NearFuture.xcodeproj/project.pbxproj b/NearFuture.xcodeproj/project.pbxproj index 7d60060..8a49d67 100644 --- a/NearFuture.xcodeproj/project.pbxproj +++ b/NearFuture.xcodeproj/project.pbxproj @@ -74,7 +74,6 @@ A98C20CE2DE7308E0008D61C /* ArchiveView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98C20CD2DE7308E0008D61C /* ArchiveView.swift */; }; A98C20D02DE731BD0008D61C /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98C20CF2DE731BD0008D61C /* HomeView.swift */; }; A98C20D42DE7339E0008D61C /* AboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98C20D32DE7339E0008D61C /* AboutView.swift */; }; - A9C769A12DFDD1FC00082FFF /* SymbolsPicker.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A9C769A02DFDD1FC00082FFF /* SymbolsPicker.storyboard */; }; A9C769A22DFDD1FC00082FFF /* SymbolsPicker.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A9C769A02DFDD1FC00082FFF /* SymbolsPicker.storyboard */; }; A9C769A32DFDD1FC00082FFF /* SymbolsPicker.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A9C769A02DFDD1FC00082FFF /* SymbolsPicker.storyboard */; }; A9C769A52DFDD27500082FFF /* SymbolsPickerStoryboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9C769A42DFDD27500082FFF /* SymbolsPickerStoryboard.swift */; }; @@ -507,7 +506,6 @@ files = ( A90D49452DDE1C7600781124 /* Tints.xcassets in Resources */, A90D493E2DDE10CF00781124 /* Assets.xcassets in Resources */, - A9C769A12DFDD1FC00082FFF /* SymbolsPicker.storyboard in Resources */, A90D493D2DDE10B200781124 /* NearFutureIcon.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/NearFuture/Views/ContentView.swift b/NearFuture/Views/ContentView.swift index 514966e..e00f1d9 100644 --- a/NearFuture/Views/ContentView.swift +++ b/NearFuture/Views/ContentView.swift @@ -33,8 +33,8 @@ struct ContentView: View { Label("Archive", systemImage: "tray.full") } .tag(Tab.archive) -// StatsView(viewModel: viewModel) - SymbolsPickerStoryboardUIViewRepresentable() + StatsView(viewModel: viewModel) +// SymbolsPickerStoryboardUIViewRepresentable() .tabItem { Label("Statistics", systemImage: "chart.pie") } diff --git a/NearFuture/Views/Events/AddEventView.swift b/NearFuture/Views/Events/AddEventView.swift index 1925bc9..d8c172e 100644 --- a/NearFuture/Views/Events/AddEventView.swift +++ b/NearFuture/Views/Events/AddEventView.swift @@ -119,7 +119,7 @@ struct AddEventView: View { .navigationTitle("\(adding ? "Add Event" : "")") .modifier(navigationInlineLarge()) .toolbar { - ToolbarItem(/*placement: .topBarLeading*/) { + ToolbarItem(placement: .cancellationAction) { if adding { Button() { resetAddEventView() @@ -128,7 +128,6 @@ struct AddEventView: View { Image(systemName: "xmark") .resizable() .scaledToFit() - .frame(width: 30) .tint(.one) } } @@ -168,7 +167,6 @@ struct AddEventView: View { } } .scrollContentBackground(.hidden) - .scrollContentBackground(.hidden) .presentationDragIndicator(.visible) } } diff --git a/Shared/Model/SymbolsPicker/SymbolsPicker.swift b/Shared/Model/SymbolsPicker/SymbolsPicker.swift index 5f44ee9..f2ab309 100644 --- a/Shared/Model/SymbolsPicker/SymbolsPicker.swift +++ b/Shared/Model/SymbolsPicker/SymbolsPicker.swift @@ -26,42 +26,44 @@ struct SymbolsPicker: View { } var body: some View { - GeometryReader { geo in - ScrollView { - if symbols.isEmpty { - HStack { - Image(systemName: "magnifyingglass") - .resizable().scaledToFit() - .frame(width: 30) - Text("You look lost") - .font(.title) - .bold() - } - .padding() - Text("The symbol picker search only works with exact matches, try a different search term.") - } - LazyVGrid(columns: gridLayout(forWidth: geo.size.width)) { - ForEach(symbols, id: \.self) { symbol in - Button() { - selection = symbol - } label: { - VStack { - Image(systemName: symbol) - .resizable() - .scaledToFit() - .symbolRenderingMode(.palette) - .foregroundStyle(.blue, .gray, .black) - Text(symbol) - .truncationMode(.middle) - .font(.footnote) - } + NavigationStack { + GeometryReader { geo in + ScrollView { + if symbols.isEmpty { + HStack { + Image(systemName: "magnifyingglass") + .resizable().scaledToFit() + .frame(width: 30) + Text("You look lost") + .font(.title) + .bold() + } + .padding() + Text("The symbol picker search only works with exact matches, try a different search term.") + } + LazyVGrid(columns: gridLayout(forWidth: geo.size.width)) { + ForEach(symbols, id: \.self) { symbol in + Button() { + selection = symbol + } label: { + VStack { + Image(systemName: symbol) + .resizable() + .scaledToFit() + .symbolRenderingMode(.palette) + .foregroundStyle(.blue, .gray, .black) + Text(symbol) + .truncationMode(.middle) + .font(.footnote) + } + } + .frame(maxWidth: 80, maxHeight: 80) + .buttonStyle(.plain) } - .frame(maxWidth: 80, maxHeight: 80) - .buttonStyle(.plain) } } + .searchable(text: $searchInput) } - .searchable(text: $searchInput) } } } diff --git a/Shared/ViewModifiers.swift b/Shared/ViewModifiers.swift index d427d08..caa1ae9 100644 --- a/Shared/ViewModifiers.swift +++ b/Shared/ViewModifiers.swift @@ -32,6 +32,7 @@ struct glassButton: ViewModifier { } else { content.buttonStyle(.borderedProminent) .clipShape(RoundedRectangle(cornerRadius: 15)) + .tint(.two) } } }