Egalware/eqn.ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Improve style and comments for EQNUtility class

Browse Source
This commit is contained in:
Andrea Busi
2020-10-15 08:11:49 +02:00
parent c538ca7dcb
commit a474d5782f
2 changed files with 44 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/Earthquake Network/Models/EQNUtility.h
+10 -4
View File
@@ -7,7 +7,6 @@
//
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
#import "Costanti.h"
@@ -28,11 +27,18 @@ NS_ASSUME_NONNULL_BEGIN
/// @param timeDifference Time differnce
+ (NSString *)formattedStringForTimeDifference:(NSInteger)timeDifference;
+(NSArray *)applicaFiltroWithTime:(EQNFiltriMappa )filtro withList:(NSArray *)list;
+(NSString *)clearStringMessaggi:(NSString *)messaggio;
+(NSInteger )getDifferenceMinute:(NSDate *)date;
/// Apply a map filter to a given set of annotations
/// @param filtro Filter to apply
/// @param list Annotations
+ (NSArray *)applicaFiltroWithTime:(EQNFiltriMappa)filtro withList:(NSArray *)list;
/// Clear a given string from unwanted characters
/// @param messaggio Cleaned string
+ (NSString *)clearStringMessaggi:(NSString *)messaggio;
/// Calculate time difference (in minutes) between the given date and the current timestamp
/// @param date Difference (in minutes)
+ (NSInteger)getDifferenceMinute:(NSDate *)date;
/// Store an array of custom objects to NSUserDefaults
/// @param array Array to store
Sources/Earthquake Network/Models/EQNUtility.m
+34 -46
View File
@@ -48,8 +48,37 @@
return [NSString stringWithFormat:format, (long)finalValue];
}
+(NSDate *)impostaFiltroWithTime:(EQNFiltriMappa )filtro{
+ (NSArray *)applicaFiltroWithTime:(EQNFiltriMappa )filtro withList:(NSArray *)list
{
NSDate *date = [self impostaFiltroWithTime:filtro];
NSMutableArray *temp = [NSMutableArray array];
for (id object in list) {
if ([object isKindOfClass:[EQNPastquakes class]]) {
EQNPastquakes *anPasq = (EQNPastquakes *)object;
if ([anPasq.date compare:date] == NSOrderedDescending) {
[temp addObject:anPasq];
NSLog(@"\n\naggiunto %@ filtro %@", anPasq.date, date);
} else {
NSLog(@"\n\nNon aggiunto %@ filtro %@", anPasq.date, date);
}
} else if ([object isKindOfClass:[EQNSegnalazione class]]){
EQNSegnalazione *anSegn = (EQNSegnalazione *)object;
if ([anSegn.date compare:date] == NSOrderedDescending) {
[temp addObject:anSegn];
NSLog(@"\n\naggiunto %@ filtro %@", anSegn.date, date);
} else {
NSLog(@"\n\nNon aggiunto %@ filtro %@", anSegn.date, date);
}
}
}
NSLog(@"filtrati %lu tutti %lu", (unsigned long)temp.count, (unsigned long)list.count);
return temp;
}
+ (NSDate *)impostaFiltroWithTime:(EQNFiltriMappa)filtro
{
unsigned unitFlags = NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay | NSCalendarUnitHour | NSCalendarUnitMinute;
NSDate *now = [NSDate date];
@@ -85,49 +114,10 @@
}
return [gregorian dateFromComponents:comps];
}
+(NSArray *)applicaFiltroWithTime:(EQNFiltriMappa )filtro withList:(NSArray *)list {
NSDate *date = [self impostaFiltroWithTime:filtro];
NSMutableArray *temp = [NSMutableArray array];
for (id object in list) {
if ([object isKindOfClass:[EQNPastquakes class]]) {
EQNPastquakes *anPasq = (EQNPastquakes *)object;
if ([anPasq.date compare:date] == NSOrderedDescending) {
[temp addObject:anPasq];
NSLog(@"\n\naggiunto %@ filtro %@", anPasq.date, date);
}
else{
NSLog(@"\n\nNon aggiunto %@ filtro %@", anPasq.date, date);
}
} else if ([object isKindOfClass:[EQNSegnalazione class]]){
EQNSegnalazione *anSegn = (EQNSegnalazione *)object;
if ([anSegn.date compare:date] == NSOrderedDescending) {
[temp addObject:anSegn];
NSLog(@"\n\naggiunto %@ filtro %@", anSegn.date, date);
}
else{
NSLog(@"\n\nNon aggiunto %@ filtro %@", anSegn.date, date);
}
}
}
NSLog(@"filtrati %lu tutti %lu", (unsigned long)temp.count, (unsigned long)list.count);
return temp;
}
+(NSString *)clearStringMessaggi:(NSString *)messaggio{
+ (NSString *)clearStringMessaggi:(NSString *)messaggio
{
NSString *clearString = [messaggio stringByReplacingOccurrencesOfString:@" " withString:@""];
clearString = [clearString stringByReplacingOccurrencesOfString:@"[" withString:@""];
clearString = [clearString stringByReplacingOccurrencesOfString:@"]" withString:@""];
@@ -136,13 +126,11 @@
clearString = [clearString stringByReplacingOccurrencesOfString:@">" withString:@""];
clearString = [clearString stringByReplacingOccurrencesOfString:@"/" withString:@""];
clearString = [clearString stringByReplacingOccurrencesOfString:@"span" withString:@""];
return clearString;
}
+(NSInteger )getDifferenceMinute:(NSDate *)date{
+ (NSInteger)getDifferenceMinute:(NSDate *)date
{
NSDate *now = [NSDate date];
NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
NSDateComponents *components = [calendar components:NSCalendarUnitMinute