lint
/
PhotoCtrl
mirror of https://github.com/lint/PhotoCtrl
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 0 Wiki Activity
Browse Source

Fix new album crash

master
lint 5 years ago
parent
4cbf301cff
commit
4298d22e15
2 changed files with 99 additions and 91 deletions
Unified View Show Diff Stats
  1. +98
    -90
      Tweak.xm
  2. +1
    -1
      control

+ 98
- 90
Tweak.xm View File

@property(assign,nonatomic) id delegate; @property(assign,nonatomic) id delegate;
@property(assign,nonatomic) NSArray* visibleCells; @property(assign,nonatomic) NSArray* visibleCells;
@property(assign,nonatomic) NSArray* indexPathsForVisibleItems; @property(assign,nonatomic) NSArray* indexPathsForVisibleItems;
@property(assign,nonatomic) id reorderDelegate;
@property(assign,nonatomic) id selectionDelegate;
-(id) idexPathForItemAtPoint:(id) arg1; -(id) idexPathForItemAtPoint:(id) arg1;
-(id) cellForItemAtIndexPath:(id) arg1; -(id) cellForItemAtIndexPath:(id) arg1;
-(id) indexPathForCell:(id) arg1; -(id) indexPathForCell:(id) arg1;
%new %new
-(void)ctrlScreenTapRecognized:(id) sender { -(void)ctrlScreenTapRecognized:(id) sender {
if ([self selectionDelegate] && ![self reorderDelegate]) {
id gvController = [self delegate];
id gvController = [self delegate];
if ([gvController ctrlEnabled]){
if ([gvController ctrlEnabled]){
CGPoint tapPoint = [sender locationInView:self];
NSIndexPath *nextIndexPath = [self indexPathForItemAtPoint:tapPoint];
if (![gvController ctrlFirstIndexPath]){
CGPoint tapPoint = [sender locationInView:self];
NSIndexPath *nextIndexPath = [self indexPathForItemAtPoint:tapPoint];
if (![gvController ctrlFirstIndexPath]){
[gvController setCtrlFirstIndexPath:nextIndexPath];
PUPhotosGridCell* firstSelectedCell = [self cellForItemAtIndexPath:nextIndexPath];
firstSelectedCell.ctrlSelectOverlayView = [[UIImageView alloc] init];
firstSelectedCell.ctrlSelectOverlayView.frame = CGRectMake(0,0,31,31);
firstSelectedCell.ctrlSelectOverlayView.image = [UIImage imageWithContentsOfFile:@"/var/mobile/Library/Application Support/PhotoCtrl/check.png"];
[firstSelectedCell addSubview:firstSelectedCell.ctrlSelectOverlayView];
} else {
//PUPhotosGridCell* firstSelectedCell = [self cellForItemAtIndexPath:[gvController ctrlFirstIndexPath]];
//[firstSelectedCell.ctrlSelectOverlayView removeFromSuperview];
//firstSelectedCell.ctrlSelectOverlayView = nil;
NSRange indexRange;
NSInteger firstRow = [gvController ctrlFirstIndexPath].row;
NSInteger firstSection = [gvController ctrlFirstIndexPath].section;
NSInteger nextRow = nextIndexPath.row;
NSInteger nextSection = nextIndexPath.section;

NSInteger lowRow = 0;
NSInteger highRow = 0;
NSInteger lowSection = 0;
NSInteger highSection = 0;
NSInteger sectionItemCount = 0;
if (firstRow == nextRow && nextSection == firstSection){
[gvController setCtrlFirstIndexPath:nextIndexPath];
PUPhotosGridCell* firstSelectedCell = [self cellForItemAtIndexPath:nextIndexPath];
[gvController setCtrlFirstIndexPath:nil];
firstSelectedCell.ctrlSelectOverlayView = [[UIImageView alloc] init];
firstSelectedCell.ctrlSelectOverlayView.frame = CGRectMake(0,0,31,31);
firstSelectedCell.ctrlSelectOverlayView.image = [UIImage imageWithContentsOfFile:@"/var/mobile/Library/Application Support/PhotoCtrl/check.png"];
[firstSelectedCell addSubview:firstSelectedCell.ctrlSelectOverlayView];
} else { } else {
//PUPhotosGridCell* firstSelectedCell = [self cellForItemAtIndexPath:[gvController ctrlFirstIndexPath]];
//[firstSelectedCell.ctrlSelectOverlayView removeFromSuperview];
//firstSelectedCell.ctrlSelectOverlayView = nil;
NSRange indexRange;
NSInteger firstRow = [gvController ctrlFirstIndexPath].row;
NSInteger firstSection = [gvController ctrlFirstIndexPath].section;
NSInteger nextRow = nextIndexPath.row;
NSInteger nextSection = nextIndexPath.section;

NSInteger lowRow = 0;
NSInteger highRow = 0;
NSInteger lowSection = 0;
NSInteger highSection = 0;
NSInteger sectionItemCount = 0;
if (firstRow == nextRow && nextSection == firstSection){
[gvController setCtrlFirstIndexPath:nil];
} else {
if (nextSection == firstSection){
if (nextSection == firstSection){
if (firstRow < nextRow){
indexRange = NSMakeRange(firstRow, nextRow - firstRow + 1);
} else {
indexRange = NSMakeRange(nextRow, firstRow - nextRow + 1);
}
if (firstRow < nextRow){
indexRange = NSMakeRange(firstRow, nextRow - firstRow + 1);
} else {
indexRange = NSMakeRange(nextRow, firstRow - nextRow + 1);
}
[gvController setSelected:YES itemsAtIndexes:[%c(NSIndexSet) indexSetWithIndexesInRange:indexRange] inSection:(long long)firstSection animated:NO];
[gvController setSelected:YES itemsAtIndexes:[%c(NSIndexSet) indexSetWithIndexesInRange:indexRange] inSection:(long long)firstSection animated:NO];
} else {
} else {
if (nextSection > firstSection){
if (nextSection > firstSection){
lowRow = firstRow;
lowSection = firstSection;
highRow = nextRow;
highSection = nextSection;
lowRow = firstRow;
lowSection = firstSection;
highRow = nextRow;
highSection = nextSection;
} else if (nextSection < firstSection){
} else if (nextSection < firstSection){
lowRow = nextRow;
lowSection = nextSection;
highRow = firstRow;
highSection = firstSection;
lowRow = nextRow;
lowSection = nextSection;
highRow = firstRow;
highSection = firstSection;
}
}
for (NSInteger i = lowSection; i <= highSection; i++){
sectionItemCount = [gvController collectionView:self numberOfItemsInSection:i];
for (NSInteger i = lowSection; i <= highSection; i++){
sectionItemCount = [gvController collectionView:self numberOfItemsInSection:i];
if (i == lowSection){
indexRange = NSMakeRange(lowRow, sectionItemCount - lowRow);
} else if (i == highSection){
indexRange = NSMakeRange(0, highRow+1);
} else {
indexRange = NSMakeRange(0, sectionItemCount);
}
if (i == lowSection){
indexRange = NSMakeRange(lowRow, sectionItemCount - lowRow);
} else if (i == highSection){
indexRange = NSMakeRange(0, highRow+1);
} else {
indexRange = NSMakeRange(0, sectionItemCount);
}
[gvController setSelected:YES itemsAtIndexes:[%c(NSIndexSet) indexSetWithIndexesInRange:indexRange] inSection:(long long)i animated:NO];
[gvController setSelected:YES itemsAtIndexes:[%c(NSIndexSet) indexSetWithIndexesInRange:indexRange] inSection:(long long)i animated:NO];
}
} }
}
[gvController handleToggleSelectionOfItemAtIndexPath:nextIndexPath];
[gvController setCtrlEnabled:NO];
[gvController handleToggleSelectionOfItemAtIndexPath:nextIndexPath];
[gvController setCtrlEnabled:NO];
}
} }
} }
[gvController updateCtrlButton];
} }
[gvController updateCtrlButton];
} }


