Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions ALFormInput.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Pod::Spec.new do |s|
s.name = 'ALFormInput'
s.version = '0.1.1'
s.version = '0.2.0'
s.summary = 'Commonly used form inputs in our projects'

s.homepage = 'https://github.com/applogistdev/ALFormInput'
Expand All @@ -23,8 +23,8 @@ Pod::Spec.new do |s|
s.dependency 'SkyFloatingLabelTextField', '~> 3.0'
s.dependency 'PhoneNumberKit', '~> 3.1'
s.dependency 'SwiftValidatorNew', '~> 4.2.0'
s.dependency 'ActionSheetPicker-3.0'
s.dependency 'AlExtensions'
s.dependency 'FontAwesome.swift'
s.dependency 'ActionSheetPicker-3.0', '2.4.2'
s.dependency 'AlExtensions', '0.2.0'
s.dependency 'FontAwesome.swift', '1.9.0'

end
7 changes: 4 additions & 3 deletions ALFormInput/Classes/ALDatePicker.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public protocol ALDatePickerDelegate: class {
public class ALDatePicker: ALValidatableTextField {

weak var datePickerDelegate: ALDatePickerDelegate?
private var datePickerMode: UIDatePickerMode?
private var datePickerMode: UIDatePicker.Mode?
private var minDate: Date?
private var maxDate: Date?
private var showFormat: String = "HH/mm/yyyy"
Expand All @@ -37,7 +37,7 @@ public class ALDatePicker: ALValidatableTextField {
setDropDownIcon()
}

public func setupPicker(pickerMode: UIDatePickerMode? = nil,
public func setupPicker(pickerMode: UIDatePicker.Mode? = nil,
minDate: Date? = nil,
maxDate: Date? = nil,
locale: Locale? = Locale.current,
Expand All @@ -50,8 +50,9 @@ public class ALDatePicker: ALValidatableTextField {
}

private func showActionSheetDatePicker() {

let picker = ActionSheetDatePicker(title: title,
datePickerMode: datePickerMode ?? UIDatePickerMode.date,
datePickerMode: datePickerMode ?? UIDatePicker.Mode.date,
selectedDate: selectedDate ?? Date(),
doneBlock: { (_, selectedDate, _) in
guard let selectedDate = selectedDate as? Date else { return }
Expand Down
2 changes: 1 addition & 1 deletion ALFormInput/Classes/ALMonthAndYearPicker.swift
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public class ALMonthAndYearPicker: ALDatePicker {
private func showActionSheetDatePicker() {
guard let minYear = minYear, let maxYear = maxYear else { return }
let years = (minYear...maxYear).map { "\($0)"}
let months = format == .withNumeric ? monthSymbols?.compactMap{ String((monthSymbols?.index(of: $0) ?? 0) + 1)} : (monthSymbols ?? [])
let months = format == .withNumeric ? monthSymbols?.compactMap{ String((monthSymbols?.firstIndex(of: $0) ?? 0) + 1)} : (monthSymbols ?? [])
let picker = ActionSheetMultipleStringPicker(title: title,
rows: [months ?? [], years ],
initialSelection: selectedIndexes ?? [0,0] ,
Expand Down
10 changes: 5 additions & 5 deletions ALFormInput/Classes/ALValidatableTextFieldType.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,24 @@ public enum ALValidatableTextFieldType: String {


private var emailRule : EmailRule {
EmailRule(message: "Geçersiz E-Posta Adresi")
EmailRule(message: "Geçersiz E-Posta Adresi".uppercased)
}

private var requiredRule: RequiredRule {
RequiredRule(message: "Bu alan zorunludur")
RequiredRule(message: "Bu alan zorunludur".uppercased)
}

private func minLengthRule(_ length: Int) -> MinLengthRule {
MinLengthRule(length: length, message: "En %ld karakter olmalıdır")
MinLengthRule(length: length, message: "En %ld karakter olmalıdır".uppercased)
}

private func exactLengthRule(_ length: Int) -> ExactLengthRule {
ExactLengthRule(length: length, message: "%ld karakter olmalıdır")
ExactLengthRule(length: length, message: "%ld karakter olmalıdır".uppercased)
}

private func passwordRule(_ length: Int) -> PasswordRule {
PasswordRule(regex: "^(?=.*?[A-Z]).{\(length),}$",
message: String(format: "En az %ld karakter olmalıdır", length))
message: String(format: "En az %ld karakter olmalıdır".uppercased, length))
}

public var rules : [Rule] {
Expand Down
5 changes: 5 additions & 0 deletions ALFormInput/Classes/Extensions/AL+String.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
import Foundation

public extension String {

var uppercased: String {
uppercased(with: Locale(identifier: "tr-TR"))
}

func localizeWithFormat(arguments: CVarArg...) -> String{
String(format: self.localized, arguments: arguments)
}
Expand Down
7 changes: 3 additions & 4 deletions Example/ALFormInput.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -297,10 +297,9 @@
};
buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "ALFormInput" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -610,7 +609,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -625,7 +624,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion Example/ALFormInput/AppDelegate.swift
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 {
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
return true
}

Expand Down
8 changes: 4 additions & 4 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ PODS:
- ActionSheetPicker-3.0 (2.4.2)
- AlExtensions (0.2.0)
- ALFormInput (0.1.1):
- ActionSheetPicker-3.0
- AlExtensions
- FontAwesome.swift
- ActionSheetPicker-3.0 (= 2.4.2)
- AlExtensions (= 0.2.0)
- FontAwesome.swift (= 1.9.0)
- PhoneNumberKit (~> 3.1)
- SkyFloatingLabelTextField (~> 3.0)
- SwiftValidatorNew (~> 4.2.0)
Expand Down Expand Up @@ -44,7 +44,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
ActionSheetPicker-3.0: 5b62e07b00bd970509cf5ece99cb7447eae5dd0d
AlExtensions: d5c1a189e6f980dd33ca4292b9e6ddae1911a6a2
ALFormInput: 37a541d67b3eceb1afd74237588acd5ffd1010c0
ALFormInput: 6018150d366f7a7e11b74fdb2a64bfdd36bf1529
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
FontAwesome.swift: a403b88cec950511745ba8f2decd1b6a07346d13
PhoneNumberKit: df411d46177d1492da84e10b6c093846dd861452
Expand Down
6 changes: 3 additions & 3 deletions Example/Pods/Local Podspecs/ALFormInput.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Example/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading