updated ios version

sonosaurus · Dec 29, 2020 · 72e8966 · 72e8966
1 parent f7cdc22
commit 72e8966
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 15 deletions.
diff --git a/Builds/iOS/Info-AUv3_AppExtension.plist b/Builds/iOS/Info-AUv3_AppExtension.plist
@@ -4,7 +4,7 @@
 <plist version="1.0">
  <dict>
  <key>CFBundleVersion</key>
- <string>37</string>
+ <string>39</string>
  <key>ITSAppUsesNonExemptEncryption</key>
  <false/>
  <key>UIStatusBarHidden</key>

diff --git a/Builds/iOS/Info-Standalone_Plugin.plist b/Builds/iOS/Info-Standalone_Plugin.plist
@@ -4,7 +4,7 @@
 <plist version="1.0">
  <dict>
  <key>CFBundleVersion</key>
- <string>37</string>
+ <string>39</string>
  <key>ITSAppUsesNonExemptEncryption</key>
  <false/>
  <key>UIStatusBarHidden</key>

diff --git a/Builds/iOS/SonoBus.xcodeproj/project.pbxproj b/Builds/iOS/SonoBus.xcodeproj/project.pbxproj
@@ -2214,7 +2214,7 @@
  "DEBUG=1",
  "JUCE_CONTENT_SHARING=1",
  "JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1",
- "SONOBUS_BUILD_VERSION=\\\"1.2.1-37\\\"",
+ "SONOBUS_BUILD_VERSION=\\\"1.3.0-39\\\"",
  "LOGLEVEL=2",
  "JUCE_IOS_AUDIO_LOGGING=1",
  "USE_CODEC_OPUS=1",
@@ -2283,7 +2283,7 @@
  "NDEBUG=1",
  "JUCE_CONTENT_SHARING=1",
  "JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1",
- "SONOBUS_BUILD_VERSION=\\\"1.2.1-37\\\"",
+ "SONOBUS_BUILD_VERSION=\\\"1.3.0-39\\\"",
  "USE_CODEC_OPUS=1",
  "AOO_TIMEFILTER_CHECK=0",
  "AOO_STATIC",
@@ -2351,7 +2351,7 @@
  "DEBUG=1",
  "JUCE_CONTENT_SHARING=1",
  "JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1",
- "SONOBUS_BUILD_VERSION=\\\"1.2.1-37\\\"",
+ "SONOBUS_BUILD_VERSION=\\\"1.3.0-39\\\"",
  "LOGLEVEL=2",
  "JUCE_IOS_AUDIO_LOGGING=1",
  "USE_CODEC_OPUS=1",
@@ -2422,7 +2422,7 @@
  "NDEBUG=1",
  "JUCE_CONTENT_SHARING=1",
  "JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1",
- "SONOBUS_BUILD_VERSION=\\\"1.2.1-37\\\"",
+ "SONOBUS_BUILD_VERSION=\\\"1.3.0-39\\\"",
  "USE_CODEC_OPUS=1",
  "AOO_TIMEFILTER_CHECK=0",
  "AOO_STATIC",
@@ -2493,7 +2493,7 @@
  "DEBUG=1",
  "JUCE_CONTENT_SHARING=1",
  "JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1",
- "SONOBUS_BUILD_VERSION=\\\"1.2.1-37\\\"",
+ "SONOBUS_BUILD_VERSION=\\\"1.3.0-39\\\"",
  "LOGLEVEL=2",
  "JUCE_IOS_AUDIO_LOGGING=1",
  "USE_CODEC_OPUS=1",
@@ -2565,7 +2565,7 @@
  "NDEBUG=1",
  "JUCE_CONTENT_SHARING=1",
  "JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1",
- "SONOBUS_BUILD_VERSION=\\\"1.2.1-37\\\"",
+ "SONOBUS_BUILD_VERSION=\\\"1.3.0-39\\\"",
  "USE_CODEC_OPUS=1",
  "AOO_TIMEFILTER_CHECK=0",
  "AOO_STATIC",
@@ -2635,7 +2635,7 @@
  "DEBUG=1",
  "JUCE_CONTENT_SHARING=1",
  "JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1",
- "SONOBUS_BUILD_VERSION=\\\"1.2.1-37\\\"",
+ "SONOBUS_BUILD_VERSION=\\\"1.3.0-39\\\"",
  "LOGLEVEL=2",
  "JUCE_IOS_AUDIO_LOGGING=1",
  "USE_CODEC_OPUS=1",
@@ -2706,7 +2706,7 @@
  "NDEBUG=1",
  "JUCE_CONTENT_SHARING=1",
  "JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1",
