Ready for app store closed #262

Carrene · Jun 19, 2019 · c8a5770 · c8a5770
1 parent 083ff57
commit c8a5770
Show file tree

Hide file tree

Showing 15 changed files with 119 additions and 100 deletions.
diff --git a/Configuration/CarreneDevDebug.xcconfig b/Configuration/CarreneDevDebug.xcconfig
@@ -2,11 +2,11 @@
 
 URL_ENDPOINT=192.168.1.32
 
-URL_PORT=443
+URL_PORT=80
 
-URL_SCHEME=https
+URL_SCHEME=http
 
-INITIAL_TOKEN=eyJhbGciOiJIUzI1NiIsImlhdCI6MTU1NDg3ODYzNiwiZXhwIjoxNTg2NDE0NjM2fQ.e30.cR0HTGypeFCLZcwGxLIHfboFwC20FI1Q43UzvCFvP2M
+INITIAL_TOKEN=eyJhbGciOiJIUzI1NiIsImlhdCI6MTU2MDkyNjQ3MSwiZXhwIjoxNTYxMjkzMTM3fQ.e30.Wc3XdwDGlRB_udcX-WZcuW2EMfuZLkNWMe11Ns-jkCs
 
 SELF_SIGNED=YES
 

diff --git a/MobileToken copy-Info.plist b/MobileToken copy-Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>راز</string>
+	<string>Raaz</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.3</string>
+	<string>1.0.4</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>InitialToken</key>
@@ -42,6 +42,8 @@
 	<array>
 		<string>armv7</string>
 	</array>
+	<key>UIRequiresFullScreen</key>
+	<true/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

diff --git a/MobileToken.xcodeproj/project.pbxproj b/MobileToken.xcodeproj/project.pbxproj
diff --git a/MobileToken.xcodeproj/xcshareddata/xcschemes/MobileTokenAppStore.xcscheme b/MobileToken.xcodeproj/xcshareddata/xcschemes/MobileTokenAppStore.xcscheme
@@ -85,7 +85,7 @@
       buildConfiguration = "DebugCarreneDev">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "ReleaseCarreneDev"
+      buildConfiguration = "ReleaseISCOP"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>
diff --git a/MobileToken/banks.json b/MobileToken/banks.json
@@ -1,6 +1,6 @@
 [
     {
-        "bankId": 3,
+        "bankId": 2,
         "phone": "+4917660877393"
     }
 ]

diff --git a/MobileToken/en.lproj/Localizable.strings b/MobileToken/en.lproj/Localizable.strings
@@ -69,8 +69,8 @@
 "lb_add_second_otp" = "Add second token";
 
 //placeholder
-"ph_sms_code" = "message code";
-"ph_atm_code" = "device code";
+"ph_sms_code" = "code recieved through device";
+"ph_atm_code" = "Code recieved through message";
 "ph_password" = "Password";
 "ph_confirm_password" = "Confirm password";
 

