1.修改iOS Apex Driver设置，增加Cache Size。

2.修改iOS Apex Driver Message，增加Unread。

Redant Drivers/Apex And Drivers/Home/HomeHeader.xib

@@ -163,15 +163,25 @@
                                 <button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="g4U-M8-oMo">
                                     <rect key="frame" x="57.5" y="19" width="40" height="40"/>
                                     <state key="normal" image="action_message"/>
-                                    <state key="selected" image="action_message_new"/>
+                                    <state key="selected" image="action_message"/>
                                     <connections>
                                         <action selector="messageBtnClick:" destination="CmN-WL-UzN" eventType="touchUpInside" id="rtb-6D-QVQ"/>
                                     </connections>
                                 </button>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3ey-sT-bNa">
+                                    <rect key="frame" x="88.5" y="13" width="15" height="15"/>
+                                    <color key="backgroundColor" red="1" green="0.1047433005" blue="0.075207091899999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="15" id="Kg6-vG-bOI"/>
+                                        <constraint firstAttribute="height" constant="15" id="flS-ZQ-lyo"/>
+                                    </constraints>
+                                </view>
                             </subviews>
                             <constraints>
+                                <constraint firstItem="3ey-sT-bNa" firstAttribute="top" secondItem="g4U-M8-oMo" secondAttribute="top" constant="-6" id="7Mp-e3-81a"/>
                                 <constraint firstItem="g4U-M8-oMo" firstAttribute="centerX" secondItem="iQb-jc-IpW" secondAttribute="centerX" id="Hcz-d3-Oxr"/>
                                 <constraint firstItem="T2T-ct-zc2" firstAttribute="centerX" secondItem="iQb-jc-IpW" secondAttribute="centerX" id="Rm8-84-grW"/>
+                                <constraint firstItem="3ey-sT-bNa" firstAttribute="trailing" secondItem="g4U-M8-oMo" secondAttribute="trailing" constant="6" id="cEc-xq-GuF"/>
                             </constraints>
                         </view>
                     </subviews>
@@ -354,6 +364,7 @@
                 <outlet property="availableTitleLabel" destination="Hae-rx-iyX" id="Mlr-72-rTe"/>
                 <outlet property="backgroundView" destination="q6Y-ok-z0V" id="O1Q-PB-BO0"/>
                 <outlet property="messageBtn" destination="g4U-M8-oMo" id="s8m-Kt-9Rw"/>
+                <outlet property="messageNewFlagView" destination="3ey-sT-bNa" id="6bv-0h-I3W"/>
                 <outlet property="settingBtn" destination="vJn-m4-oEg" id="rqD-th-mZy"/>
                 <outlet property="signoutBtn" destination="DoZ-Kc-GDv" id="gj7-9F-yXR"/>
             </connections>
@@ -363,7 +374,6 @@
     <resources>
         <image name="action_available" width="40" height="40"/>
         <image name="action_message" width="40" height="40"/>
-        <image name="action_message_new" width="40" height="40"/>
         <image name="action_setting" width="40" height="40"/>
         <image name="action_signout" width="40" height="40"/>
         <image name="action_unavailable" width="40" height="40"/>

Redant Drivers/Apex And Drivers/Home/RAHomeHeaderView.m

@@ -27,6 +27,8 @@
 
 @property (nonatomic,strong) IBOutlet UIButton *messageBtn;
 
+@property (nonatomic,strong) IBOutlet UIView *messageNewFlagView;
+
 @end
 
 @implementation RAHomeHeaderView
