diff --git a/.gitignore b/.gitignore index 73a19c0..8925c74 100644 --- a/.gitignore +++ b/.gitignore @@ -33,5 +33,4 @@ playground.xcworkspace *.xcodeproj Configs/user.xcconfig Configs/bundleIdentifier.xcconfig -tmp/ - +tmp/ \ No newline at end of file diff --git a/Area51/Resources/Assets.xcassets/TabbarFeedIcon.imageset/Contents.json b/Area51/Resources/Assets.xcassets/TabbarFeedIcon.imageset/Contents.json new file mode 100644 index 0000000..7dd2cba --- /dev/null +++ b/Area51/Resources/Assets.xcassets/TabbarFeedIcon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "TabbarFeedIcon.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "TabbarFeedIcon@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "TabbarFeedIcon@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Area51/Resources/Assets.xcassets/TabbarFeedIcon.imageset/TabbarFeedIcon.png b/Area51/Resources/Assets.xcassets/TabbarFeedIcon.imageset/TabbarFeedIcon.png new file mode 100644 index 0000000..96f4954 Binary files /dev/null and b/Area51/Resources/Assets.xcassets/TabbarFeedIcon.imageset/TabbarFeedIcon.png differ diff --git a/Area51/Resources/Assets.xcassets/TabbarFeedIcon.imageset/TabbarFeedIcon@2x.png b/Area51/Resources/Assets.xcassets/TabbarFeedIcon.imageset/TabbarFeedIcon@2x.png new file mode 100644 index 0000000..4d57eb3 Binary files /dev/null and b/Area51/Resources/Assets.xcassets/TabbarFeedIcon.imageset/TabbarFeedIcon@2x.png differ diff --git a/Area51/Resources/Assets.xcassets/TabbarFeedIcon.imageset/TabbarFeedIcon@3x.png b/Area51/Resources/Assets.xcassets/TabbarFeedIcon.imageset/TabbarFeedIcon@3x.png new file mode 100644 index 0000000..ca95671 Binary files /dev/null and b/Area51/Resources/Assets.xcassets/TabbarFeedIcon.imageset/TabbarFeedIcon@3x.png differ diff --git a/Area51/Resources/Assets.xcassets/TabbarSettingsIcon.imageset/Contents.json b/Area51/Resources/Assets.xcassets/TabbarSettingsIcon.imageset/Contents.json new file mode 100644 index 0000000..d734c8a --- /dev/null +++ b/Area51/Resources/Assets.xcassets/TabbarSettingsIcon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "TabbarSettingsIcon.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "TabbarSettingsIcon@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "TabbarSettingsIcon@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Area51/Resources/Assets.xcassets/TabbarSettingsIcon.imageset/TabbarSettingsIcon.png b/Area51/Resources/Assets.xcassets/TabbarSettingsIcon.imageset/TabbarSettingsIcon.png new file mode 100644 index 0000000..777d613 Binary files /dev/null and b/Area51/Resources/Assets.xcassets/TabbarSettingsIcon.imageset/TabbarSettingsIcon.png differ diff --git a/Area51/Resources/Assets.xcassets/TabbarSettingsIcon.imageset/TabbarSettingsIcon@2x.png b/Area51/Resources/Assets.xcassets/TabbarSettingsIcon.imageset/TabbarSettingsIcon@2x.png new file mode 100644 index 0000000..60b01f0 Binary files /dev/null and b/Area51/Resources/Assets.xcassets/TabbarSettingsIcon.imageset/TabbarSettingsIcon@2x.png differ diff --git a/Area51/Resources/Assets.xcassets/TabbarSettingsIcon.imageset/TabbarSettingsIcon@3x.png b/Area51/Resources/Assets.xcassets/TabbarSettingsIcon.imageset/TabbarSettingsIcon@3x.png new file mode 100644 index 0000000..ac3d034 Binary files /dev/null and b/Area51/Resources/Assets.xcassets/TabbarSettingsIcon.imageset/TabbarSettingsIcon@3x.png differ diff --git a/Area51/Sources/NavigationRouter.swift b/Area51/Sources/NavigationRouter.swift index 96ad330..3897e35 100644 --- a/Area51/Sources/NavigationRouter.swift +++ b/Area51/Sources/NavigationRouter.swift @@ -3,10 +3,12 @@ import UIKit struct NavigationRouter { static var mainNavigation: UITabBarController { let feedController = UIStoryboard.feed.instantiateInitialViewController()! - feedController.tabBarItem = UITabBarItem(title: "Feed", image: nil, tag: 0) + let feedIcon = UIImage(named: "TabbarFeedIcon") + feedController.tabBarItem = UITabBarItem(title: "Feed", image: feedIcon, tag: 0) let settingsController = UIStoryboard.settings.instantiateInitialViewController()! - settingsController.tabBarItem = UITabBarItem(title: "Settings", image: nil, tag: 0) + let settingsIcon = UIImage(named: "TabbarSettingsIcon") + settingsController.tabBarItem = UITabBarItem(title: "Settings", image: settingsIcon, tag: 0) let tabBar = UITabBarController() tabBar.viewControllers = [feedController, settingsController]