update ios plists

.gitignore

@@ -4,3 +4,10 @@ build32
 buildXcode
 release/1.*
 mobile/Builds
+.DS_Store
+
+release/CoLabs
+release/tmp
+release/macpkg/CoLabsTemp.pkgproj
+release/macpkg/CoLabs_All.pkgproj
+release/CoLabsPkg

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "*.mm": "cpp"
+    }
+}

CMakeLists.txt

@@ -36,9 +36,9 @@ endif()
 # `project()` command. `project()` sets up some helpful variables that describe source/binary
 # directories, and the current project version. This is a standard CMake command.
 
-project(SonoBus VERSION 1.6.1)
+project(SonoBus VERSION 1.6.2)
 
-set(BUILDVERSION 76)
+set(BUILDVERSION 77)
 
 
 # If you've installed JUCE somehow (via a package manager, or directly using the CMake install
@@ -118,10 +118,10 @@ set (MacPList "<plist version=\"1.0\">
 <array>
      <dict>
          <key>CFBundleURLName</key>
-         <string>net.sonobus</string>
+         <string>com.amunsonaudio.Sonobus</string>
          <key>CFBundleURLSchemes</key>
          <array>
-              <string>sonobus</string>
+              <string>colabs</string>
          </array>
       </dict>
    </array>
@@ -150,8 +150,8 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr
         NEEDS_MIDI_INPUT TRUE
         NEEDS_MIDI_OUTPUT TRUE
         EDITOR_WANTS_KEYBOARD_FOCUS TRUE
-        COMPANY_NAME "Sonosaurus"
-        BUNDLE_ID "com.Sonosaurus.SonoBus"
+        COMPANY_NAME "amunsonaudio"
+        BUNDLE_ID "com.amunsonaudio.CoLabs"
         MICROPHONE_PERMISSION_ENABLED TRUE
 
         ICON_BIG "images/sonobus_icon_mac_1024.png"
@@ -173,7 +173,7 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr
         PLUGIN_MANUFACTURER_CODE Sono
         PLUGIN_CODE ${plugincode}
         FORMATS ${formats}
-        DESCRIPTION "SonoBus - Network Audio"
+        DESCRIPTION "Amunson Audio"
         PRODUCT_NAME "${product_name}")
 
     juce_generate_juce_header("${target_name}")
@@ -450,6 +450,7 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr
     juce_add_binary_data("${target_name}_SBData" SOURCES
         Source/wordmaker.g
         Source/DejaVuSans.ttf
+        Source/BricolageGrotesque-Regular.ttf
         localization/localized_de.txt
         localization/localized_es.txt
         localization/localized_fr.txt
@@ -545,6 +546,9 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr
         images/triangle_disclosure_right.svg
         images/urei_main.wav
         images/x_icon.svg
+        images/AmunsonAudio172x96.jpg
+        images/AmunsonAudioTransparent.png
+        images/AmunsonAudioWide.png
     )
 
     set_target_properties(${target_name}_SBData PROPERTIES FOLDER "Targets")
@@ -605,11 +609,11 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr
 endfunction()
 
 # most of the targets
-sono_add_custom_plugin_target(SonoBus SonoBus "${FormatsToBuild}" FALSE  "NBus")
+sono_add_custom_plugin_target(CoLabs CoLabs "${FormatsToBuild}" FALSE  "NBus")
 
 # Mobile targets
 #sono_add_custom_plugin_target(SonoBusMobile "AUv3 Standalone" FALSE "NBus")
 
 # add VSTi target
-sono_add_custom_plugin_target(SonoBusInst "SonoBusInstrument" "VST3" TRUE  "IBus")
+sono_add_custom_plugin_target(CoLabsInst "CoLabsInstrument" "VST3" TRUE  "IBus")
 

Source/AutoUpdater.cpp

@@ -76,7 +76,7 @@ void LatestVersionCheckerAndUpdater::run()
         if (showAlertWindows)
             AlertWindow::showMessageBoxAsync (AlertWindow::InfoIcon,
                                               "No New Version Available",
-                                              "Your SonoBus version is up to date.");
+                                              "Your CoLabs version is up to date.");
         return;
     }
 
@@ -557,9 +557,9 @@ void restartProcess (const File& targetFolder)
 
    #if JUCE_MAC || JUCE_LINUX
     #if JUCE_MAC
-     auto newProcess = targetFolder.getChildFile ("SonoBus.app").getChildFile ("Contents").getChildFile ("MacOS").getChildFile ("SonoBus");
+     auto newProcess = targetFolder.getChildFile ("CoLabs.app").getChildFile ("Contents").getChildFile ("MacOS").getChildFile ("CoLabs");
     #elif JUCE_LINUX
