From c289d6a4df9caf867e6ff58e1980ac37dbd45b20 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Mon, 15 Apr 2013 10:29:39 -0700
Subject: [PATCH] Fixing menu colors, segmented control colors, and settings
 button inaccurate sizing after opening social feed (with avatar in place of
 settings button).

---
 .../Classes/FeedDetailMenuViewController.m    |  23 ++++++++-------
 media/ios/Classes/FeedDetailViewController.h  |   1 +
 media/ios/Classes/FeedDetailViewController.m  |  27 +++++++-----------
 media/ios/Classes/FeedsMenuViewController.m   |   2 +-
 .../ios/Classes/FontSettingsViewController.m  |   4 +--
 media/ios/Classes/MenuTableViewCell.m         |   9 ++----
 .../Resources/segmented/segment_active.png    | Bin 707 -> 752 bytes
 .../Resources/segmented/segment_inactive.png  | Bin 560 -> 609 bytes
 .../segmented/segment_left_selected.png       | Bin 419 -> 433 bytes
 .../segmented/segment_right_selected.png      | Bin 380 -> 384 bytes
 .../segmented/segment_unselected.png          | Bin 323 -> 334 bytes
 11 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/media/ios/Classes/FeedDetailMenuViewController.m b/media/ios/Classes/FeedDetailMenuViewController.m
index 5d5d8128c..2563cbbbe 100644
--- a/media/ios/Classes/FeedDetailMenuViewController.m
+++ b/media/ios/Classes/FeedDetailMenuViewController.m
@@ -35,8 +35,8 @@
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-    self.menuTableView.backgroundColor = UIColorFromRGB(0xF0FFF0);
-    self.menuTableView.separatorColor = UIColorFromRGB(0x8AA378);
+    self.menuTableView.backgroundColor = UIColorFromRGB(0xECEEEA);
+    self.menuTableView.separatorColor = UIColorFromRGB(0x909090);
 }
 
 - (void)viewDidUnload
@@ -78,20 +78,23 @@
     return YES;
 }
 
-- (void)buildMenuOptions {    
+- (void)buildMenuOptions {
+    BOOL everything = appDelegate.isRiverView && [appDelegate.activeFolder isEqualToString:@"everything"];
+
     NSMutableArray *options = [NSMutableArray array];
     
     //    NSString *title = appDelegate.isRiverView ?
     //                        appDelegate.activeFolder :
     //                        [appDelegate.activeFeed objectForKey:@"feed_title"];
     
-    NSString *deleteText = [NSString stringWithFormat:@"Delete %@",
-                            appDelegate.isRiverView ?
-                            @"this entire folder" :
-                            @"this site"];
-    [options addObject:[deleteText uppercaseString]];
-    
-    [options addObject:[@"Move to another folder" uppercaseString]];
+    if (!everything) {
+        NSString *deleteText = [NSString stringWithFormat:@"Delete %@",
+                                appDelegate.isRiverView ?
+                                @"this entire folder" :
+                                @"this site"];
+        [options addObject:[deleteText uppercaseString]];
+        [options addObject:[@"Move to another folder" uppercaseString]];
+    }
     
     if (!appDelegate.isRiverView) {
         [options addObject:[@"Train this site" uppercaseString]];
diff --git a/media/ios/Classes/FeedDetailViewController.h b/media/ios/Classes/FeedDetailViewController.h
index 4839013fa..46f6e9153 100644
--- a/media/ios/Classes/FeedDetailViewController.h
+++ b/media/ios/Classes/FeedDetailViewController.h
@@ -44,6 +44,7 @@
 @property (nonatomic) IBOutlet UIBarButtonItem * spacer2BarButton;
 @property (nonatomic) IBOutlet UIBarButtonItem * spacer3BarButton;
 @property (nonatomic) IBOutlet UIBarButtonItem * separatorBarButton;
+@property (nonatomic) IBOutlet UIBarButtonItem * titleImageBarButton;
 @property (nonatomic) IBOutlet TransparentToolbar * rightToolbar;
 @property (nonatomic, retain) WEPopoverController *popoverController;
 
diff --git a/media/ios/Classes/FeedDetailViewController.m b/media/ios/Classes/FeedDetailViewController.m
index d68616653..bf2c0d5c5 100644
--- a/media/ios/Classes/FeedDetailViewController.m
+++ b/media/ios/Classes/FeedDetailViewController.m
@@ -45,6 +45,7 @@
 @synthesize storyTitlesTable, feedMarkReadButton;
 @synthesize settingsBarButton;
 @synthesize separatorBarButton;
+@synthesize titleImageBarButton;
 @synthesize spacerBarButton, spacer2BarButton, spacer3BarButton;
 @synthesize stories;
 @synthesize rightToolbar;
@@ -91,6 +92,9 @@
     
     UIImage *markreadImage = [UIImage imageNamed:@"markread.png"];
     feedMarkReadButton = [UIBarButtonItem barItemWithImage:markreadImage target:self action:@selector(doOpenMarkReadActionSheet:)];
+
+    titleImageBarButton = [UIBarButtonItem alloc];
+
 }
 
 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
@@ -124,8 +128,7 @@
     if (appDelegate.isSocialView) {
         UIButton *titleImageButton = [appDelegate makeRightFeedTitle:appDelegate.activeFeed];
         [titleImageButton addTarget:self action:@selector(showUserProfile) forControlEvents:UIControlEventTouchUpInside];
-        UIBarButtonItem *titleImageBarButton = [[UIBarButtonItem alloc] 
-                                                 initWithCustomView:titleImageButton];
+        titleImageBarButton.customView = titleImageButton;
         [rightToolbar setItems: [NSArray arrayWithObjects:
                                  spacerBarButton,
                                  feedMarkReadButton,
@@ -134,6 +137,7 @@
                                  spacer3BarButton,
                                  titleImageBarButton, nil]];
         self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:rightToolbar];
+        titleImageBarButton.enabled = YES;
     } else {
         [rightToolbar setItems: [NSArray arrayWithObjects:
                                  spacerBarButton,
@@ -144,19 +148,11 @@
                                  settingsBarButton, nil]];
         self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:rightToolbar];
     }
