diff --git a/Xamarin.Essentials/Accelerometer/Accelerometer.shared.cs b/Xamarin.Essentials/Accelerometer/Accelerometer.shared.cs index 835919904..74749f49a 100644 --- a/Xamarin.Essentials/Accelerometer/Accelerometer.shared.cs +++ b/Xamarin.Essentials/Accelerometer/Accelerometer.shared.cs @@ -101,6 +101,8 @@ public override int GetHashCode() => Acceleration.GetHashCode(); public override string ToString() => - $"X: {Acceleration.X}, Y: {Acceleration.Y}, Z: {Acceleration.Z}"; + $"{nameof(Acceleration.X)}: {Acceleration.X}, " + + $"{nameof(Acceleration.Y)}: {Acceleration.Y}, " + + $"{nameof(Acceleration.Z)}: {Acceleration.Z}"; } } diff --git a/Xamarin.Essentials/Barometer/Barometer.shared.cs b/Xamarin.Essentials/Barometer/Barometer.shared.cs index 95ff6ac9a..c3677f973 100644 --- a/Xamarin.Essentials/Barometer/Barometer.shared.cs +++ b/Xamarin.Essentials/Barometer/Barometer.shared.cs @@ -95,6 +95,6 @@ public bool Equals(BarometerData other) => public override int GetHashCode() => Pressure.GetHashCode(); - public override string ToString() => $"Pressure: {Pressure}"; + public override string ToString() => $"{nameof(Pressure)}: {Pressure}"; } } diff --git a/Xamarin.Essentials/Battery/Battery.shared.cs b/Xamarin.Essentials/Battery/Battery.shared.cs index c9745528c..6d117b0ca 100644 --- a/Xamarin.Essentials/Battery/Battery.shared.cs +++ b/Xamarin.Essentials/Battery/Battery.shared.cs @@ -102,6 +102,8 @@ internal BatteryChangedEventArgs(double level, BatteryState state, BatteryPowerS public BatteryPowerSource PowerSource { get; } public override string ToString() => - $"ChargeLevel: {ChargeLevel}, State: {State}, PowerSource: {PowerSource}"; + $"{nameof(ChargeLevel)}: {ChargeLevel}, " + + $"{nameof(State)}: {State}, " + + $"{nameof(PowerSource)}: {PowerSource}"; } } diff --git a/Xamarin.Essentials/Compass/Compass.shared.cs b/Xamarin.Essentials/Compass/Compass.shared.cs index 3b30479ad..658dcace2 100644 --- a/Xamarin.Essentials/Compass/Compass.shared.cs +++ b/Xamarin.Essentials/Compass/Compass.shared.cs @@ -98,6 +98,6 @@ public override int GetHashCode() => HeadingMagneticNorth.GetHashCode(); public override string ToString() => - $"HeadingMagneticNorth: {HeadingMagneticNorth}"; + $"{nameof(HeadingMagneticNorth)}: {HeadingMagneticNorth}"; } } diff --git a/Xamarin.Essentials/Connectivity/Connectivity.shared.cs b/Xamarin.Essentials/Connectivity/Connectivity.shared.cs index 08c860f4c..56e198b1e 100644 --- a/Xamarin.Essentials/Connectivity/Connectivity.shared.cs +++ b/Xamarin.Essentials/Connectivity/Connectivity.shared.cs @@ -78,6 +78,7 @@ internal ConnectivityChangedEventArgs(NetworkAccess access, IEnumerable Profiles { get; } public override string ToString() => - $"NetworkAccess: {NetworkAccess}, Profiles: [{string.Join(", ", Profiles)}]"; + $"{nameof(NetworkAccess)}: {NetworkAccess}, " + + $"{nameof(Profiles)}: [{string.Join(", ", Profiles)}]"; } } diff --git a/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.shared.cs b/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.shared.cs index a5b4e6e9d..cf878627e 100644 --- a/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.shared.cs +++ b/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.shared.cs @@ -102,7 +102,9 @@ public override int GetHashCode() => (Height, Width, Density, Orientation, Rotation).GetHashCode(); public override string ToString() => - $"Height: {Height}, Width: {Width}, Density: {Density}, Orientation: {Orientation}, Rotation: {Rotation}"; + $"{nameof(Height)}: {Height}, {nameof(Width)}: {Width}, " + + $"{nameof(Density)}: {Density}, {nameof(Orientation)}: {Orientation}, " + + $"{nameof(Rotation)}: {Rotation}"; } public enum ScreenOrientation diff --git a/Xamarin.Essentials/Geolocation/GeolocationRequest.shared.cs b/Xamarin.Essentials/Geolocation/GeolocationRequest.shared.cs index 555d4a73f..30a906f1e 100644 --- a/Xamarin.Essentials/Geolocation/GeolocationRequest.shared.cs +++ b/Xamarin.Essentials/Geolocation/GeolocationRequest.shared.cs @@ -55,6 +55,6 @@ public GeolocationRequest(GeolocationAccuracy accuracy, TimeSpan timeout) public GeolocationAccuracy DesiredAccuracy { get; set; } public override string ToString() => - $"DesiredAccuracy: {DesiredAccuracy}, Timeout: {Timeout}"; + $"{nameof(DesiredAccuracy)}: {DesiredAccuracy}, {nameof(Timeout)}: {Timeout}"; } } diff --git a/Xamarin.Essentials/Gyroscope/Gyroscope.shared.cs b/Xamarin.Essentials/Gyroscope/Gyroscope.shared.cs index edcf4595b..3a78b2904 100644 --- a/Xamarin.Essentials/Gyroscope/Gyroscope.shared.cs +++ b/Xamarin.Essentials/Gyroscope/Gyroscope.shared.cs @@ -102,6 +102,8 @@ public override int GetHashCode() => AngularVelocity.GetHashCode(); public override string ToString() => - $"X: {AngularVelocity.X}, Y: {AngularVelocity.Y}, Z: {AngularVelocity.Z}"; + $"{nameof(AngularVelocity.X)}: {AngularVelocity.X}, " + + $"{nameof(AngularVelocity.Y)}: {AngularVelocity.Y}, " + + $"{nameof(AngularVelocity.Z)}: {AngularVelocity.Z}"; } } diff --git a/Xamarin.Essentials/Magnetometer/Magnetometer.shared.cs b/Xamarin.Essentials/Magnetometer/Magnetometer.shared.cs index d66fdbcee..e16e58553 100644 --- a/Xamarin.Essentials/Magnetometer/Magnetometer.shared.cs +++ b/Xamarin.Essentials/Magnetometer/Magnetometer.shared.cs @@ -102,6 +102,8 @@ public override int GetHashCode() => MagneticField.GetHashCode(); public override string ToString() => - $"X: {MagneticField.X}, Y: {MagneticField.Y}, Z: {MagneticField.Z}"; + $"{nameof(MagneticField.X)}: {MagneticField.X}, " + + $"{nameof(MagneticField.Y)}: {MagneticField.Y}, " + + $"{nameof(MagneticField.Z)}: {MagneticField.Z}"; } } diff --git a/Xamarin.Essentials/OrientationSensor/OrientationSensor.shared.cs b/Xamarin.Essentials/OrientationSensor/OrientationSensor.shared.cs index 8d11a0331..4badd4dcc 100644 --- a/Xamarin.Essentials/OrientationSensor/OrientationSensor.shared.cs +++ b/Xamarin.Essentials/OrientationSensor/OrientationSensor.shared.cs @@ -102,6 +102,9 @@ public override int GetHashCode() => Orientation.GetHashCode(); public override string ToString() => - $"X: {Orientation.X}, Y: {Orientation.Y}, Z: {Orientation.Z}, W: {Orientation.W}"; + $"{nameof(Orientation.X)}: {Orientation.X}, " + + $"{nameof(Orientation.Y)}: {Orientation.Y}, " + + $"{nameof(Orientation.Z)}: {Orientation.Z}, " + + $"{nameof(Orientation.W)}: {Orientation.W}"; } } diff --git a/Xamarin.Essentials/Types/Placemark.shared.cs b/Xamarin.Essentials/Types/Placemark.shared.cs index b5e7940bf..0508d87ff 100644 --- a/Xamarin.Essentials/Types/Placemark.shared.cs +++ b/Xamarin.Essentials/Types/Placemark.shared.cs @@ -51,5 +51,13 @@ public Placemark(Placemark placemark) public string AdminArea { get; set; } public string SubAdminArea { get; set; } + + public override string ToString() => + $"{nameof(Location)}: {Location}, {nameof(CountryCode)}: {CountryCode}, " + + $"{nameof(CountryName)}: {CountryName}, {nameof(FeatureName)}: {FeatureName}, " + + $"{nameof(PostalCode)}: {PostalCode}, {nameof(SubLocality)}: {SubLocality}, " + + $"{nameof(Thoroughfare)}: {Thoroughfare}, {nameof(SubThoroughfare)}: {SubThoroughfare}, " + + $"{nameof(Locality)}: {Locality}, {nameof(AdminArea)}: {AdminArea}, " + + $"{nameof(SubAdminArea)}: {SubAdminArea}"; } }