diff --git a/iphone/Maps/Bookmarks/BookmarksTabViewController.swift b/iphone/Maps/Bookmarks/BookmarksTabViewController.swift index 452fee93da..3700621c19 100644 --- a/iphone/Maps/Bookmarks/BookmarksTabViewController.swift +++ b/iphone/Maps/Bookmarks/BookmarksTabViewController.swift @@ -24,11 +24,6 @@ final class BookmarksTabViewController: TabViewController { viewControllers = [bookmarks, catalog] title = L("bookmarks_guides"); - tabView.backgroundColor = .pressBackground() - tabView.barTintColor = .primary() - tabView.tintColor = .white() - tabView.headerTextAttributes = [.foregroundColor: UIColor.whitePrimaryText(), - .font: UIFont.medium14()] tabView.selectedIndex = activeTab.rawValue tabView.delegate = self } diff --git a/iphone/Maps/Bookmarks/BookmarksVC.mm b/iphone/Maps/Bookmarks/BookmarksVC.mm index 260d4b773e..6856d1d89a 100644 --- a/iphone/Maps/Bookmarks/BookmarksVC.mm +++ b/iphone/Maps/Bookmarks/BookmarksVC.mm @@ -2,6 +2,7 @@ #import "BookmarksSection.h" #import "InfoSection.h" #import "MWMCategoryInfoCell.h" +#import "SwiftBridge.h" #import "MWMKeyboard.h" #import "MWMLocationObserver.h" @@ -209,17 +210,15 @@ using namespace std; - (void)viewDidLoad { [super viewDidLoad]; - UIColor *searchBarColor = [UIColor primary]; self.searchBar.delegate = self; - self.statusBarBackground.backgroundColor = self.searchBar.barTintColor = searchBarColor; - self.searchBar.backgroundImage = [UIImage imageWithColor:searchBarColor]; + [self.statusBarBackground setStyleAndApply:@"SearchBarView"]; + [self.searchBar setStyleAndApply: @"SearchBar"]; self.searchBar.placeholder = L(@"search_in_the_list"); [self.noResultsView setTranslatesAutoresizingMaskIntoConstraints:NO]; self.tableView.estimatedRowHeight = 44; [self.tableView registerWithCellClass:MWMCategoryInfoCell.class]; - self.tableView.separatorColor = [UIColor blackDividers]; auto regularTitleAttributes = @{ NSFontAttributeName: [UIFont regular16], NSForegroundColorAttributeName: [UIColor linkBlue] }; @@ -682,10 +681,6 @@ using namespace std; - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { UITableViewCell *cell = [[self currentSections][indexPath.section] tableView:tableView cellForRow:indexPath.row]; - - cell.backgroundColor = [UIColor white]; - cell.textLabel.textColor = [UIColor blackPrimaryText]; - cell.detailTextLabel.textColor = [UIColor blackSecondaryText]; return cell; } @@ -746,12 +741,6 @@ using namespace std; } } -- (void)tableView:(UITableView *)tableView willDisplayHeaderView:(UIView *)view forSection:(NSInteger)section { - auto header = (UITableViewHeaderFooterView *)view; - header.textLabel.textColor = [UIColor blackSecondaryText]; - header.textLabel.font = [UIFont medium14]; -} - #pragma mark - InfoSectionDelegate - (void)infoSectionUpdates:(void (^)(void))updates { diff --git a/iphone/Maps/Bookmarks/BookmarksVC.xib b/iphone/Maps/Bookmarks/BookmarksVC.xib index 967181c74e..0b7475648f 100644 --- a/iphone/Maps/Bookmarks/BookmarksVC.xib +++ b/iphone/Maps/Bookmarks/BookmarksVC.xib @@ -1,11 +1,9 @@ - - - - + + - + @@ -43,14 +41,14 @@ - + - + - + @@ -76,7 +74,7 @@ - + @@ -98,18 +96,18 @@ - + - + - + @@ -143,7 +141,7 @@ - + diff --git a/iphone/Maps/Bookmarks/Catalog/CatalogCategoryCell.swift b/iphone/Maps/Bookmarks/Catalog/CatalogCategoryCell.swift index bc7459c8ca..382bf9e38a 100644 --- a/iphone/Maps/Bookmarks/Catalog/CatalogCategoryCell.swift +++ b/iphone/Maps/Bookmarks/Catalog/CatalogCategoryCell.swift @@ -7,24 +7,9 @@ final class CatalogCategoryCell: MWMTableViewCell { weak var delegate: CatalogCategoryCellDelegate? - @IBOutlet weak var visibleCheckmark: Checkmark! { - didSet { - visibleCheckmark.offTintColor = .blackHintText() - visibleCheckmark.onTintColor = .linkBlue() - } - } - @IBOutlet weak var titleLabel: UILabel! { - didSet { - titleLabel.font = .regular16() - titleLabel.textColor = .blackPrimaryText() - } - } - @IBOutlet weak var subtitleLabel: UILabel! { - didSet { - subtitleLabel.font = .regular14() - subtitleLabel.textColor = .blackSecondaryText() - } - } + @IBOutlet weak var visibleCheckmark: Checkmark! + @IBOutlet weak var titleLabel: UILabel! + @IBOutlet weak var subtitleLabel: UILabel! @IBOutlet weak var moreButton: UIButton! @IBAction func onVisibleChanged(_ sender: Checkmark) { diff --git a/iphone/Maps/Bookmarks/Catalog/CatalogCategoryCell.xib b/iphone/Maps/Bookmarks/Catalog/CatalogCategoryCell.xib index 84b5e41ddc..d8dbd0c7c1 100644 --- a/iphone/Maps/Bookmarks/Catalog/CatalogCategoryCell.xib +++ b/iphone/Maps/Bookmarks/Catalog/CatalogCategoryCell.xib @@ -1,11 +1,9 @@ - - - - + + - + @@ -16,11 +14,11 @@ - + - + @@ -38,21 +36,27 @@ + + + + @@ -75,7 +68,7 @@ - + diff --git a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift index 6e92fe0fc0..38c2762a7d 100644 --- a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift +++ b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift @@ -87,8 +87,7 @@ final class CatalogWebViewController: WebViewController { progressView.translatesAutoresizingMaskIntoConstraints = false progressBgView.translatesAutoresizingMaskIntoConstraints = false loadingIndicator.translatesAutoresizingMaskIntoConstraints = false - numberOfTasksLabel.font = UIFont.medium14() - numberOfTasksLabel.textColor = UIColor.white + numberOfTasksLabel.styleName = "medium14:whiteText" numberOfTasksLabel.text = "0" progressBgView.layer.cornerRadius = 8 progressBgView.clipsToBounds = true @@ -125,7 +124,9 @@ final class CatalogWebViewController: WebViewController { progressBgView.leftAnchor.constraint(equalTo: view.leftAnchor, constant: 8).isActive = true } - progressView.tintColor = UIColor.white() + progressView.styleName = "MWMWhite" + self.view.styleName = "Background" + updateProgress() let backButton = UIBarButtonItem(image: UIImage(named: "ic_nav_bar_back"), style: .plain, diff --git a/iphone/Maps/Bookmarks/Catalog/Dialogs/BookmarksLoadedViewController.xib b/iphone/Maps/Bookmarks/Catalog/Dialogs/BookmarksLoadedViewController.xib index 8cd4a2b0d5..fe720c68a3 100644 --- a/iphone/Maps/Bookmarks/Catalog/Dialogs/BookmarksLoadedViewController.xib +++ b/iphone/Maps/Bookmarks/Catalog/Dialogs/BookmarksLoadedViewController.xib @@ -1,11 +1,9 @@ - - - - + + - + @@ -29,8 +27,7 @@ succesfully downloaded - - + - @@ -58,9 +54,7 @@ - - - + @@ -78,13 +72,7 @@ - - - - - - - + @@ -110,7 +98,7 @@ - + diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift b/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift index ba3de555bb..5245879e93 100644 --- a/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift +++ b/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift @@ -6,12 +6,7 @@ final class EditOnWebViewController: MWMViewController { weak var delegate: EditOnWebViewControllerDelegate? var category: MWMCategory! - @IBOutlet weak var activityIndicator: ActivityIndicator! { - didSet { - activityIndicator.tintColor = UIColor.white() - } - } - + @IBOutlet weak var activityIndicator: ActivityIndicator! @IBOutlet weak var sendMeLinkButton: MWMButton! { didSet { sendMeLinkButton.setTitle(L("send_a_link_btn").uppercased(), for: .normal) diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/UploadActionCell.swift b/iphone/Maps/Bookmarks/Categories/Sharing/UploadActionCell.swift index b4af15d36f..684b29b69b 100644 --- a/iphone/Maps/Bookmarks/Categories/Sharing/UploadActionCell.swift +++ b/iphone/Maps/Bookmarks/Categories/Sharing/UploadActionCell.swift @@ -31,41 +31,36 @@ final class UploadActionCell: MWMTableViewCell { switch cellState { case .normal: progressView.isHidden = true - actionImage.tintColor = .linkBlue() - actionTitle.textColor = .linkBlue() - actionTitle.font = .regular16() + actionImage.setStyleAndApply("MWMBlue") + actionTitle.setStyleAndApply("regular16:linkBlueText") actionTitle.text = titles?[.normal] shareButton.isHidden = true selectionStyle = .default case .inProgress: progressView.isHidden = false - actionImage.tintColor = .blackSecondaryText() - actionTitle.textColor = .blackSecondaryText() - actionTitle.font = .italic16() + actionImage.setStyleAndApply("MWMBlack") + actionTitle.setStyleAndApply("italic16:blackSecondaryText") actionTitle.text = titles?[.inProgress] shareButton.isHidden = true selectionStyle = .none case .updating: progressView.isHidden = false - actionImage.tintColor = .blackSecondaryText() - actionTitle.textColor = .blackSecondaryText() - actionTitle.font = .italic16() + actionImage.setStyleAndApply("MWMBlack") + actionTitle.setStyleAndApply("italic16:blackSecondaryText") actionTitle.text = titles?[.updating] shareButton.isHidden = true selectionStyle = .none case .completed: progressView.isHidden = true - actionImage.tintColor = .blackSecondaryText() - actionTitle.textColor = .blackSecondaryText() - actionTitle.font = .regular16() + actionImage.setStyleAndApply("MWMBlack") + actionTitle.setStyleAndApply("regular16:blackSecondaryText") actionTitle.text = titles?[.completed] shareButton.isHidden = false selectionStyle = .none case .disabled: progressView.isHidden = true - actionImage.tintColor = .blackSecondaryText() - actionTitle.textColor = .blackSecondaryText() - actionTitle.font = .regular16() + actionImage.setStyleAndApply("MWMBlack") + actionTitle.setStyleAndApply("regular16:blackSecondaryText") actionTitle.text = titles?[.disabled] shareButton.isHidden = true selectionStyle = .none diff --git a/iphone/Maps/Bookmarks/MWMCategoryInfoCell.xib b/iphone/Maps/Bookmarks/MWMCategoryInfoCell.xib index 5472342d6d..83be4f9355 100644 --- a/iphone/Maps/Bookmarks/MWMCategoryInfoCell.xib +++ b/iphone/Maps/Bookmarks/MWMCategoryInfoCell.xib @@ -1,11 +1,9 @@ - - - - + + - + @@ -16,7 +14,7 @@ - + @@ -51,18 +49,18 @@ - + - + - + - + - + - + @@ -217,10 +202,7 @@ - - - - + diff --git a/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.xib b/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.xib index aece36cd55..ce89f83c19 100644 --- a/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.xib @@ -1,32 +1,24 @@ - - - - + + - + - - - HelveticaNeue - HelveticaNeue-Medium - - - + - + - + - + - + - + @@ -101,11 +90,11 @@ - + - - + - + - + - + - + - + @@ -166,22 +153,7 @@ - - - - - - - - - - - - - - - - + diff --git a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib index 98ad1c9f56..5e37f6d97e 100644 --- a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib @@ -1,23 +1,21 @@ - - - - + + - + - + - + - + - + - + @@ -144,22 +133,7 @@ - - - - - - - - - - - - - - - - + diff --git a/iphone/Maps/Classes/CustomAlert/SearchAlert/MWMSearchNoResultsAlert.xib b/iphone/Maps/Classes/CustomAlert/SearchAlert/MWMSearchNoResultsAlert.xib index 15005cf0be..4bae1f4491 100644 --- a/iphone/Maps/Classes/CustomAlert/SearchAlert/MWMSearchNoResultsAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/SearchAlert/MWMSearchNoResultsAlert.xib @@ -1,32 +1,24 @@ - - - - + + - + - - - HelveticaNeue - HelveticaNeue-Medium - - - + - + - + - + - + - + - + - + @@ -167,22 +154,7 @@ - - - - - - - - - - - - - - - - + diff --git a/iphone/Maps/Classes/CustomAlert/SpinnerAlert/MWMSpinnerAlert.xib b/iphone/Maps/Classes/CustomAlert/SpinnerAlert/MWMSpinnerAlert.xib index 822eff50e1..a8ba78b749 100644 --- a/iphone/Maps/Classes/CustomAlert/SpinnerAlert/MWMSpinnerAlert.xib +++ b/iphone/Maps/Classes/CustomAlert/SpinnerAlert/MWMSpinnerAlert.xib @@ -1,20 +1,12 @@ - - - - + + - + - - - HelveticaNeue - HelveticaNeue-Medium - - @@ -23,10 +15,10 @@ - + - + - + @@ -64,7 +55,7 @@ @@ -94,22 +84,7 @@ - - - - - - - - - - - - - - - - + diff --git a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.xib b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.xib index b18e631e34..5cc3d7c155 100644 --- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.xib +++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgress.xib @@ -1,11 +1,9 @@ - - - - + + - + @@ -16,7 +14,7 @@ - + @@ -27,7 +25,7 @@ - + @@ -60,6 +58,7 @@ + diff --git a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.m b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.m index de402494e3..ca6c4b2a69 100644 --- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.m +++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.m @@ -69,8 +69,9 @@ static CGFloat angleWithProgress(CGFloat progress) { return 2.0 * M_PI * progres [self setColoring:MWMButtonColoringBlue forState:MWMCircularProgressStateCompleted]; } -- (void)mwm_refreshUI +- (void)applyTheme { + [super applyTheme]; self.suspendRefreshProgress = YES; [self setupColors]; self.suspendRefreshProgress = NO; diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.h b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.h index 4c2eeaaed6..d51989098e 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.h +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.h @@ -10,9 +10,6 @@ enum class AuthorizationButtonType AuthorizationButtonTypeOSM }; -UIColor * AuthorizationButtonBackgroundColor(AuthorizationButtonType type); -void AuthorizationConfigButton(UIButton * btn, AuthorizationButtonType type); - // Deletes any stored credentials if called with empty key or secret. void AuthorizationStoreCredentials(osm::KeySecret const & keySecret); BOOL AuthorizationHaveCredentials(); diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm index ffd16a0091..60e2a12809 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm @@ -38,42 +38,6 @@ void SetEmptyOSMUserName() [ud synchronize]; } -UIColor * AuthorizationButtonTextColor(AuthorizationButtonType type) -{ - switch (type) - { - case AuthorizationButtonType::AuthorizationButtonTypeGoogle: return UIColor.blackColor; - case AuthorizationButtonType::AuthorizationButtonTypeFacebook: return UIColor.whiteColor; - case AuthorizationButtonType::AuthorizationButtonTypeOSM: return [UIColor white]; - } - return UIColor.clearColor; -} - -UIColor * AuthorizationButtonBackgroundColor(AuthorizationButtonType type) -{ - switch (type) - { - case AuthorizationButtonType::AuthorizationButtonTypeGoogle: return UIColor.whiteColor; - case AuthorizationButtonType::AuthorizationButtonTypeFacebook: - return [UIColor colorWithRed:72. / 255. green:97. / 255. blue:163. / 255. alpha:1.]; - case AuthorizationButtonType::AuthorizationButtonTypeOSM: return [UIColor linkBlue]; - } - return UIColor.clearColor; -} - -void AuthorizationConfigButton(UIButton * btn, AuthorizationButtonType type) -{ - UIColor * txtCol = AuthorizationButtonTextColor(type); - UIColor * bgCol = AuthorizationButtonBackgroundColor(type); - - CGFloat const highlightedAlpha = 0.3; - [btn setTitleColor:txtCol forState:UIControlStateNormal]; - [btn setTitleColor:[txtCol colorWithAlphaComponent:highlightedAlpha] forState:UIControlStateHighlighted]; - - [btn setBackgroundColor:bgCol forState:UIControlStateNormal]; - [btn setBackgroundColor:[bgCol colorWithAlphaComponent:highlightedAlpha] forState:UIControlStateHighlighted]; -} - void AuthorizationStoreCredentials(osm::KeySecret const & keySecret) { NSUserDefaults * ud = NSUserDefaults.standardUserDefaults; diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm index f5eca1a396..8357310256 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm @@ -63,11 +63,7 @@ using namespace osm_auth_ios; self.loginGoogleButton.enabled = isConnected; self.loginFacebookButton.enabled = isConnected; self.signupButton.enabled = isConnected; - - AuthorizationConfigButton(self.loginGoogleButton, AuthorizationButtonType::AuthorizationButtonTypeGoogle); - AuthorizationConfigButton(self.loginFacebookButton, AuthorizationButtonType::AuthorizationButtonTypeFacebook); - AuthorizationConfigButton(self.loginOSMButton, AuthorizationButtonType::AuthorizationButtonTypeOSM); - + if (!isConnected) { self.loginGoogleButton.layer.borderColor = UIColor.clearColor.CGColor; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Layers/LayersViewController.swift b/iphone/Maps/Classes/CustomViews/MapViewControls/Layers/LayersViewController.swift index 746a05f0aa..3506b353c9 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Layers/LayersViewController.swift +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Layers/LayersViewController.swift @@ -38,14 +38,12 @@ final class LayersViewController: MWMViewController { private func updateTrafficButton() { let enabled = MapOverlayManager.trafficEnabled() - trafficButton.setTitleColor(enabled ? UIColor.linkBlue() : UIColor.blackSecondaryText(), for: .normal) - trafficButton.imageName = enabled ? "btn_menu_traffic_on" : "btn_menu_traffic_off" + trafficButton.setStyleAndApply(enabled ? "LayersTrafficButtonEnabled" : "LayersTrafficButtonDisabled") } private func updateSubwayButton() { let enabled = MapOverlayManager.transitEnabled() - subwayButton.setTitleColor(enabled ? UIColor.linkBlue() : UIColor.blackSecondaryText(), for: .normal) - subwayButton.imageName = enabled ? "btn_menu_subway_on" : "btn_menu_subway_off" + subwayButton.setStyleAndApply(enabled ? "LayersSubwayButtonEnabled" : "LayersSubwayButtonDisabled") } private func updateIsoLinesButton() { diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Layers/LayersViewController.xib b/iphone/Maps/Classes/CustomViews/MapViewControls/Layers/LayersViewController.xib index 8a59c9c6f4..c9a0e4707c 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Layers/LayersViewController.xib +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Layers/LayersViewController.xib @@ -31,7 +31,7 @@ - + @@ -62,7 +62,7 @@ - + + + + - + @@ -104,20 +99,19 @@ diff --git a/iphone/Maps/UI/Authorization/AuthorizationViewController.swift b/iphone/Maps/UI/Authorization/AuthorizationViewController.swift index b562e30914..cf10ecb6d1 100644 --- a/iphone/Maps/UI/Authorization/AuthorizationViewController.swift +++ b/iphone/Maps/UI/Authorization/AuthorizationViewController.swift @@ -15,7 +15,7 @@ final class AuthorizationViewController: MWMViewController { lazy var chromeView: UIView = { let view = UIView() - view.backgroundColor = UIColor.blackStatusBarBackground() + view.styleName = "BlackStatusBarBackground" return view }() @@ -25,45 +25,14 @@ final class AuthorizationViewController: MWMViewController { } } - @IBOutlet private weak var contentView: UIView! { - didSet { - contentView.backgroundColor = UIColor.white() - } - } - - @IBOutlet private weak var titleLabel: UILabel! { - didSet { - titleLabel.font = UIFont.bold22() - titleLabel.textColor = UIColor.blackPrimaryText() - titleLabel.text = L("profile_authorization_title") - } - } - - @IBOutlet weak var separator: UIView! { - didSet { - separator.backgroundColor = UIColor.blackDividers() - } - } - - @IBOutlet private weak var textLabel: UILabel! { - didSet { - textLabel.font = UIFont.regular14() - textLabel.textColor = UIColor.blackSecondaryText() - textLabel.text = L("sign_message_gdpr") - } - } + @IBOutlet private weak var contentView: UIView! + @IBOutlet private weak var titleLabel: UILabel! + @IBOutlet weak var separator: UIView! + @IBOutlet private weak var textLabel: UILabel! @IBOutlet private weak var googleButton: UIButton! { didSet { - let layer = googleButton.layer - layer.cornerRadius = 8 - layer.borderWidth = 1 - layer.borderColor = UIColor.blackDividers().cgColor - googleButton.clipsToBounds = true googleButton.setTitle("Google", for: .normal) - googleButton.setTitleColor(UIColor.blackPrimaryText(), for: .normal) - googleButton.setTitleColor(UIColor.blackSecondaryText(), for: .disabled) - googleButton.titleLabel?.font = UIFont.bold14() googleButton.isEnabled = false } } @@ -81,11 +50,6 @@ final class AuthorizationViewController: MWMViewController { @IBOutlet private weak var facebookButton: UIButton! { didSet { - facebookButton.layer.cornerRadius = 8 - facebookButton.clipsToBounds = true - facebookButton.titleLabel?.font = UIFont.bold14() - facebookButton.setBackgroundColor(UIColor.facebookButtonBackground(), for: .normal) - facebookButton.setBackgroundColor(UIColor.facebookButtonBackgroundDisabled(), for: .disabled) facebookButton.isEnabled = false } } @@ -120,29 +84,9 @@ final class AuthorizationViewController: MWMViewController { } } - @IBOutlet private weak var privacyPolicyCheck: Checkmark! { - didSet { - privacyPolicyCheck.offTintColor = .blackHintText() - privacyPolicyCheck.onTintColor = .linkBlue() - privacyPolicyCheck.contentHorizontalAlignment = .left - } - } - - @IBOutlet private weak var termsOfUseCheck: Checkmark! { - didSet { - termsOfUseCheck.offTintColor = .blackHintText() - termsOfUseCheck.onTintColor = .linkBlue() - termsOfUseCheck.contentHorizontalAlignment = .left - } - } - - @IBOutlet private weak var latestNewsCheck: Checkmark! { - didSet { - latestNewsCheck.offTintColor = .blackHintText() - latestNewsCheck.onTintColor = .linkBlue() - latestNewsCheck.contentHorizontalAlignment = .left - } - } + @IBOutlet private weak var privacyPolicyCheck: Checkmark! + @IBOutlet private weak var termsOfUseCheck: Checkmark! + @IBOutlet private weak var latestNewsCheck: Checkmark! @IBAction func onCheck(_ sender: Checkmark) { let allButtonsChecked = privacyPolicyCheck.isChecked && @@ -156,10 +100,8 @@ final class AuthorizationViewController: MWMViewController { @IBOutlet private weak var privacyPolicyTextView: UITextView! { didSet { let htmlString = String(coreFormat: L("sign_agree_pp_gdpr"), arguments: [User.privacyPolicyLink()]) - let attributes: [NSAttributedString.Key : Any] = [NSAttributedString.Key.font: UIFont.regular16(), - NSAttributedString.Key.foregroundColor: UIColor.blackPrimaryText()] privacyPolicyTextView.attributedText = NSAttributedString.string(withHtml: htmlString, - defaultAttributes: attributes) + defaultAttributes: [:]) privacyPolicyTextView.delegate = self } } @@ -167,10 +109,8 @@ final class AuthorizationViewController: MWMViewController { @IBOutlet private weak var termsOfUseTextView: UITextView! { didSet { let htmlString = String(coreFormat: L("sign_agree_tof_gdpr"), arguments: [User.termsOfUseLink()]) - let attributes: [NSAttributedString.Key : Any] = [NSAttributedString.Key.font: UIFont.regular16(), - NSAttributedString.Key.foregroundColor: UIColor.blackPrimaryText()] termsOfUseTextView.attributedText = NSAttributedString.string(withHtml: htmlString, - defaultAttributes: attributes) + defaultAttributes: [:]) termsOfUseTextView.delegate = self } } @@ -178,9 +118,7 @@ final class AuthorizationViewController: MWMViewController { @IBOutlet private weak var latestNewsTextView: UITextView! { didSet { let text = L("sign_agree_news_gdpr") - let attributes: [NSAttributedString.Key : Any] = [NSAttributedString.Key.font: UIFont.regular16(), - NSAttributedString.Key.foregroundColor: UIColor.blackPrimaryText()] - latestNewsTextView.attributedText = NSAttributedString(string: text, attributes: attributes) + latestNewsTextView.attributedText = NSAttributedString(string: text, attributes: [:]) } } diff --git a/iphone/Maps/UI/Authorization/AuthorizationViewController.xib b/iphone/Maps/UI/Authorization/AuthorizationViewController.xib index 7a1280ded2..395a6cbce4 100644 --- a/iphone/Maps/UI/Authorization/AuthorizationViewController.xib +++ b/iphone/Maps/UI/Authorization/AuthorizationViewController.xib @@ -1,9 +1,7 @@ - - + - - + @@ -28,11 +26,11 @@ - + - + @@ -40,26 +38,33 @@ - + - + + + + - + - + @@ -71,7 +76,7 @@ - + @@ -99,6 +104,7 @@ + @@ -117,7 +123,7 @@ - + @@ -145,6 +151,7 @@ + @@ -185,6 +192,7 @@ + @@ -200,49 +208,54 @@ + + + + + @@ -278,6 +291,9 @@ + + + diff --git a/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.xib b/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.xib index 06b386c424..e50e4cb92a 100644 --- a/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.xib +++ b/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.xib @@ -1,21 +1,9 @@ - - - - + - - - - + - - - HelveticaNeue - HelveticaNeue-Medium - - @@ -23,21 +11,21 @@ - - + + - + - + - + - + @@ -45,24 +33,22 @@ @@ -95,7 +81,7 @@ - + @@ -148,23 +126,21 @@ - @@ -191,19 +167,7 @@ - - - - - - - - - - - - - + @@ -228,6 +192,7 @@ + diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewCell.m b/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewCell.m index 45a6a65870..0699435bee 100644 --- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewCell.m +++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewCell.m @@ -35,8 +35,8 @@ self.badgeCount.hidden = YES; } self.isEnabled = isEnabled; - self.icon.mwm_coloring = isEnabled ? MWMImageColoringBlack : MWMImageColoringGray; - self.label.textColor = isEnabled ? [UIColor blackPrimaryText] : [UIColor blackHintText]; + [self.icon setStyleAndApply: isEnabled ? @"MWMBlack" : @"MWMGray" ]; + [self.label setStyleAndApply: isEnabled ? @"blackPrimaryText" : @"blackHintText"]; self.promo = NO; } @@ -45,8 +45,8 @@ { self.icon.image = [UIImage imageNamed:imageName]; self.label.text = label; - self.icon.mwm_coloring = MWMImageColoringBlue; - self.label.textColor = [UIColor linkBlue]; + [self.icon setStyleAndApply:@"MWMBlue"]; + [self.label setStyleAndApply:@"linkBlueText"]; self.badgeBackground.hidden = YES; self.badgeCount.hidden = YES; self.isEnabled = YES; @@ -60,9 +60,9 @@ [super setHighlighted:highlighted]; if (self.promo) - self.label.textColor = highlighted ? [UIColor linkBlueHighlighted] : [UIColor linkBlue]; + [self.label setStyleAndApply: highlighted ? @"linkBlueHighlightedText" : @"linkBlueText"]; else - self.label.textColor = highlighted ? [UIColor blackHintText] : [UIColor blackPrimaryText]; + [self.label setStyleAndApply: highlighted ? @"blackHintText" : @"blackPrimaryText"]; } - (void)setSelected:(BOOL)selected diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewLandscapeCell.xib b/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewLandscapeCell.xib index a11427522e..a03e887f87 100644 --- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewLandscapeCell.xib +++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewLandscapeCell.xib @@ -1,23 +1,15 @@ - - - - + + - + - - - HelveticaNeue - HelveticaNeue-Medium - - - + @@ -31,17 +23,16 @@ - + @@ -62,11 +53,7 @@ - - - - - + diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewPortraitCell.xib b/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewPortraitCell.xib index 95305c086f..e6af12f54a 100644 --- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewPortraitCell.xib +++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewPortraitCell.xib @@ -1,23 +1,15 @@ - - - - + + - + - - - HelveticaNeue - HelveticaNeue-Medium - - - + @@ -31,7 +23,7 @@ - + @@ -65,11 +56,7 @@ - - - - - + @@ -79,7 +66,7 @@ - + diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuView.m b/iphone/Maps/UI/BottomMenu/MWMBottomMenuView.m index cec7e33abd..0e87d77305 100644 --- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuView.m +++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuView.m @@ -1,6 +1,7 @@ #import "MWMBottomMenuView.h" #import "MWMAvailableAreaAffectDirection.h" #import "MWMButton.h" +#import "SwiftBridge.h" //#import static CGFloat kAdditionalHeight = 64; @@ -52,6 +53,12 @@ static CGFloat kDefaultMainButtonsHeight = 48; [super layoutSubviews]; } +- (void)applyTheme +{ + [super applyTheme]; + [self updateAppearance]; +} + - (void)updateAppearance { [self updateAlphaAndColor]; @@ -64,12 +71,12 @@ static CGFloat kDefaultMainButtonsHeight = 48; { case MWMBottomMenuStateHidden: break; case MWMBottomMenuStateInactive: - self.extraBottomView.backgroundColor = [UIColor menuBackground]; + [self.extraBottomView setStyleAndApply: @"MenuBackground"]; self.downloadBadge.alpha = [self isCompact] ? 0.0 : 1.0; self.additionalButtons.alpha = 0.0; break; case MWMBottomMenuStateActive: - self.extraBottomView.backgroundColor = [UIColor white]; + [self.extraBottomView setStyleAndApply: @"Background"]; self.downloadBadge.alpha = 0.0; self.additionalButtons.alpha = 1.0; break; diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.h b/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.h index c265a4f7ad..f3f93be0a3 100644 --- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.h +++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.h @@ -12,7 +12,6 @@ - (instancetype)initWithParentController:(MapViewController *)controller delegate:(id)delegate; -- (void)mwm_refreshUI; - (void)updateBadgeVisible:(BOOL)visible; + (void)updateAvailableArea:(CGRect)frame; diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm b/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm index 18be6e13c5..ac1ca38021 100644 --- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm +++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm @@ -106,7 +106,6 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) { [self refreshLayout]; } -- (void)mwm_refreshUI { [self.view mwm_refreshUI]; } - (void)updateBadgeVisible:(BOOL)visible { self.downloadBadge.hidden = !visible; } #pragma mark - Refresh Collection View layout diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.xib b/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.xib index 6292335a0b..8b86bfc2bc 100644 --- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.xib +++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.xib @@ -1,12 +1,7 @@ - - - - + - - - + @@ -25,7 +20,7 @@ - + @@ -41,7 +36,7 @@ - + @@ -52,7 +47,7 @@ - + @@ -63,7 +58,7 @@ - + @@ -74,7 +69,7 @@ - + @@ -85,7 +80,7 @@ - + @@ -99,10 +94,7 @@ - - - - + @@ -142,7 +134,7 @@ - + diff --git a/iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift b/iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift index 2a9355be71..8b4856eb92 100644 --- a/iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift +++ b/iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift @@ -147,4 +147,9 @@ final class CarPlayMapViewController: MWMViewController { super.traitCollectionDidChange(previousTraitCollection) ThemeManager.invalidate() } + + override func applyTheme() { + super.applyTheme() + updateSpeedControl() + } } diff --git a/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryBookingCell.swift b/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryBookingCell.swift index c4766e93cd..5f526a9337 100644 --- a/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryBookingCell.swift +++ b/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryBookingCell.swift @@ -1,45 +1,14 @@ @objc(MWMDiscoveryBookingCell) final class DiscoveryBookingCell: UICollectionViewCell { @IBOutlet private weak var avatar: UIImageView! - @IBOutlet private weak var name: UILabel! { - didSet { - name.font = UIFont.medium14() - name.textColor = UIColor.blackPrimaryText() - } - } - - @IBOutlet private weak var stars: UILabel! { - didSet { - stars.font = UIFont.regular12() - stars.textColor = UIColor.blackSecondaryText() - } - } - - @IBOutlet private weak var price: UILabel! { - didSet { - price.font = UIFont.medium14() - price.textColor = UIColor.blackSecondaryText() - } - } - - @IBOutlet private weak var rating: RatingSummaryView! { - didSet { - rating.defaultConfig() - rating.textFont = UIFont.bold12() - rating.textSize = 12 - } - } - - @IBOutlet private weak var distance: UILabel! { - didSet { - distance.font = UIFont.medium14() - distance.textColor = UIColor.linkBlue() - } - } + @IBOutlet private weak var name: UILabel! + @IBOutlet private weak var stars: UILabel! + @IBOutlet private weak var price: UILabel! + @IBOutlet private weak var rating: RatingSummaryView! + @IBOutlet private weak var distance: UILabel! @IBOutlet private weak var buildRoute: UIButton! { didSet { - buildRoute.setTitleColor(UIColor.linkBlue(), for: .normal) buildRoute.setTitle(L("p2p_to_here"), for: .normal) } } @@ -95,6 +64,5 @@ final class DiscoveryBookingCell: UICollectionViewCell { override func awakeFromNib() { super.awakeFromNib() - layer.borderColor = UIColor.blackDividers().cgColor } } diff --git a/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryBookingCell.xib b/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryBookingCell.xib index de91a244e8..aecbd9a447 100644 --- a/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryBookingCell.xib +++ b/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryBookingCell.xib @@ -1,17 +1,15 @@ - - - - + + - + - + @@ -33,8 +31,7 @@ - - + @@ -60,11 +63,7 @@ - - - - - + @@ -80,7 +79,6 @@ - - + @@ -61,6 +65,9 @@ + + + @@ -93,13 +100,7 @@ - - - - - - - + diff --git a/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryMoreCell.swift b/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryMoreCell.swift index 424dd50bd2..a57105f92a 100644 --- a/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryMoreCell.swift +++ b/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryMoreCell.swift @@ -12,6 +12,5 @@ final class DiscoveryMoreCell: UICollectionViewCell { required init?(coder aDecoder: NSCoder) { super.init(coder: aDecoder) - layer.borderColor = UIColor.blackDividers().cgColor } } diff --git a/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryMoreCell.xib b/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryMoreCell.xib index 38ad424b46..d826a34535 100644 --- a/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryMoreCell.xib +++ b/iphone/Maps/UI/Discovery/Collection Cells/DiscoveryMoreCell.xib @@ -1,11 +1,9 @@ - - - - + + - + @@ -29,19 +27,17 @@ - - + @@ -71,7 +67,7 @@ - + diff --git a/iphone/Maps/UI/Discovery/Collection Cells/DiscoverySearchCell.swift b/iphone/Maps/UI/Discovery/Collection Cells/DiscoverySearchCell.swift index 561c15d9d4..580e2a3d9b 100644 --- a/iphone/Maps/UI/Discovery/Collection Cells/DiscoverySearchCell.swift +++ b/iphone/Maps/UI/Discovery/Collection Cells/DiscoverySearchCell.swift @@ -3,19 +3,8 @@ final class DiscoverySearchCell: UICollectionViewCell { @IBOutlet private weak var titleLabel: UILabel! @IBOutlet private weak var subtitleLabel: UILabel! @IBOutlet private weak var distanceLabel: UILabel! - @IBOutlet private weak var popularView: UIView! { - didSet { - popularView.tintColor = UIColor.linkBlue() - } - } - - @IBOutlet private weak var ratingView: RatingSummaryView! { - didSet { - ratingView.defaultConfig() - ratingView.textFont = UIFont.bold12() - ratingView.textSize = 12 - } - } + @IBOutlet private weak var popularView: UIView! + @IBOutlet private weak var ratingView: RatingSummaryView! typealias Tap = () -> () private var tap: Tap? @@ -52,6 +41,5 @@ final class DiscoverySearchCell: UICollectionViewCell { required init?(coder aDecoder: NSCoder) { super.init(coder: aDecoder) - layer.borderColor = UIColor.blackDividers().cgColor } } diff --git a/iphone/Maps/UI/Discovery/Collection Cells/DiscoverySearchCell.xib b/iphone/Maps/UI/Discovery/Collection Cells/DiscoverySearchCell.xib index c6c9e87a61..26582e94c4 100644 --- a/iphone/Maps/UI/Discovery/Collection Cells/DiscoverySearchCell.xib +++ b/iphone/Maps/UI/Discovery/Collection Cells/DiscoverySearchCell.xib @@ -1,11 +1,9 @@ - - - - + + - + @@ -19,7 +17,7 @@ - + - - - - - @@ -88,11 +79,11 @@ - + - + @@ -115,20 +105,16 @@ - - - - + @@ -156,13 +142,7 @@ - - - - - - - + @@ -174,11 +154,4 @@ - - - - - - - diff --git a/iphone/Maps/UI/Discovery/MWMDiscoveryController.xib b/iphone/Maps/UI/Discovery/MWMDiscoveryController.xib index b91aeeccef..34d85c6199 100644 --- a/iphone/Maps/UI/Discovery/MWMDiscoveryController.xib +++ b/iphone/Maps/UI/Discovery/MWMDiscoveryController.xib @@ -1,11 +1,9 @@ - - - - + + - + @@ -22,10 +20,10 @@ - + - + @@ -38,7 +36,7 @@ - + diff --git a/iphone/Maps/UI/Discovery/Table Cells/DiscoveryNoResultsCell.xib b/iphone/Maps/UI/Discovery/Table Cells/DiscoveryNoResultsCell.xib index 24343b670c..6a3eb29a1e 100644 --- a/iphone/Maps/UI/Discovery/Table Cells/DiscoveryNoResultsCell.xib +++ b/iphone/Maps/UI/Discovery/Table Cells/DiscoveryNoResultsCell.xib @@ -1,51 +1,46 @@ - - - - + + - - + - + - + - + - diff --git a/iphone/Maps/UI/Discovery/Table Cells/DiscoveryOnlineTemplateCell.swift b/iphone/Maps/UI/Discovery/Table Cells/DiscoveryOnlineTemplateCell.swift index 91f6c2b548..a316a07065 100644 --- a/iphone/Maps/UI/Discovery/Table Cells/DiscoveryOnlineTemplateCell.swift +++ b/iphone/Maps/UI/Discovery/Table Cells/DiscoveryOnlineTemplateCell.swift @@ -13,22 +13,11 @@ final class DiscoveryOnlineTemplateCell: MWMTableViewCell { } } - @IBOutlet var containerView: UIView! { - didSet { - containerView.backgroundColor = UIColor.white() - containerView.layer.cornerRadius = 6.0 - containerView.layer.borderWidth = 1.0 - containerView.layer.borderColor = UIColor.blackDividers().cgColor - } - } + @IBOutlet var containerView: UIView! @IBOutlet var header: UILabel! @IBOutlet var title: UILabel! @IBOutlet var subtitle: UILabel! - @IBOutlet var actionButton: UIButton! { - didSet { - actionButton.setTitleColor(UIColor.linkBlue(), for: .normal) - } - } + @IBOutlet var actionButton: UIButton! typealias Tap = () -> () private var tap: Tap? diff --git a/iphone/Maps/UI/Discovery/Table Cells/DiscoveryOnlineTemplateCell.xib b/iphone/Maps/UI/Discovery/Table Cells/DiscoveryOnlineTemplateCell.xib index cb96e240db..3a3fc55bea 100644 --- a/iphone/Maps/UI/Discovery/Table Cells/DiscoveryOnlineTemplateCell.xib +++ b/iphone/Maps/UI/Discovery/Table Cells/DiscoveryOnlineTemplateCell.xib @@ -1,11 +1,9 @@ - - - - + + - + @@ -16,10 +14,10 @@ - + - + - @@ -54,16 +47,17 @@ - + - + + diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAddScheduleTableViewCell.xib b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAddScheduleTableViewCell.xib index 973be289c2..3a93e40314 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAddScheduleTableViewCell.xib +++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAddScheduleTableViewCell.xib @@ -1,26 +1,19 @@ - - - - + + - + - - - HelveticaNeue - - - + - + - + - + @@ -98,11 +89,11 @@ - + - + @@ -111,6 +102,7 @@ + diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.mm b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.mm index a3a59055b9..a939fb036d 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.mm +++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.mm @@ -1,5 +1,5 @@ #import "MWMOpeningHoursDaysSelectorTableViewCell.h" -#import "UIImageView+Coloring.h" +#import "SwiftBridge.h" @interface MWMOpeningHoursDaysSelectorTableViewCell () @@ -73,7 +73,7 @@ using namespace osmoh; if (image.tag == tag) { image.image = [UIImage imageNamed:selected ? @"radioBtnOn" : @"radioBtnOff"]; - image.mwm_coloring = selected ? MWMImageColoringBlue : MWMImageColoringGray; + [image setStyleAndApply: selected ? @"MWMBlue" : @"MWMGray"]; } } } diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.xib b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.xib index 0cd2ad93d2..ea7e29452b 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.xib +++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.xib @@ -1,26 +1,19 @@ - - - - + + - + - - - HelveticaNeue - - - + - + @@ -38,17 +31,17 @@ - + - + - + @@ -65,7 +58,7 @@ - + @@ -83,17 +76,17 @@ - + - + - + @@ -110,7 +103,7 @@ - + @@ -128,17 +121,17 @@ - + - + - + @@ -155,7 +148,7 @@ - + @@ -173,17 +166,17 @@ - + - + - + @@ -200,7 +193,7 @@ - + @@ -218,17 +211,17 @@ - + - + - + @@ -245,7 +238,7 @@ - + @@ -263,17 +256,17 @@ - + - + - + @@ -290,7 +283,7 @@ - + @@ -308,17 +301,17 @@ - + - + - + @@ -335,16 +328,16 @@ - + - + - + @@ -353,7 +346,7 @@ - + @@ -394,11 +387,11 @@ - + - + @@ -423,6 +416,7 @@ + diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDeleteScheduleTableViewCell.xib b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDeleteScheduleTableViewCell.xib index c5b5c73d64..1c03f29c98 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDeleteScheduleTableViewCell.xib +++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDeleteScheduleTableViewCell.xib @@ -1,26 +1,19 @@ - - - - + + - + - - - HelveticaNeue - - - + - + - + - + @@ -60,12 +51,13 @@ - + - + + diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSelectorTableViewCell.xib b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSelectorTableViewCell.xib index 3fde43f081..56679789e0 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSelectorTableViewCell.xib +++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSelectorTableViewCell.xib @@ -1,29 +1,23 @@ - - - - + + - - + - + - + - - - @@ -31,16 +25,13 @@ - - - - + - + @@ -99,16 +90,17 @@ - + - + + diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSpanTableViewCell.xib b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSpanTableViewCell.xib index 31caff6f36..f71aa3a734 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSpanTableViewCell.xib +++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSpanTableViewCell.xib @@ -1,87 +1,76 @@ - - - - + + - + - - - HelveticaNeue - - - + - + - + - + - + - + - + - + @@ -109,7 +98,7 @@ - + diff --git a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.swift b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.swift index b57573a6b5..fb96f27922 100644 --- a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.swift +++ b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.swift @@ -1,9 +1,16 @@ final class SearchCategoryCell: MWMTableViewCell { @IBOutlet weak var iconImageView: UIImageView! @IBOutlet weak var titleLabel: UILabel! - + + private var category: String = "" func update(with category: String) { + self.category = category iconImageView.mwm_name = String(format: "ic_%@", category) titleLabel.text = L(category) } + + override func applyTheme() { + super.applyTheme() + iconImageView.mwm_name = String(format: "ic_%@", category) + } } diff --git a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.xib b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.xib index a56ebf683d..890b5bdbcb 100644 --- a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.xib +++ b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.xib @@ -1,11 +1,7 @@ - - - - + - - + @@ -15,7 +11,7 @@ - + @@ -26,23 +22,22 @@ - + - + @@ -62,6 +57,7 @@ + diff --git a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryClearCell.xib b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryClearCell.xib index fcbca3d73c..8c13898168 100644 --- a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryClearCell.xib +++ b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryClearCell.xib @@ -1,11 +1,7 @@ - - - - + - - + @@ -15,7 +11,7 @@ - + @@ -25,27 +21,26 @@ - + - + - + @@ -62,6 +57,7 @@ + diff --git a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryQueryCell.xib b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryQueryCell.xib index f4c95af04c..c32b1de579 100644 --- a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryQueryCell.xib +++ b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryQueryCell.xib @@ -1,11 +1,7 @@ - - - - + - - + @@ -15,7 +11,7 @@ - + @@ -25,27 +21,26 @@ - + - + - + @@ -64,6 +59,7 @@ + diff --git a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.xib b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.xib index eb173c2799..8fa48acd42 100644 --- a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.xib +++ b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.xib @@ -1,11 +1,9 @@ - - - - + + - + @@ -23,7 +21,7 @@ - + @@ -31,7 +29,7 @@ - + @@ -50,7 +48,7 @@ - + diff --git a/iphone/Maps/UI/Search/Tabs/SearchTabViewController.swift b/iphone/Maps/UI/Search/Tabs/SearchTabViewController.swift index d4d787e350..44d5b6de0e 100644 --- a/iphone/Maps/UI/Search/Tabs/SearchTabViewController.swift +++ b/iphone/Maps/UI/Search/Tabs/SearchTabViewController.swift @@ -41,12 +41,6 @@ final class SearchTabViewController: TabViewController { } else { tabView.selectedIndex = activeTab.rawValue } - - tabView.backgroundColor = .pressBackground() - tabView.barTintColor = .primary() - tabView.tintColor = .white() - tabView.headerTextAttributes = [.foregroundColor: UIColor.whitePrimaryText(), - .font: UIFont.medium14()] tabView.delegate = self } diff --git a/iphone/Maps/UI/Settings/Cells/SettingsTableViewLinkCell.swift b/iphone/Maps/UI/Settings/Cells/SettingsTableViewLinkCell.swift index 68c4921a25..c5f4359f99 100644 --- a/iphone/Maps/UI/Settings/Cells/SettingsTableViewLinkCell.swift +++ b/iphone/Maps/UI/Settings/Cells/SettingsTableViewLinkCell.swift @@ -10,11 +10,15 @@ final class SettingsTableViewLinkCell: MWMTableViewCell { self.info?.styleName = "regular17:blackSecondaryText" } - @objc func config(title: String, info: String?) { - backgroundColor = UIColor.white() + override func awakeFromNib() { + super.awakeFromNib() + self.styleName = "Background" + self.title.styleName = "regular17:blackPrimaryText" + self.info.styleName = "regular17:blackSecondaryText" + } + @objc func config(title: String, info: String?) { self.title.text = title - styleTitle() self.info?.text = info self.info?.isHidden = info == nil diff --git a/iphone/Maps/UI/Settings/Cells/SettingsTableViewSelectableCell.swift b/iphone/Maps/UI/Settings/Cells/SettingsTableViewSelectableCell.swift index 6b1274b09c..e9c52721e0 100644 --- a/iphone/Maps/UI/Settings/Cells/SettingsTableViewSelectableCell.swift +++ b/iphone/Maps/UI/Settings/Cells/SettingsTableViewSelectableCell.swift @@ -2,15 +2,13 @@ final class SettingsTableViewSelectableCell: MWMTableViewCell { @IBOutlet fileprivate weak var title: UILabel! - @objc func config(title: String) { - backgroundColor = UIColor.white() - - self.title.text = title - styleTitle() + override func awakeFromNib() { + super.awakeFromNib() + self.styleName = "Background" + self.title.styleName = "regular17:blackPrimaryText" } - fileprivate func styleTitle() { - title.textColor = UIColor.blackPrimaryText() - title.font = UIFont.regular17() + @objc func config(title: String) { + self.title.text = title } } diff --git a/iphone/Maps/UI/Settings/Cells/SettingsTableViewSelectableProgressCell.swift b/iphone/Maps/UI/Settings/Cells/SettingsTableViewSelectableProgressCell.swift index dc13d1aee6..f49197cab2 100644 --- a/iphone/Maps/UI/Settings/Cells/SettingsTableViewSelectableProgressCell.swift +++ b/iphone/Maps/UI/Settings/Cells/SettingsTableViewSelectableProgressCell.swift @@ -3,16 +3,14 @@ final class SettingsTableViewSelectableProgressCell: MWMTableViewCell { @IBOutlet private weak var title: UILabel! @IBOutlet weak var progress: UIActivityIndicatorView! + override func awakeFromNib() { + super.awakeFromNib() + self.title.styleName = "regular17:blackPrimaryText" + } + @objc func config(title: String) { - backgroundColor = UIColor.white() progress.style = UIColor.isNightMode() ? .white : .gray self.title.text = title - styleTitle() - } - - fileprivate func styleTitle() { - title.textColor = UIColor.blackPrimaryText() - title.font = UIFont.regular17() } } diff --git a/iphone/Maps/UI/Settings/Cells/SettingsTableViewSwitchCell.swift b/iphone/Maps/UI/Settings/Cells/SettingsTableViewSwitchCell.swift index 7a2896a42c..5d5825aea9 100644 --- a/iphone/Maps/UI/Settings/Cells/SettingsTableViewSwitchCell.swift +++ b/iphone/Maps/UI/Settings/Cells/SettingsTableViewSwitchCell.swift @@ -28,6 +28,11 @@ final class SettingsTableViewSwitchCell: MWMTableViewCell { set { switchButton.isOn = newValue } } + override func awakeFromNib() { + super.awakeFromNib() + styleTitle() + } + @objc func config(delegate: SettingsTableViewSwitchCellDelegate, title: String, isOn: Bool) { backgroundColor = UIColor.white() @@ -37,7 +42,6 @@ final class SettingsTableViewSwitchCell: MWMTableViewCell { styleTitle() switchButton.isOn = isOn - styleSwitchButton() } @IBAction fileprivate func switchChanged() { @@ -45,11 +49,7 @@ final class SettingsTableViewSwitchCell: MWMTableViewCell { } fileprivate func styleTitle() { - title.textColor = isEnabled ? UIColor.blackPrimaryText() : UIColor.blackSecondaryText() - title.font = UIFont.regular17() - } - - fileprivate func styleSwitchButton() { - switchButton.onTintColor = UIColor.linkBlue() + let style = "regular17:" + (isEnabled ? "blackPrimaryText" : "blackSecondaryText") + title.setStyleAndApply(style) } } diff --git a/iphone/Maps/UI/Settings/DrivingOptions.storyboard b/iphone/Maps/UI/Settings/DrivingOptions.storyboard index 8fe1ebba8a..2d98a6e50b 100644 --- a/iphone/Maps/UI/Settings/DrivingOptions.storyboard +++ b/iphone/Maps/UI/Settings/DrivingOptions.storyboard @@ -1,11 +1,9 @@ - - - - + + - + @@ -24,18 +22,16 @@ - + @@ -63,18 +59,16 @@ - + @@ -102,18 +96,16 @@ - + @@ -141,18 +133,16 @@ - + diff --git a/iphone/Maps/UI/Settings/MWMAboutControllerHeader.xib b/iphone/Maps/UI/Settings/MWMAboutControllerHeader.xib index 1df764317c..9269a7f4df 100644 --- a/iphone/Maps/UI/Settings/MWMAboutControllerHeader.xib +++ b/iphone/Maps/UI/Settings/MWMAboutControllerHeader.xib @@ -1,9 +1,9 @@ - + - + @@ -15,7 +15,7 @@ - + @@ -32,8 +32,7 @@ - - + @@ -74,7 +71,7 @@ - + diff --git a/iphone/Maps/UI/Settings/MWMTTSLanguageViewController.mm b/iphone/Maps/UI/Settings/MWMTTSLanguageViewController.mm index 46e2e01f71..3a8e242b73 100644 --- a/iphone/Maps/UI/Settings/MWMTTSLanguageViewController.mm +++ b/iphone/Maps/UI/Settings/MWMTTSLanguageViewController.mm @@ -11,7 +11,6 @@ static NSString * const kUnwingSegueIdentifier = @"UnwindToTTSSettings"; { [super viewDidLoad]; self.title = L(@"pref_tts_other_section_title"); - self.tableView.separatorColor = [UIColor blackDividers]; } - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(SettingsTableViewSelectableCell *)sender diff --git a/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm b/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm index 419a6c4d62..f046853544 100644 --- a/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm +++ b/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm @@ -251,7 +251,6 @@ struct FAQCellStrategy : BaseCellStategy { [super viewDidLoad]; self.title = L(@"pref_tts_enable_title"); - self.tableView.separatorColor = [UIColor blackDividers]; MWMTextToSpeech * tts = [MWMTextToSpeech tts]; m_languages.reserve(3); diff --git a/iphone/Maps/UI/Storyboard/Authorization.storyboard b/iphone/Maps/UI/Storyboard/Authorization.storyboard index 4b5fa12b5e..deed70f9e6 100644 --- a/iphone/Maps/UI/Storyboard/Authorization.storyboard +++ b/iphone/Maps/UI/Storyboard/Authorization.storyboard @@ -1,9 +1,7 @@ - - + - - + @@ -13,68 +11,66 @@ - + - + - + - + - + - + - - + - + - + - + - - + - + @@ -100,47 +96,32 @@ - + @@ -199,14 +180,14 @@ - + - + - + - + - + - + - + @@ -496,7 +486,7 @@ - + @@ -516,7 +506,7 @@ - + @@ -541,26 +531,26 @@ - + - + - + + + + - + - + @@ -1597,22 +1567,23 @@ + + + - + - + @@ -1624,23 +1595,22 @@ + + + - + - + @@ -1651,26 +1621,27 @@ + + + - + - + @@ -1683,26 +1654,27 @@ + + + - + - + @@ -1716,29 +1688,26 @@ + - + - + - + @@ -1762,20 +1731,18 @@ - + - + @@ -1788,22 +1755,23 @@ + + + - + - + @@ -1816,22 +1784,23 @@ + + + - + - + @@ -1844,6 +1813,9 @@ + + + @@ -1875,39 +1847,36 @@ - + @@ -1955,7 +1924,7 @@ - + @@ -1965,20 +1934,18 @@ Приложение не использует мобильный интернет в роуминге. - + - + @@ -1995,20 +1962,18 @@ - + - + @@ -2025,20 +1990,18 @@ - + - + @@ -2077,27 +2040,26 @@ - + - + - + @@ -2114,20 +2076,19 @@ - + - + @@ -2144,20 +2105,19 @@ - + - + diff --git a/iphone/Maps/UI/Storyboard/Welcome.storyboard b/iphone/Maps/UI/Storyboard/Welcome.storyboard index 82ea76f915..101360c5da 100644 --- a/iphone/Maps/UI/Storyboard/Welcome.storyboard +++ b/iphone/Maps/UI/Storyboard/Welcome.storyboard @@ -1,9 +1,7 @@ - - + - - + @@ -13,42 +11,40 @@ - + - - + + - + -