From b97fcfc657e70c3216aab492819039dce187eeed Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Sun, 6 Mar 2011 13:05:16 -0800 Subject: Separate out CyteKit/CyteTableView.*. --- CyteKit/TableViewCell.h | 66 ++++++++++++++++++++++++++++++++++++++++ CyteKit/TableViewCell.mm | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ MobileCydia.mm | 75 +++++---------------------------------------- 3 files changed, 152 insertions(+), 68 deletions(-) create mode 100644 CyteKit/TableViewCell.h create mode 100644 CyteKit/TableViewCell.mm diff --git a/CyteKit/TableViewCell.h b/CyteKit/TableViewCell.h new file mode 100644 index 0000000..27fd650 --- /dev/null +++ b/CyteKit/TableViewCell.h @@ -0,0 +1,66 @@ +/* Cydia - iPhone UIKit Front-End for Debian APT + * Copyright (C) 2008-2011 Jay Freeman (saurik) +*/ + +/* Modified BSD License {{{ */ +/* + * Redistribution and use in source and binary + * forms, with or without modification, are permitted + * provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the + * above copyright notice, this list of conditions + * and the following disclaimer. + * 2. Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the + * distribution. + * 3. The name of the author may not be used to endorse + * or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ +/* }}} */ + +#ifndef CyteKit_TableViewCell_H +#define CyteKit_TableViewCell_H + +#include + +#include + +#include + +@protocol CyteTableViewCellDelegate +- (void) drawContentRect:(CGRect)rect; +@end + +@interface CyteTableViewCellContentView : UIView { + _transient id delegate_; +} + +@end + +@interface CYTableViewCell : UITableViewCell { + _H content_; + bool highlighted_; +} + +@end + +#endif//CyteKit_TableViewCell_H diff --git a/CyteKit/TableViewCell.mm b/CyteKit/TableViewCell.mm new file mode 100644 index 0000000..e8f0c52 --- /dev/null +++ b/CyteKit/TableViewCell.mm @@ -0,0 +1,79 @@ +/* Cydia - iPhone UIKit Front-End for Debian APT + * Copyright (C) 2008-2011 Jay Freeman (saurik) +*/ + +/* Modified BSD License {{{ */ +/* + * Redistribution and use in source and binary + * forms, with or without modification, are permitted + * provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the + * above copyright notice, this list of conditions + * and the following disclaimer. + * 2. Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the + * distribution. + * 3. The name of the author may not be used to endorse + * or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ +/* }}} */ + +#include "CyteKit/TableViewCell.h" + +#include "iPhonePrivate.h" + +@implementation CyteTableViewCellContentView + +- (id) initWithFrame:(CGRect)frame { + if ((self = [super initWithFrame:frame]) != nil) { + [self setNeedsDisplayOnBoundsChange:YES]; + } return self; +} + +- (void) setDelegate:(id)delegate { + delegate_ = delegate; +} + +- (void) drawRect:(CGRect)rect { + [super drawRect:rect]; + [delegate_ drawContentRect:rect]; +} + +@end + +@implementation CYTableViewCell + +- (void) _updateHighlightColorsForView:(UIView *)view highlighted:(BOOL)highlighted { + if (view == (UIView *) content_) + highlighted_ = highlighted; + + [super _updateHighlightColorsForView:view highlighted:highlighted]; +} + +- (void) setSelected:(BOOL)selected animated:(BOOL)animated { + highlighted_ = selected; + + [super setSelected:selected animated:animated]; + [content_ setNeedsDisplay]; +} + +@end diff --git a/MobileCydia.mm b/MobileCydia.mm index 43fc9e3..fcccdd5 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -123,6 +123,7 @@ extern "C" { #include "Menes/Menes.h" #include "CyteKit/PerlCompatibleRegEx.hpp" +#include "CyteKit/TableViewCell.h" #include "CyteKit/WebScriptObject-Cyte.h" #include "CyteKit/WebViewController.h" #include "CyteKit/stringWithUTF8Bytes.h" @@ -5235,71 +5236,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { @end /* }}} */ -/* Cell Content View {{{ */ -@protocol ContentDelegate -- (void) drawContentRect:(CGRect)rect; -@end - -@interface ContentView : UIView { - _transient id delegate_; -} - -@end - -@implementation ContentView - -- (id) initWithFrame:(CGRect)frame { - if ((self = [super initWithFrame:frame]) != nil) { - [self setNeedsDisplayOnBoundsChange:YES]; - } return self; -} - -- (void) setDelegate:(id)delegate { - delegate_ = delegate; -} - -- (void) drawRect:(CGRect)rect { - [super drawRect:rect]; - [delegate_ drawContentRect:rect]; -} - -@end -/* }}} */ -/* Cydia TableView Cell {{{ */ -@interface CYTableViewCell : UITableViewCell { - _H content_; - bool highlighted_; -} - -@end - -@implementation CYTableViewCell - -- (void) _updateHighlightColorsForView:(UIView *)view highlighted:(BOOL)highlighted { - //NSLog(@"_updateHighlightColorsForView:%@ highlighted:%s [content_=%@]", view, highlighted ? "YES" : "NO", content_); - - if (view == (UIView *) content_) { - //NSLog(@"_updateHighlightColorsForView:content_ highlighted:%s", highlighted ? "YES" : "NO", content_); - highlighted_ = highlighted; - } - - [super _updateHighlightColorsForView:view highlighted:highlighted]; -} - -- (void) setSelected:(BOOL)selected animated:(BOOL)animated { - //NSLog(@"setSelected:%s animated:%s", selected ? "YES" : "NO", animated ? "YES" : "NO"); - highlighted_ = selected; - - [super setSelected:selected animated:animated]; - [content_ setNeedsDisplay]; -} - -@end -/* }}} */ - /* Package Cell {{{ */ @interface PackageCell : CYTableViewCell < - ContentDelegate + CyteTableViewCellDelegate > { _H icon_; _H name_; @@ -5327,7 +5266,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { UIView *content([self contentView]); CGRect bounds([content bounds]); - content_ = [[[ContentView alloc] initWithFrame:bounds] autorelease]; + content_ = [[[CyteTableViewCellContentView alloc] initWithFrame:bounds] autorelease]; [content_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; [content addSubview:content_]; @@ -5521,7 +5460,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { /* }}} */ /* Section Cell {{{ */ @interface SectionCell : CYTableViewCell < - ContentDelegate + CyteTableViewCellDelegate > { _H basic_; _H section_; @@ -5547,7 +5486,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { UIView *content([self contentView]); CGRect bounds([content bounds]); - content_ = [[[ContentView alloc] initWithFrame:bounds] autorelease]; + content_ = [[[CyteTableViewCellContentView alloc] initWithFrame:bounds] autorelease]; [content_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; [content addSubview:content_]; [content_ setBackgroundColor:[UIColor whiteColor]]; @@ -7850,7 +7789,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { /* Source Cell {{{ */ @interface SourceCell : CYTableViewCell < - ContentDelegate + CyteTableViewCellDelegate > { _H icon_; _H origin_; @@ -7881,7 +7820,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { UIView *content([self contentView]); CGRect bounds([content bounds]); - content_ = [[[ContentView alloc] initWithFrame:bounds] autorelease]; + content_ = [[[CyteTableViewCellContentView alloc] initWithFrame:bounds] autorelease]; [content_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; [content_ setBackgroundColor:[UIColor whiteColor]]; [content addSubview:content_]; -- cgit v1.2.3