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

* Updating CXPopupKit to fix facias-ios framework issue #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

* Updating CXPopupKit to fix facias-ios framework issue #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
121 changes: 24 additions & 97 deletions CXPopupKit.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions CXPopupKit.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>
154 changes: 77 additions & 77 deletions CXPopupKit.xcodeproj/xcshareddata/xcschemes/CXPopupKit.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,82 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0920"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
LastUpgradeVersion = "0920"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3C1727611FE80F6400728374"
BuildableName = "CXPopupKit.framework"
BlueprintName = "CXPopupKit"
ReferencedContainer = "container:CXPopupKit.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3C1727611FE80F6400728374"
BuildableName = "CXPopupKit.framework"
BlueprintName = "CXPopupKit"
ReferencedContainer = "container:CXPopupKit.xcodeproj">
BuildableIdentifier = "primary"
BlueprintIdentifier = "3C1727611FE80F6400728374"
BuildableName = "CXPopupKit.framework"
BlueprintName = "CXPopupKit"
ReferencedContainer = "container:CXPopupKit.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3C1727611FE80F6400728374"
BuildableName = "CXPopupKit.framework"
BlueprintName = "CXPopupKit"
ReferencedContainer = "container:CXPopupKit.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3C1727611FE80F6400728374"
BuildableName = "CXPopupKit.framework"
BlueprintName = "CXPopupKit"
ReferencedContainer = "container:CXPopupKit.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3C1727611FE80F6400728374"
BuildableName = "CXPopupKit.framework"
BlueprintName = "CXPopupKit"
ReferencedContainer = "container:CXPopupKit.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
36 changes: 17 additions & 19 deletions CXPopupKit/Components/AlertView/CXAlertAppearance.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,17 @@ public struct CXAlertAppearance {
public struct Font {
public var title = UIFont.boldSystemFont(ofSize: 16.0)
public var detail = UIFont.systemFont(ofSize: 13.0)
public var cancel = UIFont.boldSystemFont(ofSize: 14.0)
public var action = UIFont.boldSystemFont(ofSize: 14.0)
}

public struct Color {
public var backgroundColor: UIColor = .white
public var title: UIColor = .black
public var detail: UIColor = .black
public var cancelBackground: UIColor = .white
public var actionBackground: UIColor = .white
public var cancelTitle: UIColor? = nil
public var actionTitle: UIColor? = nil
}

Expand All @@ -40,7 +43,7 @@ public struct CXAlertAppearance {

public struct Dimension {
public var titleMargin: UIEdgeInsets = UIEdgeInsets(top: 24, left: 16, bottom: 0, right: 16)
public var messageMargin: UIEdgeInsets = UIEdgeInsets(top: 24, left: 8, bottom: 24, right: 8)
public var detailMargin: UIEdgeInsets = UIEdgeInsets(top: 24, left: 8, bottom: 24, right: 8)
public var buttonHeight: CGFloat = 44
public var cornerRadius: CGFloat = 8.0
public var rectCorners: UIRectCorner = .allCorners
Expand All @@ -53,29 +56,24 @@ public struct CXAlertAppearance {
public var dimension = Dimension()
public var color = Color()
public var separator = Separator()
public var isModal = true {
didSet {
appearance.window.allowTouchOutsideToDismiss = !isModal
}
}
public var isModal = true


public init(with type: CXAlertType) {
self.alertType = type

switch alertType {
case .actionSheet:
appearance.window.width = .equalToParent
appearance.window.position = .bottom
appearance.window.enableInsideSafeArea = true
appearance.animation.style = .plain
appearance.animation.duration = CXAnimation.Duration(0.35)
appearance.animation.transition = CXAnimation.Transition(in: .up, out: .down)
case .alert:
appearance.window.width = .fixValue(size: 300)
appearance.animation.style = .bounceZoom
appearance.animation.duration = CXAnimation.Duration(0.35)
appearance.animation.transition = CXAnimation.Transition(.center)
appearance.window.allowTouchOutsideToDismiss = false
case .actionSheet:
appearance.window.width = .fixValue(size: UIScreen.main.bounds.width - 16)
appearance.window.position = .bottom
appearance.animation.style = .plain
appearance.animation.duration = CXAnimation.Duration(0.35)
appearance.animation.transition = CXAnimation.Transition(in: .up, out: .down)
case .alert:
appearance.window.width = .fixValue(size: 247)
appearance.animation.style = .bounceZoom
appearance.animation.duration = CXAnimation.Duration(0.35)
appearance.animation.transition = CXAnimation.Transition(.center)
}
}
}
Loading