diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 89dbd85..017de56 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -13,8 +13,8 @@ android { minSdk = 26 targetSdk = 35 // versionCode = major*1_000_000 + minor*10_000 + patch*100 + build - versionCode = 4_021_001 - versionName = "4.2.1+1" + versionCode = 4_022_001 + versionName = "4.2.2+1" vectorDrawables.useSupportLibrary = true ndk { abiFilters += listOf("arm64-v8a", "armeabi-v7a", "x86_64") diff --git a/dist/navis-release/update.json b/dist/navis-release/update.json index 2569d01..3a94e8e 100644 --- a/dist/navis-release/update.json +++ b/dist/navis-release/update.json @@ -1,16 +1,16 @@ { - "version": "4.2.1", - "notes": "4.2.1: исправлены опечатки Румынии (флаг RO), чистая шапка списка серверов, полезные ссылки вместо рекомендаций, убраны мусорные подписи на Защите, большая кнопка ПОДКЛЮЧИТЬСЯ всегда видна, свойства сервера заполнены, без T/V бейджей в списке", + "version": "4.2.2", + "notes": "4.2.2: светлая тема по умолчанию, ссылка поддержки Telegram → @evilfox100Bot", "platform": "windows-amd64", "os": "windows", "arch": "amd64", "url": "https://git.de4ima.uk/Evilfox/navi/raw/branch/Windows/dist/navis-release/windows/EvilFox.exe", - "sha256": "c3885d6d0c5b6e542fe1a172650c2f9480afde2b9016ceb1a5699f851761b837", + "sha256": "1cf00e87907714c299838ab1422ec593275e4dacfccca8e9914d21b2f4c51c87", "mandatory": false, "platforms": { "windows-amd64": { "url": "https://git.de4ima.uk/Evilfox/navi/raw/branch/Windows/dist/navis-release/windows/EvilFox.exe", - "sha256": "c3885d6d0c5b6e542fe1a172650c2f9480afde2b9016ceb1a5699f851761b837", + "sha256": "1cf00e87907714c299838ab1422ec593275e4dacfccca8e9914d21b2f4c51c87", "os": "windows", "arch": "amd64" }, diff --git a/dist/navis-release/windows/EvilFox.exe b/dist/navis-release/windows/EvilFox.exe index 1037401..13c5a9e 100644 Binary files a/dist/navis-release/windows/EvilFox.exe and b/dist/navis-release/windows/EvilFox.exe differ diff --git a/dist/navis-release/windows/Navis.exe b/dist/navis-release/windows/Navis.exe index 1037401..13c5a9e 100644 Binary files a/dist/navis-release/windows/Navis.exe and b/dist/navis-release/windows/Navis.exe differ diff --git a/dist/navis-release/windows/evilfox-cli.exe b/dist/navis-release/windows/evilfox-cli.exe index 708dcc2..1013364 100644 Binary files a/dist/navis-release/windows/evilfox-cli.exe and b/dist/navis-release/windows/evilfox-cli.exe differ diff --git a/dist/navis-release/windows/vpnclient.exe b/dist/navis-release/windows/vpnclient.exe index 708dcc2..1013364 100644 Binary files a/dist/navis-release/windows/vpnclient.exe and b/dist/navis-release/windows/vpnclient.exe differ diff --git a/dist/update.json b/dist/update.json index 2569d01..3a94e8e 100644 --- a/dist/update.json +++ b/dist/update.json @@ -1,16 +1,16 @@ { - "version": "4.2.1", - "notes": "4.2.1: исправлены опечатки Румынии (флаг RO), чистая шапка списка серверов, полезные ссылки вместо рекомендаций, убраны мусорные подписи на Защите, большая кнопка ПОДКЛЮЧИТЬСЯ всегда видна, свойства сервера заполнены, без T/V бейджей в списке", + "version": "4.2.2", + "notes": "4.2.2: светлая тема по умолчанию, ссылка поддержки Telegram → @evilfox100Bot", "platform": "windows-amd64", "os": "windows", "arch": "amd64", "url": "https://git.de4ima.uk/Evilfox/navi/raw/branch/Windows/dist/navis-release/windows/EvilFox.exe", - "sha256": "c3885d6d0c5b6e542fe1a172650c2f9480afde2b9016ceb1a5699f851761b837", + "sha256": "1cf00e87907714c299838ab1422ec593275e4dacfccca8e9914d21b2f4c51c87", "mandatory": false, "platforms": { "windows-amd64": { "url": "https://git.de4ima.uk/Evilfox/navi/raw/branch/Windows/dist/navis-release/windows/EvilFox.exe", - "sha256": "c3885d6d0c5b6e542fe1a172650c2f9480afde2b9016ceb1a5699f851761b837", + "sha256": "1cf00e87907714c299838ab1422ec593275e4dacfccca8e9914d21b2f4c51c87", "os": "windows", "arch": "amd64" }, diff --git a/internal/appui/index.html b/internal/appui/index.html index 670527b..1bd1bb6 100644 --- a/internal/appui/index.html +++ b/internal/appui/index.html @@ -1,5 +1,5 @@ - + @@ -10,11 +10,11 @@ var k = "navis.theme"; var t = localStorage.getItem(k); if (t !== "light" && t !== "dark") { - t = "dark"; + t = "light"; } document.documentElement.setAttribute("data-theme", t); } catch (_) { - document.documentElement.setAttribute("data-theme", "dark"); + document.documentElement.setAttribute("data-theme", "light"); } })(); @@ -2049,11 +2049,7 @@ const t = localStorage.getItem(THEME_KEY); if (t === "light" || t === "dark") return t; } catch (_) {} - try { - return window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light"; - } catch (_) { - return "dark"; - } + return "light"; } function applyTheme(t) { const theme = t === "dark" ? "dark" : "light"; @@ -2109,7 +2105,7 @@ // (internal/apphost/app.go → allowedLinkHosts). const RECOMMENDED_SERVICES = [ { icon: "🌐", name: "Сайт", url: "https://evilfox.win/" }, - { icon: "✈️", name: "Поддержка: Telegram", url: "https://t.me/evilfox" } + { icon: "✈️", name: "Поддержка: Telegram", url: "https://t.me/evilfox100Bot" } ]; const AUTO_BEST_KEY = "navis.autoBest"; // Оффер на карточке EvilFox рендерим из константы, чтобы правка была в одном месте. diff --git a/internal/update/update.go b/internal/update/update.go index 1f3a120..2291dc8 100644 --- a/internal/update/update.go +++ b/internal/update/update.go @@ -18,7 +18,7 @@ import ( // CurrentVersion is the product/semver used for update eligibility (feed "version"). // Keep major.minor.patch only — no build suffix here. -const CurrentVersion = "4.2.1" +const CurrentVersion = "4.2.2" // BuildNumber is the monotonic build within CurrentVersion (Windows FileVersion 4th part, // macOS CFBundleVersion suffix, Android versionCode low digits). Bump on every release build. diff --git a/packaging/msix/AppxManifest.xml b/packaging/msix/AppxManifest.xml index 5373394..21c190a 100644 --- a/packaging/msix/AppxManifest.xml +++ b/packaging/msix/AppxManifest.xml @@ -33,7 +33,7 @@ diff --git a/scripts/pack-msix.ps1 b/scripts/pack-msix.ps1 index 1a8c28e..e34dfa6 100644 --- a/scripts/pack-msix.ps1 +++ b/scripts/pack-msix.ps1 @@ -15,7 +15,7 @@ param( [string]$ExePath = "", [string]$OutDir = "", - [string]$Version = "4.2.1.1", + [string]$Version = "4.2.2.1", [string]$Name = "EvilFox.EvilFox", [string]$Publisher = "CN=EvilFox", [string]$DisplayName = "EvilFox", @@ -82,7 +82,7 @@ $manifestText = Get-Content -LiteralPath $ManifestSrc -Raw -Encoding UTF8 # Prefer exact placeholder swaps so we never touch . $manifestText = $manifestText.Replace('Name="EvilFox.EvilFox"', "Name=`"$Name`"") $manifestText = $manifestText.Replace('Publisher="CN=EvilFox"', "Publisher=`"$Publisher`"") -$manifestText = $manifestText.Replace('Version="4.2.1.1"', "Version=`"$Version`"") +$manifestText = $manifestText.Replace('Version="4.2.2.1"', "Version=`"$Version`"") $manifestText = $manifestText.Replace('EvilFox', "$DisplayName") $manifestText = $manifestText.Replace('EvilFox', "$PublisherDisplayName") $manifestText = $manifestText.Replace('DisplayName="EvilFox"', "DisplayName=`"$DisplayName`"") diff --git a/server/update.json b/server/update.json index 2569d01..3a94e8e 100644 --- a/server/update.json +++ b/server/update.json @@ -1,16 +1,16 @@ { - "version": "4.2.1", - "notes": "4.2.1: исправлены опечатки Румынии (флаг RO), чистая шапка списка серверов, полезные ссылки вместо рекомендаций, убраны мусорные подписи на Защите, большая кнопка ПОДКЛЮЧИТЬСЯ всегда видна, свойства сервера заполнены, без T/V бейджей в списке", + "version": "4.2.2", + "notes": "4.2.2: светлая тема по умолчанию, ссылка поддержки Telegram → @evilfox100Bot", "platform": "windows-amd64", "os": "windows", "arch": "amd64", "url": "https://git.de4ima.uk/Evilfox/navi/raw/branch/Windows/dist/navis-release/windows/EvilFox.exe", - "sha256": "c3885d6d0c5b6e542fe1a172650c2f9480afde2b9016ceb1a5699f851761b837", + "sha256": "1cf00e87907714c299838ab1422ec593275e4dacfccca8e9914d21b2f4c51c87", "mandatory": false, "platforms": { "windows-amd64": { "url": "https://git.de4ima.uk/Evilfox/navi/raw/branch/Windows/dist/navis-release/windows/EvilFox.exe", - "sha256": "c3885d6d0c5b6e542fe1a172650c2f9480afde2b9016ceb1a5699f851761b837", + "sha256": "1cf00e87907714c299838ab1422ec593275e4dacfccca8e9914d21b2f4c51c87", "os": "windows", "arch": "amd64" }, diff --git a/versioninfo.json b/versioninfo.json index ea4b773..2b638ab 100644 --- a/versioninfo.json +++ b/versioninfo.json @@ -1,7 +1,7 @@ { "FixedFileInfo": { - "FileVersion": { "Major": 4, "Minor": 2, "Patch": 1, "Build": 1 }, - "ProductVersion": { "Major": 4, "Minor": 2, "Patch": 1, "Build": 1 }, + "FileVersion": { "Major": 4, "Minor": 2, "Patch": 2, "Build": 1 }, + "ProductVersion": { "Major": 4, "Minor": 2, "Patch": 2, "Build": 1 }, "FileFlagsMask": "3f", "FileFlags": "00", "FileOS": "40004", @@ -11,12 +11,12 @@ "StringFileInfo": { "CompanyName": "EvilFox", "FileDescription": "EvilFox — VPN client (Naive / Hy2 / AWG / VLESS / VMess / Trojan)", - "FileVersion": "4.2.1.1", + "FileVersion": "4.2.2.1", "InternalName": "EvilFox", "LegalCopyright": "Copyright (c) EvilFox", "OriginalFilename": "EvilFox.exe", "ProductName": "EvilFox", - "ProductVersion": "4.2.1.1", + "ProductVersion": "4.2.2.1", "Comments": "Open-source VPN/proxy client. https://evilfox.win/" }, "VarFileInfo": {