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

Remove more user settings

Browse source
This commit is contained in:
Garth Vander Houwen 2023-04-26 10:25:39 -07:00
parent c27798d036
commit 04a337d34f
4 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Meshtastic/Views/Map/Custom/MapViewSwiftUI.swift
View file

@ -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 {

4
Meshtastic/Views/Messages/ChannelMessageList.swift
View file

@ -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 {

1
Meshtastic/Views/Messages/Contacts.swift
View file

@ -135,7 +135,6 @@ struct Contacts: View {
}
}
.padding([.top, .bottom])
}
}
Section(header: Text("direct.messages")) {

4
Meshtastic/Views/Messages/UserMessageList.swift
View file

@ -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."
}