From 4be0780b149d3449566e6dc56c7e5ff5fe54cdf7 Mon Sep 17 00:00:00 2001 From: Chris Li Date: Sun, 27 Nov 2016 10:06:36 -0500 Subject: [PATCH] commit --- .../Main/Bookmark.imageset/star-3 copy.png | Bin 0 -> 2194 bytes .../Main/Bookmark.imageset/star-3.png | Bin 2194 -> 5596 bytes .../Contents.json | 2 +- .../BookmarkHighlighted.imageset/star-3.png | Bin 0 -> 5995 bytes .../stars64 copy 3.png | Bin 19823 -> 0 bytes Kiwix-iOS/Controller/Main/Buttons.swift | 12 +++++------ Kiwix-iOS/Controller/Main/MainDelegates.swift | 12 ++++++++--- Kiwix-iOS/Info.plist | 2 +- Kiwix-iOS/View/BarButtonItems.swift | 19 ++++++++++++++---- Kiwix-iOSWidgets/Bookmarks/Info.plist | 2 +- 10 files changed, 33 insertions(+), 16 deletions(-) create mode 100644 Kiwix-iOS/Assets.xcassets/Main/Bookmark.imageset/star-3 copy.png create mode 100644 Kiwix-iOS/Assets.xcassets/Main/BookmarkHighlighted.imageset/star-3.png delete mode 100644 Kiwix-iOS/Assets.xcassets/Main/BookmarkHighlighted.imageset/stars64 copy 3.png diff --git a/Kiwix-iOS/Assets.xcassets/Main/Bookmark.imageset/star-3 copy.png b/Kiwix-iOS/Assets.xcassets/Main/Bookmark.imageset/star-3 copy.png new file mode 100644 index 0000000000000000000000000000000000000000..e22bbafe223fee5194672045db64c1921baa7832 GIT binary patch literal 2194 zcmZ`)X*iS(8-47ItuG;jxq9DZXDoxUL|J176Juwj8CwWr&%Tt#mJo($B!oc>*^NEI zYwT-;hHOb`K3d-C-}mSHaqe@SbKmE>f1Xq;gb6Q56a)YOubHVKlED^#z{$#(e$NU@ z8N}*o05<@DhD`1s?raPV_Ao`l0U%Ne0OFDW;FMv-Z394vG5~x+0{|=^0EF)qwOQ*h z7RqG4>I3%GZfc7Q-@#xU@7_oCV#?n1jFROnZb=X*0}k&G%p$aBd^VH&}N1P zHeRb^i&1IQGlCqSC&m@IN13(p`uI4d`=vxH`P-)nvnJG2FUoCls(P&y)aSNu^o!Yf zo9cA9@8Y~YaXPy){iR>OLhh;bqEBrl=XD1%rzp-~^(-#>b@17cYpndm z|+JrR+k0))AJWvAky(rHv z#l8q6ESB*zZ?Sk9>i9}NQQ6gwmOoD8FvQMsRo= zp^J|zdQ!sRGgflehZxJ9z)suJFo@|b32IQIy@S}nXoJg zi@PU-y>Lf8S4HTk3^g}V5zB=_GEGq(23ce-=-qVM2c7WtJm7yVotZal&I!R|yR2|vh-)oOLqR#6{u zIH6X#;5$Q|_7S(PN$B)}&dwkm)q8d{e(Z^pJ%ZfN0XrS*p2B0TKbYd%wFc|m+B4|h zb3{GGlV^07irKChma<+Msp>qGVD}W&SXM(mW`zIoH&17W4`&C+cqyf&QtL8f_|Zb8 zbv2?`MFp13)U%U*Gv}t6Os-0A{)@DXi7LHnP_4gkI)>n6E8JJRYb;|MbFR25_7P+( z_R%`^+x1&D=ULm4fw{0fC8$(ZswPrKjH1TPBL|i3dzaZY++Hq4??7V4FVx8S_{;4_ zUQ=P;7YeMQ5!t+(hc}6o!VmG%bc$+5ifZTMixU`x9H^!s@2c@HG7DFM!>>G>x}eo_ zgme{QdjZcwtBtP*=}&Yo9-pIN?fBe7t9!{15O3ki+|-bHyDlt_B5^H)GPwRS@L=+S z=gPs$)t}Alqi8%?+nlT~ETza;h$50xL&lgqSzkD%@U1UOAZZ2-e z=e&_U?ML4W&aJMU6-{%(gR?L&0#_0pXjSZMbKw#ycWLjT>U4YAZ|@{)e+zbK+t7d5 zl0$L^QrW`ahp}UsQd;|CH`YQk^O4H-Qwo_}TWhwoO@W};ar4ync0*eOH2lOOXheQY zDFV0}DgWx&)lH7GUhIR9`f08uU&^HBcN6i>7NCCQHp;I~QnaAcmn6QrV-`i3XLgp( zF^aD|PWnh;@<8fH>51Z`ueXbr!oEX4GNTT7WN?nUUiNn`KRrT-$k$ts152GQ0J=jc zdefn`#!eAEq{-edYMOqvI$QjJ z>#n{nNqcRtXV7G68EqRM*KkuHrJz8UP%J**pMQ68J28RD$yZo&Ch13f@%f*RNGIl74i@%c-b?IvRrN}PIxxJ|+1TBqh{3GoO1_`+$8+>4$W0%S*wOGclRef5HA z`A2$mOvPIs0xM+9s| z=eIxBc)BNhvQap&G#0rnlIEms^oa-!MqYW{SkO=V+0K2MCV2CQ{7JWtB)W`P*V>-h z^Xi?Bdg|foPDl%#?8o)aCC0;1l0^NHFW;q6LTDA}ki2pisZ={e_x=)AfF`(UO7s

