Skip to content

Commit

Permalink
updated for Apple Silicon
Browse files Browse the repository at this point in the history
* Updated for macOS Ventura and Xcode 14.2
* Apple Silicon compatible
* updated project to macOS 11+
* fixed most warnings and deprecations
* replaced ShortcutRecorder Framework with MASShortcut package
* general refactoring
* updated Preferences window layout
* replaced most static images with SF Symbols
* moved remaining images to Assets catalogue
* updated icon to user submitted icon 2ndalpha#203
* refreshed status menu icon
* refreshed .hst icon
* added support for restarting mDNSResponder via NSUserAppleScriptTask
* updated .gitignore to ignore .DS_Store files
* updated README to indicate support for macOS Big Sur and above
  • Loading branch information
sweetppro committed Jan 8, 2023
1 parent 164a4e3 commit a395e46
Show file tree
Hide file tree
Showing 284 changed files with 2,027 additions and 12,182 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
xcuserdata
build
.DS_Store
24 changes: 12 additions & 12 deletions AboutBox.xib
100644 → 100755
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="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand All @@ -20,7 +20,7 @@
<windowStyleMask key="styleMask" titled="YES" closable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="131" y="158" width="335" height="260"/>
<rect key="screenRect" x="0.0" y="0.0" width="1792" height="1097"/>
<rect key="screenRect" x="0.0" y="0.0" width="1470" height="919"/>
<view key="contentView" id="2">
<rect key="frame" x="0.0" y="0.0" width="335" height="260"/>
<autoresizingMask key="autoresizingMask"/>
Expand Down Expand Up @@ -55,9 +55,9 @@ All rights reserved.</string>
</textFieldCell>
</textField>
<imageView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="13">
<rect key="frame" x="62" y="131" width="85" height="109"/>
<rect key="frame" x="62" y="131" width="115" height="109"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="About Box Image" id="14"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="AboutIcon" id="14"/>
</imageView>
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="15">
<rect key="frame" x="73" y="74" width="68" height="14"/>
Expand Down Expand Up @@ -89,11 +89,11 @@ All rights reserved.</string>
<scrollView fixedFrame="YES" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="27">
<rect key="frame" x="140" y="92" width="119" height="15"/>
<autoresizingMask key="autoresizingMask"/>
<clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="n8d-RP-4LU">
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="n8d-RP-4LU">
<rect key="frame" x="0.0" y="0.0" width="119" height="15"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textView ambiguous="YES" editable="NO" drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="NO" id="30">
<textView editable="NO" drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="NO" id="30">
<rect key="frame" x="0.0" y="0.0" width="119" height="15"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
Expand All @@ -104,7 +104,7 @@ All rights reserved.</string>
<fragment content="[email protected]">
<attributes>
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" metaFont="user"/>
<font key="NSFont" usesAppearanceFont="YES"/>
<paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural"/>
</attributes>
</fragment>
Expand All @@ -125,11 +125,11 @@ All rights reserved.</string>
<scrollView fixedFrame="YES" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="32">
<rect key="frame" x="140" y="73" width="175" height="15"/>
<autoresizingMask key="autoresizingMask"/>
<clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="pO4-Ek-Ecy">
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="pO4-Ek-Ecy">
<rect key="frame" x="0.0" y="0.0" width="175" height="15"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textView ambiguous="YES" editable="NO" drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="NO" id="33">
<textView editable="NO" drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="NO" id="33">
<rect key="frame" x="0.0" y="0.0" width="175" height="15"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
Expand All @@ -140,7 +140,7 @@ All rights reserved.</string>
<fragment content="github.com/2ndalpha/gasmask">
<attributes>
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" metaFont="user"/>
<font key="NSFont" usesAppearanceFont="YES"/>
<paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural"/>
</attributes>
</fragment>
Expand All @@ -167,6 +167,6 @@ All rights reserved.</string>
</window>
</objects>
<resources>
<image name="About Box Image" width="256" height="256"/>
<image name="AboutIcon" width="128" height="128"/>
</resources>
</document>
23 changes: 23 additions & 0 deletions Assets.xcassets/AboutIcon.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "icon_128x128.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon_512x512.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file removed Assets.xcassets/ActivateImage.imageset/Activate.png
Binary file not shown.
25 changes: 0 additions & 25 deletions Assets.xcassets/ActivateImage.imageset/Contents.json

This file was deleted.

68 changes: 68 additions & 0 deletions Assets.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"images" : [
{
"filename" : "icon_16x16.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "16x16"
},
{
"filename" : "[email protected]",
"idiom" : "mac",
"scale" : "2x",
"size" : "16x16"
},
{
"filename" : "icon_32x32.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "32x32"
},
{
"filename" : "[email protected]",
"idiom" : "mac",
"scale" : "2x",
"size" : "32x32"
},
{
"filename" : "icon_128x128.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "128x128"
},
{
"filename" : "[email protected]",
"idiom" : "mac",
"scale" : "2x",
"size" : "128x128"
},
{
"filename" : "icon_256x256.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "256x256"
},
{
"filename" : "[email protected]",
"idiom" : "mac",
"scale" : "2x",
"size" : "256x256"
},
{
"filename" : "icon_512x512.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "512x512"
},
{
"filename" : "[email protected]",
"idiom" : "mac",
"scale" : "2x",
"size" : "512x512"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets.xcassets/AppIcon.appiconset/icon_16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets.xcassets/AppIcon.appiconset/icon_32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 0 additions & 38 deletions Assets.xcassets/BackgroundColor.colorset/Contents.json

This file was deleted.

File renamed without changes
12 changes: 12 additions & 0 deletions Assets.xcassets/Combined Hosts Hint.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "Combined Hosts Hint.png",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
38 changes: 0 additions & 38 deletions Assets.xcassets/CommentColor.colorset/Contents.json

This file was deleted.

6 changes: 3 additions & 3 deletions Assets.xcassets/Contents.json
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
25 changes: 0 additions & 25 deletions Assets.xcassets/RemoveImage.imageset/Contents.json

This file was deleted.

Binary file removed Assets.xcassets/RemoveImage.imageset/Remove Dark.png
Binary file not shown.
Binary file removed Assets.xcassets/RemoveImage.imageset/Remove.png
Binary file not shown.
38 changes: 0 additions & 38 deletions Assets.xcassets/TextColor.colorset/Contents.json

This file was deleted.

Loading

0 comments on commit a395e46

Please sign in to comment.