Skip to content

Commit

Permalink
Merge pull request IvanMathy#305 from IvanMathy/release/1.4.0
Browse files Browse the repository at this point in the history 
Release/1.4.0
  • Loading branch information
@IvanMathy
IvanMathy authored Oct 23, 2021
2 parents 90be3eb + 3389b5e commit bd4c655
Show file tree
Hide file tree
Showing 16 changed files with 63 additions and 56 deletions.
8 changes: 4 additions & 4 deletions Boop/Boop.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 13;
CURRENT_PROJECT_VERSION = 14;
DEVELOPMENT_TEAM = RLZ8XBTX7G;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -781,7 +781,7 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 13;
CURRENT_PROJECT_VERSION = 14;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -812,7 +812,7 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 17;
CURRENT_PROJECT_VERSION = 18;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -843,7 +843,7 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 17;
CURRENT_PROJECT_VERSION = 18;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down
2 changes: 1 addition & 1 deletion Boop/Boop/Controllers/PopoverViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,6 @@ extension PopoverViewController: NSTextFieldDelegate {
let results = scriptManager.search(searchField.stringValue)
tableViewController.results = results

self.tableHeightConstraint.constant = CGFloat(47 * min(5, results.count))
self.tableHeightConstraint.constant = CGFloat(65 * min(5, results.count))
}
}
6 changes: 3 additions & 3 deletions Boop/Boop/Editor/Themes/Colors.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ struct ColorPair {

static let comments = ColorPair(light: Colors.commentGreyDarkest, dark: Colors.commentGreyDarkest)
static let separator = ColorPair(light: .init(white: 220/255, alpha: 1), dark: .init(white: 45/255, alpha: 1))
static let background = ColorPair(light: .init(white: 0.95, alpha: 1), dark: .init(white: 31/255, alpha: 1))
static let overlayColor = ColorPair(light: NSColor(calibratedWhite: 0.85, alpha: 0.6), dark: NSColor(calibratedWhite: 0.08, alpha: 0.6))
static let popoverBorder = ColorPair(light: .init(white: 220/255, alpha: 1), dark: .init(white: 130/255, alpha: 1))
static let background = ColorPair(light: .init(white: 0.95, alpha: 1.0), dark: .init(white: 31/255, alpha: 1.0))
static let overlayColor = ColorPair(light: .init(white: 0.85, alpha: 0.6), dark: .init(white: 0.08, alpha: 0.6))
static let popoverBorder = ColorPair(light: .init(white: 220/255, alpha: 1), dark: .init(white: 75/255, alpha: 1))
static let popoverOutline = ColorPair(light: .init(white: 150/255, alpha: 1), dark: .init(white: 20/255, alpha: 1))


Expand Down
1 change: 1 addition & 0 deletions Boop/Boop/System/Models/Script.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class Script: NSObject {
var url: URL
var scriptCode: String


lazy var context: JSContext = { [unowned self] in
let context: JSContext = JSContext()
context.name = self.name ?? "Unknown Script"
Expand Down
4 changes: 2 additions & 2 deletions Boop/Boop/scripts/ASCIIToHex.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"api":1,
"name":"ASCII To Hex",
"description":"Converts ASCII characters to hex",
"description":"Converts ASCII characters to hexadecimal codes.",
"author":"aWZHY0yQH81uOYvH",
"icon":"metamorphose",
"tags":"ascii,hex,convert"
Expand All @@ -17,4 +17,4 @@ function main(state) {
buf += code;
}
state.fullText = buf.toUpperCase();
}
}
2 changes: 1 addition & 1 deletion Boop/Boop/scripts/AndroidIOSStrings.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"api":1,
"name":"Android Strings to iOS Localizables",
"description":"Converts Android Strings to iOS localizables",
"description":"Converts Android Strings to iOS localizables.",
"author":"Manuel Kunz (https://github.com/KunzManuel)",
"icon":"translation",
"tags":"string,android,ios"
Expand Down
6 changes: 3 additions & 3 deletions Scripts/BinaryToDecimal.js → Boop/Boop/scripts/BinaryToDecimal.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
{
"api": 1,
"name": "Bin to Dec",
"description": "Binary to Decimal (per line)",
"name": "Binary to Decimal",
"description": "Converts binary values to decimal.",
"author": "Maurice",
"icon": "metamorphose",
"tags": "decimal,binary,dec,bin"
Expand All @@ -28,4 +28,4 @@ function main(state) {
}

state.text = result.trim();
}
}
6 changes: 3 additions & 3 deletions Scripts/DecimalToBinary.js → Boop/Boop/scripts/DecimalToBinary.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
{
"api": 1,
"name": "Dec to Bin",
"description": "Decimal to Binary (per line)",
"name": "Decimal to Binary",
"description": "Converts decimal values to binary.",
"author": "Maurice",
"icon": "metamorphose",
"tags": "decimal,binary,dec,bin"
Expand All @@ -28,4 +28,4 @@ function main(state) {
}

state.text = result.trim();
}
}
6 changes: 3 additions & 3 deletions Scripts/DecimalToHex.js → Boop/Boop/scripts/DecimalToHex.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
{
"api": 1,
"name": "Dec to Hex",
"description": "Decimal to Hexadecimal (per line)",
"name": "Decimal to Hex",
"description": "Converts decimal values to hexadecimal.",
"author": "Maurice",
"icon": "metamorphose",
"tags": "decimal,hexadecimal,dec,hex"
Expand All @@ -27,4 +27,4 @@ function main(state) {
}

state.text = result.trim();
}
}
2 changes: 1 addition & 1 deletion Boop/Boop/scripts/FishHexPathConverter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"api": 1,
"name": "Fish PATH Hex Converter",
"description": "Takes a regular PATH and converts it to use hex ascii characters ex. -L/usr/local/opt/[email protected]/lib -> \x2dL/usr/local/opt/openssl\x401\x2e1/lib"",
"description": "Escapes terminal characters.",
"author": "Paul Seelman",
"icon": "broom",
"tags": "fish_user_paths, fish, hex, ascii, path, var"
Expand Down
2 changes: 1 addition & 1 deletion Boop/Boop/scripts/HexToASCII.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"api":1,
"name":"Hex To ASCII",
"description":"Converts hex into ASCII characters",
"description":"Converts hexadecimal values into ASCII characters",
"author":"aWZHY0yQH81uOYvH",
"icon":"metamorphose",
"tags":"hex,ascii,convert"
Expand Down
4 changes: 2 additions & 2 deletions Scripts/HexToDecimal.js → Boop/Boop/scripts/HexToDecimal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"api": 1,
"name": "Hex to Dec",
"description": "Hexadecimal to Decimal (per line)",
"description": "Converts hexadecimal to decimal.",
"author": "Maurice",
"icon": "metamorphose",
"tags": "decimal,hexadecimal,dec,hex"
Expand All @@ -28,4 +28,4 @@ function main(state) {
}