-     auto newProcess = targetFolder.getChildFile ("SonoBus");
+     auto newProcess = targetFolder.getChildFile ("CoLabs");
     #endif
 
     StringArray command ("/bin/sh", "-c", "while killall -0 SonoBus; do sleep 5; done; " + newProcess.getFullPathName().quoted());

Source/BeatToggleGrid.cpp

@@ -47,7 +47,7 @@ void BeatToggleGrid::setupStuff()
 
     activeColor = Colour::fromFloatRGBA(0.1, 0.7, 0.5, 1.0);
 
-    accentedColor = Colour::fromFloatRGBA(0.5, 0.4, 0.6, 0.9);
+    accentedColor = Colour(0xFF002CFF);
 
 
     //self.backgroundColor = [UIColor colorWithRed:0.4 green:0.5 blue:0.6 alpha:1.0 ];

Source/ChatView.cpp

@@ -654,7 +654,7 @@ void ChatView::showSaveChat()
 
         // TODO - on iOS we need to give it a name first
 //#if (JUCE_IOS || JUCE_ANDROID)
-        String filename = String("SonoBusChat_") + Time::getCurrentTime().formatted("%Y-%m-%d_%H.%M.%S");
+        String filename = String("AmunsonAudioChat_") + Time::getCurrentTime().formatted("%Y-%m-%d_%H.%M.%S");
         recdir = File::getSpecialLocation(File::userDocumentsDirectory).getNonexistentChildFile (filename, ".txt");
 //#endif
 

Source/ConnectView.cpp

@@ -46,8 +46,8 @@ publicGroupsListModel(this)
     mConnectTab->setOutline(0);
     mConnectTab->setTabBarDepth(36);
     mConnectTab->getTabbedButtonBar().setMinimumTabScaleFactor(0.1f);
-    mConnectTab->getTabbedButtonBar().setColour(TabbedButtonBar::frontTextColourId, Colour::fromFloatRGBA(0.4, 0.8, 1.0, 1.0));
-    mConnectTab->getTabbedButtonBar().setColour(TabbedButtonBar::frontOutlineColourId, Colour::fromFloatRGBA(0.4, 0.8, 1.0, 0.5));
+    mConnectTab->getTabbedButtonBar().setColour(TabbedButtonBar::frontTextColourId, Colour(0xFFFFFFFF));
+    mConnectTab->getTabbedButtonBar().setColour(TabbedButtonBar::frontOutlineColourId, Colour(0xFFFF2E61));
 
     mDirectConnectContainer = std::make_unique<Component>();
     mServerConnectContainer = std::make_unique<Component>();
@@ -86,7 +86,7 @@ publicGroupsListModel(this)
     mRemoteAddressStaticLabel = std::make_unique<Label>("remaddrst", TRANS("Host: "));
     mRemoteAddressStaticLabel->setJustificationType(Justification::centredRight);
 
-    mDirectConnectDescriptionLabel = std::make_unique<Label>("dirconndesc", TRANS("Connect directly to other instances of SonoBus on your local network with the local address that they advertise. This is experimental, using a private group is recommended instead, and works fine on local networks."));
+    mDirectConnectDescriptionLabel = std::make_unique<Label>("dirconndesc", TRANS("Connect directly to other jam sessions on your local network with the local address that they advertise. This is experimental, using a private group is recommended instead, and works fine on local networks."));
     mDirectConnectDescriptionLabel->setJustificationType(Justification::topLeft);
 
     mAddRemoteHostEditor = std::make_unique<TextEditor>("remaddredit");
@@ -122,14 +122,14 @@ publicGroupsListModel(this)
     mDirectConnectButton = std::make_unique<TextButton>("directconnect");
     mDirectConnectButton->setButtonText(TRANS("Direct Connect"));
     mDirectConnectButton->addListener(this);
-    mDirectConnectButton->setColour(TextButton::buttonColourId, Colour::fromFloatRGBA(0.1, 0.4, 0.6, 0.6));
+    mDirectConnectButton->setColour(TextButton::buttonColourId, juce::Colour(0xFF1A2E61));
     mDirectConnectButton->setWantsKeyboardFocus(true);
 
 
     mServerConnectButton = std::make_unique<TextButton>("serverconnect");
     mServerConnectButton->setButtonText(TRANS("Connect to Group"));
     mServerConnectButton->addListener(this);
-    mServerConnectButton->setColour(TextButton::buttonColourId, Colour::fromFloatRGBA(0.1, 0.4, 0.6, 0.6));
+    mServerConnectButton->setColour(TextButton::buttonColourId, Colour (0xFF1A2E61));
     mServerConnectButton->setWantsKeyboardFocus(true);
 
     mServerHostEditor = std::make_unique<TextEditor>("srvaddredit");
@@ -317,7 +317,7 @@ publicGroupsListModel(this)
     mPublicServerAddGroupButton = std::make_unique<TextButton>("addgroup");
     mPublicServerAddGroupButton->setButtonText(TRANS("Create Group..."));
     mPublicServerAddGroupButton->addListener(this);
