begin redistribution of backup UI

Author: marticliment

src/UniGetUI.Core.Settings/SettingsEngine_Names.cs

@@ -39,7 +39,8 @@ public enum K
         AlreadyWarnedAboutAdmin,
         ShownTelemetryBanner,
         CollapseNavMenuOnWideScreen,
-        EnablePackageBackup,
+        EnablePackageBackup_LOCAL,
+        EnablePackageBackup_CLOUD,
         ChangeBackupOutputDirectory,
         DisableWinGetMalfunctionDetector,
         EnableBackupTimestamping,
@@ -127,7 +128,8 @@ public static string ResolveKey(K key)
             K.AlreadyWarnedAboutAdmin => "AlreadyWarnedAboutAdmin",
             K.ShownTelemetryBanner => "ShownTelemetryBanner",
             K.CollapseNavMenuOnWideScreen => "CollapseNavMenuOnWideScreen",
-            K.EnablePackageBackup => "EnablePackageBackup",
+            K.EnablePackageBackup_LOCAL => "EnablePackageBackup",
+            K.EnablePackageBackup_CLOUD => "EnablePackageBackup_CLOUD",
             K.ChangeBackupOutputDirectory => "ChangeBackupOutputDirectory",
             K.DisableWinGetMalfunctionDetector => "DisableWinGetMalfunctionDetector",
             K.EnableBackupTimestamping => "EnableBackupTimestamping",

src/UniGetUI.Interface.Telemetry/TelemetryHandler.cs

@@ -41,7 +41,7 @@ public static class TelemetryHandler
         Settings.K.DisableAutoCheckforUpdates,
         Settings.K.AutomaticallyUpdatePackages,
         Settings.K.AskToDeleteNewDesktopShortcuts,
-        Settings.K.EnablePackageBackup,
+        Settings.K.EnablePackageBackup_LOCAL,
         Settings.K.DoCacheAdminRights,
         Settings.K.DoCacheAdminRightsForBatches,
         Settings.K.ForceLegacyBundledWinGet,

src/UniGetUI/Pages/SettingsPages/GeneralPages/Backup.xaml

@@ -27,13 +27,7 @@
                 FontWeight="SemiBold"
                 Text="Package backup" />
 
-            <widgets:CheckboxCard
-                x:Name="EnablePackageBackupCheckBox"
-                CornerRadius="8,8,0,0"
-                SettingName="EnablePackageBackup"
-                StateChanged="ShowRestartBanner"
-                Text="Periodically perform a backup of the installed packages" />
-            <Toolkit:SettingsCard BorderThickness="1,0,1,1" CornerRadius="0,0,8,8">
+            <Toolkit:SettingsCard CornerRadius="8">
                 <Toolkit:SettingsCard.Description>
                     <StackPanel Orientation="Vertical">
                         <widgets:TranslatedTextBlock Prefix=" ● " Text="The backup will include the complete list of the installed packages and their installation options. Ignored updates and skipped versions will also be saved." />
@@ -44,29 +38,100 @@
                 </Toolkit:SettingsCard.Description>
             </Toolkit:SettingsCard>
 
-            <UserControl Height="16" />
 
+            <widgets:TranslatedTextBlock
+                Margin="4,32,4,8"
+                FontSize="16"
+                FontWeight="SemiBold"
+                Text="Cloud package backup" />
+
+            <widgets:CheckboxCard
+                x:Name="EnablePackageBackupCheckBox_CLOUD"
+                BorderThickness="1,1,1,0"
+                CornerRadius="8,8,0,0"
+                SettingName="EnablePackageBackup_CLOUD"
+                StateChanged="ShowRestartBanner"
+                Text="Periodically perform a cloud backup of the installed packages">
+                <widgets:CheckboxCard.Description>
+                    <widgets:TranslatedTextBlock Text="Cloud backup uses a private GitHub Gist to store a list of installed packages" />
+                </widgets:CheckboxCard.Description>
+            </widgets:CheckboxCard>
+
+            <Toolkit:SettingsCard>
+
+                <StackPanel
+                    VerticalAlignment="Center"
+                    Orientation="Horizontal"
+                    Spacing="8">
+                    <TextBlock
+                        x:Name="GitHubUserText"
+                        VerticalAlignment="Center"
+                        Text="Not logged in" />
+                    <Button
+                        x:Name="LoginWithGitHubButton"
+                        Click="LoginWithGitHubButton_Click"
+                        Content="Login with GitHub" />
+                    <Button
+                        x:Name="LogoutGitHubButton"
+                        Click="LogoutGitHubButton_Click"
+                        Content="Logout from GitHub"
+                        Visibility="Collapsed" />
+                </StackPanel>
+            </Toolkit:SettingsCard>
+
+            <UserControl Height="16" />
 
             <widgets:ButtonCard
