Upgrade to .NET8

.github/workflows/cd-action.yml

@@ -29,7 +29,7 @@ env:
   PKG_PATH: ./out/TRViS.pkg
   AAB_PATH: ./out/dev.t0r.trvis-Signed.aab
   APK_PATH: ./out/dev.t0r.trvis-Signed.apk
-  SDK_VERSION: '8.0.100-preview.4.23260.5'
+  SDK_VERSION: '8.0.100'
   APP_CENTER_SECRETS_FILE_NAME: ./TRViS/AppCenterSecrets.cs
   IOS_DSYM_PATH: ./TRViS/bin/Release/net8.0-ios/ios-arm64
   IOS_DSYM_FILENAME: TRViS.app.dSYM
@@ -133,7 +133,7 @@ jobs:
         || github.event.pull_request.draft == false
       )
 
-    runs-on: macos-12
+    runs-on: macos-13
     timeout-minutes: 30
     needs:
       - get-version
@@ -337,7 +337,7 @@ jobs:
         || github.event.pull_request.draft == false
       )
 
-    runs-on: macos-12
+    runs-on: macos-13
     timeout-minutes: 30
     needs:
       - get-version
@@ -581,7 +581,6 @@ jobs:
         needs.publish-ios.result == 'success'
         || needs.publish-mac.result == 'success'
       )
-      && !failure()
 
     runs-on: ubuntu-latest
     timeout-minutes: 5

TRViS.IO.Tests/TRViS.IO.Tests.csproj

@@ -9,10 +9,10 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.1" />
-		<PackageReference Include="NUnit" Version="3.13.3" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+		<PackageReference Include="NUnit" Version="3.14.0" />
 		<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-		<PackageReference Include="NUnit.Analyzers" Version="3.6.1"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		<PackageReference Include="NUnit.Analyzers" Version="3.9.0"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 <PrivateAssets>all</PrivateAssets>
 </PackageReference>
 		<PackageReference Include="coverlet.collector" Version="6.0.0"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

TRViS.IO/TRViS.IO.csproj

@@ -8,7 +8,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="sqlite-net-pcl" Version="1.8.116" />
-		<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.5" />
-		<PackageReference Include="System.Text.Json" Version="7.0.2" />
+		<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.6" />
+		<PackageReference Include="System.Text.Json" Version="8.0.0" />
 	</ItemGroup>
 </Project>

TRViS/DTAC/BeforeAfterRemarks.cs

@@ -15,9 +15,6 @@ public BeforeAfterRemarks(Grid Parent)
 
 		IsVisible = false;
 
-		Grid.SetColumn(Label, 2);
-		Grid.SetColumnSpan(Label, 6);
-
 		Label.Margin = new(32, 0);
 		Label.HorizontalOptions = LayoutOptions.Start;
 		Label.LineHeight = 1.4;
@@ -47,6 +44,8 @@ public string Text
 
 	public void AddToParent()
 	{
+		Grid.SetColumn(Label, 2);
+		Grid.SetColumnSpan(Label, 6);
 		Parent.Add(Label);
 	}
 

TRViS/DTAC/BeforeDeparture_AfterArrive.cs

@@ -16,9 +16,6 @@ public class BeforeDeparture_AfterArrive
 	};
 	readonly Label HeaderLabel = DTACElementStyles.HeaderLabelStyle<Label>();
 
-	readonly Line UpperSeparator = DTACElementStyles.HorizontalSeparatorLineStyle();
-	readonly Line LowerSeparator = DTACElementStyles.HorizontalSeparatorLineStyle();
-
 	readonly HtmlAutoDetectLabel Label = DTACElementStyles.LabelStyle<HtmlAutoDetectLabel>();
 	readonly HtmlAutoDetectLabel Label_OnStationTrackColumn = DTACElementStyles.LabelStyle<HtmlAutoDetectLabel>();
 
