Removes tabBar and introduces Upload button

piwigo/Albums and Images/Album and Image Collection/AlbumTableViewCell.m

@@ -559,7 +559,7 @@ -(void)deleteCategory
 
     UIAlertAction* emptyCategoryAction = [UIAlertAction
        actionWithTitle:NSLocalizedString(@"deleteCategory_empty", @"Delete Empty Album")
-       style:UIAlertActionStyleDefault
+       style:UIAlertActionStyleDestructive
        handler:^(UIAlertAction * action) {
            [self deleteCategoryWithNumberOfImages:0  deletionMode:kCategoryDeletionModeNone andViewController:topViewController];
     }];
@@ -588,6 +588,7 @@ -(void)deleteCategory
     // Add actions
     switch (self.albumData.totalNumberOfImages) {
         case 0:
+            [alert addAction:cancelAction];
             [alert addAction:emptyCategoryAction];
             break;
 

piwigo/Settings/SettingsViewController.m

@@ -47,6 +47,7 @@ @interface SettingsViewController () <UITableViewDataSource, UITableViewDelegate
 @property (nonatomic, strong) UITableView *settingsTableView;
 @property (nonatomic, strong) NSLayoutConstraint *topConstraint;
 @property (nonatomic, strong) NSLayoutConstraint *tableViewBottomConstraint;
+@property (nonatomic, strong) UIBarButtonItem *doneBarButton;
 
 @property (nonatomic, assign) CGFloat previousContentYOffset;
 @property (nonatomic, assign) CGFloat minContentYOffset;
@@ -60,6 +61,7 @@ -(instancetype)init
 	self = [super init];
 	if(self)
 	{
+        // Table view
         self.settingsTableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];
 		self.settingsTableView.translatesAutoresizingMaskIntoConstraints = NO;
         self.settingsTableView.backgroundColor = [UIColor clearColor];
@@ -71,6 +73,9 @@ -(instancetype)init
 		self.tableViewBottomConstraint = [NSLayoutConstraint constraintViewFromBottom:self.settingsTableView amount:0];
 		[self.view addConstraint:self.tableViewBottomConstraint];
 
+        // Button for returning to albums/images
+        self.doneBarButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(quitSettings)];
+
         // Keyboard management
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillChange:) name:UIKeyboardWillChangeFrameNotification object:nil];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillDismiss:) name:UIKeyboardWillHideNotification object:nil];
@@ -98,6 +103,7 @@ -(void)viewWillAppear:(BOOL)animated
     [self.navigationController.navigationBar setTintColor:[UIColor piwigoOrange]];
     [self.navigationController.navigationBar setBarTintColor:[UIColor piwigoBackgroundColor]];
     self.navigationController.navigationBar.barStyle = [Model sharedInstance].isDarkPaletteActive ? UIBarStyleBlack : UIBarStyleDefault;
+    [self.navigationItem setRightBarButtonItems:@[self.doneBarButton] animated:YES];
 
     // Tab bar appearance
     self.tabBarController.tabBar.barTintColor = [UIColor piwigoBackgroundColor];
@@ -127,6 +133,11 @@ -(void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIVie
     } completion:nil];
 }
 
+-(void)quitSettings
+{
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+
 
 #pragma mark - UITableView - headers
 
@@ -934,6 +945,33 @@ -(UITableViewCell*)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSI
                         // Redraw views in windows
                         AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
                         [appDelegate screenBrightnessChanged:nil];
+
+                        // Background color of the view
+                        self.view.backgroundColor = [UIColor piwigoBackgroundColor];
+                        self.settingsTableView.indicatorStyle = [Model sharedInstance].isDarkPaletteActive ?UIScrollViewIndicatorStyleWhite : UIScrollViewIndicatorStyleBlack;
+
+                        // Navigation bar appearence
+                        NSDictionary *attributes = @{
+                                                     NSForegroundColorAttributeName: [UIColor piwigoWhiteCream],
+                                                     NSFontAttributeName: [UIFont piwigoFontNormal],
+                                                     };
+                        self.navigationController.navigationBar.titleTextAttributes = attributes;
+                        [self.navigationController.navigationBar setTintColor:[UIColor piwigoOrange]];
+                        [self.navigationController.navigationBar setBarTintColor:[UIColor piwigoBackgroundColor]];
+                        self.navigationController.navigationBar.barStyle = [Model sharedInstance].isDarkPaletteActive ? UIBarStyleBlack : UIBarStyleDefault;
+                        [self.navigationItem setRightBarButtonItems:@[self.doneBarButton] animated:YES];
+
+                        // Tab bar appearance
+                        self.tabBarController.tabBar.barTintColor = [UIColor piwigoBackgroundColor];
+                        self.tabBarController.tabBar.tintColor = [UIColor piwigoOrange];
+                        if (@available(iOS 10, *)) {
+                            self.tabBarController.tabBar.unselectedItemTintColor = [UIColor piwigoTextColor];
+                        }
+                        [[UITabBarItem appearance] setTitleTextAttributes:@{NSForegroundColorAttributeName : [UIColor piwigoTextColor]} forState:UIControlStateNormal];
+                        [[UITabBarItem appearance] setTitleTextAttributes:@{NSForegroundColorAttributeName : [UIColor piwigoOrange]} forState:UIControlStateSelected];
+
+                        // Table view
+                        self.settingsTableView.separatorColor = [UIColor piwigoSeparatorColor];
                     };
 
                     tableViewCell = cell;
