Merge pull request #123 from 2fast-team/master

fix: Selected categories were not highlighted
2fast-team · Mar 23, 2024 · d452b3c · d452b3c
2 parents 352ca39 + 306290e
commit d452b3c
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 23 deletions.
diff --git a/Project2FA.Shared/Strings/de/Resources.resw b/Project2FA.Shared/Strings/de/Resources.resw
@@ -582,7 +582,7 @@ Anleitung zum setzen der Berechtigung:
     <value>Ein Fehler ist aufgetreten</value>
   </data>
   <data name="ErrorHandleDescription" xml:space="preserve">
-    <value>Ein unbehandelter Fehler ist aufgetreten, bitte senden Sie die Fehlerdetails welche in den Feld zu sehen sind über den Feedback-Hub, oder nutzen Sie die Fehlermeldung über Github.</value>
+    <value>Ein unbehandelter Fehler ist aufgetreten, bitte senden Sie die Fehlerdetails welche in den Feld zu sehen sind über die Fehlermeldung in Github.</value>
   </data>
   <data name="PasswordInvalidHeader" xml:space="preserve">
     <value>Passwort ungültig</value>
@@ -724,7 +724,7 @@ Bitte synchronisieren Sie die Uhrzeit in den Einstellungen.</value>
     <value>Speichern</value>
   </data>
   <data name="ErrorHandleDescriptionLastSession" xml:space="preserve">
-    <value>Ein unbehandelter Fehler ist bei der letzten Nutzung der App aufgetreten, bitte senden Sie die Fehlerdetails welche in den Feld zu sehen sind über den Feedback-Hub, oder nutzen Sie die Fehlermeldung über Github.</value>
+    <value>Ein unbehandelter Fehler ist bei der letzten Nutzung der App aufgetreten, bitte senden Sie die Fehlerdetails welche in den Feld zu sehen sind über die Fehlermeldung in Github.</value>
   </data>
   <data name="SettingsNTPServerCheckBoxText.Content" xml:space="preserve">
     <value>NTP Server manuell setzen</value>

diff --git a/Project2FA.Shared/Strings/en/Resources.resw b/Project2FA.Shared/Strings/en/Resources.resw
@@ -577,7 +577,7 @@ Instructions for setting the authorisation:
     <value>Error handle</value>
   </data>
   <data name="ErrorHandleDescription" xml:space="preserve">
-    <value>An unhandled error has occurred, please send the error details which can be seen in the field via the feedback hub, or add a new issue via Github.</value>
+    <value>An unhandled error has occurred, please send the error details which can be seen in the field via a new issue in Github.</value>
   </data>
   <data name="PasswordInvalidHeader" xml:space="preserve">
     <value>Password invalid</value>
@@ -721,7 +721,7 @@ Please synchronize the time in the settings.</value>
     <value>Save</value>
   </data>
   <data name="ErrorHandleDescriptionLastSession" xml:space="preserve">
-    <value>An unhandled error occurred the last time the app was used, please submit the error details which can be seen in the box via the feedback hub, or use the error message via Github.</value>
+    <value>An unhandled error occurred the last time the app was used, please send the error details which can be seen in the field via a new issue in Github.</value>
   </data>
   <data name="SettingsNTPServerCheckBoxText.Content" xml:space="preserve">
     <value>set NTP server manually</value>

diff --git a/Project2FA.Shared/ViewModels/Fylouts/CategoryFilterFlyoutViewModel.cs b/Project2FA.Shared/ViewModels/Fylouts/CategoryFilterFlyoutViewModel.cs
@@ -35,18 +35,23 @@ public class CategoryFilterFlyoutViewModel : ObservableRecipient
     {
         public ICommand ManageCategoriesCommand { get; }
         private bool _canSaveFilter, _canResetFilter;
-        private bool _categoriesExists;
         public ObservableCollection<CategoryModel> GlobalTempCategories { get; } = new ObservableCollection<CategoryModel>();
         public CategoryFilterFlyoutViewModel()
         {
             ManageCategoriesCommand = new AsyncRelayCommand(ManageCategoriesCommandTask);
-            OnPropertyChanged(nameof(NoCategoriesExists));
+            //OnPropertyChanged(nameof(NoCategoriesExists));
 
             Messenger.Register<CategoryFilterFlyoutViewModel, CategoriesChangedMessage>(this, (r, m) =>
             {
                 OnPropertyChanged(nameof(NoCategoriesExists));
                 CanSaveFilter = false;
                 GlobalTempCategories.AddRange(DataService.Instance.GlobalCategories.Select(x => (CategoryModel)x.Clone()).ToList(), true);
+                var selectedItems = GlobalCategories.Where(x => x.IsSelected == true);
+                var tempItems = GlobalTempCategories.Where(x => selectedItems.Where(s => s.Guid == x.Guid).Any());
+                for (int i = 0; i < tempItems.Count(); i++)
+                {
+                    tempItems.ElementAt(i).IsSelected = true;
+                }
             });
         }
 
@@ -85,6 +90,10 @@ public void SaveCategorySetting()
                 Messenger.Send(new FilteringChangedMessage(false));
             }
         }