-                x:Name="BackupNowButton"
+                x:Name="BackupNowButton_Local"
                 ButtonText="Backup"
-                Click="DoBackup_Click"
-                CornerRadius="8"
-                IsEnabled="{x:Bind EnablePackageBackupCheckBox._checkbox.IsOn, Mode=OneWay}"
-                Text="Perform a backup now" />
+                Click="BackupNowButton_Local_Click"
+                CornerRadius="8,8,0,0"
+                IsEnabled="{x:Bind EnablePackageBackupCheckBox_CLOUD._checkbox.IsOn, Mode=OneWay}"
+                Text="Perform a cloud backup now" />
 
+            <widgets:ButtonCard
+                x:Name="RestorePackagesFromGitHubButton"
+                BorderThickness="1,0,1,1"
+                ButtonText="Select backup"
+                Click="RestorePackagesFromGitHubButton_Click"
+                CornerRadius="0,0,8,8"
+                Text="Restore a backup from the cloud">
+                <widgets:ButtonCard.Description>
+                    <widgets:TranslatedTextBlock Text="Begin the process to select a cloud backup and review which packages to restore" />
+                </widgets:ButtonCard.Description>
+            </widgets:ButtonCard>
 
             <widgets:TranslatedTextBlock
                 Margin="4,32,4,8"
+                FontSize="16"
                 FontWeight="SemiBold"
-                Text="Backup location" />
+                Text="Local package backup" />
+
+            <widgets:CheckboxCard
+                x:Name="EnablePackageBackupCheckBox_LOCAL"
+                BorderThickness="1,1,1,0"
+                CornerRadius="8,8,0,0"
+                SettingName="EnablePackageBackup_LOCAL"
+                StateChanged="ShowRestartBanner"
+                Text="Periodically perform a local backup of the installed packages" />
+
+            <widgets:ButtonCard
+                x:Name="BackupNowButton_LOCAL"
+                ButtonText="Backup"
+                Click="BackupNowButton_LOCAL_Click_1"
+                CornerRadius="0,0,8,8"
+                IsEnabled="{x:Bind EnablePackageBackupCheckBox_LOCAL._checkbox.IsOn, Mode=OneWay}"
+                Text="Perform a local backup now" />
+
+            <UserControl Height="16" />
+
 
             <widgets:ButtonCard
                 x:Name="ChangeBackupDirectory"
                 ButtonText="Select"
                 Click="ChangeBackupDirectory_Click"
                 CornerRadius="8"
-                IsEnabled="{x:Bind EnablePackageBackupCheckBox._checkbox.IsOn, Mode=OneWay}"
+                IsEnabled="{x:Bind EnablePackageBackupCheckBox_LOCAL._checkbox.IsOn, Mode=OneWay}"
                 Text="Change backup output directory">
                 <Toolkit:SettingsCard.Description>
                     <StackPanel Orientation="Horizontal" Spacing="5">
@@ -80,12 +145,12 @@
             <widgets:TranslatedTextBlock
                 Margin="4,32,4,8"
                 FontWeight="SemiBold"
-                Text="Advanced options" />
+                Text="Local backup advanced options" />
 
             <widgets:TextboxCard
                 x:Name="ChangeBackupFileNameTextBox"
                 CornerRadius="8,8,0,0"
-                IsEnabled="{x:Bind EnablePackageBackupCheckBox._checkbox.IsOn, Mode=OneWay}"
+                IsEnabled="{x:Bind EnablePackageBackupCheckBox_LOCAL._checkbox.IsOn, Mode=OneWay}"
                 Placeholder="Leave empty for default"
                 SettingName="ChangeBackupFileName"
                 Text="Set a custom backup file name" />
@@ -94,58 +159,9 @@
                 x:Name="EnableBackupTimestampingCheckBox"
                 BorderThickness="1,0,1,1"
                 CornerRadius="0,0,8,8"
-                IsEnabled="{x:Bind EnablePackageBackupCheckBox._checkbox.IsOn, Mode=OneWay}"
+                IsEnabled="{x:Bind EnablePackageBackupCheckBox_LOCAL._checkbox.IsOn, Mode=OneWay}"
                 SettingName="EnableBackupTimestamping"
                 Text="Add a timestamp to the backup file names" />
