ok i locked in and the basic app is done 🎉 - up next, accent colors for events and then: widgets

This commit is contained in:
neon443
2024-12-25 20:29:46 +00:00
parent 3ae665e3d7
commit 107d7379f4
7 changed files with 554 additions and 64 deletions

View File

@@ -6,6 +6,10 @@
objectVersion = 77;
objects = {
/* Begin PBXBuildFile section */
A91288592D1C7E3000912B3C /* SFSymbolsPicker in Frameworks */ = {isa = PBXBuildFile; productRef = A91288582D1C7E3000912B3C /* SFSymbolsPicker */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
A9B4BFDC2D1AE66700212CE2 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
@@ -52,6 +56,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
A91288592D1C7E3000912B3C /* SFSymbolsPicker in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -112,6 +117,7 @@
);
name = NearFuture;
packageProductDependencies = (
A91288582D1C7E3000912B3C /* SFSymbolsPicker */,
);
productName = NearFuture;
productReference = A9B4BFC82D1AE66000212CE2 /* NearFuture.app */;
@@ -195,6 +201,9 @@
);
mainGroup = A9B4BFBF2D1AE66000212CE2;
minimizedProjectReferenceProxies = 1;
packageReferences = (
A91288572D1C7E3000912B3C /* XCRemoteSwiftPackageReference "SFSymbolsPicker" */,
);
preferredProjectObjectVersion = 77;
productRefGroup = A9B4BFC92D1AE66000212CE2 /* Products */;
projectDirPath = "";
@@ -388,12 +397,14 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CLANG_CXX_STANDARD_LIBRARY_HARDENING = none;
CODE_SIGN_ENTITLEMENTS = NearFuture/NearFuture.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"NearFuture/Preview Content\"";
DEVELOPMENT_TEAM = 8626DL2GW3;
ENABLE_HARDENED_RUNTIME = YES;
DEVELOPMENT_TEAM = 85Q9QG6DN7;
ENABLE_HARDENED_RUNTIME = NO;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
@@ -406,13 +417,14 @@
"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 18.2;
IPHONEOS_DEPLOYMENT_TARGET = 17;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.neon443.NearFuture;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -428,11 +440,12 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = NearFuture/NearFuture.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"NearFuture/Preview Content\"";
DEVELOPMENT_TEAM = 8626DL2GW3;
ENABLE_HARDENED_RUNTIME = YES;
DEVELOPMENT_TEAM = 85Q9QG6DN7;
ENABLE_HARDENED_RUNTIME = NO;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
@@ -445,7 +458,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 = 18.2;
IPHONEOS_DEPLOYMENT_TARGET = 17;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
@@ -591,6 +604,25 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
/* Begin XCRemoteSwiftPackageReference section */
A91288572D1C7E3000912B3C /* XCRemoteSwiftPackageReference "SFSymbolsPicker" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/alessiorubicini/SFSymbolsPicker";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.0.6;
};
};
/* End XCRemoteSwiftPackageReference section */
/* Begin XCSwiftPackageProductDependency section */
A91288582D1C7E3000912B3C /* SFSymbolsPicker */ = {
isa = XCSwiftPackageProductDependency;
package = A91288572D1C7E3000912B3C /* XCRemoteSwiftPackageReference "SFSymbolsPicker" */;
productName = SFSymbolsPicker;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = A9B4BFC02D1AE66000212CE2 /* Project object */;
}

View File

@@ -0,0 +1,15 @@
{
"originHash" : "19df39f99b22f4ef95b73ed292ffb0c8d7694dd4c9db2b96ea73b091b7b1a026",
"pins" : [
{
"identity" : "sfsymbolspicker",
"kind" : "remoteSourceControl",
"location" : "https://github.com/alessiorubicini/SFSymbolsPicker",
"state" : {
"revision" : "73c909b8a7fc77a30dd04208e33f759f8b52c4c8",
"version" : "1.0.6"
}
}
],
"version" : 3
}

View File