@@ -968,6 +1006,33 @@ -(UITableViewCell*)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSI
                         // Redraw views in windows
                         AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
                         [appDelegate screenBrightnessChanged:nil];
+
+                        // Background color of the view
+                        self.view.backgroundColor = [UIColor piwigoBackgroundColor];
+                        self.settingsTableView.indicatorStyle = [Model sharedInstance].isDarkPaletteActive ?UIScrollViewIndicatorStyleWhite : UIScrollViewIndicatorStyleBlack;
+
+                        // Navigation bar appearence
+                        NSDictionary *attributes = @{
+                                                     NSForegroundColorAttributeName: [UIColor piwigoWhiteCream],
+                                                     NSFontAttributeName: [UIFont piwigoFontNormal],
+                                                     };
+                        self.navigationController.navigationBar.titleTextAttributes = attributes;
+                        [self.navigationController.navigationBar setTintColor:[UIColor piwigoOrange]];
+                        [self.navigationController.navigationBar setBarTintColor:[UIColor piwigoBackgroundColor]];
+                        self.navigationController.navigationBar.barStyle = [Model sharedInstance].isDarkPaletteActive ? UIBarStyleBlack : UIBarStyleDefault;
+                        [self.navigationItem setRightBarButtonItems:@[self.doneBarButton] animated:YES];
+
+                        // Tab bar appearance
+                        self.tabBarController.tabBar.barTintColor = [UIColor piwigoBackgroundColor];
+                        self.tabBarController.tabBar.tintColor = [UIColor piwigoOrange];
+                        if (@available(iOS 10, *)) {
+                            self.tabBarController.tabBar.unselectedItemTintColor = [UIColor piwigoTextColor];
+                        }
+                        [[UITabBarItem appearance] setTitleTextAttributes:@{NSForegroundColorAttributeName : [UIColor piwigoTextColor]} forState:UIControlStateNormal];
+                        [[UITabBarItem appearance] setTitleTextAttributes:@{NSForegroundColorAttributeName : [UIColor piwigoOrange]} forState:UIControlStateSelected];
+
+                        // Table view
+                        self.settingsTableView.separatorColor = [UIColor piwigoSeparatorColor];
                     };
 
                     tableViewCell = cell;

piwigo/Supporting Files/AppDelegate.m

@@ -98,8 +98,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
 -(void)loadNavigation
 {
-    TabBarViewController *navigation = [TabBarViewController new];
-    self.window.rootViewController = [[UINavigationController alloc] initWithRootViewController:navigation];
+    AlbumImagesViewController *albums = [[AlbumImagesViewController alloc] initWithAlbumId:[Model sharedInstance].defaultCategory];
+    self.window.rootViewController = [[UINavigationController alloc] initWithRootViewController:albums];
     [self.loginVC removeFromParentViewController];
 	self.loginVC = nil;
 

piwigo/Upload/Pick Album/CategoryPickViewController.h

@@ -10,4 +10,6 @@
 
 @interface CategoryPickViewController : UIViewController
 
+-(instancetype)initWithCategoryId:(NSInteger)categoryId;
+
 @end

piwigo/Upload/Pick Album/CategoryPickViewController.m

@@ -25,19 +25,24 @@ @interface CategoryPickViewController () <UITableViewDataSource, UITableViewDele
 @property (nonatomic, strong) NSMutableArray *categoriesThatShowSubCategories;
 @property (nonatomic, strong) UIAlertAction *createAlbumAction;
 @property (nonatomic, strong) UIViewController *hudViewController;
+@property (nonatomic, strong) UIBarButtonItem *doneBarButton;
 
 @end
 
 @implementation CategoryPickViewController
 
--(instancetype)init
+-(instancetype)initWithCategoryId:(NSInteger)categoryId;
 {
 	// User can upload images/videos if he/she has:
     // — admin rights
     // — opened a session on a server having Community extension installed
     if(([Model sharedInstance].hasAdminRights) ||
        ([Model sharedInstance].usesCommunityPluginV29 && [Model sharedInstance].hadOpenedSession))
 	{
+        // Current category
+        self.currentCategoryId = categoryId;
+        self.title = NSLocalizedString(@"tabBar_upload", @"Upload");
+
         // List of categories to present in 2nd section
         self.categories = [NSMutableArray new];
         self.categoriesThatShowSubCategories = [NSMutableArray new];
@@ -56,6 +61,9 @@ -(instancetype)init
 
 		[[PhotosFetch sharedInstance] getLocalGroupsOnCompletion:nil];
 
+        // Button for returning to albums/images
+        self.doneBarButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(quitUpload)];
+
         // Current category updated by Albums section
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didChangeCurrentCategory:) name:kPiwigoNotificationChangedCurrentCategory object:nil];
     }
@@ -140,6 +148,7 @@ -(void)viewWillAppear:(BOOL)animated
     [self.navigationController.navigationBar setTintColor:[UIColor piwigoOrange]];
     [self.navigationController.navigationBar setBarTintColor:[UIColor piwigoBackgroundColor]];
     self.navigationController.navigationBar.barStyle = [Model sharedInstance].isDarkPaletteActive ? UIBarStyleBlack : UIBarStyleDefault;
+    [self.navigationItem setRightBarButtonItems:@[self.doneBarButton] animated:YES];
 
     // Tab bar appearance
     self.tabBarController.tabBar.barTintColor = [UIColor piwigoBackgroundColor];
@@ -159,6 +168,11 @@ -(void)viewWillAppear:(BOOL)animated
     }];
 }
 
+-(void)quitUpload
+{
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+
 
 #pragma mark - UITableView - Headers