- "SONOBUS_BUILD_VERSION=\\\"1.2.1-37\\\"",
+ "SONOBUS_BUILD_VERSION=\\\"1.3.0-39\\\"",
  "USE_CODEC_OPUS=1",
  "AOO_TIMEFILTER_CHECK=0",
  "AOO_STATIC",

diff --git a/Source/SonobusPluginEditor.cpp b/Source/SonobusPluginEditor.cpp
@@ -698,6 +698,7 @@ publicGroupsListModel(this)
 
  mRemoteAddressStaticLabel = std::make_unique<Label>("remaddrst", TRANS("Host: "));
  mRemoteAddressStaticLabel->setJustificationType(Justification::centredRight);
+ mRemoteAddressStaticLabel->setWantsKeyboardFocus(true);
 
  mDirectConnectDescriptionLabel = std::make_unique<Label>("remaddrst", TRANS("Connect directly to other instances of SonoBus on your local network with the local address that they advertise."));
  mDirectConnectDescriptionLabel->setJustificationType(Justification::topLeft);
@@ -871,6 +872,7 @@ publicGroupsListModel(this)
 
  mPublicServerHostStaticLabel = std::make_unique<Label>("pubaddrst", TRANS("Connection Server:"));
  configServerLabel(mPublicServerHostStaticLabel.get());
+ mPublicServerHostStaticLabel->setWantsKeyboardFocus(true);
 
  mPublicServerUserStaticLabel = std::make_unique<Label>("localaddrst", TRANS("Your Displayed Name:"));
  configServerLabel(mPublicServerUserStaticLabel.get());
@@ -899,7 +901,7 @@ publicGroupsListModel(this)
  mPublicServerAddGroupButton->setButtonText(TRANS("Create Group..."));
  mPublicServerAddGroupButton->addListener(this);
  mPublicServerAddGroupButton->setColour(TextButton::buttonColourId, Colour::fromFloatRGBA(0.1, 0.4, 0.6, 0.6));
- //mPublicServerAddGroupButton->setWantsKeyboardFocus(true);
+ mPublicServerAddGroupButton->setWantsKeyboardFocus(true);
 
  mPublicServerGroupEditor = std::make_unique<TextEditor>("pubgroupedit");
  mPublicServerGroupEditor->setFont(Font(16));
@@ -2416,6 +2418,16 @@ void SonobusAudioProcessorEditor::textEditorReturnKeyPressed (TextEditor& ed)
  mServerConnectButton->grabKeyboardFocus();
  //mServerConnectButton->setWantsKeyboardFocus(false);
  }
+ else if (mConnectComponent->isVisible() && mPublicServerAddGroupButton->isShowing()) {
+ //mServerConnectButton->setWantsKeyboardFocus(true);
+ mPublicServerAddGroupButton->grabKeyboardFocus();
+ //mServerConnectButton->setWantsKeyboardFocus(false);
+ }
+ else if (mConnectComponent->isVisible() && mDirectConnectButton->isShowing()) {
+ //mServerConnectButton->setWantsKeyboardFocus(true);
+ mDirectConnectButton->grabKeyboardFocus();
+ //mServerConnectButton->setWantsKeyboardFocus(false);
+ }
 }
 
 void SonobusAudioProcessorEditor::textEditorEscapeKeyPressed (TextEditor& ed)
@@ -5005,8 +5017,8 @@ void SonobusAudioProcessorEditor::updateLayout()
  publicServAddressBox.items.clear();
  publicServAddressBox.flexDirection = FlexBox::Direction::row;
  publicServAddressBox.items.add(FlexItem(servLabelWidth, minitemheight, *mPublicServerHostStaticLabel).withMargin(2).withFlex(1));
- publicServAddressBox.items.add(FlexItem(172, minpassheight, *mPublicServerHostEditor).withMargin(2).withFlex(1));
- publicServAddressBox.items.add(FlexItem(servLabelWidth, minitemheight, *mPublicServerStatusInfoLabel).withMargin(2).withFlex(1));
+ publicServAddressBox.items.add(FlexItem(150, minpassheight, *mPublicServerHostEditor).withMargin(2).withFlex(1));
+ publicServAddressBox.items.add(FlexItem(servLabelWidth, minitemheight, *mPublicServerStatusInfoLabel).withMargin(2).withFlex(0.75));
 
  publicServUserBox.items.clear();
  publicServUserBox.flexDirection = FlexBox::Direction::row;

diff --git a/ios/SonoBusIOS.jucer b/ios/SonoBusIOS.jucer
@@ -3,7 +3,7 @@
 <JUCERPROJECT id="ZRovAH" name="SonoBus" projectType="audioplug" companyName="Sonosaurus"
  companyCopyright="2020 Sonosaurus LLC" companyEmail="[email protected]"
  pluginFormats="buildAUv3,buildStandalone,enableIAA" pluginManufacturerCode="Sono"
