Skip to content

Commit

Permalink
Updated for version 3.6 of the Adonit iOS SDK.
Browse files Browse the repository at this point in the history
  • Loading branch information
@adonitDevel
adonitDevel committed Aug 5, 2019
1 parent 258788d commit d522fe4
Show file tree
Hide file tree
Showing 33 changed files with 135 additions and 84 deletions.
Binary file modified AdonitSDK.bundle/DebugOptionsTableViewCell.nib
View file
Binary file not shown.
Binary file modified AdonitSDK.bundle/Info.plist
View file
Binary file not shown.
Binary file modified AdonitSDK.bundle/JotSettings.storyboardc/DebugStatusViewController.nib
View file
Binary file not shown.
Binary file modified AdonitSDK.bundle/JotSettings.storyboardc/FPM-bZ-AqB-view-Xvj-0Q-ooG.nib
View file
Binary file not shown.
Binary file modified AdonitSDK.bundle/JotSettings.storyboardc/Info.plist
View file
Binary file not shown.
Binary file modified AdonitSDK.bundle/JotSettings.storyboardc/JotBatteryViewController.nib
View file
Binary file not shown.
Binary file modified AdonitSDK.bundle/JotSettings.storyboardc/JotConnectedViewController.nib
View file
Binary file not shown.
Binary file modified AdonitSDK.bundle/JotSettings.storyboardc/JotConnectionStatusViewController.nib
View file
Binary file not shown.
Binary file modified AdonitSDK.bundle/JotSettings.storyboardc/JotDisconnectedViewController.nib
View file
Binary file not shown.
Binary file modified AdonitSDK.bundle/JotSettings.storyboardc/JotPressToConnectViewController.nib
View file
Binary file not shown.
Binary file modified AdonitSDK.bundle/JotSettings.storyboardc/JotShortButtonsTableViewController.nib
View file
Binary file not shown.
Binary file modified AdonitSDK.bundle/JotSettings.storyboardc/JotStylusDetailTableViewController.nib
View file
Binary file not shown.
Binary file modified AdonitSDK.bundle/JotSettings.storyboardc/JotWritingStyleViewController.nib
View file
Binary file not shown.
Binary file modified AdonitSDK.bundle/JotSettings.storyboardc/Kai-kc-1UU-view-mH9-9p-q6X.nib
View file
Binary file not shown.
Binary file modified AdonitSDK.bundle/JotSettings.storyboardc/UINavigationController-WQh-qr-84m.nib
View file
Binary file not shown.
Binary file modified AdonitSDK.bundle/JotSettings.storyboardc/YyA-YT-yNg-view-daT-lA-OZj.nib
View file
Binary file not shown.
Binary file modified AdonitSDK.bundle/JotSettings.storyboardc/dtB-tO-xBf-view-2bn-E7-7yp.nib
View file
Binary file not shown.
Binary file modified AdonitSDK.bundle/JotSettings.storyboardc/mrx-Gs-5KW-view-vOb-Vy-utL.nib
View file
Binary file not shown.
Binary file modified AdonitSDK.bundle/JotSettings.storyboardc/oxC-0N-u0H-view-NZH-Vd-sUJ.nib
View file
Binary file not shown.
Binary file modified AdonitSDK.bundle/JotSettings.storyboardc/p4f-Rj-cqB-view-iYF-un-vxo.nib
View file
Binary file not shown.
Binary file modified AdonitSDK.bundle/JotSettings.storyboardc/s6B-Kb-hQX-view-S2f-BN-84O.nib
View file
Binary file not shown.
Binary file modified AdonitSDK.bundle/JotSettings.storyboardc/zQv-SI-wo7-view-zzO-wF-Psq.nib
View file
Binary file not shown.
Binary file modified AdonitSDK.framework/Versions/A/AdonitSDK
View file
Binary file not shown.
63 changes: 49 additions & 14 deletions JotTouchExample/JotTouchExample.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
4D2273911D2A6F65008AEE13 /* Colors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D22738F1D2A6F65008AEE13 /* Colors.swift */; };
4D2273921D2A6F65008AEE13 /* Numbers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D2273901D2A6F65008AEE13 /* Numbers.swift */; };
4D22739A1D2B597C008AEE13 /* ColorPaletteLibrary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D2273991D2B597C008AEE13 /* ColorPaletteLibrary.swift */; };
4D6143A71FDA929000BB736F /* AdonitSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D6143A51FDA929000BB736F /* AdonitSDK.framework */; };
4D6143A81FDA929000BB736F /* AdonitSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 4D6143A61FDA929000BB736F /* AdonitSDK.bundle */; };
4D75A99D1FFF321D00F5ED80 /* AdonitRadiusView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D75A99C1FFF321D00F5ED80 /* AdonitRadiusView.m */; };
4D82FD8C1FCC103300BD9240 /* PressedConnectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D82FD8A1FCC103200BD9240 /* PressedConnectionViewController.m */; };
4D82FD8F1FCC129000BD9240 /* PressToConnectViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D82FD8E1FCC129000BD9240 /* PressToConnectViewController.m */; };
Expand All @@ -34,6 +32,8 @@
4DB71A971FBD3385004F53E4 /* WritingStyleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB71A931FBD3383004F53E4 /* WritingStyleViewController.m */; };
4DB71A981FBD3385004F53E4 /* WritingStyleSelectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB71A951FBD3384004F53E4 /* WritingStyleSelectionView.m */; };
4DB71A9B1FBD5E7C004F53E4 /* ShortcutButtonsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB71A991FBD5E7B004F53E4 /* ShortcutButtonsTableViewController.m */; };
4DEA9388223A2BAB0082A4B7 /* AdonitSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DEA9386223A2BAB0082A4B7 /* AdonitSDK.framework */; };
4DEA9389223A2BAB0082A4B7 /* AdonitSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 4DEA9387223A2BAB0082A4B7 /* AdonitSDK.bundle */; };
4DFA5DF71FCFAFAD00D0B949 /* JotModelConnectViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DFA5DF61FCFAFAD00D0B949 /* JotModelConnectViewController.m */; };
7717F9481A1CD859001706AE /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7717F9471A1CD859001706AE /* MainStoryboard.storyboard */; };
7747EC821A1BDC9700D18429 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 7747EC811A1BDC9700D18429 /* main.m */; };
Expand Down Expand Up @@ -90,8 +90,6 @@
4D22738F1D2A6F65008AEE13 /* Colors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Colors.swift; sourceTree = "<group>"; };
4D2273901D2A6F65008AEE13 /* Numbers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Numbers.swift; sourceTree = "<group>"; };
4D2273991D2B597C008AEE13 /* ColorPaletteLibrary.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ColorPaletteLibrary.swift; sourceTree = "<group>"; };
4D6143A51FDA929000BB736F /* AdonitSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdonitSDK.framework; path = ../../AdonitSDK.framework; sourceTree = "<group>"; };
4D6143A61FDA929000BB736F /* AdonitSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = AdonitSDK.bundle; path = ../../AdonitSDK.bundle; sourceTree = "<group>"; };
4D75A99B1FFF321C00F5ED80 /* AdonitRadiusView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdonitRadiusView.h; sourceTree = "<group>"; };
4D75A99C1FFF321D00F5ED80 /* AdonitRadiusView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AdonitRadiusView.m; sourceTree = "<group>"; };
4D82FD8A1FCC103200BD9240 /* PressedConnectionViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PressedConnectionViewController.m; sourceTree = "<group>"; };
Expand All @@ -112,6 +110,8 @@
4DB71A9A1FBD5E7C004F53E4 /* ShortcutButtonsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShortcutButtonsTableViewController.h; sourceTree = "<group>"; };
4DC541CA1D61BBD2008631C8 /* AdonitSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = AdonitSDK.bundle; path = ../../AdonitSDK.bundle; sourceTree = "<group>"; };
4DC541CB1D61BBD2008631C8 /* AdonitSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdonitSDK.framework; path = ../../AdonitSDK.framework; sourceTree = "<group>"; };
4DEA9386223A2BAB0082A4B7 /* AdonitSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdonitSDK.framework; path = ../AdonitSDK.framework; sourceTree = "<group>"; };
4DEA9387223A2BAB0082A4B7 /* AdonitSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = AdonitSDK.bundle; path = ../AdonitSDK.bundle; sourceTree = "<group>"; };
4DFA5DF51FCFAFAC00D0B949 /* JotModelConnectViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JotModelConnectViewController.h; sourceTree = "<group>"; };
4DFA5DF61FCFAFAD00D0B949 /* JotModelConnectViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JotModelConnectViewController.m; sourceTree = "<group>"; };
7717F9471A1CD859001706AE /* MainStoryboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MainStoryboard.storyboard; sourceTree = "<group>"; };
Expand Down Expand Up @@ -157,9 +157,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
4D6143A71FDA929000BB736F /* AdonitSDK.framework in Frameworks */,
7747ECD41A1BDF4F00D18429 /* SystemConfiguration.framework in Frameworks */,
7747ECD21A1BDF3B00D18429 /* CoreBluetooth.framework in Frameworks */,
4DEA9388223A2BAB0082A4B7 /* AdonitSDK.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -278,13 +278,23 @@
name = "Recovered References";
sourceTree = "<group>";
};
4DEA937C223A28B00082A4B7 /* Frameworks */ = {
isa = PBXGroup;
children = (
4DEA9387223A2BAB0082A4B7 /* AdonitSDK.bundle */,
4DEA9386223A2BAB0082A4B7 /* AdonitSDK.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
7747EC731A1BDC9700D18429 = {
isa = PBXGroup;
children = (
7747EC7E1A1BDC9700D18429 /* JotTouchExample */,
7747EC981A1BDC9800D18429 /* JotTouchExampleTests */,
7747EC7D1A1BDC9700D18429 /* Products */,
4D6143A41FDA91D900BB736F /* Recovered References */,
4DEA937C223A28B00082A4B7 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -350,8 +360,6 @@
7747ECCE1A1BDF1100D18429 /* Frameworks */ = {
isa = PBXGroup;
children = (
4D6143A61FDA929000BB736F /* AdonitSDK.bundle */,
4D6143A51FDA929000BB736F /* AdonitSDK.framework */,
7747ECD11A1BDF3B00D18429 /* CoreBluetooth.framework */,
7747ECCF1A1BDF2900D18429 /* CoreMotion.framework */,
7747ECD31A1BDF4F00D18429 /* SystemConfiguration.framework */,
Expand Down Expand Up @@ -406,7 +414,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0730;
LastUpgradeCheck = 0700;
LastUpgradeCheck = 1020;
ORGANIZATIONNAME = "Adonit, USA";
TargetAttributes = {
7747EC7B1A1BDC9700D18429 = {
Expand All @@ -421,7 +429,7 @@
};
buildConfigurationList = 7747EC771A1BDC9700D18429 /* Build configuration list for PBXProject "JotTouchExample" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand All @@ -443,8 +451,8 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4DEA9389223A2BAB0082A4B7 /* AdonitSDK.bundle in Resources */,
7717F9481A1CD859001706AE /* MainStoryboard.storyboard in Resources */,
4D6143A81FDA929000BB736F /* AdonitSDK.bundle in Resources */,
4DB71A921FB5AFEE004F53E4 /* Images.xcassets in Resources */,
4D8951A51FB53E7F000F30E3 /* Settings.bundle in Resources */,
3CCAF05E1A7A86A70023607E /* Launch Screen.xib in Resources */,
Expand Down Expand Up @@ -545,17 +553,28 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
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_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
Expand All @@ -564,6 +583,7 @@
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
Expand All @@ -581,6 +601,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h";
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -589,24 +610,36 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
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_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
Expand All @@ -616,7 +649,9 @@
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h";
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
Expand Down Expand Up @@ -644,13 +679,13 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(inherited)";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = "net.adonit.$(PRODUCT_NAME)";
PRODUCT_BUNDLE_IDENTIFIER = net.adonit.JotWorkshop;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_OBJC_BRIDGING_HEADER = "JotTouchExample/JotWorkshop-Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -674,12 +709,12 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(inherited)";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = "net.adonit.$(PRODUCT_NAME)";
PRODUCT_BUNDLE_IDENTIFIER = net.adonit.JotWorkshop;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_OBJC_BRIDGING_HEADER = "JotTouchExample/JotWorkshop-Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
4 changes: 1 addition & 3 deletions JotTouchExample/JotTouchExample.xcodeproj/xcshareddata/xcschemes/JotTouchExample.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0700"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -40,7 +40,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
Expand Down Expand Up @@ -70,7 +69,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
22 changes: 11 additions & 11 deletions JotTouchExample/JotTouchExample/BrushLibrary.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
import Foundation

class BrushLibrary: NSObject {
let pen:Brush
let pencil:Brush
let eraser:Brush
@objc let pen:Brush
@objc let pencil:Brush
@objc let eraser:Brush

let eraserIndex:Int
var eraserSelected = false
@objc let eraserIndex:Int
@objc var eraserSelected = false

fileprivate(set) var brushes = [Brush]()
var currentBrushIndex = 0 {
@objc fileprivate(set) var brushes = [Brush]()
@objc var currentBrushIndex = 0 {
willSet {
previousBrushIndex = currentBrushIndex
}
Expand All @@ -39,18 +39,18 @@ class BrushLibrary: NSObject {

brushes += [pencil, pen, eraser]

eraserIndex = brushes.index(of: eraser)!
eraserIndex = brushes.firstIndex(of: eraser)!

currentBrushIndex = UserDefaults.standard.integer(forKey: "currentBrushIndex")
}

var currentBrush:Brush {
@objc var currentBrush:Brush {
return brushes[currentBrushIndex]
}

func revertFromEraser() {
if currentBrushIndex == brushes.index(of: eraser) {
if previousBrushIndex != brushes.index(of: eraser) {
if currentBrushIndex == brushes.firstIndex(of: eraser) {
if previousBrushIndex != brushes.firstIndex(of: eraser) {
currentBrushIndex = previousBrushIndex
} else {
currentBrushIndex = 0
Expand Down
Loading

0 comments on commit d522fe4

Please sign in to comment.