Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
1f22381
update packages and .net version
TheJoeFin Oct 6, 2025
d942f21
Initial plan
Copilot Nov 1, 2025
a0e4c96
Add logo overlay support for QR codes
Copilot Nov 1, 2025
c5a892d
Add proper disposal of logo images to prevent memory leaks
Copilot Nov 1, 2025
6197c21
Address code review feedback: extract magic numbers and use stream fo…
Copilot Nov 1, 2025
305bd87
Preserve logo aspect ratio to prevent distortion
Copilot Nov 1, 2025
763412d
Add logo size slider with error correction-based limits and optimize …
Copilot Nov 1, 2025
51db551
Improve QR code logo handling and error correction
TheJoeFin Nov 1, 2025
71cea3e
Add logo padding support for QR code generation
TheJoeFin Nov 1, 2025
113c3d2
Refactor QR code logo embedding and UI updates
TheJoeFin Nov 1, 2025
a390cd9
Add support for custom QR code background color
TheJoeFin Nov 1, 2025
a26351e
Refactor QR code generation and UI enhancements
TheJoeFin Nov 2, 2025
7648e5d
Add new IconAndTextContentControl
TheJoeFin Nov 17, 2025
9be34ee
Add new method for LogoImages on Barcodes GetMaxLogoSizePercentage
TheJoeFin Nov 17, 2025
9d73eed
Update packages
TheJoeFin Nov 17, 2025
f7c676d
Adjust min/max of the logo image size and use new IconAndTextContent …
TheJoeFin Nov 17, 2025
9a2e144
Add history support for logo images with local storage persistence
Copilot Nov 18, 2025
9c23fe9
Add logo padding pixels to history persistence
Copilot Nov 18, 2025
93694fe
Move history storage from settings to separate file with migration su…
Copilot Nov 19, 2025
8d460d6
Pass HistoryItem between pages for full state restoration including c…
Copilot Nov 19, 2025
857ebe7
Update SizeTextVisible logic in BarcodeImageItem
TheJoeFin Nov 19, 2025
01fd6ef
Adjust layout and button sizes in QrCodeOptions UI
TheJoeFin Nov 20, 2025
1371b2f
Merge pull request #38 from TheJoeFin/copilot/add-logo-to-qr-code-again
TheJoeFin Nov 20, 2025
fe153ec
Update namespace and add new FAQ items to FaqItem.cs
TheJoeFin Nov 20, 2025
9802a37
update packages
TheJoeFin Dec 1, 2025
0365c13
Change names
TheJoeFin Dec 1, 2025
ccc4e8a
Add a CI/CD build pipeline
TheJoeFin Dec 1, 2025
b4b9e3f
Update version number
TheJoeFin Dec 1, 2025
19507b6
update Actions script
TheJoeFin Dec 1, 2025
d5d2acf
update build yml
TheJoeFin Dec 1, 2025
b7f8dfb
update build yml
TheJoeFin Dec 1, 2025
9de5e06
use build pipeline from Trdo
TheJoeFin Dec 1, 2025
ac4ac3f
Remove Generate Appx Pkg on build to resolve CI issues
TheJoeFin Dec 1, 2025
6bf7013
Try lowering targer framework version for CI
TheJoeFin Dec 1, 2025
d96868d
use Trdo csproj for ci
TheJoeFin Dec 1, 2025
dd2c44e
use msbuild not dotnet build
TheJoeFin Dec 2, 2025
0cc2caa
tweak MSBuild args
TheJoeFin Dec 2, 2025
ebf8050
removing auto build pipeline
TheJoeFin Dec 4, 2025
8f5262a
Bump app version to 1.10.0.0
TheJoeFin Dec 4, 2025
d16f000
Fix the version, should be 1.9
TheJoeFin Dec 4, 2025
b81769f
Drop x86 support and update project configurations
TheJoeFin Dec 7, 2025
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
38 changes: 38 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Build

on:
# push:
# branches:
# - main
# - dev
# pull_request:
# branches:
# - main
# - dev
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}
cancel-in-progress: true

jobs:
build:
runs-on: windows-latest

steps:
- name: Checkout code
uses: actions/checkout@v6

- name: Setup .NET
uses: actions/setup-dotnet@v5
with:
dotnet-version: '9.0.x'

- name: Setup MSBuild
uses: microsoft/setup-msbuild@v2

- name: Restore
run: msbuild "Simple QR Code Maker.sln" /t:Restore /p:Configuration=Release /p:Platform=x64

- name: Build
run: msbuild "Simple QR Code Maker.sln" /p:Configuration=Release /p:Platform=x64
6 changes: 3 additions & 3 deletions Simple QR Code Maker.Core/Simple QR Code Maker.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>Simple_QR_Code_Maker.Core</RootNamespace>
<Platforms>x86;x64;arm64;AnyCPU</Platforms>
<Platforms>x64;arm64</Platforms>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

Expand All @@ -11,6 +11,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Text.Json" Version="9.0.4" />
<PackageReference Include="System.Text.Json" Version="10.0.0" />
</ItemGroup>
</Project>
69 changes: 0 additions & 69 deletions Simple QR Code Maker.sln

This file was deleted.

17 changes: 17 additions & 0 deletions Simple QR Code Maker.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Solution>
<Configurations>
<Platform Name="arm64" />
<Platform Name="x64" />
</Configurations>
<Project Path="Simple QR Code Maker.Core/Simple QR Code Maker.Core.csproj">
<Platform Solution="*|arm64" Project="arm64" />
<Platform Solution="*|x64" Project="x64" />
<Platform Solution="*|x86" Project="x86" />
</Project>
<Project Path="Simple QR Code Maker/Simple QR Code Maker.csproj">
<Platform Solution="*|arm64" Project="arm64" />
<Platform Solution="*|x64" Project="x64" />
<Platform Solution="*|x86" Project="x86" />
<Deploy />
</Project>
</Solution>
17 changes: 17 additions & 0 deletions Simple QR Code Maker/Controls/IconAndTextContent.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8" ?>
<StackPanel
x:Class="Simple_QR_Code_Maker.Controls.IconAndTextContent"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:Simple_QR_Code_Maker.Controls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
DataContext="{Binding}"
Orientation="Horizontal"
Spacing="6"
mc:Ignorable="d">
<Viewbox Height="14">
<SymbolIcon Symbol="{x:Bind Icon}" />
</Viewbox>
<TextBlock Text="{x:Bind ContentText}" />
</StackPanel>
26 changes: 26 additions & 0 deletions Simple QR Code Maker/Controls/IconAndTextContent.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;

namespace Simple_QR_Code_Maker.Controls;

public sealed partial class IconAndTextContent : StackPanel
{
public IconAndTextContent()
{
InitializeComponent();
}

public Symbol Icon
{ get => (Symbol)GetValue(IconProperty); set => SetValue(IconProperty, value);
}

public static readonly DependencyProperty IconProperty =
DependencyProperty.Register(nameof(Icon), typeof(Symbol), typeof(IconAndTextContent), new PropertyMetadata(Symbol.Placeholder));

public string ContentText
{ get => (string)GetValue(ContentTextProperty); set => SetValue(ContentTextProperty, value);
}

public static readonly DependencyProperty ContentTextProperty =
DependencyProperty.Register(nameof(ContentText), typeof(string), typeof(IconAndTextContent), new PropertyMetadata(string.Empty));
}
Loading