Commit fa0ab730 authored by Grigor Aghabalyan's avatar Grigor Aghabalyan
Browse files

Merge branch 'dev' into 'master'

Feat: UI Issues fix

See merge request !2
parents 8845f56f 8e535554
......@@ -646,7 +646,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = JY829SQQAV;
INFOPLIST_FILE = App16/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
......@@ -667,7 +667,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = JY829SQQAV;
INFOPLIST_FILE = App16/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
......
......@@ -36,6 +36,7 @@ class FormCreateViewController: UIViewController {
// MARK: - Variables
var data: FormResponse!
var formViewType: FormViewType = .creta
let date = Date().toString(dateFormat: DateFormat.StandartDate.rawValue)
// MARK: - LifeCycle
override func viewDidLoad() {
......@@ -46,6 +47,7 @@ class FormCreateViewController: UIViewController {
createButton.isHidden = false
self.title = "Ստեղծել ձևաթուղթ"
curentDate.text = date
case .viewFromList:
self.title = "Ձևաթուղթ"
......@@ -57,9 +59,6 @@ class FormCreateViewController: UIViewController {
createButton.isHidden = true
retriveCurentForm()
}
let date = Date().toString(dateFormat: DateFormat.StandartDate.rawValue)
curentDate.text = date
}
// MARK: - Actions
......@@ -201,5 +200,6 @@ class FormCreateViewController: UIViewController {
destinationAddressTextField.text = response?.visitingAddressAndName
planneDateTimeTextField.text = response?.plannedReturnDatetime
destinationTypeTextField.text = response?.visitingReason
curentDate.text = response?.createdAt
}
}
......@@ -32,7 +32,7 @@
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kwt-kc-N2e">
<rect key="frame" x="0.0" y="0.0" width="414" height="621"/>
<rect key="frame" x="0.0" y="0.0" width="414" height="646"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Azo-7T-DFW" customClass="IQPreviousNextView" customModule="IQKeyboardManagerSwift">
<rect key="frame" x="40" y="55" width="334" height="50"/>
......@@ -292,7 +292,7 @@
<constraint firstAttribute="trailing" secondItem="NyF-FR-xam" secondAttribute="trailing" constant="40" id="De8-qX-Ukc"/>
<constraint firstAttribute="trailing" secondItem="JD7-Yf-hQj" secondAttribute="trailing" constant="40" id="DlW-PC-fOe"/>
<constraint firstItem="NyF-FR-xam" firstAttribute="leading" secondItem="Kwt-kc-N2e" secondAttribute="leading" constant="40" id="FI1-KC-yTn"/>
<constraint firstAttribute="bottom" secondItem="NyF-FR-xam" secondAttribute="bottom" constant="20" id="FW4-Nj-AYg"/>
<constraint firstAttribute="bottom" secondItem="NyF-FR-xam" secondAttribute="bottom" constant="45" id="FW4-Nj-AYg"/>
<constraint firstAttribute="trailing" secondItem="XIU-P6-Fzz" secondAttribute="trailing" constant="40" id="GAa-mM-fJ1"/>
<constraint firstItem="D1C-8s-tPP" firstAttribute="leading" secondItem="Kwt-kc-N2e" secondAttribute="leading" constant="40" id="JBl-Oe-bk3"/>
<constraint firstAttribute="trailing" secondItem="Azo-7T-DFW" secondAttribute="trailing" constant="40" id="KFI-Av-Xcb"/>
......
......@@ -78,10 +78,10 @@
</connections>
</button>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo_green" translatesAutoresizingMaskIntoConstraints="NO" id="39T-Am-QrN">
<rect key="frame" x="171" y="84" width="72" height="72"/>
<rect key="frame" x="147" y="78" width="120" height="120"/>
<constraints>
<constraint firstAttribute="width" constant="72" id="hr6-Z1-HDD"/>
<constraint firstAttribute="height" constant="72" id="rX4-P5-bJs"/>
<constraint firstAttribute="width" constant="120" id="hr6-Z1-HDD"/>
<constraint firstAttribute="height" constant="120" id="rX4-P5-bJs"/>
</constraints>
</imageView>
</subviews>
......@@ -89,10 +89,10 @@
<constraints>
<constraint firstItem="xKX-74-m44" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" constant="40" id="1EZ-9p-hsc"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="RJu-c4-bw8" secondAttribute="trailing" constant="25" id="Cng-7l-xT0"/>
<constraint firstItem="tpq-Rn-PFH" firstAttribute="top" secondItem="39T-Am-QrN" secondAttribute="bottom" constant="80" id="Lzl-WV-3JE"/>
<constraint firstItem="tpq-Rn-PFH" firstAttribute="top" secondItem="39T-Am-QrN" secondAttribute="bottom" constant="38" id="Lzl-WV-3JE"/>
<constraint firstItem="tpq-Rn-PFH" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" constant="25" id="NGj-74-yUC"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="xKX-74-m44" secondAttribute="trailing" constant="40" id="UNL-Wy-Tsw"/>
<constraint firstItem="39T-Am-QrN" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" constant="40" id="XXY-rv-lx0"/>
<constraint firstItem="39T-Am-QrN" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" constant="34" id="XXY-rv-lx0"/>
<constraint firstItem="Jmm-GA-Npp" firstAttribute="top" secondItem="RJu-c4-bw8" secondAttribute="bottom" constant="80" id="XqL-Wa-gsg"/>
<constraint firstItem="39T-Am-QrN" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="f0p-e1-dlb"/>
<constraint firstItem="Jmm-GA-Npp" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" constant="40" id="fgw-Q6-lpD"/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment