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

chore: add value binding to SwitchPresenter
2fast-team · Nov 10, 2024 · 94a6dea · 94a6dea
2 parents befd0f4 + 7d97100
commit 94a6dea
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/Project2FA/Project2FA.UWP/Package.appxmanifest b/Project2FA/Project2FA.UWP/Package.appxmanifest
@@ -5,8 +5,8 @@
          xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
          xmlns:uap6="http://schemas.microsoft.com/appx/manifest/uap/windows10/6"
          IgnorableNamespaces="uap mp rescap uap6">
-	<Identity Name="38343JanPhilippWeber.2fastTwoFactorAuthenticatorSu" Publisher="CN=31DBFF9D-D4FF-4E73-808A-7B49119D08D3" Version="0.0.1.0" />
-	<mp:PhoneIdentity PhoneProductId="422adbdb-6213-4e25-ada0-57ef2ef12d1f" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
+	<Identity Name="38343JanPhilippWeber.2fastTwoFactorAuthenticatorSu" Publisher="CN=31DBFF9D-D4FF-4E73-808A-7B49119D08D3" Version="1.3.3.0" />
+	<mp:PhoneIdentity PhoneProductId="bc29244b-719f-4ec0-9714-0371a4b56bae" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
 	<Properties>
 		<DisplayName>2fast – Two Factor Authenticator Supporting TOTP</DisplayName>
 		<PublisherDisplayName>Jan Philipp Weber</PublisherDisplayName>

diff --git a/Project2FA/Project2FA.UWP/Views/UseDataFilePage.xaml b/Project2FA/Project2FA.UWP/Views/UseDataFilePage.xaml
@@ -350,8 +350,9 @@
 
         <ctwc:SwitchPresenter 
             Grid.ColumnSpan="3"
-            >
-            <ctwc:Case Value="GeneralError">
+            TargetType="x:Boolean"
+            Value="{x:Bind ViewModel.ShowError, Mode=OneWay}">
+            <ctwc:Case Value="True">
                 <Grid
             Background="{ThemeResource TranslucentBackgroundHighBrush}">
                     <StackPanel>
@@ -371,7 +372,14 @@
                     </StackPanel>
                 </Grid>
             </ctwc:Case>
-            <ctwc:Case Value="WebDAVLoginError">
+        </ctwc:SwitchPresenter>
+
+        <ctwc:SwitchPresenter 
+            Grid.ColumnSpan="3"
+            TargetType="x:Boolean"
+            Value="{x:Bind ViewModel.WebDAVLoginError, Mode=OneWay}">
+
+            <ctwc:Case Value="True">
                 <Grid
             Background="{ThemeResource TranslucentBackgroundHighBrush}">
                     <StackPanel>
@@ -391,7 +399,14 @@
                     </StackPanel>
                 </Grid>
             </ctwc:Case>
-            <ctwc:Case Value="Loading">
+
+        </ctwc:SwitchPresenter>
+
+        <ctwc:SwitchPresenter 
+            Grid.ColumnSpan="3"
+            TargetType="x:Boolean"
+            Value="{x:Bind ViewModel.IsLoading, Mode=OneWay}">
+            <ctwc:Case Value="True">
                 <Grid 
             Background="{ThemeResource TranslucentBackgroundHighBrush}">
                     <muxc:ProgressRing 
@@ -404,9 +419,6 @@
         </ctwc:SwitchPresenter>
 
 
-
-
-
         <VisualStateManager.VisualStateGroups>
             <VisualStateGroup x:Name="WindowStates">
                 <VisualState x:Name="NarrowState">