implemented #13 (hide/show TOTP codes)

jp-weber · jp-weber · commit f18d7c008723 · 2022-03-29T19:43:07.000+02:00
diff --git a/Project2FA.Core/Constants.cs b/Project2FA.Core/Constants.cs
@@ -3,5 +3,8 @@
     public static class Constants
     {
         public const string ContainerName = "Project2FA";
+        public const string SettingsRegionName = "SettingsContentRegion";
+        public const string DatafileRegionName = "DatafileContentRegion";
+        public const string AboutAppRegionName = "AboutAppContentRegion";
     }
 }
diff --git a/Project2FA.Repository/Models/TwoFACodeModel.cs b/Project2FA.Repository/Models/TwoFACodeModel.cs
@@ -89,6 +89,13 @@ public string TwoFACode
             set => SetProperty(ref _twoFACode, value);
         }
 
+        private bool _hideTOTPCode;
+        [JsonIgnore]
+        public bool HideTOTPCode
+        {
+            get => _hideTOTPCode;
+            set => SetProperty(ref _hideTOTPCode, value);
+        }
 
         //[JsonIgnore]
         //public List<(string name, string message)> Errors
diff --git a/Project2FA/Project2FA.Mobile/Project2FA.Mobile.csproj b/Project2FA/Project2FA.Mobile/Project2FA.Mobile.csproj
@@ -13,9 +13,9 @@
     <!-- Required for C# Hot Reload -->
     <UseInterpreter Condition="'$(Configuration)' == 'Debug'">True</UseInterpreter>
     <IsUnoHead>true</IsUnoHead>
-    <Platforms>ARM32;x64;ARM64</Platforms>
+    <!--<Platforms>ARM32;x64;ARM64</Platforms>-->
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0-android|ARM64'">
+  <!--<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0-android|ARM64'">
     <RunAOTCompilation>False</RunAOTCompilation>
     <EnableLLVM>False</EnableLLVM>
     <AndroidEnableProfiledAot>False</AndroidEnableProfiledAot>
@@ -145,15 +145,15 @@
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0-macos|x64'">
     <EnableLLVM>True</EnableLLVM>
     <AndroidEnableProfiledAot>True</AndroidEnableProfiledAot>
-  </PropertyGroup>
+  </PropertyGroup>-->
   <ItemGroup>
-    <PackageReference Include="Prism.DryIoc.Uno" Version="8.1.97" />
-    <PackageReference Include="Uno.UI" Version="4.1.8" />
-    <PackageReference Include="Uno.UI.RemoteControl" Version="4.1.8" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.1.8" />
+    <PackageReference Include="Uno.WinUI" Version="4.1.9" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.1.9" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.WinUI.Adapter.Microsoft.Extensions.Logging" Version="4.1.9" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
     <PackageReference Include="ZXing.Net" Version="0.16.8" />
+	<PackageReference Include="Prism.DryIoc.Uno.WinUI" Version="8.1.97" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0-android'">
     <PackageReference Include="Xamarin.Google.Android.Material" Version="1.5.0.1" />
diff --git a/Project2FA/Project2FA.Shared/Views/UseDataFilePage.xaml b/Project2FA/Project2FA.Shared/Views/UseDataFilePage.xaml
@@ -9,7 +9,7 @@
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
     <Grid x:Name="RootGrid">
-        <!--<Pivot x:Name="MainPivot" SelectedIndex="{x:Bind ViewModel.SelectedIndex,Mode=TwoWay}">
+        <Pivot x:Name="MainPivot" SelectedIndex="{x:Bind ViewModel.SelectedIndex,Mode=TwoWay}">
             <PivotItem 
                 Header="#Auswahl"
                 x:Uid="UseDatafileContentDialogPivotItemKind">
@@ -141,7 +141,7 @@
                 x:Name="WebDAVPivotItem"
                 Header="~WebDAVPivotItem.Header"
                 x:Uid="UseDatafileContentDialogWebDAVPivotItem">
-                --><!--<Grid MaxWidth="550" MinWidth="400" HorizontalAlignment="Left" >
+                <Grid MaxWidth="550" MinWidth="400" HorizontalAlignment="Left" >
                     <ScrollViewer
                         VerticalScrollBarVisibility="Hidden">
                         <StackPanel>
