Skip to content

Commit a1f2b61

Browse files
TakayukiHoshi1984TakayukiHoshi1984
authored
Merge pull request #254 from TakayukiHoshi1984/modify_browser_navigation_bar_color
各UIのナビゲーションバーの色調整。
2 parents becfce0 + d673c30 commit a1f2b61

11 files changed

Lines changed: 114 additions & 20 deletions

‎dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/classes/GHAddBookmarkController.m‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,17 @@ - (void)viewDidLoad
6464
self.navigationItem.rightBarButtonItem = done;
6565

6666
}
67+
- (void)viewWillAppear:(BOOL)animated {
68+
// デバイスプラグインの設定画面で、全体のナビゲーションバーの色を変えられた時のために、Browserデフォルトの色に戻す。
69+
self.navigationController.navigationBar.barTintColor =[UIColor whiteColor];
70+
self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
71+
self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName: [UIColor blackColor]};
72+
[UINavigationBar appearance].barTintColor = [UIColor whiteColor];
73+
[UINavigationBar appearance].tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
74+
[UITabBar appearance].translucent = NO;
75+
[UITabBar appearance].barTintColor = [UIColor whiteColor];
76+
[[UITabBar appearance] setTintColor:[UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000]];
77+
}
6778

6879

6980

‎dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/classes/GHBookmarkTopController.m‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,16 @@ - (void)viewDidLoad
5757
self.folderBtn.tintColor = [UIColor colorWithWhite:0 alpha:0];
5858
isEditing = NO;
5959
}
60-
61-
62-
- (void)viewWillAppear:(BOOL)animated
63-
{
64-
[super viewWillAppear:animated];
60+
- (void)viewWillAppear:(BOOL)animated {
61+
// デバイスプラグインの設定画面で、全体のナビゲーションバーの色を変えられた時のために、Browserデフォルトの色に戻す。
62+
self.navigationController.navigationBar.barTintColor =[UIColor whiteColor];
63+
self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
64+
self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName: [UIColor blackColor]};
65+
[UINavigationBar appearance].barTintColor = [UIColor whiteColor];
66+
[UINavigationBar appearance].tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
67+
[UITabBar appearance].translucent = NO;
68+
[UITabBar appearance].barTintColor = [UIColor whiteColor];
69+
[[UITabBar appearance] setTintColor:[UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000]];
6570
//ツールバーのボタン非表示
6671
self.navigationController.toolbarHidden = NO;
6772
[self setEdiMode:isEditing];

‎dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/classes/GHBookmarkViewController.m‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,21 @@ - (void)viewDidLoad
4646
}
4747

4848

49-
- (void)viewWillAppear:(BOOL)animated
50-
{
51-
[super viewWillAppear:animated];
49+
- (void)viewWillAppear:(BOOL)animated {
50+
// デバイスプラグインの設定画面で、全体のナビゲーションバーの色を変えられた時のために、Browserデフォルトの色に戻す。
51+
self.navigationController.navigationBar.barTintColor =[UIColor whiteColor];
52+
self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
53+
self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName: [UIColor blackColor]};
54+
[UINavigationBar appearance].barTintColor = [UIColor whiteColor];
55+
[UINavigationBar appearance].tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
56+
[UITabBar appearance].translucent = NO;
57+
[UITabBar appearance].barTintColor = [UIColor whiteColor];
58+
[[UITabBar appearance] setTintColor:[UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000]];
5259
self.title = self.parent.title;
5360
[self setEdiMode:isEditing];
5461
self.navigationController.toolbarHidden = NO;
5562
}
5663

57-
5864
- (void)didReceiveMemoryWarning
5965
{
6066
[super didReceiveMemoryWarning];

‎dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/classes/GHDeviceListViewController.m‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,16 @@ - (void)viewDidLoad {
173173
self.title = @"デバイス一覧";
174174
}
175175

176-
- (void)viewDidAppear:(BOOL)animated
177-
{
178-
[super viewDidAppear:animated];
176+
- (void)viewWillAppear:(BOOL)animated {
177+
// デバイスプラグインの設定画面で、全体のナビゲーションバーの色を変えられた時のために、Browserデフォルトの色に戻す。
178+
self.navigationController.navigationBar.barTintColor =[UIColor whiteColor];
179+
self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
180+
self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName: [UIColor blackColor]};
181+
[UINavigationBar appearance].barTintColor = [UIColor whiteColor];
182+
[UINavigationBar appearance].tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
183+
[UITabBar appearance].translucent = NO;
184+
[UITabBar appearance].barTintColor = [UIColor whiteColor];
185+
[[UITabBar appearance] setTintColor:[UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000]];
179186
[viewModel setup];
180187
}
181188

‎dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/classes/GHDevicePluginDetailViewController.m‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,17 @@ - (void)viewDidLoad {
4040
self.tableView.rowHeight = UITableViewAutomaticDimension;
4141
}
4242

43+
- (void)viewWillAppear:(BOOL)animated {
44+
// デバイスプラグインの設定画面で、全体のナビゲーションバーの色を変えられた時のために、Browserデフォルトの色に戻す。
45+
self.navigationController.navigationBar.barTintColor =[UIColor whiteColor];
46+
self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
47+
self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName: [UIColor blackColor]};
48+
[UINavigationBar appearance].barTintColor = [UIColor whiteColor];
49+
[UINavigationBar appearance].tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
50+
[UITabBar appearance].translucent = NO;
51+
[UITabBar appearance].barTintColor = [UIColor whiteColor];
52+
[[UITabBar appearance] setTintColor:[UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000]];
53+
}
4354
- (void)openDevicePluginSetting
4455
{
4556
DConnectSystemProfile *systemProfile = [viewModel findSystemProfile];

‎dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/classes/GHDevicePluginTableViewController.m‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,17 @@ - (void)viewDidLoad {
5050
self.tableView.estimatedRowHeight = 80;
5151
self.tableView.rowHeight = UITableViewAutomaticDimension;
5252
}
53-
53+
- (void)viewWillAppear:(BOOL)animated {
54+
// デバイスプラグインの設定画面で、全体のナビゲーションバーの色を変えられた時のために、Browserデフォルトの色に戻す。
55+
self.navigationController.navigationBar.barTintColor =[UIColor whiteColor];
56+
self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
57+
self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName: [UIColor blackColor]};
58+
[UINavigationBar appearance].barTintColor = [UIColor whiteColor];
59+
[UINavigationBar appearance].tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
60+
[UITabBar appearance].translucent = NO;
61+
[UITabBar appearance].barTintColor = [UIColor whiteColor];
62+
[[UITabBar appearance] setTintColor:[UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000]];
63+
}
5464
//--------------------------------------------------------------//
5565
#pragma mark - tableViewDelegate
5666
//--------------------------------------------------------------//