@@ -0,0 +1,102 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1620"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES"
buildArchitectures = "Automatic">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A9B4BFC72D1AE66000212CE2"
BuildableName = "NearFuture.app"
BlueprintName = "NearFuture"
ReferencedContainer = "container:NearFuture.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
<Testables>
<TestableReference
skipped = "NO"
parallelizable = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A9B4BFDA2D1AE66700212CE2"
BuildableName = "NearFutureTests.xctest"
BlueprintName = "NearFutureTests"
ReferencedContainer = "container:NearFuture.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO"
parallelizable = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A9B4BFE42D1AE66700212CE2"
BuildableName = "NearFutureUITests.xctest"
BlueprintName = "NearFutureUITests"
ReferencedContainer = "container:NearFuture.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A9B4BFC72D1AE66000212CE2"
BuildableName = "NearFuture.app"
BlueprintName = "NearFuture"
ReferencedContainer = "container:NearFuture.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A9B4BFC72D1AE66000212CE2"
BuildableName = "NearFuture.app"
BlueprintName = "NearFuture"
ReferencedContainer = "container:NearFuture.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

View File

@@ -0,0 +1,150 @@
//
// AddEventView.swift
// NearFuture
//
// Created by Nihaal Sharma on 25/12/2024.
//
import SwiftUI
import SFSymbolsPicker
struct AddEventView: View {
@ObservedObject var viewModel: EventViewModel
@Binding var eventName: String
@Binding var eventSymbol: String
@Binding var eventDescription: String
@Binding var eventDate: Date
@Binding var eventRecurrence: Event.RecurrenceType
@Binding var isPresented: Bool
@State var isSymbolPickerPresented = false
var body: some View {
Form {
Section(header: Text("Event Details").font(.headline).foregroundColor(.blue)) {
// name & symbol
HStack(spacing: 5) {
Button() {
isSymbolPickerPresented.toggle()
} label: {
Image(systemName: eventSymbol)
.resizable()
.scaledToFit()
.frame(width: 30, height: 30)
}
.buttonStyle(.bordered)
.sheet(isPresented: $isSymbolPickerPresented) {
SymbolsPicker(
selection: $eventSymbol,
title: "Choose a Symbol",
searchLabel: "Search...",
autoDismiss: true)
}
Divider()
ZStack {
TextField("Event Name", text: $eventName)
.textFieldStyle(RoundedBorderTextFieldStyle())
.padding(.trailing, eventName.isEmpty ? 0 : 30)
.animation(.spring, value: eventName)
MagicClearButton(text: $eventName)
}
}
// dscription
ZStack {
TextField("Event Description", text: $eventDescription)
.textFieldStyle(RoundedBorderTextFieldStyle())
.padding(.trailing, eventDescription.isEmpty ? 0 : 30)
.animation(.spring, value: eventDescription)
MagicClearButton(text: $eventDescription)
}
// date picker
DatePicker("Event Date", selection: $eventDate, in: Date()..., displayedComponents: .date)
.datePickerStyle(WheelDatePickerStyle())
// re-ocurrence Picker
Picker("Recurrence", selection: $eventRecurrence) {
ForEach(Event.RecurrenceType.allCases, id: \.self) { recurrence in
Text(recurrence.rawValue.capitalized)
}
}
.pickerStyle(SegmentedPickerStyle())
Text(
describeOccurrence(
date: eventDate,
recurrence: eventRecurrence
)
)
}
// save button
Button {
viewModel.addEvent(
name: eventName,
symbol: eventSymbol,
description: eventDescription,
date: eventDate,
recurrence: eventRecurrence
)
eventName = ""
eventSymbol = "star"
eventDescription = ""
eventDate = Date()
eventRecurrence = .none
isPresented = false
} label: {
Text("Save Event")
.font(.headline)
.cornerRadius(10)
.shadow(radius: 10)
.buttonStyle(BorderedProminentButtonStyle())
}
.disabled(eventName.isEmpty || eventDescription.isEmpty)
if eventName.isEmpty && eventDescription.isEmpty {
Text("Give your event a name and description.")
} else if eventName.isEmpty {
Text("Give your event a name.")
} else if eventDescription.isEmpty {
Text("Give your event a description.")
}
}
}
}
struct MagicClearButton: View {
@Binding var text: String
var body: some View {
HStack {
Spacer()
Button {
text = ""
} label: {
Image(systemName: "xmark.circle.fill")
.resizable()
.scaledToFit()
.frame(width: text.isEmpty ? 0 : 25)
.symbolRenderingMode(.hierarchical)
.padding(.trailing, -5)
.animation(.spring, value: text.isEmpty)
}
}
}
}
struct AddEvent_Preview: PreviewProvider {
@State static var symbol = "star"
@State static var date = Date()
static var previews: some View {
AddEventView(
viewModel: EventViewModel(),
eventName: .constant("Birthday"),
eventSymbol: $symbol,
eventDescription: .constant("A very special day"),
eventDate: $date,
eventRecurrence: .constant(.monthly),
isPresented: .constant(true)
)
}
}

