Skip to content

Commit

Permalink
Feature: šŸŽ…Xmas filtersšŸŽ (#304)
Browse files Browse the repository at this point in the history
* Ignore .idea folder

* Updated FinniversKit

* Add overridden modifier to RootFilterCell.isEnabled

* Add christmas filterKey

* Update demo bap.json

* Insert xmas filters in FilterMarketBap

* Don't layout view unless added to view hierarchy

* Add method to compensate detailLabelConstraint, if iOS 13

* Minor refactoring

* Update FinniversKit

* Update circleCI config
  • Loading branch information
bstien authored Oct 23, 2019
1 parent 58eb2e7 commit 849ac48
Show file tree
Hide file tree
Showing 25 changed files with 2,481 additions and 62 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
3 changes: 3 additions & 0 deletions .gitignore
2 changes: 1 addition & 1 deletion Cartfile.resolved
5 changes: 3 additions & 2 deletions Carthage/Build/.FinniversKit.version
Binary file not shown.
Binary file modified Carthage/Build/iOS/FinniversKit.framework/Assets.car
Binary file not shown.
Binary file modified Carthage/Build/iOS/FinniversKit.framework/FinniversKit
Binary file not shown.
2,457 changes: 2,411 additions & 46 deletions Carthage/Build/iOS/FinniversKit.framework/Headers/FinniversKit-Swift.h
Binary file modified Carthage/Build/iOS/FinniversKit.framework/Info.plist
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
16 changes: 16 additions & 0 deletions Demo/Resources/bap/bap.json
10 changes: 7 additions & 3 deletions Sources/Charcoal/Filters/FilterViewController.swift
19 changes: 14 additions & 5 deletions Sources/Charcoal/Filters/List/Views/ListFilterCell.swift
2 changes: 1 addition & 1 deletion Sources/Charcoal/Filters/Root/Views/RootFilterCell.swift
1 change: 1 addition & 0 deletions Sources/FINNSetup/FilterKey.swift
1 change: 1 addition & 0 deletions Sources/FINNSetup/FilterMarkets/FilterMarketBap.swift

0 comments on commit 849ac48

Please sign in to comment.