Skip to content

Commit

Permalink
Merge branch 'develop' into feature/header-and-keyboard-accessibility
Browse files Browse the repository at this point in the history
  • Loading branch information
analogcode committed Oct 6, 2018
2 parents 4ded8f0 + 6cbf651 commit 8e4f6f5
Show file tree
Hide file tree
Showing 148 changed files with 39,383 additions and 2,324 deletions.
8 changes: 6 additions & 2 deletions AudioKitSynthOne.xcodeproj/project.pbxproj
Expand Up @@ -12,6 +12,7 @@
941645D120B3597300D62851 /* OneSignalNotificationServiceExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 941645CA20B3597300D62851 /* OneSignalNotificationServiceExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
941752BA20E2BD2E0076D953 /* Starter Bank.json in Resources */ = {isa = PBXBuildFile; fileRef = 941752B920E2BD2E0076D953 /* Starter Bank.json */; };
94656AED205F410900634B2C /* KeyboardShowButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94656AEC205F410900634B2C /* KeyboardShowButton.swift */; };
946980572169258A007EAA5B /* String+CapitalizeFirst.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946980562169258A007EAA5B /* String+CapitalizeFirst.swift */; };
947956A91F329AB200FE5D9B /* Stepper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 947956A81F329AB100FE5D9B /* Stepper.swift */; };
947956AD1F329AB200FE5D9B /* StepperStyleKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 947956A51F329AB100FE5D9B /* StepperStyleKit.swift */; };
947956B31F32A70400FE5D9B /* ToggleSwitchStyleKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 947956B21F32A70300FE5D9B /* ToggleSwitchStyleKit.swift */; };
Expand Down Expand Up @@ -299,6 +300,7 @@
9441B84C2126618E003A5163 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/InfoPlist.strings; sourceTree = "<group>"; };
945C3A0E1F31428B0086D58B /* VerticalSlider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VerticalSlider.swift; sourceTree = "<group>"; };
94656AEC205F410900634B2C /* KeyboardShowButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardShowButton.swift; sourceTree = "<group>"; };
946980562169258A007EAA5B /* String+CapitalizeFirst.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+CapitalizeFirst.swift"; sourceTree = "<group>"; };
94780FEF1F9B0108006D3710 /* AudioKitSynthOne.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = AudioKitSynthOne.entitlements; sourceTree = "<group>"; };
947956A51F329AB100FE5D9B /* StepperStyleKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepperStyleKit.swift; sourceTree = "<group>"; };
947956A81F329AB100FE5D9B /* Stepper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Stepper.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -796,6 +798,7 @@
C435C4F420C5234900DAECCD /* CategoryCell.swift */,
C435C4F720C5234900DAECCD /* PresetCell.swift */,
94DB3FDF1FC8C0EA007F8081 /* PresetUIButton.swift */,
946980562169258A007EAA5B /* String+CapitalizeFirst.swift */,
);
path = "UI Components";
sourceTree = "<group>";
Expand Down Expand Up @@ -1592,7 +1595,7 @@
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-AudioKitSynthOne/Pods-AudioKitSynthOne-frameworks.sh",
"${SRCROOT}/Pods/Target Support Files/Pods-AudioKitSynthOne/Pods-AudioKitSynthOne-frameworks.sh",
"${PODS_ROOT}/AudioKit/iOS/AudioKitUI.framework",
"${BUILT_PRODUCTS_DIR}/ChimpKit/ChimpKit.framework",
"${BUILT_PRODUCTS_DIR}/Disk/Disk.framework",
Expand All @@ -1605,7 +1608,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-AudioKitSynthOne/Pods-AudioKitSynthOne-frameworks.sh\"\n";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AudioKitSynthOne/Pods-AudioKitSynthOne-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
C4421AA920B81D0500BE9F12 /* ShellScript */ = {
Expand Down Expand Up @@ -1746,6 +1749,7 @@
947956B31F32A70400FE5D9B /* ToggleSwitchStyleKit.swift in Sources */,
C4B491B120C7D11500FD565A /* MIDIKnob.swift in Sources */,
C47FB3C31F36694300EF2F01 /* RateKnob.swift in Sources */,
946980572169258A007EAA5B /* String+CapitalizeFirst.swift in Sources */,
C4B491BC20C7DEB100FD565A /* ArpButtonStyleKit.swift in Sources */,
C4B4919420C7C7C500FD565A /* PresetEditorViewController.swift in Sources */,
C4B4918620C7C79C00FD565A /* Presets+PresetCellDelegate.swift in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion AudioKitSynthOne/About/AboutViewController.swift
Expand Up @@ -46,7 +46,7 @@ class AboutViewController: UIViewController {
self.parentView.alpha = 1.0
})

UIView.animate(withDuration: 6, animations: {
UIView.animate(withDuration: 4, animations: {
self.textContainer.alpha = 1.0
})
}
Expand Down
11 changes: 6 additions & 5 deletions AudioKitSynthOne/About/Base.lproj/About.storyboard
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="fj4-IP-viA">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="fj4-IP-viA">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand All @@ -31,7 +31,7 @@
</accessibility>
</imageView>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YcU-Sg-lR2">
<rect key="frame" x="44" y="50" width="932" height="501"/>
<rect key="frame" x="44.5" y="50" width="932" height="501"/>
<subviews>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="PTm-MK-dhI">
<rect key="frame" x="60" y="67" width="813" height="426"/>
Expand All @@ -53,7 +53,8 @@ How can you help? Please share with your friends and leave a nice review in the
We're all volunteers. We're dozens of developers, sound designers, and music lovers across the globe who want to give back to the music-making community. We hope you enjoy it!

Thanks to the following people (listed alphabetically):
Adam Nemecek, Alex Buga, Andy Voelkel, Aurelius Prochazka, Brent Stabbs, Brice Beasley, Cem Olcay, Chamin Morikawa, Chase Dobson, Cheez da Producer, Chello Ward, Clayton Miller, Damon Law, Daniel Clelland, Dave Gibson, Dave O'Neill, Daveypoo, David Biedny, Dawei, Dean Daughters, Derek Lee, Devon C Johnson, Doug Woods, Dylan Wreggelsworth, Eric George, Eric Ross (eross), Francis Preve, Gene De Lisa, Gray Smith, Greg Cerveny, Haris Ali, Henri Hagenow, James Edward Cosby, Jason Donnelly, Jeff Holtzkener, Jeffrey Cooper, Jennifer Li, Jeroen (When The Rush Comes), Jim McMillan, Jim W. Mooney, Joe Zeno, John Groenhof, Jon Rawlinson, Jose Hales-Garcia, Joshua Hodge, Just Plain Paul, Justin Gitlin, Juan Maserati, Kevin Loustau, Marcus Hobbs, Mark Bellot, Mark Jeschke, Martin Halter, Mathieu Garcia, Matrix Synth, Matthew Fecher, Michael Tyson, Mike Gazzaruso, Mitch Slayton, Nick Arner, Nicolas Silesi (Lord Gogo), Oke Scheel, Onur Geneş, Paulo Ribeiro, Power DX7, Randy Weinstein, Red Sky Lullaby (Stuart Kilbride), Rolf Seese, RUST(i)ck, Ryan Francesconi, Ryan McLeod, saintjoe (soundsandgear.com), Sean Costello, Serafin Sanchez, Shane Dunne, Shazamm the iPad Producer, Sound Of Izrael, Stephen James Taylor, Stéphane Peter, Yaron Karasik, Ze Osorio</string>

Adam Nemecek, Alex Buga, Andy Voelkel, Aurelius Prochazka, Brent Stabbs, Brice Beasley, Cem Olcay, Chamin Morikawa, Chase Dobson, Cheez da Producer, Chello Ward, Clayton Miller, Damon Law, Daniel Clelland, Dave Gibson, Dave O'Neill, Daveypoo, David Biedny, Dawei, Dean Daughters, Derek Lee, Devon C Johnson, Doug Woods, Dylan Wreggelsworth, Eric George, Eric Ross (eross), Francis Preve, Gene De Lisa, Gray Smith, Greg Cerveny, Haris Ali, Henri Hagenow, James Edward Cosby, Jason Donnelly, Jeff Holtzkener, Jeffrey Cooper, Jennifer Li, Jeroen (When The Rush Comes), Jim McMillan, Jim W. Mooney, Joe Zeno, John Groenhof, Jon Rawlinson, Jose Hales-Garcia, Joshua Hodge, Just Plain Paul, Justin Gitlin, Juan Maserati, Kevin Loustau, Marcus Hobbs, Mark Bellot, Mark Jeschke, Martin Halter, Mathieu Garcia, Matrix Synth, Matthew Fecher, Michael Tyson, Mike Gazzaruso, Mitch Slayton, Nick Arner, Nicolas Silesi (Lord Gogo), Oke Scheel, Onur Geneş, Paulo Ribeiro, Power DX7, Randy Weinstein, Red Sky Lullaby (Stuart Kilbride), Rolf Seese, RUST(i)ck, Ryan Francesconi, Ryan McLeod, saintjoe (soundsandgear.com), Sean Costello, Serafin Sanchez, Shane Dunne, Shazamm the iPad Producer, Sound Of Izrael, Stanley Rosenbaum, Stephen James Taylor, Stéphane Peter, Yaron Karasik, Ze Osorio</mutableString>
<color key="textColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
<fontDescription key="fontDescription" name="AvenirNextCondensed-Regular" family="Avenir Next Condensed" pointSize="19"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
Expand Down Expand Up @@ -354,6 +355,6 @@ Perfect with a MIDI Keyboard. Beautiful sounding multi-layered samples of Electr
<resources>
<image name="ak1-logo" width="188" height="14"/>
<image name="background" width="1024" height="768"/>
<image name="fmplayer" width="510" height="382"/>
<image name="fmplayer" width="510" height="382.5"/>
</resources>
</document>
53 changes: 0 additions & 53 deletions AudioKitSynthOne/About/en.lproj/About.strings
@@ -1,54 +1 @@

/* Class = "UITextView"; text = "AudioKit Synth One is the first completely free & open-source full-featured professional iOS synthesizer app in history. Everyone working on this app volunteered their time to create this awesome app.\n\nPlus, it’s completely open-source. You can use the code to learn how to build your own synth app or modify the app to build the synth of your dreams. This app is a labor of love. \n\nHow can you help? Please share with your friends and leave a nice review in the app store.\n\nWe're all volunteers. We're dozens of developers, sound designers, and music lovers across the globe who want to give back to the music-making community. We hope you enjoy it!\n\nThanks to the following people (listed alphabetically):\nAdam Nemecek, Alex Buga, Andy Voelkel, Aurelius Prochazka, Brent Stabbs, Brice Beasley, Cem Olcay, Chase Dobson, Cheez da Producer, Chello Ward, Clayton Miller, Damon Law, Daniel Clelland, Dave Gibson, Dave O'Neill, Daveypoo, David Biedny, Dawei, Dean Daughters, Derek Lee, Devon C Johnson, Doug Woods, Dylan Wreggelsworth, Eric George, Eric Ross (eross), Francis Preve, Gene De Lisa, Gray Smith, Greg Cerveny, Haris Ali, Henri Hagenow, James Edward Cosby, Jason Donnelly, Jeff Holtzkener, Jeffrey Cooper, Jeroen (When The Rush Comes), Jim McMillan, Jim W. Mooney, Joe Zeno, John Groenhof, Jon Rawlinson, Jose Hales-Garcia, Joshua Hodge, Just Plain Paul, Justin Gitlin, Juan Maserati, Kevin Loustau, Marcus Hobbs, Mark Bellot, Mark Jeschke, Martin Halter, Mathieu Garcia, Matrix Synth, Matthew Fecher, Michael Tyson, Mike Gazzaruso, Mitch Slayton, Nick Arner, Nicolas Silesi (Lord Gogo), Oke Scheel, Onur Geneş, Power DX7, Randy Weinstein, Red Sky Lullaby (Stuart Kilbride), Rolf Seese, RUST(i)ck, Ryan Francesconi, Ryan McLeod, saintjoe (soundsandgear.com), Sean Costello, Serafin Sanchez, Shane Dunne, Shazamm the iPad Producer, Sound Of Izrael, Stephen James Taylor, Stéphane Peter, Yaron Karasik, Ze Osorio"; ObjectID = "1Nf-2H-Scf"; */
"1Nf-2H-Scf.text" = "AudioKit Synth One is the first completely free & open-source full-featured professional iOS synthesizer app in history. Everyone working on this app volunteered their time to create this awesome app.\n\nPlus, it’s completely open-source. You can use the code to learn how to build your own synth app or modify the app to build the synth of your dreams. This app is a labor of love. \n\nHow can you help? Please share with your friends and leave a nice review in the app store.\n\nWe're all volunteers. We're dozens of developers, sound designers, and music lovers across the globe who want to give back to the music-making community. We hope you enjoy it!\n\nThanks to the following people (listed alphabetically):\nAdam Nemecek, Alex Buga, Andy Voelkel, Aurelius Prochazka, Brent Stabbs, Brice Beasley, Cem Olcay, Chase Dobson, Cheez da Producer, Chello Ward, Clayton Miller, Damon Law, Daniel Clelland, Dave Gibson, Dave O'Neill, Daveypoo, David Biedny, Dawei, Dean Daughters, Derek Lee, Devon C Johnson, Doug Woods, Dylan Wreggelsworth, Eric George, Eric Ross (eross), Francis Preve, Gene De Lisa, Gray Smith, Greg Cerveny, Haris Ali, Henri Hagenow, James Edward Cosby, Jason Donnelly, Jeff Holtzkener, Jeffrey Cooper, Jeroen (When The Rush Comes), Jim McMillan, Jim W. Mooney, Joe Zeno, John Groenhof, Jon Rawlinson, Jose Hales-Garcia, Joshua Hodge, Just Plain Paul, Justin Gitlin, Juan Maserati, Kevin Loustau, Marcus Hobbs, Mark Bellot, Mark Jeschke, Martin Halter, Mathieu Garcia, Matrix Synth, Matthew Fecher, Michael Tyson, Mike Gazzaruso, Mitch Slayton, Nick Arner, Nicolas Silesi (Lord Gogo), Oke Scheel, Onur Geneş, Power DX7, Randy Weinstein, Red Sky Lullaby (Stuart Kilbride), Rolf Seese, RUST(i)ck, Ryan Francesconi, Ryan McLeod, saintjoe (soundsandgear.com), Sean Costello, Serafin Sanchez, Shane Dunne, Shazamm the iPad Producer, Sound Of Izrael, Stephen James Taylor, Stéphane Peter, Yaron Karasik, Ze Osorio";

/* Class = "UILabel"; text = "AudioKit is free & open-source"; ObjectID = "2jS-Ub-cCT"; */
"2jS-Ub-cCT.text" = "AudioKit is free & open-source";

/* Class = "UILabel"; text = "MORE AUDIOKIT APPS"; ObjectID = "A1r-GN-8if"; */
"A1r-GN-8if.text" = "MORE AUDIOKIT APPS";

/* Class = "UILabel"; text = "Learn from these code examples"; ObjectID = "F4n-VN-XPq"; */
"F4n-VN-XPq.text" = "Learn from these code examples";

/* Class = "UILabel"; text = "Learn how this app was made"; ObjectID = "GGp-jS-eWl"; */
"GGp-jS-eWl.text" = "Learn how this app was made";

/* Class = "UITextView"; text = "Award-winning Free iPad Instrument inspired by the DX7 & DX7II. \nPerfect with a MIDI Keyboard. Beautiful sounding multi-layered samples of Electric Pianos, Tines, Basses, Keys and 80s sounds. "; ObjectID = "IAn-lv-O7m"; */
"IAn-lv-O7m.text" = "Award-winning Free iPad Instrument inspired by the DX7 & DX7II. \nPerfect with a MIDI Keyboard. Beautiful sounding multi-layered samples of Electric Pianos, Tines, Basses, Keys and 80s sounds. ";

/* Class = "UILabel"; text = "REVIEW"; ObjectID = "M92-zU-EUI"; */
"M92-zU-EUI.text" = "REVIEW";

/* Class = "UILabel"; text = "PLEASE send BUG REPORTS:"; ObjectID = "SJq-it-GbF"; */
"SJq-it-GbF.text" = "PLEASE send BUG REPORTS:";

/* Class = "UIButton"; normalTitle = "Be kind 👍🏼 Review this app! "; ObjectID = "VE1-2S-HqW"; */
"VE1-2S-HqW.normalTitle" = "Be kind 👍🏼 Review this app! ";

/* Class = "UIButton"; normalTitle = "DONE"; ObjectID = "Whk-km-WmE"; */
"Whk-km-WmE.normalTitle" = "DONE";

/* Class = "UIButton"; normalTitle = "AudioKit Github"; ObjectID = "dll-2U-dYG"; */
"dll-2U-dYG.normalTitle" = "AudioKit Github";

/* Class = "UIButton"; normalTitle = "hello@audiokitpro.com"; ObjectID = "etI-kL-v1E"; */
"etI-kL-v1E.normalTitle" = "hello@audiokitpro.com";

/* Class = "UILabel"; text = "FM PLAYER: CLASSIC DX"; ObjectID = "g34-af-uEZ"; */
"g34-af-uEZ.text" = "FM PLAYER: CLASSIC DX";

/* Class = "UILabel"; text = "SOURCE CODE"; ObjectID = "jeK-lZ-M5v"; */
"jeK-lZ-M5v.text" = "SOURCE CODE";

/* Class = "UIButton"; normalTitle = "Get FREE in App Store!"; ObjectID = "oBP-Wz-rvL"; */
"oBP-Wz-rvL.normalTitle" = "Get FREE in App Store!";

/* Class = "UILabel"; text = "VIDEO"; ObjectID = "rad-NL-GFv"; */
"rad-NL-GFv.text" = "VIDEO";

/* Class = "UILabel"; text = "World's First Free & Open-Source Pro iOS Synth"; ObjectID = "s4D-if-VhP"; */
"s4D-if-VhP.text" = "World's First Free & Open-Source Pro iOS Synth";

/* Class = "UIButton"; normalTitle = "Watch the Amazing Synth One Video"; ObjectID = "yLF-QF-HMs"; */
"yLF-QF-HMs.normalTitle" = "Watch the Amazing Synth One Video";
50 changes: 0 additions & 50 deletions AudioKitSynthOne/Developer/Base.lproj/en.lproj/Dev.strings
@@ -1,51 +1 @@

/* Class = "UILabel"; text = "Master Compressor"; ObjectID = "4x3-IO-hYz"; */
"4x3-IO-hYz.text" = "Master Compressor";

/* Class = "UILabel"; text = "Lock ArpRate"; ObjectID = "8du-td-RcA"; */
"8du-td-RcA.text" = "Lock ArpRate";

/* Class = "UILabel"; text = "DelFCut"; ObjectID = "AIL-8o-L1E"; */
"AIL-8o-L1E.text" = "DelFCut";

/* Class = "UILabel"; text = "Reverb Input Compressor"; ObjectID = "Acb-r3-neV"; */
"Acb-r3-neV.text" = "Reverb Input Compressor";

/* Class = "UILabel"; text = "PostGain"; ObjectID = "GRS-H5-GyB"; */
"GRS-H5-GyB.text" = "PostGain";

/* Class = "UILabel"; text = "Release"; ObjectID = "O3q-m2-cp5"; */
"O3q-m2-cp5.text" = "Release";

/* Class = "UILabel"; text = "Lock Reverb"; ObjectID = "U8L-qY-a4j"; */
"U8L-qY-a4j.text" = "Lock Reverb";

/* Class = "UILabel"; text = "HAQ PANEL"; ObjectID = "Yqu-Zu-SxM"; */
"Yqu-Zu-SxM.text" = "HAQ PANEL";

/* Class = "UILabel"; text = "Ratio"; ObjectID = "Zr2-3d-n6e"; */
"Zr2-3d-n6e.text" = "Ratio";

/* Class = "UILabel"; text = "Thresh"; ObjectID = "bwY-pS-LEC"; */
"bwY-pS-LEC.text" = "Thresh";

/* Class = "UILabel"; text = "Lock Arp+Seq"; ObjectID = "ct1-IH-Yiw"; */
"ct1-IH-Yiw.text" = "Lock Arp+Seq";

/* Class = "UILabel"; text = "Master Volume"; ObjectID = "hU8-IN-aa4"; */
"hU8-IN-aa4.text" = "Master Volume";

/* Class = "UILabel"; text = "Attack"; ObjectID = "oPw-gV-Wod"; */
"oPw-gV-Wod.text" = "Attack";

/* Class = "UILabel"; text = "Reverb Wet Compressor"; ObjectID = "rEb-j6-MNs"; */
"rEb-j6-MNs.text" = "Reverb Wet Compressor";

/* Class = "UILabel"; text = "DSP Param Halftime"; ObjectID = "slc-Pi-ahg"; */
"slc-Pi-ahg.text" = "DSP Param Halftime";

/* Class = "UILabel"; text = "Lock Delay"; ObjectID = "tLJ-xr-40E"; */
"tLJ-xr-40E.text" = "Lock Delay";

/* Class = "UILabel"; text = "DelFRes"; ObjectID = "tRH-wD-RtM"; */
"tRH-wD-RtM.text" = "DelFRes";

0 comments on commit 8e4f6f5

Please sign in to comment.