View File

@@ -8,59 +8,170 @@
import SwiftUI
import SwiftData
//struct ContentView: View {
// @Environment(\.modelContext) private var modelContext
// @Query private var items: [Item]
//
// var body: some View {
// NavigationSplitView {
// List {
// ForEach(items) { item in
// NavigationLink {
// Text("Item at \(item.timestamp, format: Date.FormatStyle(date: .numeric, time: .standard))")
// } label: {
// Text(item.timestamp, format: Date.FormatStyle(date: .numeric, time: .standard))
// }
// }
// .onDelete(perform: deleteItems)
// }
//#if os(macOS)
// .navigationSplitViewColumnWidth(min: 180, ideal: 200)
//#endif
// .toolbar {
//#if os(iOS)
// ToolbarItem(placement: .navigationBarTrailing) {
// EditButton()
// }
//#endif
// ToolbarItem {
// Button(action: addItem) {
// Label("Add Item", systemImage: "plus")
// }
// }
// }
// } detail: {
// Text("Select an item")
// }
// }
//
// private func addItem() {
// withAnimation {
// let newItem = Item(timestamp: Date())
// modelContext.insert(newItem)
// }
// }
//
// private func deleteItems(offsets: IndexSet) {
// withAnimation {
// for index in offsets {
// modelContext.delete(items[index])
// }
// }
// }
//}
//
//#Preview {
// ContentView()
// .modelContainer(for: Item.self, inMemory: true)
//}
struct ContentView: View {
@Environment(\.modelContext) private var modelContext
@Query private var items: [Item]
@StateObject private var viewModel = EventViewModel()
@State private var eventName = ""
@State private var eventSymbol = "star"
@State private var eventDescription = ""
@State private var eventDate = Date()
@State private var eventRecurrence: Event.RecurrenceType = .none
@State private var showingAddEventView = false
@State private var searchInput: String = ""
var filteredEvents: [Event] {
if searchInput.isEmpty {
return viewModel.events
} else {
return viewModel.events.filter {
$0.name.localizedCaseInsensitiveContains(searchInput) ||
$0.description.localizedCaseInsensitiveContains(searchInput)
}
}
}
var body: some View {
NavigationSplitView {
NavigationView {
VStack {
ZStack {
TextField(
"\(Image(systemName: "magnifyingglass")) Search",
text: $searchInput
)
.padding(.trailing, searchInput.isEmpty ? 0 : 30)
.animation(.spring, value: searchInput)
.textFieldStyle(RoundedBorderTextFieldStyle())
MagicClearButton(text: $searchInput)
}
.padding(.horizontal)
List {
ForEach(items) { item in
NavigationLink {
Text("Item at \(item.timestamp, format: Date.FormatStyle(date: .numeric, time: .standard))")
} label: {
Text(item.timestamp, format: Date.FormatStyle(date: .numeric, time: .standard))
ForEach(filteredEvents) { event in
EventListView(event: event)
}
.onDelete(perform: viewModel.removeEvent)
}
}
.onDelete(perform: deleteItems)
.navigationTitle("Near Future")
// .navigationTitle() {
// Text("hi")
// }
.navigationBarTitleDisplayMode(.inline)
.sheet(isPresented: $showingAddEventView) {
AddEventView(
viewModel: viewModel,
eventName: $eventName,
eventSymbol: $eventSymbol,
eventDescription: $eventDescription,
eventDate: $eventDate,
eventRecurrence: $eventRecurrence,
isPresented: $showingAddEventView
)
}
#if os(macOS)
.navigationSplitViewColumnWidth(min: 180, ideal: 200)
#endif
.toolbar {
#if os(iOS)
ToolbarItem(placement: .navigationBarTrailing) {
EditButton()
ToolbarItem(placement: .topBarTrailing) {
Button(action: {
showingAddEventView.toggle()
}) {
Image(systemName: "plus.circle")
.resizable()
.scaledToFit()
}
#endif
ToolbarItem {
Button(action: addItem) {
Label("Add Item", systemImage: "plus")
}
}
}
} detail: {
Text("Select an item")
}
}
private func addItem() {
withAnimation {
let newItem = Item(timestamp: Date())
modelContext.insert(newItem)
}
}
}
private func deleteItems(offsets: IndexSet) {
withAnimation {
for index in offsets {
modelContext.delete(items[index])
struct EventListView: View {
@State var event: Event
var body: some View {
HStack {
VStack(alignment: .leading) {
HStack {
Image(systemName: event.symbol)
Text(event.name)
.font(.headline)
.padding(.bottom, 2)
}
Text(event.description)
.font(.subheadline)
.foregroundColor(.gray)
Text("Recurring: \(event.recurrence.rawValue.capitalized)")
.font(.subheadline)
.foregroundColor(.blue)
Text("In \(daysUntilEvent(event.date))")
.font(.subheadline)
.foregroundColor(.gray)
}
Spacer()
Text(event.date.formatted(date: .long, time: .omitted))
.font(.subheadline)
.foregroundColor(.blue)
}
.padding(.vertical, 8)
}
}
#Preview {
ContentView()
.modelContainer(for: Item.self, inMemory: true)
}

View File

@@ -16,3 +16,81 @@ final class Item {
self.timestamp = timestamp
}
}
struct Event: Identifiable, Codable {
var id = UUID()
var name: String
var symbol: String
var description: String
var date: Date
var recurrence: RecurrenceType
enum RecurrenceType: String, Codable, CaseIterable {
case none, daily, weekly, monthly, yearly
}
}
func daysUntilEvent(_ eventDate: Date) -> String {
let calendar = Calendar.current
let currentDate = Date()
let components = calendar.dateComponents([.day], from: currentDate, to: eventDate)
guard let days = components.day else { return "N/A" }
return "\(days) days"
}
class EventViewModel: ObservableObject {
@Published var events: [Event] = []
init() {
loadEvents()
}
func loadEvents() {
if let savedData = UserDefaults.standard.data(forKey: "events") {
let decoder = JSONDecoder()
if let decodedEvents = try? decoder.decode([Event].self, from: savedData) {
self.events = decodedEvents
}
}
}
func saveEvents() {
let encoder = JSONEncoder()
if let encoded = try? encoder.encode(events) {
UserDefaults.standard.set(encoded, forKey: "events")
}
}
func addEvent(name: String, symbol: String, description: String, date: Date, recurrence: Event.RecurrenceType) {
let newEvent = Event(
name: name,
symbol: symbol,
description: description,
date: date,
recurrence: recurrence
)
events.append(newEvent)
saveEvents()
}
func removeEvent(at index: IndexSet) {
events.remove(atOffsets: index)
saveEvents()
}
}
//TODO: make it better lol
func describeOccurrence(date: Date, recurrence: Event.RecurrenceType) -> String {
switch recurrence {
case .none:
return "Occurs once on \(date.formatted(date: .long, time: .omitted))"
case .daily:
return "Repeats every day from \(date.formatted(date: .long, time: .omitted))"
case .weekly:
return "Repeats every week from \(date.formatted(date: .long, time: .omitted))"
case .monthly:
return "Repeats every month from \(date.formatted(date: .long, time: .omitted))"
case .yearly:
return "Repeats every month from \(date.formatted(date: .long, time: .omitted))"
}
}

View File

@@ -3,8 +3,10 @@
<plist version="1.0">
<dict>
<key>com.apple.security.app-sandbox</key>
<true/>
<false/>
<key>com.apple.security.files.user-selected.read-only</key>
<false/>
<key>get-task-allow</key>
<true/>
</dict>
</plist>