@@ -39,17 +36,9 @@ public BeforeDeparture_AfterArrive(Grid Parent, string HeaderLabelText, bool Alw
 		this.Parent = Parent;
 		this.AlwaysShow = AlwaysShow;
 
-		UpperSeparator.VerticalOptions = LayoutOptions.Start;
-
 		Label.HorizontalOptions = LayoutOptions.Start;
 		Label_OnStationTrackColumn.HorizontalOptions = LayoutOptions.Start;
 
-		Grid.SetColumn(Label, 1);
-		Grid.SetColumnSpan(Label, 7);
-
-		Grid.SetColumn(Label_OnStationTrackColumn, 4);
-		Grid.SetColumnSpan(Label_OnStationTrackColumn, 4);
-
 		DTACElementStyles.HeaderTextColor.Apply(HeaderLabel, Microsoft.Maui.Controls.Label.TextColorProperty);
 		DTACElementStyles.HeaderBackgroundColor.Apply(HeaderBoxView, BoxView.ColorProperty);
 
@@ -99,10 +88,12 @@ public void AddToParent()
 	{
 		Parent.Add(HeaderBoxView);
 		Parent.Add(HeaderLabel);
+		Grid.SetColumn(Label, 1);
+		Grid.SetColumn(Label_OnStationTrackColumn, 4);
+		Grid.SetColumnSpan(Label, 7);
+		Grid.SetColumnSpan(Label_OnStationTrackColumn, 4);
 		Parent.Add(Label);
 		Parent.Add(Label_OnStationTrackColumn);
-		Parent.Add(LowerSeparator);
-		Parent.Add(UpperSeparator);
 	}
 
 	bool _IsVisible = false;
@@ -122,8 +113,6 @@ public bool IsVisible
 
 			HeaderBoxView.IsVisible
 				= HeaderLabel.IsVisible
-				= LowerSeparator.IsVisible
-				= UpperSeparator.IsVisible
 				= Label.IsVisible
 				= Label_OnStationTrackColumn.IsVisible
 				= value;
@@ -134,8 +123,6 @@ public void SetRow(in int row)
 	{
 		Grid.SetRow(HeaderBoxView, row);
 		Grid.SetRow(HeaderLabel, row);
-		Grid.SetRow(LowerSeparator, row);
-		Grid.SetRow(UpperSeparator, row);
 		Grid.SetRow(Label, row);
 		Grid.SetRow(Label_OnStationTrackColumn, row);
 	}

TRViS/DTAC/DTACElementStyles.cs

@@ -46,10 +46,14 @@ public static readonly AppThemeGenericsBindingExtension<Brush> MarkerMarkButtonB
 	);
 
 	public static readonly AppThemeColorBindingExtension ForegroundBlackWhite = genColor(0x00, 0xFF);
+	public static readonly AppThemeGenericsBindingExtension<Brush> ForegroundBlackWhiteBrush = ForegroundBlackWhite.ToBrushTheme();
 
 	public static readonly AppThemeColorBindingExtension LocationServiceSelectedSideFrameColor = genColor(0xFF, 0xAA);
+	public static readonly AppThemeColorBindingExtension LocationServiceSelectedSideDisabledFrameColor = genColor(0xDD, 0x99);
 	public static readonly AppThemeColorBindingExtension LocationServiceSelectedSideTextColor = genColor(0xFF, 0xDD);
+	public static readonly AppThemeColorBindingExtension LocationServiceNotSelectedSideTextColor = genColor(0x00, 0x00);
 	public static readonly AppThemeColorBindingExtension LocationServiceNotSelectedSideBaseColor = genColor(0xFF, 0xDD);
+	public static readonly AppThemeColorBindingExtension LocationServiceNotSelectedSideDisabledBaseColor = genColor(0xDD, 0x99);
 
 	public static readonly AppThemeColorBindingExtension StartEndRunButtonTextColor = genColor(0xFF, 0xE0);
 
@@ -84,6 +88,28 @@ public static readonly AppThemeGenericsBindingExtension<Brush> MarkerMarkButtonB
 		new(new(64))
 		);
 
+	static Style? _labelStyleResource = null;
+	public static Style LabelStyleResource
+	{
+		get
+		{
+			if (_labelStyleResource is not null)
+				return _labelStyleResource;
+
+			_labelStyleResource = new Style(typeof(Label));
+			_labelStyleResource.Setters.Add(Label.HorizontalOptionsProperty, LayoutOptions.Center);
+			_labelStyleResource.Setters.Add(Label.VerticalOptionsProperty, LayoutOptions.Center);
+			_labelStyleResource.Setters.Add(Label.TextColorProperty, DefaultTextColor);
+			_labelStyleResource.Setters.Add(Label.FontSizeProperty, DefaultTextSize);
+			_labelStyleResource.Setters.Add(Label.FontFamilyProperty, DefaultFontFamily);
+			_labelStyleResource.Setters.Add(Label.MarginProperty, new Thickness(4, 0));
+			_labelStyleResource.Setters.Add(Label.LineBreakModeProperty, LineBreakMode.CharacterWrap);
+			_labelStyleResource.Setters.Add(Label.LineHeightProperty, DeviceInfo.Platform == DevicePlatform.Android ? 0.9 : 1.1);
+
+			return _labelStyleResource;
+		}
+	}
+
 	public static T LabelStyle<T>() where T : Label, new()
 	{
 		T v = new();
@@ -101,6 +127,25 @@ public static readonly AppThemeGenericsBindingExtension<Brush> MarkerMarkButtonB
 		return v;
 	}
 
