diff --git a/CharcoalDemo/CharcoalDemo.xcodeproj/project.pbxproj b/CharcoalDemo/CharcoalDemo.xcodeproj/project.pbxproj index 5300b4e8..4e55a1fc 100644 --- a/CharcoalDemo/CharcoalDemo.xcodeproj/project.pbxproj +++ b/CharcoalDemo/CharcoalDemo.xcodeproj/project.pbxproj @@ -29,7 +29,6 @@ 79CC225C25D682F100E165BE /* DemoTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79CC224C25D682F100E165BE /* DemoTableViewController.swift */; }; 79CC226125D6835E00E165BE /* DemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79CC225F25D6835E00E165BE /* DemoViewController.swift */; }; 79CC226225D6835E00E165BE /* DemoTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79CC226025D6835E00E165BE /* DemoTableViewCell.swift */; }; - 79CC226525D686B200E165BE /* CHANGELOG.md in Resources */ = {isa = PBXBuildFile; fileRef = 79CC226425D686B200E165BE /* CHANGELOG.md */; }; 79CC227A25D6A5F900E165BE /* FilterContainerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79CC227925D6A5F900E165BE /* FilterContainerTests.swift */; }; 79CC22C025D6C14200E165BE /* Charcoal in Frameworks */ = {isa = PBXBuildFile; productRef = 79CC222F25D67CE000E165BE /* Charcoal */; }; 79CC22C125D6C14200E165BE /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = 79CC228425D6A63C00E165BE /* SnapshotTesting */; }; @@ -75,7 +74,6 @@ 79CC224C25D682F100E165BE /* DemoTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DemoTableViewController.swift; sourceTree = ""; }; 79CC225F25D6835E00E165BE /* DemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DemoViewController.swift; sourceTree = ""; }; 79CC226025D6835E00E165BE /* DemoTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DemoTableViewCell.swift; sourceTree = ""; }; - 79CC226425D686B200E165BE /* CHANGELOG.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = ""; }; 79CC227725D6A5F900E165BE /* SnapshotTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SnapshotTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 79CC227925D6A5F900E165BE /* FilterContainerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterContainerTests.swift; sourceTree = ""; }; 79CC227B25D6A5F900E165BE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -128,7 +126,6 @@ 79CC221825D67B8600E165BE /* CharcoalDemo */ = { isa = PBXGroup; children = ( - 79CC226425D686B200E165BE /* CHANGELOG.md */, 79CC225E25D6835E00E165BE /* Utils */, 79CC224025D682F000E165BE /* Components */, 79CC224725D682F000E165BE /* DataSource.swift */, @@ -317,7 +314,6 @@ buildActionMask = 2147483647; files = ( 79CC222625D67B8700E165BE /* LaunchScreen.storyboard in Resources */, - 79CC226525D686B200E165BE /* CHANGELOG.md in Resources */, 79CC222325D67B8700E165BE /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/CharcoalDemo/CharcoalDemo/CHANGELOG.md b/CharcoalDemo/CharcoalDemo/CHANGELOG.md deleted file mode 100644 index a1ef6c2b..00000000 --- a/CharcoalDemo/CharcoalDemo/CHANGELOG.md +++ /dev/null @@ -1,73 +0,0 @@ -## [5.1.1] - 2019-10-04 -- New build distributed with AppCenter instead of HockeyApp. - -## [5.1.1] - 2019-10-04 -- A lot of changes, Charcoal has been used in the FINN.no app for quite a while now. - -## [0.10] - 2019-01-11 -- Fixed realestate filter config -- Using FinniverKit as a dependency, new lists/cells will use FinniversKit, but old ones needs to be updated so there might be some UI inconsistencies until that is completed. -- Added geofilter -- New bottomsheet implementation -- Updated search query cell on root view to use FinniversKit styling - -## [0.9] - 2018-11-29 -- Improvement to switching verticals and demo data for one more car vertical added -- Range control should now work when the slider is all the way to the left (slide to go back should not interfer anymore) -- Continuing to slide finger when expanding bottomsheet will now switch to scroll content when bottomsheet has reached its expanded state -- Improved UI for search query filter - - -## [0.9] - 2018-11-29 -- Improvement to switching verticals and demo data for one more car vertical added -- Range control should now work when the slider is all the way to the left (slide to go back should not interfer anymore) -- Continuing to slide finger when expanding bottomsheet will now switch to scroll content when bottomsheet has reached its expanded state -- Improved UI for search query filter - -## [0.8] - 2018-11-20 -- Added UI for a verticals selector -- Fixed swipe handle animation not connected to bottomsheet -- Added stepper (-/+) UI for "number of bedrooms" filter -- Tweaked how bottomsheet handles being panned up/down -- Added an "all" item to multilevel filter -- Removed the double-tap to close swipe gesture for views presented inside a bottomsheet, close them by tapping outside of bottomsheet instead -- Removing curent selection values from root filter page should always work now -- If current selection remove buttons doesn't fit they collapse into 1 view -- Update UI, fonts, separators, colors, swipe handle etc. -- Renamed project to Charcoal -- When apply button should be hidden it is also completely hidden on iPhone X form factors - -## [0.7] - 2018-10-19 -- Improved range view -- Showing apply button when a selection has changed -- Updated preference filter UI - -## [0.6] - 2018-10-11 -- Selections should work for most filter types and be remembered for the "lifetime of that bottomsheet" -- 3 selection states for multilevel filters -- Bottom sheet presentation and dismiss animation is quicker - -## [0.5] - 2018-09-05 -- Updated bottom sheet swipe handle -- Fixed UI issue when iOS version < 11 -- Updated DNA from Finnivers and added DNA views to Demo app -- New search query filter added -- Update bottom sheet size and removed support for compact size on small devices - -## [0.4] - 2018-06-26 -- App icon! -- Different UI for checkbox and radio "buttons" -- Range filter -- Parsing of filter data, demo app will have 3 different filter setups based on real data -- Styled navigation bar - -## [0.3] - 2018-06-11 -- Compact list (shoe size filter) - -## [0.2] - 2018-05-11 -- Popover with options when selecting horizontal preferences -- Listview component -- Selected values shown on filter root - -## [0.1] - 2018-05-04 -- First Demo release diff --git a/README.md b/README.md index 9c48e227..62b26c5d 100644 --- a/README.md +++ b/README.md @@ -31,13 +31,6 @@ _Charcoal_ /ˈtʃɑːkəʊl/: _a porous black solid, consisting of an amorphous

-**Making a new Demo release** -1. Update Demo/CHANGELOG.md -2. Update version for Demo target in Xcode -3. Install fastlane with bundler if it is not already there. Run `bundle install`. -4. Run `sh Scripts/version.sh` to update build number -5. Run `bundle exec fastlane` and follow instructions - ## Installation ### CocoaPods @@ -70,7 +63,7 @@ Add this line to your `Package.swift`. We may not always update the version stri check the list of [available tags](https://github.com/finn-no/charcoal-ios/tags) and select the newest one. ```swift -.package(url: "https://github.com/finn-no/charcoal-ios.git", .from("10.0.0")) +.package(name: "Charcoal", url: "https://github.com/finn-no/charcoal-ios.git", from: "10.0.0") ``` Don't forget to add `Charcoal` as a dependency to your intended target! diff --git a/Sources/Charcoal/Filters/Map/Polygon/MapPolygonFilterViewController.swift b/Sources/Charcoal/Filters/Map/Polygon/MapPolygonFilterViewController.swift index 902b1635..c978a6fd 100644 --- a/Sources/Charcoal/Filters/Map/Polygon/MapPolygonFilterViewController.swift +++ b/Sources/Charcoal/Filters/Map/Polygon/MapPolygonFilterViewController.swift @@ -808,7 +808,7 @@ private func == (lhs: CLLocationCoordinate2D, rhs: CLLocationCoordinate2D) -> Bo return (fabs(lhs.latitude - rhs.latitude) <= 1e-5) && (fabs(lhs.longitude - rhs.longitude) <= 1e-5) } -private extension MKPolygonRenderer { +extension MKPolygonRenderer { open override func applyStrokeProperties(to context: CGContext, atZoomScale zoomScale: MKZoomScale) { super.applyStrokeProperties(to: context, atZoomScale: zoomScale) UIGraphicsPushContext(context) diff --git a/Sources/Charcoal/Resources/en.lproj/Localizable.strings b/Sources/Charcoal/Resources/nb.lproj/Localizable.strings similarity index 100% rename from Sources/Charcoal/Resources/en.lproj/Localizable.strings rename to Sources/Charcoal/Resources/nb.lproj/Localizable.strings