some random bugfixes

Author: Guerra24

LRReader.Shared/Models/App.cs

@@ -47,10 +47,11 @@ public class IdTabState : TabState
 		public IdTabState(Tab tab, string id) : base(tab) => Id = id;
 	}
 
-	public class ArchiveTabState(string id, int? page, bool wasOpen) : IdTabState(Tab.Archive, id)
+	public class ArchiveTabState(string id, int? page, bool wasOpen, List<string>? next) : IdTabState(Tab.Archive, id)
 	{
 		public int? Page { get; set; } = page;
 		public bool WasOpen { get; set; } = wasOpen;
+		public List<string>? Next { get; set; } = next;
 	}
 
 	public class SearchTabState(SearchState search) : TabState(Tab.SearchResults)

LRReader.Shared/Services/Archives.cs

@@ -195,7 +195,7 @@ private async Task Update(string path)
 
 		public bool HasArchive(string id) => Archives.ContainsKey(id);
 
-		public void OpenTab(Archive archive, bool switchToTab = true, IList<Archive>? next = null)
+		public void OpenTab(Archive archive, bool switchToTab = true, List<Archive>? next = null)
 		{
 			Tabs.OpenTab(Tab.Archive, switchToTab, archive, next);
 		}

LRReader.Shared/Services/Settings.cs

@@ -642,7 +642,7 @@ public enum ClearNewMode
 	}
 	public enum ArchiveStyle
 	{
-		Default, ThumbnailOnly, Compact, _InvalidIgnore = -1
+		Default, ThumbnailOnly, Compact
 	}
 
 	public enum SessionMode

LRReader.Shared/Services/Tabs.cs

@@ -23,6 +23,12 @@ public partial class TabsService : ObservableObject
 		[ObservableProperty]
 		private ICustomTab? _currentTab;
 
+		partial void OnCurrentTabChanged(ICustomTab? value)
+		{
+			// Try to keep memory under control
+			GC.Collect(1, GCCollectionMode.Forced, false, false);
+		}
+
 		[ObservableProperty]
 		[NotifyPropertyChangedFor("Windowed")]
 		private bool _fullscreen;

LRReader.Shared/ViewModels/ArchivePageViewModel.cs

@@ -25,7 +25,7 @@ public partial class ArchivePageViewModel : ArchiveBaseViewModel
 
 		[ObservableProperty]
 		[NotifyPropertyChangedFor("CanGoNext")]
-		private IList<Archive> _group = new List<Archive>();
+		private List<Archive> _group = new List<Archive>();
 
 		public bool CanGoNext => Group.Count != 0 && Group.ElementAtOrDefault(Group.IndexOf(Archive) + 1) != null;
 

LRReader.Shared/ViewModels/Base/ArchiveBaseViewModel.cs

@@ -254,7 +254,7 @@ private async Task TagClick(ArchiveTagsGroupTag tag)
 			}
 		}
 
-		public async Task OpenTab(IList<Archive> group)
+		public async Task OpenTab(List<Archive> group)
 		{
 			if (Archive.IsTank)
 			{

LRReader.Shared/ViewModels/SearchResultsViewModel.cs

@@ -66,20 +66,6 @@ public bool ControlsEnabled
 		[ObservableProperty]
 		private ArchiveStyle _archiveStyle;
 
-		partial void OnArchiveStyleChanged(ArchiveStyle value)
-		{
-			if (value != ArchiveStyle._InvalidIgnore)
-			{
-				var tmp = ArchiveList.ToList();
-				ArchiveList.Clear();
-				Dispatcher.Run(async () =>
-				{
-					foreach (var item in tmp)
-						await Dispatcher.RunAsync(() => ArchiveList.Add(item), 10);
-				});
-			}
-		}
-
 		public event Func<Task>? OnRefresh;
 
 		public SearchResultsViewModel(SettingsService settings, ArchivesService archives, IDispatcherService dispatcher, ApiService api, TabsService tabs)
@@ -198,5 +184,20 @@ public void Receive(DeleteArchiveMessage message)
 		{
 			ArchiveList.Remove(message.Value);
 		}
+
+		[RelayCommand]
+		private async Task ChangeStyle(ArchiveStyle style)
+		{
+			if (ArchiveStyle == style)
+				return;
+			ArchiveStyle = style;
+			var tmp = ArchiveList.ToList();
+			ArchiveList.Clear();
+			await Task.Run(async () =>
+			{
+				foreach (var item in tmp)
+					await Dispatcher.RunAsync(() => ArchiveList.Add(item), 10);
+			});
+		}
 	}
 }

