new sort menu

iOSClient/AppDelegate.h

@@ -90,12 +90,16 @@
 // Remenu
 @property (nonatomic, strong) REMenu *reMainMenu;
 @property (nonatomic, strong) REMenuItem *selezionaItem;
-@property (nonatomic, strong) REMenuItem *directoryOnTopItem;
-@property (nonatomic, strong) REMenuItem *ordinaItem;
-@property (nonatomic, strong) REMenuItem *ascendenteItem;
+@property (nonatomic, strong) REMenuItem *sortFileNameAZItem;
+@property (nonatomic, strong) REMenuItem *sortFileNameZAItem;
+@property (nonatomic, strong) REMenuItem *sortDateMoreRecentItem;
+@property (nonatomic, strong) REMenuItem *sortDateLessRecentItem;
+@property (nonatomic, strong) REMenuItem *sortSmallestItem;
+@property (nonatomic, strong) REMenuItem *sortLargestItem;
 @property (nonatomic, strong) REMenuItem *alphabeticItem;
 @property (nonatomic, strong) REMenuItem *typefileItem;
 @property (nonatomic, strong) REMenuItem *dateItem;
+@property (nonatomic, strong) REMenuItem *directoryOnTopItem;
 
 @property (nonatomic, strong) REMenu *reSelectMenu;
 @property (nonatomic, strong) REMenuItem *selectAllItem;

iOSClient/Main/CCMain.m

@@ -50,9 +50,6 @@
     
     UIImageView *_ImageTitleHomeCryptoCloud;
     
-    NSString *_directoryGroupBy;
-    NSString *_directoryOrder;
-    
     NSUInteger _failedAttempts;
     NSDate *_lockUntilDate;
 
@@ -97,9 +94,6 @@
     if (self = [super initWithCoder:aDecoder])  {
         
         appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
-
-        _directoryOrder = [CCUtility getOrderSettings];
-        _directoryGroupBy = [CCUtility getGroupBySettings];
         
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(initializeMain:) name:@"initializeMain" object:nil];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(clearDateReadDataSource:) name:@"clearDateReadDataSource" object:nil];
@@ -147,10 +141,6 @@
     [self.tableView registerNib:[UINib nibWithNibName:@"CCCellMain" bundle:nil] forCellReuseIdentifier:@"CellMain"];
     [self.tableView registerNib:[UINib nibWithNibName:@"CCCellMainTransfer" bundle:nil] forCellReuseIdentifier:@"CellMainTransfer"];
     
-    // Order & GroupBy
-    _directoryOrder = [CCUtility getOrderSettings];
-    _directoryGroupBy = [CCUtility getGroupBySettings];
-    
     // long press recognizer TableView
     UILongPressGestureRecognizer* longPressRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(onLongPressTableView:)];
     [self.tableView addGestureRecognizer:longPressRecognizer];
@@ -2413,42 +2403,6 @@
     }
 }
 
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== Order Table & GroupBy & DirectoryOnTop =====
-#pragma --------------------------------------------------------------------------------------------
-
-- (void)orderTable:(NSString *)order
-{
-    [CCUtility setOrderSettings:order];
-    
-    // Clear data-read of DataSource
-    [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"clearDateReadDataSource" object:nil];
-}
-
-- (void)ascendingTable:(BOOL)ascending
-{
-    [CCUtility setAscendingSettings:ascending];
-    
-    // Clear data-read of DataSource
-    [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"clearDateReadDataSource" object:nil];
-}
-
-- (void)directoryOnTop:(BOOL)directoryOnTop
-{
-    [CCUtility setDirectoryOnTop:directoryOnTop];
-    
-    // Clear data-read of DataSource
-    [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"clearDateReadDataSource" object:nil];
-}
-
-- (void)tableGroupBy:(NSString *)groupBy
-{
-    [CCUtility setGroupBySettings:groupBy];
-    
-    // Clear data-read of DataSource
-    [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"clearDateReadDataSource" object:nil];
-}
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ==== Menu LOGO ====
 #pragma --------------------------------------------------------------------------------------------
@@ -2645,114 +2599,120 @@
 
 - (void)createReMainMenu
 {
-    __block NSString *nuovoOrdinamento;
-    NSString *titoloNuovo, *titoloAttuale;
-    BOOL ascendente;
-    __block BOOL nuovoAscendente;
-    UIImage *image;
+    NSString *title;
+    NSString *groupBy = [CCUtility getGroupBySettings];
+    NSString *sorted = [CCUtility getOrderSettings];
+    BOOL ascending = [CCUtility getAscendingSettings];
     
     // ITEM SELECT ----------------------------------------------------------------------------------------------------
     
     appDelegate.selezionaItem = [[REMenuItem alloc] initWithTitle:NSLocalizedString(@"_select_", nil)subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"select"] multiplier:2 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
-            if ([sectionDataSource.allRecordsDataSource count] > 0) {
-                [self tableViewSelect:YES];
-            }
+        if ([sectionDataSource.allRecordsDataSource count] > 0) [self tableViewSelect:YES];
     }];
