Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix border color on vibrancy #3

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

fix border color on vibrancy #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
e75d699
fix, add IBInspectable var to configure from IB, fix default floating…
Jan 5, 2016
e922217
fix
Jan 13, 2016
118a887
add default text public func
Jan 27, 2016
173043b
fix border color on vibrancy
Mar 24, 2016
8416555
Merge remote-tracking branch 'enisgayretli/master'
Jul 20, 2016
528397c
Merge branch 'enisgayretli/master'
Jul 20, 2016
928173c
fix
Jul 20, 2016
23b9f28
fix regex for number
Aug 11, 2016
d11454c
added type and fix validation blocks
Aug 24, 2016
047df55
fix
Aug 24, 2016
f2fd4c4
fix swift
Sep 1, 2016
56a6fc6
fix swift 2.3
Sep 8, 2016
5ecf1f0
fix
Sep 13, 2016
3931fbd
Conversion to Swift 3.0
JoelGerboreLaser Sep 22, 2016
7a20275
Merge pull request #1 from JoelGerboreLaser/master
Sep 22, 2016
cae93d8
fix animation on text change
Mar 15, 2017
9ba85c0
changed podspec version
Mar 15, 2017
12924f6
fix
Apr 14, 2017
df61f82
added validation for required element
May 12, 2017
caf18b0
added localization error string
Jun 23, 2017
a5bc2bd
new version number
Jun 23, 2017
3d7401a
add french localization
Jun 28, 2017
92b0be5
add fr language
Jun 28, 2017
4fb0205
new pod version
Jun 28, 2017
10cf062
fix @objc method
Aug 11, 2017
a0240b9
fix new version
Sep 13, 2017
954ede4
fix required field
Oct 19, 2017
933a0e2
Merge pull request #1 from LaserPatrick/master
JoelGerboreLaser Feb 1, 2018
f107083
Customizable label color and font
JoelGerboreLaser Feb 1, 2018
0119c73
now supporting swift 4.2
Sep 1, 2018
a17e3eb
fix pod spec
Sep 1, 2018
7867780
fix spec
Nov 14, 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
15 changes: 0 additions & 15 deletions EGFloatingTextField.podspec
View file
Open in desktop

This file was deleted.

