From a6d5a7ffd8c4b886b97e2dcb80a3859a42afc2e8 Mon Sep 17 00:00:00 2001
From: Ilya Grechuhin <i.grechuhin@gmail.com>
Date: Tue, 28 Nov 2017 16:21:55 +0300
Subject: [PATCH] [MAPSME-6071] [ios] Added error state handling for name field
 in editor.

---
 .../MWMEditorAdditionalNameTableViewCell.h    |  2 +
 .../MWMEditorAdditionalNameTableViewCell.mm   | 56 ++++++++++++++++++-
 .../MWMEditorAdditionalNameTableViewCell.xib  | 48 ++++++++++++----
 .../Cells/MWMEditorTextTableViewCell.xib      | 25 ++++++---
 iphone/Maps/UI/Editor/MWMEditorCommon.h       |  2 +-
 .../Maps/UI/Editor/MWMEditorViewController.mm | 34 ++++++-----
 6 files changed, 127 insertions(+), 40 deletions(-)

diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.h b/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.h
index 0c7fae91e5..a7e01dbc0d 100644
--- a/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.h
+++ b/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.h
@@ -11,6 +11,8 @@
                   langCode:(NSInteger)langCode
                   langName:(NSString *)langName
                       name:(NSString *)name
+              errorMessage:(NSString *)errorMessage
+                   isValid:(BOOL)isValid
               keyboardType:(UIKeyboardType)keyboardType;
 
 @end
diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.mm b/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.mm
index 70d459c1e4..fbf0516df7 100644
--- a/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.mm
+++ b/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.mm
@@ -1,15 +1,23 @@
 #import "MWMEditorAdditionalNameTableViewCell.h"
 
+namespace
+{
+CGFloat const kErrorLabelHeight = 16;
+}  // namespace
+
 @interface MWMEditorAdditionalNameTableViewCell ()
 
 @property(weak, nonatomic) IBOutlet UILabel * languageLabel;
-@property(weak, nonatomic) IBOutlet UIButton * languageButton;
 @property(weak, nonatomic) IBOutlet UITextField * textField;
+@property(weak, nonatomic) IBOutlet UILabel * errorLabel;
+@property(weak, nonatomic) IBOutlet NSLayoutConstraint * errorLabelHeight;
 
 @property(nonatomic, readwrite) NSInteger code;
 
 @property(weak, nonatomic) id<MWMEditorAdditionalName> delegate;
 
+@property(nonatomic) BOOL isValid;
+
 @end
 
 @implementation MWMEditorAdditionalNameTableViewCell
@@ -18,19 +26,63 @@
                   langCode:(NSInteger)langCode
                   langName:(NSString *)langName
                       name:(NSString *)name
+              errorMessage:(NSString *)errorMessage
+                   isValid:(BOOL)isValid
               keyboardType:(UIKeyboardType)keyboardType
 {
   self.delegate = delegate;
   self.code = langCode;
   self.languageLabel.text = langName;
-  [self.languageButton setTitle:langName forState:UIControlStateNormal];
+  self.errorLabel.text = errorMessage;
+  self.isValid = isValid;
   self.textField.text = name;
   self.textField.keyboardType = keyboardType;
+  self.textField.backgroundColor = [UIColor clearColor];
+  [self processValidation];
 }
 
 - (IBAction)changeLanguageTap { [self.delegate editAdditionalNameLanguage:self.code]; }
+
+- (void)processValidation
+{
+  if (self.isValid)
+  {
+    self.errorLabelHeight.constant = 0;
+    self.contentView.backgroundColor = [UIColor white];
+  }
+  else
+  {
+    self.errorLabelHeight.constant = kErrorLabelHeight;
+    self.contentView.backgroundColor = [UIColor errorPink];
+  }
+  [self layoutIfNeeded];
+}
+
+- (void)changeInvalidCellState
+{
+  if (self.isValid)
+    return;
+  self.isValid = YES;
+  [self processValidation];
+  [self.delegate tryToChangeInvalidStateForCell:self];
+}
+
 #pragma mark - UITextFieldDelegate
 
+- (BOOL)textField:(UITextField *)textField
+    shouldChangeCharactersInRange:(NSRange)range
+                replacementString:(NSString *)string
+{
+  [self changeInvalidCellState];
+  return YES;
+}
+
+- (BOOL)textFieldShouldClear:(UITextField *)textField
+{
+  [self changeInvalidCellState];
+  return YES;
+}
+
 - (void)textFieldDidEndEditing:(UITextField *)textField
 {
   [self.delegate cell:self changedText:textField.text];
diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.xib b/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.xib
index da315f3138..2f823b5301 100644
--- a/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.xib
+++ b/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.xib
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeue.ttc">
+            <string>HelveticaNeue</string>
+        </array>
+    </customFonts>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
@@ -12,10 +20,12 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hfo-cP-AGX" id="JQH-ks-NoC">
-                <frame key="frameInset" width="320" height="43"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="zh-classical" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="efb-nS-cjm">
+                        <rect key="frame" x="16" y="13.5" width="80" height="17"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="17" id="8qF-WG-0JP"/>
                             <constraint firstAttribute="width" constant="80" id="RUn-7a-x8R"/>
@@ -29,6 +39,8 @@
                         </userDefinedRuntimeAttributes>
                     </label>
                     <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalCompressionResistancePriority="499" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="9BY-PA-dlA">
+                        <rect key="frame" x="100" y="16.5" width="204" height="11"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
                         <textInputTraits key="textInputTraits"/>
                         <userDefinedRuntimeAttributes>
@@ -42,15 +54,32 @@
                             <outlet property="delegate" destination="hfo-cP-AGX" id="jkD-0x-Ods"/>
                         </connections>
                     </textField>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="252" translatesAutoresizingMaskIntoConstraints="NO" id="SZa-Bj-se1">
+                        <rect key="frame" x="60" y="31.5" width="252" height="0.0"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" priority="999" id="CPF-uE-pzx"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                        <color key="textColor" red="0.95686274510000002" green="0.26274509800000001" blue="0.21176470589999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular12"/>
+                            <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="red"/>
+                        </userDefinedRuntimeAttributes>
+                    </label>
                 </subviews>
                 <constraints>
+                    <constraint firstItem="SZa-Bj-se1" firstAttribute="leading" secondItem="JQH-ks-NoC" secondAttribute="leading" constant="60" id="BcS-gb-9vl"/>
+                    <constraint firstAttribute="trailing" secondItem="SZa-Bj-se1" secondAttribute="trailing" constant="8" id="EBU-G3-tgp"/>
                     <constraint firstAttribute="trailing" secondItem="9BY-PA-dlA" secondAttribute="trailing" constant="16" id="EPW-QQ-h4A"/>
-                    <constraint firstItem="9BY-PA-dlA" firstAttribute="centerY" secondItem="JQH-ks-NoC" secondAttribute="centerY" id="Vfs-Wj-X79"/>
+                    <constraint firstItem="efb-nS-cjm" firstAttribute="centerY" secondItem="9BY-PA-dlA" secondAttribute="centerY" id="KMC-QU-FKv"/>
+                    <constraint firstAttribute="bottom" secondItem="SZa-Bj-se1" secondAttribute="bottom" constant="12" id="TdX-jx-CpD"/>
                     <constraint firstItem="efb-nS-cjm" firstAttribute="leading" secondItem="JQH-ks-NoC" secondAttribute="leading" constant="16" id="aeA-g6-24D"/>
                     <constraint firstItem="9BY-PA-dlA" firstAttribute="leading" secondItem="efb-nS-cjm" secondAttribute="trailing" constant="4" id="bE7-50-JFQ"/>
                     <constraint firstAttribute="bottom" secondItem="efb-nS-cjm" secondAttribute="bottom" priority="750" constant="12" id="fZC-8Q-bPw"/>
-                    <constraint firstItem="efb-nS-cjm" firstAttribute="top" secondItem="JQH-ks-NoC" secondAttribute="top" priority="750" constant="14" id="uOq-es-lVN"/>
-                    <constraint firstItem="efb-nS-cjm" firstAttribute="centerY" secondItem="JQH-ks-NoC" secondAttribute="centerY" id="w1Z-wg-zVl"/>
+                    <constraint firstItem="SZa-Bj-se1" firstAttribute="top" secondItem="9BY-PA-dlA" secondAttribute="bottom" constant="4" id="gPQ-Bf-Pgf"/>
+                    <constraint firstItem="9BY-PA-dlA" firstAttribute="top" secondItem="JQH-ks-NoC" secondAttribute="top" constant="16" id="qga-k9-pOr"/>
                 </constraints>
                 <userDefinedRuntimeAttributes>
                     <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
@@ -60,15 +89,12 @@
                 <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
             </userDefinedRuntimeAttributes>
             <connections>
+                <outlet property="errorLabel" destination="SZa-Bj-se1" id="hqN-vX-0Hw"/>
+                <outlet property="errorLabelHeight" destination="CPF-uE-pzx" id="X4g-6X-W0e"/>
                 <outlet property="languageLabel" destination="efb-nS-cjm" id="13M-9D-Qbf"/>
                 <outlet property="textField" destination="9BY-PA-dlA" id="SCv-JL-5TL"/>
             </connections>
             <point key="canvasLocation" x="342" y="257"/>
         </tableViewCell>
     </objects>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/>
-    </simulatedMetricsContainer>
 </document>
diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorTextTableViewCell.xib b/iphone/Maps/UI/Editor/Cells/MWMEditorTextTableViewCell.xib
index fef2ebbd30..8fed33a2f7 100644
--- a/iphone/Maps/UI/Editor/Cells/MWMEditorTextTableViewCell.xib
+++ b/iphone/Maps/UI/Editor/Cells/MWMEditorTextTableViewCell.xib
@@ -1,10 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="HelveticaNeue.ttc">
+            <string>HelveticaNeue</string>
+        </array>
+    </customFonts>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
@@ -12,11 +21,11 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="59"/>
             <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="320" height="58"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="58.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="5uK-5Q-cg0">
-                        <rect key="frame" x="16" y="8" width="28" height="28"/>
+                        <rect key="frame" x="16" y="11" width="28" height="28"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="28" id="6Kb-wI-H3V"/>
                             <constraint firstAttribute="width" constant="28" id="nbm-T8-Yob"/>
@@ -27,7 +36,7 @@
                     </imageView>
                     <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="bottom" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="krN-k2-9qO">
                         <rect key="frame" x="60" y="0.0" width="252" height="28"/>
-                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstAttribute="height" priority="750" constant="28" id="P3n-mD-g5V"/>
                         </constraints>
@@ -44,12 +53,12 @@
                     </textField>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="252" translatesAutoresizingMaskIntoConstraints="NO" id="Lht-i1-s0H">
                         <rect key="frame" x="60" y="32" width="252" height="14"/>
-                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstAttribute="height" priority="250" id="2X4-TJ-v2V"/>
                         </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                        <color key="textColor" red="0.95686274510000002" green="0.26274509800000001" blue="0.21176470589999999" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="textColor" red="0.95686274510000002" green="0.26274509800000001" blue="0.21176470589999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular12"/>
diff --git a/iphone/Maps/UI/Editor/MWMEditorCommon.h b/iphone/Maps/UI/Editor/MWMEditorCommon.h
index eb467c6b76..71e44532d2 100644
--- a/iphone/Maps/UI/Editor/MWMEditorCommon.h
+++ b/iphone/Maps/UI/Editor/MWMEditorCommon.h
@@ -6,7 +6,7 @@
 - (void)cell:(MWMTableViewCell *)cell changedText:(NSString *)changeText;
 - (void)cell:(UITableViewCell *)cell changeSwitch:(BOOL)changeSwitch;
 - (void)cellSelect:(UITableViewCell *)cell;
-- (void)tryToChangeInvalidStateForCell:(MWMEditorTextTableViewCell *)cell;
+- (void)tryToChangeInvalidStateForCell:(MWMTableViewCell *)cell;
 
 @end
 
diff --git a/iphone/Maps/UI/Editor/MWMEditorViewController.mm b/iphone/Maps/UI/Editor/MWMEditorViewController.mm
index 838e979988..22111d4040 100644
--- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm
+++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm
@@ -551,6 +551,8 @@ void registerCellsForTableView(vector<MWMEditorCellType> const & cells, UITableV
                        langCode:name.m_code
                        langName:@(name.m_langName)
                            name:@(name.m_name.c_str())
+                   errorMessage:L(@"error_enter_correct_name")
+                        isValid:isValid
                    keyboardType:UIKeyboardTypeDefault];
     }
     else