-
-            <widgets:TranslatedTextBlock
-                Margin="4,32,4,8"
-                FontWeight="SemiBold"
-                Text="Cloud Backup and Restore" />
-
-            <StackPanel Orientation="Horizontal" Spacing="8" VerticalAlignment="Center">
-                <TextBlock x:Name="GitHubUserText" Text="Not logged in" VerticalAlignment="Center"/>
-                <Button x:Name="LoginWithGitHubButton" Content="Login with GitHub" Click="LoginWithGitHubButton_Click" />
-                <Button x:Name="LogoutGitHubButton" Content="Logout from GitHub" Click="LogoutGitHubButton_Click" Visibility="Collapsed" />
-            </StackPanel>
-
-            <widgets:ButtonCard
-                x:Name="BackupToGitHubButton"
-                ButtonText="Backup settings and packages"
-                Click="BackupToGitHubButton_Click"
-                CornerRadius="8,8,0,0"
-                IsEnabled="False"
-                Text="Backup your settings and packages to a private GitHub Gist">
-                <widgets:ButtonCard.Description>
-                    <widgets:TranslatedTextBlock Text="Requires you to be logged in with your GitHub account." />
-                </widgets:ButtonCard.Description>
-            </widgets:ButtonCard>
-
-            <!--widgets:ButtonCard
-                x:Name="RestoreSettingsFromGitHubButton"
-                ButtonText="Restore settings"
-                Click="RestoreSettingsFromGitHubButton_Click"
-                CornerRadius="8"
-                IsEnabled="False"
-                Text="Restore your settings from a private GitHub Gist">
-                <widgets:ButtonCard.Description>
-                    <widgets:TranslatedTextBlock Text="This will overwrite your current settings. A restart may be required." />
-                </widgets:ButtonCard.Description>
-            </widgets:ButtonCard-->
-
-            <widgets:ButtonCard
-                x:Name="RestorePackagesFromGitHubButton"
-                ButtonText="Restore packages"
-                Click="RestorePackagesFromGitHubButton_Click"
-                CornerRadius="0,0,8,8"
-                BorderThickness="1,0,1,1"
-                IsEnabled="False"
-                Text="Restore your packages from a private GitHub Gist">
-                <widgets:ButtonCard.Description>
-                    <widgets:TranslatedTextBlock Text="This will install the packages from the backup." />
-                </widgets:ButtonCard.Description>
-            </widgets:ButtonCard>
-
         </StackPanel>
     </ScrollViewer>
 </Page>

src/UniGetUI/Pages/SettingsPages/GeneralPages/Backup.xaml.cs

@@ -35,7 +35,7 @@ public Backup()
             _authService = new GitHubAuthService();
             _backupService = new GitHubBackupService(_authService);
 
-            EnablePackageBackupUI(Settings.Get(Settings.K.EnablePackageBackup));
+            EnablePackageBackupUI(Settings.Get(Settings.K.EnablePackageBackup_LOCAL));
             ResetBackupDirectory.Content = CoreTools.Translate("Reset");
             OpenBackupDirectory.Content = CoreTools.Translate("Open");
             UpdateGitHubLoginStatus();
@@ -89,7 +89,7 @@ private async void UpdateBackupToGitHubButtonStatus()
         {
             UpdateGitHubLoginStatus();
             bool isAuthenticated = await _authService.IsAuthenticatedAsync();
-            BackupToGitHubButton.IsEnabled = isAuthenticated;
+            // BackupToGitHubButton.IsEnabled = isAuthenticated;
             RestorePackagesFromGitHubButton.IsEnabled = isAuthenticated;
         }
 
@@ -144,7 +144,7 @@ private async void RestorePackagesFromGitHubButton_Click(object sender, EventArg
 
         private async void BackupToGitHubButton_Click(object sender, EventArgs e)
         {
-            BackupToGitHubButton.IsEnabled = false;
+            // BackupToGitHubButton.IsEnabled = false;
             DialogHelper.ShowLoadingDialog(CoreTools.Translate("Backing up packages to GitHub Gist..."));
 
             var packagesContent = await InstalledPackagesPage.GenerateBackupContents();
@@ -202,7 +202,7 @@ public void EnablePackageBackupUI(bool enabled)
             EnableBackupTimestampingCheckBox.IsEnabled = enabled;
             ChangeBackupFileNameTextBox.IsEnabled = enabled;
             ChangeBackupDirectory.IsEnabled = enabled;
-            BackupNowButton.IsEnabled = enabled;
+            // BackupNowButton.IsEnabled = enabled;
 
             if (enabled)
             {
@@ -250,5 +250,15 @@ private async void DoBackup_Click(object sender, EventArgs e)
             await InstalledPackagesPage.BackupPackages();
             DialogHelper.HideLoadingDialog();
         }
+
+        private void BackupNowButton_Local_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void BackupNowButton_LOCAL_Click_1(object sender, EventArgs e)
+        {
+
+        }
     }
 }

src/UniGetUI/Pages/SoftwarePages/InstalledPackagesPage.cs

@@ -286,7 +286,7 @@ protected override void WhenPackagesLoaded(ReloadReason reason)
         {
             if (!HasDoneBackup)
             {
-                if (Settings.Get(Settings.K.EnablePackageBackup))
+                if (Settings.Get(Settings.K.EnablePackageBackup_LOCAL))
                 {
                     _ = BackupPackages();
                 }