diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj index a81939c1..5afd34bc 100644 --- a/GME Remit.xcodeproj/project.pbxproj +++ b/GME Remit.xcodeproj/project.pbxproj @@ -8935,10 +8935,8 @@ "$(inherited)", "$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module", ); - MARKETING_VERSION = 1.6.0; ONLY_ACTIVE_ARCH = YES; - "OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--generate-entitlement-der"; OTHER_LDFLAGS = ( "$(OTHER_LDFLAGS)", @@ -8984,10 +8982,8 @@ "$(inherited)", "$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module", ); - MARKETING_VERSION = 1.6.0; ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = ( "$(OTHER_LDFLAGS)", "-ObjC", diff --git a/GME Remit/Supported Files/Info.plist b/GME Remit/Supported Files/Info.plist index d722d378..8fb80d1b 100644 --- a/GME Remit/Supported Files/Info.plist +++ b/GME Remit/Supported Files/Info.plist @@ -133,13 +133,6 @@ Turning on location service allows us to show you nearby JME's branches. UIInterfaceOrientationPortrait - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - UIUserInterfaceStyle Light UIViewControllerBasedStatusBarAppearance diff --git a/GME Remit/Utilities/TablePresenter/User Interface/View/Cell/TableCell.swift b/GME Remit/Utilities/TablePresenter/User Interface/View/Cell/TableCell.swift index 82527111..b501b3ed 100644 --- a/GME Remit/Utilities/TablePresenter/User Interface/View/Cell/TableCell.swift +++ b/GME Remit/Utilities/TablePresenter/User Interface/View/Cell/TableCell.swift @@ -19,6 +19,8 @@ class TableCell: UITableViewCell { cellImageView.isHidden = cellImage == nil ? true : false cellImageView.image = cellImage cellTitleLabel.text = model?.cellTitle + + cellTitleLabel.font = .sanfrancisco(.semibold, size: 16) } func optimizeCell() { diff --git a/GME Remit/Utilities/TablePresenter/User Interface/View/TablePresenter.storyboard b/GME Remit/Utilities/TablePresenter/User Interface/View/TablePresenter.storyboard index 7be90792..10ca6bee 100644 --- a/GME Remit/Utilities/TablePresenter/User Interface/View/TablePresenter.storyboard +++ b/GME Remit/Utilities/TablePresenter/User Interface/View/TablePresenter.storyboard @@ -1,9 +1,9 @@ - + - + @@ -107,7 +107,7 @@ - + - + @@ -137,26 +137,24 @@ - + - - + + - + + - - - diff --git a/GME Remit/Utilities/TablePresenter/User Interface/View/TablePresenterViewController.swift b/GME Remit/Utilities/TablePresenter/User Interface/View/TablePresenterViewController.swift index 243596ae..c46c82bb 100644 --- a/GME Remit/Utilities/TablePresenter/User Interface/View/TablePresenterViewController.swift +++ b/GME Remit/Utilities/TablePresenter/User Interface/View/TablePresenterViewController.swift @@ -117,7 +117,7 @@ class TablePresenterViewController: UIViewController { if !self.searchBarContainerView.isHidden { if self.searchBar.canBecomeFirstResponder { - self.searchBar.becomeFirstResponder() +// self.searchBar.becomeFirstResponder() } } } @@ -137,7 +137,7 @@ class TablePresenterViewController: UIViewController { override func viewWillDisappear(_ animated: Bool) { super.viewWillDisappear(animated) IQKeyboardManager.shared.enable = true - view.endEditing(true) +// view.endEditing(true) } // MARK: IBActions @@ -200,9 +200,17 @@ extension TablePresenterViewController { let configuration = delegate?.tablePresenterView(self) titleLabel.text = configuration?.presenterTitle + titleLabel.font = .sanfrancisco(.bold, size: 16) + titleLabel.textColor = .themeBlack notFoundLabel.text = configuration?.notFoundTitle + notFoundLabel.font = .sanfrancisco(.bold, size: 16) + notFoundLabel.textColor = .themeBlack searchBar.placeholder = configuration?.presenterTitle - +// searchBar.attributedPlaceholder = NSAttributedString( +// string: configuration?.presenterTitle, +// attributes: [NSAttributedStringKey.foregroundColor: .themeGray1, .font: .sanfrancisco(.medium, size: 14)] +// ) + searchBar.searchTextField.font = .sanfrancisco(.medium, size: 16) // searchBar.isHidden = !(configuration?.isUseSearchBar ?? true) }