updated for Apple Silicon by sweetppro · Pull Request #220 · 2ndalpha/gasmask

sweetppro · 2023-01-08T20:51:05Z

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 New Icon for Big Sur + #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

As mentioned in Issues 2ndalpha#160 and 2ndalpha#140, the list of hosts is not alphabetized in newer versions of macOS. This change is a feeble attempt by me to sort the `hostsFiles` array as it's populated. It seems to have built successfully on my machine but I'm extremely new to the world of Obj-C development so it would not surprise me in the least if this does something in a bad or easily improved way. That is, I added a way to Sort (`NSSortDescriptor`) and call it immediately after every time we `addObject` to `hostsFiles` during `loadFiles` in LocalHostsController.m. Doing this after every addition seems like it might be a poor choice from a performance perspective. Moreover, it may be wholly unnecessary when used in some environments where this issue doesn't present. I went with it anyway because I didn't know how else to approach this, nor how to conditionally use this logic only when I know it to be necessary.

* 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

sweetppro · 2023-01-08T20:52:58Z

Here's all the assets I used/created:
Gas Mask Icons.zip

add framework searchpath to build settings to fix Sparkle build

2ndalpha · 2023-03-07T10:16:54Z

Wow, it is a big PR.
Has anyone tested it / is using it successfully daily?

oliveratgithub · 2023-03-12T15:53:11Z

Has anyone tested it / is using it successfully daily?

I tested it today – but my conclusion is, that its not "production ready" yet.
Some key functionalities of the Gas Mask App are not working. I think the to-dos in #202 need to be addressed, too.

I tried it first with the configured Target platform settings (11.0) and with the most recent once (13.1) – the later giving me actually better results on an Apple Silicon platform.

MacBook Air M2
macOS 13.3 (b) Beta (22E7752300g)
Xcode Version 14.2 (14C18)

Functionality + GUI issues

Good news first: this version adds support for Adding remote file fails #90 - although buggy (see below)
Sometimes the "Combine Hosts"-selection is missing
- Might relate to Xcode Warnings with HostsListView.m, listed below
A "Combined" file does not show any (combined) content --> yet I think an existing combined hosts works technically
A "Remote" hosts file is not being displayed properly
- e.g. after adding, an infinite "spinner"-icon is displayed (stuck downloading the file?)
- upon App restart, a remote Hosts is rendered empty… and not refetching or alike
Also I think the release is not properly updating Version information etc. (e.g. still "0.8.6").
Tested the changes of 2 PRs and those both seem to work flawlessly – and could be merged IMHO:
- Sort Local hosts when loading #162
- Move host file storage to "~/Library/Application Support/Gas Mask" #193

—> below are some screenshots

Xcode issues

Build Errors

None

Build Warnings

ApplicationController.m

/Applications/GasMask/gasmask/Source/ApplicationController.m:136:12 'setAllowedFileTypes:' is deprecated: first deprecated in macOS 12.0 - Use -allowedContentTypes instead

HostsListView.m

/Applications/GasMask/gasmask/Source/HostsListView.m:43:85 'NSFilenamesPboardType' is deprecated: first deprecated in macOS 10.14 - Create multiple pasteboard items with NSPasteboardTypeFileURL or kUTTypeFileURL instead
/Applications/GasMask/gasmask/Source/HostsListView.m:47:35 'NSTableViewSelectionHighlightStyleSourceList' is deprecated: first deprecated in macOS 12.0 - Set the NSTableView.style property to NSTableViewStyleSourceList instead.
/Applications/GasMask/gasmask/Source/HostsListView.m:101:1 Implementing deprecated method

HostsMainController.m

/Applications/GasMask/gasmask/Source/HostsMainController.m:420:9 'FSEventStreamScheduleWithRunLoop' is deprecated: first deprecated in macOS 13.0 - Use FSEventStreamSetDispatchQueue instead.
/Applications/GasMask/gasmask/Source/HostsMainController.m:431:9 'FSEventStreamUnscheduleFromRunLoop' is deprecated: first deprecated in macOS 13.0 - Use FSEventStreamSetDispatchQueue instead.

LoginItem.m

