Browse Source

release 2.5.1(0)

pull/1/head
InKwon James Kim 5 years ago
parent
commit
cae5400269
  1. 27
      GME Remit/Utilities/TablePresenter/User Interface/View/TablePresenter.storyboard
  2. 5
      GME Remit/Utilities/TablePresenter/User Interface/View/TablePresenterViewController.swift

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

@ -73,10 +73,22 @@
<constraint firstAttribute="height" constant="0.5" id="w6w-5s-3Dl"/>
</constraints>
</view>
<searchBar contentMode="redraw" searchBarStyle="minimal" translatesAutoresizingMaskIntoConstraints="NO" id="bDX-DE-rTc">
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7zN-Gw-dJN">
<rect key="frame" x="0.0" y="44.5" width="375" height="56"/>
<textInputTraits key="textInputTraits"/>
</searchBar>
<subviews>
<searchBar contentMode="redraw" searchBarStyle="minimal" translatesAutoresizingMaskIntoConstraints="NO" id="bDX-DE-rTc">
<rect key="frame" x="20" y="0.0" width="335" height="56"/>
<textInputTraits key="textInputTraits"/>
</searchBar>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="bDX-DE-rTc" firstAttribute="leading" secondItem="7zN-Gw-dJN" secondAttribute="leading" constant="20" id="CQO-kP-Ynf"/>
<constraint firstItem="bDX-DE-rTc" firstAttribute="top" secondItem="7zN-Gw-dJN" secondAttribute="top" id="We6-ld-DQi"/>
<constraint firstAttribute="bottom" secondItem="bDX-DE-rTc" secondAttribute="bottom" id="sTg-zm-aqn"/>
<constraint firstAttribute="trailing" secondItem="bDX-DE-rTc" secondAttribute="trailing" constant="20" id="xhd-t5-vqC"/>
</constraints>
</view>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="dlq-37-tEm" secondAttribute="trailing" id="HQS-oF-4gf"/>
@ -94,7 +106,7 @@
<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">
<rect key="frame" x="0.0" y="0.0" width="315" height="44"/>
<rect key="frame" x="0.0" y="0.0" width="355" height="44"/>
<fontDescription key="fontDescription" name="Roboto-MediumItalic" family="Roboto" pointSize="14"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
@ -117,10 +129,10 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nxP-L8-I6f">
<rect key="frame" x="10" y="10" width="295" height="39.5"/>
<rect key="frame" x="10" y="10" width="335" height="39.5"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="Rti-WB-QBf">
<rect key="frame" x="10" y="0.0" width="275" height="40"/>
<rect key="frame" x="10" y="0.0" width="315" height="40"/>
<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"/>
@ -130,7 +142,7 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Cell Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J9n-Ka-9S8">
<rect key="frame" x="63.5" y="0.0" width="211.5" height="40"/>
<rect key="frame" x="63.5" y="0.0" width="251.5" height="40"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
@ -212,6 +224,7 @@
<outlet property="mainView" destination="xw3-lN-oJG" id="h1n-ag-oSV"/>
<outlet property="notFoundLabel" destination="OZZ-An-Xpk" id="7fL-OU-2Zr"/>
<outlet property="searchBar" destination="bDX-DE-rTc" id="8bZ-4C-Tct"/>
<outlet property="searchBarContainerView" destination="7zN-Gw-dJN" id="x2c-7p-Zkf"/>
<outlet property="tableView" destination="IH7-nK-nTw" id="pM5-Yi-cyf"/>
<outlet property="titleLabel" destination="jvk-DD-Fur" id="llU-KI-kNU"/>
<outlet property="transparentView" destination="wxC-au-MnL" id="y8c-4N-r1f"/>

5
GME Remit/Utilities/TablePresenter/User Interface/View/TablePresenterViewController.swift

@ -58,10 +58,10 @@ class TablePresenterViewController: UIViewController {
if isFirst {
switch type {
case .branches:
searchBar.isHidden = false
searchBarContainerView.isHidden = false
dynamicHeight = view.frame.height * 0.8
default :
searchBar.isHidden = (model?.count ?? 0) < 10 ? true : false
searchBarContainerView.isHidden = (model?.count ?? 0) < 10 ? true : false
dynamicHeight = calculateHeight(count: model?.count ?? 0)
}
isFirst = false
@ -71,6 +71,7 @@ class TablePresenterViewController: UIViewController {
// MARK: IBOutlets
@IBOutlet private weak var titleLabel: UILabel!
@IBOutlet private weak var searchBarContainerView: UIView!
@IBOutlet private weak var searchBar: UISearchBar!
@IBOutlet private weak var tableView: UITableView!
@IBOutlet private weak var closeButton: UIButton!

Loading…
Cancel
Save