From 27184eff9deeece53791162b240d32cc9dd5b676 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sun, 17 Jan 2021 09:11:46 -0500 Subject: [PATCH] [M] Move WVM class to Models.swift --- ProjectClock.xcodeproj/project.pbxproj | 4 ---- ProjectClock/Logic.swift | 20 -------------------- ProjectClock/Models.swift | 13 +++++++++++++ 3 files changed, 13 insertions(+), 24 deletions(-) delete mode 100644 ProjectClock/Logic.swift diff --git a/ProjectClock.xcodeproj/project.pbxproj b/ProjectClock.xcodeproj/project.pbxproj index 0466a66..7bd502e 100644 --- a/ProjectClock.xcodeproj/project.pbxproj +++ b/ProjectClock.xcodeproj/project.pbxproj @@ -9,7 +9,6 @@ /* Begin PBXBuildFile section */ 4F509BD225AE22D100726227 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F509BD125AE22D100726227 /* Models.swift */; }; 4F8A607125A9160400D88DC3 /* AddAlarmViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F8A607025A9160400D88DC3 /* AddAlarmViewController.swift */; }; - 4F8A607525A919E600D88DC3 /* Logic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F8A607425A919E600D88DC3 /* Logic.swift */; }; 4F98955225A9260400F51321 /* Net.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F98955125A9260400F51321 /* Net.swift */; }; 4FA419AF25AF93EC004CE0FC /* AlarmViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FA419AE25AF93EC004CE0FC /* AlarmViewController.swift */; }; 4FF0683F25A5F18700304E6B /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FF0683E25A5F18700304E6B /* AppDelegate.swift */; }; @@ -26,7 +25,6 @@ /* Begin PBXFileReference section */ 4F509BD125AE22D100726227 /* Models.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Models.swift; sourceTree = ""; }; 4F8A607025A9160400D88DC3 /* AddAlarmViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddAlarmViewController.swift; sourceTree = ""; }; - 4F8A607425A919E600D88DC3 /* Logic.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logic.swift; sourceTree = ""; }; 4F98955125A9260400F51321 /* Net.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Net.swift; sourceTree = ""; }; 4FA419AE25AF93EC004CE0FC /* AlarmViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlarmViewController.swift; sourceTree = ""; }; 4FF0683B25A5F18700304E6B /* ProjectClock.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ProjectClock.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -85,7 +83,6 @@ 4FF0684725A5F18800304E6B /* Assets.xcassets */, 4FF0684925A5F18800304E6B /* LaunchScreen.storyboard */, 4FF0684C25A5F18800304E6B /* Info.plist */, - 4F8A607425A919E600D88DC3 /* Logic.swift */, 7C83963525AF375B0027A94C /* NotificationLogic.swift */, 4F98955125A9260400F51321 /* Net.swift */, 7C5DAE9B25AF812200E44C52 /* clock.png */, @@ -179,7 +176,6 @@ files = ( 4F8A607125A9160400D88DC3 /* AddAlarmViewController.swift in Sources */, 4F98955225A9260400F51321 /* Net.swift in Sources */, - 4F8A607525A919E600D88DC3 /* Logic.swift in Sources */, 7C83963925AF68980027A94C /* TestingViewController.swift in Sources */, 4FF0684325A5F18700304E6B /* AccountViewController.swift in Sources */, 4FF0683F25A5F18700304E6B /* AppDelegate.swift in Sources */, diff --git a/ProjectClock/Logic.swift b/ProjectClock/Logic.swift deleted file mode 100644 index 1094a5c..0000000 --- a/ProjectClock/Logic.swift +++ /dev/null @@ -1,20 +0,0 @@ -// -// ProjectClock -// -// Created by Hykilpikonna on 1/8/21. -// - -import Foundation - -struct WVM -{ - let name: String - let desc: String -} - -let wvms = [ - WVM(name: "Walk", desc: "Walk a few steps"), - WVM(name: "Jump", desc: "Make a few jumps"), - WVM(name: "Puzzle", desc: "Complete a simple puzzle"), - WVM(name: "Smash", desc: "It'll never truns off"), -] diff --git a/ProjectClock/Models.swift b/ProjectClock/Models.swift index 64293b0..db41202 100644 --- a/ProjectClock/Models.swift +++ b/ProjectClock/Models.swift @@ -15,6 +15,19 @@ struct User: Decodable var pass: String } +struct WVM: Decodable +{ + let name: String + let desc: String +} + +let wvms = [ + WVM(name: "Walk", desc: "Walk a few steps"), + WVM(name: "Jump", desc: "Make a few jumps"), + WVM(name: "Puzzle", desc: "Complete a simple puzzle"), + WVM(name: "Smash", desc: "It'll never truns off"), +] + struct Alarm: Decodable { var alarmTime: Date