Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to JTSHardwareInfo #86

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Switch to JTSHardwareInfo #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
712ec93
Unmericiful hacking of the Airdrop share item to turn it into a More …
prendio2 Oct 3, 2014
d3d99f5
Merge branch 'master' of https://github.com/overshare/overshare-kit
PadraigK Oct 19, 2014
1927929
Switch to using JTSHardwareInfo
PadraigK Oct 19, 2014
4cc8150
Revert "Unmericiful hacking of the Airdrop share item to turn it into…
PadraigK Oct 19, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@
[submodule "ADNLogin-SDK-iOS"]
path = Dependencies/ADNLogin-SDK
url = https://github.com/appdotnet/ADNLogin-SDK-iOS.git
[submodule "Dependencies/JTSHardwareInfo"]
path = Dependencies/JTSHardwareInfo
url = https://github.com/jaredsinclair/JTSHardwareInfo.git
1 change: 1 addition & 0 deletions Dependencies/JTSHardwareInfo
Open in desktop
Submodule JTSHardwareInfo added at e32dbd
4 changes: 2 additions & 2 deletions Overshare Kit/OSKAirDropActivity.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#import "OSKAirDropActivity.h"

#import "UIDevice+OSKHardware.h"
#import "JTSHardwareInfo.h"
#import "OSKShareableContentItem.h"

@interface OSKAirDropActivity ()
Expand All @@ -32,7 +32,7 @@ + (NSString *)supportedContentItemType {
}

+ (BOOL)isAvailable {
return [[UIDevice currentDevice] osk_airDropIsAvailable];
return [JTSHardwareInfo airDropIsAvailable];
}