@@ -570,6 +572,8 @@ void registerCellsForTableView(vector<MWMEditorCellType> const & cells, UITableV
                        langCode:langCode
                        langName:@(StringUtf8Multilang::GetLangNameByCode(langCode))
                            name:@(name.c_str())
+                   errorMessage:L(@"error_enter_correct_name")
+                        isValid:isValid
                    keyboardType:UIKeyboardTypeDefault];
     }
     break;
@@ -856,7 +860,7 @@ void registerCellsForTableView(vector<MWMEditorCellType> const & cells, UITableV
 
 #pragma mark - MWMEditorCellProtocol
 
-- (void)tryToChangeInvalidStateForCell:(MWMEditorTextTableViewCell *)cell
+- (void)tryToChangeInvalidStateForCell:(MWMTableViewCell *)cell
 {
   [self.tableView update:^{
     NSIndexPath * indexPath = [self.tableView indexPathForCell:cell];
@@ -870,48 +874,42 @@ void registerCellsForTableView(vector<MWMEditorCellType> const & cells, UITableV
   NSIndexPath * indexPath = [self.tableView indexPathForRowAtPoint:cell.center];
   MWMEditorCellType const cellType = [self cellTypeForIndexPath:indexPath];
   string const val = changeText.UTF8String;
+  BOOL isFieldValid = YES;
   switch (cellType)
   {
   case MWMEditorCellTypePhoneNumber:
     m_mapObject.SetPhone(val);
-    if (!osm::EditableMapObject::ValidatePhoneList(val))
-      [self markCellAsInvalid:indexPath];
+    isFieldValid = osm::EditableMapObject::ValidatePhoneList(val);
     break;
   case MWMEditorCellTypeWebsite:
     m_mapObject.SetWebsite(val);
-    if (!osm::EditableMapObject::ValidateWebsite(val))
-      [self markCellAsInvalid:indexPath];
+    isFieldValid = osm::EditableMapObject::ValidateWebsite(val);
     break;
   case MWMEditorCellTypeEmail:
     m_mapObject.SetEmail(val);
-    if (!osm::EditableMapObject::ValidateEmail(val))
-      [self markCellAsInvalid:indexPath];
+    isFieldValid = osm::EditableMapObject::ValidateEmail(val);
     break;
   case MWMEditorCellTypeOperator: m_mapObject.SetOperator(val); break;
   case MWMEditorCellTypeBuilding:
     m_mapObject.SetHouseNumber(val);
-    if (!osm::EditableMapObject::ValidateHouseNumber(val))
-      [self markCellAsInvalid:indexPath];
+    isFieldValid = osm::EditableMapObject::ValidateHouseNumber(val);
     break;
   case MWMEditorCellTypeZipCode:
     m_mapObject.SetPostcode(val);
-    if (!osm::EditableMapObject::ValidatePostCode(val))
-      [self markCellAsInvalid:indexPath];
+    isFieldValid = osm::EditableMapObject::ValidatePostCode(val);
     break;
   case MWMEditorCellTypeBuildingLevels:
     m_mapObject.SetBuildingLevels(val);
-    if (!osm::EditableMapObject::ValidateBuildingLevels(val))
-      [self markCellAsInvalid:indexPath];
+    isFieldValid = osm::EditableMapObject::ValidateBuildingLevels(val);
     break;
   case MWMEditorCellTypeAdditionalName:
-  {
-    MWMEditorAdditionalNameTableViewCell * tCell =
-        static_cast<MWMEditorAdditionalNameTableViewCell *>(cell);
-    m_mapObject.SetName(val, tCell.code);
+    m_mapObject.SetName(val, static_cast<MWMEditorAdditionalNameTableViewCell *>(cell).code);
+    isFieldValid = osm::EditableMapObject::ValidateName(val);
     break;
-  }
   default: NSAssert(false, @"Invalid field for changeText");
   }
+  if (!isFieldValid)
+    [self markCellAsInvalid:indexPath];
 }
 
 - (void)cell:(UITableViewCell *)cell changeSwitch:(BOOL)changeSwitch