z+OqhU^I@@JznH>Nm7ZEN)vhzkSsQ1+qf*vJcB_SF1#ala+lH$Rz76((w+8Fx4o}3$ zx#Vq>NDHj^+-jK%pWic_@2|6mKSThPq#SbLqNUgZ86CyaZWqArCcLv~r{9?B%55cSj-2?x@t&P_cVaMED6?Bhm)b5C?-u73WvQd>|or2A*w&tVp#A$bZ zH45)9cl-)8d^!2Qs>~iP>oSMcEek47v6%zGow2D$88#%!1C}<>9{v>^S+#)WWm`k> zoJt;AdX=$GUd?0F?-iVpJ?@S>4g>QD!Y~L>QHDSjAP@zJnvJp+OdSeS(Ns`Yhbb#3 zaFZFe|33l0fIHsUi2olrM)4jo0wRAt+zP>l`Bme*a literal 0 HcmV?d00001 diff --git a/Kiwix-iOS/Assets.xcassets/Main/Bookmark.imageset/star-3.png b/Kiwix-iOS/Assets.xcassets/Main/Bookmark.imageset/star-3.png index e22bbafe223fee5194672045db64c1921baa7832..eee0168f43dcc32da60f6104a62aeb1649671b07 100644 GIT binary patch literal 5596 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 DUak>7 diff --git a/Kiwix-iOS/Assets.xcassets/Main/BookmarkHighlighted.imageset/Contents.json b/Kiwix-iOS/Assets.xcassets/Main/BookmarkHighlighted.imageset/Contents.json index 309cb347..d725f785 100644 --- a/Kiwix-iOS/Assets.xcassets/Main/BookmarkHighlighted.imageset/Contents.json +++ b/Kiwix-iOS/Assets.xcassets/Main/BookmarkHighlighted.imageset/Contents.json @@ -10,7 +10,7 @@ }, { "idiom" : "universal", - "filename" : "stars64 copy 3.png", + "filename" : "star-3.png", "scale" : "3x" } ], diff --git a/Kiwix-iOS/Assets.xcassets/Main/BookmarkHighlighted.imageset/star-3.png b/Kiwix-iOS/Assets.xcassets/Main/BookmarkHighlighted.imageset/star-3.png new file mode 100644 index 0000000000000000000000000000000000000000..c331209316d67803568859753231dbfa957a3522 GIT binary patch literal 5995 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 literal 0 HcmV?d00001 diff --git a/Kiwix-iOS/Assets.xcassets/Main/BookmarkHighlighted.imageset/stars64 copy 3.png b/Kiwix-iOS/Assets.xcassets/Main/BookmarkHighlighted.imageset/stars64 copy 3.png deleted file mode 100644 index b156f3885cb8f01bee149c1eefef37b6950d4f60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19823 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 CFBundleVersion - 1.8.3401 + 1.8.3419 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/Kiwix-iOS/View/BarButtonItems.swift b/Kiwix-iOS/View/BarButtonItems.swift index 70e562ee..10d4fb99 100644 --- a/Kiwix-iOS/View/BarButtonItems.swift +++ b/Kiwix-iOS/View/BarButtonItems.swift @@ -15,17 +15,22 @@ class LPTBarButtonItem: UIBarButtonItem { scale: CGFloat = 1.0, grayed: Bool = true, delegate: LPTBarButtonItemDelegate? = nil) { - let image = UIImage(named: imageName)?.withRenderingMode(.alwaysTemplate) - let highlightedImage: UIImage? = { + var image = UIImage(named: imageName) + var highlightedImage: UIImage? = { guard let name = highlightedImageName else {return nil} - return UIImage(named: name)?.withRenderingMode(.alwaysTemplate) + return UIImage(named: name) }() + if grayed { + image = image?.withRenderingMode(.alwaysTemplate) + highlightedImage = highlightedImage?.withRenderingMode(.alwaysTemplate) + } + let imageView = UIImageView(image: image, highlightedImage: highlightedImage) imageView.contentMode = UIViewContentMode.scaleAspectFit imageView.frame = CGRect(x: 0, y: 0, width: 26, height: 26) - imageView.tintColor = grayed ? UIColor.gray : nil imageView.transform = CGAffineTransform(scaleX: scale, y: scale) + if grayed {imageView.tintColor = UIColor.gray} let containerView = UIView(frame: CGRect(x: 0, y: 0, width: 44, height: 30)) // on ipad may be 52, 44 is value on iP6s+, to be investigated imageView.center = containerView.center @@ -48,6 +53,12 @@ class LPTBarButtonItem: UIBarButtonItem { } } + var isHighlighted: Bool = false { + didSet { + imageView?.isHighlighted = isHighlighted + } + } + // MARK: - properties weak var delegate: LPTBarButtonItemDelegate? diff --git a/Kiwix-iOSWidgets/Bookmarks/Info.plist b/Kiwix-iOSWidgets/Bookmarks/Info.plist index 2ea4ebe5..ad1fb459 100644 --- a/Kiwix-iOSWidgets/Bookmarks/Info.plist +++ b/Kiwix-iOSWidgets/Bookmarks/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 1.8.3401 + 1.8.3419 NSExtension NSExtensionMainStoryboard