‎dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/classes/GHFolderCreateController.m‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,17 @@ - (void)viewDidLoad
4747
[self.tableView registerNib:[UINib nibWithNibName:@"GHFolderTitleCell" bundle:nil] forCellReuseIdentifier:CELL_TITLE];
4848
}
4949

50+
- (void)viewWillAppear:(BOOL)animated {
51+
// デバイスプラグインの設定画面で、全体のナビゲーションバーの色を変えられた時のために、Browserデフォルトの色に戻す。
52+
self.navigationController.navigationBar.barTintColor =[UIColor whiteColor];
53+
self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
54+
self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName: [UIColor blackColor]};
55+
[UINavigationBar appearance].barTintColor = [UIColor whiteColor];
56+
[UINavigationBar appearance].tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
57+
[UITabBar appearance].translucent = NO;
58+
[UITabBar appearance].barTintColor = [UIColor whiteColor];
59+
[[UITabBar appearance] setTintColor:[UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000]];
60+
}
5061

5162
- (void)setDirectory
5263
{

‎dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/classes/GHFoldersListController.m‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,22 @@ - (void)viewDidLoad
4747
self.title = @"フォルダを選択";
4848
[self setup];
4949
}
50-
51-
- (void)viewWillAppear:(BOOL)animated
52-
{
53-
[super viewWillAppear:animated];
54-
50+
- (void)viewWillAppear:(BOOL)animated {
51+
// デバイスプラグインの設定画面で、全体のナビゲーションバーの色を変えられた時のために、Browserデフォルトの色に戻す。
52+
self.navigationController.navigationBar.barTintColor =[UIColor whiteColor];
53+
self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
54+
self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName: [UIColor blackColor]};
55+
[UINavigationBar appearance].barTintColor = [UIColor whiteColor];
56+
[UINavigationBar appearance].tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
57+
[UITabBar appearance].translucent = NO;
58+
[UITabBar appearance].barTintColor = [UIColor whiteColor];
59+
[[UITabBar appearance] setTintColor:[UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000]];
5560
self.navigationController.toolbarHidden = YES;
5661
self.treeView.frame = self.view.bounds;
5762
}
5863

5964

65+
6066
- (void)didReceiveMemoryWarning
6167
{
6268
[super didReceiveMemoryWarning];

‎dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/classes/GHSettingController.m‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,17 @@ - (void)viewDidLoad
6565
[super viewDidLoad];
6666
self.title = @"設定";
6767
}
68-
68+
- (void)viewWillAppear:(BOOL)animated {
69+
// デバイスプラグインの設定画面で、全体のナビゲーションバーの色を変えられた時のために、Browserデフォルトの色に戻す。
70+
self.navigationController.navigationBar.barTintColor =[UIColor whiteColor];
71+
self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
72+
self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName: [UIColor blackColor]};
73+
[UINavigationBar appearance].barTintColor = [UIColor whiteColor];
74+
[UINavigationBar appearance].tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
75+
[UITabBar appearance].translucent = NO;
76+
[UITabBar appearance].barTintColor = [UIColor whiteColor];
77+
[[UITabBar appearance] setTintColor:[UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000]];
78+
}
6979
- (IBAction)close
7080
{
7181
[viewModel updateSwitchState];

‎dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/classes/WebViewController.m‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,17 @@ - (void)viewDidLoad
127127
action:@selector(close:)];
128128
self.navigationItem.leftBarButtonItem = closeButton;
129129
}
130+
- (void)viewWillAppear:(BOOL)animated {
131+
// デバイスプラグインの設定画面で、全体のナビゲーションバーの色を変えられた時のために、Browserデフォルトの色に戻す。
132+
self.navigationController.navigationBar.barTintColor =[UIColor whiteColor];
133+
self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
134+
self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName: [UIColor blackColor]};
135+
[UINavigationBar appearance].barTintColor = [UIColor whiteColor];
136+
[UINavigationBar appearance].tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
137+
[UITabBar appearance].translucent = NO;
138+
[UITabBar appearance].barTintColor = [UIColor whiteColor];
139+
[[UITabBar appearance] setTintColor:[UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000]];
140+
}
130141

131142
- (void)close:(UIBarButtonItem*)item
132143
{

0 commit comments

Comments
 (0)