Skip to content

Commit

Permalink
Improve mic permission alert for Mac due to limitations in Catalyst
Browse files Browse the repository at this point in the history
  • Loading branch information
@maxmousee
maxmousee committed Jun 1, 2020
1 parent 6f41eac commit 5e31899
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 34 deletions.
7 changes: 5 additions & 2 deletions Apple/VSD.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = VSD/VSD.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 19;
CURRENT_PROJECT_VERSION = 20;
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
DEVELOPMENT_TEAM = 656LRSVN44;
GCC_PREPROCESSOR_DEFINITIONS = "";
Expand All @@ -627,6 +627,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.2;
PRODUCT_BUNDLE_IDENTIFIER = com.nfsindustries.VSD;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;
Expand All @@ -642,7 +643,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = VSD/VSD.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 19;
CURRENT_PROJECT_VERSION = 20;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
DEVELOPMENT_TEAM = 656LRSVN44;
INFOPLIST_FILE = VSD/Info.plist;
Expand All @@ -651,6 +653,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.2;
PRODUCT_BUNDLE_IDENTIFIER = com.nfsindustries.VSD;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;
Expand Down
60 changes: 30 additions & 30 deletions Apple/VSD.xcodeproj/xcuserdata/maxmouse.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "210"
endingLineNumber = "210"
landmarkName = "processMicrophoneBuffer(inputDataList:frameCount:)"
landmarkType = "7">
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -34,8 +34,8 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "212"
endingLineNumber = "212"
landmarkName = "processMicrophoneBuffer(inputDataList:frameCount:)"
landmarkType = "7">
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand Down Expand Up @@ -101,8 +101,8 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "37"
endingLineNumber = "37"
landmarkName = "startRecording()"
landmarkType = "7">
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -117,8 +117,8 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "40"
endingLineNumber = "40"
landmarkName = "startRecording()"
landmarkType = "7">
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -133,8 +133,8 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "39"
endingLineNumber = "39"
landmarkName = "startRecording()"
landmarkType = "7">
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -149,8 +149,8 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "41"
endingLineNumber = "41"
landmarkName = "startRecording()"
landmarkType = "7">
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -165,8 +165,8 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "46"
endingLineNumber = "46"
landmarkName = "startAudioUnit()"
landmarkType = "7">
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -181,8 +181,8 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "54"
endingLineNumber = "54"
landmarkName = "startAudioUnit()"
landmarkType = "7">
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -197,8 +197,8 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "51"
endingLineNumber = "51"
landmarkName = "startAudioUnit()"
landmarkType = "7">
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -213,8 +213,8 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "48"
endingLineNumber = "48"
landmarkName = "startAudioUnit()"
landmarkType = "7">
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -229,8 +229,8 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "89"
endingLineNumber = "89"
landmarkName = "startAudioSession()"
landmarkType = "7">
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -245,8 +245,8 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "97"
endingLineNumber = "97"
landmarkName = "startAudioSession()"
landmarkType = "7">
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -261,8 +261,8 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "94"
endingLineNumber = "94"
landmarkName = "startAudioSession()"
landmarkType = "7">
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -277,8 +277,8 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "95"
endingLineNumber = "95"
landmarkName = "startAudioSession()"
landmarkType = "7">
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -291,8 +291,8 @@
filePath = "VSD/ViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "62"
endingLineNumber = "62"
startingLineNumber = "66"
endingLineNumber = "66"
landmarkName = "openSettings(alert:)"
landmarkType = "7">
</BreakpointContent>
Expand Down
2 changes: 1 addition & 1 deletion Apple/VSD/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>5.1</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSApplicationCategoryType</key>
Expand Down
6 changes: 5 additions & 1 deletion Apple/VSD/ViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,11 @@ class ViewController: UIViewController {

@objc func askForMicrophonePermission(notification: NSNotification) {
DispatchQueue.main.async {
let errorMessage = "Please enable microphone access to monitor your stress level"
#if targetEnvironment(macCatalyst)
let errorMessage = "Please enable microphone access and restart the app to monitor your stress level"
#else
let errorMessage = "Please enable microphone access to monitor your stress level"
#endif
let alert = UIAlertController(title: "Error", message: errorMessage, preferredStyle: UIAlertController.Style.alert)
alert.addAction(UIAlertAction(title: "Open Settings", style: UIAlertAction.Style.default, handler: self.openSettings))
self.present(alert, animated: true, completion: nil)
Expand Down

0 comments on commit 5e31899

Please sign in to comment.