Merge pull request #253 from meshtastic/2.0.6_Working_Changes

2.0.6 working changes

Meshtastic/Views/Messages/ChannelMessageList.swift

@@ -29,7 +29,6 @@ struct ChannelMessageList: View {
 	@State private var deleteMessageId: Int64 = 0
 	@State private var replyMessageId: Int64 = 0
 	@State private var sendPositionWithMessage: Bool = false
-	//@State private var refreshId = UUID()
 
 	var body: some View {
 		NavigationStack {
@@ -218,13 +217,11 @@ struct ChannelMessageList: View {
 				.scrollDismissesKeyboard(.immediately)
 				.onAppear(perform: {
 					self.bleManager.context = context
-				//	refreshId = UUID()
 					if channel.allPrivateMessages.count > 0 {
 						scrollView.scrollTo(channel.allPrivateMessages.last!.messageId)
 					}
 				})
 				.onChange(of: channel.allPrivateMessages, perform: { messages in
-				//	refreshId = UUID()
 					if channel.allPrivateMessages.count > 0 {
 						scrollView.scrollTo(channel.allPrivateMessages.last!.messageId)
 					}
@@ -337,7 +334,6 @@ struct ChannelMessageList: View {
 			}
 			.padding(.all, 15)
 		}
-		.navigationViewStyle(.stack)
 		.navigationBarTitleDisplayMode(.inline)
 		.toolbar {
 			ToolbarItem(placement: .principal) {

Meshtastic/Views/Messages/Contacts.swift

@@ -89,7 +89,10 @@ struct Contacts: View {
 										
 										do {
 											try context.save()
-											self.context.refresh(channel, mergeChanges: true)
+											// Would rather not do this but the merge changes on
+											// A single object is only working on mac GVH
+											context.refreshAllObjects()
+											//context.refresh(channel, mergeChanges: true)
 										} catch {
 											context.rollback()
 											print("💥 Save Channel Mute Error")

Meshtastic/Views/Messages/UserMessageList.swift

@@ -329,7 +329,6 @@ struct UserMessageList: View {
 			}
 			.padding(.all, 15)
 		}
-		.navigationViewStyle(.stack)
 		.navigationBarTitleDisplayMode(.inline)
 		.toolbar {
 			ToolbarItem(placement: .principal) {

Meshtastic/Views/Settings/Config/BluetoothConfig.swift

@@ -151,6 +151,5 @@ struct BluetoothConfig: View {
 				if newFixedPin != String(node!.bluetoothConfig!.fixedPin) { hasChanges = true }
 			}
 		}
-		.navigationViewStyle(StackNavigationViewStyle())
 	}
 }

Meshtastic/Views/Settings/Config/DeviceConfig.swift

@@ -192,6 +192,5 @@ struct DeviceConfig: View {
 				if newDebugLog != node!.deviceConfig!.debugLogEnabled {	hasChanges = true }
 			}
 		}
-		.navigationViewStyle(StackNavigationViewStyle())
 	}
 }

Meshtastic/Views/Settings/Config/DisplayConfig.swift

@@ -161,6 +161,5 @@ struct DisplayConfig: View {
 				if newFlipScreen != node!.displayConfig!.flipScreen { hasChanges = true }
 			}
 		}
-		.navigationViewStyle(StackNavigationViewStyle())
 	}
 }

Meshtastic/Views/Settings/Config/LoRaConfig.swift

@@ -127,6 +127,5 @@ struct LoRaConfig: View {
 				if newHopLimit != node!.loRaConfig!.hopLimit { hasChanges = true }
 			}
 		}
-		.navigationViewStyle(StackNavigationViewStyle())
 	}
 }

Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift

@@ -361,7 +361,6 @@ struct CannedMessagesConfig: View {
 					if newKeyPress != node!.cannedMessageConfig!.inputbrokerEventPress { hasChanges = true }
 				}
 			}
-			.navigationViewStyle(StackNavigationViewStyle())
 		}
 	}
 }

Meshtastic/Views/Settings/Config/Module/ExternalNotificationConfig.swift

@@ -203,7 +203,6 @@ struct ExternalNotificationConfig: View {
 					if newUsePWM != node!.externalNotificationConfig!.usePWM { hasChanges = true }
 				}
 			}
-			.navigationViewStyle(StackNavigationViewStyle())
 		}
 	}
 }

Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift

@@ -212,6 +212,5 @@ struct MQTTConfig: View {
 				if newJsonEnabled != node!.mqttConfig!.jsonEnabled { hasChanges = true }
 			}
 		}
-		.navigationViewStyle(StackNavigationViewStyle())
 	}
 }

Meshtastic/Views/Settings/Config/Module/RangeTestConfig.swift

@@ -141,7 +141,6 @@ struct RangeTestConfig: View {
 					if newSender != node!.rangeTestConfig!.sender { hasChanges = true }
 				}
 			}
-			.navigationViewStyle(StackNavigationViewStyle())
 		}
 	}
 }

Meshtastic/Views/Settings/Config/Module/SerialConfig.swift

@@ -217,7 +217,6 @@ struct SerialConfig: View {
 					if newMode != node!.serialConfig!.mode { hasChanges = true	}
 				}
 			}
-			.navigationViewStyle(StackNavigationViewStyle())
 		}
 	}
 }

Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift

@@ -193,7 +193,6 @@ struct TelemetryConfig: View {
 					if newEnvDisplayF != node!.telemetryConfig!.environmentDisplayFahrenheit { hasChanges = true	}
 				}
 			}
-			.navigationViewStyle(StackNavigationViewStyle())
 		}
 	}
 }

Meshtastic/Views/Settings/Config/NetworkConfig.swift

@@ -168,6 +168,5 @@ struct NetworkConfig: View {
 				if newEthEnabled != node!.networkConfig!.ethEnabled { hasChanges = true }
 			}
 		}
-		.navigationViewStyle(StackNavigationViewStyle())
 	}
 }

Meshtastic/Views/Settings/UserConfig.swift

@@ -119,6 +119,5 @@ struct UserConfig: View {
 				if newLong != node?.user!.longName { hasChanges = true }
 			}
 		}
-		.navigationViewStyle(StackNavigationViewStyle())
 	}
 }