-    mPublicServerAddGroupButton->setColour(TextButton::buttonColourId, Colour::fromFloatRGBA(0.1, 0.4, 0.6, 0.6));
+    mPublicServerAddGroupButton->setColour(TextButton::buttonColourId, Colour(0xFF1A2E61));
     mPublicServerAddGroupButton->setWantsKeyboardFocus(true);
 
     mPublicServerGroupEditor = std::make_unique<TextEditor>("pubgroupedit");
@@ -364,7 +364,7 @@ publicGroupsListModel(this)
     mPublicServerConnectContainer->addAndMakeVisible(mPublicGroupComponent.get());
     mPublicGroupComponent->addAndMakeVisible(mPublicGroupsListBox.get());
 
-    mPublicServerConnectContainer->addAndMakeVisible(mPublicServerHostEditor.get());
+    // mPublicServerConnectContainer->addAndMakeVisible(mPublicServerHostEditor.get());
     mPublicServerConnectContainer->addAndMakeVisible(mPublicServerHostStaticLabel.get());
     mPublicServerConnectContainer->addAndMakeVisible(mPublicServerUserStaticLabel.get());
     mPublicServerConnectContainer->addAndMakeVisible(mPublicServerUsernameEditor.get());
@@ -610,7 +610,7 @@ void ConnectView::updateLayout()
     publicServAddressBox.items.clear();
     publicServAddressBox.flexDirection = FlexBox::Direction::row;
     publicServAddressBox.items.add(FlexItem(servLabelWidth, minitemheight, *mPublicServerHostStaticLabel).withMargin(2).withFlex(1).withMaxWidth(staticlabelmaxw));
-    publicServAddressBox.items.add(FlexItem(150, minpassheight, *mPublicServerHostEditor).withMargin(2).withFlex(1).withMaxWidth(220));
+    // publicServAddressBox.items.add(FlexItem(150, minpassheight, *mPublicServerHostEditor).withMargin(2).withFlex(1).withMaxWidth(220));
     publicServAddressBox.items.add(FlexItem(servLabelWidth, minitemheight, *mPublicServerStatusInfoLabel).withMargin(2).withFlex(0.75));
 
     publicServUserBox.items.clear();
@@ -819,7 +819,7 @@ void ConnectView::publicGroupLogin()
     DBG("Public host enter pressed");
     // parse it
     StringArray toks = StringArray::fromTokens(hostport, ":", "");
