Skip to content
This repository was archived by the owner on Jul 7, 2023. It is now read-only.

A validation features shows a alert message, Conversion to Swift 4.2 #9

Open
RAYCHEV wants to merge 6 commits into
base: master
Choose a base branch
from
Open

A validation features shows a alert message, Conversion to Swift 4.2 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c11ba35
Replace with String(describing:) for optional values
Oct 25, 2018
18815c4
init git
Oct 25, 2018
353b331
gitignore .DS_Store file
Oct 25, 2018
5c7ddb0
Replaced deprecated M_PI_2 value with Double.pi/2
useername Oct 25, 2018
f63a005
Conversion to Swift 4.2
RAYCHEV Oct 26, 2018
9f34678
add a validation methods with a AlertController messages
RAYCHEV Oct 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ xcuserdata/
## Other
*.moved-aside
*.xcuserstate
.DS_Store

## Obj-C/Swift specific
*.hmap
Expand Down
55 changes: 47 additions & 8 deletions AMLoginSingup/AMLoginSingup.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
4D8FFB41218325FE00B0AC70 /* IsValid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D8FFB40218325FE00B0AC70 /* IsValid.swift */; };
ABA51C7F1DAC9B0C009F209C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABA51C7E1DAC9B0C009F209C /* AppDelegate.swift */; };
ABA51C811DAC9B0C009F209C /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABA51C801DAC9B0C009F209C /* ViewController.swift */; };
ABA51C841DAC9B0C009F209C /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = ABA51C821DAC9B0C009F209C /* Main.storyboard */; };
Expand All @@ -18,6 +19,7 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
4D8FFB40218325FE00B0AC70 /* IsValid.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IsValid.swift; sourceTree = "<group>"; };
ABA51C7B1DAC9B0C009F209C /* AMLS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AMLS.app; sourceTree = BUILT_PRODUCTS_DIR; };
ABA51C7E1DAC9B0C009F209C /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
ABA51C801DAC9B0C009F209C /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
Expand All @@ -41,6 +43,14 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
4D8FFB3F218325CF00B0AC70 /* SupportingFiles */ = {
isa = PBXGroup;
children = (
4D8FFB40218325FE00B0AC70 /* IsValid.swift */,
);
path = SupportingFiles;
sourceTree = "<group>";
};
ABA51C721DAC9B0C009F209C = {
isa = PBXGroup;
children = (
Expand All @@ -60,6 +70,7 @@
ABA51C7D1DAC9B0C009F209C /* AMLoginSingup */ = {
isa = PBXGroup;
children = (
4D8FFB3F218325CF00B0AC70 /* SupportingFiles */,
ABA51C901DAC9BA2009F209C /* AMInputView */,
ABA51C7E1DAC9B0C009F209C /* AppDelegate.swift */,
ABA51C801DAC9B0C009F209C /* ViewController.swift */,
Expand Down Expand Up @@ -108,12 +119,13 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0800;
LastUpgradeCheck = 0800;
LastUpgradeCheck = 1000;
ORGANIZATIONNAME = amirs.eu;
TargetAttributes = {
ABA51C7A1DAC9B0C009F209C = {
CreatedOnToolsVersion = 8.0;
DevelopmentTeam = 4J5W7CJ2ZV;
DevelopmentTeam = F2VB86LLAX;
LastSwiftMigration = 1000;
ProvisioningStyle = Automatic;
};
};
Expand Down Expand Up @@ -156,6 +168,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4D8FFB41218325FE00B0AC70 /* IsValid.swift in Sources */,
ABA51C921DAC9BD3009F209C /* AMInputView.swift in Sources */,
ABA51C811DAC9B0C009F209C /* ViewController.swift in Sources */,
ABA51C7F1DAC9B0C009F209C /* AppDelegate.swift in Sources */,
Expand Down Expand Up @@ -193,15 +206,24 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_SUSPICIOUS_MOVES = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -242,15 +264,24 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_SUSPICIOUS_MOVES = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -279,27 +310,35 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = 4J5W7CJ2ZV;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = F2VB86LLAX;
INFOPLIST_FILE = AMLoginSingup/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = eu.amirs.AMLoginSingup;
PRODUCT_BUNDLE_IDENTIFIER = "AMLS-Forks-com.theXoder";
PRODUCT_NAME = AMLS;
SWIFT_VERSION = 3.0;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
ABA51C8F1DAC9B0C009F209C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = 4J5W7CJ2ZV;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = F2VB86LLAX;
INFOPLIST_FILE = AMLoginSingup/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = eu.amirs.AMLoginSingup;
PRODUCT_BUNDLE_IDENTIFIER = "AMLS-Forks-com.theXoder";
PRODUCT_NAME = AMLS;
SWIFT_VERSION = 3.0;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand Down
8 changes: 8 additions & 0 deletions ...nSingup/AMLoginSingup.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
5 changes: 5 additions & 0 deletions ...gup/AMLoginSingup.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict/>
</plist>
12 changes: 5 additions & 7 deletions AMLoginSingup/AMLoginSingup/AMInputView/AMInputView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import UIKit

@IBDesignable class AMInputView: UIView,UITextFieldDelegate {
@IBDesignable class AMInputView: UIView, UITextFieldDelegate {



Expand Down Expand Up @@ -126,10 +126,10 @@ import UIKit
//MARK: - change view
private func setViewExpandMode(expand:Bool){

backViewHeightExpandConstraint.priority = expand ? 500:200
labelViewHTopExpandConstraint.priority = expand ? 500:200
labelViewRightExpandConstraint.priority = expand ? 500:300
labelViewLeftExpandConstraint.priority = expand ? 999:300
backViewHeightExpandConstraint.priority = UILayoutPriority(rawValue: (expand ? 500.0:200.0))
labelViewHTopExpandConstraint.priority = UILayoutPriority(rawValue: (expand ? 500.0:200.0))
labelViewRightExpandConstraint.priority = UILayoutPriority(rawValue: (expand ? 500.0:300.0))
labelViewLeftExpandConstraint.priority = UILayoutPriority(rawValue: (expand ? 999.0:300.0))

UIView.animate(withDuration: animationDuration) {
self.layoutIfNeeded()
Expand All @@ -146,6 +146,4 @@ import UIKit
}
}
}


}
15 changes: 11 additions & 4 deletions AMLoginSingup/AMLoginSingup/AMInputView/AMInputView.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
<?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" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" 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="14283.14"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AMInputView" customModule="AMLoginSingup" customModuleProvider="target">
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AMInputView" customModule="AMLS" customModuleProvider="target">
<connections>
<outlet property="backViewHeightExpandConstraint" destination="Vcm-u1-hga" id="4gO-qs-o9O"/>
<outlet property="backWhiteView" destination="sUG-Dl-kvk" id="GhZ-EI-W7I"/>
Expand All @@ -24,19 +27,23 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tcM-sV-IEL">
<rect key="frame" x="0.0" y="0.0" width="298" height="64"/>
<subviews>
<view alpha="0.080000000000000002" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sUG-Dl-kvk">
<rect key="frame" x="0.0" y="0.0" width="298" height="64"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" priority="200" constant="2" id="Vcm-u1-hga"/>
</constraints>
</view>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="1U2-iu-Mx1">
<rect key="frame" x="0.0" y="19" width="298" height="39"/>
<color key="textColor" red="1" green="1" blue="1" alpha="0.76935151457055218" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Email" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OIA-KE-pbf">
<rect key="frame" x="26" y="23" width="246" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" red="1" green="1" blue="1" alpha="0.92939992331288346" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
Expand Down Expand Up @@ -72,7 +79,7 @@
<nil key="simulatedTopBarMetrics"/>
<nil key="simulatedBottomBarMetrics"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="42" y="-39"/>
<point key="canvasLocation" x="41.600000000000001" y="-39.580209895052477"/>
</view>
</objects>
</document>
2 changes: 1 addition & 1 deletion AMLoginSingup/AMLoginSingup/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?


func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.

return true
Expand Down
5 changes: 5 additions & 0 deletions AMLoginSingup/AMLoginSingup/Assets.xcassets/AppIcon.appiconset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@
"idiom" : "iphone",
"filename" : "Icon-60@3x.png",
"scale" : "3x"
},
{
"idiom" : "ios-marketing",
"size" : "1024x1024",
"scale" : "1x"
}
],
"info" : {
Expand Down
Loading