Settings direction closed #286

Carrene · Aug 3, 2019 · 213082b · 213082b
1 parent faea081
commit 213082b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/MobileToken/de.lproj/Localizable.strings b/MobileToken/de.lproj/Localizable.strings
@@ -3,7 +3,7 @@
 "next" = "Next";
 "skip" = "Skip";
 "lb_enter_program" = "Enter program";
-"lb_version" = "version";
+"lb_version" = "";
 "lb_support" = "support";
 
 // snackbar

diff --git a/MobileToken/en.lproj/Localizable.strings b/MobileToken/en.lproj/Localizable.strings
@@ -3,7 +3,7 @@
 "next" = "Next";
 "skip" = "Skip";
 "lb_enter_program" = "Enter program";
-"lb_version" = "version";
+"lb_version" = "";
 "lb_support" = "support";
 
 // snackbar

diff --git a/MobileToken/ui/settings/basic/SettingsViewController.swift b/MobileToken/ui/settings/basic/SettingsViewController.swift
@@ -3,6 +3,7 @@ import UIKit
 
 class SettingsViewController: UIViewController,SettingsTableAdapterProtocol,SettingViewProtocol {
 
+    @IBOutlet weak var labelversionString: UILabel!
     @IBOutlet var tableView: UITableView!
     @IBOutlet var labelVersion: UILabel!
     var adapter : SettingsTableViewAdapter?
@@ -22,8 +23,10 @@ class SettingsViewController: UIViewController,SettingsTableAdapterProtocol,Sett
     func getVersion() {
         let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
         labelVersion.text = version!
+        labelversionString.text = R.string.localizable.lb_version()
     }
 
+
     func initTableView(settingMediator: SettingMediator) {
         tableView?.register(UINib(nibName:R.nib.lockScreenTimeTableViewCell.name,bundle: nil),forCellReuseIdentifier:R.reuseIdentifier.reuseLockScreenTimerSettingRow.identifier)
         tableView?.register(UINib(nibName:R.nib.authenticationTypeTableViewCell.name,bundle: nil),forCellReuseIdentifier:R.reuseIdentifier.reuseAuthenticationTypeSettingRow.identifier)

diff --git a/...oken/view/nibs/settings/authenticationtype/Base.lproj/AuthenticationTypeTableViewCell.xib b/...oken/view/nibs/settings/authenticationtype/Base.lproj/AuthenticationTypeTableViewCell.xib
@@ -28,7 +28,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" 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="367" y="28" width="0.0" height="0.0"/>
+                                <rect key="frame" x="360" 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"/>
@@ -49,7 +49,7 @@
                         </subviews>
                         <color key="backgroundColor" name="primary"/>
                         <constraints>
-                            <constraint firstAttribute="trailing" secondItem="gtq-aV-gt8" secondAttribute="trailing" constant="8" id="0AB-0x-Tuy"/>
+                            <constraint firstAttribute="trailing" secondItem="gtq-aV-gt8" secondAttribute="trailing" constant="15" id="0AB-0x-Tuy"/>
                             <constraint firstItem="DUg-sn-6jc" firstAttribute="centerY" secondItem="xFT-nP-W5v" secondAttribute="centerY" id="5dN-tU-va5"/>
                             <constraint firstItem="Xw8-dp-cRT" firstAttribute="leading" secondItem="DUg-sn-6jc" secondAttribute="trailing" constant="10" id="8iT-Vx-6n7"/>
                             <constraint firstItem="DUg-sn-6jc" firstAttribute="leading" secondItem="xFT-nP-W5v" secondAttribute="leading" constant="15" id="ZE2-Hn-WP9"/>

diff --git a/MobileToken/view/nibs/settings/lockscreentime/Base.lproj/LockScreenTimeTableViewCell.xib b/MobileToken/view/nibs/settings/lockscreentime/Base.lproj/LockScreenTimeTableViewCell.xib
@@ -116,7 +116,7 @@
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="seconds" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jBa-RC-JwO" userLabel="labelSeconds">
-                                <rect key="frame" x="301.5" y="18" width="65.5" height="25.5"/>
+                                <rect key="frame" x="294.5" y="18" width="65.5" height="25.5"/>
                                 <fontDescription key="fontDescription" name="IRANSansMobileFaNum" family="IRANSansMobile(FaNum)" pointSize="16"/>
                                 <color key="textColor" name="buttonColor"/>
                                 <nil key="highlightedColor"/>
@@ -133,7 +133,7 @@
                             <constraint firstItem="lNM-iF-yCq" firstAttribute="leading" secondItem="6ET-8m-5lP" secondAttribute="leading" constant="15" id="Vfd-DC-rLM"/>
                             <constraint firstItem="xIl-pG-zsS" firstAttribute="left" secondItem="6ET-8m-5lP" secondAttribute="left" constant="15" id="cmD-UY-4h5"/>
                             <constraint firstItem="lNM-iF-yCq" firstAttribute="top" secondItem="6ET-8m-5lP" secondAttribute="top" constant="18" id="kmV-bt-vFZ"/>
-                            <constraint firstAttribute="trailing" secondItem="jBa-RC-JwO" secondAttribute="trailing" constant="8" id="odi-sD-X1h"/>
+                            <constraint firstAttribute="trailing" secondItem="jBa-RC-JwO" secondAttribute="trailing" constant="15" id="odi-sD-X1h"/>
                             <constraint firstAttribute="bottom" secondItem="xIl-pG-zsS" secondAttribute="bottom" constant="15" id="sml-nC-wrN"/>
                         </constraints>
                     </view>

diff --git a/MobileToken/view/settings/basic/Base.lproj/Settings.storyboard b/MobileToken/view/settings/basic/Base.lproj/Settings.storyboard
@@ -94,6 +94,7 @@
                     <simulatedTabBarMetrics key="simulatedBottomBarMetrics"/>
                     <connections>
                         <outlet property="labelVersion" destination="74y-71-IgY" id="Yat-eZ-u1W"/>
+                        <outlet property="labelversionString" destination="TkY-iF-rcV" id="3fe-6V-Kvp"/>
                         <outlet property="tableView" destination="2RQ-2g-WfX" id="v1s-47-0EB"/>
                         <segue destination="CH3-Ix-uEq" kind="show" identifier="settingToAuthenticationDefinitionSegue" id="Ozs-Jd-d0g"/>
                         <segue destination="kd4-Cy-Ix5" kind="show" identifier="settingToHelp" id="14Y-T4-gtp"/>