+        public ObservableCollection<CategoryModel> GlobalCategories
+        {
+            get => DataService.Instance.GlobalCategories;
+        }
 
         public bool NoCategoriesExists 
         {

diff --git a/Project2FA.UNO.MauiControls/Project2FA.UNO.MauiControls.csproj b/Project2FA.UNO.MauiControls/Project2FA.UNO.MauiControls.csproj
@@ -8,8 +8,8 @@
 
   <ItemGroup>
 	<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.10" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.10" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.14" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.14" />
     <PackageReference Include="ZXing.Net.Maui.Controls" Version="0.4" />
   </ItemGroup>
 

diff --git a/Project2FA/Project2FA.UNO.Mobile/Project2FA.UNO.Mobile.csproj b/Project2FA/Project2FA.UNO.Mobile/Project2FA.UNO.Mobile.csproj
@@ -52,14 +52,14 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-    <PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.1.240305-build.970" />
-    <PackageReference Include="CommunityToolkit.WinUI.Collections" Version="8.1.240305-build.970" />
-    <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.1.240305-build.970" />
-    <PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.1.240305-build.970" />
-    <PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.1.240305-build.970" />
-    <PackageReference Include="CommunityToolkit.WinUI.Triggers" Version="8.1.240305-build.970" />
-	<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.10" />
-	<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.10" />
+    <PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.1.240320-build.986" />
+    <PackageReference Include="CommunityToolkit.WinUI.Collections" Version="8.1.240320-build.986" />
+    <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.1.240320-build.986" />
+    <PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.1.240320-build.986" />
+    <PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.1.240320-build.986" />
+    <PackageReference Include="CommunityToolkit.WinUI.Triggers" Version="8.1.240320-build.986" />
+	<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.14" />
+	<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.14" />
     <PackageReference Include="DryIoc" Version="5.4.3" />
     <PackageReference Include="Prism.Core" Version="8.1.97" />
     <PackageReference Include="Svg.Skia" Version="1.0.0.16" />

diff --git a/Project2FA/Project2FA.UWP/App.xaml.cs b/Project2FA/Project2FA.UWP/App.xaml.cs
@@ -75,7 +75,7 @@ private void TaskScheduler_UnobservedTaskException(object sender, UnobservedTask
         private void App_UnhandledException(object sender, Windows.UI.Xaml.UnhandledExceptionEventArgs e)
         {
             TrackingManager.TrackExceptionUnhandled(nameof(App_UnhandledException), e.Exception);
-            SettingsService.Instance.UnhandledExceptionStr += e.Exception.Message + "\n" + e.Exception.StackTrace + "\n"
+            SettingsService.Instance.UnhandledExceptionStr += e.Message + "\n" + e.Exception.StackTrace + "\n"
             + e.Exception.InnerException;
             App.Current.Container.Resolve<ILoggingService>().LogException(e.Exception);
             // let the app crash...

diff --git a/Project2FA/Project2FA.UWP/Project2FA.UWP.csproj b/Project2FA/Project2FA.UWP/Project2FA.UWP.csproj
@@ -310,25 +310,25 @@
       <Version>0.1.240305-build.1659</Version>
     </PackageReference>
     <PackageReference Include="CommunityToolkit.Uwp.Animations">
-      <Version>8.1.240305-build.970</Version>
+      <Version>8.1.240320-build.986</Version>
     </PackageReference>
     <PackageReference Include="CommunityToolkit.Uwp.Collections">
-      <Version>8.1.240305-build.970</Version>
+      <Version>8.1.240320-build.986</Version>
     </PackageReference>
     <PackageReference Include="CommunityToolkit.Uwp.Controls.Primitives">
-      <Version>8.1.240305-build.970</Version>
+      <Version>8.1.240320-build.986</Version>
     </PackageReference>
     <PackageReference Include="CommunityToolkit.Uwp.Controls.SettingsControls">
-      <Version>8.1.240305-build.970</Version>
+      <Version>8.1.240320-build.986</Version>
     </PackageReference>
     <PackageReference Include="CommunityToolkit.Uwp.Extensions">
-      <Version>8.1.240305-build.970</Version>
+      <Version>8.1.240320-build.986</Version>
     </PackageReference>
     <PackageReference Include="CommunityToolkit.Uwp.Lottie">
       <Version>8.0.280224</Version>
     </PackageReference>
     <PackageReference Include="CommunityToolkit.Uwp.Media">
-      <Version>8.1.240305-build.970</Version>
+      <Version>8.1.240320-build.986</Version>
     </PackageReference>
     <PackageReference Include="DryIoc.dll">
       <Version>5.4.3</Version>