mirror of
https://github.com/neon443/NearFuture.git
synced 2026-03-11 06:49:12 +00:00
ui cleanup
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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")
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,6 +26,7 @@ struct SymbolsPicker: View {
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
NavigationStack {
|
||||
GeometryReader { geo in
|
||||
ScrollView {
|
||||
if symbols.isEmpty {
|
||||
@@ -64,6 +65,7 @@ struct SymbolsPicker: View {
|
||||
.searchable(text: $searchInput)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#Preview {
|
||||
|
||||
@@ -32,6 +32,7 @@ struct glassButton: ViewModifier {
|
||||
} else {
|
||||
content.buttonStyle(.borderedProminent)
|
||||
.clipShape(RoundedRectangle(cornerRadius: 15))
|
||||
.tint(.two)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user