state.text = result.trim();
}
}
4 changes: 2 additions & 2 deletions Scripts/LoremIpsum.js → Boop/Boop/scripts/LoremIpsum.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"api":1,
"name":"Lorem Ipsum",
"description":"Generates Lorem Ipsum like text",
"description":"Generates Lorem Ipsum placeholder text.",
"author":"luisfontes19",
"icon":"type",
"tags":"generate,lorem,ipsum,text",
Expand All @@ -23,4 +23,4 @@ function main(state) {
sentence = sentence.charAt(0).toUpperCase() + sentence.slice(1).trim() + ".";

state.text = sentence;
}
}
2 changes: 1 addition & 1 deletion Boop/Boop/scripts/SumAll.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"api":1,
"name":"Sum All",
"description":"Sum a list of numbers (separated by either a new line, comma, or semicolon).",
"description":"Sums up a list of numbers.",
"author":"Annie Tran",
"icon":"abacus",
"tags":"sum,calculator,addition,add"
Expand Down
32 changes: 19 additions & 13 deletions Boop/UI/Base.lproj/MainMenu.xib
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17156" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17156"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand Down Expand Up @@ -495,13 +495,17 @@ Gw
<action selector="openHelp:" target="unv-pE-gme" id="8ta-uT-eZh"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="Fec-Ba-9Rm"/>
<menuItem title="@OKatBest on Twitter" id="N9h-rg-i4V" userLabel="@OKatBest on Twitter">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
</items>
</menu>
</menuItem>
</items>
<point key="canvasLocation" x="139" y="-200"/>
</menu>
<window title="Boop" separatorStyle="shadow" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" tabbingMode="disallowed" titleVisibility="hidden" id="QvC-M9-y7g">
<window title="Boop" separatorStyle="shadow" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" tabbingMode="disallowed" toolbarStyle="compact" titleVisibility="hidden" id="QvC-M9-y7g">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="335" y="390" width="480" height="360"/>
Expand All @@ -518,13 +522,13 @@ Gw
<rect key="frame" x="0.0" y="0.0" width="480" height="360"/>
</customView>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="ibo-QR-zuu" customClass="PopoverContainerView" customModule="Boop" customModuleProvider="target">
<rect key="frame" x="20" y="144" width="440" height="190"/>
<rect key="frame" x="20" y="152" width="440" height="182"/>
<subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="NDF-Rt-5B3" customClass="PopoverView" customModule="Boop" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="440" height="190"/>
<rect key="frame" x="0.0" y="0.0" width="440" height="182"/>
<subviews>
<textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EfF-8p-bmE" customClass="SearchField" customModule="Boop" customModuleProvider="target">
<rect key="frame" x="10" y="148" width="420" height="30"/>
<rect key="frame" x="10" y="140" width="420" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="3ju-8B-ORH"/>
</constraints>
Expand Down Expand Up @@ -563,15 +567,15 @@ Gw
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="hXY-cu-8yv">
<rect key="frame" x="8" y="5" width="30" height="30"/>
<rect key="frame" x="0.0" y="5" width="30" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="30" id="5DT-iv-bTJ"/>
<constraint firstAttribute="height" constant="30" id="DLV-6S-4Af"/>
</constraints>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="icons8-broom" id="0pf-Dg-gKF"/>
</imageView>
<stackView distribution="fill" orientation="vertical" alignment="leading" spacing="-2" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ahi-ZC-6NH">
<rect key="frame" x="45" y="3" width="372" height="37"/>
<rect key="frame" x="37" y="3" width="380" height="37"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="llX-0P-Bnw">
<rect key="frame" x="-2" y="13" width="146" height="24"/>
Expand All @@ -584,7 +588,7 @@ Gw
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rLt-DR-5JZ">
<rect key="frame" x="-2" y="0.0" width="90" height="15"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="fOL-j2-H9u">
<font key="font" metaFont="system" size="12"/>
<font key="font" metaFont="cellTitle"/>
<color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
Expand All @@ -601,12 +605,12 @@ Gw
</stackView>
</subviews>
<constraints>
<constraint firstItem="ahi-ZC-6NH" firstAttribute="top" secondItem="1oI-88-xll" secondAttribute="top" id="LWs-D3-oJh"/>
<constraint firstItem="hXY-cu-8yv" firstAttribute="top" secondItem="1oI-88-xll" secondAttribute="top" constant="5" id="LlB-v6-CtV"/>
<constraint firstItem="ahi-ZC-6NH" firstAttribute="top" secondItem="1oI-88-xll" secondAttribute="top" constant="1" id="LWs-D3-oJh"/>
<constraint firstItem="hXY-cu-8yv" firstAttribute="top" secondItem="1oI-88-xll" secondAttribute="top" constant="6" id="LlB-v6-CtV"/>
<constraint firstItem="ahi-ZC-6NH" firstAttribute="leading" secondItem="hXY-cu-8yv" secondAttribute="trailing" constant="7" id="Lrk-98-STE"/>
<constraint firstAttribute="trailing" secondItem="ahi-ZC-6NH" secondAttribute="trailing" id="bM0-gY-1Wg"/>
<constraint firstAttribute="bottom" secondItem="ahi-ZC-6NH" secondAttribute="bottom" constant="3" id="ifu-ja-93W"/>
<constraint firstItem="hXY-cu-8yv" firstAttribute="leading" secondItem="1oI-88-xll" secondAttribute="leading" constant="8" id="lOt-qT-7gH"/>
<constraint firstItem="hXY-cu-8yv" firstAttribute="leading" secondItem="1oI-88-xll" secondAttribute="leading" id="lOt-qT-7gH"/>
</constraints>
<connections>
<outlet property="imageView" destination="hXY-cu-8yv" id="WEV-5g-bSe"/>
Expand All @@ -628,6 +632,7 @@ Gw
<constraints>
<constraint firstAttribute="height" constant="140" id="CGh-qY-CKR"/>
</constraints>
<edgeInsets key="scrollerInsets" left="0.0" right="0.0" top="0.0" bottom="10"/>
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="uf1-vI-kh9">
<rect key="frame" x="1" y="119" width="223" height="15"/>
<autoresizingMask key="autoresizingMask"/>
Expand All @@ -639,10 +644,11 @@ Gw
</scrollView>
</subviews>
<constraints>
<constraint firstItem="lpr-jW-wRt" firstAttribute="top" secondItem="EfF-8p-bmE" secondAttribute="bottom" constant="8" id="2ID-K8-nFS"/>
<constraint firstItem="lpr-jW-wRt" firstAttribute="top" secondItem="EfF-8p-bmE" secondAttribute="bottom" id="2ID-K8-nFS"/>
<constraint firstItem="EfF-8p-bmE" firstAttribute="leading" secondItem="NDF-Rt-5B3" secondAttribute="leading" constant="12" id="2Qj-w2-tCw"/>
<constraint firstItem="lpr-jW-wRt" firstAttribute="leading" secondItem="NDF-Rt-5B3" secondAttribute="leading" id="dOf-du-E6M"/>
<constraint firstAttribute="trailing" secondItem="EfF-8p-bmE" secondAttribute="trailing" constant="12" id="eSY-Sy-G2J"/>
<constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="EfF-8p-bmE" secondAttribute="bottom" constant="8" id="hUt-ze-STS"/>
<constraint firstItem="EfF-8p-bmE" firstAttribute="top" secondItem="NDF-Rt-5B3" secondAttribute="top" constant="12" id="hvZ-Ps-eCw"/>
<constraint firstAttribute="bottom" secondItem="lpr-jW-wRt" secondAttribute="bottom" id="v0z-IJ-iPG"/>
<constraint firstAttribute="trailing" secondItem="lpr-jW-wRt" secondAttribute="trailing" id="zwK-uj-6le"/>
Expand Down
Loading

0 comments on commit bd4c655

Please sign in to comment.