-
-    // ITEM ORDER ----------------------------------------------------------------------------------------------------
     
-    if ([_directoryOrder isEqualToString:@"fileName"]) {
-        
-        image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"MenuOrdeyByDate"] multiplier:2 color:[NCBrandColor sharedInstance].icon];
-        titoloNuovo = NSLocalizedString(@"_order_by_date_", nil);
-        titoloAttuale = NSLocalizedString(@"_current_order_name_", nil);
-        nuovoOrdinamento = @"date";
-    }
+    // ITEM ORDER ----------------------------------------------------------------------------------------------------
+
+    if ([sorted isEqualToString:@"fileName"] && ascending) { title = [NSString stringWithFormat:@"✓ %@", NSLocalizedString(@"_order_by_name_a_z_", nil)]; }
+    else title = NSLocalizedString(@"_order_by_name_a_z_", nil);
     
-    if ([_directoryOrder isEqualToString:@"date"]) {
-        
-        image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"MenuOrderByFileName"] multiplier:2 color:[NCBrandColor sharedInstance].icon];
-        titoloNuovo = NSLocalizedString(@"_order_by_name_", nil);
-        titoloAttuale = NSLocalizedString(@"_current_order_date_", nil);
-        nuovoOrdinamento = @"fileName";
-    }
+    appDelegate.sortFileNameAZItem = [[REMenuItem alloc] initWithTitle:title subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"sortFileNameAZ"] multiplier:2 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
+        [CCUtility setOrderSettings:@"fileName"];
+        [CCUtility setAscendingSettings:true];
+        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"clearDateReadDataSource" object:nil];
+    }];
+
+    if ([sorted isEqualToString:@"fileName"] && !ascending) { title = [NSString stringWithFormat:@"✓ %@", NSLocalizedString(@"_order_by_name_z_a_", nil)]; }
+    else title = NSLocalizedString(@"_order_by_name_z_a_", nil);
     
-    appDelegate.ordinaItem = [[REMenuItem alloc] initWithTitle:titoloNuovo subtitle:titoloAttuale image:image highlightedImage:nil action:^(REMenuItem *item) {
-        [self orderTable:nuovoOrdinamento];
+    appDelegate.sortFileNameZAItem = [[REMenuItem alloc] initWithTitle:title subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"sortFileNameZA"] multiplier:2 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
+        [CCUtility setOrderSettings:@"fileName"];
+        [CCUtility setAscendingSettings:false];
+        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"clearDateReadDataSource" object:nil];
     }];
     
-    // ITEM ASCENDING -----------------------------------------------------------------------------------------------------
+    if ([sorted isEqualToString:@"date"] && !ascending) { title = [NSString stringWithFormat:@"✓ %@", NSLocalizedString(@"_order_by_date_more_recent_", nil)]; }
+    else title = NSLocalizedString(@"_order_by_date_more_recent_", nil);
+    
+    appDelegate.sortDateMoreRecentItem = [[REMenuItem alloc] initWithTitle:title subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"sortDateMoreRecent"] multiplier:2 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
+        [CCUtility setOrderSettings:@"date"];
+        [CCUtility setAscendingSettings:false];
+        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"clearDateReadDataSource" object:nil];
+    }];
     
-    ascendente = [CCUtility getAscendingSettings];
+    if ([sorted isEqualToString:@"date"] && ascending) { title = [NSString stringWithFormat:@"✓ %@", NSLocalizedString(@"_order_by_date_less_recent_", nil)]; }
+    else title = NSLocalizedString(@"_order_by_date_less_recent_", nil);
     
-    if (ascendente)  {
-        
-        image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"MenuOrdinamentoDiscendente"] multiplier:2 color:[NCBrandColor sharedInstance].icon];
-        titoloNuovo = NSLocalizedString(@"_sort_descending_", nil);
-        titoloAttuale = NSLocalizedString(@"_current_sort_ascending_", nil);
-        nuovoAscendente = false;
-    }
+    appDelegate.sortDateLessRecentItem = [[REMenuItem alloc] initWithTitle:title subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"sortDateLessRecent"] multiplier:2 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
+        [CCUtility setOrderSettings:@"date"];
+        [CCUtility setAscendingSettings:true];
+        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"clearDateReadDataSource" object:nil];
+    }];
     
