Base64 subscription fetcher works, some ui changes

WinWARP.Ui/Services/DialogService.cs

@@ -14,14 +14,10 @@ using WinWARP.Ui.Views.Dialogs;
 
 namespace WinWARP.Ui.Services;
 
-public class DialogService : IDialogService
+public class DialogService(XamlRootTracker tracker, ILocalizationService localizationService) : IDialogService
 {
-    private readonly XamlRootTracker _tracker;
-
-    public DialogService(XamlRootTracker tracker)
-    {
-        _tracker = tracker;
-    }
+    private readonly XamlRootTracker _tracker = tracker;
+    private readonly ILocalizationService _localizationService = localizationService;
 
     public async Task<(CommonDialogResult Result, string Title, string URL, int UpdateInterval)> ShowAddSubscriptionAsync()
     {
@@ -44,4 +40,17 @@ public class DialogService : IDialogService
 
         return (mappedResult, dialog.ViewModel.CustomName, dialog.ViewModel.SubscriptionLink, dialog.ViewModel.UpdateInterval);
     }
+
+    public async Task ShowErrorAsync(string message)
+    {
+        var dialog = new ContentDialog
+        {
+            Title = _localizationService.GetString("ErrorDialog.Title"),
+            Content = message,
+            CloseButtonText = _localizationService.GetString("ErrorDialog.CloseButtonText"),
+            XamlRoot = _tracker.XamlRoot,
+            Style = Application.Current.Resources["DefaultContentDialogStyle"] as Style
+        };
+        await dialog.ShowAsync();
+    }
 }

WinWARP.Ui/Strings/en-US/Resources.resw

@@ -267,4 +267,10 @@
   <data name="UpdateInterval_auto" xml:space="preserve">
     <value>Auto</value>
   </data>
+  <data name="ErrorDialog.CloseButtonText" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="ErrorDialog.Title" xml:space="preserve">
+    <value>Error occurred:</value>
+  </data>
 </root>

WinWARP.Ui/Strings/ru-RU/Resources.resw

@@ -267,4 +267,10 @@
   <data name="UpdateInterval_auto" xml:space="preserve">
     <value>Автоматически</value>
   </data>
+  <data name="ErrorDialog.CloseButtonText" xml:space="preserve">
+    <value>Ок</value>
+  </data>
+  <data name="ErrorDialog.Title" xml:space="preserve">
+    <value>Произошла ошибка:</value>
+  </data>
 </root>

WinWARP.Ui/Views/Components/ServerListElement.xaml

@@ -16,7 +16,7 @@
     <UserControl.Resources>
 
         <DataTemplate x:DataType="w:StandaloneServerViewModel" x:Key="StandaloneServerTemplate">
-            <StackPanel>
+            <StackPanel> 
             </StackPanel>
         </DataTemplate>
         <DataTemplate x:DataType="w:SubscriptionServerViewModel" x:Key="SubscriptionServerTemplate">
@@ -31,7 +31,9 @@
         </MenuFlyout>
     </UserControl.ContextFlyout>
 
-    <Grid MaxHeight="64">
+    <Grid MaxHeight="64" 
+          Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+          CornerRadius="4">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="64"/>
             <ColumnDefinition Width="*"/>
@@ -76,7 +78,7 @@
             </ItemsView.ItemTemplate>
         </ItemsView>
         <!--<TextBlock Grid.Column="1" Text="both server"/>-->
-        <!--<ContentPresenter Grid.Column="1" Grid.Row="1" Content="{x:Bind ServerData}" ContentTemplate="{x:Bind ChooseTemplate(ServerData), Mode=OneWay}"/>-->
+        <ContentPresenter Grid.Column="1" Grid.Row="1" Content="{x:Bind ServerData}" ContentTemplate="{x:Bind ChooseTemplate(ServerData), Mode=OneWay}"/>
     </Grid>
 
 </UserControl>

WinWARP.Ui/Views/SubsSettingsPage.xaml

@@ -11,6 +11,7 @@
     
     mc:Ignorable="d">
 
+    <ScrollView>
     <StackPanel>
         <Button Command="{x:Bind ViewModel.AddSubscriptionCommand}" Content="Add Subscription"/>
         <GridView ItemsSource="{x:Bind ViewModel.Servers}" SelectionMode="None">
@@ -28,4 +29,6 @@
         </GridView>
         <ProgressRing IsActive="{x:Bind ViewModel.ShowLoadingIndicator, Mode=OneWay}"/>
     </StackPanel>
+        
+    </ScrollView>
 </Page>

WinWARP.Ui/WinWARP.Ui.csproj

@@ -127,6 +127,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Folder Include="ViewModels\" />
     <Folder Include="Views\ConfigSettings\" />
   </ItemGroup>