@@ -38,6 +40,9 @@
 - (void)awakeFromNib {
     [super awakeFromNib];
     
+    self.messageNewFlagView.layer.cornerRadius = 10.0f;
+    self.messageNewFlagView.layer.masksToBounds = YES;
+    
     self.NewOrderCount = self.ProcessingOrderCount = self.FinishOrderCount = 0;
     self.availabel = self.existNewMessage = NO;
     
@@ -97,6 +102,7 @@
 - (void)setExistNewMessage:(BOOL)existNewMessage {
     _existNewMessage = existNewMessage;
     self.messageBtn.selected = _existNewMessage;
+    self.messageNewFlagView.hidden = !_existNewMessage;
 }
 
 #pragma mark - Action

Redant Drivers/Apex And Drivers/Message/RAMessageViewController.m

@@ -31,6 +31,8 @@ typedef enum {
 @property (nonatomic,strong) NSMutableArray<RAMessageModel *> *messageArray;
 @property (nonatomic,strong) JLRefreshFooter *refreshFooter;
 
+@property (nonatomic,assign) BOOL unread;
+
 @end
 
 @implementation RAMessageViewController
@@ -45,6 +47,7 @@ typedef enum {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     
+    [self configNavigationBar];
     [self configTableView];
     
     [self loadData];
@@ -83,6 +86,12 @@ typedef enum {
     }];
 }
 
+- (void)configNavigationBar {
+    
+    UIBarButtonItem *unreadItem = [[UIBarButtonItem alloc] initWithTitle:@"Unread" style:UIBarButtonItemStylePlain target:self action:@selector(unreadBtnClick:)];
+    self.navigationItem.rightBarButtonItem = unreadItem;
+}
+
 #pragma mark - Getter
 
 - (UITableView *)tableView {
@@ -110,6 +119,19 @@ typedef enum {
     [self reloadData];
 }
 
+- (void)unreadBtnClick:(UIBarButtonItem *)sender {
+    self.unread = !self.unread;
+    if (self.unread) {
+        
+        sender.title = @"All";
+        
+    } else {
+        
+        sender.title = @"Unread";
+    }
+    [self reloadData];
+}
+
 #pragma mark - Data
 
 - (void)loadData:(LoadDataActionType)actionType {
@@ -130,9 +152,10 @@ typedef enum {
     RAProgressHUD *hud = [RAProgressHUD showHUDOnView:self.view];
     
     __weak typeof(self) weakSelf = self;
+    BOOL unread = self.unread;
     dispatch_async(dispatch_get_global_queue(0, 0), ^{
         
-        NSDictionary *json = [RADataProvider requestMessage:offset limit:limit];
+        NSDictionary *json = [RADataProvider requestMessage:offset limit:limit unread:unread];
         
         dispatch_async(dispatch_get_main_queue(), ^{
             

Redant Drivers/Apex And Drivers/RADataProvider.h

@@ -44,6 +44,6 @@
 
 + (NSDictionary *)requestChange:(NSString *)old password:(NSString *)pass;
 
-+ (NSDictionary *)requestMessage:(NSInteger)offset limit:(NSInteger)limit;
++ (NSDictionary *)requestMessage:(NSInteger)offset limit:(NSInteger)limit unread:(BOOL)unread;
 
 @end

Redant Drivers/Apex And Drivers/RADataProvider.m

@@ -368,12 +368,13 @@
     return [self handleJsonData:json];
 }
 
-+ (NSDictionary *)requestMessage:(NSInteger)offset limit:(NSInteger)limit {
++ (NSDictionary *)requestMessage:(NSInteger)offset limit:(NSInteger)limit unread:(BOOL)unread {
     
     NSMutableDictionary *params = [NSMutableDictionary dictionary];
     
     [params setObject:@(offset) forKey:@"offset"];
     [params setObject:@(limit) forKey:@"limit"];
+    [params setObject:@(unread) forKey:@"unread"];
     
     NSData* json=[self get_json:URL_MESSAGE_LIST parameters:params  file:nil];
     

Redant Drivers/Apex And Drivers/Setting/Cell/RASettingActionCell.m

@@ -13,6 +13,7 @@
 
 @property (nonatomic,strong) IBOutlet UILabel *titleLabel;
 @property (nonatomic,strong) IBOutlet UIActivityIndicatorView *activityIndicator;
+@property (nonatomic,strong) IBOutlet UILabel *sizeLabel;
 
 @end
 
@@ -39,11 +40,17 @@
     BOOL active = model.active;
     
     self.titleLabel.text = title;
+    
     if (active) {
         [self.activityIndicator startAnimating];
+        self.sizeLabel.hidden = YES;
+        
     } else{
         [self.activityIndicator stopAnimating];
+        self.sizeLabel.hidden = NO;
     }
+    
+    self.sizeLabel.text = model.detail;
 }
 
 @end

Redant Drivers/Apex And Drivers/Setting/Model/RASettingActionModel.h

@@ -19,5 +19,6 @@ typedef enum {
 
 @property (nonatomic,assign) RASettingActionType actionType;
 @property (nonatomic,assign) BOOL active;
+@property (nonatomic,copy) NSString *detail;
 
 @end

Redant Drivers/Apex And Drivers/Setting/Model/RASettingActionModel.m

@@ -17,9 +17,36 @@
 - (void)setActive:(BOOL)active{
     _active = active;
     
+    if (self.actionType == RASettingActionTypeCleanCache) {
+        
+        [self updateCacheSize];
+    }
+    
     if (self.delegate && [self.delegate respondsToSelector:@selector(refreshUI)]) {
         [self.delegate refreshUI];
     }
 }
 
+- (void)setActionType:(RASettingActionType)actionType {
+    
+    if (actionType == RASettingActionTypeCleanCache) {
+        
+        [self updateCacheSize];
+    }
+}
+
+- (void)updateCacheSize {
+ 
+    NSString *cacheDir = [NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) firstObject];
+    NSString *imageCacheDir = [cacheDir stringByAppendingPathComponent:@"ImageCache"];
+    float cacheSize = [RAUtils fileSizeForDir:imageCacheDir];
+    
+    self.detail = ({
+        
+        NSString *detail = [NSString stringWithFormat:@"%.1fM",cacheSize];
+        
+        detail;
+    });
+}
+
 @end

Redant Drivers/Apex And Drivers/Setting/RASettingViewController+TableDelegate.m

@@ -85,18 +85,19 @@
 }
 
 - (void)cleanDiskCache:(RASettingActionModel *)model {
-    model.active = YES;
+    
     
     dispatch_async(dispatch_get_main_queue(), ^{
     
         UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"Warning" message:@"are you sure to clean cached file" preferredStyle:UIAlertControllerStyleAlert];
         UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
             
-            model.active = NO;
         }];
         
         UIAlertAction *yesAction = [UIAlertAction actionWithTitle:@"Yes" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
             
+            model.active = YES;
+            
             dispatch_async(dispatch_get_global_queue(0, 0), ^{
 
                 NSFileManager *defaultManager = [NSFileManager defaultManager];
@@ -112,7 +113,7 @@
 //                    [self showAlert:@"Clean Success"];
 //                });
 
-                dispatch_after(dispatch_time(1 * NSEC_PER_SEC, DISPATCH_TIME_NOW), dispatch_get_main_queue(), ^{
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 1 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
                     model.active = NO;
 
                     [self showAlert:@"Clean Success"];

Redant Drivers/Apex And Drivers/Setting/setting.storyboard

@@ -26,7 +26,7 @@
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="© 2014 United Software Applications, Inc." textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="n2h-5Z-NBM">
-                                            <rect key="frame" x="5" y="5" width="590" height="30"/>
+                                            <rect key="frame" x="5" y="5" width="365" height="30"/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                             <nil key="textColor"/>
@@ -56,7 +56,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Ne-f7-mNd">
-                                                    <rect key="frame" x="531.5" y="21.5" width="35.5" height="17"/>
+                                                    <rect key="frame" x="306.5" y="21.5" width="35.5" height="17"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
@@ -84,13 +84,13 @@
                                             <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="7mb-Gz-UK4">
-                                                    <rect key="frame" x="10" y="21" width="521" height="18"/>
+                                                    <rect key="frame" x="10" y="21" width="296" height="18"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="745-1J-0vr">
-                                                    <rect key="frame" x="541" y="14.5" width="51" height="31"/>
+                                                    <rect key="frame" x="316" y="14.5" width="51" height="31"/>
                                                     <connections>
                                                         <action selector="switchBtnClick:" destination="fw3-Ce-iMX" eventType="valueChanged" id="qlF-Jb-a7c"/>
                                                     </connections>
@@ -118,27 +118,37 @@
                                             <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="rXI-of-ag8">
-                                                    <rect key="frame" x="10" y="21" width="533" height="18"/>
+                                                    <rect key="frame" x="10" y="21" width="308" height="18"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="Wf2-XY-ejy">
-                                                    <rect key="frame" x="553" y="11.5" width="37" height="37"/>
+                                                    <rect key="frame" x="328" y="11.5" width="37" height="37"/>
                                                     <color key="color" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 </activityIndicatorView>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="100M" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="emF-6X-Ajb">
+                                                    <rect key="frame" x="328" y="21.5" width="42" height="17"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
                                             </subviews>
                                             <constraints>
                                                 <constraint firstAttribute="trailing" secondItem="Wf2-XY-ejy" secondAttribute="trailing" constant="10" id="Hv4-VV-t0p"/>
                                                 <constraint firstItem="rXI-of-ag8" firstAttribute="leading" secondItem="NTz-8W-1bG" secondAttribute="leading" constant="10" id="K74-vK-dVC"/>
                                                 <constraint firstItem="rXI-of-ag8" firstAttribute="centerY" secondItem="NTz-8W-1bG" secondAttribute="centerY" id="NoT-Ks-zr9"/>
                                                 <constraint firstItem="Wf2-XY-ejy" firstAttribute="leading" secondItem="rXI-of-ag8" secondAttribute="trailing" constant="10" id="Xq4-z3-0Dg"/>
+                                                <constraint firstItem="emF-6X-Ajb" firstAttribute="leading" secondItem="Wf2-XY-ejy" secondAttribute="leading" id="fJV-Gw-9nF"/>
                                                 <constraint firstItem="Wf2-XY-ejy" firstAttribute="centerY" secondItem="NTz-8W-1bG" secondAttribute="centerY" id="iZb-76-W4M"/>
+                                                <constraint firstItem="emF-6X-Ajb" firstAttribute="centerY" secondItem="NTz-8W-1bG" secondAttribute="centerY" id="lm5-9Z-68o"/>
+                                                <constraint firstAttribute="trailing" secondItem="emF-6X-Ajb" secondAttribute="trailing" constant="5" id="wQ5-Js-UwO"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <connections>
                                             <outlet property="activityIndicator" destination="Wf2-XY-ejy" id="u3g-pn-8Fg"/>
+                                            <outlet property="sizeLabel" destination="emF-6X-Ajb" id="qap-qF-qzJ"/>
                                             <outlet property="titleLabel" destination="rXI-of-ag8" id="vGF-n3-dC6"/>
                                         </connections>
                                     </tableViewCell>
@@ -157,7 +167,7 @@
                                                     </constraints>
                                                 </imageView>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Apex &amp; Drivers 1.0" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0Rt-Xa-P59">
-                                                    <rect key="frame" x="70" y="15" width="520" height="21"/>
+                                                    <rect key="frame" x="70" y="15" width="295" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="21" id="I4Z-WS-ohs"/>
                                                     </constraints>
@@ -173,7 +183,7 @@
                                                     </constraints>
                                                 </imageView>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ver:1.0 build 180913" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gMo-mB-JAI">
-                                                    <rect key="frame" x="70" y="41" width="520" height="21"/>
+                                                    <rect key="frame" x="70" y="41" width="295" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="21" id="oz7-pl-nM7"/>
                                                     </constraints>
@@ -182,7 +192,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" bounces="NO" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" bouncesZoom="NO" editable="NO" text="redantsupport@united-us.net" translatesAutoresizingMaskIntoConstraints="NO" id="PVK-zg-HWg">
-                                                    <rect key="frame" x="65" y="89.5" width="525" height="25"/>
+                                                    <rect key="frame" x="65" y="89.5" width="300" height="25"/>
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="25" id="ccc-3X-Q0i"/>
@@ -192,7 +202,7 @@
                                                     <dataDetectorType key="dataDetectorTypes" link="YES"/>
                                                 </textView>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Support:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wiy-uj-wOO">
-                                                    <rect key="frame" x="70" y="75" width="520" height="19.5"/>
+                                                    <rect key="frame" x="70" y="75" width="295" height="19.5"/>
                                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
@@ -285,14 +295,14 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Tfn-3m-nS4">
-                                <rect key="frame" x="0.0" y="20" width="600" height="580"/>
+                                <rect key="frame" x="0.0" y="20" width="375" height="647"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="RAOptionCell" rowHeight="50" id="vtS-6b-ZlL" customClass="RAOptionCell">
-                                        <rect key="frame" x="0.0" y="28" width="600" height="50"/>
+                                        <rect key="frame" x="0.0" y="28" width="375" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="vtS-6b-ZlL" id="0Gc-fu-jG7">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="49.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="49.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="H3V-Ud-CQM">
@@ -345,7 +355,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Old password *required" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="AGg-Is-zfV">
-                                <rect key="frame" x="5" y="61" width="590" height="30"/>
+                                <rect key="frame" x="5" y="61" width="365" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="tdG-fz-DUH"/>
                                 </constraints>
@@ -357,13 +367,13 @@
                                 </connections>
                             </textField>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Change Password" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XYO-s8-g1R">
-                                <rect key="frame" x="5" y="30" width="590" height="21"/>
+                                <rect key="frame" x="5" y="30" width="365" height="21"/>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="New password *required" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="one-j7-LgU">
-                                <rect key="frame" x="5" y="101" width="590" height="30"/>
+                                <rect key="frame" x="5" y="101" width="365" height="30"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <textInputTraits key="textInputTraits" returnKeyType="done" secureTextEntry="YES"/>
@@ -372,7 +382,7 @@
                                 </connections>
                             </textField>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Confirm new password *required" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="dQK-Xb-iG2">
-                                <rect key="frame" x="5" y="141" width="590" height="30"/>
+                                <rect key="frame" x="5" y="141" width="365" height="30"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <textInputTraits key="textInputTraits" returnKeyType="done" secureTextEntry="YES"/>
@@ -381,13 +391,13 @@
                                 </connections>
                             </textField>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mZu-0K-iio">
-                                <rect key="frame" x="0.0" y="181" width="600" height="40"/>
+                                <rect key="frame" x="0.0" y="181" width="375" height="40"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gkw-yN-ovJ">
-                                        <rect key="frame" x="10" y="0.0" width="285" height="40"/>
+                                        <rect key="frame" x="10" y="0.0" width="172.5" height="40"/>
                                         <subviews>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="i90-wQ-C0t">
-                                                <rect key="frame" x="118.5" y="5" width="48" height="30"/>
+                                                <rect key="frame" x="62.5" y="5" width="48" height="30"/>
                                                 <state key="normal" title="Cancel"/>
                                                 <connections>
                                                     <action selector="cancelBtnClick:" destination="q0p-GF-XgD" eventType="touchUpInside" id="Bfz-hQ-8gd"/>
@@ -400,10 +410,10 @@
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xb4-bE-BCi">
-                                        <rect key="frame" x="305" y="0.0" width="285" height="40"/>
+                                        <rect key="frame" x="192.5" y="0.0" width="172.5" height="40"/>
                                         <subviews>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NV0-3K-Irh">
-                                                <rect key="frame" x="116" y="5" width="53" height="30"/>
+                                                <rect key="frame" x="60" y="5" width="53" height="30"/>
                                                 <state key="normal" title="Change"/>
                                                 <connections>
                                                     <action selector="changeBtnClick:" destination="q0p-GF-XgD" eventType="touchUpInside" id="oHD-Ns-DyX"/>