-
-    
-    // Commenting out until training is ready...
-    //    UIBarButtonItem *trainBarButton = [UIBarButtonItem alloc];
-    //    [trainBarButton setImage:[UIImage imageNamed:@"train.png"]];
-    //    [trainBarButton setEnabled:YES];
-    //    [self.navigationItem setRightBarButtonItem:trainBarButton animated:YES];
-    //    [trainBarButton release];
     
     NSMutableArray *indexPaths = [NSMutableArray array];
     for (id i in appDelegate.recentlyReadStories) {
         NSIndexPath *indexPath = [NSIndexPath indexPathForRow:[i intValue]
-                                                inSection:0];
+                                                    inSection:0];
 //        NSLog(@"Read story: %d", [i intValue]);
         if (![indexPaths containsObject:indexPath]) {
             [indexPaths addObject:indexPath];
@@ -174,8 +170,6 @@
         
     if ((appDelegate.isSocialRiverView ||
          appDelegate.isSocialView ||
-         (appDelegate.isRiverView &&
-          [appDelegate.activeFolder isEqualToString:@"everything"]) ||
          [appDelegate.activeFolder isEqualToString:@"saved_stories"])) {
         settingsBarButton.enabled = NO;
     } else {
@@ -237,12 +231,12 @@
 - (void)setUserAvatarLayout:(UIInterfaceOrientation)orientation {
     if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone && appDelegate.isSocialView) {
         if (UIInterfaceOrientationIsPortrait(orientation)) {
-            UIButton *avatar = (UIButton *)[(UIBarButtonItem *)[[rightToolbar items] lastObject] customView];
+            UIButton *avatar = (UIButton *)titleImageBarButton.customView;
             CGRect buttonFrame = avatar.frame;
             buttonFrame.size = CGSizeMake(32, 32);
             avatar.frame = buttonFrame;
         } else {
-            UIButton *avatar = (UIButton *)[(UIBarButtonItem *)[[rightToolbar items] lastObject] customView];
+            UIButton *avatar = (UIButton *)titleImageBarButton.customView;
             CGRect buttonFrame = avatar.frame;
             buttonFrame.size = CGSizeMake(28, 28);
             avatar.frame = buttonFrame;
@@ -1131,7 +1125,8 @@
         if ([self.popoverController respondsToSelector:@selector(setContainerViewProperties:)]) {
             [self.popoverController setContainerViewProperties:[self improvedContainerViewProperties]];
         }
-        [self.popoverController setPopoverContentSize:CGSizeMake(260, appDelegate.isRiverView ? 38 * 4 : 38 * 6)];
+        BOOL everything = appDelegate.isRiverView && [appDelegate.activeFolder isEqualToString:@"everything"];
+        [self.popoverController setPopoverContentSize:CGSizeMake(260, everything ? 38 * 2 : 38 * 6)];
         [self.popoverController presentPopoverFromBarButtonItem:self.settingsBarButton
                                        permittedArrowDirections:UIPopoverArrowDirectionUp
                                                        animated:YES];
diff --git a/media/ios/Classes/FeedsMenuViewController.m b/media/ios/Classes/FeedsMenuViewController.m
index 41a6fb19f..32acb0d8a 100644
--- a/media/ios/Classes/FeedsMenuViewController.m
+++ b/media/ios/Classes/FeedsMenuViewController.m
@@ -37,7 +37,7 @@
                         initWithObjects:[@"Find Friends" uppercaseString],
                                         [@"Logout" uppercaseString], nil];
     
-    self.menuTableView.backgroundColor = UIColorFromRGB(0xFFFFFF);
+    self.menuTableView.backgroundColor = UIColorFromRGB(0xECEEEA);
     self.menuTableView.separatorColor = UIColorFromRGB(0x909090);
 }
 
diff --git a/media/ios/Classes/FontSettingsViewController.m b/media/ios/Classes/FontSettingsViewController.m
index 111b708be..1625f8161 100644
--- a/media/ios/Classes/FontSettingsViewController.m
+++ b/media/ios/Classes/FontSettingsViewController.m
@@ -35,8 +35,8 @@
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-    self.menuTableView.backgroundColor = UIColorFromRGB(0xF0FFF0);
-    self.menuTableView.separatorColor = UIColorFromRGB(0x8AA378);
+    self.menuTableView.backgroundColor = UIColorFromRGB(0xECEEEA);
+    self.menuTableView.separatorColor = UIColorFromRGB(0x909090);
 }
 
 - (void)viewWillAppear:(BOOL)animated {
diff --git a/media/ios/Classes/MenuTableViewCell.m b/media/ios/Classes/MenuTableViewCell.m
index d81802c14..a5fd943db 100644
--- a/media/ios/Classes/MenuTableViewCell.m
+++ b/media/ios/Classes/MenuTableViewCell.m
@@ -17,6 +17,7 @@
         // Initialization code
         self.textLabel.backgroundColor = [UIColor clearColor];
         self.textLabel.textColor = UIColorFromRGB(0x303030);
+        self.textLabel.highlightedTextColor = UIColorFromRGB(0x303030);
         self.textLabel.shadowColor = UIColorFromRGB(0xF0F0F0);
         self.textLabel.shadowOffset = CGSizeMake(0, 1);
         self.textLabel.font = [UIFont fontWithName:@"Helvetica-Bold" size:14.0];
@@ -44,16 +45,10 @@
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
     [super setSelected:selected animated:animated];
-
-    self.textLabel.shadowColor = UIColorFromRGB(0xF0F0F0);
-    self.textLabel.textColor = UIColorFromRGB(0x303030);
 }
 
 - (void)setHighlighted:(BOOL)highlighted animated:(BOOL)animated {
-    [super setHighlighted:highlighted animated:animated];
-
-    self.textLabel.shadowColor = UIColorFromRGB(0xF0F0F0);
-    self.textLabel.textColor = UIColorFromRGB(0x303030);
+    [super setHighlighted:highlighted animated:animated];    
 }
 
 @end
diff --git a/media/ios/Resources/segmented/segment_active.png b/media/ios/Resources/segmented/segment_active.png
index da1b81bcda04d29cae80172e02daee5025632f26..6238ff2510b469cb1d94b91db75d76a3a898c0fa 100644
GIT binary patch
delta 652
zcmV;70(1St1@HwSiBL{Q4GJ0x0000DNk~Le0000G0000q2nGNE0E5oBL6ISGe@RJ1
zK~zYI?U%hy8$lF>zdO5LJLbm_99yD5X_6v6qM&h}fQX8`1#f_P1KuK3Bs@V}kOEN?
z36PSAlHl0R8VBRuxhcH6*eD@}b%7#|w8hTMIdjgPk@l`IfSnKTD!@8W0SXMG1=N78
z)i-Zz@t`E+-R){VKe6$wSYmc&e~wHhgGhf`Rq6G5G@5n3pP$j`Tx_nctW^_%o!#x~
z)7j$2!oqVV^OLx)i!siSfVCk(5YX<lIX(TxkH-1t>dIPG-tTT#CMG67zI^eD>8S#q
z=ixXGB8G^MDyUk*Fy!j$il2Uq<CD)^T(n=ih^&{(^Gr__$mMdlZU$ove+WpFP*G5D
z9NV7*%H?^!d_7q=K&4bH;dx#{7LkP9&nbuq#u!{TgXejaiY0)G5u}jK=5QP*A^#1r
zh~qe9vpEDQ7=)-`X5dV2fq;m?7zYGQY)=L<-_DQLMlsDbXO!)4tc@Mq7dIT-OJOVy
zQdkhdO)45aqw%g!?y-o1e@V%I5E1TAM*uVG<@vLL@kB^j#MH<57-1|C(q5#Lco0`P
z1)s4*NC|iFqjL8T%Y!K5f8sz<K<~g*6ipno!Z3{5*?)_uDyk5MA&9h$K+X4CsM^u@
zSBvkr5U3fDtwyuKWw(p9_Es1DuHACk?b2vA0NDay|6s3rbbP3OV%ygs2-I4u)>@4b
zzXw5}e%sfh<3rs)*sH=oce#J?shWS1-<X>#F;keqbu&Zleh~C%wwl!IXLNpbHkTHc
mhXo>$3M2gTEG;hA;=$iZqTo(^6As(}0000<MNUMnLSTYRMmAUg

delta 607
zcmV-l0-*iy1;Yg)iBL{Q4GJ0x0000DNk~Le0000F0000p2nGNE07!09oRJ}Me;i3f
zK~zYI?Uub#6Hye$f9LL9Li_+$1c9N@aRv*EG>(N$d;$%XmiPud3U45tR2bd>X0XVl
zN@0P6Xo*0+P)IUl@3Gim5+)2`w_u#%bh~r@AN#-O?i^87;+FJ2tmi*10n0#UKyL|H
zS$z9`wGX_$u{HtZC&q*9^wbPve`DhqV-N&Ian5mkT<73$pIW`T1>_drysOy`Nq%~2
zCi~>^Q$|KoSkEFx{(;pg>GU0f-~m5=e$O5p?&pEm@_A!zDF`M%K3jNBdNhsi`xwtd
zL=Zp$RmFuNXJ=<LnhkcoeWhA0f3S!w&&|%09!--<jbg2hfYOaaRZ-7ke~bsf-0VEn
zT4mV^WP)H4-}fV6$8KM$A|PO`#W|lKm_#6B5y5)4$7(;Yn`}g2JP+$x5WxsUY8R{y
zB<S=+?!eGdyG(JAgUE$oh6N2GF)^{x_urVZ6}m}Zl{WMwj$noXTt;$(fhDvZ)A#vo
z$HKy`?Q5bF4@qp{o3(v=e<iPh{$FR?3dH<xC$^oSk}AhPtc3R&iB_c{chGKcq+B{}
zoD4;9-gDYGL4=Y4S*cXYI2WSoE+vS74(CEDl`<eJ02GSbo4b2E+G;g54BP6Q)82B<
zX&AP()oSYQ-i{WE+ncINXK|HWxqOswx7*pNhmW{-_kL%RKs8eRHFNTt!=qo+>$NSA
t99%f3Lh;KISM1v_U%Xm9e<4XW{lCV-*qUa`7@q(D002ovPDHLkV1jl`7Y+ab

diff --git a/media/ios/Resources/segmented/segment_inactive.png b/media/ios/Resources/segmented/segment_inactive.png
index 97bebdc7fa6cf9d6ebbdfca297a7736f4556dbf9..d41a2ea9bdf82464c293f3d2732c566c72364b7c 100644
GIT binary patch
delta 508
zcmV<Y0R#T91mOfBiBL{Q4GJ0x0000DNk~Le0000F0000q2nGNE099*ZB#|L;f4WIT
zK~zYI<(EHh6G0fof8Xpzn>ex8k+M;`D2M_i4zb1{LKUUUF?<8BZ{S;yDuN1%C~Qjs
zCqU35rD4~r$Rjdi3hc0?i0zqT3tl<<y?x)GnWq_{hKsjvQeXh2KwSG&068!|Jvqx4
zi&7(I?RICFBnQNCmmmo4n8p~2f8r<C*FTs{%F*e`Sq2dNA)aSRaxgqRJYsu$2c=X!
zA(T>VZMEojcQMAMpTB&Pr%#^ca`EmwZMQogA00g=3^!PY+uL7!`~H>5r0gkRknHWR
zL<9)K4U)ZmfPn(iPN%yPae;Y!ssxGa%~=IO5Fkh#0?cN!wa5#ozr$J+e*$WG)C0=m
zC@lyL*6fqEU&DOT4nZ6nCMXYK@0uO8MF<7AO)^j0y=vbb=FIh+^Z$4-#Ia$`rroG}
zx*y5roW#=r-Ane}Bu&{+lkVvOZ!;*2G4cKT=0mX7B1oZtT<hstqVxD%0pqHwu-2@o
zYN)CTV60yDU*}p+M`c+oQvHFohO#WsdOCXX{5ZdB*X7mwEQ+FGtF=QEZT@rTw$`Hc
yl$)Cht@WtiJI>(VkT0)3q%3(R^n0)J#o})iB$oS9Itvy60000<MNUMnLSTaC66>r0