-    String host = "aoo.sonobus.net";
+    String host = DEFAULT_SERVER_HOST;
     int port = DEFAULT_SERVER_PORT;
 
     if (toks.size() >= 1) {
@@ -866,7 +866,7 @@ bool ConnectView::copyInfoToClipboard(bool singleURL, String * retmessage)
 
     String hostport = mServerHostEditor->getText();
     if (hostport.isEmpty()) {
-        hostport = "aoo.sonobus.net";
+        hostport = DEFAULT_SERVER_HOST;
     }
 
     String groupName;
@@ -1028,7 +1028,7 @@ void ConnectView::buttonClicked (Button* buttonThatWasClicked)
 
         // parse it
         StringArray toks = StringArray::fromTokens(hostport, ":", "");
-        String host = "aoo.sonobus.net";
+        String host = DEFAULT_SERVER_HOST;
         int port = DEFAULT_SERVER_PORT;
 
         if (toks.size() >= 1) {
@@ -1059,7 +1059,7 @@ void ConnectView::buttonClicked (Button* buttonThatWasClicked)
 
         // parse it
         StringArray toks = StringArray::fromTokens(hostport, ":", "");
-        String host = "aoo.sonobus.net";
+        String host = DEFAULT_SERVER_HOST;
         int port = DEFAULT_SERVER_PORT;
 
         if (toks.size() >= 1) {
@@ -1576,7 +1576,7 @@ void ConnectView::RecentsListModel::paintListBoxItem (int rowNumber, Graphics &g
 
     infostr += TRANS("on") + " " + Time(info.timestamp).toString(true, true, false) + " " ;
 
-    if (info.serverHost != "aoo.sonobus.net") {
+    if (info.serverHost != DEFAULT_SERVER_HOST) {
         infostr += TRANS("to") + " " +  info.serverHost;
     }
 

Source/SonoLookAndFeel.cpp

@@ -33,7 +33,7 @@ SonoLookAndFeel::SonoLookAndFeel()
     setColour (TextButton::buttonColourId, Colour::fromFloatRGBA(0.15, 0.15, 0.15, 0.7)); // old one
     //setColour (TextButton::buttonColourId, Colour::fromFloatRGBA(0.15, 0.15, 0.15, 0.0));
     //setColour (TextButton::buttonOnColourId, Colour (0xff3d70c8));
-    setColour (TextButton::buttonOnColourId, Colour::fromFloatRGBA(0.5, 0.4, 0.6, 0.8));
+    setColour (TextButton::buttonOnColourId, Colour(0xFF002CFF));
     setColour (TextButton::textColourOnId, Colour (0xddcccccc));
     setColour (TextButton::textColourOffId, Colour (0xdde9e9e9));
 
@@ -51,7 +51,7 @@ SonoLookAndFeel::SonoLookAndFeel()
 
     setColour (TextEditor::backgroundColourId, Colour (0xff050505));
     setColour (TextEditor::textColourId, Colour (0xffe9e9e9));
-    setColour (TextEditor::highlightColourId, Colour (0xff5959f9));
+    setColour (TextEditor::highlightColourId, Colour (0xFF002CFF));
     setColour (TextEditor::outlineColourId, Colour::fromFloatRGBA(0.3, 0.3, 0.3, 0.5));
     setColour (TextEditor::focusedOutlineColourId, Colour::fromFloatRGBA(0.5, 0.5, 0.5, 0.7));
 
@@ -62,10 +62,10 @@ SonoLookAndFeel::SonoLookAndFeel()
     setColour (Slider::textBoxHighlightColourId, Colour (0xaa555555));
     setColour (Slider::textBoxOutlineColourId, Colour::fromFloatRGBA(0.3, 0.3, 0.3, 0.5));
 
-    setColour (Slider::trackColourId, Colour::fromFloatRGBA(0.1, 0.4, 0.6, 0.8));
-    setColour (Slider::thumbColourId, Colour::fromFloatRGBA(0.5, 0.4, 0.6, 0.9));
+    setColour(Slider::trackColourId, juce::Colour(0xFF1A2E61));
+    setColour(Slider::thumbColourId, juce::Colour(0xFF002CFF));
     //setColour (Slider::thumbColourId, Colour::fromFloatRGBA(0.2, 0.5, 0.7, 1.0));
-    setColour (Slider::rotarySliderFillColourId, Colour::fromFloatRGBA(0.5, 0.4, 0.6, 0.9));
+    setColour (Slider::rotarySliderFillColourId, juce::Colour(0xFF1A2E61));
 
     setColour (TabbedButtonBar::tabOutlineColourId, Colour::fromFloatRGBA(0.3, 0.3, 0.3, 0.5));
 
@@ -96,24 +96,25 @@ SonoLookAndFeel::SonoLookAndFeel()
     setColour (DrawableButton::textColourOnId, Colour (0xffe9e9e9));
 
     //setColour (DrawableButton::backgroundColourId, Colour (0xffb9b9b9));
-    setColour (DrawableButton::backgroundOnColourId, Colour::fromFloatRGBA(0.5, 0.4, 0.6, 0.8));
+    setColour (DrawableButton::backgroundOnColourId, Colour(0xFF002CFF));
 
     //setColour (ConfigurationRowView::backgroundColourId, Colour::fromFloatRGBA(0.05, 0.05, 0.05, 1.0));
     //setColour (ConfigurationRowView::selectedBackgroundColourId, Colour::fromFloatRGBA(0.15, 0.15, 0.15, 1.0));
 
-    setColour(ToggleButton::tickColourId, Colour::fromFloatRGBA(0.4, 0.8, 1.0, 1.0));
+    setColour(ToggleButton::tickColourId, Colour(0xFF002CFF));
 
     setColour (DirectoryContentsDisplayComponent::highlightColourId, Colour::fromFloatRGBA(0.1, 0.4, 0.6, 0.9));
     setColour (DirectoryContentsDisplayComponent::textColourId, Colour (0xffe9e9e9));
     // setColour (Label::textColourId, Colour (0xffe9e9e9));
 
-    //myFont = Typeface::createSystemTypefaceFor (BinaryData::DejaVuSans_ttf, BinaryData::DejaVuSans_ttfSize);
+    // myFont = Typeface::createSystemTypefaceFor (BinaryData::DejaVuSans_ttf, BinaryData::DejaVuSans_ttfSize);
+    myFont = Typeface::createSystemTypefaceFor (BinaryData::BricolageGrotesqueRegular_ttf, BinaryData::BricolageGrotesqueRegular_ttfSize);
     //setDefaultSansSerifTypefaceName("Gill Sans");
     //setDefaultSansSerifTypefaceName("Arial Unicode MS");
     //setDefaultSansSerifTypefaceName(myFont.getTypefaceName());
 
     //myFont = Typeface::createSystemTypefaceFor (BinaryData::GillSans_ttc, BinaryData::GillSans_ttcSize);
-    myFont = Font(16 * fontScale);
+    // myFont = Font(16 * fontScale);
 
     setupDefaultMeterColours();