@@ -262,9 +262,9 @@
                             </muxc:Expander>
                         </StackPanel>
                     </ScrollViewer>
-                </Grid>--><!--
+                </Grid>
             </PivotItem>
-        </Pivot>-->
+        </Pivot>
         <!--<msct:Loading 
                         IsLoading="{x:Bind ViewModel.ShowError,Mode=OneWay}" 
                         Background="{ThemeResource TranslucentBackgroundHighBrush}">
diff --git a/Project2FA/Project2FA.Skia.Gtk/Project2FA.Skia.Gtk.csproj b/Project2FA/Project2FA.Skia.Gtk/Project2FA.Skia.Gtk.csproj
@@ -26,8 +26,8 @@
     <PackageReference Include="Prism.DryIoc.Uno.WinUI" Version="8.1.97" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="Uno.WinUI.Lottie" Version="4.1.8" />
-    <PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.1.8" />
+    <PackageReference Include="Uno.WinUI.Lottie" Version="4.1.9" />
+    <PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.1.9" />
     <PackageReference Include="ZXing.Net" Version="0.16.8" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Project2FA/Project2FA.Skia.Linux.FrameBuffer/Project2FA.Skia.Linux.FrameBuffer.csproj b/Project2FA/Project2FA.Skia.Linux.FrameBuffer/Project2FA.Skia.Linux.FrameBuffer.csproj
@@ -16,9 +16,9 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-    <PackageReference Include="Uno.UI.Skia.Linux.FrameBuffer" Version="4.1.8" />
-    <PackageReference Include="Uno.UI.RemoteControl" Version="4.1.8" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.1.8" />
+    <PackageReference Include="Uno.UI.Skia.Linux.FrameBuffer" Version="4.1.9" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="4.1.9" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.1.9" />
     <PackageReference Include="ZXing.Net" Version="0.16.8" />
   </ItemGroup>
   <Import Project="..\Project2FA.Shared\Project2FA.Shared.projitems" Label="Shared" />
diff --git a/Project2FA/Project2FA.Skia.Tizen/Project2FA.Skia.Tizen.csproj b/Project2FA/Project2FA.Skia.Tizen/Project2FA.Skia.Tizen.csproj
@@ -30,8 +30,8 @@
     <PackageReference Include="SkiaSharp.Views" Version="2.88.0-preview.155" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="Uno.WinUI.Lottie" Version="4.1.8" />
-    <PackageReference Include="Uno.WinUI.Skia.Tizen" Version="4.1.8" />
+    <PackageReference Include="Uno.WinUI.Lottie" Version="4.1.9" />
+    <PackageReference Include="Uno.WinUI.Skia.Tizen" Version="4.1.9" />
     <PackageReference Include="ZXing.Net" Version="0.16.8" />
   </ItemGroup>
   <Import Project="..\Project2FA.Shared\Project2FA.Shared.projitems" Label="Shared" />
diff --git a/Project2FA/Project2FA.Skia.Wpf.Host/Project2FA.Skia.Wpf.Host.csproj b/Project2FA/Project2FA.Skia.Wpf.Host/Project2FA.Skia.Wpf.Host.csproj
@@ -15,9 +15,9 @@
     </PackageReference>
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-	<PackageReference Include="Uno.UI.RemoteControl" Version="4.1.8" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Skia.Wpf" Version="4.1.8" />
-	<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.1.8" />
+	<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.1.9" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.WinUI.Skia.Wpf" Version="4.1.9" />
+	<PackageReference Include="Uno.WinUI.Adapter.Microsoft.Extensions.Logging" Version="4.1.9" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Assets\Fonts\uno-fluentui-assets.ttf" />
diff --git a/Project2FA/Project2FA.Skia.Wpf/Project2FA.Skia.Wpf.csproj b/Project2FA/Project2FA.Skia.Wpf/Project2FA.Skia.Wpf.csproj
@@ -11,13 +11,13 @@
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-	<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.1.8" />
+    <PackageReference Include="Prism.DryIoc.Uno.WinUI" Version="8.1.97" />
+	<!--<PackageReference Include="Uno.WinUI.Adapter.Microsoft.Extensions.Logging" Version="4.1.9" />-->
     <PackageReference Include="Prism.Core" Version="8.1.97" />
