mirror of
https://github.com/MacPass/MacPass.git
synced 2025-12-22 15:19:27 +00:00
Fixed sorting and selection of database icons (issue #118)
This commit is contained in:
@@ -29,7 +29,12 @@
|
||||
dispatch_once(&onceToken, ^{
|
||||
NSDictionary *imageNames = [MPIconHelper availableIconNames];
|
||||
NSMutableArray *mutableIcons = [[NSMutableArray alloc] initWithCapacity:[imageNames count]];
|
||||
for(NSNumber *iconNumber in [imageNames allKeys]) {
|
||||
|
||||
NSArray *sortedImageNames = [[imageNames allKeys] sortedArrayUsingComparator:^NSComparisonResult(id obj1, id obj2) {
|
||||
return [[imageNames objectForKey:obj1] compare:[imageNames objectForKey:obj2]];
|
||||
}];
|
||||
|
||||
for(NSNumber *iconNumber in sortedImageNames) {
|
||||
if([iconNumber integerValue] > MPCustomIconTypeBegin) {
|
||||
continue; // Skip all non-db Keys
|
||||
}
|
||||
@@ -41,6 +46,30 @@
|
||||
return icons;
|
||||
}
|
||||
|
||||
|
||||
+ (NSArray *)databaseIconType {
|
||||
static NSArray *iconTypes;
|
||||
static dispatch_once_t onceToken;
|
||||
dispatch_once(&onceToken, ^{
|
||||
NSDictionary *imageNames = [MPIconHelper availableIconNames];
|
||||
NSMutableArray *mutableIcons = [[NSMutableArray alloc] initWithCapacity:[imageNames count]];
|
||||
|
||||
NSArray *sortedImageNames = [[imageNames allKeys] sortedArrayUsingComparator:^NSComparisonResult(id obj1, id obj2) {
|
||||
return [[imageNames objectForKey:obj1] compare:[imageNames objectForKey:obj2]];
|
||||
}];
|
||||
|
||||
for(NSNumber *iconNumber in sortedImageNames) {
|
||||
if([iconNumber integerValue] > MPCustomIconTypeBegin) {
|
||||
continue; // Skip all non-db Keys
|
||||
}
|
||||
[mutableIcons addObject:iconNumber];
|
||||
}
|
||||
iconTypes = mutableIcons;
|
||||
});
|
||||
return iconTypes;
|
||||
}
|
||||
|
||||
|
||||
+ (NSDictionary *)availableIconNames {
|
||||
static NSDictionary *imageNames;
|
||||
static dispatch_once_t onceToken;
|
||||
|
||||
Reference in New Issue
Block a user