Skip to content

Commit

Permalink
Update version 3.7.3
Browse files Browse the repository at this point in the history
  • Loading branch information
adonitDevel committed Nov 18, 2019
1 parent 8ba9087 commit 2691dd3
Show file tree
Hide file tree
Showing 72 changed files with 106 additions and 83 deletions.
Binary file removed AdonitSDK.bundle/DebugOptionsTableViewCell.nib
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified AdonitSDK.bundle/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 modified AdonitSDK.bundle/JotSettings.storyboardc/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.
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.
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.
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.
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.
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 modified AdonitSDK.framework/Versions/A/AdonitSDK
Binary file not shown.
5 changes: 5 additions & 0 deletions AdonitSDK.framework/Versions/A/Headers/JotStylusManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,11 @@ extern NSString * const JotStylusManagerDiscoveryAttemptedButBluetoothOffNotific
*/
@property (readonly) BOOL stylusSupportsScrollSensor;

/**
* Indicates whether the connected stylus supports a variable azimuth angle.
*/
@property (readonly) BOOL stylusSupportsAzimuthAngle;

/**
* A positive integer specifying the amount of battery remaining
*/
Expand Down
5 changes: 5 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
#Change Log for AdonitSDK (iOS)

#v3.7.3

**SDK**
- Improved stability when connected with external display with iOS 13.

#v3.7

**SDK**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "7747EC7B1A1BDC9700D18429"
BuildableName = "JotWorkshop.app"
BlueprintName = "JotWorkshop"
ReferencedContainer = "container:JotTouchExample.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -53,17 +62,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "7747EC7B1A1BDC9700D18429"
BuildableName = "JotWorkshop.app"
BlueprintName = "JotWorkshop"
ReferencedContainer = "container:JotTouchExample.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -85,8 +83,6 @@
ReferencedContainer = "container:JotTouchExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
13 changes: 7 additions & 6 deletions JotTouchExample/JotTouchExample/CanvasView.m
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ - (void)layoutSublayersOfLayer:(CALayer *)layer
#pragma mark - Begin Adonit SDK integration
- (void)configureDrawViewForAdonitSDK
{
[[JotStylusManager sharedInstance] registerView:self];
// [[JotStylusManager sharedInstance] registerView:self];
}

#pragma mark - JotStrokeDelegate
Expand Down Expand Up @@ -275,13 +275,13 @@ - (void)jotStylusStrokeMoved:(JotStroke *)stylusStroke
for (JotStroke *coalescedJotStroke in stylusStroke.coalescedJotStrokes) {

CGPoint location = [coalescedJotStroke locationInView:self];
NSLog(@"azimuthAngleInView = %f , azimuthUnitVectorInView = %@ , altitudeAngle = %f",[coalescedJotStroke azimuthAngleInView:self] ,NSStringFromCGVector([coalescedJotStroke azimuthUnitVectorInView:self]), [coalescedJotStroke altitudeAngle] );
// NSLog(@"azimuthAngleInView = %f , azimuthUnitVectorInView = %@ , altitudeAngle = %f",[coalescedJotStroke azimuthAngleInView:self] ,NSStringFromCGVector([coalescedJotStroke azimuthUnitVectorInView:self]), [coalescedJotStroke altitudeAngle] );
self.viewController.radianLabel.text = [NSString stringWithFormat:@"%.5f",[coalescedJotStroke altitudeAngle]];
self.viewController.angleLabel.text = [NSString stringWithFormat:@"%.5f",[coalescedJotStroke altitudeAngle] * 180 / M_PI];

CGFloat pressure = coalescedJotStroke.pressure;
CGFloat width = [self widthForPressure:pressure tilt:coalescedJotStroke.altitudeAngle];
CGFloat offset = 0;//[self widthForPressure:pressure tilt:coalescedJotStroke.altitudeAngle] / 10;

brushWidthActual = brushWidthActual < width ? width : brushWidthActual;
[self addLineToAndRenderStroke:currentStroke
toPoint:CGPointMake(location.x + offset, location.y + offset)
Expand Down Expand Up @@ -424,13 +424,15 @@ - (void)jotStylusStrokeCancelled:(JotStroke *)stylusStroke

- (void)jotSuggestsToDisableGestures
{
NSLog(@"jotSuggestsToDisableGestures");
// disable any other gestures, like a pinch to zoom
[self disableGestures];
[self.viewController handleJotSuggestsToDisableGestures];
}

- (void)jotSuggestsToEnableGestures
{
NSLog(@"jotSuggestsToEnableGestures");
// enable any other gestures, like a pinch to zoom
[self enableGestures];
[self.viewController handleJotSuggestsToEnableGestures];
Expand Down Expand Up @@ -463,7 +465,6 @@ - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event

for (UITouch *coalescedTouch in coalescedTouches) {
CGPoint location = [coalescedTouch locationInView:self];

[self addLineToAndRenderStroke:[self getStrokeForHash:@(currentStroke.hash)]
toPoint:location
toWidth:[self widthForPressure:(CGFloat)[JotStylusManager sharedInstance].unconnectedPressure / (CGFloat)JOT_MAX_PRESSURE tilt:M_PI_2]
Expand Down Expand Up @@ -497,7 +498,7 @@ - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
// AbstractBezierPathElement* last = currentStroke.segments.lastObject;
for (UITouch *coalescedTouch in coalescedTouches) {
CGPoint location = [coalescedTouch locationInView:self];
NSLog(@"azimuthAngleInView = %f , azimuthUnitVectorInView = %@ , altitudeAngle = %f",[coalescedTouch azimuthAngleInView:self] ,NSStringFromCGVector([coalescedTouch azimuthUnitVectorInView:self]), [coalescedTouch altitudeAngle] );
// NSLog(@"azimuthAngleInView = %f , azimuthUnitVectorInView = %@ , altitudeAngle = %f",[coalescedTouch azimuthAngleInView:self] ,NSStringFromCGVector([coalescedTouch azimuthUnitVectorInView:self]), [coalescedTouch altitudeAngle] );
self.viewController.radianLabel.text = [NSString stringWithFormat:@"%.5f",[coalescedTouch altitudeAngle]];
self.viewController.angleLabel.text = [NSString stringWithFormat:@"%.5f",[coalescedTouch altitudeAngle] * 180 / M_PI];
if (currentStroke) {
Expand Down Expand Up @@ -1421,7 +1422,7 @@ - (void)setupBrushTexture:(UIImage*)brushImage
*/
- (void)dealloc
{
[[JotStylusManager sharedInstance] unregisterView:self];
// [[JotStylusManager sharedInstance] unregisterView:self];

[self destroyFramebuffer];

Expand Down
2 changes: 2 additions & 0 deletions JotTouchExample/JotTouchExample/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>NSBluetoothAlwaysUsageDescription</key>
<string>Bluetooth is required to use your stylus.</string>
<key>NSBluetoothPeripheralUsageDescription</key>
<string>Apps require bluetooth</string>
<key>UIBackgroundModes</key>
Expand Down
Loading

0 comments on commit 2691dd3

Please sign in to comment.