Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,17 @@ - (void)viewDidLoad
self.navigationItem.rightBarButtonItem = done;

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



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,16 @@ - (void)viewDidLoad
self.folderBtn.tintColor = [UIColor colorWithWhite:0 alpha:0];
isEditing = NO;
}


- (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];
- (void)viewWillAppear:(BOOL)animated {
// デバイスプラグインの設定画面で、全体のナビゲーションバーの色を変えられた時のために、Browserデフォルトの色に戻す。
self.navigationController.navigationBar.barTintColor =[UIColor whiteColor];
self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName: [UIColor blackColor]};
[UINavigationBar appearance].barTintColor = [UIColor whiteColor];
[UINavigationBar appearance].tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
[UITabBar appearance].translucent = NO;
[UITabBar appearance].barTintColor = [UIColor whiteColor];
[[UITabBar appearance] setTintColor:[UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000]];
//ツールバーのボタン非表示
self.navigationController.toolbarHidden = NO;
[self setEdiMode:isEditing];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,21 @@ - (void)viewDidLoad
}


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


- (void)didReceiveMemoryWarning
{
[super didReceiveMemoryWarning];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,16 @@ - (void)viewDidLoad {
self.title = @"デバイス一覧";
}

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,17 @@ - (void)viewDidLoad {
self.tableView.rowHeight = UITableViewAutomaticDimension;
}

- (void)viewWillAppear:(BOOL)animated {
// デバイスプラグインの設定画面で、全体のナビゲーションバーの色を変えられた時のために、Browserデフォルトの色に戻す。
self.navigationController.navigationBar.barTintColor =[UIColor whiteColor];
self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName: [UIColor blackColor]};
[UINavigationBar appearance].barTintColor = [UIColor whiteColor];
[UINavigationBar appearance].tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
[UITabBar appearance].translucent = NO;
[UITabBar appearance].barTintColor = [UIColor whiteColor];
[[UITabBar appearance] setTintColor:[UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000]];
}
- (void)openDevicePluginSetting
{
DConnectSystemProfile *systemProfile = [viewModel findSystemProfile];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,17 @@ - (void)viewDidLoad {
self.tableView.estimatedRowHeight = 80;
self.tableView.rowHeight = UITableViewAutomaticDimension;
}

- (void)viewWillAppear:(BOOL)animated {
// デバイスプラグインの設定画面で、全体のナビゲーションバーの色を変えられた時のために、Browserデフォルトの色に戻す。
self.navigationController.navigationBar.barTintColor =[UIColor whiteColor];
self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName: [UIColor blackColor]};
[UINavigationBar appearance].barTintColor = [UIColor whiteColor];
[UINavigationBar appearance].tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
[UITabBar appearance].translucent = NO;
[UITabBar appearance].barTintColor = [UIColor whiteColor];
[[UITabBar appearance] setTintColor:[UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000]];
}
//--------------------------------------------------------------//
#pragma mark - tableViewDelegate
//--------------------------------------------------------------//
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,17 @@ - (void)viewDidLoad
[self.tableView registerNib:[UINib nibWithNibName:@"GHFolderTitleCell" bundle:nil] forCellReuseIdentifier:CELL_TITLE];
}

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

- (void)setDirectory
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,22 @@ - (void)viewDidLoad
self.title = @"フォルダを選択";
[self setup];
}

- (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];

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



- (void)didReceiveMemoryWarning
{
[super didReceiveMemoryWarning];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,17 @@ - (void)viewDidLoad
[super viewDidLoad];
self.title = @"設定";
}

- (void)viewWillAppear:(BOOL)animated {
// デバイスプラグインの設定画面で、全体のナビゲーションバーの色を変えられた時のために、Browserデフォルトの色に戻す。
self.navigationController.navigationBar.barTintColor =[UIColor whiteColor];
self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName: [UIColor blackColor]};
[UINavigationBar appearance].barTintColor = [UIColor whiteColor];
[UINavigationBar appearance].tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
[UITabBar appearance].translucent = NO;
[UITabBar appearance].barTintColor = [UIColor whiteColor];
[[UITabBar appearance] setTintColor:[UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000]];
}
- (IBAction)close
{
[viewModel updateSwitchState];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,17 @@ - (void)viewDidLoad
action:@selector(close:)];
self.navigationItem.leftBarButtonItem = closeButton;
}
- (void)viewWillAppear:(BOOL)animated {
// デバイスプラグインの設定画面で、全体のナビゲーションバーの色を変えられた時のために、Browserデフォルトの色に戻す。
self.navigationController.navigationBar.barTintColor =[UIColor whiteColor];
self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName: [UIColor blackColor]};
[UINavigationBar appearance].barTintColor = [UIColor whiteColor];
[UINavigationBar appearance].tintColor = [UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000];
[UITabBar appearance].translucent = NO;
[UITabBar appearance].barTintColor = [UIColor whiteColor];
[[UITabBar appearance] setTintColor:[UIColor colorWithRed:0.000 green:0.549 blue:0.890 alpha:1.000]];
}

- (void)close:(UIBarButtonItem*)item
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,13 @@ - (void)viewDidLoad {
}

- (void)viewWillAppear:(BOOL)animated {

// 他のデバイスプラグインで全てのナビゲーションバーの色が変えられた時のために色を設定する
self.navigationController.navigationBar.barTintColor = [UIColor colorWithRed:0.00
green:0.63
blue:0.91
alpha:1.0];
self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName: [UIColor whiteColor]};
// 再表示(バックグラウンド中に通知されたDConnectServiceListener(サービス追加/削除/状態変化)がTableViewに適用されていないので再表示する)
[self.tableView reloadData];

Expand Down