From 7bbcfee74b5551107be22e085ffd69a21fe2a560 Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Fri, 14 Aug 2020 15:47:38 -0400 Subject: [PATCH] new icons --- .../HorizontalCombinationViews/TabBar.swift | 16 ++++++++++------ .../Buttons/LabelBarButtonItem.swift | 1 + .../Media.xcassets/nav_back.imageset/Back-1.png | Bin 0 -> 636 bytes .../Media.xcassets/nav_back.imageset/Back-2.png | Bin 0 -> 906 bytes .../Media.xcassets/nav_back.imageset/Back.png | Bin 0 -> 366 bytes .../nav_back.imageset/Contents.json | 6 +++--- .../nav_back.imageset/nav_back.png | Bin 183 -> 0 bytes .../nav_back.imageset/nav_back@2x.png | Bin 335 -> 0 bytes .../nav_back.imageset/nav_back@3x.png | Bin 488 -> 0 bytes .../nav_close.imageset/Close-1.png | Bin 0 -> 571 bytes .../nav_close.imageset/Close-2.png | Bin 0 -> 810 bytes .../Media.xcassets/nav_close.imageset/Close.png | Bin 0 -> 365 bytes .../nav_close.imageset/Contents.json | 6 +++--- .../nav_close.imageset/nav_close.png | Bin 268 -> 0 bytes .../nav_close.imageset/nav_close@2x.png | Bin 488 -> 0 bytes .../nav_close.imageset/nav_close@3x.png | Bin 738 -> 0 bytes 16 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Back-1.png create mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Back-2.png create mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Back.png delete mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back.png delete mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@2x.png delete mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@3x.png create mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close-1.png create mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close-2.png create mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close.png delete mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close.png delete mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close@2x.png delete mode 100644 MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close@3x.png diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift index 1068f350..2b87daf8 100644 --- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift +++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift @@ -57,6 +57,8 @@ import Foundation var tabs: [UITabBarItem] = [] for (index, tab) in model.tabs.enumerated() { let tabBarItem = UITabBarItem(title: tab.title, image: MVMCoreCache.shared()?.getImageFromRegisteredBundles(tab.image), tag: index) + tabBarItem.titlePositionAdjustment = UIOffset(horizontal: 0, vertical: -3) + tabBarItem.setTitleTextAttributes([NSAttributedString.Key.font: MFFonts.mfFontTXRegular(8)], for: .normal) tabs.append(tabBarItem) } setItems(tabs, animated: false) @@ -65,12 +67,14 @@ import Foundation /// Sets the item colors. @available(iOS 13.0, *) - private func setTabBarItemColors(_ itemAppearance: UITabBarItemAppearance, model: TabBarModel) { - itemAppearance.normal.iconColor = model.unSelectedColor.uiColor - itemAppearance.normal.titleTextAttributes = [NSAttributedString.Key.foregroundColor: model.unSelectedColor.uiColor] - - itemAppearance.selected.iconColor = model.selectedColor.uiColor - itemAppearance.selected.titleTextAttributes = [NSAttributedString.Key.foregroundColor: model.selectedColor.uiColor] + private func set(tabItemAppearance: UITabBarItemAppearance, model: TabBarModel) { + tabItemAppearance.normal.iconColor = model.unSelectedColor.uiColor + tabItemAppearance.normal.titleTextAttributes = [NSAttributedString.Key.foregroundColor: model.unSelectedColor.uiColor, NSAttributedString.Key.font: MFFonts.mfFontTXRegular(8)] + tabItemAppearance.normal.titlePositionAdjustment = UIOffset(horizontal: 0, vertical: -3) + + tabItemAppearance.selected.iconColor = model.selectedColor.uiColor + tabItemAppearance.selected.titleTextAttributes = [NSAttributedString.Key.foregroundColor: model.selectedColor.uiColor, NSAttributedString.Key.font: MFFonts.mfFontTXRegular(8)] + tabItemAppearance.selected.titlePositionAdjustment = UIOffset(horizontal: 0, vertical: -3) } // MARK: - UITabBarDelegate diff --git a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/LabelBarButtonItem.swift b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/LabelBarButtonItem.swift index 4d31a84c..a2c18e08 100644 --- a/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/LabelBarButtonItem.swift +++ b/MVMCoreUI/Atomic/Molecules/NavigationBar/Buttons/LabelBarButtonItem.swift @@ -18,6 +18,7 @@ import Foundation let actionObject = ActionDelegate() let button = self.init(title: title, style: .plain, target: actionObject, action: #selector(actionObject.callActionBlock(_:))) button.actionDelegate = actionObject + button.setTitleTextAttributes([NSAttributedString.Key.font: Styler.Font.RegularBodySmall], for: .normal) return button } diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Back-1.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Back-1.png new file mode 100644 index 0000000000000000000000000000000000000000..3fae0595ffb9eb65dc865fdc3f8c1d716ca794e6 GIT binary patch literal 636 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyy~ySip>6gB0F2&*1?od*kA+Bp9tg-bQN(tvG2e{9<}EckK%V6$bK?0N>~0&=h|sr-j%f# zSB;NZ8=nhJU7U6BhStKGH0G5>T{8K)3-Z6T?waT$StBP|bE%JO@4? z1L7ZhH9n`#jd$7i`S}mEDL;*Vus(UH|550}wYxhR>Ra=-NpqPpFM0pR6sX$j!2L(j z6I^^9Us~6<=TB8&FEToCU;Cgx%MbS&=}9XLHU4g?Jha_=0<)#igZWb*v@`wT-pA~D zg<(qFtvwH|RZld&;r{Ucho0z6iD-Efd$*3H|t)AMBC#Z}~g^Hi7kB zifzsuE9)0$s<;7Z{Y@fCHZ2?6IcGj!AfjY<##W9TXJYiDgBcS5T2#-2avi#n!rZ64^pUJuggLar+3HYR-XJ;EIr%L_GPQrdVA~ZN0)ty(QgCAyr-+5%Q~lo FCID&k1FHZ4 literal 0 HcmV?d00001 diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Back-2.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Back-2.png new file mode 100644 index 0000000000000000000000000000000000000000..48ad21763e95d2cb5187c0ef17aa1bb90918901e GIT binary patch literal 906 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(<^v49!D1}U6i==Pq0f$58#6uo^_3F;jbqOAehybx4_*0AX-@wuxn;X{tzM;-{o2LKxWgxPY3RJ1Z;y}varonA z<8npm(l_@7%umZ*4s4v^wwFzD|5oP*`Ewe+2ygU`RcCLoZ0VKKW^6cCMv7x`LB9xVrfzP%EFrA1FK-a#Om*>ALpK-qL#hI@i@fG#NI zJ2%7XTol6|*Bhm3ditv$n=m}!J-BmG-)1R>^_=HIOXpNE>`}6~ex)$X(&GBn!Z4-> zs!IC=qW>
  • *JZN5NwI)xv4a4=fMvT-~>shv7WOxgA#Lf*5R6ExunZe8upg<$+DW z@kpkI<1Fbxvgw8la*A&rTk9>q5ZC)7f4ghyud|X)2fUC#&L3-&y=!QdSusmJjA%mNf^<-*oxOX)MiouV%}iDXSIN zI;#5Kn$4zpIai)Z*nGKk`$o2v)!XOkPqZsKoA{9_`lg}Maz`P)>}H8ete4!^RVo{$ zaj!UcGIK)9UeyZcCH*nQ5l2pj?U*<5vI1v*=>$KJzI#re7%h1x6;y~c+Aa@NsC_c) z@MJrlmGOSfDtCImDJku{p7u2kXxPo_1@Btsuz6OP-@2(h^SGz{&SzpNHr*S7&z$-a zkZ&RqCA*}iWKKyb|EBc(SPLaxVb%Gn9uJqQwJ&a}8r#l9xGCxUy>>@?DE?toj@_o|`zD>^VRH18GV=+3A6h!~ZcnlL zro1O1tNYSBsY{GbKYXU=dWrs)yJxW7HM5*GlU+XI)h1ufWPin$^*MpJVx4Xs62CT~ zTBOKYSt3?`;u`(mlf;#d&5N}Uj$HG)U(GjWJ6GnTT{k_2ufL6&wL{M0l1g<7pG%Kz iIcJIWm(-2*>viq_uGRltP}O4s@~fw-pUXO@geCwLQ+o9P literal 0 HcmV?d00001 diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Contents.json b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Contents.json index 65a64dfd..753f15c2 100644 --- a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Contents.json +++ b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "nav_back.png", + "filename" : "Back.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "nav_back@2x.png", + "filename" : "Back-1.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "nav_back@3x.png", + "filename" : "Back-2.png", "scale" : "3x" } ], diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back.png deleted file mode 100644 index 2592ddda043233e967fa1a81123d0ff7f42fe64c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%1|*NXY)uAIjKx9jP7LeL$-D$|3O!vMLp*qs z6BJ}OOj_4!A}izY)Vg6uw@L1i)oqa<_*bYlR{)tZTN@H0df6^!2ng~pE)p?e2>r|c z=&8#}wP3-sleN#pE*3lJ)RaaS&-vd?0YePIyjF-{YThA|Eo3dToi`V7$3%+CLT7MbFch&so0wqA%y3s^34C z>6_J9+KA4#D4S^zU-SRd!@4<#3JYT&o&GG{7qmk+jZ;x4)JK0Asg&Hh&T?{#r3-X^t-YRPje({x6V$QC3q-|%lxQ`a?4tgysk_)j%dw0 zBA0svwgv6bTqdcQv$P=C$JptH*TZEq(pol5J>+Y67Oe4+;%v)L9PLJWUD<_S7E1lo juj)wlyPo>*>py1ZhF!A@x`h`2Lx{oC)z4*}Q$iB}#6*De diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@3x.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_back.imageset/nav_back@3x.png deleted file mode 100644 index f2ac8c73bba31fb9e6054699464c39704db9ccb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 488 zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$Kyp#^NA%Cx&(BWL^T3RBMG%i${+%kJISUGj9n zKCh=+w)EVw31E7p6yWDpwSeV_>w-BwUmQ3)x*aSfUp5K}h&L7)U1C;M&|`Xl~C z%s#@l;l$NALYF&MfVfLRVjLbPf z2}RcGJR3Y4PrjXFa6pY!ZF}({hS?%B?wsTNt!yxFeyYOPmX9fB%%-mxj~V}OJJB3I iPwgi|$H#iXAB=b3t_^BYk7@!&9fPN6gB0F2&*1?oTk7fJ7?Qzy zb(VMDVFMnQW}T{?^GtWgty>-Pcv=I?3?uu)Qv?-GO!GJ=ebO=E!1mkuzhw?5f9c=< z`y8{xL9SDxSwP>DLqgu0UqT-nqiA`6Vj2LFd^s1Z4Gj={{d9cP)PQiao=zO7c z#?40p5*E3ZHSFHHBF=Lj+pWL3`8Ruvg+I;eDy-y=0F>2cF0wsZ%honiZO zWtbZRlet&w8nw>cYH}}ipVNj#&zN-0r#emD%KxvZabeK1z_5tEGO3qQUz&v1lzCoW zB6`Wg{B!2pl1AP+rJ831{I*Q8d~`?W9SggU$(1uHd_9v?KIz@mV-|X}=8Ep)+x1x= szR6cVn32e&-njVHy#pNA9(zxf@7vbycWZ%rE-2zWUHx3vIVCg!0QnK%ZU6uP literal 0 HcmV?d00001 diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close-2.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close-2.png new file mode 100644 index 0000000000000000000000000000000000000000..db8470f741a56daf2686bea532645a9b3e90902f GIT binary patch literal 810 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(<^v49!D1}U6i==Pq0foY1Ti(^Oy zocq5`F=Q22Zqonn9FyBt&GWndHoN-g z-na9w2cO<6R92{O;nY0^M-Eb!orCmrzdu6d#!pZ!Y=N)Y00UR zzjmDR$~vhjcjWBP*CErwb_VpV*L&%4t}oU$pl9C+vokg}4?A6FMxGU(?{UrKaY^Hm zO$j+0oH|nu&V0bioO&@Lqg6KbqT~zSj!kzq?KWjPRdoK%y#lAOh-({;F>g9#+{SJ( zVX9j6EQP6SN@g0do|>}s*O{U}A(O)V3`HdkHkCgNmsM_Z`x0`p!sLYUhV=FBdzO8c zJ7`-qIDD;pc4 zp6xiWVO9@Ae^2UD-j%BvulI0rzQ4LfJ>lwama>2SDpRG^Up;>3))c!`yl(N-ElcKn z+WB3j_4H2-&-=$~*s4}9|HI1_?<)9eOVP9`B`WS=-EUldYGaaAzdkupdUi%fsQ-IQ zCOe~Pa(5OtvfeN{-pqP0nXM#EPo^bMfU#r6!GziCI$4~r&0=#FNnkL{Qi^ELHgKG= zwcSxy*oMKTD&ofOVw>jbZ?BrN*<4uqUaTxEG*>gqNO^B9xK>z_Dec6CqRFr3pDLMj ziS?Gc{PCZ@yT-G@yGywoOl3exx literal 0 HcmV?d00001 diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Close.png new file mode 100644 index 0000000000000000000000000000000000000000..f45880aa78c1d1cc38ffec9d806e6679a3aa35a9 GIT binary patch literal 365 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlfUUH5cx4DsMS zI<=AWu!4w7uC>d;&!W46ceyQpp*DBXUg4JYHDBwrTz;s$x@&Ff5#;rV*PrKqrAxr*gwkY1$tbpeyc<7sU7h=Y>xfyZ4{Ni+O>J)9h#SI&E?d%kZ?)g& z)%R3Bkg@K^(&g-*j;TcWUttQrJ5%d?TT9;Gorh$uY+U{PqmJz&v2**(w`IRqzL4R^ z70l3ejJI1t`Id~B*#Xt+l!cq$uPoOpSnxJr`o*~!oKE*sKOUFa^>4C*^rl#aeT(c? juy;9X-{PJi{pv3>vtr_r#QA4-gS_hL>gTe~DWM4f#-DwR literal 0 HcmV?d00001 diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Contents.json b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Contents.json index d328ed8e..795c8827 100644 --- a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Contents.json +++ b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "nav_close.png", + "filename" : "Close.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "nav_close@2x.png", + "filename" : "Close-1.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "nav_close@3x.png", + "filename" : "Close-2.png", "scale" : "3x" } ], diff --git a/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close.png b/MVMCoreUI/SupportingFiles/Media.xcassets/nav_close.imageset/nav_close.png deleted file mode 100644 index e04a9996db92a8ca047dc3a8a2148381f2813b1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 268 zcmV+n0rUQeP)P000>X1^@s6#OZ}&00001b5ch_0Itp) z=>Px##z{m$R7efImQfDFAPhs>kKO-gC+SsopeotRks*c3#0a{N50Gz{+0~47bt{2|lUMut2BJNa`y}2*yOP)Px$qDe$SRA>e5noADCFbqTyT!9VuUvMRE12MvamL&Ky6QvcAs+Pu{d6U4RsE5N& z$GPM>Z6KR43Tt&-%H3NzuH~3HjIar#unO~HNIIFgzm8eMXb9yL=Ecse3#4$iFlI(` zVF@{UxY^td0}_Rq!i|JbX_mAAAQX%NCKLz-_l64^LeV^F!j({TFSr%io4o$=|jx+t|Un+u`IT48Aa102=)fBs&9)^6z6i?%D@DDgYB z5CXobAA2i=-0#iBmyOVA0kzZ+(Cm^PKu@im08kkLi}V0c+Y%X|OmCYgFoOU=XavyT zEl2>Q)|=39#V}@QcB3#2nc9m`BaG-Cbc2s2qj}MUKj7Dwa8J14nz-{B<_#0-!2X&_ zGo%H65jy6>Ea656oVV1?002t}1^@s6I8J)%00001b5ch_0Itp) z=>Px%oJmAMRCodHoLg?fFc3xg>}NO9f0o{5l@+v}(m_#**Gmc@u!v#)44dxS8C@DC&KX}0;;LLoP z6%GPt?#H}=6F4^?ZjFq}#GJhU-%J(y8cA(TN>9h5J#I-^EM^UaJ|71kQo=2`i0 ztJ`b5H{Q*NS0gC^X`Gktus$si??qXryBT4ixbYFNuM)Jq-NWxAZu_v_@c9TB1LApV zP<*5$z!oT`Rc5+I)lNP7p7yU%2&|PQTm}+Q>zdVAQMFTY%4^rriXtF%jiQ-X)pni= zSPK;Gry-5IN59}}FM!_omqDgAuFX3wxKYES`KJMgGK#8`7983jx?UP^R>rLAhJmv- zWL@74oR<-=K4##&4S4s1fr}Cz)mIHJT5xoKF}N&3v*@UT%O)_Jo(H(B!qVwVC+Kkq z?{CuROCw|lX#X)>XSjepk;dmRy