From 694def74bf095fa074478f0eefde4e6d9767b3c0 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Tue, 16 Apr 2019 20:56:02 -0500 Subject: [PATCH] Updated some of the graphics to be more correct and added the Edit button to the Master view. --- iOS/Base.lproj/Main.storyboard | 22 +++++++++++------- iOS/Master/Cell/MasterTableViewCell.swift | 2 +- .../Cell/MasterTableViewCellLayout.swift | 5 ++-- iOS/Master/MasterViewController.swift | 2 ++ .../browserImage.imageset/Contents.json | 2 +- .../{Safari.pdf => safari.pdf} | Bin 5115 -> 5130 bytes .../circleClosedImage.imageset/Contents.json | 2 +- .../{circlefilled.pdf => circleClosed.pdf} | Bin 3905 -> 3905 bytes .../circleOpenImage.imageset/Contents.json | 2 +- .../circleOpen.pdf} | Bin 3981 -> 3985 bytes .../settingsImage.imageset/Contents.json | 12 ++++++++++ .../settingsImage.imageset/settings.pdf | Bin 0 -> 6292 bytes .../starClosedImage.imageset/Contents.json | 2 +- .../{star.pdf => starClosed.pdf} | Bin 3916 -> 3935 bytes .../starOpenImage.imageset/Contents.json | 2 +- .../starOpen.pdf} | Bin 3975 -> 4024 bytes .../toolsImage.imageset/tools.pdf | Bin 4634 -> 4736 bytes 17 files changed, 36 insertions(+), 17 deletions(-) rename iOS/Resources/Assets.xcassets/browserImage.imageset/{Safari.pdf => safari.pdf} (64%) rename iOS/Resources/Assets.xcassets/circleClosedImage.imageset/{circlefilled.pdf => circleClosed.pdf} (91%) rename iOS/Resources/Assets.xcassets/{starOpenImage.imageset/staropen.pdf => circleOpenImage.imageset/circleOpen.pdf} (83%) create mode 100644 iOS/Resources/Assets.xcassets/settingsImage.imageset/Contents.json create mode 100644 iOS/Resources/Assets.xcassets/settingsImage.imageset/settings.pdf rename iOS/Resources/Assets.xcassets/starClosedImage.imageset/{star.pdf => starClosed.pdf} (85%) rename iOS/Resources/Assets.xcassets/{circleOpenImage.imageset/circleopen.pdf => starOpenImage.imageset/starOpen.pdf} (82%) diff --git a/iOS/Base.lproj/Main.storyboard b/iOS/Base.lproj/Main.storyboard index 3895a8bfe..347b5c3b1 100644 --- a/iOS/Base.lproj/Main.storyboard +++ b/iOS/Base.lproj/Main.storyboard @@ -205,11 +205,14 @@ - - - - - + + + + + + + + @@ -280,10 +283,11 @@ - - - - + + + + + diff --git a/iOS/Master/Cell/MasterTableViewCell.swift b/iOS/Master/Cell/MasterTableViewCell.swift index 19151d4a8..a71cc4b44 100644 --- a/iOS/Master/Cell/MasterTableViewCell.swift +++ b/iOS/Master/Cell/MasterTableViewCell.swift @@ -92,7 +92,7 @@ class MasterTableViewCell : UITableViewCell { override func layoutSubviews() { super.layoutSubviews() - let layout = MasterTableViewCellLayout(cellSize: bounds.size, shouldShowImage: shouldShowImage, label: titleView, unreadCountView: unreadCountView) + let layout = MasterTableViewCellLayout(cellSize: bounds.size, shouldShowImage: shouldShowImage, label: titleView, unreadCountView: unreadCountView, isEditing: isEditing) layoutWith(layout) } diff --git a/iOS/Master/Cell/MasterTableViewCellLayout.swift b/iOS/Master/Cell/MasterTableViewCellLayout.swift index 629e77796..f55bbb5e3 100644 --- a/iOS/Master/Cell/MasterTableViewCellLayout.swift +++ b/iOS/Master/Cell/MasterTableViewCellLayout.swift @@ -21,13 +21,14 @@ struct MasterTableViewCellLayout { let titleRect: CGRect let unreadCountRect: CGRect - init(cellSize: CGSize, shouldShowImage: Bool, label: UILabel, unreadCountView: MasterUnreadCountView) { + init(cellSize: CGSize, shouldShowImage: Bool, label: UILabel, unreadCountView: MasterUnreadCountView, isEditing: Bool) { let bounds = CGRect(x: 0.0, y: 0.0, width: floor(cellSize.width), height: floor(cellSize.height)) var rFavicon = CGRect.zero if shouldShowImage { - rFavicon = CGRect(x: MasterTableViewCellLayout.imageMarginLeft, y: 0.0, width: MasterTableViewCellLayout.imageSize.width, height: MasterTableViewCellLayout.imageSize.height) + let indent = isEditing ? MasterTableViewCellLayout.imageMarginLeft + 40 : MasterTableViewCellLayout.imageMarginLeft + rFavicon = CGRect(x: indent, y: 0.0, width: MasterTableViewCellLayout.imageSize.width, height: MasterTableViewCellLayout.imageSize.height) rFavicon = MasterTableViewCellLayout.centerVertically(rFavicon, bounds) } self.faviconRect = rFavicon diff --git a/iOS/Master/MasterViewController.swift b/iOS/Master/MasterViewController.swift index 4a73646c7..bc139c841 100644 --- a/iOS/Master/MasterViewController.swift +++ b/iOS/Master/MasterViewController.swift @@ -30,6 +30,8 @@ class MasterViewController: UITableViewController, UndoableCommandRunner { super.viewDidLoad() + navigationItem.rightBarButtonItem = editButtonItem + NotificationCenter.default.addObserver(self, selector: #selector(unreadCountDidChange(_:)), name: .UnreadCountDidChange, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(containerChildrenDidChange(_:)), name: .ChildrenDidChange, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(batchUpdateDidPerform(_:)), name: .BatchUpdateDidPerform, object: nil) diff --git a/iOS/Resources/Assets.xcassets/browserImage.imageset/Contents.json b/iOS/Resources/Assets.xcassets/browserImage.imageset/Contents.json index 1dba92e17..0718c2065 100644 --- a/iOS/Resources/Assets.xcassets/browserImage.imageset/Contents.json +++ b/iOS/Resources/Assets.xcassets/browserImage.imageset/Contents.json @@ -2,7 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "Safari.pdf" + "filename" : "safari.pdf" } ], "info" : { diff --git a/iOS/Resources/Assets.xcassets/browserImage.imageset/Safari.pdf b/iOS/Resources/Assets.xcassets/browserImage.imageset/safari.pdf similarity index 64% rename from iOS/Resources/Assets.xcassets/browserImage.imageset/Safari.pdf rename to iOS/Resources/Assets.xcassets/browserImage.imageset/safari.pdf index 2dc9c6e8fd5299d9b07678ccc3650f35891694db..5f59660eb160109295ebbd9e0bb2915b22eb2f86 100644 GIT binary patch delta 1695 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 diff --git a/iOS/Resources/Assets.xcassets/circleClosedImage.imageset/Contents.json b/iOS/Resources/Assets.xcassets/circleClosedImage.imageset/Contents.json index 9a22be9d0..96164f72b 100644 --- a/iOS/Resources/Assets.xcassets/circleClosedImage.imageset/Contents.json +++ b/iOS/Resources/Assets.xcassets/circleClosedImage.imageset/Contents.json @@ -2,7 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "circlefilled.pdf" + "filename" : "circleClosed.pdf" } ], "info" : { diff --git a/iOS/Resources/Assets.xcassets/circleClosedImage.imageset/circlefilled.pdf b/iOS/Resources/Assets.xcassets/circleClosedImage.imageset/circleClosed.pdf similarity index 91% rename from iOS/Resources/Assets.xcassets/circleClosedImage.imageset/circlefilled.pdf rename to iOS/Resources/Assets.xcassets/circleClosedImage.imageset/circleClosed.pdf index de652a543933206bb3cb92de2724786d99af037f..4535180631066b4e0a9ce359e66eefd4cbef0b9d 100644 GIT binary patch delta 261 zcmX>ocTjFZKz*pcBiCUAp54zye;wFk;l20X_ojK@8VUDXL1T=jY-7PA%}EeTwh9^f{=DOB~?HGR8`GcQ(1 zW&B(py5Ui0zPI_F!rCj()^zO6I;bkYTm3Ps%f4uZpp83=Hi+u$u-bR#8;5SZvXPs` zNWsWxawpGLHgf|*10#dYF1+&?;|&ZgQd5l$(^Aun4O0wKj17%ajZzGg5|a`wO)L{l mjqJE=2r5yCRj{+;DlSPZDyb++P2(~)v9RD$Rdw}u;{pKQ!e#~l delta 261 zcmX>ocTjFZK)tJ**~ns&H{ zSL;HTdeMnc@0mGW7Yuu%f{nB?a@y+!wk!Ga`&TXq_-|P>RYA!#vh8yIbMyDJ{@>g1 zpi8_(KZ^JLZM~Kz_H)zMW!%km%(wWs?#OJ;HCG!hWj&}pDEpa}-9uOB-^ME&xmgSp zj0`4s@@!=@Ftji=Hr(vOJC89w(a6*?&CoO@%_uD;*~q{+)iBM_(%i%_#UL>)#W*F& kj?0Fi5`|a=J3Fr8lEk8tilWpsE@Kl53ocbvSARDy0P%-n_W%F@ diff --git a/iOS/Resources/Assets.xcassets/circleOpenImage.imageset/Contents.json b/iOS/Resources/Assets.xcassets/circleOpenImage.imageset/Contents.json index 6f57c5865..af022ee47 100644 --- a/iOS/Resources/Assets.xcassets/circleOpenImage.imageset/Contents.json +++ b/iOS/Resources/Assets.xcassets/circleOpenImage.imageset/Contents.json @@ -2,7 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "circleopen.pdf" + "filename" : "circleOpen.pdf" } ], "info" : { diff --git a/iOS/Resources/Assets.xcassets/starOpenImage.imageset/staropen.pdf b/iOS/Resources/Assets.xcassets/circleOpenImage.imageset/circleOpen.pdf similarity index 83% rename from iOS/Resources/Assets.xcassets/starOpenImage.imageset/staropen.pdf rename to iOS/Resources/Assets.xcassets/circleOpenImage.imageset/circleOpen.pdf index 36ce192cf3a92fc4f6d625c555020db626d25c5e..6fd77db9a348f1c2f896bf3a63623396f3c3684e 100644 GIT binary patch delta 529 zcmeB`pC~^epguIvlk2bn&z|3+pBr~gdbIZWK859W2LggTxE24mpPF`Ah-aGn=?s

aIpd~q=AJ$`_x`+@ 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 T8oyr%Tu2ZO;N+B3l?VI}5^7TA literal 0 HcmV?d00001 diff --git a/iOS/Resources/Assets.xcassets/starClosedImage.imageset/Contents.json b/iOS/Resources/Assets.xcassets/starClosedImage.imageset/Contents.json index 630617b60..38cbb2719 100644 --- a/iOS/Resources/Assets.xcassets/starClosedImage.imageset/Contents.json +++ b/iOS/Resources/Assets.xcassets/starClosedImage.imageset/Contents.json @@ -2,7 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "star.pdf" + "filename" : "starClosed.pdf" } ], "info" : { diff --git a/iOS/Resources/Assets.xcassets/starClosedImage.imageset/star.pdf b/iOS/Resources/Assets.xcassets/starClosedImage.imageset/starClosed.pdf similarity index 85% rename from iOS/Resources/Assets.xcassets/starClosedImage.imageset/star.pdf rename to iOS/Resources/Assets.xcassets/starClosedImage.imageset/starClosed.pdf index 267d229be42e04d69e645c5b9346b18511dfcce7..04042a300afcffb2d4856b852ad94d408b664a34 100644 GIT binary patch delta 481 zcmX>jcVBKoV7>oo-ev=yy~anQ7wDDAsLz?%5X|ndYK4oo;=zfwJbM0pcgLipatxAtfAl zJ;jBlKKRFZuJftKYrVxd(KJUgp zk!HgvuGGAg;*z4 R<7KPijLRKY+2L>rozZsup4%*|?Opy@{cM0SGAMDR6-q1_s6^2IykOhFH{@7+7GcGr};> z*vQlzL!Ge!M2sKFVq;?qqsfQ(?BY`rQ&WKol1)r4O%2nM(kzWlQ_WIR4UJ7LOihi< m)9kox2r5yCRj{+;DlSPZDyb++P2(~)v9#n;Rdw}u;{pIoCyu%R diff --git a/iOS/Resources/Assets.xcassets/starOpenImage.imageset/Contents.json b/iOS/Resources/Assets.xcassets/starOpenImage.imageset/Contents.json index fad0e5c23..19c68b8c4 100644 --- a/iOS/Resources/Assets.xcassets/starOpenImage.imageset/Contents.json +++ b/iOS/Resources/Assets.xcassets/starOpenImage.imageset/Contents.json @@ -2,7 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "staropen.pdf" + "filename" : "starOpen.pdf" } ], "info" : { diff --git a/iOS/Resources/Assets.xcassets/circleOpenImage.imageset/circleopen.pdf b/iOS/Resources/Assets.xcassets/starOpenImage.imageset/starOpen.pdf similarity index 82% rename from iOS/Resources/Assets.xcassets/circleOpenImage.imageset/circleopen.pdf rename to iOS/Resources/Assets.xcassets/starOpenImage.imageset/starOpen.pdf index 814275c22e221d9b09a0f5a81fd0821617affc91..803a3f8ec4aa348749fd683855cfcae123ac3c32 100644 GIT binary patch delta 587 zcmZpd-yuICpgwh?V_u5^kL&k2kKz~Py;1Rt_|CHV6{Fj#6(U-_JN93he;~lEm9_8h z-#^K6J03E22Pw&C2=()9blRL@s$aj8ZL40XNyy4se}d*pHO+V)?&B=zee2@pBSuzI zlfHDEbu=lH+8Oyr!{4g=X@TzUDKRs582pRQi{Mz)E;J{3@2Zvc{@RBpq|G||ZqA1V z2YWXx(GfZ4-(H*{^7Ur$cM+9cqHlK!1fAUTuygs*ht|B6wx(}3C-dsB(Ycs*y*Mph z)H8Im>^8qImn{Ri?LHn>wcPjd-$u=M(uXRxTi@Gp^oF=qlt^sQu8LuGD~7c5?#*Q)5G;$=$pS z+NQ=v3I-sckf*=}W*8V4n^~ZX85>!cOg7_Ft2ePkmohLh!J-_CI#WY4biKw#Mi}N9 z8=IM8s53Eyi18!2)7Zq)VDc+IyLbZ=LzBc*i)5ff3=ULQEwHBd~T$bTx`|Yb@W8- z%9mHV4fj82e969RTd4kIZ$@b*1Cz}ej8nK-3>1tECh=}%H!!p?H8i%Eyoa|z+r+|H z!2kpl@)Wqh3v7rTqdB( z%^+g@NbWQ?F)^Gh&2JZPWM-U}W}0GZX=Y$#Xq0M_Y-(ol3_iN(<@iA&xoi=`=do)NsRTRiu0{l?XN^A}6{Ke2Gn zp5(Sru(|8svupEm&+9xiTYf6@S@Wii znn5pZbAFujo~Q76o9%T=`QuXWU$1UDdiHneoX2mBE6z4wTHGZ6muFISoQ>Uqu8adS zUlm8H-7tL}Iz#u7Tf(*n%_mc@)(dS5?(^I@$IWljMXC10mrR;#&tG0~``TqCp&xgD zJ)2vTzD29c;`ZbjyF;R_f43&*1+2Vgb)IM9g^e{^l{;UEtbC#6^Kx0*&$iMT&X$$$ zenl*KHI2JLM7Mo{9pCmjuND^eE}10Ro|xSrUJ$%((cxu>Ya%Y3QxytvR$$q9{AK5| z`qyhy7>pa_J$9X7Ki;NtV7+FgHP0lO`UyPMi(M8i@7v9|?TmhN!Swk@wP$3BUFg^+ z|Ea`a`trlKTV>rZ-*A8PoKsJszgb(#f9hM8j{0Y(&U<&CNoO(X5#hV1?jYG} zEnryq>)fv^^{=AMd{r(KHs8H8Wzwpx1_us3Z@zHNC3&@p#R+EKvdaz+JJlMC&iy+w zCu^38_nbs|ulej+8y;ka-ttsg|7>T48K3a#(1k)XBc>ivvsRjEqieeKtlFv>i3?{n`{hv&~rq8(_wzR8!jaY|E+2_MoH77-0xK)v;7C3#%*;{K>p5&-x-pFD+ zxW=ab7>}Ciy+27I7wTSKZxiu|I=N}ytQovlOVl2||D?Zt^B=AI|9^ccs-IT%&+h%F z-uV{;TeBRBS0`r$s2sZWuiUV&|Fx3bSJmzhU!T4Ue}Ddy|Id%|Pqx%-nY@-+irLc4 zbn_|ZDcme33PwhgllZrA7@8Xxm>8LuOqLU9&<4^91|Xo2r@#ef7#JE@7@&(8TUwe; zJ}ID5Z)jjslkL||WlM&IpYq~se_9|Zn;gYf$NN22Zbr5F%&mRdkD4s3CFYpY;r-={ zAMVt-wP#27E`LUwFZb$U38lE3VboAKC;{Z7$y zmW3@3cC)IKygtIZSXWh9r2SbvbIX$lnp;<>Y?qx~an-3e;8fqk${o@yYp$sse3{yD zBI~QoXUo&#J=RroHIKh*H##v@dD*S)M@Tb(yI%DRCo;$Naaz3lc5l~bfmJsiPfn44s%{&6dFLFJ+N1S0 zHjlVJZILukPfp}{%C^cnht+78cE_hByFHaYRlcz1|HoB&+RP?TBW$M0)N>AuS8Y=J zUWjiEWjWRpa#!}=^w6&fEh3FhFQtVKPqx^UVJ4&_@k;F#yK2L-?)3`=e}`O~Y$Yw> z^3&wYZ!P1wYkcP4+P-p%_oc2&y(_-AX3sfzu>M_#SoNi~Y_7f24_}dpaC|Mnr?B9e z?SU5`*mjtB_S|v%-F;HE)1<0Kz3ag=hgsRF&1M>tu5D2|H~(t;qo&|}3^`kbx^7x% zMOL%)<-QIGp!P`5FO(Zi`=KRa&d6Pc&Nxd-5$*8yyuO&PqM=2pIi1E@(&3#hp z_Z}@-`T9*g<2(avp0#OdkG$2Z+@*tpAAgJEE9tFvx-?mJqd>CRozlN~t9e@1gfj6* zxs~kMSj%vE#q3bdi7w}=qr;-3R!GmBAQzu&W;)UN*c3No=ALIQ5pA*6K2kO&=1>2v zVC!WxK6ETKD3Wn~M9_+o`TzG@M}Me@T~jD=ZJ86}_cL~e^+N1RuQ)kJN&S0LZD8#& zX9xeY1;#l!_8K)tPAk8zXS20uoDjEv`hA<|r{O<;z3shOul@DU9@|sX6RY2Ond&_f z4rGdKKWX3aKmACJ{pIeM(C+6yAAUW4dHz%P%AefX)`8|+sd*{IB}J);xgb`4QWlq~ zf`I~vwlFj1+HA-&nVZEx!O&vz3H~h{2IhtqCKg7PlUoEDv<*#+6bwK>Ay0t|%rG#p zG`Bz(Gq$ianXE6UQg2{sYKbmsXkdy(0~U3LMrP=GjV+8Z%rmw$2Ra|sQ6>gPATdD{ zmzo$F7)*XFXcwPqY?Nx6YMPj4YGj&bXqIGQkZfuR^kR~ElCec%a