meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bump version, add notification settings to settings bundle.

Browse source
This commit is contained in:
Garth Vander Houwen 2024-04-09 22:04:37 -07:00
parent 62c2069fb6
commit cb06af0b6c
5 changed files with 43 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Meshtastic.xcodeproj/project.pbxproj
View file

@ -1627,7 +1627,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.3.4;
MARKETING_VERSION = 2.3.5;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;
@ -1661,7 +1661,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.3.4;
MARKETING_VERSION = 2.3.5;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;
@ -1783,7 +1783,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.3.4;
MARKETING_VERSION = 2.3.5;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@ -1816,7 +1816,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.3.4;
MARKETING_VERSION = 2.3.5;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";

6
Meshtastic/Extensions/UserDefaults.swift
View file

@ -67,6 +67,7 @@ extension UserDefaults {
case detectionSensorRole
case enableSmartPosition
case newNodeNotifications
case lowBatteryNotifications
case modemPreset
case firmwareVersion
case testIntEnum
@ -145,8 +146,11 @@ extension UserDefaults {
@UserDefault(.enableSmartPosition, defaultValue: false)
static var enableSmartPosition: Bool
@UserDefault(.newNodeNotifications, defaultValue: false)
@UserDefault(.newNodeNotifications, defaultValue: true)
static var newNodeNotifications: Bool
@UserDefault(.lowBatteryNotifications, defaultValue: true)
static var lowBatteryNotifications: Bool
@UserDefault(.modemPreset, defaultValue: 0)
static var modemPreset: Int

2
Meshtastic/Helpers/MeshPackets.swift
View file

@ -723,7 +723,7 @@ func telemetryPacket(packet: MeshPacket, connectedNode: Int64, context: NSManage
// Connected Device Metrics
// ------------------------
// Low Battery notification
if telemetry.batteryLevel > 0 && telemetry.batteryLevel < 4 {
if UserDefaults.lowBatteryNotifications && telemetry.batteryLevel > 0 && telemetry.batteryLevel < 4 {
let manager = LocalNotificationManager()
manager.notifications = [
Notification(

10
Meshtastic/Views/Settings/AppSettings.swift
View file

@ -54,11 +54,11 @@ struct AppSettings: View {
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
}
Section(header: Text("Notifications")){
Toggle(isOn: $newNodeNotifications){
Label("appsettings.newNodeNotifications", systemImage: "bell.fill")
}
}
// Section(header: Text("Notifications")){
// Toggle(isOn: $newNodeNotifications){
// Label("appsettings.newNodeNotifications", systemImage: "bell.fill")
// }
// }
Section(header: Text("phone.gps")) {
if #available(iOS 17.0, macOS 14.0, *) {
GPSStatus()

29
Settings.bundle/Root.plist
View file

@ -5,6 +5,33 @@
<key>StringsTable</key>
<string>Root</string>
<key>PreferenceSpecifiers</key>
<array/>
<array>
<dict>
<key>Type</key>
<string>PSGroupSpecifier</string>
<key>Title</key>
<string>Notifications</string>
</dict>
<dict>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
<key>Title</key>
<string>New Nodes</string>
<key>Key</key>
<string>newNodeNotifications</string>
<key>DefaultValue</key>
<true/>
</dict>
<dict>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
<key>Title</key>
<string>Low Battery</string>
<key>Key</key>
<string>lowBatteryNotifications</string>
<key>DefaultValue</key>
<true/>
</dict>
</array>
</dict>
</plist>