-(id) dequeueReusableCellWithReuseIdentifier: (id) arg1 forIndexPath:(id) arg2{ -(id) dequeueReusableCellWithReuseIdentifier: (id) arg1 forIndexPath:(id) arg2{
id orig = %orig;
id orig = %orig;
id gvController = [self delegate];
if ([self selectionDelegate] && ![self reorderDelegate] && [orig isKindOfClass:[%c(PUPhotosGridCell) class]]) {
if ([orig ctrlSelectOverlayView]){
[orig ctrlSelectOverlayView].image = nil;
id gvController = [self delegate];
if ([gvController ctrlEnabled] && [gvController ctrlFirstIndexPath]){
if ([orig ctrlSelectOverlayView]){
NSIndexPath* firstIndexPath = [gvController ctrlFirstIndexPath];
NSIndexPath* thisIndexPath = arg2;
HBLogDebug(@"firstIndexPath: %ld-%ld thisIndexPath: %ld-%ld", (long)firstIndexPath.section, (long)firstIndexPath.row, (long)thisIndexPath.section, (long)thisIndexPath.row);
if ( firstIndexPath.section == thisIndexPath.section && firstIndexPath.row == thisIndexPath.row){
[orig ctrlSelectOverlayView].image = [UIImage imageWithContentsOfFile:@"/var/mobile/Library/Application Support/PhotoCtrl/check.png"];
[orig ctrlSelectOverlayView].image = nil;
if ([gvController ctrlEnabled] && [gvController ctrlFirstIndexPath]){
}
}
NSIndexPath* firstIndexPath = [gvController ctrlFirstIndexPath];
NSIndexPath* thisIndexPath = arg2;
HBLogDebug(@"firstIndexPath: %ld-%ld thisIndexPath: %ld-%ld", (long)firstIndexPath.section, (long)firstIndexPath.row, (long)thisIndexPath.section, (long)thisIndexPath.row);
if ( firstIndexPath.section == thisIndexPath.section && firstIndexPath.row == thisIndexPath.row){
[orig ctrlSelectOverlayView].image = [UIImage imageWithContentsOfFile:@"/var/mobile/Library/Application Support/PhotoCtrl/check.png"];
}
}
}
} }
return orig; return orig;

+ 1
- 1
control View File

Package: com.lint.photoctrl Package: com.lint.photoctrl
Name: PhotoCtrl Name: PhotoCtrl
Depends: mobilesubstrate Depends: mobilesubstrate
Version: 1.0.0
Version: 1.0.1
Architecture: iphoneos-arm Architecture: iphoneos-arm
Description: Adds a "ctrl + shift" like function for selecting photos. Description: Adds a "ctrl + shift" like function for selecting photos.
Maintainer: lint <apieceoflint@protonmail.com> Maintainer: lint <apieceoflint@protonmail.com>

Write Preview
Loading…
Cancel
Save