From 899479b1860e11254535ff6a3b990cd240b1fa6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Fo=CC=88rtsch?= Date: Thu, 17 Jan 2019 20:05:26 +0100 Subject: [PATCH 1/3] add tabbaricons --- .gitignore | 2 ++ .../TabbarFeedIcon.imageset/Contents.json | 23 ++++++++++++++++++ .../TabbarFeedIcon.png | Bin 0 -> 617 bytes .../TabbarFeedIcon@2x.png | Bin 0 -> 727 bytes .../TabbarFeedIcon@3x.png | Bin 0 -> 899 bytes .../TabbarSettingsIcon.imageset/Contents.json | 23 ++++++++++++++++++ .../TabbarSettingsIcon.png | Bin 0 -> 804 bytes .../TabbarSettingsIcon@2x.png | Bin 0 -> 1152 bytes .../TabbarSettingsIcon@3x.png | Bin 0 -> 1561 bytes Area51/Sources/NavigationRouter.swift | 4 +-- 10 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 Area51/Resources/Assets.xcassets/TabbarFeedIcon.imageset/Contents.json create mode 100644 Area51/Resources/Assets.xcassets/TabbarFeedIcon.imageset/TabbarFeedIcon.png create mode 100644 Area51/Resources/Assets.xcassets/TabbarFeedIcon.imageset/TabbarFeedIcon@2x.png create mode 100644 Area51/Resources/Assets.xcassets/TabbarFeedIcon.imageset/TabbarFeedIcon@3x.png create mode 100644 Area51/Resources/Assets.xcassets/TabbarSettingsIcon.imageset/Contents.json create mode 100644 Area51/Resources/Assets.xcassets/TabbarSettingsIcon.imageset/TabbarSettingsIcon.png create mode 100644 Area51/Resources/Assets.xcassets/TabbarSettingsIcon.imageset/TabbarSettingsIcon@2x.png create mode 100644 Area51/Resources/Assets.xcassets/TabbarSettingsIcon.imageset/TabbarSettingsIcon@3x.png diff --git a/.gitignore b/.gitignore index 73a19c0..31bbaa9 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,5 @@ Configs/user.xcconfig Configs/bundleIdentifier.xcconfig tmp/ +## Local Files +Local/ \ 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 0000000000000000000000000000000000000000..96f4954403bae5b13580334fa6bdd04444a495fe GIT binary patch literal 617 zcmV-v0+#)WP)qLKJ21TBI@t0*yoXd{>)Q3w)Z1Yb>Z z<{{*9+(jhV3bp|S(Z*Mye}T4wwIC>pAT~DEiZ&|eoDmYl%(AoJ{&r^Aods(otz`5X z4`i}=EgbMUXXoafbx&Amp_NXoQAJnBLZKj4?fq7w#jg9zTGiwJwZ^5mu7IUpcvMlf zyzqo@a5b-*yd~VOq@qj0C&F$`E+~9s>ah|(o1851r^#9*><4SJurpb~u?kjFT1Hr2 zjw_R1QGV}ZzQi8S&P>bNEwc-qFadlxnPeP4Lkut?euzH2^vjMa`JSKrDRPplh*v3~ zu}qQ_dEBC|NcFg^3DM&+(iF`8|Lv=u81$B^+kH^`Xc(_OP`3$RMZ@?wFpRH5usy(e zww#~ahv7HTi)GEV2aa_(y(nw3Z8+P2j(at#MSmolOlu+mFUQa{2W?l-uu$sR?>R?z z5LuJ2x`drw=#_ZK;x_A&1lLa(0}EQ%*u%tTfz00000NkvXXu0mjf DFz*m2 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4d57eb3a78586eb98453a03c3f129807f4d1741e GIT binary patch literal 727 zcmV;|0x127P)qLKJ21TBI@t0*yoXd{>)Q3w)Z1Yb>Z z<{{*9+(jhV3bp|S(Z*Mye}T4wwIC>pAT~DEiZ&|eoDmYl%(AoJ{&r^Aods(otz`5X z4`i}=EgbMUXXoafbx&Amp_NXoQAJnBLZKj4?fq7w#jg9zTGiwJwZ^5mu7IUpcvMlf zyzqo@a5b-*yd~VOq@qj0C&F$`E+~9s>ah|(o1851r^#9*><4SJurpb~u?kjFT1Hr2 zjw_R1QGV}ZzQi8S&P>bNEwc-qFadlxnPeP4Lkut?euzH2^vjMa`JSKrDRPplh*v3~ zu}qQ_dEBC|NcFg^3DM&+(iF`8|Lv=u81$B^+kH^`Xc(_OP`3$RMZ@?wFpRH5usy(e zww#~ahv7HTi)GEV2aa_(y(nw3Z8+P2j(at#MSmolOlu+mFUQa{2W?l-uu$sR?>R?z z5LuJ2x`drw=#_ZK;x_6OuQFoD3nQxl|4FJ2=5wK+8{q`o3>nFK~--p|LkBY_%c$0-Na1|EzyvfXCo_ zrkN&f&O;n&evP7xaf$P$6Q7jZkkiJiUkf>DRZnp|Wv+xzT;Zd1$p7}eIs4cW|GjSO z9S<16E{4i)zS|PRUa&!Ug?0YGCW#_N6YYN86GXeqh)xs43C!K(K0+* zhDXcrXg$1?j_BZd1sm8dUDDE7g>~%Xz~cY(9N`Anr9;xv_yUY(v?qK_U!`lELx=k*tH4K|FlxHXeatI}{#QPRKQ+!f*$5rJ9 z*EUAhi^swj);Dfz+Nz+@rC?@ut;(ibb7g+Z`dEXJa^XGg{-_qU8J=cJ-#$slQjJ-3Dfl^(E-JUO}`?P+}oBv0%XwvGA zaLol9eI|)i-dVKHL0&g!k!y` zVMD;Ho9`{%%LO7Quiw=&H}=KUisO&W8G_Qcw+o1x10#jAz$3DlfkDv%gc)6@872Uu zXt}40V@SoEx3?X=m=a~$KBk*^E#b(ztaa<^x&@nE0%n`NU6m{%yO6ttp?TefWnvG* zIK;PVFH-V46Xg?l;r5M=$L4+S`R#aQzP@+1oWC$3?V5cc|MrzkQ|tIAP2?+>|Fv0$ zY5jrU0&9&E)Vd`YiVsBd%}deGRzEAOyVT+vV}(!gbIYQ+&mL?PIc~@N`hcFn+-HtV zuName@Oj(wrT7prxjuu-5reI^7eDqYn?5M{cv30^^#_#>du=NqM6jL zhzopr0FYmU_5c6? literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..777d613847073c05737bfed6a9c9ef15331f5348 GIT binary patch literal 804 zcmV+<1Ka$GP)qLKJ21TBI@t0*yoXd{>)Q3w)Z1Yb>Z z<{{*9+(jhV3bp|S(Z*Mye}T4wwIC>pAT~DEiZ&|eoDmYl%(AoJ{&r^Aods(otz`5X z4`i}=EgbMUXXoafbx&Amp_NXoQAJnBLZKj4?fq7w#jg9zTGiwJwZ^5mu7IUpcvMlf zyzqo@a5b-*yd~VOq@qj0C&F$`E+~9s>ah|(o1851r^#9*><4SJurpb~u?kjFT1Hr2 zjw_R1QGV}ZzQi8S&P>bNEwc-qFadlxnPeP4Lkut?euzH2^vjMa`JSKrDRPplh*v3~ zu}qQ_dEBC|NcFg^3DM&+(iF`8|Lv=u81$B^+kH^`Xc(_OP`3$RMZ@?wFpRH5usy(e zww#~ahv7HTi)GEV2aa_(y(nw3Z8+P2j(at#MSmolOlu+mFUQa{2W?l-uu$sR?>R?z z5LuJ2x`drw=#_ZK;x_$85ddZajqj7?Z=5~!o z3hKDTTO_|)!63eJzCjb;*vfcg*>xQs1)3z|fl(X>I@k#qtOWR{m})0a=MWnh2$)y! zlB1b#B^2QSuYqR`To;MU%!d_sK2oAb2lspip8;Yboun=FX8a!Mw7eH+8q#R^)0|(G znEsmcX7?TYL+Nm~@H-VZa2RP+!qLKJ21TBI@t0*yoXd{>)Q3w)Z1Yb>Z z<{{*9+(jhV3bp|S(Z*Mye}T4wwIC>pAT~DEiZ&|eoDmYl%(AoJ{&r^Aods(otz`5X z4`i}=EgbMUXXoafbx&Amp_NXoQAJnBLZKj4?fq7w#jg9zTGiwJwZ^5mu7IUpcvMlf zyzqo@a5b-*yd~VOq@qj0C&F$`E+~9s>ah|(o1851r^#9*><4SJurpb~u?kjFT1Hr2 zjw_R1QGV}ZzQi8S&P>bNEwc-qFadlxnPeP4Lkut?euzH2^vjMa`JSKrDRPplh*v3~ zu}qQ_dEBC|NcFg^3DM&+(iF`8|Lv=u81$B^+kH^`Xc(_OP`3$RMZ@?wFpRH5usy(e zww#~ahv7HTi)GEV2aa_(y(nw3Z8+P2j(at#MSmolOlu+mFUQa{2W?l-uu$sR?>R?z z5LuJ2x`drw=#_ZK;x_dGVEoFf3rElR^N_*b8DtdI1+748M?!c!yf#r>LY0xdW+W>%R z@j*1VMrln0z*UP~N#K_o0IXWPRI%(XYyhax*c1mpRd;ARHH^F}`!)wDN*|1+!%HQtlKcu7WRq73M3pnp%2LE3qIRv^GI9)bikbleH9ycuNkab4-A#1-n9I}c& z)((g&13h?Au=hX5+NMn;XwuY;CQg={p*+!=1WscYgpz8Q|7dHr}iJy?juqLKJ21TBI@t0*yoXd{>)Q3w)Z1Yb>Z z<{{*9+(jhV3bp|S(Z*Mye}T4wwIC>pAT~DEiZ&|eoDmYl%(AoJ{&r^Aods(otz`5X z4`i}=EgbMUXXoafbx&Amp_NXoQAJnBLZKj4?fq7w#jg9zTGiwJwZ^5mu7IUpcvMlf zyzqo@a5b-*yd~VOq@qj0C&F$`E+~9s>ah|(o1851r^#9*><4SJurpb~u?kjFT1Hr2 zjw_R1QGV}ZzQi8S&P>bNEwc-qFadlxnPeP4Lkut?euzH2^vjMa`JSKrDRPplh*v3~ zu}qQ_dEBC|NcFg^3DM&+(iF`8|Lv=u81$B^+kH^`Xc(_OP`3$RMZ@?wFpRH5usy(e zww#~ahv7HTi)GEV2aa_(y(nw3Z8+P2j(at#MSmolOlu+mFUQa{2W?l-uu$sR?>R?z z5LuJ2x`drw=#_ZK;x_0}4MsE>FGlc^2w4V=N;JzPg_ut_yMyKF^wC`7T!6VT!9(w@iT70 z)%Y}H+a2;>dS`IA{P%;uDmJ7U$8jv@wy)0DkTGGnUiCrtGfoM=WVsl^mjfWWjQAaw z<}u~*0T5eeyq{&r5WXJ(p=HK#tZFx*GtIvp8?u~RWSlFc7hS3PXSJ$0g!7UNS*t%O z`9g`Onntu=J})@CN6jy43^bdg&5N)P7ndw#M#zeH2^r~?!aZ%gp{Z={5r#G3Vdb8x z-w8APiPy1k#;(V^CF`1O7jYeqmeA>OyyVP*WEKw!Nmd!AZ0+oPqxc6_Y4Iy=nui(f zEXQYk)OJwYjkc2|cp3)^?sP_c{<9Rn6|Cz7wqaQw0n6}4qfrr^zuuD#bJ_b@ z+&1RTwU~W74BDTZ|=wLKb&j}g%Se|5URrV&S?2K&R$r1b# z(f%CibIiF+Ss5YVkT6+QG`k|(ryf(5DNC>-qVrwCDO)s^nsT9Vy7kK5h_-3OTt0+} z_O4`^aug>cI=?=mZ5rz%+y9aFVU{VUh5JIUY|x)aoUw`E!L$$a+-OsGkiiO}(64AJ zH|0R2fQ^yuI~f&s`JBX`F#_t0wvA=NKxr|LeZG)$>@$pKw5kk>iW%J2lMO8@870^A zDIJtK^Y*d@GV@l&9PORb=V))hdnN0dq?K4L6$Wlq%;rxCW0@&jCFCHt8i3h+cvHFG z%Amz=3EB5r^%KHG>SxL3ruh@y+*;(kBV@XX)b%Omo+-0yIinWJ;^z`jd=pcj&R=TBG4N2|Jw@76NqE=0B;L+WZM~ z$5ESwFRgRi!?>(hLz=ACszNx4w++@Rj{8%z4C7e^ui|LZ>w2FL^l!b-Bj&f>XNv;Y z`^0jM;#P+JC@iEHh?QZn+^ZN Date: Sat, 19 Jan 2019 22:34:37 +0100 Subject: [PATCH 2/3] remove Local/ from gitignore --- .gitignore | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 31bbaa9..8925c74 100644 --- a/.gitignore +++ b/.gitignore @@ -33,7 +33,4 @@ playground.xcworkspace *.xcodeproj Configs/user.xcconfig Configs/bundleIdentifier.xcconfig -tmp/ - -## Local Files -Local/ \ No newline at end of file +tmp/ \ No newline at end of file From 4881d5b240760932b639742d12f6f481b8293e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Fo=CC=88rtsch?= Date: Tue, 22 Jan 2019 13:51:30 +0100 Subject: [PATCH 3/3] fix line length validation error --- Area51/Sources/NavigationRouter.swift | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Area51/Sources/NavigationRouter.swift b/Area51/Sources/NavigationRouter.swift index 01495ce..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: UIImage(named: "TabbarFeedIcon"), 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: UIImage(named: "TabbarSettingsIcon"), tag: 0) + let settingsIcon = UIImage(named: "TabbarSettingsIcon") + settingsController.tabBarItem = UITabBarItem(title: "Settings", image: settingsIcon, tag: 0) let tabBar = UITabBarController() tabBar.viewControllers = [feedController, settingsController]