LRReader.UWP/Converters/Converters.cs

@@ -153,8 +153,6 @@ public object Convert(object value, Type targetType, object parameter, string la
 
 		public object ConvertBack(object value, Type targetType, object parameter, string language)
 		{
-			if (!(bool)value)
-				return ArchiveStyle._InvalidIgnore;
 			return Enum.Parse<ArchiveStyle>((string)parameter);
 		}
 	}

LRReader.UWP/Views/Controls/ArchiveList.xaml

@@ -11,6 +11,7 @@
 	xmlns:services="using:LRReader.Shared.Services"
 	xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
 	xmlns:labs="using:CommunityToolkit.Labs.WinUI"
+	xmlns:helpers="using:LRReader.UWP.Helpers"
 	Loaded="UserControl_Loaded"
 	mc:Ignorable="d">
 
@@ -84,9 +85,9 @@
 									<Button ToolTipService.ToolTip="{ext:LangString Key=Settings/General/ArchivesStyle/Title}" Padding="8" IsEnabled="{x:Bind Data.ControlsEnabled, Mode=OneWay}" Visibility="{x:Bind ArchiveStyleButtonVisibility, Mode=OneWay}">
 										<Button.Flyout>
 											<MenuFlyout>
-												<muxc:RadioMenuFlyoutItem IsChecked="{x:Bind Data.ArchiveStyle, Mode=TwoWay, Converter={StaticResource ArchiveStyleConverter}, ConverterParameter=Default}" GroupName="{x:Bind random}" Text="{ext:LangString Key=Settings/General/ArchiveStyle/Default}" />
-												<muxc:RadioMenuFlyoutItem IsChecked="{x:Bind Data.ArchiveStyle, Mode=TwoWay, Converter={StaticResource ArchiveStyleConverter}, ConverterParameter=ThumbnailOnly}" GroupName="{x:Bind random}" Text="{ext:LangString Key=Settings/General/ArchiveStyle/ThumbnailOnly}" />
-												<muxc:RadioMenuFlyoutItem IsChecked="{x:Bind Data.ArchiveStyle, Mode=TwoWay, Converter={StaticResource ArchiveStyleConverter}, ConverterParameter=Compact}" GroupName="{x:Bind random}" Text="{ext:LangString Key=Settings/General/ArchiveStyle/Compact}" />
+												<muxc:RadioMenuFlyoutItem IsChecked="{x:Bind Data.ArchiveStyle, Mode=OneWay, Converter={StaticResource ArchiveStyleConverter}, ConverterParameter=Default}" GroupName="{x:Bind random}" Command="{x:Bind Data.ChangeStyleCommand}" CommandParameter="{helpers:EnumValue Type=services:ArchiveStyle, Member=Default}" Text="{ext:LangString Key=Settings/General/ArchiveStyle/Default}" />
+												<muxc:RadioMenuFlyoutItem IsChecked="{x:Bind Data.ArchiveStyle, Mode=OneWay, Converter={StaticResource ArchiveStyleConverter}, ConverterParameter=ThumbnailOnly}" GroupName="{x:Bind random}" Command="{x:Bind Data.ChangeStyleCommand}" CommandParameter="{helpers:EnumValue Type=services:ArchiveStyle, Member=ThumbnailOnly}" Text="{ext:LangString Key=Settings/General/ArchiveStyle/ThumbnailOnly}" />
+												<muxc:RadioMenuFlyoutItem IsChecked="{x:Bind Data.ArchiveStyle, Mode=OneWay, Converter={StaticResource ArchiveStyleConverter}, ConverterParameter=Compact}" GroupName="{x:Bind random}" Command="{x:Bind Data.ChangeStyleCommand}" CommandParameter="{helpers:EnumValue Type=services:ArchiveStyle, Member=Compact}" Text="{ext:LangString Key=Settings/General/ArchiveStyle/Compact}" />
 											</MenuFlyout>
 										</Button.Flyout>
 										<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" FontSize="14" Glyph="&#xECA5;" />

LRReader.UWP/Views/Controls/ArchiveList.xaml.cs

@@ -174,7 +174,7 @@ private async void ArchivesGrid_PointerPressed(object sender, PointerRoutedEvent
 
 		public void Search(string query)
 		{
-			SearchBox.Text = this.query = query;
+			SearchBox.Text = Data.Query = this.query = query;
 		}
 
 		public void Search(Category category)