From ed016217dba2b3491d3115f11e0719112e997e0b Mon Sep 17 00:00:00 2001 From: neon443 <69979447+neon443@users.noreply.github.com> Date: Wed, 21 May 2025 14:52:55 +0100 Subject: [PATCH] added item and assets to macnearfuture --- .../AccentColor.colorset/Contents.json | 11 ---- .../AppIcon.appiconset/Contents.json | 58 ------------------ MacNearFuture/MacNearFutureApp.swift | 17 ----- MacNearFuture/{ => Views}/ContentView.swift | 8 ++- NearFuture.xcodeproj/project.pbxproj | 42 +++++++++---- .../Resources/Assets.xcassets/Contents.json | 6 -- .../AccentColor.colorset/Contents.json | 0 .../AppIcon.appiconset/Contents.json | 0 .../AppIcon.appiconset/NearFutureIcon.png | Bin .../AppIcon.appiconset/NearFutureIconDark.png | Bin .../AppIcon.appiconset/NearFutureIconTint.png | Bin .../Assets.xcassets/Contents.json | 0 .../bgTop.colorset/Contents.json | 0 .../bloo.appiconset/Contents.json | 0 .../bloo.appiconset/NearFutureIconTint.png | Bin .../Assets.xcassets/bloo.appiconset/bloo.png | Bin .../bloo.appiconset/blooDark.png | Bin .../blue.appiconset/Contents.json | 0 .../blue.appiconset/NearFutureIconTint.png | Bin .../Assets.xcassets/blue.appiconset/blue.png | Bin .../blue.appiconset/blueDark.png | Bin .../green.appiconset/Contents.json | 0 .../green.appiconset/NearFutureIconTint.png | Bin .../green.appiconset/green.png | Bin .../green.appiconset/greenDark.png | Bin .../one.colorset/Contents.json | 0 .../pink.appiconset/Contents.json | 0 .../pink.appiconset/NearFutureIconTint.png | Bin .../Assets.xcassets/pink.appiconset/pink.png | Bin .../pink.appiconset/pinkDark.png | Bin .../purple.appiconset/Contents.json | 0 .../purple.appiconset/NearFutureIconTint.png | Bin .../purple.appiconset/purple.png | Bin .../purple.appiconset/purpleDark.png | Bin .../red.appiconset/Contents.json | 0 .../red.appiconset/NearFutureIconTint.png | Bin .../Assets.xcassets/red.appiconset/red.png | Bin .../red.appiconset/redDark.png | Bin .../two.colorset/Contents.json | 0 .../Assets.xcassets/uiColors/Contents.json | 0 .../uiColors/bloo.colorset/Contents.json | 0 .../uiColors/blue.colorset/Contents.json | 0 .../uiColors/green.colorset/Contents.json | 0 .../uiColors/orange.colorset/Contents.json | 0 .../uiColors/pink.colorset/Contents.json | 0 .../uiColors/purple.colorset/Contents.json | 0 .../uiColors/red.colorset/Contents.json | 0 .../uiColors/yellow.colorset/Contents.json | 0 .../yellow.appiconset/Contents.json | 0 .../yellow.appiconset/NearFutureIconTint.png | Bin .../yellow.appiconset/yellow.png | Bin .../yellow.appiconset/yellowDark.png | Bin .../Dark Variants/BlooDark.pxd | Bin .../Dark Variants/BlueDark.pxd | Bin .../Dark Variants/GreenDark.pxd | Bin .../Dark Variants/PinkDark.pxd | Bin .../Dark Variants/PurpleDark.pxd | Bin .../Dark Variants/RedDark.pxd | Bin .../Dark Variants/YellowDark.pxd | Bin {NearFuture/Resources => Resources}/Grue.pxd | Bin .../Resources => Resources}/GrueDark.pxd | Bin .../Light Variants/Bloo.pxd | Bin .../Light Variants/Blue.pxd | Bin .../Light Variants/Green.pxd | Bin .../Light Variants/Pink.pxd | Bin .../Light Variants/Purple.pxd | Bin .../Light Variants/Red.pxd | Bin .../Light Variants/Yellow.pxd | Bin .../NearFutureIcon.pxd | Bin .../NearFutureIconDark.pxd | Bin .../NearFutureIconTint.pxd | Bin {NearFuture => Shared}/Model/Event.swift | 0 {NearFuture => Shared}/NearFutureApp.swift | 0 73 files changed, 36 insertions(+), 106 deletions(-) delete mode 100644 MacNearFuture/Assets.xcassets/AccentColor.colorset/Contents.json delete mode 100644 MacNearFuture/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 MacNearFuture/MacNearFutureApp.swift rename MacNearFuture/{ => Views}/ContentView.swift (65%) delete mode 100644 NearFuture/Resources/Assets.xcassets/Contents.json rename {NearFuture/Resources => Resources}/Assets.xcassets/AccentColor.colorset/Contents.json (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/AppIcon.appiconset/NearFutureIcon.png (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/AppIcon.appiconset/NearFutureIconDark.png (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/AppIcon.appiconset/NearFutureIconTint.png (100%) rename {MacNearFuture => Resources}/Assets.xcassets/Contents.json (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/bgTop.colorset/Contents.json (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/bloo.appiconset/Contents.json (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/bloo.appiconset/NearFutureIconTint.png (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/bloo.appiconset/bloo.png (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/bloo.appiconset/blooDark.png (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/blue.appiconset/Contents.json (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/blue.appiconset/NearFutureIconTint.png (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/blue.appiconset/blue.png (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/blue.appiconset/blueDark.png (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/green.appiconset/Contents.json (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/green.appiconset/NearFutureIconTint.png (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/green.appiconset/green.png (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/green.appiconset/greenDark.png (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/one.colorset/Contents.json (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/pink.appiconset/Contents.json (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/pink.appiconset/NearFutureIconTint.png (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/pink.appiconset/pink.png (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/pink.appiconset/pinkDark.png (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/purple.appiconset/Contents.json (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/purple.appiconset/NearFutureIconTint.png (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/purple.appiconset/purple.png (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/purple.appiconset/purpleDark.png (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/red.appiconset/Contents.json (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/red.appiconset/NearFutureIconTint.png (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/red.appiconset/red.png (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/red.appiconset/redDark.png (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/two.colorset/Contents.json (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/uiColors/Contents.json (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/uiColors/bloo.colorset/Contents.json (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/uiColors/blue.colorset/Contents.json (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/uiColors/green.colorset/Contents.json (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/uiColors/orange.colorset/Contents.json (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/uiColors/pink.colorset/Contents.json (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/uiColors/purple.colorset/Contents.json (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/uiColors/red.colorset/Contents.json (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/uiColors/yellow.colorset/Contents.json (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/yellow.appiconset/Contents.json (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/yellow.appiconset/NearFutureIconTint.png (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/yellow.appiconset/yellow.png (100%) rename {NearFuture/Resources => Resources}/Assets.xcassets/yellow.appiconset/yellowDark.png (100%) rename {NearFuture/Resources => Resources}/Dark Variants/BlooDark.pxd (100%) rename {NearFuture/Resources => Resources}/Dark Variants/BlueDark.pxd (100%) rename {NearFuture/Resources => Resources}/Dark Variants/GreenDark.pxd (100%) rename {NearFuture/Resources => Resources}/Dark Variants/PinkDark.pxd (100%) rename {NearFuture/Resources => Resources}/Dark Variants/PurpleDark.pxd (100%) rename {NearFuture/Resources => Resources}/Dark Variants/RedDark.pxd (100%) rename {NearFuture/Resources => Resources}/Dark Variants/YellowDark.pxd (100%) rename {NearFuture/Resources => Resources}/Grue.pxd (100%) rename {NearFuture/Resources => Resources}/GrueDark.pxd (100%) rename {NearFuture/Resources => Resources}/Light Variants/Bloo.pxd (100%) rename {NearFuture/Resources => Resources}/Light Variants/Blue.pxd (100%) rename {NearFuture/Resources => Resources}/Light Variants/Green.pxd (100%) rename {NearFuture/Resources => Resources}/Light Variants/Pink.pxd (100%) rename {NearFuture/Resources => Resources}/Light Variants/Purple.pxd (100%) rename {NearFuture/Resources => Resources}/Light Variants/Red.pxd (100%) rename {NearFuture/Resources => Resources}/Light Variants/Yellow.pxd (100%) rename {NearFuture/Resources => Resources}/NearFutureIcon.pxd (100%) rename {NearFuture/Resources => Resources}/NearFutureIconDark.pxd (100%) rename {NearFuture/Resources => Resources}/NearFutureIconTint.pxd (100%) rename {NearFuture => Shared}/Model/Event.swift (100%) rename {NearFuture => Shared}/NearFutureApp.swift (100%) diff --git a/MacNearFuture/Assets.xcassets/AccentColor.colorset/Contents.json b/MacNearFuture/Assets.xcassets/AccentColor.colorset/Contents.json deleted file mode 100644 index eb87897..0000000 --- a/MacNearFuture/Assets.xcassets/AccentColor.colorset/Contents.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "colors" : [ - { - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MacNearFuture/Assets.xcassets/AppIcon.appiconset/Contents.json b/MacNearFuture/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 3f00db4..0000000 --- a/MacNearFuture/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "scale" : "1x", - "size" : "16x16" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "16x16" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "32x32" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "32x32" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "128x128" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "128x128" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "256x256" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "256x256" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "512x512" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "512x512" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/MacNearFuture/MacNearFutureApp.swift b/MacNearFuture/MacNearFutureApp.swift deleted file mode 100644 index 01ca05e..0000000 --- a/MacNearFuture/MacNearFutureApp.swift +++ /dev/null @@ -1,17 +0,0 @@ -// -// MacNearFutureApp.swift -// MacNearFuture -// -// Created by neon443 on 21/05/2025. -// - -import SwiftUI - -@main -struct MacNearFutureApp: App { - var body: some Scene { - WindowGroup { - ContentView() - } - } -} diff --git a/MacNearFuture/ContentView.swift b/MacNearFuture/Views/ContentView.swift similarity index 65% rename from MacNearFuture/ContentView.swift rename to MacNearFuture/Views/ContentView.swift index 2a69949..b8f8c93 100644 --- a/MacNearFuture/ContentView.swift +++ b/MacNearFuture/Views/ContentView.swift @@ -8,6 +8,9 @@ import SwiftUI struct ContentView: View { + @ObservedObject var viewModel: EventViewModel + @ObservedObject var settingsModel: SettingsViewModel + var body: some View { VStack { Image(systemName: "globe") @@ -20,5 +23,8 @@ struct ContentView: View { } #Preview { - ContentView() + ContentView( + viewModel: dummyEventViewModel(), + settingsModel: dummySettingsViewModel() + ) } diff --git a/NearFuture.xcodeproj/project.pbxproj b/NearFuture.xcodeproj/project.pbxproj index 9a2984c..36fd439 100644 --- a/NearFuture.xcodeproj/project.pbxproj +++ b/NearFuture.xcodeproj/project.pbxproj @@ -7,9 +7,11 @@ objects = { /* Begin PBXBuildFile section */ - A90D49372DDE0FAF00781124 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A90D49322DDE0FAF00781124 /* Assets.xcassets */; }; A90D49382DDE0FAF00781124 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90D49332DDE0FAF00781124 /* ContentView.swift */; }; - A90D49392DDE0FAF00781124 /* MacNearFutureApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90D49352DDE0FAF00781124 /* MacNearFutureApp.swift */; }; + A90D493D2DDE10B200781124 /* NearFutureIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = A949F8312DCAAA8A0064DCA0 /* NearFutureIcon.png */; }; + A90D493E2DDE10CF00781124 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A920C28D2D24011A00E4F9B1 /* Assets.xcassets */; }; + A90D49402DDE111400781124 /* NearFutureApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = A920C2872D24011400E4F9B1 /* NearFutureApp.swift */; }; + A90D49422DDE114100781124 /* Event.swift in Sources */ = {isa = PBXBuildFile; fileRef = A920C28B2D24011400E4F9B1 /* Event.swift */; }; A914FA4B2DD26C6800856265 /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A914FA4A2DD26C0F00856265 /* HomeView.swift */; }; A914FA4D2DD2768900856265 /* WhatsNewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A914FA4C2DD2768900856265 /* WhatsNewView.swift */; }; A914FA4F2DD276D200856265 /* AboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A914FA4E2DD276D200856265 /* AboutView.swift */; }; @@ -66,10 +68,8 @@ /* Begin PBXFileReference section */ A90D491F2DDE08E400781124 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; A90D49262DDE0FA400781124 /* MacNearFuture.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacNearFuture.app; sourceTree = BUILT_PRODUCTS_DIR; }; - A90D49322DDE0FAF00781124 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; A90D49332DDE0FAF00781124 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; A90D49342DDE0FAF00781124 /* MacNearFuture.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = MacNearFuture.entitlements; sourceTree = ""; }; - A90D49352DDE0FAF00781124 /* MacNearFutureApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MacNearFutureApp.swift; sourceTree = ""; }; A90FDE222DC0D4310012790C /* Config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = ""; }; A914FA4A2DD26C0F00856265 /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = ""; }; A914FA4C2DD2768900856265 /* WhatsNewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = WhatsNewView.swift; path = NearFuture/Views/Settings/WhatsNewView.swift; sourceTree = SOURCE_ROOT; }; @@ -139,22 +139,39 @@ A90D49362DDE0FAF00781124 /* MacNearFuture */ = { isa = PBXGroup; children = ( - A90D49322DDE0FAF00781124 /* Assets.xcassets */, - A90D49332DDE0FAF00781124 /* ContentView.swift */, + A90D493F2DDE10EC00781124 /* Views */, A90D49342DDE0FAF00781124 /* MacNearFuture.entitlements */, - A90D49352DDE0FAF00781124 /* MacNearFutureApp.swift */, ); path = MacNearFuture; sourceTree = ""; }; + A90D493F2DDE10EC00781124 /* Views */ = { + isa = PBXGroup; + children = ( + A90D49332DDE0FAF00781124 /* ContentView.swift */, + ); + path = Views; + sourceTree = ""; + }; + A90D49412DDE112700781124 /* Shared */ = { + isa = PBXGroup; + children = ( + A920C2872D24011400E4F9B1 /* NearFutureApp.swift */, + A90D49202DDE0A3B00781124 /* Model */, + ); + path = Shared; + sourceTree = ""; + }; A920C27B2D24011300E4F9B1 = { isa = PBXGroup; children = ( + A90D49412DDE112700781124 /* Shared */, A90D491F2DDE08E400781124 /* README.md */, A90FDE222DC0D4310012790C /* Config.xcconfig */, A920C2862D24011400E4F9B1 /* NearFuture */, - A979F6082D270AF00094C0B3 /* NearFutureWidgets */, A90D49362DDE0FAF00781124 /* MacNearFuture */, + A949F8002DCAA0340064DCA0 /* Resources */, + A979F6082D270AF00094C0B3 /* NearFutureWidgets */, A920C2852D24011400E4F9B1 /* Products */, ); sourceTree = ""; @@ -172,10 +189,7 @@ A920C2862D24011400E4F9B1 /* NearFuture */ = { isa = PBXGroup; children = ( - A920C2872D24011400E4F9B1 /* NearFutureApp.swift */, A949F84A2DCAABE00064DCA0 /* Views */, - A90D49202DDE0A3B00781124 /* Model */, - A949F8002DCAA0340064DCA0 /* Resources */, A920C2902D24011A00E4F9B1 /* Preview Content */, ); path = NearFuture; @@ -392,7 +406,8 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - A90D49372DDE0FAF00781124 /* Assets.xcassets in Resources */, + A90D493E2DDE10CF00781124 /* Assets.xcassets in Resources */, + A90D493D2DDE10B200781124 /* NearFutureIcon.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -421,8 +436,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + A90D49402DDE111400781124 /* NearFutureApp.swift in Sources */, + A90D49422DDE114100781124 /* Event.swift in Sources */, A90D49382DDE0FAF00781124 /* ContentView.swift in Sources */, - A90D49392DDE0FAF00781124 /* MacNearFutureApp.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/NearFuture/Resources/Assets.xcassets/Contents.json b/NearFuture/Resources/Assets.xcassets/Contents.json deleted file mode 100644 index 73c0059..0000000 --- a/NearFuture/Resources/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/NearFuture/Resources/Assets.xcassets/AccentColor.colorset/Contents.json b/Resources/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from NearFuture/Resources/Assets.xcassets/AccentColor.colorset/Contents.json rename to Resources/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/NearFuture/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json b/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from NearFuture/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Resources/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/NearFuture/Resources/Assets.xcassets/AppIcon.appiconset/NearFutureIcon.png b/Resources/Assets.xcassets/AppIcon.appiconset/NearFutureIcon.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/AppIcon.appiconset/NearFutureIcon.png rename to Resources/Assets.xcassets/AppIcon.appiconset/NearFutureIcon.png diff --git a/NearFuture/Resources/Assets.xcassets/AppIcon.appiconset/NearFutureIconDark.png b/Resources/Assets.xcassets/AppIcon.appiconset/NearFutureIconDark.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/AppIcon.appiconset/NearFutureIconDark.png rename to Resources/Assets.xcassets/AppIcon.appiconset/NearFutureIconDark.png diff --git a/NearFuture/Resources/Assets.xcassets/AppIcon.appiconset/NearFutureIconTint.png b/Resources/Assets.xcassets/AppIcon.appiconset/NearFutureIconTint.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/AppIcon.appiconset/NearFutureIconTint.png rename to Resources/Assets.xcassets/AppIcon.appiconset/NearFutureIconTint.png diff --git a/MacNearFuture/Assets.xcassets/Contents.json b/Resources/Assets.xcassets/Contents.json similarity index 100% rename from MacNearFuture/Assets.xcassets/Contents.json rename to Resources/Assets.xcassets/Contents.json diff --git a/NearFuture/Resources/Assets.xcassets/bgTop.colorset/Contents.json b/Resources/Assets.xcassets/bgTop.colorset/Contents.json similarity index 100% rename from NearFuture/Resources/Assets.xcassets/bgTop.colorset/Contents.json rename to Resources/Assets.xcassets/bgTop.colorset/Contents.json diff --git a/NearFuture/Resources/Assets.xcassets/bloo.appiconset/Contents.json b/Resources/Assets.xcassets/bloo.appiconset/Contents.json similarity index 100% rename from NearFuture/Resources/Assets.xcassets/bloo.appiconset/Contents.json rename to Resources/Assets.xcassets/bloo.appiconset/Contents.json diff --git a/NearFuture/Resources/Assets.xcassets/bloo.appiconset/NearFutureIconTint.png b/Resources/Assets.xcassets/bloo.appiconset/NearFutureIconTint.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/bloo.appiconset/NearFutureIconTint.png rename to Resources/Assets.xcassets/bloo.appiconset/NearFutureIconTint.png diff --git a/NearFuture/Resources/Assets.xcassets/bloo.appiconset/bloo.png b/Resources/Assets.xcassets/bloo.appiconset/bloo.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/bloo.appiconset/bloo.png rename to Resources/Assets.xcassets/bloo.appiconset/bloo.png diff --git a/NearFuture/Resources/Assets.xcassets/bloo.appiconset/blooDark.png b/Resources/Assets.xcassets/bloo.appiconset/blooDark.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/bloo.appiconset/blooDark.png rename to Resources/Assets.xcassets/bloo.appiconset/blooDark.png diff --git a/NearFuture/Resources/Assets.xcassets/blue.appiconset/Contents.json b/Resources/Assets.xcassets/blue.appiconset/Contents.json similarity index 100% rename from NearFuture/Resources/Assets.xcassets/blue.appiconset/Contents.json rename to Resources/Assets.xcassets/blue.appiconset/Contents.json diff --git a/NearFuture/Resources/Assets.xcassets/blue.appiconset/NearFutureIconTint.png b/Resources/Assets.xcassets/blue.appiconset/NearFutureIconTint.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/blue.appiconset/NearFutureIconTint.png rename to Resources/Assets.xcassets/blue.appiconset/NearFutureIconTint.png diff --git a/NearFuture/Resources/Assets.xcassets/blue.appiconset/blue.png b/Resources/Assets.xcassets/blue.appiconset/blue.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/blue.appiconset/blue.png rename to Resources/Assets.xcassets/blue.appiconset/blue.png diff --git a/NearFuture/Resources/Assets.xcassets/blue.appiconset/blueDark.png b/Resources/Assets.xcassets/blue.appiconset/blueDark.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/blue.appiconset/blueDark.png rename to Resources/Assets.xcassets/blue.appiconset/blueDark.png diff --git a/NearFuture/Resources/Assets.xcassets/green.appiconset/Contents.json b/Resources/Assets.xcassets/green.appiconset/Contents.json similarity index 100% rename from NearFuture/Resources/Assets.xcassets/green.appiconset/Contents.json rename to Resources/Assets.xcassets/green.appiconset/Contents.json diff --git a/NearFuture/Resources/Assets.xcassets/green.appiconset/NearFutureIconTint.png b/Resources/Assets.xcassets/green.appiconset/NearFutureIconTint.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/green.appiconset/NearFutureIconTint.png rename to Resources/Assets.xcassets/green.appiconset/NearFutureIconTint.png diff --git a/NearFuture/Resources/Assets.xcassets/green.appiconset/green.png b/Resources/Assets.xcassets/green.appiconset/green.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/green.appiconset/green.png rename to Resources/Assets.xcassets/green.appiconset/green.png diff --git a/NearFuture/Resources/Assets.xcassets/green.appiconset/greenDark.png b/Resources/Assets.xcassets/green.appiconset/greenDark.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/green.appiconset/greenDark.png rename to Resources/Assets.xcassets/green.appiconset/greenDark.png diff --git a/NearFuture/Resources/Assets.xcassets/one.colorset/Contents.json b/Resources/Assets.xcassets/one.colorset/Contents.json similarity index 100% rename from NearFuture/Resources/Assets.xcassets/one.colorset/Contents.json rename to Resources/Assets.xcassets/one.colorset/Contents.json diff --git a/NearFuture/Resources/Assets.xcassets/pink.appiconset/Contents.json b/Resources/Assets.xcassets/pink.appiconset/Contents.json similarity index 100% rename from NearFuture/Resources/Assets.xcassets/pink.appiconset/Contents.json rename to Resources/Assets.xcassets/pink.appiconset/Contents.json diff --git a/NearFuture/Resources/Assets.xcassets/pink.appiconset/NearFutureIconTint.png b/Resources/Assets.xcassets/pink.appiconset/NearFutureIconTint.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/pink.appiconset/NearFutureIconTint.png rename to Resources/Assets.xcassets/pink.appiconset/NearFutureIconTint.png diff --git a/NearFuture/Resources/Assets.xcassets/pink.appiconset/pink.png b/Resources/Assets.xcassets/pink.appiconset/pink.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/pink.appiconset/pink.png rename to Resources/Assets.xcassets/pink.appiconset/pink.png diff --git a/NearFuture/Resources/Assets.xcassets/pink.appiconset/pinkDark.png b/Resources/Assets.xcassets/pink.appiconset/pinkDark.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/pink.appiconset/pinkDark.png rename to Resources/Assets.xcassets/pink.appiconset/pinkDark.png diff --git a/NearFuture/Resources/Assets.xcassets/purple.appiconset/Contents.json b/Resources/Assets.xcassets/purple.appiconset/Contents.json similarity index 100% rename from NearFuture/Resources/Assets.xcassets/purple.appiconset/Contents.json rename to Resources/Assets.xcassets/purple.appiconset/Contents.json diff --git a/NearFuture/Resources/Assets.xcassets/purple.appiconset/NearFutureIconTint.png b/Resources/Assets.xcassets/purple.appiconset/NearFutureIconTint.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/purple.appiconset/NearFutureIconTint.png rename to Resources/Assets.xcassets/purple.appiconset/NearFutureIconTint.png diff --git a/NearFuture/Resources/Assets.xcassets/purple.appiconset/purple.png b/Resources/Assets.xcassets/purple.appiconset/purple.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/purple.appiconset/purple.png rename to Resources/Assets.xcassets/purple.appiconset/purple.png diff --git a/NearFuture/Resources/Assets.xcassets/purple.appiconset/purpleDark.png b/Resources/Assets.xcassets/purple.appiconset/purpleDark.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/purple.appiconset/purpleDark.png rename to Resources/Assets.xcassets/purple.appiconset/purpleDark.png diff --git a/NearFuture/Resources/Assets.xcassets/red.appiconset/Contents.json b/Resources/Assets.xcassets/red.appiconset/Contents.json similarity index 100% rename from NearFuture/Resources/Assets.xcassets/red.appiconset/Contents.json rename to Resources/Assets.xcassets/red.appiconset/Contents.json diff --git a/NearFuture/Resources/Assets.xcassets/red.appiconset/NearFutureIconTint.png b/Resources/Assets.xcassets/red.appiconset/NearFutureIconTint.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/red.appiconset/NearFutureIconTint.png rename to Resources/Assets.xcassets/red.appiconset/NearFutureIconTint.png diff --git a/NearFuture/Resources/Assets.xcassets/red.appiconset/red.png b/Resources/Assets.xcassets/red.appiconset/red.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/red.appiconset/red.png rename to Resources/Assets.xcassets/red.appiconset/red.png diff --git a/NearFuture/Resources/Assets.xcassets/red.appiconset/redDark.png b/Resources/Assets.xcassets/red.appiconset/redDark.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/red.appiconset/redDark.png rename to Resources/Assets.xcassets/red.appiconset/redDark.png diff --git a/NearFuture/Resources/Assets.xcassets/two.colorset/Contents.json b/Resources/Assets.xcassets/two.colorset/Contents.json similarity index 100% rename from NearFuture/Resources/Assets.xcassets/two.colorset/Contents.json rename to Resources/Assets.xcassets/two.colorset/Contents.json diff --git a/NearFuture/Resources/Assets.xcassets/uiColors/Contents.json b/Resources/Assets.xcassets/uiColors/Contents.json similarity index 100% rename from NearFuture/Resources/Assets.xcassets/uiColors/Contents.json rename to Resources/Assets.xcassets/uiColors/Contents.json diff --git a/NearFuture/Resources/Assets.xcassets/uiColors/bloo.colorset/Contents.json b/Resources/Assets.xcassets/uiColors/bloo.colorset/Contents.json similarity index 100% rename from NearFuture/Resources/Assets.xcassets/uiColors/bloo.colorset/Contents.json rename to Resources/Assets.xcassets/uiColors/bloo.colorset/Contents.json diff --git a/NearFuture/Resources/Assets.xcassets/uiColors/blue.colorset/Contents.json b/Resources/Assets.xcassets/uiColors/blue.colorset/Contents.json similarity index 100% rename from NearFuture/Resources/Assets.xcassets/uiColors/blue.colorset/Contents.json rename to Resources/Assets.xcassets/uiColors/blue.colorset/Contents.json diff --git a/NearFuture/Resources/Assets.xcassets/uiColors/green.colorset/Contents.json b/Resources/Assets.xcassets/uiColors/green.colorset/Contents.json similarity index 100% rename from NearFuture/Resources/Assets.xcassets/uiColors/green.colorset/Contents.json rename to Resources/Assets.xcassets/uiColors/green.colorset/Contents.json diff --git a/NearFuture/Resources/Assets.xcassets/uiColors/orange.colorset/Contents.json b/Resources/Assets.xcassets/uiColors/orange.colorset/Contents.json similarity index 100% rename from NearFuture/Resources/Assets.xcassets/uiColors/orange.colorset/Contents.json rename to Resources/Assets.xcassets/uiColors/orange.colorset/Contents.json diff --git a/NearFuture/Resources/Assets.xcassets/uiColors/pink.colorset/Contents.json b/Resources/Assets.xcassets/uiColors/pink.colorset/Contents.json similarity index 100% rename from NearFuture/Resources/Assets.xcassets/uiColors/pink.colorset/Contents.json rename to Resources/Assets.xcassets/uiColors/pink.colorset/Contents.json diff --git a/NearFuture/Resources/Assets.xcassets/uiColors/purple.colorset/Contents.json b/Resources/Assets.xcassets/uiColors/purple.colorset/Contents.json similarity index 100% rename from NearFuture/Resources/Assets.xcassets/uiColors/purple.colorset/Contents.json rename to Resources/Assets.xcassets/uiColors/purple.colorset/Contents.json diff --git a/NearFuture/Resources/Assets.xcassets/uiColors/red.colorset/Contents.json b/Resources/Assets.xcassets/uiColors/red.colorset/Contents.json similarity index 100% rename from NearFuture/Resources/Assets.xcassets/uiColors/red.colorset/Contents.json rename to Resources/Assets.xcassets/uiColors/red.colorset/Contents.json diff --git a/NearFuture/Resources/Assets.xcassets/uiColors/yellow.colorset/Contents.json b/Resources/Assets.xcassets/uiColors/yellow.colorset/Contents.json similarity index 100% rename from NearFuture/Resources/Assets.xcassets/uiColors/yellow.colorset/Contents.json rename to Resources/Assets.xcassets/uiColors/yellow.colorset/Contents.json diff --git a/NearFuture/Resources/Assets.xcassets/yellow.appiconset/Contents.json b/Resources/Assets.xcassets/yellow.appiconset/Contents.json similarity index 100% rename from NearFuture/Resources/Assets.xcassets/yellow.appiconset/Contents.json rename to Resources/Assets.xcassets/yellow.appiconset/Contents.json diff --git a/NearFuture/Resources/Assets.xcassets/yellow.appiconset/NearFutureIconTint.png b/Resources/Assets.xcassets/yellow.appiconset/NearFutureIconTint.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/yellow.appiconset/NearFutureIconTint.png rename to Resources/Assets.xcassets/yellow.appiconset/NearFutureIconTint.png diff --git a/NearFuture/Resources/Assets.xcassets/yellow.appiconset/yellow.png b/Resources/Assets.xcassets/yellow.appiconset/yellow.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/yellow.appiconset/yellow.png rename to Resources/Assets.xcassets/yellow.appiconset/yellow.png diff --git a/NearFuture/Resources/Assets.xcassets/yellow.appiconset/yellowDark.png b/Resources/Assets.xcassets/yellow.appiconset/yellowDark.png similarity index 100% rename from NearFuture/Resources/Assets.xcassets/yellow.appiconset/yellowDark.png rename to Resources/Assets.xcassets/yellow.appiconset/yellowDark.png diff --git a/NearFuture/Resources/Dark Variants/BlooDark.pxd b/Resources/Dark Variants/BlooDark.pxd similarity index 100% rename from NearFuture/Resources/Dark Variants/BlooDark.pxd rename to Resources/Dark Variants/BlooDark.pxd diff --git a/NearFuture/Resources/Dark Variants/BlueDark.pxd b/Resources/Dark Variants/BlueDark.pxd similarity index 100% rename from NearFuture/Resources/Dark Variants/BlueDark.pxd rename to Resources/Dark Variants/BlueDark.pxd diff --git a/NearFuture/Resources/Dark Variants/GreenDark.pxd b/Resources/Dark Variants/GreenDark.pxd similarity index 100% rename from NearFuture/Resources/Dark Variants/GreenDark.pxd rename to Resources/Dark Variants/GreenDark.pxd diff --git a/NearFuture/Resources/Dark Variants/PinkDark.pxd b/Resources/Dark Variants/PinkDark.pxd similarity index 100% rename from NearFuture/Resources/Dark Variants/PinkDark.pxd rename to Resources/Dark Variants/PinkDark.pxd diff --git a/NearFuture/Resources/Dark Variants/PurpleDark.pxd b/Resources/Dark Variants/PurpleDark.pxd similarity index 100% rename from NearFuture/Resources/Dark Variants/PurpleDark.pxd rename to Resources/Dark Variants/PurpleDark.pxd diff --git a/NearFuture/Resources/Dark Variants/RedDark.pxd b/Resources/Dark Variants/RedDark.pxd similarity index 100% rename from NearFuture/Resources/Dark Variants/RedDark.pxd rename to Resources/Dark Variants/RedDark.pxd diff --git a/NearFuture/Resources/Dark Variants/YellowDark.pxd b/Resources/Dark Variants/YellowDark.pxd similarity index 100% rename from NearFuture/Resources/Dark Variants/YellowDark.pxd rename to Resources/Dark Variants/YellowDark.pxd diff --git a/NearFuture/Resources/Grue.pxd b/Resources/Grue.pxd similarity index 100% rename from NearFuture/Resources/Grue.pxd rename to Resources/Grue.pxd diff --git a/NearFuture/Resources/GrueDark.pxd b/Resources/GrueDark.pxd similarity index 100% rename from NearFuture/Resources/GrueDark.pxd rename to Resources/GrueDark.pxd diff --git a/NearFuture/Resources/Light Variants/Bloo.pxd b/Resources/Light Variants/Bloo.pxd similarity index 100% rename from NearFuture/Resources/Light Variants/Bloo.pxd rename to Resources/Light Variants/Bloo.pxd diff --git a/NearFuture/Resources/Light Variants/Blue.pxd b/Resources/Light Variants/Blue.pxd similarity index 100% rename from NearFuture/Resources/Light Variants/Blue.pxd rename to Resources/Light Variants/Blue.pxd diff --git a/NearFuture/Resources/Light Variants/Green.pxd b/Resources/Light Variants/Green.pxd similarity index 100% rename from NearFuture/Resources/Light Variants/Green.pxd rename to Resources/Light Variants/Green.pxd diff --git a/NearFuture/Resources/Light Variants/Pink.pxd b/Resources/Light Variants/Pink.pxd similarity index 100% rename from NearFuture/Resources/Light Variants/Pink.pxd rename to Resources/Light Variants/Pink.pxd diff --git a/NearFuture/Resources/Light Variants/Purple.pxd b/Resources/Light Variants/Purple.pxd similarity index 100% rename from NearFuture/Resources/Light Variants/Purple.pxd rename to Resources/Light Variants/Purple.pxd diff --git a/NearFuture/Resources/Light Variants/Red.pxd b/Resources/Light Variants/Red.pxd similarity index 100% rename from NearFuture/Resources/Light Variants/Red.pxd rename to Resources/Light Variants/Red.pxd diff --git a/NearFuture/Resources/Light Variants/Yellow.pxd b/Resources/Light Variants/Yellow.pxd similarity index 100% rename from NearFuture/Resources/Light Variants/Yellow.pxd rename to Resources/Light Variants/Yellow.pxd diff --git a/NearFuture/Resources/NearFutureIcon.pxd b/Resources/NearFutureIcon.pxd similarity index 100% rename from NearFuture/Resources/NearFutureIcon.pxd rename to Resources/NearFutureIcon.pxd diff --git a/NearFuture/Resources/NearFutureIconDark.pxd b/Resources/NearFutureIconDark.pxd similarity index 100% rename from NearFuture/Resources/NearFutureIconDark.pxd rename to Resources/NearFutureIconDark.pxd diff --git a/NearFuture/Resources/NearFutureIconTint.pxd b/Resources/NearFutureIconTint.pxd similarity index 100% rename from NearFuture/Resources/NearFutureIconTint.pxd rename to Resources/NearFutureIconTint.pxd diff --git a/NearFuture/Model/Event.swift b/Shared/Model/Event.swift similarity index 100% rename from NearFuture/Model/Event.swift rename to Shared/Model/Event.swift diff --git a/NearFuture/NearFutureApp.swift b/Shared/NearFutureApp.swift similarity index 100% rename from NearFuture/NearFutureApp.swift rename to Shared/NearFutureApp.swift