Skip to content

Commit

Permalink
Decrease minimum iOS version (#46)
Browse files Browse the repository at this point in the history
* Decrease minium iOS version

Create ContextMenuHapticFeedbackStyle enumeration to mirror iOS UIImpactFeedbackGenerator.FeedbackStyle

* Rename ContextMenuHapticFeedbackStyle and put the enum inside an extension to match the common style

* Rename ContextMenuHapticFeedbackStyle to HapticFeedbackStyle

* Update the Example project

- Install newest Pod version
- Specify platform in the Podfile
- Unset development team
  • Loading branch information
av0c0der authored and rnystrom committed Jan 5, 2019
1 parent 6840577 commit 03c33c4
Show file tree
Hide file tree
Showing 12 changed files with 332 additions and 309 deletions.
6 changes: 3 additions & 3 deletions ContextMenu.podspec
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Pod::Spec.new do |spec|
spec.name = 'ContextMenu'
spec.version = '0.5.0'
spec.version = '0.5.1'
spec.license = { :type => 'MIT' }
spec.homepage = 'https://github.com/GitHawkApp/ContextMenu'
spec.authors = { 'Ryan Nystrom' => '[email protected]' }
spec.summary = 'Context menu inspired by Things 3.'
spec.source = { :git => 'https://github.com/GitHawkApp/ContextMenu.git', :tag => spec.version.to_s }
spec.source_files = 'ContextMenu/*.swift'
spec.platform = :ios, '10.0'
spec.platform = :ios, '9.0'
spec.swift_version = '4.2'
end
end
4 changes: 4 additions & 0 deletions ContextMenu.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
2991418920BC757100B63A3B /* ContextMenu.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2971CE722054539900342296 /* ContextMenu.framework */; };
2991419020BC77FA00B63A3B /* CGRect+DominantCorner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2991418F20BC77FA00B63A3B /* CGRect+DominantCorner.swift */; };
2991419220BC789D00B63A3B /* CGRect_DominantCornerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2991419120BC789D00B63A3B /* CGRect_DominantCornerTests.swift */; };
9DAB381F21E10EB600567709 /* ContextMenu+HapticFeedbackStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DAB381E21E10EB600567709 /* ContextMenu+HapticFeedbackStyle.swift */; };
DE5D838B2055D72A0069A81D /* UIViewController+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE5D838A2055D72A0069A81D /* UIViewController+Extensions.swift */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -66,6 +67,7 @@
2991418820BC757100B63A3B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
2991418F20BC77FA00B63A3B /* CGRect+DominantCorner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CGRect+DominantCorner.swift"; sourceTree = "<group>"; };
2991419120BC789D00B63A3B /* CGRect_DominantCornerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGRect_DominantCornerTests.swift; sourceTree = "<group>"; };
9DAB381E21E10EB600567709 /* ContextMenu+HapticFeedbackStyle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ContextMenu+HapticFeedbackStyle.swift"; sourceTree = "<group>"; };
DE5D838A2055D72A0069A81D /* UIViewController+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Extensions.swift"; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -117,6 +119,7 @@
2971CE83205453D900342296 /* ContextMenu+Animations.swift */,
2971CE80205453D800342296 /* ContextMenu+ContainerStyle.swift */,
2971CE85205453D900342296 /* ContextMenu+ContextMenuPresentationControllerDelegate.swift */,
9DAB381E21E10EB600567709 /* ContextMenu+HapticFeedbackStyle.swift */,
2971CE81205453D900342296 /* ContextMenu+Item.swift */,
2971CE86205453D900342296 /* ContextMenu+MenuStyle.swift */,
2971CE7E205453D800342296 /* ContextMenu+Options.swift */,
Expand Down Expand Up @@ -262,6 +265,7 @@
2971CE97205453D900342296 /* ContextMenuPresenting.swift in Sources */,
2971CE90205453D900342296 /* ContextMenuDismissing.swift in Sources */,
2971CE94205453D900342296 /* ContextMenu+MenuStyle.swift in Sources */,
9DAB381F21E10EB600567709 /* ContextMenu+HapticFeedbackStyle.swift in Sources */,
2971CE8E205453D900342296 /* ContextMenu+ContainerStyle.swift in Sources */,
DE5D838B2055D72A0069A81D /* UIViewController+Extensions.swift in Sources */,
2971CE95205453D900342296 /* ClippedContainerViewController.swift in Sources */,
Expand Down
18 changes: 18 additions & 0 deletions ContextMenu/ContextMenu+HapticFeedbackStyle.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
//
// ContextMenu+HapticFeedbackStyle.swift
// ContextMenu
//
// Created by Abdurahim Jauzee on 31/12/2018.
//

