From 3a6f9c89e5edc675d5741eb5aa66e30e798fb3aa Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 7 Mar 2017 02:54:50 -0800 Subject: [PATCH] Split PackageListController partially for CyteKit. --- CyteKit/CyteKit.h | 1 + CyteKit/ListController.h | 40 ++++++++ CyteKit/ListController.mm | 193 ++++++++++++++++++++++++++++++++++++++ CyteKit/extern.h | 20 ++++ MobileCydia.mm | 180 +---------------------------------- 5 files changed, 258 insertions(+), 176 deletions(-) create mode 100644 CyteKit/ListController.h create mode 100644 CyteKit/ListController.mm diff --git a/CyteKit/CyteKit.h b/CyteKit/CyteKit.h index 7f1df37b..0d664394 100644 --- a/CyteKit/CyteKit.h +++ b/CyteKit/CyteKit.h @@ -24,6 +24,7 @@ #include "CyteKit/Application.h" #include "CyteKit/CyteObject.h" +#include "CyteKit/ListController.h" #include "CyteKit/NavigationController.h" #include "CyteKit/TableViewCell.h" #include "CyteKit/TabBarController.h" diff --git a/CyteKit/ListController.h b/CyteKit/ListController.h new file mode 100644 index 00000000..b9b8022c --- /dev/null +++ b/CyteKit/ListController.h @@ -0,0 +1,40 @@ +/* Cydia - iPhone UIKit Front-End for Debian APT + * Copyright (C) 2008-2015 Jay Freeman (saurik) +*/ + +/* GNU General Public License, Version 3 {{{ */ +/* + * Cydia is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. + * + * Cydia is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Cydia. If not, see . +**/ +/* }}} */ + +#ifndef CyteKit_ListController_H +#define CyteKit_ListController_H + +#include + +#include + +@interface CyteListController : CyteViewController + +- (bool) shouldYield; +- (void) loadView; +- (void) _reloadData; +- (void) resetCursor; +- (void) clearData; +- (CGFloat) rowHeight; + +@end + +#endif//CyteKit_ListController_H diff --git a/CyteKit/ListController.mm b/CyteKit/ListController.mm new file mode 100644 index 00000000..d3c162e9 --- /dev/null +++ b/CyteKit/ListController.mm @@ -0,0 +1,193 @@ +/* Cydia - iPhone UIKit Front-End for Debian APT + * Copyright (C) 2008-2015 Jay Freeman (saurik) +*/ + +/* GNU General Public License, Version 3 {{{ */ +/* + * Cydia is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. + * + * Cydia is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Cydia. If not, see . +**/ +/* }}} */ + +#include "CyteKit/UCPlatform.h" + +#include +#include + +#include "CyteKit/ListController.h" +#include "CyteKit/extern.h" + +#include "iPhonePrivate.h" +#include + +static CGFloat CYStatusBarHeight() { + CGSize size([[UIApplication sharedApplication] statusBarFrame].size); + return UIInterfaceOrientationIsPortrait([[UIApplication sharedApplication] statusBarOrientation]) ? size.height : size.width; +} + +@implementation CyteListController { + _H list_; +} + +- (bool) shouldYield { + return false; +} + +- (void) deselectWithAnimation:(BOOL)animated { + [list_ deselectRowAtIndexPath:[list_ indexPathForSelectedRow] animated:animated]; +} + +- (void) resizeForKeyboardBounds:(CGRect)bounds duration:(NSTimeInterval)duration curve:(UIViewAnimationCurve)curve { + CGRect base = [[self view] bounds]; + base.size.height -= bounds.size.height; + base.origin = [list_ frame].origin; + + [UIView beginAnimations:nil context:NULL]; + [UIView setAnimationBeginsFromCurrentState:YES]; + [UIView setAnimationCurve:curve]; + [UIView setAnimationDuration:duration]; + [list_ setFrame:base]; + [UIView commitAnimations]; +} + +- (void) resizeForKeyboardBounds:(CGRect)bounds duration:(NSTimeInterval)duration { + [self resizeForKeyboardBounds:bounds duration:duration curve:UIViewAnimationCurveLinear]; +} + +- (void) resizeForKeyboardBounds:(CGRect)bounds { + [self resizeForKeyboardBounds:bounds duration:0]; +} + +- (void) getKeyboardCurve:(UIViewAnimationCurve *)curve duration:(NSTimeInterval *)duration forNotification:(NSNotification *)notification { + if (&UIKeyboardAnimationCurveUserInfoKey == NULL) + *curve = UIViewAnimationCurveEaseInOut; + else + [[[notification userInfo] objectForKey:UIKeyboardAnimationCurveUserInfoKey] getValue:curve]; + + if (&UIKeyboardAnimationDurationUserInfoKey == NULL) + *duration = 0.3; + else + [[[notification userInfo] objectForKey:UIKeyboardAnimationDurationUserInfoKey] getValue:duration]; +} + +- (void) keyboardWillShow:(NSNotification *)notification { + CGRect bounds; + CGPoint center; + [[[notification userInfo] objectForKey:UIKeyboardBoundsUserInfoKey] getValue:&bounds]; + [[[notification userInfo] objectForKey:UIKeyboardCenterEndUserInfoKey] getValue:¢er]; + + NSTimeInterval duration; + UIViewAnimationCurve curve; + [self getKeyboardCurve:&curve duration:&duration forNotification:notification]; + + CGRect kbframe = CGRectMake(Retina(center.x - bounds.size.width / 2), Retina(center.y - bounds.size.height / 2), bounds.size.width, bounds.size.height); + UIViewController *base([self rootViewController]); + CGRect viewframe = [[base view] convertRect:[list_ frame] fromView:[list_ superview]]; + CGRect intersection = CGRectIntersection(viewframe, kbframe); + + if (kCFCoreFoundationVersionNumber < kCFCoreFoundationVersionNumber_iPhoneOS_3_0) // XXX: _UIApplicationLinkedOnOrAfter(4) + intersection.size.height += CYStatusBarHeight(); + + [self resizeForKeyboardBounds:intersection duration:duration curve:curve]; +} + +- (void) keyboardWillHide:(NSNotification *)notification { + NSTimeInterval duration; + UIViewAnimationCurve curve; + [self getKeyboardCurve:&curve duration:&duration forNotification:notification]; + + [self resizeForKeyboardBounds:CGRectZero duration:duration curve:curve]; +} + +- (void) viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; + + [self resizeForKeyboardBounds:CGRectZero]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil]; +} + +- (void) viewWillDisappear:(BOOL)animated { + [super viewWillDisappear:animated]; + + [self resizeForKeyboardBounds:CGRectZero]; + [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillShowNotification object:nil]; + [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillHideNotification object:nil]; +} + +- (void) viewDidAppear:(BOOL)animated { + [super viewDidAppear:animated]; + [self deselectWithAnimation:animated]; +} + +- (void) releaseSubviews { + list_ = nil; + [super releaseSubviews]; +} + +- (CGFloat) rowHeight { + return 0; +} + +- (void) updateHeight { + [list_ setRowHeight:[self rowHeight]]; +} + +- (void) loadView { + UIView *view([[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]); + [view setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + [self setView:view]; + + list_ = [[[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStylePlain] autorelease]; + [list_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + [view addSubview:list_]; + + // XXX: is 20 the most optimal number here? + [list_ setSectionIndexMinimumDisplayRowCount:20]; + + [list_ setDataSource:(id)self]; + [list_ setDelegate:(id)self]; + + [self updateHeight]; +} + +- (void) _reloadData { + [self updateHeight]; + + [list_ setDataSource:(id)self]; + [list_ reloadData]; +} + +- (void) reloadData { + [super reloadData]; + + if ([self shouldYield]) + [self performSelector:@selector(_reloadData) withObject:nil afterDelay:0]; + else + [self _reloadData]; +} + +- (void) resetCursor { + [list_ scrollRectToVisible:CGRectMake(0, 0, 1, 1) animated:NO]; +} + +- (void) clearData { + [self updateHeight]; + + [list_ setDataSource:nil]; + [list_ reloadData]; + + [self resetCursor]; +} + +@end diff --git a/CyteKit/extern.h b/CyteKit/extern.h index 670f560c..562fb263 100644 --- a/CyteKit/extern.h +++ b/CyteKit/extern.h @@ -35,4 +35,24 @@ bool CyteIsReachable(const char *name); void CyteInitialize(NSString *app, NSString *version); +static inline double Retina(double value) { + value *= ScreenScale_; + value = round(value); + value /= ScreenScale_; + return value; +} + +static inline CGRect Retina(CGRect value) { + value.origin.x *= ScreenScale_; + value.origin.y *= ScreenScale_; + value.size.width *= ScreenScale_; + value.size.height *= ScreenScale_; + value = CGRectIntegral(value); + value.origin.x /= ScreenScale_; + value.origin.y /= ScreenScale_; + value.size.width /= ScreenScale_; + value.size.height /= ScreenScale_; + return value; +} + #endif//CyteKit_extern_H diff --git a/MobileCydia.mm b/MobileCydia.mm index e6881038..3e81b070 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -272,11 +272,6 @@ static _finline void UpdateExternalStatus(uint64_t newStatus) { notify_post("com.saurik.Cydia.status"); } -static CGFloat CYStatusBarHeight() { - CGSize size([[UIApplication sharedApplication] statusBarFrame].size); - return UIInterfaceOrientationIsPortrait([[UIApplication sharedApplication] statusBarOrientation]) ? size.height : size.width; -} - /* NSForcedOrderingSearch doesn't work on the iPhone */ static const NSStringCompareOptions MatchCompareOptions_ = NSLiteralSearch | NSCaseInsensitiveSearch; static const NSStringCompareOptions LaxCompareOptions_ = NSNumericSearch | NSDiacriticInsensitiveSearch | NSWidthInsensitiveSearch | NSCaseInsensitiveSearch; @@ -707,30 +702,6 @@ static NSString *kCydiaProgressEventTypeWarning = @"Warning"; /* }}} */ /* Display Helpers {{{ */ -inline float Interpolate(float begin, float end, float fraction) { - return (end - begin) * fraction + begin; -} - -static inline double Retina(double value) { - value *= ScreenScale_; - value = round(value); - value /= ScreenScale_; - return value; -} - -static inline CGRect Retina(CGRect value) { - value.origin.x *= ScreenScale_; - value.origin.y *= ScreenScale_; - value.size.width *= ScreenScale_; - value.size.height *= ScreenScale_; - value = CGRectIntegral(value); - value.origin.x /= ScreenScale_; - value.origin.y /= ScreenScale_; - value.size.width /= ScreenScale_; - value.size.height /= ScreenScale_; - return value; -} - static _finline const char *StripVersion_(const char *version) { const char *colon(strchr(version, ':')); return colon == NULL ? version : colon + 1; @@ -5999,7 +5970,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { /* }}} */ /* Package List Controller {{{ */ -@interface PackageListController : CyteViewController < +@interface PackageListController : CyteListController < UITableViewDataSource, UITableViewDelegate > { @@ -6007,7 +5978,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { unsigned era_; _H packages_; _H sections_; - _H list_; _H thumbs_; std::vector offset_; @@ -6017,8 +5987,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (id) initWithDatabase:(Database *)database title:(NSString *)title; -- (void) resetCursor; -- (void) clearData; - (NSArray *) sectionsForPackages:(NSMutableArray *)packages; @@ -6038,93 +6006,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { return true; } -- (void) deselectWithAnimation:(BOOL)animated { - [list_ deselectRowAtIndexPath:[list_ indexPathForSelectedRow] animated:animated]; -} - -- (void) resizeForKeyboardBounds:(CGRect)bounds duration:(NSTimeInterval)duration curve:(UIViewAnimationCurve)curve { - CGRect base = [[self view] bounds]; - base.size.height -= bounds.size.height; - base.origin = [list_ frame].origin; - - [UIView beginAnimations:nil context:NULL]; - [UIView setAnimationBeginsFromCurrentState:YES]; - [UIView setAnimationCurve:curve]; - [UIView setAnimationDuration:duration]; - [list_ setFrame:base]; - [UIView commitAnimations]; -} - -- (void) resizeForKeyboardBounds:(CGRect)bounds duration:(NSTimeInterval)duration { - [self resizeForKeyboardBounds:bounds duration:duration curve:UIViewAnimationCurveLinear]; -} - -- (void) resizeForKeyboardBounds:(CGRect)bounds { - [self resizeForKeyboardBounds:bounds duration:0]; -} - -- (void) getKeyboardCurve:(UIViewAnimationCurve *)curve duration:(NSTimeInterval *)duration forNotification:(NSNotification *)notification { - if (&UIKeyboardAnimationCurveUserInfoKey == NULL) - *curve = UIViewAnimationCurveEaseInOut; - else - [[[notification userInfo] objectForKey:UIKeyboardAnimationCurveUserInfoKey] getValue:curve]; - - if (&UIKeyboardAnimationDurationUserInfoKey == NULL) - *duration = 0.3; - else - [[[notification userInfo] objectForKey:UIKeyboardAnimationDurationUserInfoKey] getValue:duration]; -} - -- (void) keyboardWillShow:(NSNotification *)notification { - CGRect bounds; - CGPoint center; - [[[notification userInfo] objectForKey:UIKeyboardBoundsUserInfoKey] getValue:&bounds]; - [[[notification userInfo] objectForKey:UIKeyboardCenterEndUserInfoKey] getValue:¢er]; - - NSTimeInterval duration; - UIViewAnimationCurve curve; - [self getKeyboardCurve:&curve duration:&duration forNotification:notification]; - - CGRect kbframe = CGRectMake(Retina(center.x - bounds.size.width / 2), Retina(center.y - bounds.size.height / 2), bounds.size.width, bounds.size.height); - UIViewController *base([self rootViewController]); - CGRect viewframe = [[base view] convertRect:[list_ frame] fromView:[list_ superview]]; - CGRect intersection = CGRectIntersection(viewframe, kbframe); - - if (kCFCoreFoundationVersionNumber < kCFCoreFoundationVersionNumber_iPhoneOS_3_0) // XXX: _UIApplicationLinkedOnOrAfter(4) - intersection.size.height += CYStatusBarHeight(); - - [self resizeForKeyboardBounds:intersection duration:duration curve:curve]; -} - -- (void) keyboardWillHide:(NSNotification *)notification { - NSTimeInterval duration; - UIViewAnimationCurve curve; - [self getKeyboardCurve:&curve duration:&duration forNotification:notification]; - - [self resizeForKeyboardBounds:CGRectZero duration:duration curve:curve]; -} - -- (void) viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - - [self resizeForKeyboardBounds:CGRectZero]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil]; -} - -- (void) viewWillDisappear:(BOOL)animated { - [super viewWillDisappear:animated]; - - [self resizeForKeyboardBounds:CGRectZero]; - [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillShowNotification object:nil]; - [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillHideNotification object:nil]; -} - -- (void) viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; - [self deselectWithAnimation:animated]; -} - - (void) didSelectPackage:(Package *)package { CYPackageController *view([[[CYPackageController alloc] initWithDatabase:database_ forPackage:[package id] withReferrer:[[self referrerURL] absoluteString]] autorelease]); [view setDelegate:self.delegate]; @@ -6183,8 +6064,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { return offset_[index]; } -- (void) updateHeight { - [list_ setRowHeight:([self isSummarized] ? 38 : 73)]; +- (CGFloat) rowHeight { + return [self isSummarized] ? 38 : 73; } - (id) initWithDatabase:(Database *)database title:(NSString *)title { @@ -6195,27 +6076,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } return self; } -- (void) loadView { - UIView *view([[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]); - [view setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; - [self setView:view]; - - list_ = [[[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStylePlain] autorelease]; - [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth]; - [view addSubview:list_]; - - // XXX: is 20 the most optimal number here? - [list_ setSectionIndexMinimumDisplayRowCount:20]; - - [(UITableView *) list_ setDataSource:self]; - [list_ setDelegate:self]; - - [self updateHeight]; -} - - (void) releaseSubviews { - list_ = nil; - packages_ = nil; sections_ = nil; @@ -6225,10 +6086,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [super releaseSubviews]; } -- (bool) shouldYield { - return false; -} - - (bool) shouldBlock { return false; } @@ -6289,12 +6146,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { sections_ = [NSArray arrayWithObject:section]; } - [self updateHeight]; - - _profile(PackageTable$reloadData$List) - [(UITableView *) list_ setDataSource:self]; - [list_ reloadData]; - _end + [super _reloadData]; } PrintTimes(); @@ -6353,28 +6205,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { return sections; } -- (void) reloadData { - [super reloadData]; - - if ([self shouldYield]) - [self performSelector:@selector(_reloadData) withObject:nil afterDelay:0]; - else - [self _reloadData]; -} - -- (void) resetCursor { - [list_ scrollRectToVisible:CGRectMake(0, 0, 1, 1) animated:NO]; -} - -- (void) clearData { - [self updateHeight]; - - [list_ setDataSource:nil]; - [list_ reloadData]; - - [self resetCursor]; -} - @end /* }}} */ /* Filtered Package List Controller {{{ */ @@ -7164,8 +6994,6 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi if (upgrades_ != 0) [sections insertObject:upgradable atIndex:0]; - [list_ reloadData]; - [[self navigationItem] setRightBarButtonItem:(upgrades_ == 0 ? nil : [[[UIBarButtonItem alloc] initWithTitle:[NSString stringWithFormat:UCLocalize("PARENTHETICAL"), UCLocalize("UPGRADE"), [NSString stringWithFormat:@"%u", upgrades_]] style:UIBarButtonItemStylePlain -- 2.45.2