Skip to content

feat: Next update #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andyld97 merged 5 commits into from
Apr 3, 2026
Merged

feat: Next update #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fe79540
ci/cd: Try fast-actions for .NET setup
andyld97 Jan 27, 2026
277d4d3
feat: Updated nuget packages
andyld97 Jan 27, 2026
b8af898
feat: Updated PDF2J URL & Nuget Packages
andyld97 Mar 24, 2026
151fdbc
feat: Updated version & nuget packges
andyld97 Apr 3, 2026
eead527
feat: Dark Scrollbar (in Dark Mode)
andyld97 Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ jobs:
uses: actions/checkout@v3

- name: Setup .NET
uses: actions/setup-dotnet@v1
uses: fast-actions/setup-dotnet@v1
with:
dotnet-version: '10.0'
include-prerelease: True
sdk-version: '10.x'
cache: false

- name: Add package sources
run: nuget sources Add -Name "Fluent.Ribbon (AppVeyor)" -Source https://ci.appveyor.com/nuget/fluent-ribbon
Expand Down
6 changes: 3 additions & 3 deletions Helper Applications/PDF2J/PDF2J.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.10.0" />
<PackageReference Include="Magick.NET.Core" Version="14.10.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.0" />
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.11.1" />
<PackageReference Include="Magick.NET.Core" Version="14.11.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.7" />
<PackageReference Include="WebhookAPI" Version="1.0.7" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion Helper Applications/TouchDeviceManager/Touch Device Manager.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Data.DataSetExtensions" Version="4.6.0-preview3.19128.7" />
<PackageReference Include="System.Management" Version="10.0.1" />
<PackageReference Include="System.Management" Version="10.0.5" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion Shared Libraries/SimpleJournal.Common/SimpleJournal.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="10.0.1" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="10.0.5" />
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions Shared Libraries/SimpleJournal.Common/Strings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ namespace SimpleJournal.Common
{
public static class Strings
{
public const string Version = "0.7.1.0";
public const string StoreVersion = "1.710.0.0";
public const string Copyright = "Copyright © 2018-2025";
public const string Version = "0.7.2.0";
public const string StoreVersion = "1.720.0.0";
public const string Copyright = "Copyright © 2018-2026";

#if UWPNEW || NORMAL
public static readonly DateTime ReleaseDate = new DateTime(2025, 12, 27, 12, 0, 0);
public static readonly DateTime ReleaseDate = new DateTime(2026, 04, 03, 10, 41, 0);
#else
public static readonly DateTime ReleaseDate = DateTime.Now;
#endif
Expand Down
4 changes: 2 additions & 2 deletions Shared Libraries/SimpleJournal.Documents.PDF/SimpleJournal.Documents.PDF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.10.0" />
<PackageReference Include="Magick.NET.Core" Version="14.10.0" />
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.11.1" />
<PackageReference Include="Magick.NET.Core" Version="14.11.1" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions SimpleJournal/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,7 @@

<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/Fluent;Component/Themes/Generic.xaml" />
<ResourceDictionary Source="/resources/ScrollBar.xaml" />
<!-- Directly use ColorPalette.xaml to prevent messing up all other styles! -->
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;Component/Themes/ColorPicker/ColorPalette.xaml" />
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;Component/Styles/Controls.Slider.xaml" />
Expand Down
5 changes: 2 additions & 3 deletions SimpleJournal/Consts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public static class Consts
public static readonly string GhostScriptDownloadUrl = "https://ghostscript.com/releases/gsdnld.html";
public static readonly string DotnetReleaseInfoUrl = "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/10.0/releases.json";
#if !DEBUG
public static readonly string ConverterAPIUrl = "https://cas-server2.ddns.net:8080";
public static readonly string ConverterAPIUrl = "https://andy97.de:8080";
#else
public static readonly string ConverterAPIUrl = "http://127.0.0.1:5290";
#endif
Expand All @@ -42,7 +42,7 @@ public static class Consts
/// <summary>
/// The .NET version which was used to compile SJ
/// </summary>
public static readonly Version CompiledDotnetVersion = new Version(10, 0, 1);
public static readonly Version CompiledDotnetVersion = new Version(10, 0, 5);

/// <summary>
/// Polling interval for NotificationService
Expand All @@ -62,7 +62,6 @@ public static class Consts

#endregion


public static readonly string WebView2CachePath = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "SimpleJournal", "WebView2");

#if !UWP
Expand Down
55 changes: 29 additions & 26 deletions SimpleJournal/Helper/GeneralHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,15 @@
using ControlzEx.Theming;
using Newtonsoft.Json;
using SimpleJournal.Controls;
using SimpleJournal.Data;
using SimpleJournal.Dialogs;
using SimpleJournal.Common;
using SimpleJournal.Documents.UI.Controls;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Net;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Ink;
using System.Windows.Input;
using System.Windows.Markup;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using System.Xml;
using SimpleJournal.Documents;
using SimpleJournal.Common.Helper;
using SimpleJournal.Documents.UI.Extensions;
using SimpleJournal.Documents.PDF;
using System.Threading.Tasks;
using System.Net.Http;
Expand Down Expand Up @@ -63,27 +48,45 @@ public static string GetCurrentTheme()

public static void ApplyTheming()
{
Color sidebarColor, linkColor, tabControlBackgroundColor, tabItemBackground, tabItemSelectedBackground;
Color
sidebarColor, linkColor, tabControlBackgroundColor, tabItemBackground, tabItemSelectedBackground;

static Color ToColor(string hex) => (Color)ColorConverter.ConvertFromString(hex);
static Brush ToBrush(string hex) => new SolidColorBrush(ToColor(hex));

string transparency = Settings.Instance.UseObjectBarTransparency ? "AF" : "FF";

if (Settings.Instance.UseDarkMode)
{
sidebarColor = (Color)ColorConverter.ConvertFromString($"#{transparency}252525");
sidebarColor = ToColor($"#{transparency}252525");
linkColor = Colors.White;
tabControlBackgroundColor = Colors.Black;

tabItemBackground = (Color)ColorConverter.ConvertFromString("#AF282828");
tabItemSelectedBackground = (Color)ColorConverter.ConvertFromString("#282828");
tabItemBackground = ToColor("#AF282828");
tabItemSelectedBackground = ToColor("#282828");

// Scrollbar / Dark
App.Current.Resources["ScrollBarButtonBackgroundBrush"] = ToBrush("#FF2B2B2B");
App.Current.Resources["ScrollbarThumb"] = ToBrush("#FF383838");
App.Current.Resources["ScrollBarButtonHighlightBackgroundBrush"] = ToBrush("#FF3C3C3C");
App.Current.Resources["ScrollBarButtonArrowForegroundBrush"] = ToBrush("#FFD0D0D0");
App.Current.Resources["ScrollBarTrackBrush"] = ToBrush("#FF1C1C1C");
}
else
{
sidebarColor = (Color)ColorConverter.ConvertFromString($"#{transparency}CECACA");
sidebarColor = ToColor($"#{transparency}CECACA");
linkColor = Colors.MediumBlue;
tabControlBackgroundColor = (Color)ColorConverter.ConvertFromString($"#DADADA");
tabControlBackgroundColor = ToColor($"#DADADA");

tabItemBackground = ToColor("#D7D7D7");
tabItemSelectedBackground = ToColor("#F9F9F9");

tabItemBackground = (Color)ColorConverter.ConvertFromString("#D7D7D7");
tabItemSelectedBackground = (Color)ColorConverter.ConvertFromString("#F9F9F9");
// Scrollbar / Light
App.Current.Resources["ScrollBarButtonBackgroundBrush"] = ToBrush("#FFE6E6E6");
App.Current.Resources["ScrollbarThumb"] = ToBrush("#FFB5B5B5");
App.Current.Resources["ScrollBarButtonHighlightBackgroundBrush"] = ToBrush("#FFDADADA");
App.Current.Resources["ScrollBarButtonArrowForegroundBrush"] = ToBrush("#FF4A4A4A");
App.Current.Resources["ScrollBarTrackBrush"] = ToBrush("#FFF5F5F5");
}

// Apply own theming colors
Expand All @@ -98,7 +101,7 @@ public static void ApplyTheming()
{
if (Settings.Instance.UseDarkMode)
{
var fixedBlack = (Color)ColorConverter.ConvertFromString("#FF252525");
var fixedBlack = ToColor("#FF252525");
theme.Resources["Fluent.Ribbon.Colors.White"] = fixedBlack;
theme.Resources["Fluent.Ribbon.Brushes.White"] = new SolidColorBrush(fixedBlack);
}
Expand Down Expand Up @@ -411,9 +414,9 @@ public static bool InstallFileAssoc()

public static bool InstallUWPFileAssoc()
{
GeneralHelper.InstallApplicationIconForFileAssociation();
InstallApplicationIconForFileAssociation();

if (GeneralHelper.InstallFileAssoc())
if (InstallFileAssoc())
{
var executableSJFileAssocFile = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "journal", "SjFileAssoc.exe");
if (System.IO.File.Exists(executableSJFileAssocFile))
Expand Down
10 changes: 5 additions & 5 deletions SimpleJournal/SimpleJournal.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,13 +281,13 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Fluent.Ribbon" Version="11.0.1" />
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.10.0" />
<PackageReference Include="Magick.NET.Core" Version="14.10.0" />
<PackageReference Include="Fluent.Ribbon" Version="11.0.2" />
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.11.1" />
<PackageReference Include="Magick.NET.Core" Version="14.11.1" />
<PackageReference Include="MahApps.Metro" Version="3.0.0-alpha0513" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3650.58" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3856.49" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="10.0.1" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="10.0.5" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Shared Libraries\SimpleJournal.Common\SimpleJournal.Common.csproj" />
Expand Down
Loading
Loading