[TouchRunner] Fix colors for iOS 13 dark mode (#53)

xamarin · Sep 13, 2019 · d22825a · d22825a
1 parent de42aa3
commit d22825a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/NUnitLite/TouchRunner/TestCaseElement.cs b/NUnitLite/TouchRunner/TestCaseElement.cs
@@ -84,7 +84,7 @@ public override void Update ()
 		{
 			if (Result.IsIgnored ()) {
 				Value = Result.GetMessage ();
-				DetailColor = UIColor.Orange;
+				DetailColor = Orange;
 			} else if (Result.IsSuccess () || Result.IsInconclusive ()) {
 				int counter = Result.AssertCount;
 				Value = String.Format ("{0} {1} ms for {2} assertion{3}",
@@ -94,7 +94,7 @@ public override void Update ()
 				DetailColor = DarkGreen;
 			} else if (Result.IsFailure ()) {
 				Value = Result.GetMessage ();
-				DetailColor = UIColor.Red;
+				DetailColor = Red;
 			} else {
 				// Assert.Ignore falls into this
 				Value = Result.GetMessage ();

diff --git a/NUnitLite/TouchRunner/TestElement.cs b/NUnitLite/TouchRunner/TestElement.cs
@@ -35,7 +35,9 @@ namespace MonoTouch.NUnit.UI {
 
 	abstract class TestElement : StyledMultilineElement {
 
-		static internal UIColor DarkGreen = UIColor.FromRGB (0x00, 0x77, 0x00);
+		static internal UIColor DarkGreen = UIDevice.CurrentDevice.CheckSystemVersion (13, 0) ? UIColor.SystemGreenColor : UIColor.FromRGB (0x00, 0x77, 0x00);
+		static internal UIColor Orange = UIDevice.CurrentDevice.CheckSystemVersion (13, 0) ? UIColor.SystemOrangeColor : UIColor.Orange;
+		static internal UIColor Red = UIDevice.CurrentDevice.CheckSystemVersion (13, 0) ? UIColor.SystemRedColor : UIColor.Red;
 
 		private TestResult result;
 
@@ -46,7 +48,10 @@ public TestElement (ITest test, TouchRunner runner)
 				throw new ArgumentNullException ("test");
 			if (runner == null)
 				throw new ArgumentNullException ("runner");
-
+
+			if (UIDevice.CurrentDevice.CheckSystemVersion (13, 0)) {
+				TextColor = UIColor.LabelColor;
+			}
 			Test = test;
 			Runner = runner;
 		}

diff --git a/NUnitLite/TouchRunner/TestSuiteElement.cs b/NUnitLite/TouchRunner/TestSuiteElement.cs
@@ -48,7 +48,7 @@ public TestSuiteElement (TestSuite test, TouchRunner runner)
 					runner.Show (Suite);
 				};
 			} else {
-				DetailColor = UIColor.Orange;
+				DetailColor = Orange;
 				Value = "No test was found inside this suite";
 			}
 		}
@@ -75,7 +75,7 @@ public override void Update ()
 				if (positive > 1)
 					sb.Append ('s');
 			} else {
-				DetailColor = UIColor.Red;
+				DetailColor = Red;
 				if (positive > 0)
 					sb.Append (positive).Append (" success");
 				if (sb.Length > 0)