From c16ef7f118cf838295503c30feed61767023371c Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Wed, 11 Jun 2025 16:54:40 -0700 Subject: [PATCH] TCP Connection warning, accent tint color for udp toggle --- Localizable.xcstrings | 4 ++++ Meshtastic.xcodeproj/project.pbxproj | 12 ++++++------ Meshtastic/Views/Settings/Config/NetworkConfig.swift | 7 ++++--- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Localizable.xcstrings b/Localizable.xcstrings index eec7ee0d..ccf11c60 100644 --- a/Localizable.xcstrings +++ b/Localizable.xcstrings @@ -10748,6 +10748,7 @@ } }, "Enabling WiFi will disable the bluetooth connection to the app." : { + "extractionState" : "stale", "localizations" : { "it" : { "stringUnit" : { @@ -10774,6 +10775,9 @@ } } } + }, + "Enabling WiFi will disable the bluetooth connection to the app. TCP node connections are not available on apple devices." : { + }, "Encoder Press Event" : { "localizations" : { diff --git a/Meshtastic.xcodeproj/project.pbxproj b/Meshtastic.xcodeproj/project.pbxproj index ec788769..6b37e6a6 100644 --- a/Meshtastic.xcodeproj/project.pbxproj +++ b/Meshtastic.xcodeproj/project.pbxproj @@ -767,6 +767,7 @@ children = ( DDD5BB0E2C285F92007E03CA /* Logs */, DD93800C2BA74CE3008BEC06 /* Channels */, + DD61937A2863876A00E59241 /* Config */, DD97E96728EFE9A00056DDA4 /* About.swift */, DDD5BB152C28B1E4007E03CA /* AppData.swift */, DDD5BB082C285DDC007E03CA /* AppLog.swift */, @@ -780,7 +781,6 @@ DD3501882852FC3B000FC853 /* Settings.swift */, DD3CC6B428E33FD100FA9159 /* ShareChannels.swift */, DDCE4E2B2869F92900BE9F8F /* UserConfig.swift */, - DD61937A2863876A00E59241 /* Config */, DD1B8F3F2B35E2F10022AABC /* GPSStatus.swift */, ); path = Settings; @@ -801,6 +801,7 @@ DD61937A2863876A00E59241 /* Config */ = { isa = PBXGroup; children = ( + DD61937B2863877A00E59241 /* Module */, D93068DC2B81CA820066FBC8 /* ConfigHeader.swift */, D93069072B81DF040066FBC8 /* SaveConfigButton.swift */, DDB6ABD528AE742000384BA1 /* BluetoothConfig.swift */, @@ -811,7 +812,6 @@ DD2553582855B52700E55709 /* PositionConfig.swift */, D93068DA2B81C85E0066FBC8 /* PowerConfig.swift */, DD1BD0F22C63C65E008C0C70 /* SecurityConfig.swift */, - DD61937B2863877A00E59241 /* Module */, ); path = Config; sourceTree = ""; @@ -1807,7 +1807,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.6.4; + MARKETING_VERSION = 2.6.5; PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = YES; @@ -1840,7 +1840,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.6.4; + MARKETING_VERSION = 2.6.5; PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = YES; @@ -1871,7 +1871,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.6.4; + MARKETING_VERSION = 2.6.5; PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1903,7 +1903,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.6.4; + MARKETING_VERSION = 2.6.5; PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/Meshtastic/Views/Settings/Config/NetworkConfig.swift b/Meshtastic/Views/Settings/Config/NetworkConfig.swift index c4dcb8f2..57270f65 100644 --- a/Meshtastic/Views/Settings/Config/NetworkConfig.swift +++ b/Meshtastic/Views/Settings/Config/NetworkConfig.swift @@ -37,7 +37,7 @@ struct NetworkConfig: View { Toggle(isOn: $wifiEnabled) { Label("Enabled", systemImage: "wifi") - Text("Enabling WiFi will disable the bluetooth connection to the app.") + Text("Enabling WiFi will disable the bluetooth connection to the app. TCP node connections are not available on Apple devices.") } .toggleStyle(SwitchToggleStyle(tint: .accentColor)) @@ -83,9 +83,9 @@ struct NetworkConfig: View { Section(header: Text("Ethernet Options")) { Toggle(isOn: $ethEnabled) { Label("Enabled", systemImage: "network") - Text("Enabling Ethernet will disable the bluetooth connection to the app.") + Text("Enabling Ethernet will disable the bluetooth connection to the app. TCP node connections are not available on Apple devices.") } - .toggleStyle(SwitchToggleStyle(tint: .accentColor)) + .tint(.accentColor) } } @@ -95,6 +95,7 @@ struct NetworkConfig: View { Label("Enabled", systemImage: "point.3.connected.trianglepath.dotted") Text("Enable broadcasting packets via UDP over the local network.") } + .tint(.accentColor) } } }