rami-a 160f5b15c1
Fix status bar color appearing incorrect in some Catalog examples (#5363)
I did an audit of the Catalog app to track down screens with an incorrect status bar color and the ones that I found are:
* AppBar -> Presented (This example does not use the app theme so I was able to set the style directly)
* AppBar -> Wrapped
* BottomAppBar

Additionally, I found that changing the Catalog theme from black to another color (and vice-versa) resulted in the status bar being incorrect until the next page navigation. So I created a fix for this too.

Closes #3778
2018-10-08 16:12:51 -04:00

98 lines
3.7 KiB
Objective-C

// Copyright 2017-present the Material Components for iOS authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#import <UIKit/UIKit.h>
#import "MaterialBottomAppBar+ColorThemer.h"
#import "MaterialBottomAppBar.h"
#import "MaterialButtons+ButtonThemer.h"
#import "supplemental/BottomAppBarTypicalUseSupplemental.h"
@implementation BottomAppBarTypicalUseExample
- (id)init {
self = [super init];
if (self) {
self.title = @"Bottom App Bar";
_colorScheme = [[MDCSemanticColorScheme alloc] init];
_typographyScheme = [[MDCTypographyScheme alloc] init];
}
return self;
}
- (void)commonBottomBarSetup {
[self setupExampleTableLayout];
// Add touch handler to the floating button.
[self.bottomBarView.floatingButton addTarget:self
action:@selector(didTapFloatingButton:)
forControlEvents:UIControlEventTouchUpInside];
// Set the image on the floating button.
UIImage *addImage =
[[UIImage imageNamed:@"Add"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
[self.bottomBarView.floatingButton setImage:addImage forState:UIControlStateNormal];
// Configure the navigation buttons to be shown on the bottom app bar.
UIBarButtonItem *barButtonLeadingItem =
[[UIBarButtonItem alloc] initWithTitle:nil
style:UIBarButtonItemStylePlain
target:self
action:@selector(didTapMenu:)];
UIImage *menuImage =
[[UIImage imageNamed:@"Menu"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
[barButtonLeadingItem setImage:menuImage];
UIBarButtonItem *barButtonTrailingItem =
[[UIBarButtonItem alloc] initWithTitle:nil
style:UIBarButtonItemStylePlain
target:self
action:@selector(didTapSearch:)];
UIImage *searchImage =
[[UIImage imageNamed:@"Search"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
[barButtonTrailingItem setImage:searchImage];
[self.bottomBarView setLeadingBarButtonItems:@[ barButtonLeadingItem ]];
[self.bottomBarView setTrailingBarButtonItems:@[ barButtonTrailingItem ]];
}
- (void)viewDidLoad {
[super viewDidLoad];
[self commonBottomBarSetup];
MDCButtonScheme *buttonScheme = [[MDCButtonScheme alloc] init];
buttonScheme.colorScheme = self.colorScheme;
buttonScheme.typographyScheme = self.typographyScheme;
[MDCFloatingActionButtonThemer applyScheme:buttonScheme
toButton:self.bottomBarView.floatingButton];
[MDCBottomAppBarColorThemer applySurfaceVariantWithSemanticColorScheme:self.colorScheme
toBottomAppBarView:self.bottomBarView];
}
- (void)didTapFloatingButton:(id)sender {
[self.bottomBarView setFloatingButtonHidden:YES animated:YES];
}
- (void)didTapMenu:(id)sender {
[self.navigationController popViewControllerAnimated:YES];
}
- (void)didTapSearch:(id)sender {
[self.bottomBarView setFloatingButtonPosition:MDCBottomAppBarFloatingButtonPositionTrailing
animated:YES];
}
@end