Merge branch 'master' of https://github.com/YBTopaz8/Dimmer-MAUI

YBTopaz8 · Jan 1, 2025 · 5e244d7 · 5e244d7
2 parents e627b3f + e979430
commit 5e244d7
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 162 deletions.
diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
diff --git a/.github/workflows/release-dimmer.yml b/.github/workflows/release-dimmer.yml
@@ -1,14 +1,9 @@
 name: Build and Release Dimmer
 
-on:
-  release:
-    types: [published]
-  pull_request:
-    branches:
-      - main
+on: push
 
 jobs:
-  build-windows:
+    build-windows:
     name: Build and Package Windows Installer
     runs-on: windows-latest
 
@@ -27,15 +22,17 @@ jobs:
           --self-contained=false -p:WindowsPackageType=None \
           -o ./windows-output
 
-      - name: Install Inno Setup
-        uses: jrsoftware/issrc-action@v1
-        with:
-          inno-setup-version: latest # or specify a version
+      - name: Download and Install Inno Setup
+        run: |
+          $innoSetupUrl = "https://files.jrsoftware.org/is/6/innosetup-6.3.3.exe"  # Update if newer version
+          $installerPath = "innosetup.exe"
+          Invoke-WebRequest -Uri $innoSetupUrl -OutFile $installerPath
+          Start-Process -Wait -FilePath $installerPath -ArgumentList "/VERYSILENT /SUPPRESSMSGBOXES /NORESTART"
 
       - name: Package with Inno Setup
         run: |
           # Pass the Windows output directory as a define and explicitly set the output directory
-          ISCC.exe /dMySourceDir=./windows-output /o./Output ./releasePackaging/setup_dimmer.iss
+          ISCC.exe /dMySourceDir=./windows-output /o./Output ./releasePacking/setup_dimmer.iss
 
       - name: Verify Installer Exists
         run: |
@@ -46,6 +43,7 @@ jobs:
             echo "Installer file found: ./Output/Setup_Dimmer.exe"
           fi
 
+
       - name: Upload Windows Installer Artifact
         uses: actions/upload-artifact@v3
         with:
@@ -139,4 +137,4 @@ jobs:
       #     upload_url: ${{ steps.create_release.outputs.upload_url }}
       #     asset_path: ./release-assets/android/Dimmer-Aligned.apk
       #     asset_name: Dimmer.apk
-      #     asset_content_type: application/vnd.android.package-archive
+      #     asset_content_type: application/vnd.android.package-archive
diff --git a/Dimmer/Platforms/Windows/Package.appxmanifest b/Dimmer/Platforms/Windows/Package.appxmanifest
@@ -6,7 +6,7 @@
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   IgnorableNamespaces="uap rescap">
 
-  <Identity Name="maui-package-name-placeholder" Publisher="CN=YvanBrunel" Version="0.7.0.0" />
+  <Identity Name="maui-package-name-placeholder" Publisher="CN=YvanBrunel" Version="0.9.0.0" />
 
   <mp:PhoneIdentity PhoneProductId="8EA403B0-ABFE-4371-8CD3-4C4A71E7FD9B" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

diff --git a/Dimmer/ViewModels/PlaylistSection.HomePageVM.cs b/Dimmer/ViewModels/PlaylistSection.HomePageVM.cs
@@ -1,7 +1,4 @@
-
-
-
-namespace Dimmer_MAUI.ViewModels;
+namespace Dimmer_MAUI.ViewModels;
 public partial class HomePageVM
 {
     [ObservableProperty]

diff --git a/Dimmer/ViewModels/StatsSection.HomePageVM.cs b/Dimmer/ViewModels/StatsSection.HomePageVM.cs
@@ -50,7 +50,7 @@ void ShowTopTenSongsForSpecificDay(DateTimeOffset? selectedDay)
         //    .Count(d => d.DatePlayed.Date == selectedDay.Value.Date && d.WasPlayCompleted == true)
     })
     .OrderByDescending(s => s.PlayCount)
-    .Take(10)
+    .Take(15)
     .ToObservableCollection();
 
 
@@ -70,7 +70,7 @@ void ShowTopTenSongsForSpecificDay(DateTimeOffset? selectedDay)
     };
 
     [ObservableProperty]
-    SingleSongStatistics songPickedForStats;
+    public partial SingleSongStatistics SongPickedForStats { get; set; }
     [ObservableProperty]
     int numberOfTimesPlayed;
     [ObservableProperty]