Update to v0.1.8+1

.github/workflows/pr-check.yml

@@ -12,6 +12,7 @@ on:
 jobs:
   build-windows:
     runs-on: windows-latest
+    if: github.event.pull_request.base.ref != 'main'
 
     steps:
       - name: Checkout
@@ -28,6 +29,7 @@ jobs:
 
   build-linux:
     runs-on: ubuntu-latest
+    if: github.event.pull_request.base.ref != 'main'
 
     steps:
       - name: Checkout
@@ -47,6 +49,7 @@ jobs:
 
   build-macos:
     runs-on: macos-latest
+    if: github.event.pull_request.base.ref != 'main'
 
     steps:
       - name: Checkout

lib/storages/prefs/user_info_prefs.dart

@@ -1,4 +1,4 @@
-import 'package:nyalcf/io/user_info_storage.dart';
+import 'package:nyalcf/storages/stories/user_info_storage.dart';
 import 'package:nyalcf/models/user_info_model.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 

lib/storages/stories/frpc_story_storage.dart

@@ -46,38 +46,6 @@ class FrpcStoryStorage {
     return path;
   }
 
-  // /// 获取正在使用的版本
-  // static Future<String> get usingVersion async {
-  //   final version = (await _info).frpc_version;
-  //   return version;
-  // }
-  //
-  // /*/// 自定义GitHub代理列表
-  // static Future<List<String>> get proxies async {
-  //   final url = (await _info).github_proxies;
-  //   return url;
-  // }*/
-  //
-  // /// GitHub代理
-  // static Future<bool> get useGithubMirror async {
-  //   final mirror = (await _info).github_mirror;
-  //   return mirror;
-  // }
-  //
-  // /// 获取已安装版本列表
-  // static Future<List<String>> get downloadedVersions async {
-  //   final versions = (await _info).frpc_downloaded_versions;
-  //   Logger.debug(versions);
-  //   return versions;
-  // }
-  //
-  // /// 存储至磁盘
-  // static Future<void> save(FrpcConfigModel data) async {
-  //   final String write_data = jsonEncode(data);
-  //   await File('${await _path}/info.json')
-  //       .writeAsString(write_data, encoding: utf8);
-  // }
-
   Future<void> setRunPermission() async {
     Logger.info('Set run permission: ${await getFilePath()}');
     final execPath = await FrpcPathProvider().frpcPath;

lib/io/user_info_storage.dart → lib/storages/stories/user_info_storage.dart

@@ -4,7 +4,6 @@ import 'dart:io';
 import 'package:nyalcf/models/user_info_model.dart';
 import 'package:nyalcf/utils/path_provider.dart';
 
-@deprecated
 class UserInfoStorage {
   static final _path = PathProvider.appSupportPath;
 

lib/ui/models/account_dialog.dart

@@ -3,7 +3,7 @@ import 'package:get/get.dart';
 import 'package:nyalcf/controllers/console_controller.dart';
 import 'package:nyalcf/controllers/panel_controller.dart';
 import 'package:nyalcf/controllers/proxies_controller.dart';
-import 'package:nyalcf/io/user_info_storage.dart';
+import 'package:nyalcf/storages/stories/user_info_storage.dart';
 import 'package:nyalcf/utils/logger.dart';
 import 'package:url_launcher/url_launcher.dart';
 

lib/ui/models/drawer.dart

@@ -12,17 +12,16 @@ class DrawerX {
         padding: EdgeInsets.zero,
         children: <Widget>[
           DrawerHeader(
-              decoration: const BoxDecoration(
-                image: DecorationImage(
+              decoration: BoxDecoration(
+                image: const DecorationImage(
                     image: NetworkImage('https://api.imlazy.ink/img'),
                     fit: BoxFit.cover),
-                color: Colors.pink,
+                color: Get.theme.primaryColor,
               ),
               child: Column(mainAxisSize: MainAxisSize.min, children: <Widget>[
                 DecoratedBox(
                     decoration: BoxDecoration(
-                        color: const Color.fromRGBO(
-                            255, 101, 160, 0.4196078431372549),
+                        color: Get.theme.splashColor,
                         borderRadius: BorderRadius.circular(50.0)),
                     child: Center(
                         child: Container(

lib/ui/views/home.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:nyalcf/controllers/frpc_controller.dart';
 import 'package:nyalcf/controllers/user_controller.dart';
-import 'package:nyalcf/io/user_info_storage.dart';
+import 'package:nyalcf/storages/stories/user_info_storage.dart';
 import 'package:nyalcf/models/user_info_model.dart';
 import 'package:nyalcf/ui/models/appbar_actions.dart';
 import 'package:nyalcf/ui/models/floating_action_button.dart';

lib/ui/views/setting/launcher_setting.dart

@@ -304,7 +304,7 @@ class LauncherSetting {
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: <Widget>[
                       const Text(
-                          'Nya LoCyanFrp! 是免费开源的，欢迎向我们提交BUG或新功能请求。您可以在GitHub上提交Issues来向我们反馈。'),
+                          'Nya LoCyanFrp! 是免费开源的，欢迎向我们提交BUG或新功能请求。您可以在GitHub上提交Issue来向我们反馈。'),
                       TextButton(
                         child: const ListTile(
                           leading: Icon(Icons.link),

lib/utils/frpc/process_manager.dart

@@ -18,8 +18,8 @@ class FrpcProcessManager {
     required int proxyId,
     required String frpcPath,
   }) async {
-    if (Platform.isLinux) {
-      Logger.info('Linux platform, change file permission');
+    if (Platform.isLinux || Platform.isMacOS) {
+      Logger.info('*unix platform, change file permission');
       await fss.setRunPermission();
     }
     final Map<String, dynamic> pMap = <String, dynamic>{};

macos/Runner/DebugProfile.entitlements

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>com.apple.security.app-sandbox</key>
-	<true/>
+	<false/>
 	<key>com.apple.security.cs.allow-jit</key>
 	<true/>
 	<key>com.apple.security.network.server</key>

macos/Runner/Release.entitlements

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>com.apple.security.app-sandbox</key>
-	<true/>
+	<false/>
 	<key>com.apple.security.filesystem.read-write</key>
     <true/>
     <key>com.apple.security.files.bookmarks.app-scope</key>

pubspec.lock

@@ -226,10 +226,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_markdown
-      sha256: cb44f7831b23a6bdd0f501718b0d2e8045cbc625a15f668af37ddb80314821db
+      sha256: "87e11b9df25a42e2db315b8b7a51fae8e66f57a4b2f50ec4b822d0fa155e6b52"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.21"
+    version: "0.6.22"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -268,10 +268,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba
+      sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   http_parser:
     dependency: transitive
     description:
@@ -412,10 +412,10 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79"
+      sha256: cb44f49b6e690fa766f023d5b22cac6b9affe741dd792b6ac7ad4fabe0d7b097
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.1"
+    version: "6.0.0"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -572,10 +572,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21"
+      sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.3.0"
   shared_preferences_windows:
     dependency: transitive
     description:
@@ -721,10 +721,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b
+      sha256: "3692a459204a33e04bc94f5fb91158faf4f2c8903281ddd82915adecdb1a901d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.3"
+    version: "2.3.0"
   url_launcher_windows:
     dependency: transitive
     description:
@@ -753,10 +753,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05"
+      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.2"
+    version: "0.5.1"
   win32:
     dependency: transitive
     description:

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.1.8
+version: 0.1.8+1
 
 environment:
   sdk: '>=3.1.5 <4.0.0'
@@ -42,9 +42,9 @@ dependencies:
   path_provider: ^2.1.1
   shared_preferences: ^2.2.2
   get: ^4.6.6
-  flutter_markdown: ^0.6.21
+  flutter_markdown: ^0.6.22
   archive: ^3.4.9
-  package_info_plus: ^5.0.1
+  package_info_plus: ^6.0.0
   flutter_code_editor: ^0.3.1
   logger: ^2.1.0
   tray_manager: ^0.2.1