Skip to content

Commit

Permalink
Merge pull request #134 from fullstackedorg/icons
Browse files Browse the repository at this point in the history 
MacOS dock and Windows window icons fix
  • Loading branch information
@cplepage
cplepage authored Jan 16, 2025
2 parents 7dad9a1 + 56b4b0d commit 7985659
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 13 deletions.
4 changes: 2 additions & 2 deletions platform/android/studio/app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ android {
applicationId = "org.fullstacked.editor"
minSdk = 29
targetSdk = 34
versionCode = 815
versionName = "0.11.0"
versionCode = 821
versionName = "0.10.5"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
Expand Down
16 changes: 8 additions & 8 deletions platform/apple/FullStacked.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = FullStacked/FullStacked.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 815;
CURRENT_PROJECT_VERSION = 821;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = QD7Y9DQ5V4;
ENABLE_PREVIEWS = YES;
Expand All @@ -399,7 +399,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.11.0;
MARKETING_VERSION = 0.10.5;
PRODUCT_BUNDLE_IDENTIFIER = editor.FullStacked;
PRODUCT_NAME = FullStacked;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand All @@ -420,7 +420,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = FullStacked/FullStacked.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 815;
CURRENT_PROJECT_VERSION = 821;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = QD7Y9DQ5V4;
ENABLE_PREVIEWS = YES;
Expand All @@ -441,7 +441,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.11.0;
MARKETING_VERSION = 0.10.5;
PRODUCT_BUNDLE_IDENTIFIER = editor.FullStacked;
PRODUCT_NAME = FullStacked;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand All @@ -463,7 +463,7 @@
CODE_SIGN_ENTITLEMENTS = FullStacked/FullStacked.entitlements;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 815;
CURRENT_PROJECT_VERSION = 821;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = QD7Y9DQ5V4;
Expand All @@ -490,7 +490,7 @@
"$(PROJECT_DIR)/FullStacked/bin",
);
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 0.11.0;
MARKETING_VERSION = 0.10.5;
PRODUCT_BUNDLE_IDENTIFIER = editor.FullStacked;
PRODUCT_NAME = FullStacked;
REGISTER_APP_GROUPS = NO;
Expand All @@ -514,7 +514,7 @@
CODE_SIGN_ENTITLEMENTS = FullStacked/FullStacked.entitlements;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 815;
CURRENT_PROJECT_VERSION = 821;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = QD7Y9DQ5V4;
Expand All @@ -541,7 +541,7 @@
"$(PROJECT_DIR)/FullStacked/bin",
);
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 0.11.0;
MARKETING_VERSION = 0.10.5;
PRODUCT_BUNDLE_IDENTIFIER = editor.FullStacked;
PRODUCT_NAME = FullStacked;
REGISTER_APP_GROUPS = NO;
Expand Down
Binary file modified platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/1024.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/128.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/256.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/512.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/64.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions platform/windows/App.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ private void bringToFront(WebView webview)
titleBar.ButtonBackgroundColor = primarycolor;
titleBar.ButtonHoverBackgroundColor = ColorHelper.FromArgb(1, 64, 73, 88);

newWindow.AppWindow.SetIcon("Assets/Icon-16.ico");

newWindow.Content = webview.webview;
newWindow.Activate();
this.webviews.Add(projectId, (newWindow, webview));
Expand Down
Binary file added platform/windows/Assets/Icon-16.ico
View file
Binary file not shown.
Binary file modified platform/windows/Assets/StoreLogo.scale-400.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions platform/windows/FullStacked.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@
</None>
</ItemGroup>

<ItemGroup>
<Content Update="Assets\Icon-16.ico">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>

<ItemGroup>
<None Update="editor\lib\components\snackbar.css">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Expand Down
2 changes: 1 addition & 1 deletion platform/windows/Package.appxmanifest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" xmlns:iot="http://schemas.microsoft.com/appx/manifest/iot/windows10" IgnorableNamespaces="uap rescap iot build" xmlns:build="http://schemas.microsoft.com/developer/appx/2015/build">

<Identity Name="Charles-PhilippeLepage.FullStackedBeta" Publisher="CN=3F94CE5F-7E00-4DE1-941D-8256CB924D0F" Version="0.10.792.0" />
<Identity Name="Charles-PhilippeLepage.FullStackedBeta" Publisher="CN=3F94CE5F-7E00-4DE1-941D-8256CB924D0F" Version="0.10.821.0" />

<Properties>
<DisplayName>FullStacked (Beta)</DisplayName>
Expand Down
4 changes: 2 additions & 2 deletions platform/windows/publish.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ child_process.execSync("npm run build -- --production", {

// build core

child_process.execSync("./windows.bat", {
child_process.execSync("cmd.exe /c windows.bat", {
cwd: path.resolve(rootDirectory, "core", "build"),
stdio: "inherit"
});

// update version

const winVersion = `${version.major}.${version.minor}.${version.build}.0`
const packageFile = "Package.appxmanifest";
const packageFile = path.resolve(currentDirectory, "Package.appxmanifest");
let packageContent = fs.readFileSync(packageFile, { encoding: "utf-8" });
packageContent = packageContent.replace(/\bVersion="\d+\.\d+\.\d+\.\d+"/g, `Version="${winVersion}"`)
fs.writeFileSync(packageFile, packageContent);
Expand Down

0 comments on commit 7985659

Please sign in to comment.