delta 459
zcmV;+0W|*M1h51liBL{Q4GJ0x0000DNk~Le0000E0000p2nGNE0H>@uqLCqSe~C#%
zK~zYI#g@-X0#Ovkf9EpNVl)MvNF<7A?;|MU!d=#?cJ>B7if>T6T8XU+`a?c~FA%ke
z0u}#_i*Yk8nkXe?JOlZ`EC$ZUIp6v2Irob1`)DA)f10h!8c+xF3vnHwaa=vU_)a7N
zAqBKD8K>Yl+t_w|jy0XSbh{t)e|p_EP(3<48CpT&RyLa}<Z?TImSx*<Z2N#%Y@_i0
z{?-DD(!9Q^rPI#&-tK-VZ7;9S^!wd21Js?&Rwxoc5L-6_`9)33VB2v7@@Ap2At6`@
ztn8(LQKSRFh@w<M^ckaQ)OFS9Xke5Hu|QVW7_C$#45G*>f+ei(V^FHne@Cqy>aIrc
zQP<QpG{+K!#z-3=ijTTwWr1Sn5Met0e~{O5R&~(dkD|CcB94_3dLN@`?967f(4?<e
z=@_6folZg%gV=@u+&$bpB@&y3WHPmsG#U+=OvdeUsZumS%~jVOw+Dkhp6B8F{@mwz
z9)m$2*B!S-sKSDY_m8(VA(p&X%caWCdsX{F{se<kk8bEEkDmYl002ovPDHLkV1f<R
B(=h-5

diff --git a/media/ios/Resources/segmented/segment_left_selected.png b/media/ios/Resources/segmented/segment_left_selected.png
index e35e5a74377699c0160ae8e6c9ff44a6b2ac7497..5c021267e56ed868655b97ac8f9fd1c4435bd6ab 100644
GIT binary patch
delta 311
zcmV-70m%NN1F-{;7YZ~81^@s6QJ%6Hks)w@0SZY(K~zYI<(AD#!%z@~zexrfQAw#!
zpx}G>w(dk<Luj$|5sF>fm4%uKaiK-8&0KKELfe6C=5l7vnV*|0clWm)zC8dpK>gh*
z&#PquYTK5kX_zmjTwPvM*JH}EOd{#o={YIL*uHH6m`pBu(`!|oBn~tCpa67TKXX-o
z)jg+~f=Dj_pm0wz=7I!2(>}K^l&dL}$=Bp#{;{SEJ^67cBA=g&ImklznKFfNH3{;2
zO)+{dB&#XZr+}tVpF*=2tX`lH5*gUR=?&amB1;(hYYaW*nLb69Fqg@{EdO*Nf}88x
zacLU*3e(+FZD(c;)*2veHm{6E6-ALE#@5->qZ@I(e(8OVz5~K`Pt@Vj9b5na002ov
JPDHLkV1givjlBQ>

delta 297
zcmV+^0oMMp1ET|w7YZ{71^@s6Oq+tCks)w@0Q^ZrK~zYI<(5rq!$1s$Kb65GIK4*;
zfm}Pg&_i@lN*AF=DD4HjnpnnNm_Yp_L4+9s6?miJ>FJp#A?f>`TO*xbjvnd^9HvS6
z{`ne#x~`*bTh5;!JU{KJ>)o7bS3fcaDfyBC76AZhv)PUksyeg)Sb9@RX_iz?AhHO5
z0C=z-Y={H$nC89xVX`!Zm>f+3koPAXO%l=MFv&!)hzwsu)3n%#$!qUsO{=$e2i{w~
zz0eTank3}CQuE{xdEN_XD(OA*W#t|5-@NDSJv&z3dlcId<>o2oJ-b{%P1jrK8mcYY
vDInyWsj6yT@a_H8y!V=>S-$rom*p=MT)bAb|0S>c00000NkvXXu0mjfRwj#+

diff --git a/media/ios/Resources/segmented/segment_right_selected.png b/media/ios/Resources/segmented/segment_right_selected.png
index 9ddc7ef644f09d02842dff919f74707702323c40..b9bfb64423265af4ec536a51e070018c00678fd9 100644
GIT binary patch
delta 260
zcmV+f0sH>^0)PXM7YZ~81^@s6QJ%6Hks)z^*-1n}R7i>4RLu&)Fbw`;vK0$^6!G9g
zdlMhSgPsMwh>X32m3b5AnxM6mVPL21>-Up3wArqEd|7mDFHz9`u)}h(LRD2@=0Q)a
z6TSCvwFC3;H|hJhIs)Ko2j}Jxc?0Rf3Csc!8G&Y&Jgrm^fmD#{$-tyB>7H^kO~R9J
zA<x1P(ewLR-o%5@nGAWxBP=FQg_xd_=9DBabL6?xO9)~b@-h$Cs3fLxx7?Uhiad)+
zYrHPXkC$b+Aj&P4zx0%Qg&B{K5bgmX+{U1;Yom~+X>d9pqrC_5vpQO}88Hn20000<
KMNUMnLSTXmCwfi*

delta 256
zcmV+b0ssDh1N;Jz7YZ{71^@s6Oq+tCks)z^)k#D_R7i>CltBu@Fc3xmIMW6TJ&L&S
z((c4txX`tr8<EmW7^zE1+Zk*KAz&c8y!`)@nW14Auyo1cxL-`svwO@!=gSG(%??#n
zftf=k>&B*O;A#iv@R(?s2!N{{oLfU=1nI^J%mNXaKr59oY^xAR$IMJgm5fXgkmb*7
z$dp=1X9z^!{gcx8V4$S-lVLCIlUw!*sJ-O&qMA_8l+j+)=c<fVd-?1YJtO|D_KdlQ
zTyxJ@iT^2IKc!YGB$I!8c>kJ0ec#O@ZQJ5@zs_G5QxPA7c0g7=H2Y=%0000<MNUMn
GLSTZA4tpd3

diff --git a/media/ios/Resources/segmented/segment_unselected.png b/media/ios/Resources/segmented/segment_unselected.png
index 8e358ddd6899e0e8af20f0a66c8177eb37013131..b1f5d30733d1779324e65fc15733b3f21ed81cc4 100644
GIT binary patch
delta 210
zcmV;@04@K+0?q=E7YZ~81^@s6QJ%6Hks)z^r%6OXR7i>4R67nrF$}ZOyAf~T#%zdV
zF!1hxP}K|Y_A;=>ks3u2kTFqfJ0J6MJr7tx0z;IZ?O|5#+YRgSWIj5WSpXze3Cj=^
z06^6wk{2O*AtXl==QTO(JbD359@0N*%3jznZ$v=T$0DYWFqvNN5t5-fCDY4As&m*q
zU?ZyBC^XzUWATu(7glrl-A2^8k^U}M6Hs@AI_eyD>AlGx_t$Rb-|Dbgy<FuL9{>OV
M07*qoM6N<$f-3S^?EnA(

delta 199
zcmV;&067270>c837YZ{71^@s6Oq+tCks)z^oJmAMR7i>KmOBc7Knz4P;*GTM$adl_
zEc6Z{;svx{3oUm7hOqcc8#0;4?ktNCf?Tb<Y3ukDAVLH&&11CF51o`n6&=c$1pwTh
z#>9GblU62srcIOyz|VA!(T>8z<xHD=ncVI9=IKa#nsZ9UBw}E4w|9d)8SOcT@TqSy
zgz@gZ?~M>il_#w}#iW%fPx-RURB>CkxS-`{xdR0XU%8Dl9xDI<002ovPDHLkV1fr<
BS`h#M