Dynamic installation status icon

Author: shatyuka

CollapseLauncher/Classes/InstallManagement/Base/InstallManagerBase.cs

@@ -247,6 +247,7 @@ protected virtual async ValueTask<int> ConfirmDeltaPatchDialog(DeltaPatchPropert
             {
                 // Set the activity
                 Status.ActivityStatus            = Lang!._GameRepairPage!.Status2!;
+                Status.ActivityStatusInternet    = false;
                 Status.IsIncludePerFileIndicator = false;
                 Status.IsProgressAllIndetermined = true;
                 UpdateStatus();
@@ -256,9 +257,10 @@ protected virtual async ValueTask<int> ConfirmDeltaPatchDialog(DeltaPatchPropert
                 bool isDownloadNeeded = await _gameRepairTool.StartCheckRoutine()!;
                 if (isDownloadNeeded)
                 {
-                    Status.ActivityStatus   = Lang._GameRepairPage.Status8!.Replace(": ", "");
-                    ProgressAllSizeCurrent  = 0;
-                    ProgressAllCountCurrent = 1;
+                    Status.ActivityStatus         = Lang._GameRepairPage.Status8!.Replace(": ", "");
+                    Status.ActivityStatusInternet = false;
+                    ProgressAllSizeCurrent        = 0;
+                    ProgressAllCountCurrent       = 1;
                     UpdateStatus();
 
                     // If download needed, then start the repair (download) routine
@@ -310,12 +312,13 @@ protected virtual async ValueTask<bool> StartDeltaPatch(IRepairAssetIndex repair
 
                 // Get the sum of uncompressed size and
                 // Set progress count to beginning
-                ProgressAllSizeTotal              = localAssetIndex!.Sum(x => x!.S);
-                ProgressAllSizeCurrent            = 0;
-                ProgressAllCountCurrent           = 1;
+                ProgressAllSizeTotal             = localAssetIndex!.Sum(x => x!.S);
+                ProgressAllSizeCurrent           = 0;
+                ProgressAllCountCurrent          = 1;
                 Status.IsIncludePerFileIndicator = false;
                 Status.IsProgressAllIndetermined = true;
                 Status.ActivityStatus            = Lang!._Misc!.ApplyingPatch;
+                Status.ActivityStatusInternet    = false;
                 UpdateStatus();
 
                 // Start the patching process
@@ -722,6 +725,7 @@ private async ValueTask<int> RunPackageVerificationRoutine(GameInstallPackage as
                 Status.ActivityStatus =
                     $"{Lang!._Misc!.Verifying}: {string.Format(Lang._Misc.PerFromTo!, ProgressAllCountCurrent,
                                                                ProgressAllCountTotal)}";
+                Status.ActivityStatusInternet = false;
                 UpdateStatus();
 
                 // Run the check and assign to hashLocal variable
@@ -891,6 +895,7 @@ protected virtual async Task StartPackageInstallationInner(List<GameInstallPacka
                 Status.ActivityStatus =
                     $"{Lang!._Misc!.Extracting}: {string.Format(Lang._Misc.PerFromTo!, ProgressAllCountCurrent,
                                                                 ProgressAllCountTotal)}";
+                Status.ActivityStatusInternet        = false;
                 Status.IsProgressPerFileIndetermined = false;
                 Status.IsProgressAllIndetermined     = false;
                 UpdateStatus();
@@ -957,6 +962,7 @@ protected virtual async Task StartPackageInstallationInner(List<GameInstallPacka
                     Status.ActivityStatus = $"{Lang!._Misc!.FinishingUp}: {string.Format(Lang._Misc.PerFromTo!,
                         ProgressAllCountCurrent,
                         ProgressAllCountTotal)}";
+                    Status.ActivityStatusInternet        = false;
                     Status.IsProgressPerFileIndetermined = true;
                     Status.IsProgressAllIndetermined     = true;
                     UpdateStatus();
@@ -1746,6 +1752,7 @@ protected virtual async Task ApplyHDiffMap()
                     Status.ActivityStatus =
                         $"{Lang._Misc.Patching}: {string.Format(Lang._Misc.PerFromTo, ProgressAllCountTotal,
                                                                 ProgressAllCountFound)}";
