Rename nuget and namespace to remove company name from theme (#27)

Devolutions · Jan 10, 2025 · 182a9a6 · 182a9a6
1 parent 1719cd8
commit 182a9a6
Show file tree

Hide file tree

Showing 30 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml
@@ -97,15 +97,15 @@ jobs:
         shell: pwsh
         run: |
           $PackageVersion = '${{ needs.preflight.outputs.package-version }}'
-          $csprojPath = "src\Devolutions.MacOS.Avalonia.Theme\Devolutions.MacOS.Avalonia.Theme.csproj"
+          $csprojPath = "src\MacOS.Avalonia.Theme\MacOS.Avalonia.Theme.csproj"
           $csprojContent = Get-Content $csprojPath -Raw
           $csprojContent = $csprojContent -Replace '(<Version>).*?(</Version>)', "<Version>$PackageVersion</Version>"
           Set-Content -Path $csprojPath -Value $csprojContent -Encoding UTF8
 
       - name: Build nuget package
         shell: pwsh
         run: |
-          & dotnet pack .\src\Devolutions.MacOS.Avalonia.Theme -o package
+          & dotnet pack .\src\MacOS.Avalonia.Theme -o package
 
       - name: Code sign nuget contents
         shell: pwsh

diff --git a/README.md b/README.md
@@ -6,8 +6,8 @@ Custom Avalonia Themes developed by [Devolutions](https://devolutions.net/)
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
 [![Build Status](https://github.com/Devolutions/avalonia-themes/actions/workflows/build-package.yml/badge.svg?branch=master)](https://github.com/Devolutions/avalonia-themes/actions/workflows/build-package.yml)
-[![NuGet Version](https://img.shields.io/nuget/vpre/Devolutions.MacOS.Avalonia.Theme)](https://www.nuget.org/packages/Devolutions.MacOS.Avalonia.Theme)
-![NuGet Downloads](https://img.shields.io/nuget/dt/Devolutions.MacOS.Avalonia.Theme)
+[![NuGet Version](https://img.shields.io/nuget/vpre/MacOS.Avalonia.Theme)](https://www.nuget.org/packages/MacOS.Avalonia.Theme)
+![NuGet Downloads](https://img.shields.io/nuget/dt/MacOS.Avalonia.Theme)
 
 
 ## MacOS Theme [Work in Progress]
@@ -43,19 +43,19 @@ the goal is to create a theme that helps all of the Avalonia community to bring
 
 
 ## Installation
-Install the Devolutions.MacOS.Avalonia.Theme package via [NuGet](https://www.nuget.org/packages/Devolutions.MacOS.Avalonia.Theme):
+Install the MacOS.Avalonia.Theme package via [NuGet](https://www.nuget.org/packages/MacOS.Avalonia.Theme):
 ``` bash
-Install-Package Devolutions.MacOS.Avalonia.Theme
+Install-Package MacOS.Avalonia.Theme
 ```
 or .NET
 ```bash
-dotnet add package Devolutions.MacOS.Avalonia.Theme
+dotnet add package MacOS.Avalonia.Theme
 ```
 In your App.axaml, replace the existing theme (e.g. `<FluentTheme />` or `<SimpleTheme />`) with the macOS theme:
 ``` xaml
 <Application ...>
   <Application.Styles>
-     <StyleInclude Source="avares://Devolutions.MacOS.Avalonia.Theme/MacOSTheme.axaml" />
+     <StyleInclude Source="avares://MacOS.Avalonia.Theme/MacOSTheme.axaml" />
   </Application.Styles>
 </Application>
 ```

diff --git a/avalonia-themes.sln b/avalonia-themes.sln
@@ -2,7 +2,7 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleApp", "samples\SampleApp\SampleApp.csproj", "{8FB0A38F-D80A-45A1-9796-FD22FDB14064}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MacOS.Avalonia.Theme", "src\Devolutions.MacOS.Avalonia.Theme\Devolutions.MacOS.Avalonia.Theme.csproj", "{052424E1-48F3-4D8E-A780-DEB4D33B4482}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MacOS.Avalonia.Theme", "src\MacOS.Avalonia.Theme\MacOS.Avalonia.Theme.csproj", "{052424E1-48F3-4D8E-A780-DEB4D33B4482}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7756B42B-13EB-4DC9-BA61-11997466D93C}"
 EndProject

diff --git a/samples/SampleApp/App.axaml b/samples/SampleApp/App.axaml
@@ -12,6 +12,6 @@
 
   <Application.Styles>
     <!-- <FluentTheme /> -->
-    <StyleInclude Source="avares://Devolutions.MacOS.Avalonia.Theme/MacOSTheme.axaml" />
+    <StyleInclude Source="avares://MacOS.Avalonia.Theme/MacOSTheme.axaml" />
   </Application.Styles>
 </Application>
diff --git a/samples/SampleApp/SampleApp.csproj b/samples/SampleApp/SampleApp.csproj
@@ -23,7 +23,7 @@
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
         <PackageReference Include="Svg.SourceGenerator.Skia" Version="2.0.0.4"/>
         <PackageReference Include="Avalonia.Controls.Skia" Version="11.2.0.2"/>
-        <!-- <PackageReference Include="Devolutions.MacOS.Avalonia.Theme" Version="2024.12.4" /> -->
+        <!-- <PackageReference Include="MacOS.Avalonia.Theme" Version="2024.12.4" /> -->
     </ItemGroup>
 
     <ItemGroup>
@@ -36,6 +36,6 @@
     <!-- Temporary link for development. 
          (To use the published nuget, uncomment PackageReference above (update version) or install with Nuget manager) -->
     <ItemGroup>
-        <ProjectReference Include="..\..\src\Devolutions.MacOS.Avalonia.Theme\Devolutions.MacOS.Avalonia.Theme.csproj"/>
+        <ProjectReference Include="..\..\src\MacOS.Avalonia.Theme\MacOS.Avalonia.Theme.csproj" />
     </ItemGroup>
 </Project>
diff --git a/...sets/Alternating_Row_Background_Light.png → ...sets/Alternating_Row_Background_Light.png b/...sets/Alternating_Row_Background_Light.png → ...sets/Alternating_Row_Background_Light.png
diff --git a/....MacOS.Avalonia.Theme/Accents/Icons.axaml → src/MacOS.Avalonia.Theme/Accents/Icons.axaml b/....MacOS.Avalonia.Theme/Accents/Icons.axaml → src/MacOS.Avalonia.Theme/Accents/Icons.axaml
diff --git a/...ia.Theme/Accents/Light/ToggleSwitch.axaml → ...ia.Theme/Accents/Light/ToggleSwitch.axaml b/...ia.Theme/Accents/Light/ToggleSwitch.axaml → ...ia.Theme/Accents/Light/ToggleSwitch.axaml
diff --git a/...a.Theme/Accents/Shared/ToggleSwitch.axaml → ...a.Theme/Accents/Shared/ToggleSwitch.axaml b/...a.Theme/Accents/Shared/ToggleSwitch.axaml → ...a.Theme/Accents/Shared/ToggleSwitch.axaml
diff --git a/...alonia.Theme/Accents/ThemeResources.axaml → ...alonia.Theme/Accents/ThemeResources.axaml b/...alonia.Theme/Accents/ThemeResources.axaml → ...alonia.Theme/Accents/ThemeResources.axaml
@@ -149,7 +149,7 @@
   <Thickness x:Key="TreeViewItemChevronMargin">14, 0, 4, 0</Thickness>
 
   <ImageBrush x:Key="StripedBackgroundBrush"
-              Source="avares://Devolutions.MacOS.Avalonia.Theme/Accents/Assets/Alternating_Row_Background_Light.png"
+              Source="avares://MacOS.Avalonia.Theme/Accents/Assets/Alternating_Row_Background_Light.png"
               TileMode="Tile"
               Stretch="None"
               DestinationRect="0 0 40 40" />

diff --git a/...acOS.Avalonia.Theme/Controls/Button.axaml → ...acOS.Avalonia.Theme/Controls/Button.axaml b/...acOS.Avalonia.Theme/Controls/Button.axaml → ...acOS.Avalonia.Theme/Controls/Button.axaml
diff --git a/...OS.Avalonia.Theme/Controls/CheckBox.axaml → ...OS.Avalonia.Theme/Controls/CheckBox.axaml b/...OS.Avalonia.Theme/Controls/CheckBox.axaml → ...OS.Avalonia.Theme/Controls/CheckBox.axaml
diff --git a/...OS.Avalonia.Theme/Controls/ComboBox.axaml → ...OS.Avalonia.Theme/Controls/ComboBox.axaml b/...OS.Avalonia.Theme/Controls/ComboBox.axaml → ...OS.Avalonia.Theme/Controls/ComboBox.axaml
diff --git a/...valonia.Theme/Controls/ComboBoxItem.axaml → ...valonia.Theme/Controls/ComboBoxItem.axaml b/...valonia.Theme/Controls/ComboBoxItem.axaml → ...valonia.Theme/Controls/ComboBoxItem.axaml
diff --git a/...OS.Avalonia.Theme/Controls/DataGrid.axaml → ...OS.Avalonia.Theme/Controls/DataGrid.axaml b/...OS.Avalonia.Theme/Controls/DataGrid.axaml → ...OS.Avalonia.Theme/Controls/DataGrid.axaml
diff --git a/....Avalonia.Theme/Controls/TabControl.axaml → ....Avalonia.Theme/Controls/TabControl.axaml b/....Avalonia.Theme/Controls/TabControl.axaml → ....Avalonia.Theme/Controls/TabControl.axaml
diff --git a/...cOS.Avalonia.Theme/Controls/TabItem.axaml → ...cOS.Avalonia.Theme/Controls/TabItem.axaml b/...cOS.Avalonia.Theme/Controls/TabItem.axaml → ...cOS.Avalonia.Theme/Controls/TabItem.axaml
diff --git a/...S.Avalonia.Theme/Controls/TextBlock.axaml → ...S.Avalonia.Theme/Controls/TextBlock.axaml b/...S.Avalonia.Theme/Controls/TextBlock.axaml → ...S.Avalonia.Theme/Controls/TextBlock.axaml
diff --git a/...cOS.Avalonia.Theme/Controls/TextBox.axaml → ...cOS.Avalonia.Theme/Controls/TextBox.axaml b/...cOS.Avalonia.Theme/Controls/TextBox.axaml → ...cOS.Avalonia.Theme/Controls/TextBox.axaml
diff --git a/...valonia.Theme/Controls/ToggleSwitch.axaml → ...valonia.Theme/Controls/ToggleSwitch.axaml b/...valonia.Theme/Controls/ToggleSwitch.axaml → ...valonia.Theme/Controls/ToggleSwitch.axaml
diff --git a/...OS.Avalonia.Theme/Controls/TreeView.axaml → ...OS.Avalonia.Theme/Controls/TreeView.axaml b/...OS.Avalonia.Theme/Controls/TreeView.axaml → ...OS.Avalonia.Theme/Controls/TreeView.axaml
diff --git a/...valonia.Theme/Controls/TreeViewItem.axaml → ...valonia.Theme/Controls/TreeViewItem.axaml b/...valonia.Theme/Controls/TreeViewItem.axaml → ...valonia.Theme/Controls/TreeViewItem.axaml
diff --git a/...acOS.Avalonia.Theme/Controls/_index.axaml → ...acOS.Avalonia.Theme/Controls/_index.axaml b/...acOS.Avalonia.Theme/Controls/_index.axaml → ...acOS.Avalonia.Theme/Controls/_index.axaml
diff --git a/...me/Converters/BooleanToChoiceConverter.cs → ...me/Converters/BooleanToChoiceConverter.cs b/...me/Converters/BooleanToChoiceConverter.cs → ...me/Converters/BooleanToChoiceConverter.cs
@@ -2,7 +2,7 @@
 using Avalonia;
 using Avalonia.Data.Converters;
 
-namespace Devolutions.MacOS.Avalonia.Theme.Converters;
+namespace MacOS.Avalonia.Theme.Converters;
 
 public class BooleanToChoiceConverter : IMultiValueConverter
 {

diff --git a/...rters/CharToMacOsPasswordCharConverter.cs → ...rters/CharToMacOsPasswordCharConverter.cs b/...rters/CharToMacOsPasswordCharConverter.cs → ...rters/CharToMacOsPasswordCharConverter.cs
@@ -1,7 +1,7 @@
 using System.Globalization;
 using Avalonia.Data.Converters;
 
-namespace Devolutions.MacOS.Avalonia.Theme.Converters;
+namespace MacOS.Avalonia.Theme.Converters;
 
 public class CharToMacOsPasswordCharConverter : IValueConverter
 {

diff --git a/...ters/RevealPasswordToFontSizeConverter.cs → ...ters/RevealPasswordToFontSizeConverter.cs b/...ters/RevealPasswordToFontSizeConverter.cs → ...ters/RevealPasswordToFontSizeConverter.cs
@@ -1,7 +1,7 @@
 using System.Globalization;
 using Avalonia.Data.Converters;
 
-namespace Devolutions.MacOS.Avalonia.Theme.Converters;
+namespace MacOS.Avalonia.Theme.Converters;
 
 public class RevealPasswordToFontSizeConverter : IMultiValueConverter
 {

diff --git a/...rs/SelectedIndexToPopupOffsetConverter.cs → ...rs/SelectedIndexToPopupOffsetConverter.cs b/...rs/SelectedIndexToPopupOffsetConverter.cs → ...rs/SelectedIndexToPopupOffsetConverter.cs
@@ -1,7 +1,7 @@
 using System.Globalization;
 using Avalonia.Data.Converters;
 
-namespace Devolutions.MacOS.Avalonia.Theme.Converters;
+namespace MacOS.Avalonia.Theme.Converters;
 
 public class SelectedIndexToPopupOffsetConverter : IMultiValueConverter
 {

diff --git a/...a.Theme/Converters/TotalWidthConverter.cs → ...a.Theme/Converters/TotalWidthConverter.cs b/...a.Theme/Converters/TotalWidthConverter.cs → ...a.Theme/Converters/TotalWidthConverter.cs
@@ -1,7 +1,7 @@
 using System.Globalization;
 using Avalonia.Data.Converters;
 
-namespace Devolutions.MacOS.Avalonia.Theme.Converters;
+namespace MacOS.Avalonia.Theme.Converters;
 
 public class TotalWidthConverter : IMultiValueConverter
 {

diff --git a/...e/Devolutions.MacOS.Avalonia.Theme.csproj → ...valonia.Theme/MacOS.Avalonia.Theme.csproj b/...e/Devolutions.MacOS.Avalonia.Theme.csproj → ...valonia.Theme/MacOS.Avalonia.Theme.csproj
@@ -18,8 +18,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <AdditionalFiles Include="Converters/SelectedIndexToPopupOffsetConverter.cs" NamespaceName="Devolutions.MacOS.Avalonia.Theme.Converters" ClassName="IndexToOffsetConverters"/>
-        <AdditionalFiles Include="Converters/TotalWidthConverter.cs" NamespaceName="Devolutions.MacOS.Avalonia.Theme.Converters" ClassName="TotalWidthConverter"/>
+        <AdditionalFiles Include="Converters/SelectedIndexToPopupOffsetConverter.cs" NamespaceName="MacOS.Avalonia.Theme.Converters" ClassName="IndexToOffsetConverters"/>
+        <AdditionalFiles Include="Converters/TotalWidthConverter.cs" NamespaceName="MacOS.Avalonia.Theme.Converters" ClassName="TotalWidthConverter"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/...ons.MacOS.Avalonia.Theme/MacOSTheme.axaml → src/MacOS.Avalonia.Theme/MacOSTheme.axaml b/...ons.MacOS.Avalonia.Theme/MacOSTheme.axaml → src/MacOS.Avalonia.Theme/MacOSTheme.axaml
@@ -1,6 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:converters="clr-namespace:Devolutions.MacOS.Avalonia.Theme.Converters">
+        xmlns:converters="clr-namespace:MacOS.Avalonia.Theme.Converters">
   <Styles.Resources>
     <ResourceDictionary>
       <ResourceDictionary.MergedDictionaries>