/Applications/GasMask/gasmask/Source/LoginItem.m:56:2 'LSSharedFileListInsertItemURL' is deprecated: first deprecated in macOS 10.11 - No longer supported
/Applications/GasMask/gasmask/Source/LoginItem.m:57:11 'kLSSharedFileListItemLast' is deprecated: first deprecated in macOS 10.11 - No longer supported
/Applications/GasMask/gasmask/Source/LoginItem.m:69:3 'LSSharedFileListItemRemove' is deprecated: first deprecated in macOS 10.11 - No longer supported
/Applications/GasMask/gasmask/Source/LoginItem.m:75:9 'LSSharedFileListCreate' is deprecated: first deprecated in macOS 10.11 - No longer supported
/Applications/GasMask/gasmask/Source/LoginItem.m:75:38 'kLSSharedFileListSessionLoginItems' is deprecated: first deprecated in macOS 10.11
/Applications/GasMask/gasmask/Source/LoginItem.m:87:49 'LSSharedFileListCopySnapshot' is deprecated: first deprecated in macOS 10.11 - No longer supported
/Applications/GasMask/gasmask/Source/LoginItem.m:95:7 'LSSharedFileListItemResolve' is deprecated: first deprecated in macOS 10.10

PrivilegedActions.m

/Applications/GasMask/gasmask/Source/PrivilegedActions.m:121:20 'AuthorizationExecuteWithPrivileges' is deprecated: first deprecated in macOS 10.7

Util.m

/Applications/GasMask/gasmask/Source/Util.m:57:45 'currentAppearance' is deprecated: first deprecated in macOS 12.0 - Use -performAsCurrentDrawingAppearance: to temporarily set the drawing appearance, or +currentDrawingAppearance to access the currently drawing appearance.
/Applications/GasMask/gasmask/Source/Util.m:57:45 'setCurrentAppearance:' is deprecated: first deprecated in macOS 12.0 - Use -performAsCurrentDrawingAppearance: to temporarily set the drawing appearance, or +currentDrawingAppearance to access the currently drawing appearance.

Screenshots

App GUI

Xcode

Move host file storage to "~/Library/Application Support/Gas Mask"

Sort Local hosts when loading

2ndalpha · 2023-03-13T18:26:36Z

Thank you @oliveratgithub for testing.
To be fair the current code in master does not work at all.

I will try to review it all.

lockieluke · 2023-03-25T16:27:18Z

merge this!

Contributions for 2ndalpha#220

tlogik · 2024-01-23T13:47:17Z

Hi @2ndalpha
Is there something we can do to help the process of getting the Apple Silicon version out.
I see some testing is required and maybe some fixes.
Please advise as it seems you placed you self in the eye of the storm and wanted to review :-D

2ndalpha · 2024-01-23T13:58:44Z

@tlogik I can review and test PR-s. The changes would need to be as small as possible.
This PR is huge and if the author does not have to fix the issues then there is no real way to move forward with it.
Unfortunately I don't have time to actively develop it.

Replace NSImage-based tab icons (loose PNGs and NSImage.preferencesGeneralName) with SF Symbols matching PR #220: gearshape, square.and.pencil, globe, command.square.fill, arrow.triangle.2.circlepath.

@chrissy-dev

Replace the outdated photorealistic gas mask icon with the community-contributed Big Sur rounded-rectangle icon from issue #203. Icon assets are cherry-picked from PR #220 which bundled the icon update with many other changes. Changes: - Add AppIcon.appiconset to asset catalog with all size variants (16-1024px) - Add AboutIcon.imageset and menuIcon.imageset to asset catalog - Update hosts.icns document type icon and help page icon - Migrate from legacy CFBundleIconFile (.icns) to ASSETCATALOG_COMPILER_APPICON_NAME - Remove dead pre-10.10 code paths in Menulet.m (deployment target is macOS 13.0) - Delete legacy icon files (applicationIcon.icns, About Box Image.png, menuIcon TIFFs) Icon by @chrissy-dev, drawn from scratch with no licensing issues. Closes #203

@chrissy-dev

