Skip to content

Commit

Permalink
fixes for initial release
Browse files Browse the repository at this point in the history
  • Loading branch information
Måns Bernhardt committed Jun 29, 2018
1 parent 4288b0f commit 32faf21
Show file tree
Hide file tree
Showing 6 changed files with 126 additions and 28 deletions.
22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Expected Behavior

Please describe the behavior you are expecting.

# Current Behavior

What is the current behavior?

# Steps to Reproduce

Please provide detailed steps for reproducing the issue.

## Context

Please provide any relevant information about your setup. This is important in case the issue is not reproducible except for under certain conditions.

* Operating Version:
* Swift version:

## Failure Logs

Please include any relevant log snippets or files here.
12 changes: 0 additions & 12 deletions Examples/Demo/Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@
F6B3E0632086211100F55C53 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F6B3E0612086211100F55C53 /* LaunchScreen.storyboard */; };
F6B81B9620CAA2A200B6AC39 /* Values.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6B81B9520CAA2A200B6AC39 /* Values.swift */; };
F6F0211020AD59E40035511D /* Tables.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6F0210F20AD59E40035511D /* Tables.swift */; };
F6F6797520A2DE38004C7AA7 /* Form.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6F6797420A2DE38004C7AA7 /* Form.framework */; };
F6F6797620A2DE38004C7AA7 /* Form.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = F6F6797420A2DE38004C7AA7 /* Form.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
F6F6797820A2DE4D004C7AA7 /* Flow.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6F6797720A2DE4D004C7AA7 /* Flow.framework */; };
F6F6797920A2DE4D004C7AA7 /* Flow.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = F6F6797720A2DE4D004C7AA7 /* Flow.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
F6F6797B20A2DF0A004C7AA7 /* Contents.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6F6797A20A2DF0A004C7AA7 /* Contents.swift */; };
/* End PBXBuildFile section */