+                    Status.ActivityStatusInternet = false;
 
                     bool isSuccess = false;
 
@@ -1922,6 +1929,7 @@ public virtual async Task ApplyHdiffListPatch()
                 Status.ActivityStatus =
                     $"{Lang._Misc.Patching}: {string.Format(Lang._Misc.PerFromTo, ProgressAllCountTotal,
                                                             ProgressAllCountFound)}";
+                Status.ActivityStatusInternet = false;
 
                 string patchBasePath  = Path.Combine(GamePath, ConverterTool.NormalizePath(entry.remoteName));
                 string sourceBasePath = GetBasePersistentDirectory(GamePath, entry.remoteName);
@@ -3267,6 +3275,7 @@ private async ValueTask RunPackageDownloadRoutine(Http               httpClient,
             Status.ActivityStatus =
                 $"{Lang._Misc.Downloading}: {string.Format(Lang._Misc.PerFromTo, ProgressAllCountCurrent,
                                                            ProgressAllCountTotal)}";
+            Status.ActivityStatusInternet = true;
             LogWriteLine($"Downloading package URL {ProgressAllCountCurrent}/{ProgressAllCountTotal} ({ConverterTool.SummarizeSizeSimple(package.Size)}): {package.URL}");
 
             // If the file exist or package size is unmatched,
@@ -3317,6 +3326,7 @@ await RunDownloadTask(
                 Status.ActivityStatus =
                     $"{Lang._Misc.Merging}: {string.Format(Lang._Misc.PerFromTo, ProgressAllCountCurrent,
                                                            ProgressAllCountTotal)}";
+                Status.ActivityStatusInternet = false;
                 UpdateStatus();
 
                 // Check if the merge chunk is enabled and the download could perform multisession,

CollapseLauncher/Classes/Interfaces/Class/Structs.cs

@@ -34,6 +34,7 @@ internal class TotalPerFileProgress
     internal class TotalPerFileStatus
     {
         public string ActivityStatus { get; set; }
+        public bool ActivityStatusInternet { get; set; }
 
         public string ActivityAll { get; set; }
         public bool IsProgressAllIndetermined { get; set; }

CollapseLauncher/XAMLs/MainApp/Pages/HomePage.GameManagement.cs

@@ -465,6 +465,9 @@ private void GameInstall_StatusChanged_Inner(TotalPerFileStatus e)
 
         progressRing.IsIndeterminate        = e.IsProgressAllIndetermined;
         progressRingPerFile.IsIndeterminate = e.IsProgressPerFileIndetermined;
+
+        ProgressStatusIconDisk.Visibility = e.ActivityStatusInternet ? Visibility.Collapsed : Visibility.Visible;
+        ProgressStatusIconInternet.Visibility = e.ActivityStatusInternet ? Visibility.Visible : Visibility.Collapsed;
     }
 
     private void GameInstall_ProgressChanged(object sender, TotalPerFileProgress e)
@@ -905,4 +908,4 @@ private void CancelInstallationDownload()
         CurrentGameProperty.GameInstall.CancelRoutine();
     }
     #endregion
-}
+}

CollapseLauncher/XAMLs/MainApp/Pages/HomePage.xaml

@@ -1355,9 +1355,17 @@
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition MaxWidth="160" />
                     </Grid.ColumnDefinitions>
-                    <FontIcon FontFamily="{ThemeResource FontAwesome}"
+                    <FontIcon x:Name="ProgressStatusIconDisk"
+                              Grid.Column="0"
+                              FontFamily="{ThemeResource FontAwesome}"
                               FontSize="12"
                               Glyph="" />
+                    <FontIcon x:Name="ProgressStatusIconInternet"
+                              Grid.Column="0"
+                              Visibility="Collapsed"
+                              FontFamily="{ThemeResource FontAwesomeSolid}"
+                              FontSize="12"
+                              Glyph="" />
                     <TextBlock x:Name="ProgressStatusFooter"
                                Grid.Column="1"
                                FontSize="10"