-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into kve/horizontal-list-l…
…ayout * origin/main: (61 commits) Prep 0.30.1 (#348) Fix keyboard inset (#347) Update CI to run tests on iOS 15 and Xcode 13 (#346) Update docs Prep 0.30.0 Convert several demos to result builders Update CHANGELOG Update changelog Documentation Code review from Westin Add task list Tests Self review, cleanup Add examples of two syntaxes, update SwipeActions Add examples for best practices Update CHANGELOG Make public the various layout types Revert file SPM Test support Ensure we always update the Environment on the HeaderFooter's backing view. ...
- Loading branch information
Showing
555 changed files
with
89,458 additions
and
33,244 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,9 +9,9 @@ Pod::Spec.new do |s| | |
| s.author = { 'Kyle' => '[email protected]' } | ||
| s.source = { git: 'https://github.com/kyleve/Listable.git', tag: "#{s.version}" } | ||
|
|
||
| s.ios.deployment_target = '11.0' | ||
| s.ios.deployment_target = '12.0' | ||
|
|
||
| s.swift_versions = ['5.0'] | ||
| s.swift_versions = ['5.4'] | ||
|
|
||
| s.dependency 'ListableUI' | ||
| s.dependency 'BlueprintUI' | ||
|
|
@@ -27,7 +27,7 @@ Pod::Spec.new do |s| | |
| test_spec.ios.resource_bundle = { 'BlueprintUIListsResources' => 'BlueprintUILists/Tests/Resources/**/*.*' } | ||
|
|
||
| test_spec.framework = 'XCTest' | ||
|
|
||
| test_spec.libraries = 'swiftsimd', 'swiftCoreGraphics', 'swiftFoundation', 'swiftUIKit' | ||
|
|
||
| test_spec.requires_app_host = true | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,7 @@ | |
|
|
||
| import BlueprintUI | ||
| import ListableUI | ||
| import UIKit | ||
|
|
||
|
|
||
| /// | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| // | ||
| // List.Measurement.swift | ||
| // BlueprintUILists | ||
| // | ||
| // Created by Kyle Van Essen on 3/25/21. | ||
| // | ||
|
|
||
| import ListableUI | ||
|
|
||
|
|
||
| /// | ||
| /// Provides the possible options for how to size and measure a list when its measured size is queried | ||
| /// by the layout system. | ||
| /// | ||
| /// You have two options: `.fillParent` and `.measureContent`. | ||
| /// | ||
| /// When using `.fillParent`, the full available fitting size will be taken up, regardless | ||
| /// of the size of the content itself. | ||
| /// | ||
| /// When using `.measureContent`, the content will be measured within the provided fitting size | ||
| /// and the smallest of the two sizes will be returned. | ||
| /// ``` | ||
| /// .fillParent: | ||
| /// ┌───────────┐ | ||
| /// │┌─────────┐│ | ||
| /// ││ ││ | ||
| /// ││ ││ | ||
| /// ││ ││ | ||
| /// ││ ││ | ||
| /// ││ ││ | ||
| /// │└─────────┘│ | ||
| /// └───────────┘ | ||
| /// | ||
| /// .measureContent | ||
| /// ┌───────────┐ | ||
| /// │ │ | ||
| /// │ │ | ||
| /// │┌─────────┐│ | ||
| /// ││ ││ | ||
| /// ││ ││ | ||
| /// ││ ││ | ||
| /// │└─────────┘│ | ||
| /// └───────────┘ | ||
| /// ``` | ||
| extension List { | ||
|
|
||
| public enum Measurement : Equatable | ||
| { | ||
| /// When using `.fillParent`, the full available space will be taken up, regardless | ||
| /// of the content size of the list itself. | ||
| /// | ||
| /// Eg, if the fitting size passed to the list is (200w, 1000h), and the list's content | ||
| /// is only (200w, 500h), (200w, 1000h) will still be returned. | ||
| /// | ||
| /// This is the setting you want to use when your list is being used to fill the content | ||
| /// of a screen, such as if it is being presented in a navigation controller or tab bar controller. | ||
| /// | ||
| /// This option is the most performant, because no content measurement has to occur. | ||
| case fillParent | ||
|
|
||
| /// When using `.measureContent`, the content of the list will be measured within the provided fitting size | ||
| /// and the smallest of the two sizes will be returned. | ||
| /// | ||
| /// If you are putting a list into a sheet or popover (or even another list!), this is generally the `Sizing` type | ||
| /// you will want to use, to ensure the sheet or popover takes up the minimum amount of space possible. | ||
| /// | ||
| /// - parameters: | ||
| /// - cacheKey: If provided, the underlying `Element`'s `measurementCacheKey` will be set to this value. | ||
| /// Note that this value must be unique within the entire blueprint view – so please provide a sufficiently unique value, | ||
| /// or measurement collisions will occur (one element's measurement being used for another) for duplicate keys. | ||
| /// | ||
| /// - itemLimit: When measuring the list, how many items should be measured to determine the height. Defaults | ||
| /// to 50, which is usually enough to fill the `fittingSize`. If you truly want to determine the entire height of all of | ||
| /// the content in the list, set this to `nil` (but you should rarely need to do this). The lower this value, the less | ||
| /// overall measurement that has to occur (if the value is less than the number of items in the list), which improvements | ||
| /// measurement and layout performance. | ||
| /// | ||
| case measureContent( | ||
| cacheKey : AnyHashable? = nil, | ||
| itemLimit : Int? = ListView.defaultContentSizeItemLimit | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,7 @@ | |
|
|
||
| import BlueprintUI | ||
| import ListableUI | ||
| import UIKit | ||
|
|
||
|
|
||
| /// | ||
|
|
||
Oops, something went wrong.