neon443/NearFuture
1
0
Fork 0
mirror of https://github.com/neon443/NearFuture.git synced 2026-03-11 22:56:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui cleanup

Browse Source
This commit is contained in:
neon443
2025-06-14 18:53:34 +01:00
parent 22af9fc060
commit a40d4f4300
5 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NearFuture.xcodeproj/project.pbxproj
View File

@@ -74,7 +74,6 @@
A98C20CE2DE7308E0008D61C /* ArchiveView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98C20CD2DE7308E0008D61C /* ArchiveView.swift */; }; A98C20CE2DE7308E0008D61C /* ArchiveView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98C20CD2DE7308E0008D61C /* ArchiveView.swift */; };
A98C20D02DE731BD0008D61C /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98C20CF2DE731BD0008D61C /* HomeView.swift */; }; A98C20D02DE731BD0008D61C /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98C20CF2DE731BD0008D61C /* HomeView.swift */; };
A98C20D42DE7339E0008D61C /* AboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98C20D32DE7339E0008D61C /* AboutView.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 */; }; A9C769A22DFDD1FC00082FFF /* SymbolsPicker.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A9C769A02DFDD1FC00082FFF /* SymbolsPicker.storyboard */; };
A9C769A32DFDD1FC00082FFF /* 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 */; }; A9C769A52DFDD27500082FFF /* SymbolsPickerStoryboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9C769A42DFDD27500082FFF /* SymbolsPickerStoryboard.swift */; };
@@ -507,7 +506,6 @@
files = ( files = (
A90D49452DDE1C7600781124 /* Tints.xcassets in Resources */, A90D49452DDE1C7600781124 /* Tints.xcassets in Resources */,
A90D493E2DDE10CF00781124 /* Assets.xcassets in Resources */, A90D493E2DDE10CF00781124 /* Assets.xcassets in Resources */,
A9C769A12DFDD1FC00082FFF /* SymbolsPicker.storyboard in Resources */,
A90D493D2DDE10B200781124 /* NearFutureIcon.png in Resources */, A90D493D2DDE10B200781124 /* NearFutureIcon.png in Resources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;

4
NearFuture/Views/ContentView.swift
View File

@@ -33,8 +33,8 @@ struct ContentView: View {
Label("Archive", systemImage: "tray.full") Label("Archive", systemImage: "tray.full")
} }
.tag(Tab.archive) .tag(Tab.archive)
// StatsView(viewModel: viewModel) StatsView(viewModel: viewModel)
SymbolsPickerStoryboardUIViewRepresentable() // SymbolsPickerStoryboardUIViewRepresentable()
.tabItem { .tabItem {
Label("Statistics", systemImage: "chart.pie") Label("Statistics", systemImage: "chart.pie")
} }

4
NearFuture/Views/Events/AddEventView.swift
View File

@@ -119,7 +119,7 @@ struct AddEventView: View {
.navigationTitle("\(adding ? "Add Event" : "")") .navigationTitle("\(adding ? "Add Event" : "")")
.modifier(navigationInlineLarge()) .modifier(navigationInlineLarge())
.toolbar { .toolbar {
ToolbarItem(/*placement: .topBarLeading*/) { ToolbarItem(placement: .cancellationAction) {
if adding { if adding {
Button() { Button() {
resetAddEventView() resetAddEventView()
@@ -128,7 +128,6 @@ struct AddEventView: View {
Image(systemName: "xmark") Image(systemName: "xmark")
.resizable() .resizable()
.scaledToFit() .scaledToFit()
.frame(width: 30)
.tint(.one) .tint(.one)
} }
} }
@@ -168,7 +167,6 @@ struct AddEventView: View {
} }
} }
.scrollContentBackground(.hidden) .scrollContentBackground(.hidden)
.scrollContentBackground(.hidden)
.presentationDragIndicator(.visible) .presentationDragIndicator(.visible)
} }
} }

2
Shared/Model/SymbolsPicker/SymbolsPicker.swift
View File

@@ -26,6 +26,7 @@ struct SymbolsPicker: View {
} }
var body: some View { var body: some View {
NavigationStack {
GeometryReader { geo in GeometryReader { geo in
ScrollView { ScrollView {
if symbols.isEmpty { if symbols.isEmpty {
@@ -65,6 +66,7 @@ struct SymbolsPicker: View {
} }
} }
} }
}
#Preview { #Preview {
SymbolsPicker(selection: .constant("")) SymbolsPicker(selection: .constant(""))

1
Shared/ViewModifiers.swift
View File

@@ -32,6 +32,7 @@ struct glassButton: ViewModifier {
} else { } else {
content.buttonStyle(.borderedProminent) content.buttonStyle(.borderedProminent)
.clipShape(RoundedRectangle(cornerRadius: 15)) .clipShape(RoundedRectangle(cornerRadius: 15))
.tint(.two)
} }
} }
} }