diff --git a/MobileToken/ui/cardlist/bankcards/BankCardPagerViewCell.swift b/MobileToken/ui/cardlist/bankcards/BankCardPagerViewCell.swift
@@ -110,9 +110,8 @@ class BankCardPagerViewCell: FSPagerViewCell {
         self.card = card
 
         if let cardNumber = UIHelper.getMaskCardNumber(number: card.number!){
-            let reversCards = Array(cardNumber.reversed())
-            for i in 0 ..< reversCards.count {
-                vCard.labelCardNumber[i].text = reversCards[i]
+            for i in 0 ..< cardNumber.count {
+                vCard.labelCardNumber[i].text = cardNumber[i]
             }
         }
 

diff --git a/MobileToken/ui/importtoken/ImportTokenViewController.swift b/MobileToken/ui/importtoken/ImportTokenViewController.swift
@@ -78,6 +78,7 @@ class ImportTokenViewController: BaseViewController,UITextViewDelegate, ImportTo
         textViewAtmCode.layer.borderWidth = 2
         textViewAtmCode.layer.borderColor = R.color.buttonColor()!.cgColor
         textViewAtmCode.textColor = R.color.buttonColor()?.withAlphaComponent(0.5)
+
         labelAtmCode.font = R.font.iranSansMobile(size: 12)
         labelSmsCode.font = R.font.iranSansMobile(size: 12)
         labelAtmCounter.font = R.font.iranSansMobile(size: 12)
@@ -118,7 +119,7 @@ class ImportTokenViewController: BaseViewController,UITextViewDelegate, ImportTo
     }
 
     func textViewDidBeginEditing(_ textView: UITextView) {
-        if textView.text.contains("کد") {
+        if textView.text == R.string.localizable.ph_sms_code() ||  textView.text == R.string.localizable.ph_atm_code() {
             textView.text = nil
         }
         textView.layer.borderColor = R.color.secondary()?.cgColor

diff --git a/MobileToken/ui/registration/phoneinput/PhoneInputViewController.swift b/MobileToken/ui/registration/phoneinput/PhoneInputViewController.swift
@@ -102,7 +102,7 @@ class PhoneInputViewController: UIViewController, BankCollectionViewDelegate,Cou
         countryPickerView.setCountryByPhoneCode("+49")
         let index = countryPickerView.countries.index(where: { (item) -> Bool in
             item.phoneCode == "+98" })!
-        countryPickerView.countries[index].name = "Germany"
+        countryPickerView.countries[index].name = "Iran"
 
     }
 

diff --git a/MobileToken/view/authenticationdefinition/en.lproj/AuthenticationDefinition.strings b/MobileToken/view/authenticationdefinition/en.lproj/AuthenticationDefinition.strings
@@ -9,10 +9,10 @@
 "G0v-Up-gtc.placeholder" = "password";
 
 /* Class = "UISegmentedControl"; Hmm-D3-AaW.segmentTitles[0] = "الگو"; ObjectID = "Hmm-D3-AaW"; */
-"Hmm-D3-AaW.segmentTitles[0]" = "الگو";
+"Hmm-D3-AaW.segmentTitles[0]" = "Pattern";
 
 /* Class = "UISegmentedControl"; Hmm-D3-AaW.segmentTitles[1] = "رمز"; ObjectID = "Hmm-D3-AaW"; */
-"Hmm-D3-AaW.segmentTitles[1]" = "رمز";
+"Hmm-D3-AaW.segmentTitles[1]" = "Password";
 
 /* Class = "UIBarButtonItem"; title = "  "; ObjectID = "ULQ-dM-OJz"; */
 "ULQ-dM-OJz.title" = "  ";
@@ -21,4 +21,4 @@
 "Y6w-Si-ccv.text" = "enter password again";
 
 /* Class = "UINavigationItem"; title = "روش احراز هویت"; ObjectID = "eiM-J4-X6A"; */
-"eiM-J4-X6A.title" = "روش احراز هویت";
+"eiM-J4-X6A.title" = "Authentication Method";
diff --git a/MobileToken/view/nibs/settings/authenticationtype/AuthenticationTypeTableViewCell.xib b/MobileToken/view/nibs/settings/authenticationtype/AuthenticationTypeTableViewCell.xib
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina5_5" 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"/>
@@ -17,61 +17,62 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="reuseAuthenticationTypeSettingRow" id="KGk-i7-Jjw" customClass="AuthenticationTypeSettingTableViewCell" customModule="MobileToken" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="reuseAuthenticationTypeSettingRow" id="KGk-i7-Jjw" customClass="AuthenticationTypeSettingTableViewCell" customModule="MobileToken" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="375" height="56"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="375" height="55.666666666666664"/>
+                <rect key="frame" x="0.0" y="0.0" width="337" height="55.666666666666664"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xFT-nP-W5v" userLabel="viewCell">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="55.666666666666664"/>
+                        <rect key="frame" x="0.0" y="0.0" width="337" height="55.666666666666664"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gtq-aV-gt8" userLabel="labelType">
-                                <rect key="frame" x="30" y="28" width="0.0" height="0.0"/>
-                                <fontDescription key="fontDescription" name="IRANSansMobile-Medium" family="IRANSansMobile" pointSize="16"/>
-                                <color key="textColor" red="0.42745098040000001" green="0.42745098040000001" blue="0.42745098040000001" alpha="1" colorSpace="calibratedRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Authentication type" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xw8-dp-cRT" userLabel="labelTitle">
-                                <rect key="frame" x="179" y="15" width="151" height="26"/>
+                                <rect key="frame" x="47" y="15" width="151" height="26"/>
                                 <fontDescription key="fontDescription" name="IRANSansMobile-Medium" family="IRANSansMobile" pointSize="16"/>
                                 <color key="textColor" name="buttonColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="lock-reset" translatesAutoresizingMaskIntoConstraints="NO" id="DUg-sn-6jc" userLabel="imageTimer">
-                                <rect key="frame" x="340" y="18" width="20" height="20"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="20" id="6WB-af-n6e"/>
-                                    <constraint firstAttribute="height" constant="20" id="I5s-mo-RXL"/>
-                                </constraints>
-                            </imageView>
                         </subviews>
                         <color key="backgroundColor" name="primary"/>
                         <constraints>
-                            <constraint firstItem="DUg-sn-6jc" firstAttribute="left" secondItem="Xw8-dp-cRT" secondAttribute="right" constant="10" id="3dR-LZ-Qwv"/>
-                            <constraint firstItem="DUg-sn-6jc" firstAttribute="centerY" secondItem="xFT-nP-W5v" secondAttribute="centerY" id="5dN-tU-va5"/>
-                            <constraint firstItem="gtq-aV-gt8" firstAttribute="left" secondItem="xFT-nP-W5v" secondAttribute="left" constant="30" id="EqE-pg-0jt"/>
-                            <constraint firstItem="gtq-aV-gt8" firstAttribute="centerY" secondItem="xFT-nP-W5v" secondAttribute="centerY" id="bgO-ga-t0d"/>
                             <constraint firstItem="Xw8-dp-cRT" firstAttribute="centerY" secondItem="xFT-nP-W5v" secondAttribute="centerY" id="jLa-ki-ErD"/>
-                            <constraint firstAttribute="right" secondItem="DUg-sn-6jc" secondAttribute="right" constant="15" id="o4i-2j-KmT"/>
                         </constraints>
                     </view>
+                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="lock-reset" translatesAutoresizingMaskIntoConstraints="NO" id="DUg-sn-6jc" userLabel="imageTimer">
+                        <rect key="frame" x="17" y="18" width="20" height="20"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="20" id="6WB-af-n6e"/>
+                            <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"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <nil key="highlightedColor"/>
+                    </label>
                 </subviews>
                 <color key="backgroundColor" name="primary"/>
                 <constraints>
+                    <constraint firstItem="b6J-rY-Hus" firstAttribute="centerY" secondItem="xFT-nP-W5v" secondAttribute="centerY" id="Aig-RD-OoD"/>
                     <constraint firstItem="xFT-nP-W5v" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="BFW-fF-jVr"/>
+                    <constraint firstItem="DUg-sn-6jc" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="GLE-x7-bxC"/>
                     <constraint firstItem="xFT-nP-W5v" firstAttribute="centerX" secondItem="H2p-sc-9uM" secondAttribute="centerX" id="QsZ-Np-Mjt"/>
+                    <constraint firstItem="DUg-sn-6jc" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="17" id="YBQ-sI-hdL"/>
                     <constraint firstItem="xFT-nP-W5v" firstAttribute="width" secondItem="H2p-sc-9uM" secondAttribute="width" id="bWZ-h7-L7y"/>
                     <constraint firstItem="xFT-nP-W5v" firstAttribute="height" secondItem="H2p-sc-9uM" secondAttribute="height" id="eUR-vp-L8g"/>
+                    <constraint firstItem="Xw8-dp-cRT" firstAttribute="leading" secondItem="DUg-sn-6jc" secondAttribute="trailing" constant="10" id="gf2-i1-Dqt"/>
+                    <constraint firstItem="b6J-rY-Hus" firstAttribute="trailing" secondItem="xFT-nP-W5v" secondAttribute="trailing" constant="-15" id="p1e-sF-MbB"/>
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
             <connections>
                 <outlet property="imageIcon" destination="DUg-sn-6jc" id="qba-iO-Okr"/>
                 <outlet property="labelTitle" destination="Xw8-dp-cRT" id="kQJ-WI-qIr"/>
-                <outlet property="labelType" destination="gtq-aV-gt8" id="Gna-Ul-jQr"/>
+                <outlet property="labelType" destination="b6J-rY-Hus" id="va6-eK-wIf"/>
             </connections>
+            <point key="canvasLocation" x="131.15942028985509" y="143.47826086956522"/>
         </tableViewCell>
     </objects>
     <resources>