Claude/vnxmatrix rebrand v2 fwjhpi

.github/workflows/build.yaml

@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - "v*"
+  workflow_dispatch:
 env:
   IS_STABLE: ${{ !contains(github.ref, '-') }}
   FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
@@ -92,14 +93,6 @@ jobs:
           echo "KEYCHAIN_PATH=$KEYCHAIN_PATH" >> $GITHUB_ENV
           echo "KEYCHAIN_PASSWORD=$KEYCHAIN_PASSWORD" >> $GITHUB_ENV
 
-      - name: Setup Android Signing
-        if: startsWith(matrix.platform,'android')
-        run: |
-          echo "${{ secrets.KEYSTORE }}" | base64 --decode > android/app/keystore.jks
-          echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> android/local.properties
-          echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> android/local.properties
-          echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> android/local.properties
-
       - name: Setup Firebase Config
         if: startsWith(matrix.platform,'android')
         env:

android/app/build.gradle.kts

@@ -45,7 +45,7 @@ android {
     }
 
     defaultConfig {
-        applicationId = "com.follow.clashx"
+        applicationId = "com.vnxmatrix.client"
         minSdk = flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode

android/app/src/main/AndroidManifest.xml

@@ -38,7 +38,7 @@
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:allowBackup="false"
-        android:label="FlClashX"
+        android:label="vnxMATRIX"
         android:memtagMode="off"
         android:networkSecurityConfig="@xml/network_security_config">
 
@@ -81,6 +81,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="flclashx" android:host="install-config" />
+                <data android:scheme="vnxmatrix" android:host="install-config" />
             </intent-filter>
             <meta-data
                 android:name="android.app.shortcuts"
@@ -160,7 +161,7 @@
             android:name=".services.FlClashXTileService"
             android:exported="true"
             android:icon="@drawable/ic"
-            android:label="FlClashX"
+            android:label="vnxMATRIX"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
             tools:targetApi="n">
             <intent-filter>

android/app/src/main/res/values-ru/strings.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="widget_description">FlClashX режим и туннель</string>
+    <string name="widget_description">vnxMATRIX режим и туннель</string>
     <string name="widget_mode_rule">Правила</string>
     <string name="widget_mode_global">Глобал</string>
     <string name="widget_mode_direct">Прямой</string>
     <string name="widget_toggle_desc">Переключить туннель</string>
-    <string name="widget_on_off_description">FlClashX вкл/выкл туннель</string>
+    <string name="widget_on_off_description">vnxMATRIX вкл/выкл туннель</string>
     <string name="shortcut_start">Запустить</string>
     <string name="shortcut_stop">Остановить</string>
 </resources>

android/app/src/main/res/values/strings.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="fl_clashx">FlClashX</string>
-    <string name="widget_description">FlClashX Mode &amp; Tunnel</string>
+    <string name="fl_clashx">vnxMATRIX</string>
+    <string name="widget_description">vnxMATRIX Mode &amp; Tunnel</string>
     <string name="widget_mode_rule">Rule</string>
     <string name="widget_mode_global">Global</string>
     <string name="widget_mode_direct">Direct</string>
     <string name="widget_toggle_desc">Toggle tunnel</string>
-    <string name="widget_on_off_description">FlClashX Tunnel On/Off</string>
+    <string name="widget_on_off_description">vnxMATRIX Tunnel On/Off</string>
     <string name="shortcut_start">Start</string>
     <string name="shortcut_stop">Stop</string>
 </resources>

lib/common/constant.dart

@@ -8,12 +8,12 @@ import 'package:flclashx/enum/enum.dart';
 import 'package:flclashx/models/models.dart';
 import 'package:flutter/material.dart';
 
-const appName = "FlClashX";
+const appName = "vnxMATRIX";
 const appHelperService = "FlClashHelperService";
 const coreName = "clashx.meta";
 const browserUa =
     "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36";
-const packageName = "com.follow.clashx";
+const packageName = "com.vnxmatrix.client";
 final unixSocketPath = "/tmp/FlClashXSocket_${pid}_${Random.secure().nextInt(1 << 30)}.sock";
 const helperPort = 47890;
 const maxTextScale = 1.4;
@@ -45,7 +45,7 @@ const localhost = "127.0.0.1";
 const clashConfigKey = "clash_config";
 const configKey = "config";
 const double dialogCommonWidth = 300;
-const repository = "pluralplay/FlClashX";
+const repository = "vnxAPPS/vnxmatrix-client";
 const defaultExternalController = "127.0.0.1:9090";
 const maxMobileWidth = 600;
 const maxLaptopWidth = 840;
@@ -82,7 +82,7 @@ const viewModeColumnsMap = {
 // const toolsStoreKey = PageStorageKey<String>('tools');
 // const profilesStoreKey = PageStorageKey<String>('profiles');
 
-const defaultPrimaryColor = 0xFF03A9F4;
+const defaultPrimaryColor = 0xFF3BE08C;
 
 double getWidgetHeight(num lines) => max(lines * 84 + (lines - 1) * 16, 0).ap;
 

lib/providers/state.dart

@@ -488,8 +488,11 @@ bool globalModeEnabled(Ref ref) {
 /// board on/off through the normal header pipeline rather than overriding here.
 @riverpod
 bool newDashboardEnabled(Ref ref) {
-  return ref.watch(appSettingProvider.select((state) => state.newDashboard)) ??
-      false;
+  // vnxMATRIX поставляется только с новым видом: старая раскладка — наследие
+  // апстрима, у нас она недоступна. Возвращаем константу, а не хранимое
+  // значение, чтобы вид не откатился у тех, кто успел переключить тумблер до
+  // его удаления, и чтобы заголовок flclashx-newboard не мог его выключить.
+  return true;
 }
 
 @riverpod

lib/views/theme.dart

@@ -47,7 +47,6 @@ class ThemeView extends StatelessWidget {
           _ThemeModeItem(),
           _PrimaryColorItem(),
           _PrueBlackItem(),
-          _NewDashboardItem(),
           _TextScaleFactorItem(),
           SizedBox(
             height: 64,
@@ -471,36 +470,6 @@ class _PrueBlackItem extends ConsumerWidget {
   }
 }
 
-class _NewDashboardItem extends ConsumerWidget {
-  const _NewDashboardItem();
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final enabled = ref.watch(newDashboardEnabledProvider);
-    return ListItem.switchItem(
-      leading: const Icon(Icons.dashboard_customize),
-      horizontalTitleGap: 12,
-      title: Text(
-        appLocalizations.newDashboard,
-        style: Theme.of(context).textTheme.titleSmall?.copyWith(
-              color: context.colorScheme.onSurfaceVariant,
-            ),
-      ),
-      delegate: SwitchDelegate(
-        value: enabled,
-        // Always user-controllable. A `flclashx-newboard: true` header only sets
-        // the default (via newDashboardEnabledProvider) until the user toggles;
-        // toggling writes an explicit value that then wins over the header.
-        onChanged: (value) {
-          ref.read(appSettingProvider.notifier).updateState(
-                (state) => state.copyWith(newDashboard: value),
-              );
-        },
-      ),
-    );
-  }
-}
-
 class _TextScaleFactorItem extends ConsumerWidget {
   const _TextScaleFactorItem();
 

windows/runner/Runner.rc

@@ -89,13 +89,13 @@ BEGIN
     BEGIN
         BLOCK "040904e4"
         BEGIN
-            VALUE "CompanyName", "com.follow" "\0"
-            VALUE "FileDescription", "FlClashX" "\0"
+            VALUE "CompanyName", "vnxAPPS" "\0"
+            VALUE "FileDescription", "vnxMATRIX" "\0"
             VALUE "FileVersion", VERSION_AS_STRING "\0"
             VALUE "InternalName", "clashx" "\0"
             VALUE "LegalCopyright", "Copyright (C) 2023 com.follow. All rights reserved." "\0"
             VALUE "OriginalFilename", "FlClashX.exe" "\0"
-            VALUE "ProductName", "clashx" "\0"
+            VALUE "ProductName", "vnxMATRIX" "\0"
             VALUE "ProductVersion", VERSION_AS_STRING "\0"
         END
     END