-    if (!ascendente) {
-        
-        image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"MenuOrdinamentoAscendente"] multiplier:2 color:[NCBrandColor sharedInstance].icon];
-        titoloNuovo = NSLocalizedString(@"_sort_ascending_", nil);
-        titoloAttuale = NSLocalizedString(@"_current_sort_descending_", nil);
-        nuovoAscendente = true;
-    }
+    if ([sorted isEqualToString:@"size"] && ascending) { title = [NSString stringWithFormat:@"✓ %@", NSLocalizedString(@"_order_by_size_smallest_", nil)]; }
+    else title = NSLocalizedString(@"_order_by_size_smallest_", nil);
     
-    appDelegate.ascendenteItem = [[REMenuItem alloc] initWithTitle:titoloNuovo subtitle:titoloAttuale image:image highlightedImage:nil action:^(REMenuItem *item) {
-        [self ascendingTable:nuovoAscendente];
+    appDelegate.sortSmallestItem = [[REMenuItem alloc] initWithTitle:title subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"sortSmallest"] multiplier:2 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
+        [CCUtility setOrderSettings:@"size"];
+        [CCUtility setAscendingSettings:true];
+        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"clearDateReadDataSource" object:nil];
     }];
     
+    if ([sorted isEqualToString:@"size"] && !ascending) { title = [NSString stringWithFormat:@"✓ %@", NSLocalizedString(@"_order_by_size_largest_", nil)]; }
+    else title = NSLocalizedString(@"_order_by_size_largest_", nil);
     
-    // ITEM ALPHABETIC -----------------------------------------------------------------------------------------------------
+    appDelegate.sortLargestItem = [[REMenuItem alloc] initWithTitle:title subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"sortLargest"] multiplier:2 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
+        [CCUtility setOrderSettings:@"size"];
+        [CCUtility setAscendingSettings:false];
+        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"clearDateReadDataSource" object:nil];
+    }];
+    
+    // ITEM GROUP ALPHABETIC -----------------------------------------------------------------------------------------------------
     
-    if ([_directoryGroupBy isEqualToString:@"alphabetic"])  { titoloNuovo = NSLocalizedString(@"_group_alphabetic_yes_", nil); }
-    else { titoloNuovo = NSLocalizedString(@"_group_alphabetic_no_", nil); }
+    if ([groupBy isEqualToString:@"alphabetic"])  { title = NSLocalizedString(@"_group_alphabetic_yes_", nil); }
+    else { title = NSLocalizedString(@"_group_alphabetic_no_", nil); }
     
-    appDelegate.alphabeticItem = [[REMenuItem alloc] initWithTitle:titoloNuovo subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"MenuGroupByAlphabetic"] multiplier:2 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
-            if ([_directoryGroupBy isEqualToString:@"alphabetic"]) [self tableGroupBy:@"none"];
-            else [self tableGroupBy:@"alphabetic"];
+    appDelegate.alphabeticItem = [[REMenuItem alloc] initWithTitle:title subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"MenuGroupByAlphabetic"] multiplier:2 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
+        if ([groupBy isEqualToString:@"alphabetic"]) [CCUtility setGroupBySettings:@"none"];
+        else [CCUtility setGroupBySettings:@"alphabetic"];
+        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"clearDateReadDataSource" object:nil];
     }];
     
-    // ITEM TYPEFILE -------------------------------------------------------------------------------------------------------
+    // ITEM GROUP TYPEFILE -------------------------------------------------------------------------------------------------------
     
-    if ([_directoryGroupBy isEqualToString:@"typefile"])  { titoloNuovo = NSLocalizedString(@"_group_typefile_yes_", nil); }
-    else { titoloNuovo = NSLocalizedString(@"_group_typefile_no_", nil); }
+    if ([groupBy isEqualToString:@"typefile"])  { title = NSLocalizedString(@"_group_typefile_yes_", nil); }
+    else { title = NSLocalizedString(@"_group_typefile_no_", nil); }
     
-    appDelegate.typefileItem = [[REMenuItem alloc] initWithTitle:titoloNuovo subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"file"] multiplier:1 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
-            if ([_directoryGroupBy isEqualToString:@"typefile"]) [self tableGroupBy:@"none"];
-            else [self tableGroupBy:@"typefile"];
+    appDelegate.typefileItem = [[REMenuItem alloc] initWithTitle:title subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"file"] multiplier:1 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
+        if ([groupBy isEqualToString:@"typefile"]) [CCUtility setGroupBySettings:@"none"];
+        else [CCUtility setGroupBySettings:@"typefile"];
+        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"clearDateReadDataSource" object:nil];
     }];
    
