Ready 1.0.5 closed #261

Carrene · Jun 20, 2019 · 19686f9 · 19686f9
1 parent 041a277
commit 19686f9
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 12 deletions.
diff --git a/MobileToken copy-Info.plist b/MobileToken copy-Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.4</string>
+	<string>1.0.5</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>InitialToken</key>

diff --git a/MobileToken/en.lproj/Localizable.strings b/MobileToken/en.lproj/Localizable.strings
@@ -73,6 +73,7 @@
 "ph_atm_code" = "Code recieved through message";
 "ph_password" = "Password";
 "ph_confirm_password" = "Confirm password";
+"ph_activation_code" = "Activation Code";
 
 //actionsheet
 "ash_edit_card_name" = "edit card name";

diff --git a/MobileToken/ui/registration/phoneconfirmation/PhoneConfirmationViewController.swift b/MobileToken/ui/registration/phoneconfirmation/PhoneConfirmationViewController.swift
@@ -64,7 +64,7 @@ class PhoneConfirmationViewController: BaseViewController,PhoneConfirmationViewP
         labelPhone.text = phoneNumber
         labelChangeNumber.isUserInteractionEnabled = true
         labelEnterCode.font = R.font.iranSansMobile(size: 12)
-        textFieldCode.attributedPlaceholder = NSAttributedString(string: "کد فعال سازی",
+        textFieldCode.attributedPlaceholder = NSAttributedString(string: R.string.localizable.ph_activation_code(),
                                                              attributes: [NSAttributedString.Key.foregroundColor: R.color.buttonColor()!.withAlphaComponent(0.5)])
 //        initBankNib(bank:self.selectedBank!)
     }

diff --git a/MobileToken/ui/settings/help/basic/HelpTableViewAdapter.swift b/MobileToken/ui/settings/help/basic/HelpTableViewAdapter.swift
@@ -29,7 +29,8 @@ class HelpTableViewAdapter : NSObject,UITableViewDelegate,UITableViewDataSource
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: R.reuseIdentifier.reuseHelpCell.identifier, for: indexPath) as! HelpTableViewCell
-        cell.textLabel?.text = dataSource![indexPath.row]
+        cell.labelQuestion?.textColor = R.color.buttonColor()
+        cell.labelQuestion.text = dataSource![indexPath.row]
         cell.selectionStyle = .none
         return cell
     }

diff --git a/MobileToken/ui/settings/help/basic/HelpTableViewCell.swift b/MobileToken/ui/settings/help/basic/HelpTableViewCell.swift
@@ -1,13 +1,10 @@
 import UIKit
 
 class HelpTableViewCell: UITableViewCell {
-
+    @IBOutlet var labelQuestion: UILabel!
     override func awakeFromNib() {
         super.awakeFromNib()
-        self.textLabel?.numberOfLines = 0
-        self.textLabel?.textAlignment = .right
-        self.textLabel?.font = R.font.iranSansMobile(size: 16)
-        self.textLabel?.textColor = R.color.buttonColor()
+        labelQuestion.font = UIHelper.getFont(size: 16)
     }
 
     override func setSelected(_ selected: Bool, animated: Bool) {

diff --git a/MobileToken/ui/settings/help/basic/HelpViewController.swift b/MobileToken/ui/settings/help/basic/HelpViewController.swift
@@ -2,6 +2,7 @@ import UIKit
 
 class HelpViewController: BaseViewController,HelpTableAdapterProtocol {
 
+
     @IBOutlet var tableView: UITableView!
     private var adapter : HelpTableViewAdapter?
     private var index : Int?

diff --git a/MobileToken/util/UIHelper.swift b/MobileToken/util/UIHelper.swift
@@ -39,6 +39,14 @@ class UIHelper {
         return R.font.iranSansMobileFaNumMedium(size: size)!
     }
 
+    static func getFont(size: CGFloat)-> UIFont {
+        if Locale.preferredLanguages[0] == "ar" {
+            return R.font.iranSansMobileFaNum(size: size)!
+        } else {
+            return UIFont.systemFont(ofSize: size)
+        }
+    }
+
     static func showFailedSnackBar() {
         SnackBarHelper.init(message: R.string.localizable.sb_bad_request(),color:R.color.errorDark()!, duration:TTGSnackbarDuration.short).show()
     }

diff --git a/MobileToken/view/nibs/settings/authenticationtype/AuthenticationTypeTableViewCell.xib b/MobileToken/view/nibs/settings/authenticationtype/AuthenticationTypeTableViewCell.xib
@@ -46,8 +46,8 @@
                             <constraint firstAttribute="height" constant="20" id="I5s-mo-RXL"/>
                         </constraints>
                     </imageView>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b6J-rY-Hus" userLabel="labelType">
-                        <rect key="frame" x="280" y="17.333333333333332" width="42" height="20.999999999999996"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b6J-rY-Hus" userLabel="labelType">
+                        <rect key="frame" x="322" y="28" width="0.0" height="0.0"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <nil key="highlightedColor"/>

diff --git a/MobileToken/view/settings/help/Help.storyboard b/MobileToken/view/settings/help/Help.storyboard
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="53v-M4-UbE">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="53v-M4-UbE">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <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"/>
@@ -29,8 +29,25 @@
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="S5x-U6-kE0" id="Dax-P3-UKy">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TNK-EC-lws">
+                                                    <rect key="frame" x="25" y="11" width="325" height="22"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="TNK-EC-lws" firstAttribute="leading" secondItem="Dax-P3-UKy" secondAttribute="leadingMargin" constant="10" id="JZs-DZ-Q31"/>
+                                                <constraint firstItem="TNK-EC-lws" firstAttribute="top" secondItem="Dax-P3-UKy" secondAttribute="topMargin" id="cjl-Dd-Pxh"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="TNK-EC-lws" secondAttribute="trailing" constant="10" id="jLH-Uu-XPX"/>
+                                                <constraint firstItem="TNK-EC-lws" firstAttribute="bottom" secondItem="Dax-P3-UKy" secondAttribute="bottomMargin" id="pkP-wJ-l6k"/>
+                                            </constraints>
                                         </tableViewCellContentView>
                                         <color key="backgroundColor" name="primary"/>
+                                        <connections>
+                                            <outlet property="labelQuestion" destination="TNK-EC-lws" id="gHJ-a8-bIP"/>
+                                        </connections>
                                     </tableViewCell>
                                 </prototypes>
                             </tableView>