import Foundation

public extension ContextMenu {

/// Haptic Feedback types.
public enum HapticFeedbackStyle: Int {
case light, medium, heavy
}

}

4 changes: 2 additions & 2 deletions ContextMenu/ContextMenu+Options.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ extension ContextMenu {
let menuStyle: MenuStyle

/// Trigger haptic feedback when the menu is shown.
let hapticsStyle: UIImpactFeedbackGenerator.FeedbackStyle?
let hapticsStyle: HapticFeedbackStyle?

/// The position relative to the source view (if provided).
let position: Position
Expand All @@ -32,7 +32,7 @@ extension ContextMenu {
durations: AnimationDurations = AnimationDurations(),
containerStyle: ContainerStyle = ContainerStyle(),
menuStyle: MenuStyle = .default,
hapticsStyle: UIImpactFeedbackGenerator.FeedbackStyle? = nil,
hapticsStyle: HapticFeedbackStyle? = nil,
position: Position = .default
) {
self.durations = durations
Expand Down
4 changes: 2 additions & 2 deletions ContextMenu/ContextMenu.swift
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ public class ContextMenu: NSObject {
previous.viewController.dismiss(animated: false)
}

if let style = options.hapticsStyle {
let haptics = UIImpactFeedbackGenerator(style: style)
if #available(iOS 10, *), let raw = options.hapticsStyle?.rawValue, let feedbackStyle = UIImpactFeedbackGenerator.FeedbackStyle(rawValue: raw) {
let haptics = UIImpactFeedbackGenerator(style: feedbackStyle)
haptics.impactOccurred()
}

Expand Down
3 changes: 2 additions & 1 deletion Example/Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0920;
LastUpgradeCheck = 0920;
LastUpgradeCheck = 1010;
ORGANIZATIONNAME = "Ryan Nystrom";
TargetAttributes = {
2971CEA1205454BD00342296 = {
Expand Down Expand Up @@ -251,6 +251,7 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
Expand Down
2 changes: 2 additions & 0 deletions Example/Podfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
platform :ios, '9.0'

target 'Example' do
use_frameworks!
pod 'ContextMenu', :path => '../ContextMenu.podspec'
Expand Down
6 changes: 3 additions & 3 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- ContextMenu (0.5.0)
- ContextMenu (0.5.1)

DEPENDENCIES:
- ContextMenu (from `../ContextMenu.podspec`)
Expand All @@ -9,8 +9,8 @@ EXTERNAL SOURCES:
:path: "../ContextMenu.podspec"

SPEC CHECKSUMS:
ContextMenu: 771a37612cd5cd10bf1dc0e3b9187df4d6f1e57a
ContextMenu: accf2c0d0d91ad7c573fcd9863a1fd339d1cf980

PODFILE CHECKSUM: aa060c7f3a10a9cb8b2633f1297c22bb65e4f54d
PODFILE CHECKSUM: a25bcff99b093889f3fc3097941235bb4adeee58

COCOAPODS: 1.5.3
6 changes: 3 additions & 3 deletions Example/Pods/Local Podspecs/ContextMenu.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Example/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 03c33c4

Please sign in to comment.