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

changed datepicker slightly

Browse Source
This commit is contained in:
neon443
2025-02-27 11:39:51 +00:00
parent f556f7e4ca
commit f01bc6d28c
8 changed files with 19 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
.DS_Store

4
NearFuture.xcodeproj/project.pbxproj
View File

@@ -459,7 +459,7 @@
"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 15;
IPHONEOS_DEPLOYMENT_TARGET = 16;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 13;
@@ -501,7 +501,7 @@
"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 15;
IPHONEOS_DEPLOYMENT_TARGET = 16;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 13;

BIN
NearFuture.xcodeproj/project.xcworkspace/xcuserdata/neon443.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

13
NearFuture/AddEventView.swift
View File

@@ -29,7 +29,7 @@ struct AddEventView: View {
@Environment(\.dismiss) var dismiss
var body: some View {
NavigationView {
NavigationStack {
Form {
Section(
header:
@@ -88,12 +88,8 @@ struct AddEventView: View {
// date picker
HStack {
Spacer()
DatePicker("", selection: $eventDate, displayedComponents: .date)
.datePickerStyle(WheelDatePickerStyle())
Spacer()
}
DatePicker("", selection: $eventDate, displayedComponents: .date)
.datePickerStyle(WheelDatePickerStyle())
// re-ocurrence Picker
Picker("Recurrence", selection: $eventRecurrence) {
@@ -127,6 +123,9 @@ struct AddEventView: View {
.font(.headline)
.cornerRadius(10)
.buttonStyle(BorderedProminentButtonStyle())
if eventName.isEmpty {
Text("Give your event a name.")
}
}
.disabled(eventName.isEmpty)
if eventName.isEmpty {

19
NearFuture/ContentView.swift
View File

@@ -69,7 +69,7 @@ struct ContentView: View {
var body: some View {
TabView {
NavigationView {
NavigationStack {
ZStack {
backgroundGradient
.ignoresSafeArea(.all)
@@ -131,12 +131,6 @@ struct ContentView: View {
adding: true //adding event
)
}
.sheet(
isPresented: $showSettings) {
SettingsView(
viewModel: viewModel
)
}
.toolbar {
ToolbarItem(placement: .topBarTrailing) {
Button() {
@@ -147,13 +141,6 @@ struct ContentView: View {
.scaledToFit()
}
}
ToolbarItem(placement: .topBarLeading) {
Button() {
showSettings.toggle()
} label: {
Image(systemName: "gear")
}
}
}
}
}
@@ -164,6 +151,10 @@ struct ContentView: View {
.tabItem {
Label("Statistics", systemImage: "chart.pie")
}
SettingsView(viewModel: viewModel)
.tabItem {
Label("Settings", systemImage: "gear")
}
}
}
}

2
NearFuture/EditEventView.swift
View File

@@ -31,7 +31,7 @@ struct EditEventView: View {
}
var body: some View {
// NavigationView {
// NavigationStack {
AddEventView(
viewModel: viewModel,
eventName: $eventName,

17
NearFuture/SettingsView.swift
View File

@@ -9,7 +9,6 @@ import SwiftUI
struct SettingsView: View {
@State var viewModel: EventViewModel
@Environment(\.dismiss) var dismiss
@State private var hasUbiquitous: Bool = false
@State private var lastSyncWasSuccessful: Bool = false
@@ -41,7 +40,7 @@ struct SettingsView: View {
}
var body: some View {
NavigationView {
NavigationStack {
List {
NavigationLink() {
iCloudSettingsView(
@@ -69,7 +68,7 @@ struct SettingsView: View {
}
NavigationLink() {
NavigationView() {
NavigationStack() {
Button() {
UIPasteboard.general.string = "\(viewModel.exportEvents())"
print(viewModel.exportEvents())
@@ -83,7 +82,7 @@ struct SettingsView: View {
Text("Export events")
}
NavigationLink() {
NavigationView() {
NavigationStack() {
VStack {
TextEditor(text: $importStr)
.foregroundStyle(.foreground, .gray)
@@ -133,16 +132,6 @@ struct SettingsView: View {
}
.navigationTitle("Settings")
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .topBarTrailing) {
Button() {
dismiss()
} label: {
Image(systemName: "xmark.circle.fill")
.symbolRenderingMode(.hierarchical)
}
}
}
}
}
}

2
NearFuture/StatsView.swift
View File

@@ -12,7 +12,7 @@ struct StatsView: View {
@ObservedObject var viewModel: EventViewModel
var body: some View {
NavigationView {
NavigationStack {
List {
Section(header: Text("Upcoming Events")) {
let upcomingEvents = viewModel.events.filter { $0.date > Date() }