diff --git a/AvH Plan.xcodeproj/project.pbxproj b/AvH Plan.xcodeproj/project.pbxproj index 113a81a..f5a5910 100644 --- a/AvH Plan.xcodeproj/project.pbxproj +++ b/AvH Plan.xcodeproj/project.pbxproj @@ -10,8 +10,8 @@ 1BF3A6CA97BA41C38482C1A6 /* Pods_AvH_PlanTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D9D6269E96544A9242A29611 /* Pods_AvH_PlanTests.framework */; }; 2E65263AFD35D6B542E89AE4 /* Pods_AvH_Plan.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7605BB0678C9E27A1D3E9DAA /* Pods_AvH_Plan.framework */; }; A96133802299867400B541D4 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A961337F2299867400B541D4 /* AppDelegate.swift */; }; - A96133822299867400B541D4 /* FirstViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A96133812299867400B541D4 /* FirstViewController.swift */; }; - A96133842299867400B541D4 /* SecondViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A96133832299867400B541D4 /* SecondViewController.swift */; }; + A96133822299867400B541D4 /* PlanViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A96133812299867400B541D4 /* PlanViewController.swift */; }; + A96133842299867400B541D4 /* PersonalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A96133832299867400B541D4 /* PersonalViewController.swift */; }; A96133872299867400B541D4 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A96133852299867400B541D4 /* Main.storyboard */; }; A96133892299867A00B541D4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A96133882299867A00B541D4 /* Assets.xcassets */; }; A961338C2299867A00B541D4 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A961338A2299867A00B541D4 /* LaunchScreen.storyboard */; }; @@ -19,6 +19,8 @@ A96133A22299867A00B541D4 /* AvH_PlanUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A96133A12299867A00B541D4 /* AvH_PlanUITests.swift */; }; A96133B0229986DF00B541D4 /* CollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A96133AF229986DF00B541D4 /* CollectionViewCell.swift */; }; A9A3496C22D4859200F35AE0 /* SubstModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9A3496B22D4859200F35AE0 /* SubstModel.swift */; }; + A9C1D2FE22D656A400139043 /* InfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9C1D2FD22D656A400139043 /* InfoViewController.swift */; }; + A9C1D30022D656DD00139043 /* MenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9C1D2FF22D656DD00139043 /* MenuViewController.swift */; }; C736A19A44C64423F3A695B7 /* Pods_AvH_PlanUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 74EDE3D8134812AB76BEB988 /* Pods_AvH_PlanUITests.framework */; }; /* End PBXBuildFile section */ @@ -45,8 +47,8 @@ 7605BB0678C9E27A1D3E9DAA /* Pods_AvH_Plan.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AvH_Plan.framework; sourceTree = BUILT_PRODUCTS_DIR; }; A961337C2299867400B541D4 /* AvH Plan.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "AvH Plan.app"; sourceTree = BUILT_PRODUCTS_DIR; }; A961337F2299867400B541D4 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - A96133812299867400B541D4 /* FirstViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirstViewController.swift; sourceTree = ""; }; - A96133832299867400B541D4 /* SecondViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecondViewController.swift; sourceTree = ""; }; + A96133812299867400B541D4 /* PlanViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlanViewController.swift; sourceTree = ""; }; + A96133832299867400B541D4 /* PersonalViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonalViewController.swift; sourceTree = ""; }; A96133862299867400B541D4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; A96133882299867A00B541D4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; A961338B2299867A00B541D4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; @@ -59,6 +61,8 @@ A96133A32299867A00B541D4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A96133AF229986DF00B541D4 /* CollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionViewCell.swift; sourceTree = ""; }; A9A3496B22D4859200F35AE0 /* SubstModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubstModel.swift; sourceTree = ""; }; + A9C1D2FD22D656A400139043 /* InfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfoViewController.swift; sourceTree = ""; }; + A9C1D2FF22D656DD00139043 /* MenuViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuViewController.swift; sourceTree = ""; }; C6EC6ACE7893F2BB0A157817 /* Pods-AvH Plan.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AvH Plan.release.xcconfig"; path = "Target Support Files/Pods-AvH Plan/Pods-AvH Plan.release.xcconfig"; sourceTree = ""; }; D9D6269E96544A9242A29611 /* Pods_AvH_PlanTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AvH_PlanTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; E596AED9E99670CBF1B6F49E /* Pods-AvH Plan.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AvH Plan.debug.xcconfig"; path = "Target Support Files/Pods-AvH Plan/Pods-AvH Plan.debug.xcconfig"; sourceTree = ""; }; @@ -144,14 +148,16 @@ isa = PBXGroup; children = ( A961337F2299867400B541D4 /* AppDelegate.swift */, - A96133812299867400B541D4 /* FirstViewController.swift */, - A9A3496B22D4859200F35AE0 /* SubstModel.swift */, - A96133832299867400B541D4 /* SecondViewController.swift */, + A96133812299867400B541D4 /* PlanViewController.swift */, + A96133832299867400B541D4 /* PersonalViewController.swift */, + A9C1D2FD22D656A400139043 /* InfoViewController.swift */, + A9C1D2FF22D656DD00139043 /* MenuViewController.swift */, A96133852299867400B541D4 /* Main.storyboard */, A96133882299867A00B541D4 /* Assets.xcassets */, A961338A2299867A00B541D4 /* LaunchScreen.storyboard */, A961338D2299867A00B541D4 /* Info.plist */, A96133AF229986DF00B541D4 /* CollectionViewCell.swift */, + A9A3496B22D4859200F35AE0 /* SubstModel.swift */, ); path = "AvH Plan"; sourceTree = ""; @@ -404,11 +410,13 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - A96133842299867400B541D4 /* SecondViewController.swift in Sources */, + A96133842299867400B541D4 /* PersonalViewController.swift in Sources */, A96133802299867400B541D4 /* AppDelegate.swift in Sources */, A9A3496C22D4859200F35AE0 /* SubstModel.swift in Sources */, + A9C1D30022D656DD00139043 /* MenuViewController.swift in Sources */, A96133B0229986DF00B541D4 /* CollectionViewCell.swift in Sources */, - A96133822299867400B541D4 /* FirstViewController.swift in Sources */, + A9C1D2FE22D656A400139043 /* InfoViewController.swift in Sources */, + A96133822299867400B541D4 /* PlanViewController.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/AvH Plan/Assets.xcassets/ic_history.imageset/ic_history.png b/AvH Plan/Assets.xcassets/ic_history.imageset/ic_history.png new file mode 100644 index 0000000..0ff5dde Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_history.imageset/ic_history.png differ diff --git a/AvH Plan/Assets.xcassets/ic_idea.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_idea.imageset/Contents.json index f8f827e..16fb9e3 100644 --- a/AvH Plan/Assets.xcassets/ic_idea.imageset/Contents.json +++ b/AvH Plan/Assets.xcassets/ic_idea.imageset/Contents.json @@ -6,10 +6,12 @@ }, { "idiom" : "universal", + "filename" : "ic_idea_2x.png", "scale" : "2x" }, { "idiom" : "universal", + "filename" : "ic_idea_3x.png", "scale" : "3x" } ], diff --git a/AvH Plan/Assets.xcassets/ic_idea.imageset/ic_idea_2x.png b/AvH Plan/Assets.xcassets/ic_idea.imageset/ic_idea_2x.png new file mode 100644 index 0000000..3801bb3 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_idea.imageset/ic_idea_2x.png differ diff --git a/AvH Plan/Assets.xcassets/ic_idea.imageset/ic_idea_3x.png b/AvH Plan/Assets.xcassets/ic_idea.imageset/ic_idea_3x.png new file mode 100644 index 0000000..febe1b5 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_idea.imageset/ic_idea_3x.png differ diff --git a/AvH Plan/Assets.xcassets/ic_philosophy.imageset/ic_philosophy-1.png b/AvH Plan/Assets.xcassets/ic_philosophy.imageset/ic_philosophy-1.png new file mode 100644 index 0000000..1cacab1 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_philosophy.imageset/ic_philosophy-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_wat.imageset/ic_wat-1.png b/AvH Plan/Assets.xcassets/ic_wat.imageset/ic_wat-1.png new file mode 100644 index 0000000..5d7cb69 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_wat.imageset/ic_wat-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_wat.imageset/ic_wat.png b/AvH Plan/Assets.xcassets/ic_wat.imageset/ic_wat.png new file mode 100644 index 0000000..c1ec9d9 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_wat.imageset/ic_wat.png differ diff --git a/AvH Plan/Assets.xcassets/ic_writing.imageset/ic_writing.png b/AvH Plan/Assets.xcassets/ic_writing.imageset/ic_writing.png new file mode 100644 index 0000000..5d6affd Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_writing.imageset/ic_writing.png differ diff --git a/AvH Plan/Base.lproj/Main.storyboard b/AvH Plan/Base.lproj/Main.storyboard index fd63443..b89bc26 100644 --- a/AvH Plan/Base.lproj/Main.storyboard +++ b/AvH Plan/Base.lproj/Main.storyboard @@ -14,7 +14,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -189,7 +189,7 @@ - + @@ -198,7 +198,7 @@ - + @@ -214,7 +214,7 @@ - + @@ -249,9 +249,9 @@ + - diff --git a/AvH Plan/InfoViewController.swift b/AvH Plan/InfoViewController.swift new file mode 100644 index 0000000..926ead7 --- /dev/null +++ b/AvH Plan/InfoViewController.swift @@ -0,0 +1,13 @@ +// +// InfoViewController.swift +// AvH Plan +// +// Created by Deniz Duezgoeren on 10.07.19. +// Copyright © 2019 Deniz Duezgoeren. All rights reserved. +// + +import UIKit + +class InfoViewController : UIViewController { + +} diff --git a/AvH Plan/MenuViewController.swift b/AvH Plan/MenuViewController.swift new file mode 100644 index 0000000..05aecf9 --- /dev/null +++ b/AvH Plan/MenuViewController.swift @@ -0,0 +1,13 @@ +// +// MenuViewController.swift +// AvH Plan +// +// Created by Deniz Duezgoeren on 10.07.19. +// Copyright © 2019 Deniz Duezgoeren. All rights reserved. +// + +import UIKit + +class MenuViewController : UIViewController { + +} diff --git a/AvH Plan/SecondViewController.swift b/AvH Plan/PersonalViewController.swift similarity index 86% rename from AvH Plan/SecondViewController.swift rename to AvH Plan/PersonalViewController.swift index ff714a8..6a3bb55 100644 --- a/AvH Plan/SecondViewController.swift +++ b/AvH Plan/PersonalViewController.swift @@ -8,7 +8,7 @@ import UIKit -class SecondViewController: UIViewController { +class PersonalViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() diff --git a/AvH Plan/FirstViewController.swift b/AvH Plan/PlanViewController.swift similarity index 98% rename from AvH Plan/FirstViewController.swift rename to AvH Plan/PlanViewController.swift index 80fe338..6fe6739 100644 --- a/AvH Plan/FirstViewController.swift +++ b/AvH Plan/PlanViewController.swift @@ -11,7 +11,7 @@ import SwiftSoup import Alamofire import SQLite3 -class FirstViewController : UIViewController, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout { +class PlanViewController : UIViewController, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout { let reuseIdentifier = "cell" @IBOutlet weak var collectionView: UICollectionView! @@ -35,8 +35,8 @@ class FirstViewController : UIViewController, UICollectionViewDataSource, UIColl refreshControl.addTarget(self, action: #selector(objDoAsync(_:)), for: .valueChanged) refreshControl.tintColor = UIColor(red: 0.39, green: 0.71, blue: 0.96, alpha: 1.0) refreshControl.attributedTitle = NSAttributedString(string: "Fetching the plan...") - self.refreshControl.beginRefreshing() - self.doAsync() +// self.refreshControl.beginRefreshing() +// self.doAsync() } @objc private func objDoAsync(_ sender: Any) {