Skip to content

GitLab

Commit 4422bb18 authored by Grigor Aghabalyan's avatar Grigor Aghabalyan ⚽
Browse files

Feat: add Qr view

parent e36a2731
Hide whitespace changes
Inline Side-by-side
App16.xcodeproj/project.pbxproj
View file @ 4422bb18
......@@ -37,6 +37,8 @@
C5D691B0242AC607004268C3 /* WelcomeViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C5D691AE242AC607004268C3 /* WelcomeViewController.xib */; };
C5D691B4242AD290004268C3 /* QrViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5D691B2242AD290004268C3 /* QrViewController.swift */; };
C5D691B5242AD290004268C3 /* QrViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C5D691B3242AD290004268C3 /* QrViewController.xib */; };
C5D691B8242AD62A004268C3 /* FormListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5D691B6242AD62A004268C3 /* FormListCell.swift */; };
C5D691B9242AD62A004268C3 /* FormListCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = C5D691B7242AD62A004268C3 /* FormListCell.xib */; };
DFF30959C2696CFA212F54E4 /* Pods_App16.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC947C811CE3C096F8981C77 /* Pods_App16.framework */; };
/* End PBXBuildFile section */
......@@ -76,6 +78,8 @@
C5D691AE242AC607004268C3 /* WelcomeViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = WelcomeViewController.xib; sourceTree = "<group>"; };
C5D691B2242AD290004268C3 /* QrViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QrViewController.swift; sourceTree = "<group>"; };
C5D691B3242AD290004268C3 /* QrViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = QrViewController.xib; sourceTree = "<group>"; };
C5D691B6242AD62A004268C3 /* FormListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FormListCell.swift; sourceTree = "<group>"; };
C5D691B7242AD62A004268C3 /* FormListCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FormListCell.xib; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
......@@ -285,6 +289,8 @@
C5D691A5242AB528004268C3 /* Cells */ = {
isa = PBXGroup;
children = (
C5D691B6242AD62A004268C3 /* FormListCell.swift */,
C5D691B7242AD62A004268C3 /* FormListCell.xib */,
);
path = Cells;
sourceTree = "<group>";
......@@ -376,6 +382,7 @@
C5D691B0242AC607004268C3 /* WelcomeViewController.xib in Resources */,
C5D69157242AA094004268C3 /* Assets.xcassets in Resources */,
C5D69155242AA091004268C3 /* Main.storyboard in Resources */,
C5D691B9242AD62A004268C3 /* FormListCell.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -449,6 +456,7 @@
C5D6917B242AA5AA004268C3 /* DateFormat.swift in Sources */,
C5D69181242AA5EB004268C3 /* AlertControllerHelper.swift in Sources */,
C5D69175242AA55A004268C3 /* BaseState.swift in Sources */,
C5D691B8242AD62A004268C3 /* FormListCell.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......
App16/Base.lproj/LaunchScreen.storyboard
View file @ 4422bb18
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
......@@ -11,9 +13,23 @@
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo_white" translatesAutoresizingMaskIntoConstraints="NO" id="ANO-op-Dzy">
<rect key="frame" x="131" y="372" width="153" height="153"/>
<constraints>
<constraint firstAttribute="width" secondItem="ANO-op-Dzy" secondAttribute="height" multiplier="1:1" id="xUg-v4-NyX"/>
</constraints>
</imageView>
</subviews>
<color key="backgroundColor" red="0.023529411764705882" green="0.47058823529411764" blue="0.094117647058823528" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="ANO-op-Dzy" secondAttribute="trailing" constant="130" id="4vw-Gr-xRO"/>
<constraint firstItem="ANO-op-Dzy" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" constant="131" id="5gr-ki-WAp"/>
<constraint firstItem="6Tk-OE-BBY" firstAttribute="bottom" secondItem="ANO-op-Dzy" secondAttribute="bottom" constant="337" id="eMG-vX-zti"/>
<constraint firstItem="ANO-op-Dzy" firstAttribute="top" secondItem="6Tk-OE-BBY" secondAttribute="top" constant="328" id="hjX-rl-mVj"/>
</constraints>
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
</view>
</viewController>
......@@ -22,4 +38,7 @@
<point key="canvasLocation" x="53" y="375"/>
</scene>
</scenes>
<resources>
<image name="logo_white" width="153" height="153"/>
</resources>
</document>
App16/Config/Config.swift
View file @ 4422bb18
......@@ -11,8 +11,8 @@ import Foundation
struct Config {
static let ENVIRONMENT = "DEV"
static let HOST_NAME = "test"
static let BASE_URL = "https://api." + Config.HOST_NAME + "/data/2.5"
static let HOST_NAME = "app16.x-tech.am"
static let BASE_URL = "https://" + Config.HOST_NAME + "api/" + API_VERSION
static let API_TOKEN = ""
static let API_VERSION = "v1"
static let API_FORMAT = "json"
......
App16/Views/Form/Create/FormCreateViewController.xib
View file @ 4422bb18
......@@ -42,7 +42,7 @@
</view>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="1V6-3e-Iop">
<rect key="frame" x="25" y="10" width="284" height="29"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<textInputTraits key="textInputTraits"/>
</textField>
</subviews>
......@@ -81,7 +81,7 @@
</view>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="mYS-bW-6ay">
<rect key="frame" x="25" y="10" width="284" height="29"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<textInputTraits key="textInputTraits"/>
</textField>
</subviews>
......@@ -120,7 +120,7 @@
</view>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="rPL-7I-ofi">
<rect key="frame" x="25" y="10" width="284" height="29"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<textInputTraits key="textInputTraits"/>
</textField>
</subviews>
......@@ -159,7 +159,7 @@
</view>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="4aW-Ax-Ff0">
<rect key="frame" x="25" y="10" width="284" height="29"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<textInputTraits key="textInputTraits"/>
</textField>
</subviews>
......@@ -198,7 +198,7 @@
</view>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="suG-e6-CV9">
<rect key="frame" x="25" y="10" width="284" height="29"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<textInputTraits key="textInputTraits"/>
</textField>
</subviews>
......
App16/Views/Form/FormList/Cells/FormListCell.swift 0 → 100644
View file @ 4422bb18
//
// FormListCell.swift
// App16
//
// Created by Grigor Aghabalyan on 3/25/20.
// Copyright © 2020 X-TECH. All rights reserved.
//
import UIKit
class FormListCell: UITableViewCell {
// MARK: - IBOutlets
@IBOutlet weak var createdDateLabel: UILabel!
@IBOutlet weak var outDateLabel: UILabel!
@IBOutlet weak var planeDateLabel: UILabel!
// MARK: - LifeCycle
override func awakeFromNib() {
super.awakeFromNib()
}
}
App16/Views/Form/FormList/Cells/FormListCell.xib 0 → 100644
View file @ 4422bb18
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="FormListCell" rowHeight="116" id="KGk-i7-Jjw" customClass="FormListCell" customModule="App16" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="401" height="124"/>
<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="401" height="124"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XZh-Pk-3sl">
<rect key="frame" x="16" y="0.0" width="369" height="107"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" alpha="0.41999999999999998" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="25.03.20" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oeh-Ou-ekY">
<rect key="frame" x="28" y="8" width="333" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ելքի ժամ։" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wnZ-Nm-n2v">
<rect key="frame" x="8" y="29" width="84" height="20"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="16։00 AM" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tda-Za-9BL">
<rect key="frame" x="96" y="29" width="265" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Վերադարձի ժամ։" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0kk-CH-aEy">
<rect key="frame" x="8" y="57" width="153" height="20"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="16։00 AM" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pem-jd-5mO">
<rect key="frame" x="169" y="57" width="192" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.96078431372549022" green="0.96078431372549022" blue="0.96078431372549022" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="tda-Za-9BL" secondAttribute="trailing" constant="8" id="0EP-k9-tSP"/>
<constraint firstItem="pem-jd-5mO" firstAttribute="leading" secondItem="0kk-CH-aEy" secondAttribute="trailing" constant="8" id="4uQ-58-QRu"/>
<constraint firstAttribute="bottom" secondItem="pem-jd-5mO" secondAttribute="bottom" constant="30" id="5Sc-Lt-iTU"/>
<constraint firstItem="oeh-Ou-ekY" firstAttribute="top" secondItem="XZh-Pk-3sl" secondAttribute="top" constant="8" id="SEq-Vd-1yq"/>
<constraint firstAttribute="trailing" secondItem="oeh-Ou-ekY" secondAttribute="trailing" constant="8" id="UC8-qg-hjb"/>
<constraint firstItem="0kk-CH-aEy" firstAttribute="leading" secondItem="XZh-Pk-3sl" secondAttribute="leading" constant="8" id="Yi9-C7-ecj"/>
<constraint firstItem="oeh-Ou-ekY" firstAttribute="leading" secondItem="XZh-Pk-3sl" secondAttribute="leading" constant="28" id="bsL-V4-Ixz"/>
<constraint firstItem="tda-Za-9BL" firstAttribute="top" secondItem="XZh-Pk-3sl" secondAttribute="top" constant="29" id="c9v-Vq-Ckk"/>
<constraint firstAttribute="bottom" secondItem="0kk-CH-aEy" secondAttribute="bottom" constant="30" id="cAN-wX-EJe"/>
<constraint firstItem="pem-jd-5mO" firstAttribute="top" secondItem="tda-Za-9BL" secondAttribute="bottom" constant="8" id="cEV-31-ede"/>
<constraint firstItem="wnZ-Nm-n2v" firstAttribute="top" secondItem="XZh-Pk-3sl" secondAttribute="top" constant="29" id="hCm-C4-RRP"/>
<constraint firstItem="0kk-CH-aEy" firstAttribute="top" secondItem="wnZ-Nm-n2v" secondAttribute="bottom" constant="8" id="rGs-KY-ADp"/>
<constraint firstItem="tda-Za-9BL" firstAttribute="leading" secondItem="wnZ-Nm-n2v" secondAttribute="trailing" constant="4" id="ra7-AF-9hX"/>
<constraint firstAttribute="trailing" secondItem="pem-jd-5mO" secondAttribute="trailing" constant="8" id="vXa-qi-68x"/>
<constraint firstItem="wnZ-Nm-n2v" firstAttribute="leading" secondItem="XZh-Pk-3sl" secondAttribute="leading" constant="8" id="yOb-2W-nbD"/>
</constraints>
</view>
<view alpha="0.42999999999999999" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5OJ-Lh-Jnc">
<rect key="frame" x="16" y="115" width="369" height="1"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="9Nu-iu-2w6"/>
</constraints>
</view>
</subviews>
<constraints>
<constraint firstItem="5OJ-Lh-Jnc" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="16" id="Dif-PR-mhb"/>
<constraint firstAttribute="trailing" secondItem="5OJ-Lh-Jnc" secondAttribute="trailing" constant="16" id="Q2J-46-mfn"/>
<constraint firstItem="XZh-Pk-3sl" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="16" id="e3v-LO-ZBT"/>
<constraint firstItem="XZh-Pk-3sl" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="eZY-7A-MRk"/>
<constraint firstAttribute="trailing" secondItem="XZh-Pk-3sl" secondAttribute="trailing" constant="16" id="nKz-Oe-Xzs"/>
<constraint firstItem="5OJ-Lh-Jnc" firstAttribute="top" secondItem="XZh-Pk-3sl" secondAttribute="bottom" constant="8" id="udC-PW-NKG"/>
<constraint firstAttribute="bottom" secondItem="5OJ-Lh-Jnc" secondAttribute="bottom" constant="8" id="wew-3p-0Z7"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="createdDateLabel" destination="oeh-Ou-ekY" id="ylc-nz-yXv"/>
<outlet property="outDateLabel" destination="tda-Za-9BL" id="Ezq-1a-C6F"/>
<outlet property="planeDateLabel" destination="pem-jd-5mO" id="HPu-2w-dBX"/>
</connections>
<point key="canvasLocation" x="-45.652173913043484" y="72.321428571428569"/>
</tableViewCell>
</objects>
</document>
App16/Views/Form/FormList/FormListViewController.swift
View file @ 4422bb18
......@@ -13,9 +13,53 @@ class FormListViewController: UIViewController {
// MARK: - IBOutlet
@IBOutlet weak var tableView: UITableView!
// MARK: - Varibales
private let formListCell = "FormListCell"
// MARK: - LifeCycle
override func viewDidLoad() {
super.viewDidLoad()
tableView.delegate = self
tableView.dataSource = self
registerCelll()
}
// MARK: - Register
private func registerCelll() {
let nib = UINib(nibName: formListCell, bundle: nil)
tableView.register(nib, forCellReuseIdentifier: formListCell)
}
}
extension FormListViewController: UITableViewDataSource {
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 10
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: formListCell, for: indexPath) as? FormListCell
return cell ?? UITableViewCell()
}
}
extension FormListViewController: UITableViewDelegate {
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
openCreateFormView()
print(indexPath.row)
}
private func openCreateFormView() {
let controller = FormCreateViewController()
self.navigationController?.pushViewController(controller, animated: true)
}
}
App16/Views/Form/FormList/FormListViewController.xib
View file @ 4422bb18
......@@ -19,8 +19,8 @@
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="HZb-fy-7lq">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="HZb-fy-7lq">
<rect key="frame" x="0.0" y="52" width="414" height="844"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
</tableView>
</subviews>
......@@ -29,7 +29,7 @@
<constraint firstItem="HZb-fy-7lq" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="2Ot-Go-5dk"/>
<constraint firstItem="HZb-fy-7lq" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="JJa-S3-A8H"/>
<constraint firstAttribute="bottom" secondItem="HZb-fy-7lq" secondAttribute="bottom" id="Ma1-TH-OLm"/>
<constraint firstItem="HZb-fy-7lq" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="dLk-Zr-Bbk"/>
<constraint firstItem="HZb-fy-7lq" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" constant="8" id="dLk-Zr-Bbk"/>
</constraints>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<point key="canvasLocation" x="137.68115942028987" y="130.58035714285714"/>
......
App16/Views/Login/LoginViewController.xib
View file @ 4422bb18
......@@ -40,7 +40,7 @@
</view>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Անուն" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="YHD-ah-neD">
<rect key="frame" x="25" y="10" width="284" height="29"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<textInputTraits key="textInputTraits"/>
</textField>
</subviews>
......@@ -73,7 +73,7 @@
</view>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Ազգանուն" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="hzo-dL-cmW">
<rect key="frame" x="25" y="10" width="284" height="29"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<textInputTraits key="textInputTraits"/>
</textField>
</subviews>
......@@ -106,7 +106,7 @@
</view>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Հայրանուն" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="gwp-uV-LBg">
<rect key="frame" x="25" y="10" width="284" height="29"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<textInputTraits key="textInputTraits"/>
</textField>
</subviews>
......
App16/Views/Qr/QrViewController.swift
View file @ 4422bb18
......@@ -24,9 +24,23 @@ class QrViewController: UIViewController {
// MARK: - Actions
@IBAction func formButtonAction(_ sender: UIButton) {
openCreateFormView()
}
@IBAction func finshButtonAction(_ sender: UIButton) {
openWelcomeView()
}
private func openWelcomeView() {
let controller = WelcomeViewController()
changeRoot(UINavigationController(rootViewController: controller))
}
private func openCreateFormView() {
let controller = FormCreateViewController()
self.navigationController?.pushViewController(controller, animated: true)
}
}
App16/Views/Welcome/WelcomeViewController.swift
View file @ 4422bb18
......@@ -40,11 +40,14 @@ class WelcomeViewController: UIViewController {
@IBAction func createButtonAction(_ sender: UIButton) {
let createFormView = FormCreateViewController()
self.navigationController?.pushViewController(createFormView, animated: true)
let controller = FormCreateViewController()
self.navigationController?.pushViewController(controller, animated: true)
}
@IBAction func historyButtonAction(_ sender: UIButton) {
let controller = FormListViewController()
self.navigationController?.pushViewController(controller, animated: true)
}
}
Supports Markdown
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