+	static Style? _headerLabelStyleResource = null;
+	public static Style HeaderLabelStyleResource
+	{
+		get
+		{
+			if (_headerLabelStyleResource is not null)
+				return _headerLabelStyleResource;
+
+			_headerLabelStyleResource = new Style(typeof(Label))
+			{
+					BasedOn = LabelStyleResource
+			};
+
+			_headerLabelStyleResource.Setters.Add(Label.TextColorProperty, HeaderTextColor);
+			_headerLabelStyleResource.Setters.Add(Label.MarginProperty, new Thickness(1));
+
+			return _headerLabelStyleResource;
+		}
+	}
 	public static T HeaderLabelStyle<T>() where T : Label, new()
 	{
 		T v = LabelStyle<T>();
@@ -146,6 +191,27 @@ public static readonly AppThemeGenericsBindingExtension<Brush> MarkerMarkButtonB
 		return v;
 	}
 
+	static Style? _timetableLabelStyleResource = null;
+	public static Style TimetableLabelStyleResource
+	{
+		get
+		{
+			if (_timetableLabelStyleResource is not null)
+				return _timetableLabelStyleResource;
+
+			_timetableLabelStyleResource = new Style(typeof(Label))
+			{
+				BasedOn = LabelStyleResource
+			};
+
+			_timetableLabelStyleResource.Setters.Add(Label.TextColorProperty, TimetableTextColor);
+			_timetableLabelStyleResource.Setters.Add(Label.FontSizeProperty, DeviceInfo.Current.Platform == DevicePlatform.iOS ? 28 : 26);
+			_timetableLabelStyleResource.Setters.Add(Label.FontAttributesProperty, FontAttributes.Bold);
+			_timetableLabelStyleResource.Setters.Add(Label.InputTransparentProperty, true);
+
+			return _timetableLabelStyleResource;
+		}
+	}
 	public static T TimetableLabel<T>() where T : Label, new()
 	{
 		T v = LabelStyle<T>();
@@ -158,6 +224,26 @@ public static readonly AppThemeGenericsBindingExtension<Brush> MarkerMarkButtonB
 		return v;
 	}
 
+	static Style? _timetableLargeNumberLabelStyleResource = null;
+	public static Style TimetableLargeNumberLabelStyleResource
+	{
+		get
+		{
+			if (_timetableLargeNumberLabelStyleResource is not null)
+				return _timetableLargeNumberLabelStyleResource;
+
+			_timetableLargeNumberLabelStyleResource = new Style(typeof(Label))
+			{
+				BasedOn = TimetableLabelStyleResource
+			};
+
+			_timetableLargeNumberLabelStyleResource.Setters.Add(Label.FontFamilyProperty, TimetableNumFontFamily);
+			_timetableLargeNumberLabelStyleResource.Setters.Add(Label.VerticalOptionsProperty, LayoutOptions.End);
+			_timetableLargeNumberLabelStyleResource.Setters.Add(Label.LineBreakModeProperty, LineBreakMode.NoWrap);
+
+			return _timetableLargeNumberLabelStyleResource;
+		}
+	}
 	public static T TimetableLargeNumberLabel<T>() where T : Label, new()
 	{
 		T v = TimetableLabel<T>();
@@ -203,6 +289,25 @@ public static readonly AppThemeGenericsBindingExtension<Brush> MarkerMarkButtonB
 		return v;
 	}
 
+	static Style? _timetableDefaultNumberLabelStyleResource = null;
+	public static Style TimetableDefaultNumberLabelStyleResource
+	{
+		get
+		{
+			if (_timetableDefaultNumberLabelStyleResource is not null)
+				return _timetableDefaultNumberLabelStyleResource;
+
+			_timetableDefaultNumberLabelStyleResource = new Style(typeof(Label))
+			{
+				BasedOn = TimetableLargeNumberLabelStyleResource
+			};
+
+			_timetableDefaultNumberLabelStyleResource.Setters.Add(Label.FontSizeProperty, 16);
+			_timetableDefaultNumberLabelStyleResource.Setters.Add(Label.MarginProperty, new Thickness(1, 3));
+
+			return _timetableDefaultNumberLabelStyleResource;
+		}
+	}
 	public static T TimetableDefaultNumberLabel<T>() where T : Label, new()
 	{
 		T v = TimetableLabel<T>();
@@ -213,19 +318,80 @@ public static readonly AppThemeGenericsBindingExtension<Brush> MarkerMarkButtonB
 		return v;
 	}
 