59 changes: 58 additions & 1 deletion EGFloatingTextField/EGFloatingTextField.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
B7CBFB341B769D1800CDE475 /* EGFloatingTextField.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B7CBFB281B769D1700CDE475 /* EGFloatingTextField.framework */; };
B7CBFB3B1B769D1800CDE475 /* EGFloatingTextFieldTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7CBFB3A1B769D1800CDE475 /* EGFloatingTextFieldTests.swift */; };
B7CBFB451B769D8700CDE475 /* EGFloatingTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7CBFB441B769D8700CDE475 /* EGFloatingTextField.swift */; };
CDD1766E1EFD62F000009C4E /* EGLocalizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = CDD1766C1EFD62F000009C4E /* EGLocalizable.strings */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -64,6 +65,11 @@
B7CBFB391B769D1800CDE475 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
B7CBFB3A1B769D1800CDE475 /* EGFloatingTextFieldTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EGFloatingTextFieldTests.swift; sourceTree = "<group>"; };
B7CBFB441B769D8700CDE475 /* EGFloatingTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EGFloatingTextField.swift; sourceTree = "<group>"; };
CDB85F0A1F038A2E00E0B831 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/EGLocalizable.strings; sourceTree = "<group>"; };
CDD176691EFD604900009C4E /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Main.strings; sourceTree = "<group>"; };
CDD1766A1EFD604900009C4E /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
CDD1766D1EFD62F000009C4E /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/EGLocalizable.strings; sourceTree = "<group>"; };
CDD1766F1EFD62F400009C4E /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/EGLocalizable.strings; sourceTree = "<group>"; };
DD19DB55B4D44EF6A9BB8740 /* Pods_EGFloatingTextField.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_EGFloatingTextField.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -183,6 +189,7 @@
B7CBFB2A1B769D1700CDE475 /* EGFloatingTextField */ = {
isa = PBXGroup;
children = (
CDD1766C1EFD62F000009C4E /* EGLocalizable.strings */,
B7CBFB2D1B769D1700CDE475 /* EGFloatingTextField.h */,
B7CBFB441B769D8700CDE475 /* EGFloatingTextField.swift */,
B7CBFB2B1B769D1700CDE475 /* Supporting Files */,
Expand Down Expand Up @@ -309,20 +316,25 @@
B7CBFB1F1B769D1700CDE475 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0640;
LastSwiftUpdateCheck = 0720;
LastUpgradeCheck = 0800;
TargetAttributes = {
B77E397B1B778E880078ABA3 = {
CreatedOnToolsVersion = 6.4;
LastSwiftMigration = 0800;
};
B77E398F1B778E880078ABA3 = {
CreatedOnToolsVersion = 6.4;
LastSwiftMigration = 0800;
TestTargetID = B77E397B1B778E880078ABA3;
};
B7CBFB271B769D1700CDE475 = {
CreatedOnToolsVersion = 6.4;
LastSwiftMigration = 0800;
};
B7CBFB321B769D1800CDE475 = {
CreatedOnToolsVersion = 6.4;
LastSwiftMigration = 0800;
};
};
};
Expand All @@ -333,6 +345,8 @@
knownRegions = (
en,
Base,
it,
fr,
);
mainGroup = B7CBFB1E1B769D1700CDE475;
productRefGroup = B7CBFB291B769D1700CDE475 /* Products */;
Expand Down Expand Up @@ -369,6 +383,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
CDD1766E1EFD62F000009C4E /* EGLocalizable.strings in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -473,6 +488,7 @@
isa = PBXVariantGroup;
children = (
B77E39851B778E880078ABA3 /* Base */,
CDD176691EFD604900009C4E /* it */,
);
name = Main.storyboard;
sourceTree = "<group>";
Expand All @@ -481,10 +497,21 @@
isa = PBXVariantGroup;
children = (
B77E398A1B778E880078ABA3 /* Base */,
CDD1766A1EFD604900009C4E /* it */,
);
name = LaunchScreen.xib;
sourceTree = "<group>";
};
CDD1766C1EFD62F000009C4E /* EGLocalizable.strings */ = {
isa = PBXVariantGroup;
children = (
CDD1766D1EFD62F000009C4E /* Base */,
CDD1766F1EFD62F400009C4E /* it */,
CDB85F0A1F038A2E00E0B831 /* fr */,
);
name = EGLocalizable.strings;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
Expand All @@ -498,7 +525,9 @@
);
INFOPLIST_FILE = Example/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -508,7 +537,9 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = Example/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand All @@ -527,7 +558,9 @@
INFOPLIST_FILE = ExampleTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example";
};
name = Debug;
Expand All @@ -543,7 +576,9 @@
INFOPLIST_FILE = ExampleTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example";
};
name = Release;
Expand All @@ -552,6 +587,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand All @@ -561,15 +597,18 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand All @@ -590,6 +629,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand All @@ -600,6 +640,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand All @@ -609,8 +650,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
Expand All @@ -630,6 +673,8 @@
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
Expand All @@ -642,6 +687,7 @@
baseConfigurationReference = 36B5992605E1EC32FF7D24F9 /* Pods-EGFloatingTextField.debug.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand All @@ -650,9 +696,11 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -661,6 +709,7 @@
baseConfigurationReference = 54182CEE59BCC3469EBBBFA4 /* Pods-EGFloatingTextField.release.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand All @@ -669,8 +718,10 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand All @@ -687,7 +738,9 @@
);
INFOPLIST_FILE = EGFloatingTextFieldTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -700,7 +753,9 @@
);
INFOPLIST_FILE = EGFloatingTextFieldTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand All @@ -714,6 +769,7 @@
B77E399A1B778E880078ABA3 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
B77E399B1B778E880078ABA3 /* Build configuration list for PBXNativeTarget "ExampleTests" */ = {
isa = XCConfigurationList;
Expand All @@ -722,6 +778,7 @@
B77E399D1B778E880078ABA3 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
B7CBFB221B769D1700CDE475 /* Build configuration list for PBXProject "EGFloatingTextField" */ = {
isa = XCConfigurationList;
Expand Down
13 changes: 8 additions & 5 deletions ...xtField/EGFloatingTextField.xcodeproj/xcshareddata/xcschemes/EGFloatingTextField.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0640"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -37,10 +37,10 @@
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -62,15 +62,18 @@
ReferencedContainer = "container:EGFloatingTextField.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
Expand All @@ -85,10 +88,10 @@
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
Expand Down
Binary file modified EGFloatingTextField/EGFloatingTextField/.DS_Store
View file
Open in desktop
Binary file not shown.
14 changes: 14 additions & 0 deletions EGFloatingTextField/EGFloatingTextField/Base.lproj/EGLocalizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/*
Localizable.strings
EGFloatingTextField

Created by Patrick on 23/06/17.

*/

"Invalid_Email_Address" = "Invalid E-Mail address";
"Invalid_integer_number" = "Invalid integer number";
"Invalid_decimal_number" = "Invalid decimal number";
"Invalid_phone_number" = "Invalid phone number";
"Invalid_URL" = "Invalid URL";
"Required" = "Required";
Loading