From f6f223ad0549681fb30fdb49146f489274bc29b0 Mon Sep 17 00:00:00 2001 From: Akhigbe benjamin Date: Sun, 6 Dec 2020 00:46:35 +0100 Subject: [PATCH 1/5] Style: Add News and Article Storyboard because: user not not able to read current trends happening in the world of space exploration therefore, it is important to have a view that shows the list of recent news and article relating to space exploration. --- Podfile.lock | 2 +- SpaceDash.xcodeproj/project.pbxproj | 26 +++++- .../xcshareddata/WorkspaceSettings.xcsettings | 8 ++ .../news-icon.imageset/Contents.json | 21 +++++ .../news-icon.imageset/news-icon@2x.png | Bin 0 -> 599 bytes .../ArticleListViewController.swift | 17 ++++ .../NewsListViewController.swift | 19 +++++ .../View/Storyboards/Articles.storyboard | 54 ++++++++++++ .../Base.lproj/Main.storyboard | 78 +++++++++++++----- SpaceDash/View/Storyboards/News.storyboard | 55 ++++++++++++ 10 files changed, 257 insertions(+), 23 deletions(-) create mode 100644 SpaceDash.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 SpaceDash/Assets.xcassets/news-icon.imageset/Contents.json create mode 100644 SpaceDash/Assets.xcassets/news-icon.imageset/news-icon@2x.png create mode 100644 SpaceDash/Controller/ViewControllers/ArticleListViewController.swift create mode 100644 SpaceDash/Controller/ViewControllers/NewsListViewController.swift create mode 100644 SpaceDash/View/Storyboards/Articles.storyboard rename SpaceDash/View/{ => Storyboards}/Base.lproj/Main.storyboard (96%) create mode 100644 SpaceDash/View/Storyboards/News.storyboard diff --git a/Podfile.lock b/Podfile.lock index 312934c..79a4dcb 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -17,4 +17,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: ceca5c3fa56ae640c1db8633568bd906f292243e -COCOAPODS: 1.8.4 +COCOAPODS: 1.10.0 diff --git a/SpaceDash.xcodeproj/project.pbxproj b/SpaceDash.xcodeproj/project.pbxproj index 20e20cd..79fdad8 100644 --- a/SpaceDash.xcodeproj/project.pbxproj +++ b/SpaceDash.xcodeproj/project.pbxproj @@ -8,6 +8,10 @@ /* Begin PBXBuildFile section */ 2086C60A16283D2DB5341A79 /* Pods_SpaceDash.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DE2958EE217DA2AEF4E463F /* Pods_SpaceDash.framework */; }; + 208828CB257C4DD300D6AD98 /* News.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 208828CA257C4DD300D6AD98 /* News.storyboard */; }; + 20A82BF5257C4BD000E7BF29 /* NewsListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20A82BF4257C4BD000E7BF29 /* NewsListViewController.swift */; }; + 20A82BFC257C4C4200E7BF29 /* ArticleListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20A82BFB257C4C4200E7BF29 /* ArticleListViewController.swift */; }; + 20A82C03257C4C6900E7BF29 /* Articles.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 20A82C02257C4C6900E7BF29 /* Articles.storyboard */; }; FF3043D42507E5D0005F8EE6 /* FastlaneSnapshots.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF3043D32507E5D0005F8EE6 /* FastlaneSnapshots.swift */; }; FF3043DC2507E615005F8EE6 /* SnapshotHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF3043DB2507E615005F8EE6 /* SnapshotHelper.swift */; }; FF42E94E24CD8CA5003E8DFE /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF42E94D24CD8CA5003E8DFE /* Constants.swift */; }; @@ -76,6 +80,10 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 208828CA257C4DD300D6AD98 /* News.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = News.storyboard; sourceTree = ""; }; + 20A82BF4257C4BD000E7BF29 /* NewsListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewsListViewController.swift; sourceTree = ""; }; + 20A82BFB257C4C4200E7BF29 /* ArticleListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleListViewController.swift; sourceTree = ""; }; + 20A82C02257C4C6900E7BF29 /* Articles.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Articles.storyboard; sourceTree = ""; }; 5DE2958EE217DA2AEF4E463F /* Pods_SpaceDash.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SpaceDash.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B15257ADD46DBE38C7F17D09 /* Pods-SpaceDash.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SpaceDash.release.xcconfig"; path = "Target Support Files/Pods-SpaceDash/Pods-SpaceDash.release.xcconfig"; sourceTree = ""; }; B5A11B9FE2BFCA5CB1A21EC0 /* Pods-SpaceX.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SpaceX.debug.xcconfig"; path = "Target Support Files/Pods-SpaceX/Pods-SpaceX.debug.xcconfig"; sourceTree = ""; }; @@ -167,6 +175,16 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 208828C4257C4DBD00D6AD98 /* Storyboards */ = { + isa = PBXGroup; + children = ( + FFF716DB249D3E1C0043EB81 /* Main.storyboard */, + 20A82C02257C4C6900E7BF29 /* Articles.storyboard */, + 208828CA257C4DD300D6AD98 /* News.storyboard */, + ); + path = Storyboards; + sourceTree = ""; + }; 9E7BE7660A5996338B49D647 /* Frameworks */ = { isa = PBXGroup; children = ( @@ -274,6 +292,8 @@ FFF7170B24A338D10043EB81 /* HomeViewController.swift */, FF60A64924D47B4E0030F5AE /* AboutViewController.swift */, FFB734B924DB2B2B006C1518 /* DetailsViewController.swift */, + 20A82BF4257C4BD000E7BF29 /* NewsListViewController.swift */, + 20A82BFB257C4C4200E7BF29 /* ArticleListViewController.swift */, ); path = ViewControllers; sourceTree = ""; @@ -299,8 +319,8 @@ FFC259DF24A76C720019E354 /* View */ = { isa = PBXGroup; children = ( + 208828C4257C4DBD00D6AD98 /* Storyboards */, FFD549E325055F8200F49DC0 /* Animations */, - FFF716DB249D3E1C0043EB81 /* Main.storyboard */, FFF716E0249D3E210043EB81 /* LaunchScreen.storyboard */, FFF25C6624D871EF00D0E1FF /* DetailsTableViewCell.swift */, FFF25C6724D871EF00D0E1FF /* DetailsTableViewCell.xib */, @@ -555,8 +575,10 @@ buildActionMask = 2147483647; files = ( FF4C3944250565AE00279A39 /* space.json in Resources */, + 20A82C03257C4C6900E7BF29 /* Articles.storyboard in Resources */, FFF716E2249D3E210043EB81 /* LaunchScreen.storyboard in Resources */, FFA9CA5824C0CA31006FA5DE /* Assets.xcassets in Resources */, + 208828CB257C4DD300D6AD98 /* News.storyboard in Resources */, FFF25C6924D871EF00D0E1FF /* DetailsTableViewCell.xib in Resources */, FFF716DD249D3E1C0043EB81 /* Main.storyboard in Resources */, ); @@ -644,6 +666,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 20A82BF5257C4BD000E7BF29 /* NewsListViewController.swift in Sources */, FFA9CA8024C1B838006FA5DE /* UpcomingLaunchModel.swift in Sources */, FF7F94FB2511E51000B2830B /* DetailView.swift in Sources */, FFB398F424DDD025001D4EA1 /* RocketsData.swift in Sources */, @@ -664,6 +687,7 @@ FFF7170C24A338D10043EB81 /* HomeViewController.swift in Sources */, FFC259E724A772150019E354 /* CALayer.swift in Sources */, FFB734BA24DB2B2B006C1518 /* DetailsViewController.swift in Sources */, + 20A82BFC257C4C4200E7BF29 /* ArticleListViewController.swift in Sources */, FFB398FA24DDDBDC001D4EA1 /* UIImageView.swift in Sources */, FFBEA64324DC6C3B00A22F9F /* DetailCellImageView.swift in Sources */, FFC259E924A7A9C10019E354 /* InfoPanelView.swift in Sources */, diff --git a/SpaceDash.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/SpaceDash.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/SpaceDash.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/SpaceDash/Assets.xcassets/news-icon.imageset/Contents.json b/SpaceDash/Assets.xcassets/news-icon.imageset/Contents.json new file mode 100644 index 0000000..8b023db --- /dev/null +++ b/SpaceDash/Assets.xcassets/news-icon.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "news-icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SpaceDash/Assets.xcassets/news-icon.imageset/news-icon@2x.png b/SpaceDash/Assets.xcassets/news-icon.imageset/news-icon@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..95b0995989887f4a091fb57b935822846a27356c GIT binary patch literal 599 zcmV-d0;v6oP)nueuP>Hb9Y zcs#CUGMO*SvI2B^EEbC%DP}gCIWV6n4m5S_Xb0Q2>um9%tAk($I((QO*Wt`Ndor0c z@FpQV+~h`x&9mL@cHg8Co6W`-Rfj!Y;~L(;p_E`#3Q48tY?4lg@&4Cf-UPW^ZYU;N zVq!&Ok~U%9=mubEWivo|zUF&LJne}ez6lWiN>>sqTKsiadE(ZX)k79Wv@DEhS;Q`R zybHv3^@9|_`)6$Y`^Rmuo`&FnG$ToH@n9^{2s067VMNQqh?Yf?lZyk>C3U<<^DnWY z5s?~5FEmLJ+wFEi`_t1ev7$MIB9!}xjCoSPdcAg|ZHZ3f<#O32jWDZ+ER1Mb{14H5 z1Hkr>r`CmRHtVp3uEjagL(%Dpk6NSwqtU2NA}S+k>7K0995ScVDd*Q(d^SWFCtcu+ zqDrMQI6I~h1>5j=hxS)t$`M1hw_2?p`1xW)EEEcS0`8NBqtTGNY;YI)e002ovPDHLkV1nO92h;!n literal 0 HcmV?d00001 diff --git a/SpaceDash/Controller/ViewControllers/ArticleListViewController.swift b/SpaceDash/Controller/ViewControllers/ArticleListViewController.swift new file mode 100644 index 0000000..59f2afe --- /dev/null +++ b/SpaceDash/Controller/ViewControllers/ArticleListViewController.swift @@ -0,0 +1,17 @@ +// +// ArticleListViewController.swift +// SpaceDash +// +// Created by akhigbe benjamin on 06/12/2020. +// Copyright © 2020 Pushpinder Pal Singh. All rights reserved. +// + +import UIKit + + +class ArticleListViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + } +} diff --git a/SpaceDash/Controller/ViewControllers/NewsListViewController.swift b/SpaceDash/Controller/ViewControllers/NewsListViewController.swift new file mode 100644 index 0000000..096334f --- /dev/null +++ b/SpaceDash/Controller/ViewControllers/NewsListViewController.swift @@ -0,0 +1,19 @@ +// +// NewsListViewController.swift +// SpaceDash +// +// Created by akhigbe benjamin on 06/12/2020. +// Copyright © 2020 Pushpinder Pal Singh. All rights reserved. +// + +import UIKit + + +class NewsListViewController: UIViewController{ + + override func viewDidLoad() { + super.viewDidLoad() + + } + +} diff --git a/SpaceDash/View/Storyboards/Articles.storyboard b/SpaceDash/View/Storyboards/Articles.storyboard new file mode 100644 index 0000000..8501a37 --- /dev/null +++ b/SpaceDash/View/Storyboards/Articles.storyboard @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SpaceDash/View/Base.lproj/Main.storyboard b/SpaceDash/View/Storyboards/Base.lproj/Main.storyboard similarity index 96% rename from SpaceDash/View/Base.lproj/Main.storyboard rename to SpaceDash/View/Storyboards/Base.lproj/Main.storyboard index c9b73fa..195cd08 100644 --- a/SpaceDash/View/Base.lproj/Main.storyboard +++ b/SpaceDash/View/Storyboards/Base.lproj/Main.storyboard @@ -1,13 +1,35 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + @@ -79,33 +101,34 @@ - - + @@ -119,7 +142,6 @@ - @@ -179,7 +201,7 @@ -