Commit 64fe6842 authored by Grigor Aghabalyan's avatar Grigor Aghabalyan
Browse files

Merge branch 'dev' into 'master'

UI issues fix

See merge request !4
parents 14614feb 82affefa
......@@ -646,7 +646,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5;
CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = JY829SQQAV;
INFOPLIST_FILE = App16/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
......@@ -654,6 +654,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.2;
PRODUCT_BUNDLE_IDENTIFIER = "am.x-tech.App16";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
......@@ -667,7 +668,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5;
CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = JY829SQQAV;
INFOPLIST_FILE = App16/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
......@@ -675,6 +676,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.2;
PRODUCT_BUNDLE_IDENTIFIER = "am.x-tech.App16";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
......
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSRequiresIPhoneOS</key>
......
......@@ -32,6 +32,7 @@ class FormCreateViewController: UIViewController {
@IBOutlet weak var outDateButtonAction: UIButton!
@IBOutlet weak var planneDateTimeButton: UIButton!
@IBOutlet weak var nameLabel: UILabel!
// MARK: - Variables
var data: FormResponse!
......@@ -59,6 +60,12 @@ class FormCreateViewController: UIViewController {
createButton.isHidden = true
retriveCurentForm()
}
if let firstName = UserDefaultsHelper.getString(for: .firstName),
let lastName = UserDefaultsHelper.getString(for: .lstName),
let middleName = UserDefaultsHelper.getString(for: .middleName) {
nameLabel.text = "\(firstName) \(lastName) \(middleName)"
}
}
// MARK: - Actions
......
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