diff --git a/platform/android/studio/app/build.gradle.kts b/platform/android/studio/app/build.gradle.kts index 0860018a..4a2c77d6 100644 --- a/platform/android/studio/app/build.gradle.kts +++ b/platform/android/studio/app/build.gradle.kts @@ -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 { diff --git a/platform/apple/FullStacked.xcodeproj/project.pbxproj b/platform/apple/FullStacked.xcodeproj/project.pbxproj index b7f8d4d0..eece6eac 100644 --- a/platform/apple/FullStacked.xcodeproj/project.pbxproj +++ b/platform/apple/FullStacked.xcodeproj/project.pbxproj @@ -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; @@ -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"; @@ -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; @@ -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"; @@ -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; @@ -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; @@ -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; @@ -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; diff --git a/platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/1024.png b/platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/1024.png index a84b41c6..524b80df 100644 Binary files a/platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/1024.png and b/platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/1024.png differ diff --git a/platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/128.png b/platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/128.png index 5d4bbc15..ab490cea 100644 Binary files a/platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/128.png and b/platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/128.png differ diff --git a/platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/256.png b/platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/256.png index 0c28f7b1..3695d485 100644 Binary files a/platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/256.png and b/platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/256.png differ diff --git a/platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/512.png b/platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/512.png index 6e36e9e1..d2afc410 100644 Binary files a/platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/512.png and b/platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/512.png differ diff --git a/platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/64.png b/platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/64.png index 20d17476..732eb079 100644 Binary files a/platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/64.png and b/platform/apple/FullStacked/Assets.xcassets/AppIcon.appiconset/64.png differ diff --git a/platform/windows/App.xaml.cs b/platform/windows/App.xaml.cs index c531cb3e..434f867c 100644 --- a/platform/windows/App.xaml.cs +++ b/platform/windows/App.xaml.cs @@ -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)); diff --git a/platform/windows/Assets/Icon-16.ico b/platform/windows/Assets/Icon-16.ico new file mode 100644 index 00000000..d052435c Binary files /dev/null and b/platform/windows/Assets/Icon-16.ico differ diff --git a/platform/windows/Assets/StoreLogo.scale-400.png b/platform/windows/Assets/StoreLogo.scale-400.png index 779206d8..c5cdace0 100644 Binary files a/platform/windows/Assets/StoreLogo.scale-400.png and b/platform/windows/Assets/StoreLogo.scale-400.png differ diff --git a/platform/windows/FullStacked.csproj b/platform/windows/FullStacked.csproj index 5b2832fe..78b753b5 100644 --- a/platform/windows/FullStacked.csproj +++ b/platform/windows/FullStacked.csproj @@ -99,6 +99,12 @@ + + + Always + + + Always diff --git a/platform/windows/Package.appxmanifest b/platform/windows/Package.appxmanifest index c52fc120..c330329f 100644 --- a/platform/windows/Package.appxmanifest +++ b/platform/windows/Package.appxmanifest @@ -2,7 +2,7 @@ - + FullStacked (Beta) diff --git a/platform/windows/publish.js b/platform/windows/publish.js index eab710c8..981afc94 100644 --- a/platform/windows/publish.js +++ b/platform/windows/publish.js @@ -16,7 +16,7 @@ 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" }); @@ -24,7 +24,7 @@ child_process.execSync("./windows.bat", { // 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);