Browse Source

issue fixing

v0.17
stepie.ub 1 year ago
parent
commit
6ebafd6d76
  1. 4
      GME Remit.xcodeproj/project.pbxproj
  2. 7
      GME Remit/Supported Files/Info.plist
  3. 2
      GME Remit/Utilities/TablePresenter/User Interface/View/Cell/TableCell.swift
  4. 22
      GME Remit/Utilities/TablePresenter/User Interface/View/TablePresenter.storyboard
  5. 14
      GME Remit/Utilities/TablePresenter/User Interface/View/TablePresenterViewController.swift

4
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",

7
GME Remit/Supported Files/Info.plist

@ -133,13 +133,6 @@ Turning on location service allows us to show you nearby JME's branches.</string
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UIUserInterfaceStyle</key>
<string>Light</string>
<key>UIViewControllerBasedStatusBarAppearance</key>

2
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() {

22
GME Remit/Utilities/TablePresenter/User Interface/View/TablePresenter.storyboard

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@ -107,7 +107,7 @@
<color key="separatorColor" red="0.87450980389999999" green="0.87450980389999999" blue="0.87450980389999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<inset key="separatorInset" minX="10" minY="0.0" maxX="10" maxY="0.0"/>
<view key="tableFooterView" contentMode="scaleToFill" id="az9-LK-5ZG">
<rect key="frame" x="0.0" y="127" width="307" height="44"/>
<rect key="frame" x="0.0" y="138" width="307" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Not found" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OZZ-An-Xpk">
@ -127,7 +127,7 @@
</view>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="TableCell" rowHeight="60" id="Vxa-Gw-LH4" customClass="TableCell" customModule="JME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="44.5" width="307" height="60"/>
<rect key="frame" x="0.0" y="50" width="307" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Vxa-Gw-LH4" id="WeG-Q7-FtG">
<rect key="frame" x="0.0" y="0.0" width="307" height="60"/>
@ -137,26 +137,24 @@
<rect key="frame" x="10" y="10" width="287" height="40"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="Rti-WB-QBf">
<rect key="frame" x="10" y="0.0" width="267" height="40"/>
<rect key="frame" x="10" y="4" width="267" height="32"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="252" verticalHuggingPriority="251" image="flag_vietnam" translatesAutoresizingMaskIntoConstraints="NO" id="dLg-4E-6az">
<rect key="frame" x="0.0" y="0.0" width="53.5" height="40"/>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="252" verticalHuggingPriority="251" image="flag_vietnam" translatesAutoresizingMaskIntoConstraints="NO" id="dLg-4E-6az">
<rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" secondItem="dLg-4E-6az" secondAttribute="height" multiplier="4:3" id="z1Q-3T-hlB"/>
<constraint firstAttribute="height" constant="32" id="1x6-NM-t3i"/>
<constraint firstAttribute="width" constant="32" id="c9v-2x-HMb"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Cell Title" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.80000000000000004" translatesAutoresizingMaskIntoConstraints="NO" id="J9n-Ka-9S8">
<rect key="frame" x="63.5" y="0.0" width="203.5" height="40"/>
<rect key="frame" x="42" y="0.0" width="225" height="32"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Bold" family="San Francisco Display" pointSize="16"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstAttribute="height" constant="40" id="SYu-gW-EhJ"/>
</constraints>
</stackView>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

14
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)
}

Loading…
Cancel
Save