소스 검색

Update colors according to new design

Soomin Lee 7 년 전
부모
커밋
29c24d3789

+ 5 - 5
SharedSources/PresentationTheme.swift

@@ -162,18 +162,18 @@ let brightPalette = ColorPalette(isDark: false,
 let darkPalette = ColorPalette(isDark: true,
                                name: "Dark",
                                statusBarStyle: .lightContent,
-                               navigationbarColor: UIColor(0x292B36),
-                               navigationbarTextColor: UIColor(0xD3D3D3),
+                               navigationbarColor: UIColor(0x1B1E21),
+                               navigationbarTextColor: UIColor(0xFFFFFF),
                                background: UIColor(0x1B1E21),
-                               cellBackgroundA: UIColor(0x292B36),
+                               cellBackgroundA: UIColor(0x1B1E21),
                                cellBackgroundB: UIColor(0x000000),
                                cellDetailTextColor: UIColor(0xD3D3D3),
                                cellTextColor: UIColor(0xFFFFFF),
                                lightTextColor: UIColor(0xB8B8B8),
-                               sectionHeaderTextColor: UIColor(0xFFFFFF),
+                               sectionHeaderTextColor: UIColor(0x828282),
                                separatorColor: UIColor(0x25292C),
                                mediaCategorySeparatorColor: UIColor(0x25292C),
-                               tabBarColor: UIColor(0x292B36),
+                               tabBarColor: UIColor(0x25292C),
                                orangeUI: UIColor(0xFF8800),
                                toolBarStyle: UIBarStyle.black)
 

+ 1 - 2
Sources/LocalNetworkConnectivity/VLCNetworkServerBrowserViewController.m

@@ -179,8 +179,7 @@
     if([indexPath row] == ((NSIndexPath*)[[tableView indexPathsForVisibleRows] lastObject]).row)
         [[VLCActivityManager defaultManager] networkActivityStopped];
 
-    UIColor *color = (indexPath.row % 2 == 0)? PresentationTheme.current.colors.cellBackgroundB : PresentationTheme.current.colors.cellBackgroundA;
-    cell.backgroundColor = cell.titleLabel.backgroundColor = cell.folderTitleLabel.backgroundColor = cell.subtitleLabel.backgroundColor = color;
+    cell.backgroundColor = cell.titleLabel.backgroundColor = cell.folderTitleLabel.backgroundColor = cell.subtitleLabel.backgroundColor = PresentationTheme.current.colors.cellBackgroundA;
     cell.titleLabel.textColor = cell.folderTitleLabel.textColor = cell.subtitleLabel.textColor = cell.thumbnailView.tintColor = PresentationTheme.current.colors.cellTextColor;
 }
 

+ 3 - 0
Sources/LocalNetworkConnectivity/VLCServerListViewController.m

@@ -97,6 +97,8 @@
     _localNetworkTableView.rowHeight = [VLCNetworkListCell heightOfCell];
     _localNetworkTableView.separatorStyle = UITableViewCellSeparatorStyleNone;
 
+    [self.navigationController.navigationBar setTranslucent:NO];
+
     [_localNetworkTableView registerClass:[VLCFileServerSectionTableHeaderView class] forHeaderFooterViewReuseIdentifier:VLCFileServerSectionTableHeaderView.identifier];
 
     _remoteNetworkTableView = [[UITableView alloc] initWithFrame:[UIScreen mainScreen].bounds style:UITableViewStylePlain];
@@ -214,6 +216,7 @@
     loginViewController.delegate = self;
     UINavigationController *navCon = [[UINavigationController alloc] initWithRootViewController:loginViewController];
     navCon.modalPresentationStyle = UIModalPresentationFormSheet;
+    [navCon.navigationBar setTranslucent:NO];
     [self presentViewController:navCon animated:YES completion:nil];
 
     if (loginViewController.navigationItem.leftBarButtonItem == nil)

+ 1 - 1
Sources/MediaViewControllers/MediaViewController.swift

@@ -38,7 +38,7 @@ class VLCMediaViewController: VLCPagingViewController<VLCLabelCell> {
         if #available(iOS 11.0, *) {
             navigationController?.navigationBar.prefersLargeTitles = false
         }
-
+        navigationController?.navigationBar.isTranslucent = false
         let fixedSpace: UIBarButtonItem = UIBarButtonItem(barButtonSystemItem: .fixedSpace, target: nil, action: nil)
         fixedSpace.width = fixedSpaceWidth
 

+ 1 - 1
Sources/VLCCloudServicesTableViewController.m

@@ -117,7 +117,7 @@
 
 - (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    cell.backgroundColor = (indexPath.row % 2 == 0)? PresentationTheme.current.colors.cellBackgroundA: PresentationTheme.current.colors.cellBackgroundB;
+    cell.backgroundColor = PresentationTheme.current.colors.cellBackgroundA;
     [cell setSeparatorInset:UIEdgeInsetsZero];
     [cell setPreservesSuperviewLayoutMargins:NO];
     [cell setLayoutMargins:UIEdgeInsetsZero];

+ 1 - 1
Sources/VLCCloudStorageTableViewController.m

@@ -200,7 +200,7 @@
 - (void)tableView:(UITableView *)tableView willDisplayCell:(__kindof UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
 {
     VLCCloudStorageTableViewCell *cloudcell = [cell isKindOfClass:VLCCloudStorageTableViewCell.class] ? (id)cell : nil;
-    cloudcell.backgroundColor = (indexPath.row % 2 == 0)? PresentationTheme.current.colors.cellBackgroundB : PresentationTheme.current.colors.cellBackgroundA;
+    cloudcell.backgroundColor = PresentationTheme.current.colors.cellBackgroundA;
     cloudcell.titleLabel.textColor = PresentationTheme.current.colors.cellTextColor;
     cloudcell.folderTitleLabel.textColor = PresentationTheme.current.colors.cellTextColor;
     cloudcell.subtitleLabel.textColor = PresentationTheme.current.colors.cellDetailTextColor;

+ 1 - 1
Sources/VLCOpenNetworkStreamViewController.m

@@ -308,7 +308,7 @@
 
 - (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    cell.backgroundColor = (indexPath.row % 2 == 0)? PresentationTheme.current.colors.cellBackgroundB : PresentationTheme.current.colors.cellBackgroundA;
+    cell.backgroundColor = PresentationTheme.current.colors.cellBackgroundA;
     cell.textLabel.textColor =  PresentationTheme.current.colors.cellTextColor;
     cell.detailTextLabel.textColor =  PresentationTheme.current.colors.cellDetailTextColor;
 }

+ 3 - 0
Sources/VLCTabBarCoordinator.swift

@@ -29,11 +29,14 @@ class VLCTabBarCoordinator: NSObject {
 
     @objc func updateTheme() {
         //Setting this in appearanceManager doesn't update tabbar and UINavigationbar of the settingsViewController on change hence we do it here
+        tabBarController.tabBar.isTranslucent = false
+        tabBarController.tabBar.backgroundColor = PresentationTheme.current.colors.tabBarColor
         tabBarController.tabBar.barTintColor = PresentationTheme.current.colors.tabBarColor
         tabBarController.viewControllers?.forEach {
             if let navController = $0 as? UINavigationController, navController.topViewController is VLCSettingsController {
                 navController.navigationBar.barTintColor = PresentationTheme.current.colors.navigationbarColor
                 navController.navigationBar.tintColor = PresentationTheme.current.colors.orangeUI
+                navController.navigationBar.isTranslucent = false
                 navController.navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor:  PresentationTheme.current.colors.navigationbarTextColor]
 
                 if #available(iOS 11.0, *) {