Expand All @@ -27,8 +23,6 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
F6F6797920A2DE4D004C7AA7 /* Flow.framework in Embed Frameworks */,
F6F6797620A2DE38004C7AA7 /* Form.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -44,8 +38,6 @@
F6B3E0642086211100F55C53 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
F6B81B9520CAA2A200B6AC39 /* Values.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Values.swift; sourceTree = "<group>"; };
F6F0210F20AD59E40035511D /* Tables.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tables.swift; sourceTree = "<group>"; };
F6F6797420A2DE38004C7AA7 /* Form.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Form.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F6F6797720A2DE4D004C7AA7 /* Flow.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Flow.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F6F6797A20A2DF0A004C7AA7 /* Contents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Contents.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand All @@ -54,8 +46,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
F6F6797820A2DE4D004C7AA7 /* Flow.framework in Frameworks */,
F6F6797520A2DE38004C7AA7 /* Form.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -65,8 +55,6 @@
F6B3E04C2086210E00F55C53 = {
isa = PBXGroup;
children = (
F6F6797720A2DE4D004C7AA7 /* Flow.framework */,
F6F6797420A2DE38004C7AA7 /* Form.framework */,
F6B3E0572086210E00F55C53 /* Example */,
F6B3E0562086210E00F55C53 /* Products */,
);
Expand Down
12 changes: 0 additions & 12 deletions Form.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,6 @@
F684BF09209348F30018EDE9 /* KeyboardAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = F684BF08209348F30018EDE9 /* KeyboardAnimation.swift */; };
F684BF0C209349470018EDE9 /* ViewPortEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = F684BF0B209349470018EDE9 /* ViewPortEvent.swift */; };
F684BF18209350B60018EDE9 /* ValueEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = F684BF17209350B60018EDE9 /* ValueEditor.swift */; };
F69FADB620D122F600F5BB29 /* Styling.md in Resources */ = {isa = PBXBuildFile; fileRef = F69FADB020D122F500F5BB29 /* Styling.md */; };
F69FADB720D122F600F5BB29 /* Layout.md in Resources */ = {isa = PBXBuildFile; fileRef = F69FADB120D122F500F5BB29 /* Layout.md */; };
F69FADB820D122F600F5BB29 /* Keyboard.md in Resources */ = {isa = PBXBuildFile; fileRef = F69FADB220D122F500F5BB29 /* Keyboard.md */; };
F69FADB920D122F600F5BB29 /* Forms.md in Resources */ = {isa = PBXBuildFile; fileRef = F69FADB320D122F500F5BB29 /* Forms.md */; };
F69FADBA20D122F600F5BB29 /* Values.md in Resources */ = {isa = PBXBuildFile; fileRef = F69FADB420D122F500F5BB29 /* Values.md */; };
F69FADBB20D122F600F5BB29 /* Tables.md in Resources */ = {isa = PBXBuildFile; fileRef = F69FADB520D122F600F5BB29 /* Tables.md */; };
F6A0AC4820BC4352000500EC /* CollectionAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6A0AC4620BC4351000500EC /* CollectionAnimation.swift */; };
F6A326E71F9492BC00C3A692 /* FieldStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6A326E61F9492BC00C3A692 /* FieldStyle.swift */; };
F6A326EA1F94935200C3A692 /* UILabel+Styling.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6A326E91F94935200C3A692 /* UILabel+Styling.swift */; };
Expand Down Expand Up @@ -515,12 +509,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
F69FADB720D122F600F5BB29 /* Layout.md in Resources */,
F69FADB820D122F600F5BB29 /* Keyboard.md in Resources */,
F69FADB920D122F600F5BB29 /* Forms.md in Resources */,
F69FADBB20D122F600F5BB29 /* Tables.md in Resources */,
F69FADB620D122F600F5BB29 /* Styling.md in Resources */,
F69FADBA20D122F600F5BB29 /* Values.md in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
99 changes: 99 additions & 0 deletions Form.xcodeproj/xcshareddata/xcschemes/Form.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F6A9D5DD1C1728BA009A0EEB"
BuildableName = "Form.framework"
BlueprintName = "Form"
ReferencedContainer = "container:Form.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F62E45B31CABFB5300C6867E"
BuildableName = "FormTests.xctest"
BlueprintName = "FormTests"
ReferencedContainer = "container:Form.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F6A9D5DD1C1728BA009A0EEB"
BuildableName = "Form.framework"
BlueprintName = "Form"
ReferencedContainer = "container:Form.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F6A9D5DD1C1728BA009A0EEB"
BuildableName = "Form.framework"
BlueprintName = "Form"
ReferencedContainer = "container:Form.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "F6A9D5DD1C1728BA009A0EEB"
BuildableName = "Form.framework"
BlueprintName = "Form"
ReferencedContainer = "container:Form.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
2 changes: 1 addition & 1 deletion Form/SectionStyle.swift
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ private extension SectionStyle {
rowInsets = UIEdgeInsets(horizontalInset: 15, verticalInset: 9)
itemSpacing = 10

let insetted = traits.isPad && isGrouped && traits.horizontalSizeClass == .regular
let insetted = isGrouped && traits.horizontalSizeClass == .regular
background = insetted ? .systemInsetted : .system
selectedBackground = insetted ? .systemInsettedSelected : .systemSelected

Expand Down
7 changes: 4 additions & 3 deletions FormFramework.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "FormFramework"
s.version = "1.1.0"
s.version = "1.0.0"
s.module_name = "Form"
s.summary = "Powerful iOS layout and styling"
s.description = <<-DESC
Expand All @@ -12,8 +12,9 @@ Pod::Spec.new do |s|

s.ios.deployment_target = "9.0"
s.dependency 'FlowFramework', '~> 1.1'

s.source = { :git => "https://github.com/iZettle/Form.git", :tag => "#{s.version}" }
s.source_files = "Form/*.{swift}"
s.source_files = "Form/*.{swift,m,h}"
s.public_header_files = "Form/*.{h}"
s.swift_version = '4.1'
end

0 comments on commit 32faf21

Please sign in to comment.