-    <PackageReference Include="Prism.DryIoc.Uno" Version="8.1.97" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-	<PackageReference Include="Uno.UI.RemoteControl" Version="4.1.8" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Skia.Wpf" Version="4.1.8" />
+	<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.1.9" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.WinUI.Skia.Wpf" Version="4.1.9" />
     <PackageReference Include="ZXing.Net" Version="0.16.8" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Project2FA/Project2FA.UWP/App.xaml b/Project2FA/Project2FA.UWP/App.xaml
@@ -19,6 +19,7 @@
             <Converters:FavouriteToIconConverter x:Key="FavouriteToIconConverter"/>
             <Converters:VisibleWhenFalseConverter x:Key="VisibleWhenFalseConverter"/>
             <Converters:FavouriteTooltipConverter x:Key="FavouriteTooltipConverter"/>
+            <Converters:TOTPVisibilityTooltipConverter x:Key="TOTPVisibilityTooltipConverter"/>
             <Converters:DoubleToInt32ToStringConverter x:Key="DoubleToInt32ToStringConverter"/>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/Project2FA/Project2FA.UWP/Converters/FavouriteTooltipConverter.cs b/Project2FA/Project2FA.UWP/Converters/FavouriteTooltipConverter.cs
@@ -9,11 +9,11 @@ public object Convert(object value, Type targetType, object parameter, string la
         {
             if ((bool)value)
             {
-                return Strings.Resources.AccountCodePageTooltipDelete;
+                return Strings.Resources.AccountCodePageTooltipDeleteFavourite;
             }
             else
             {
-                return Strings.Resources.AccountCodePageTooltipSet;
+                return Strings.Resources.AccountCodePageTooltipSetFavourite;
             }
         }
 
diff --git a/Project2FA/Project2FA.UWP/Converters/TOTPVisibilityTooltipConverter.cs b/Project2FA/Project2FA.UWP/Converters/TOTPVisibilityTooltipConverter.cs
@@ -0,0 +1,25 @@
+﻿using System;
+using Windows.UI.Xaml.Data;
+
+namespace Project2FA.UWP.Converters
+{
+    public class TOTPVisibilityTooltipConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (!(bool)value)
+            {
+                return Strings.Resources.AccountCodePageTooltipHideTOTP;
+            }
+            else
+            {
+                return Strings.Resources.AccountCodePageTooltipShowTOTP;
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Project2FA/Project2FA.UWP/Helpers/ThemeHelper.cs b/Project2FA/Project2FA.UWP/Helpers/ThemeHelper.cs
@@ -13,6 +13,7 @@ public static class ThemeHelper
         private static Window CurrentApplicationWindow;
         // Keep reference so it does not get optimized/garbage collected
         private static UISettings uiSettings;
+        private static bool initialTransparencyValue;
         private static bool _changeTheme;
 
 
@@ -23,6 +24,7 @@ public static void Initialize()
 
             // Registering to color changes, thus we notice when user changes theme system wide
             uiSettings = new UISettings();
+            initialTransparencyValue = uiSettings.AdvancedEffectsEnabled;
             uiSettings.ColorValuesChanged += UiSettings_ColorValuesChanged;
         }
 
@@ -47,7 +49,8 @@ public static void UpdateSystemTheme()
             // change only once
             if (!_changeTheme)
             {
-                if (SettingsService.Instance.AppTheme == Services.Enums.Theme.System)
+                if (SettingsService.Instance.AppTheme == Services.Enums.Theme.System &&
+                    initialTransparencyValue == uiSettings.AdvancedEffectsEnabled)
                 {
                     // invert the current theme
                     if (SettingsService.Instance.OriginalAppTheme == ApplicationTheme.Dark)
diff --git a/Project2FA/Project2FA.UWP/Project2FA.UWP.csproj b/Project2FA/Project2FA.UWP/Project2FA.UWP.csproj
@@ -131,6 +131,7 @@
     <Compile Include="Converters\DateTimeToStringConverter.cs" />
     <Compile Include="Converters\DoubleToInt32ToStringConverter.cs" />
     <Compile Include="Converters\FavouriteToIconConverter.cs" />
+    <Compile Include="Converters\TOTPVisibilityTooltipConverter.cs" />
     <Compile Include="Converters\FavouriteTooltipConverter.cs" />
     <Compile Include="Converters\NullToVisibilityConverter.cs" />
     <Compile Include="Converters\VisibleWhenFalseConverter.cs" />
diff --git a/Project2FA/Project2FA.UWP/Services/DataService.cs b/Project2FA/Project2FA.UWP/Services/DataService.cs
@@ -156,9 +156,11 @@ private async void Accounts_CollectionChanged(object sender, NotifyCollectionCha
         /// </summary>
         public async Task ResetCollection()
         {
+            var useHiddenTOTP = SettingsService.Instance.UseHiddenTOTP;
             await CollectionAccessSemaphore.WaitAsync();
             for (int i = 0; i < Collection.Count; i++)
             {
+                Collection[i].HideTOTPCode = useHiddenTOTP;
                 await InitializeItem(i);
             }
             CollectionAccessSemaphore.Release();
diff --git a/Project2FA/Project2FA.UWP/Services/SettingsService/SettingsService.cs b/Project2FA/Project2FA.UWP/Services/SettingsService/SettingsService.cs
@@ -99,6 +99,12 @@ public bool UseNTPServerCorrection
             set => _helper.TryWrite(nameof(UseNTPServerCorrection), value);
         }
 
+        public bool UseHiddenTOTP
+        {
+            get => _helper.SafeRead(nameof(UseHiddenTOTP), false);
+            set => _helper.TryWrite(nameof(UseHiddenTOTP), value);
+        }
+
         public string NTPServerString
         {
             get => _helper.SafeRead(nameof(UseExtendedHash), "time.windows.com");
diff --git a/Project2FA/Project2FA.UWP/Strings/de/Resources.resw b/Project2FA/Project2FA.UWP/Strings/de/Resources.resw
@@ -305,7 +305,7 @@ Wichtig: Das Passwort wird bei jedem Start zur Entschlüsselung und Nutzung der
     <value>Speicherart</value>
   </data>
   <data name="NewDatafileContentDialogWebDAV.Text" xml:space="preserve">
-    <value>WebDAV nutzen </value>
+    <value>WebDAV nutzen (Beta)</value>
   </data>
   <data name="NewDatafileContentDialogWebDAVPivotItem.Header" xml:space="preserve">
     <value>WebDAV</value>
@@ -825,10 +825,22 @@ QR-Codes können nun für einzelne Account angezeigt werden, um diese mit dem Sm
   <data name="AddAccountCodeContentDialogInputSecretKeyHelp" xml:space="preserve">
     <value>Die Eingabe basiert auf Base32 und erlaubt deshalb nur die Buchstaben A-Z und die Nummern von 2-7.</value>
   </data>
-  <data name="AccountCodePageTooltipDelete" xml:space="preserve">
+  <data name="AccountCodePageTooltipDeleteFavourite" xml:space="preserve">
     <value>Als Favorit entfernen</value>
   </data>
-  <data name="AccountCodePageTooltipSet" xml:space="preserve">
+  <data name="AccountCodePageTooltipSetFavourite" xml:space="preserve">
     <value>Als Favorit setzen</value>
   </data>
+  <data name="AccountCodePageTooltipHideTOTP" xml:space="preserve">
+    <value>Schlüssel verstecken</value>
+  </data>
+  <data name="AccountCodePageTooltipShowTOTP" xml:space="preserve">
+    <value>Schlüssel anzeigen</value>
+  </data>
+  <data name="SettingsPreferHiddenTOTP.Header" xml:space="preserve">
+    <value>Schlüssel verstecken</value>
+  </data>
+  <data name="SettingsPreferHiddenTOTPDesc.Text" xml:space="preserve">
+    <value>Die erzeugten Schlüssel werden versteckt und können optional eingeblendet werden.</value>
+  </data>
 </root>
diff --git a/Project2FA/Project2FA.UWP/Strings/en/Resources.generated.cs b/Project2FA/Project2FA.UWP/Strings/en/Resources.generated.cs
@@ -991,28 +991,54 @@ public static string AddAccountCodeContentDialogInputSecretKeyHelp
         }
         #endregion
 
-        #region AccountCodePageTooltipDelete
+        #region AccountCodePageTooltipDeleteFavourite
         /// <summary>
         ///   Looks up a localized string similar to: Undo favourite
         /// </summary>
-        public static string AccountCodePageTooltipDelete
+        public static string AccountCodePageTooltipDeleteFavourite
         {
             get
             {
-                return _resourceLoader.GetString("AccountCodePageTooltipDelete");
+                return _resourceLoader.GetString("AccountCodePageTooltipDeleteFavourite");
             }
         }
         #endregion
 
-        #region AccountCodePageTooltipSet
+        #region AccountCodePageTooltipSetFavourite
         /// <summary>
         ///   Looks up a localized string similar to: Set as favourite
         /// </summary>
-        public static string AccountCodePageTooltipSet
+        public static string AccountCodePageTooltipSetFavourite
         {
             get
             {
-                return _resourceLoader.GetString("AccountCodePageTooltipSet");
+                return _resourceLoader.GetString("AccountCodePageTooltipSetFavourite");
+            }
+        }
+        #endregion
+
+        #region AccountCodePageTooltipHideTOTP
+        /// <summary>
+        ///   Looks up a localized string similar to: hide key
+        /// </summary>
+        public static string AccountCodePageTooltipHideTOTP
+        {
+            get
+            {
+                return _resourceLoader.GetString("AccountCodePageTooltipHideTOTP");
+            }
+        }
+        #endregion
+
+        #region AccountCodePageTooltipShowTOTP
+        /// <summary>
+        ///   Looks up a localized string similar to: show key
+        /// </summary>
+        public static string AccountCodePageTooltipShowTOTP
+        {
+            get
+            {
+                return _resourceLoader.GetString("AccountCodePageTooltipShowTOTP");
             }
         }
         #endregion
@@ -1102,8 +1128,10 @@ public enum KeyEnum
             AddAccountCodeContentDialogQRCodeHelp,
             DisplayQRCodeContentDialogTitle,
             AddAccountCodeContentDialogInputSecretKeyHelp,
-            AccountCodePageTooltipDelete,
-            AccountCodePageTooltipSet,
+            AccountCodePageTooltipDeleteFavourite,
+            AccountCodePageTooltipSetFavourite,
+            AccountCodePageTooltipHideTOTP,
+            AccountCodePageTooltipShowTOTP,
         }
 
         private static ResourceLoader _resourceLoader;
diff --git a/Project2FA/Project2FA.UWP/Strings/en/Resources.resw b/Project2FA/Project2FA.UWP/Strings/en/Resources.resw
diff --git a/Project2FA/Project2FA.UWP/ViewModels/AccountCodePageViewModel.cs b/Project2FA/Project2FA.UWP/ViewModels/AccountCodePageViewModel.cs
diff --git a/Project2FA/Project2FA.UWP/ViewModels/SettingPageViewModel.cs b/Project2FA/Project2FA.UWP/ViewModels/SettingPageViewModel.cs
diff --git a/Project2FA/Project2FA.UWP/Views/AccountCodePage.xaml b/Project2FA/Project2FA.UWP/Views/AccountCodePage.xaml
diff --git a/Project2FA/Project2FA.UWP/Views/SettingPage.xaml b/Project2FA/Project2FA.UWP/Views/SettingPage.xaml

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,8 @@`
`3`	`3`	`public static class Constants`
`4`	`4`	`{`
`5`	`5`	`public const string ContainerName = "Project2FA";`
	`6`	`+ public const string SettingsRegionName = "SettingsContentRegion";`
	`7`	`+ public const string DatafileRegionName = "DatafileContentRegion";`
	`8`	`+ public const string AboutAppRegionName = "AboutAppContentRegion";`
`6`	`9`	`}`
`7`	`10`	`}`