- pluginCode="NBus" defines="JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1&#10;SONOBUS_BUILD_VERSION=&quot;1.2.1-37&quot;"
+ pluginCode="NBus" defines="JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1&#10;SONOBUS_BUILD_VERSION=&quot;1.3.0-39&quot;"
  pluginDesc="SonoBus - Network Audio" version="1.0.3" cppLanguageStandard="17"
  projectLineFeed="&#10;" jucerFormatVersion="1" pluginAUMainType="'aufx'"
  pluginAUIsSandboxSafe="1">
@@ -254,7 +254,7 @@
  </MAINGROUP>
  <EXPORTFORMATS>
  <XCODE_IPHONE targetFolder="../Builds/iOS" microphonePermissionNeeded="1" iosBackgroundAudio="1"
- iosDevelopmentTeamID="XCS435894D" customPList="&lt;plist version=&quot;1.0&quot;&gt;&#10;&lt;dict&gt;&#10;&#10;&lt;key&gt;CFBundleVersion&lt;/key&gt;&#10;&lt;string&gt;37&lt;/string&gt;&#10;&#10;&lt;key&gt;ITSAppUsesNonExemptEncryption&lt;/key&gt;&#10;&#9;&lt;false/&gt;&#10;&#10;&lt;key&gt;UIStatusBarHidden&lt;/key&gt;&#10;&#9;&lt;false/&gt;&#10;&#9;&lt;key&gt;UIStatusBarStyle&lt;/key&gt;&#10;&#9;&lt;string&gt;UIStatusBarStyleLightContent&lt;/string&gt;&#10;&#10;&lt;key&gt;CFBundleURLTypes&lt;/key&gt;&#10;&lt;array&gt;&#10; &lt;dict&gt;&#10; &lt;key&gt;CFBundleURLName&lt;/key&gt;&#10; &lt;string&gt;net.sonobus&lt;/string&gt;&#10; &lt;key&gt;CFBundleURLSchemes&lt;/key&gt;&#10; &lt;array&gt;&#10; &lt;string&gt;sonobus&lt;/string&gt;&#10; &lt;/array&gt;&#10; &lt;/dict&gt;&#10; &lt;/array&gt;&#10;&#10;&lt;key&gt;NSLocalNetworkUsageDescription&lt;/key&gt;&#10;&#9;&lt;string&gt;SonoBus uses networking to communicate with other local services&lt;/string&gt;&#10;&#10;&lt;/dict&gt;&#10;&lt;/plist&gt;"
+ iosDevelopmentTeamID="XCS435894D" customPList="&lt;plist version=&quot;1.0&quot;&gt;&#10;&lt;dict&gt;&#10;&#10;&lt;key&gt;CFBundleVersion&lt;/key&gt;&#10;&lt;string&gt;39&lt;/string&gt;&#10;&#10;&lt;key&gt;ITSAppUsesNonExemptEncryption&lt;/key&gt;&#10;&#9;&lt;false/&gt;&#10;&#10;&lt;key&gt;UIStatusBarHidden&lt;/key&gt;&#10;&#9;&lt;false/&gt;&#10;&#9;&lt;key&gt;UIStatusBarStyle&lt;/key&gt;&#10;&#9;&lt;string&gt;UIStatusBarStyleLightContent&lt;/string&gt;&#10;&#10;&lt;key&gt;CFBundleURLTypes&lt;/key&gt;&#10;&lt;array&gt;&#10; &lt;dict&gt;&#10; &lt;key&gt;CFBundleURLName&lt;/key&gt;&#10; &lt;string&gt;net.sonobus&lt;/string&gt;&#10; &lt;key&gt;CFBundleURLSchemes&lt;/key&gt;&#10; &lt;array&gt;&#10; &lt;string&gt;sonobus&lt;/string&gt;&#10; &lt;/array&gt;&#10; &lt;/dict&gt;&#10; &lt;/array&gt;&#10;&#10;&lt;key&gt;NSLocalNetworkUsageDescription&lt;/key&gt;&#10;&#9;&lt;string&gt;SonoBus uses networking to communicate with other local services&lt;/string&gt;&#10;&#10;&lt;/dict&gt;&#10;&lt;/plist&gt;"
  extraDefs="USE_CODEC_OPUS=1&#10;AOO_TIMEFILTER_CHECK=0&#10;AOO_STATIC"
  externalLibraries="opus" smallIcon="tb00W2" bigIcon="rlxTrd"
  UISupportsDocumentBrowser="1" UIFileSharingEnabled="1" customLaunchStoryboard="images/LaunchScreen.storyboard">