+ (NSString *)activityType {
Expand Down
77 changes: 0 additions & 77 deletions Overshare Kit/UIDevice+OSKHardware.h
View file
Open in desktop

This file was deleted.

159 changes: 0 additions & 159 deletions Overshare Kit/UIDevice+OSKHardware.m
View file
Open in desktop

This file was deleted.

20 changes: 14 additions & 6 deletions Projects/Static Library/OvershareKit/OvershareKit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
1A0223BD19F3503C00D68B4A /* JTSHardwareInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A0223BC19F3503C00D68B4A /* JTSHardwareInfo.m */; };
2EA7594318E5831E00078A1D /* OSKSaveToCameraRollActivity.m in Sources */ = {isa = PBXBuildFile; fileRef = 2EA7594218E5831E00078A1D /* OSKSaveToCameraRollActivity.m */; };
32C2B9B7190337BC0055C98B /* OSKMimeAttachment.m in Sources */ = {isa = PBXBuildFile; fileRef = 32C2B9B6190337BC0055C98B /* OSKMimeAttachment.m */; };
7F04946C188AFE5400BE7C4E /* NSString+OSKEmoji.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F04946B188AFE5400BE7C4E /* NSString+OSKEmoji.m */; };
Expand Down Expand Up @@ -107,7 +108,6 @@
7FEE78F6181ED8FE000F684A /* OSKUsernamePasswordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FEE78A3181ED8FE000F684A /* OSKUsernamePasswordViewController.m */; };
7FEE78F7181ED8FE000F684A /* OSKWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FEE78A5181ED8FE000F684A /* OSKWebViewController.m */; };
7FEE78F8181ED8FE000F684A /* UIColor+OSKUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FEE78A8181ED8FE000F684A /* UIColor+OSKUtility.m */; };
7FEE78F9181ED8FE000F684A /* UIDevice+OSKHardware.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FEE78AA181ED8FE000F684A /* UIDevice+OSKHardware.m */; };
7FEE78FA181ED8FE000F684A /* UIView+OSKUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FEE78AC181ED8FE000F684A /* UIView+OSKUtilities.m */; };
7FEE78FB181ED8FE000F684A /* UIViewController+OSKUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FEE78AE181ED8FE000F684A /* UIViewController+OSKUtilities.m */; };
8895C32918A3B890000B7F28 /* GoogleOpenSource.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8895C32618A3B890000B7F28 /* GoogleOpenSource.framework */; };
Expand Down Expand Up @@ -144,6 +144,8 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
1A0223BB19F3503C00D68B4A /* JTSHardwareInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JTSHardwareInfo.h; path = ../../../Dependencies/JTSHardwareInfo/Source/JTSHardwareInfo.h; sourceTree = "<group>"; };
1A0223BC19F3503C00D68B4A /* JTSHardwareInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JTSHardwareInfo.m; path = ../../../Dependencies/JTSHardwareInfo/Source/JTSHardwareInfo.m; sourceTree = "<group>"; };
2EA7594118E5831E00078A1D /* OSKSaveToCameraRollActivity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OSKSaveToCameraRollActivity.h; sourceTree = "<group>"; };
2EA7594218E5831E00078A1D /* OSKSaveToCameraRollActivity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OSKSaveToCameraRollActivity.m; sourceTree = "<group>"; };
32C2B9B5190337BC0055C98B /* OSKMimeAttachment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OSKMimeAttachment.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -475,8 +477,6 @@
7FEE78A6181ED8FE000F684A /* OvershareKit-iOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OvershareKit-iOS.h"; sourceTree = "<group>"; };
7FEE78A7181ED8FE000F684A /* UIColor+OSKUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIColor+OSKUtility.h"; sourceTree = "<group>"; };
7FEE78A8181ED8FE000F684A /* UIColor+OSKUtility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIColor+OSKUtility.m"; sourceTree = "<group>"; };
7FEE78A9181ED8FE000F684A /* UIDevice+OSKHardware.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIDevice+OSKHardware.h"; sourceTree = "<group>"; };
7FEE78AA181ED8FE000F684A /* UIDevice+OSKHardware.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIDevice+OSKHardware.m"; sourceTree = "<group>"; };
7FEE78AB181ED8FE000F684A /* UIView+OSKUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+OSKUtilities.h"; sourceTree = "<group>"; };
7FEE78AC181ED8FE000F684A /* UIView+OSKUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+OSKUtilities.m"; sourceTree = "<group>"; };
7FEE78AD181ED8FE000F684A /* UIViewController+OSKUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+OSKUtilities.h"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -526,10 +526,20 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
1A0223BA19F3501500D68B4A /* JTSHardwareInfo */ = {
isa = PBXGroup;
children = (
1A0223BB19F3503C00D68B4A /* JTSHardwareInfo.h */,
1A0223BC19F3503C00D68B4A /* JTSHardwareInfo.m */,
);
name = JTSHardwareInfo;
sourceTree = "<group>";
};
7F6711F8181EDF870006E037 /* Third-Party Dependencies */ = {
isa = PBXGroup;
children = (
7F6711F9181EDF900006E037 /* ADNLogin */,
1A0223BA19F3501500D68B4A /* JTSHardwareInfo */,
7F6711FA181EDF960006E037 /* Pocket */,
);
name = "Third-Party Dependencies";
Expand Down Expand Up @@ -816,8 +826,6 @@
7FEE78A6181ED8FE000F684A /* OvershareKit-iOS.h */,
7FEE78A7181ED8FE000F684A /* UIColor+OSKUtility.h */,
7FEE78A8181ED8FE000F684A /* UIColor+OSKUtility.m */,
7FEE78A9181ED8FE000F684A /* UIDevice+OSKHardware.h */,
7FEE78AA181ED8FE000F684A /* UIDevice+OSKHardware.m */,
7FEE78AB181ED8FE000F684A /* UIView+OSKUtilities.h */,
7FEE78AC181ED8FE000F684A /* UIView+OSKUtilities.m */,
7FEE78AD181ED8FE000F684A /* UIViewController+OSKUtilities.h */,
Expand Down Expand Up @@ -1044,7 +1052,7 @@
2EA7594318E5831E00078A1D /* OSKSaveToCameraRollActivity.m in Sources */,
7FEE78D9181ED8FE000F684A /* OSKMailComposeViewController.m in Sources */,
7F55A30C18425C6C004A3BCC /* OSKSession.m in Sources */,
7FEE78F9181ED8FE000F684A /* UIDevice+OSKHardware.m in Sources */,
1A0223BD19F3503C00D68B4A /* JTSHardwareInfo.m in Sources */,
7FEE78EE181ED8FE000F684A /* OSKSystemAccountStore.m in Sources */,
7FEE78C9181ED8FE000F684A /* OSKAppDotNetAuthenticationViewController.m in Sources */,
7FEE78C3181ED8FE000F684A /* OSKActivitySheetViewController.m in Sources */,
Expand Down
Loading