From 04a337d34f11b84a1dc828dd8906c8e9298073d3 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Wed, 26 Apr 2023 10:25:39 -0700 Subject: [PATCH] Remove more user settings --- Meshtastic/Views/Map/Custom/MapViewSwiftUI.swift | 7 ++----- Meshtastic/Views/Messages/ChannelMessageList.swift | 4 ++-- Meshtastic/Views/Messages/Contacts.swift | 1 - Meshtastic/Views/Messages/UserMessageList.swift | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Meshtastic/Views/Map/Custom/MapViewSwiftUI.swift b/Meshtastic/Views/Map/Custom/MapViewSwiftUI.swift index 01d418a1..d3959646 100644 --- a/Meshtastic/Views/Map/Custom/MapViewSwiftUI.swift +++ b/Meshtastic/Views/Map/Custom/MapViewSwiftUI.swift @@ -23,15 +23,12 @@ struct MapViewSwiftUI: UIViewRepresentable { let userTrackingMode: MKUserTrackingMode let showNodeHistory: Bool let showRouteLines: Bool - // User Defaults - //@State var enableMapRecentering: Bool = UserDefaults.enableMapRecentering // Offline Map Tiles @AppStorage("lastUpdatedLocalMapFile") private var lastUpdatedLocalMapFile = 0 @State private var loadedLastUpdatedLocalMapFile = 0 var customMapOverlay: CustomMapOverlay? @State private var presentCustomMapOverlayHash: CustomMapOverlay? // Custom Tile Server - @AppStorage("meshMapCustomTileServer") private var tileServerUrl = "" var tileRenderer: MKTileOverlayRenderer? let tileServer: MapTileServerLinks = .openStreetMaps @@ -103,11 +100,11 @@ struct MapViewSwiftUI: UIViewRepresentable { // Offline maps and tile server settings if UserDefaults.enableOfflineMaps { - if tileServerUrl.count > 0 { + if UserDefaults.mapTileServer.count > 0 { tileRenderer?.alpha = 0.0 let overlays = mapView.overlays if mapView.mapType == .standard { - let overlay = MKTileOverlay(urlTemplate: tileServerUrl) + let overlay = MKTileOverlay(urlTemplate: UserDefaults.mapTileServer) if overlays.contains(where: {$0 is MKPolyline}) { mapView.addOverlay(overlay, level: .aboveLabels) if let poly_overlay = overlays.filter({$0 is MKPolyline}).first { diff --git a/Meshtastic/Views/Messages/ChannelMessageList.swift b/Meshtastic/Views/Messages/ChannelMessageList.swift index 10863799..e8d4b14e 100644 --- a/Meshtastic/Views/Messages/ChannelMessageList.swift +++ b/Meshtastic/Views/Messages/ChannelMessageList.swift @@ -248,9 +248,9 @@ struct ChannelMessageList: View { Button { let userLongName = bleManager.connectedPeripheral != nil ? bleManager.connectedPeripheral.longName : "Unknown" sendPositionWithMessage = true - if userSettings.meshtasticUsername.count > 0 { + if UserDefaults.meshtasticUsername.count > 0 { - typingMessage += "📍 " + userSettings.meshtasticUsername + " has shared their position with you from node " + userLongName + typingMessage += "📍 " + UserDefaults.meshtasticUsername + " has shared their position with you from node " + userLongName } else { diff --git a/Meshtastic/Views/Messages/Contacts.swift b/Meshtastic/Views/Messages/Contacts.swift index ad9b743c..f1f3dc9c 100644 --- a/Meshtastic/Views/Messages/Contacts.swift +++ b/Meshtastic/Views/Messages/Contacts.swift @@ -135,7 +135,6 @@ struct Contacts: View { } } .padding([.top, .bottom]) - } } Section(header: Text("direct.messages")) { diff --git a/Meshtastic/Views/Messages/UserMessageList.swift b/Meshtastic/Views/Messages/UserMessageList.swift index 59e97013..0a654061 100644 --- a/Meshtastic/Views/Messages/UserMessageList.swift +++ b/Meshtastic/Views/Messages/UserMessageList.swift @@ -242,8 +242,8 @@ struct UserMessageList: View { let userLongName = bleManager.connectedPeripheral != nil ? bleManager.connectedPeripheral.longName : "Unknown" sendPositionWithMessage = true - if userSettings.meshtasticUsername.count > 0 { - typingMessage = "📍 " + userSettings.meshtasticUsername + " has shared their position with you from node " + userLongName + " and requested a response with your position." + if UserDefaults.meshtasticUsername.count > 0 { + typingMessage = "📍 " + UserDefaults.meshtasticUsername + " has shared their position with you from node " + userLongName + " and requested a response with your position." } else { typingMessage = "📍 " + userLongName + " has shared their position and requested a response with your position." }