* feat: replace app icon with Big Sur style design (#203) Replace the outdated photorealistic gas mask icon with the community-contributed Big Sur rounded-rectangle icon from issue #203. Icon assets are cherry-picked from PR #220 which bundled the icon update with many other changes. Changes: - Add AppIcon.appiconset to asset catalog with all size variants (16-1024px) - Add AboutIcon.imageset and menuIcon.imageset to asset catalog - Update hosts.icns document type icon and help page icon - Migrate from legacy CFBundleIconFile (.icns) to ASSETCATALOG_COMPILER_APPICON_NAME - Remove dead pre-10.10 code paths in Menulet.m (deployment target is macOS 13.0) - Delete legacy icon files (applicationIcon.icns, About Box Image.png, menuIcon TIFFs) Icon by @chrissy-dev, drawn from scratch with no licensing issues. Closes #203 * chore: remove redundant template call and unused 3x image assets - Remove redundant [icon setTemplate:YES] in Menulet.m since the asset catalog already declares template-rendering-intent - Remove unused 3x scale entries from AboutIcon and menuIcon imagesets (macOS only uses 1x and 2x) - Delete backing files icon_512x512.png and menuIcon@3x.png

rstad and others added 4 commits January 23, 2019 09:52

Merge branch 'master' into master

5b877b2

Move host file storage to "~/Library/Application Support/Gas Mask"

b983bb2

sweetppro added 2 commits January 9, 2023 13:22

fixed a build issue

3dfaabc

add framework searchpath to build settings to fix Sparkle build

fixed crashing when downloading remote hosts file

bca4be7

This was referenced Mar 12, 2023

Move host file storage to "~/Library/Application Support/Gas Mask" #193

Open

Sort Local hosts when loading #162

Open

oliveratgithub and others added 6 commits March 12, 2023 19:21

Merge pull request #1 from timepigeon/application-support

74d1c30

Move host file storage to "~/Library/Application Support/Gas Mask"

Merge pull request 2ndalpha#2 from rstad/master

c81da87

Sort Local hosts when loading

Replaces deprecated currentAppearance & setCurrentAppearance

4399896

Replaces deprecated method draggedImage

bc6d00c

Bump sparkle-project/Sparkle to version 2.3.2

b83709e

Bump 2ndalpha/gasmask to version 0.8.7

cee8fc3

oliveratgithub mentioned this pull request Mar 13, 2023

Contributions for 2ndalpha/gasmask#220 sweetppro/gasmask#1

Merged

sweetppro added 2 commits March 27, 2023 15:32

Merge branch 'master' into master

f5e4d19

Merge pull request #1 from oliveratgithub/master

61dcc29

Contributions for 2ndalpha#220

2ndalpha mentioned this pull request Feb 28, 2026

feat: replace app icon with Big Sur style design #232

Merged

2 tasks

2ndalpha mentioned this pull request Feb 28, 2026

feat: replace ShortcutRecorder with MASShortcut #233

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

updated for Apple Silicon#220

updated for Apple Silicon#220
sweetppro wants to merge 14 commits into2ndalpha:masterfrom
sweetppro:master

sweetppro commented Jan 8, 2023

Uh oh!

sweetppro commented Jan 8, 2023

Uh oh!

2ndalpha commented Mar 7, 2023

Uh oh!

oliveratgithub commented Mar 12, 2023 •

edited

Loading

Uh oh!

2ndalpha commented Mar 13, 2023

Uh oh!

lockieluke commented Mar 25, 2023

Uh oh!

tlogik commented Jan 23, 2024

Uh oh!

2ndalpha commented Jan 23, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Conversation

sweetppro commented Jan 8, 2023

Uh oh!

sweetppro commented Jan 8, 2023

Uh oh!

2ndalpha commented Mar 7, 2023

Uh oh!

oliveratgithub commented Mar 12, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Functionality + GUI issues

Xcode issues

Build Errors

Build Warnings

Screenshots

App GUI

Xcode

Uh oh!

2ndalpha commented Mar 13, 2023

Uh oh!

lockieluke commented Mar 25, 2023

Uh oh!

tlogik commented Jan 23, 2024

Uh oh!

2ndalpha commented Jan 23, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

oliveratgithub commented Mar 12, 2023 •

edited

Loading