-
-    // ITEM DATE -------------------------------------------------------------------------------------------------------
+    // ITEM GROUP DATE -------------------------------------------------------------------------------------------------------
     
-    if ([_directoryGroupBy isEqualToString:@"date"])  { titoloNuovo = NSLocalizedString(@"_group_date_yes_", nil); }
-    else { titoloNuovo = NSLocalizedString(@"_group_date_no_", nil); }
+    if ([groupBy isEqualToString:@"date"])  { title = NSLocalizedString(@"_group_date_yes_", nil); }
+    else { title = NSLocalizedString(@"_group_date_no_", nil); }
     
-    appDelegate.dateItem = [[REMenuItem alloc] initWithTitle:titoloNuovo   subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"MenuGroupByDate"] multiplier:2 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
-            if ([_directoryGroupBy isEqualToString:@"date"]) [self tableGroupBy:@"none"];
-            else [self tableGroupBy:@"date"];
+    appDelegate.dateItem = [[REMenuItem alloc] initWithTitle:title   subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"MenuGroupByDate"] multiplier:2 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
+        if ([groupBy isEqualToString:@"date"]) [CCUtility setGroupBySettings:@"none"];
+        else [CCUtility setGroupBySettings:@"date"];
+        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"clearDateReadDataSource" object:nil];
     }];
     
     // ITEM DIRECTORY ON TOP ------------------------------------------------------------------------------------------------
     
-    if ([CCUtility getDirectoryOnTop])  { titoloNuovo = NSLocalizedString(@"_directory_on_top_yes_", nil); }
-    else { titoloNuovo = NSLocalizedString(@"_directory_on_top_no_", nil); }
+    if ([CCUtility getDirectoryOnTop])  { title = NSLocalizedString(@"_directory_on_top_yes_", nil); }
+    else { title = NSLocalizedString(@"_directory_on_top_no_", nil); }
     
-    appDelegate.directoryOnTopItem = [[REMenuItem alloc] initWithTitle:titoloNuovo subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folder"] multiplier:1 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
-            if ([CCUtility getDirectoryOnTop])
-                [self directoryOnTop:NO];
-            else
-                [self directoryOnTop:YES];
+    appDelegate.directoryOnTopItem = [[REMenuItem alloc] initWithTitle:title subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folder"] multiplier:1 color:[NCBrandColor sharedInstance].icon] highlightedImage:nil action:^(REMenuItem *item) {
+        if ([CCUtility getDirectoryOnTop]) [CCUtility setDirectoryOnTop:NO];
+        else [CCUtility setDirectoryOnTop:YES];
+        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"clearDateReadDataSource" object:nil];
     }];
     
-
     // REMENU --------------------------------------------------------------------------------------------------------------
 
-    appDelegate.reMainMenu = [[REMenu alloc] initWithItems:@[appDelegate.selezionaItem, appDelegate.ordinaItem, appDelegate.ascendenteItem, appDelegate.alphabeticItem, appDelegate.typefileItem, appDelegate.dateItem, appDelegate.directoryOnTopItem]];
+    appDelegate.reMainMenu = [[REMenu alloc] initWithItems:@[appDelegate.selezionaItem, appDelegate.sortFileNameAZItem, appDelegate.sortFileNameZAItem, appDelegate.sortDateMoreRecentItem, appDelegate.sortDateLessRecentItem, appDelegate.sortSmallestItem, appDelegate.sortLargestItem,appDelegate.alphabeticItem, appDelegate.typefileItem, appDelegate.dateItem, appDelegate.directoryOnTopItem]];
     
     appDelegate.reMainMenu.imageOffset = CGSizeMake(5, -1);
     
@@ -3794,8 +3754,6 @@
 - (void)clearDateReadDataSource:(NSNotification *)notification
 {
     _dateReadDataSource = Nil;
-    _directoryGroupBy = [CCUtility getGroupBySettings];
-    _directoryOrder = [CCUtility getOrderSettings];
     
     [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:self.serverUrl fileID:nil action:k_action_NULL];
 }
@@ -3818,7 +3776,7 @@
             }
         }
         