+	static readonly AppThemeGenericsBindingExtension<Brush> SeparatorLineBrush = SeparatorLineColor.ToBrushTheme();
+	static Style? _horizontalSeparatorLineStyleResource = null;
+	public static Style HorizontalSeparatorLineStyleResource
+	{
+		get
+		{
+			if (_horizontalSeparatorLineStyleResource is not null)
+				return _horizontalSeparatorLineStyleResource;
+
+			_horizontalSeparatorLineStyleResource = new Style(typeof(Line));
+
+			_horizontalSeparatorLineStyleResource.Setters.Add(Line.VerticalOptionsProperty, LayoutOptions.End);
+			_horizontalSeparatorLineStyleResource.Setters.Add(Line.StrokeThicknessProperty, 0.5);
+			_horizontalSeparatorLineStyleResource.Setters.Add(Line.HeightRequestProperty, 0.5);
+			_horizontalSeparatorLineStyleResource.Setters.Add(Line.StrokeProperty, SeparatorLineBrush.Default);
+			_horizontalSeparatorLineStyleResource.Setters.Add(Grid.ColumnSpanProperty, 8);
+			_horizontalSeparatorLineStyleResource.Setters.Add(Line.X1Property, 0);
+			_horizontalSeparatorLineStyleResource.Setters.Add(Line.X2Property, 10000);
+
+			return _horizontalSeparatorLineStyleResource;
+		}
+	}
+	static Style? _verticalSeparatorLineStyleResource = null;
+	public static Style VerticalSeparatorLineStyleResource
+	{
+		get
+		{
+			if (_verticalSeparatorLineStyleResource is not null)
+				return _verticalSeparatorLineStyleResource;
+
+			_verticalSeparatorLineStyleResource = new Style(typeof(Line));
+
+			_verticalSeparatorLineStyleResource.Setters.Add(Line.HorizontalOptionsProperty, LayoutOptions.End);
+			_verticalSeparatorLineStyleResource.Setters.Add(Line.MarginProperty, new Thickness(0, 6));
+			_verticalSeparatorLineStyleResource.Setters.Add(Line.StrokeProperty, SeparatorLineBrush.Default);
+			_verticalSeparatorLineStyleResource.Setters.Add(Line.StrokeThicknessProperty, 1);
+			_verticalSeparatorLineStyleResource.Setters.Add(Line.WidthRequestProperty, 1);
+			_verticalSeparatorLineStyleResource.Setters.Add(Line.Y1Property, 0);
+			_verticalSeparatorLineStyleResource.Setters.Add(Line.Y2Property, 100);
+
+			return _verticalSeparatorLineStyleResource;
+		}
+	}
 	public static Line HorizontalSeparatorLineStyle()
 	{
-		Line v = new();
+		Line v = new()
+		{
+			VerticalOptions = LayoutOptions.End,
+			StrokeThickness = 0.5,
+			HeightRequest = 0.5,
+			X1 = 0,
+			X2 = 10000,
+		};
 
-		v.VerticalOptions = LayoutOptions.End;
-		SeparatorLineColor.Apply(v, Line.BackgroundColorProperty);
-		v.StrokeThickness = 0.5;
-		v.HeightRequest = 0.5;
+		SeparatorLineBrush.Apply(v, Line.StrokeProperty);
 
-		Grid.SetColumnSpan(v, 8);
+		return v;
+	}
+	public static Line TimetableRowHorizontalSeparatorLineStyle()
+	{
+		Line v = HorizontalSeparatorLineStyle();
+
+		v.Opacity = 0.5;
 
 		return v;
 	}
+	public static void AddTimetableRowHorizontalSeparatorLineStyle(Grid grid, int row)
+		=> AddHorizontalSeparatorLineStyle(grid, TimetableRowHorizontalSeparatorLineStyle(), row);
+	public static void AddHorizontalSeparatorLineStyle(Grid grid, Line line, int row)
+	{
+		Grid.SetRow(line, row);
+		Grid.SetColumnSpan(line, 8);
+		grid.Add(line);
+	}
 
 	public static TimeCell TimeCell()
 	{
@@ -258,6 +424,7 @@ public static Grid LastStopLineGrid()
 		return v;
 	}
 
+	static readonly AppThemeGenericsBindingExtension<Brush> LastStopLineBrush = TimetableTextColor.ToBrushTheme();
 	public static Line LastStopLine()
 	{
 		Line v = new()
@@ -272,7 +439,7 @@ public static Line LastStopLine()
 			HorizontalOptions = LayoutOptions.Center,
 		};
 
-		TimetableTextColor.Apply(v, Line.BackgroundColorProperty);
+		LastStopLineBrush.Apply(v, Line.StrokeProperty);
 
 		return v;
 	}