-        sectionDataSource = [CCSectionMetadata creataDataSourseSectionMetadata:metadatas listProgressMetadata:nil groupByField:_directoryGroupBy filterFileID:appDelegate.filterFileID filterTypeFileImage:NO filterTypeFileVideo:NO activeAccount:appDelegate.activeAccount];
+        sectionDataSource = [CCSectionMetadata creataDataSourseSectionMetadata:metadatas listProgressMetadata:nil groupByField:[CCUtility getGroupBySettings] filterFileID:appDelegate.filterFileID filterTypeFileImage:NO filterTypeFileVideo:NO activeAccount:appDelegate.activeAccount];
 
         [self tableViewReloadData];
         
@@ -3902,9 +3860,9 @@
     
     CCSectionDataSourceMetadata *sectionDataSourceTemp = [CCSectionDataSourceMetadata new];
 
-    NSArray *recordsTableMetadata = [[NCManageDatabase sharedInstance] getMetadatasWithPredicate:[NSPredicate predicateWithFormat:@"directoryID == %@ AND status != %i", directoryID, k_metadataStatusHide] sorted:_directoryOrder ascending:[CCUtility getAscendingSettings]];
+    NSArray *recordsTableMetadata = [[NCManageDatabase sharedInstance] getMetadatasWithPredicate:[NSPredicate predicateWithFormat:@"directoryID == %@ AND status != %i", directoryID, k_metadataStatusHide] sorted:[CCUtility getOrderSettings] ascending:[CCUtility getAscendingSettings]];
     
-    sectionDataSourceTemp = [CCSectionMetadata creataDataSourseSectionMetadata:recordsTableMetadata listProgressMetadata:nil groupByField:_directoryGroupBy filterFileID:appDelegate.filterFileID filterTypeFileImage:NO filterTypeFileVideo:NO activeAccount:appDelegate.activeAccount];
+    sectionDataSourceTemp = [CCSectionMetadata creataDataSourseSectionMetadata:recordsTableMetadata listProgressMetadata:nil groupByField:[CCUtility getGroupBySettings] filterFileID:appDelegate.filterFileID filterTypeFileImage:NO filterTypeFileVideo:NO activeAccount:appDelegate.activeAccount];
     
     if (withReloadData) {
         sectionDataSource = sectionDataSourceTemp;
@@ -4034,7 +3992,7 @@
     if ([sectionTitle isKindOfClass:[NSString class]] && [sectionTitle rangeOfString:@"download"].location != NSNotFound) return 18.f;
     if ([sectionTitle isKindOfClass:[NSString class]] && [sectionTitle rangeOfString:@"upload"].location != NSNotFound) return 18.f;
     
-    if ([_directoryGroupBy isEqualToString:@"none"] && [sections count] <= 1) return 0.0f;
+    if ([[CCUtility getGroupBySettings] isEqualToString:@"none"] && [sections count] <= 1) return 0.0f;
     
     return 20.f;
 }
@@ -4075,7 +4033,7 @@
         visualEffectView.backgroundColor = [[NCBrandColor sharedInstance].brand colorWithAlphaComponent:0.2];
     }
     
-    if ([_directoryGroupBy isEqualToString:@"alphabetic"]) {
+    if ([[CCUtility getGroupBySettings] isEqualToString:@"alphabetic"]) {
         
         if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
             shift = - 35;
@@ -4122,7 +4080,7 @@
 
 - (NSArray *)sectionIndexTitlesForTableView:(UITableView *)tableView
 {
-    if ([_directoryGroupBy isEqualToString:@"alphabetic"])
+    if ([[CCUtility getGroupBySettings] isEqualToString:@"alphabetic"])
         return [[UILocalizedIndexedCollation currentCollation] sectionIndexTitles];
     else
         return nil;

iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -300,16 +300,6 @@
 "_file_saved_local_"            = "File saved on local storage.";
 "_file_not_present_"            = "Error: File not present, please reload.";
 "_order_by_"                    = "Sort by";
-"_order_by_date_"               = "Sort by date";
-"_current_order_date_"          = "(currently sorted by date)";
-"_order_by_name_"               = "Sort by name";
-"_current_order_name_"          = "(currently sorted by name)";
-"_order_by_size_"               = "Sort by size";
-"_current_order_size_"          = "(currently sorted by size)";
-"_sort_descending_"             = "Sort descending";
-"_current_sort_ascending_"      = "(currently sorted ascending)";
-"_sort_ascending_"              = "Sort ascending";
-"_current_sort_descending_"     = "(currently sorted descending)";
 "_order_by_name_a_z_"           = "Sort by name (from A to Z)";
 "_order_by_name_z_a_"           = "Sort by name (from Z to A)";
 "_order_by_date_more_recent_"   = "Sort from the most recent";