aljaz/flutter_server_box
1
1
Fork 0
mirror of https://github.com/lollipopkit/flutter_server_box.git synced 2025-12-17 07:14:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

opt.

Browse Source
This commit is contained in:
lollipopkit
2023-06-03 21:15:26 +08:00
parent 8c25b5e60b
commit 261b8e9d29
9 changed files with 49 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ios/Runner.xcodeproj/project.pbxproj
View File

@@ -360,7 +360,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 343;
CURRENT_PROJECT_VERSION = 344;
DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -368,7 +368,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.343;
MARKETING_VERSION = 1.0.344;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -491,7 +491,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 343;
CURRENT_PROJECT_VERSION = 344;
DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -499,7 +499,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.343;
MARKETING_VERSION = 1.0.344;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -516,7 +516,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 343;
CURRENT_PROJECT_VERSION = 344;
DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -524,7 +524,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.343;
MARKETING_VERSION = 1.0.344;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

9
lib/data/provider/sftp.dart
View File

@@ -8,15 +8,14 @@ class SftpProvider extends ProviderBase {
final List<SftpReqStatus> _status = [];
List<SftpReqStatus> get status => _status;
List<SftpReqStatus> gets({int? id, String? fileName}) {
var found = <SftpReqStatus>[];
Iterable<SftpReqStatus> gets({int? id, String? fileName}) {
Iterable<SftpReqStatus> found = [];
if (id != null) {
found = _status.where((e) => e.id == id).toList();
found = _status.where((e) => e.id == id);
}
if (fileName != null) {
found = found
.where((e) => e.item.localPath.split('/').last == fileName)
.toList();
.where((e) => e.item.localPath.split('/').last == fileName);
}
return found;
}

4
lib/data/res/build_data.dart
View File

@@ -2,8 +2,8 @@
class BuildData {
static const String name = "ServerBox";
static const int build = 343;
static const int build = 344;
static const String engine = "3.10.2";
static const String buildAt = "2023-06-01 16:27:31.059809";
static const String buildAt = "2023-06-02 22:02:47.585289";
static const int modifications = 4;
}

27
lib/view/page/editor.dart
View File

@@ -1,5 +1,7 @@
import 'dart:async';
import 'dart:io';
import 'package:after_layout/after_layout.dart';
import 'package:code_text_field/code_text_field.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
@@ -15,14 +17,13 @@ import '../widget/two_line_text.dart';
class EditorPage extends StatefulWidget {
final String? path;
final String? initCode;
const EditorPage({Key? key, this.path, this.initCode}) : super(key: key);
const EditorPage({Key? key, this.path}) : super(key: key);
@override
_EditorPageState createState() => _EditorPageState();
}
class _EditorPageState extends State<EditorPage> {
class _EditorPageState extends State<EditorPage> with AfterLayoutMixin {
late CodeController _controller;
late final _focusNode = FocusNode();
final _setting = locator<SettingStore>();
@@ -35,15 +36,9 @@ class _EditorPageState extends State<EditorPage> {
super.initState();
_langCode = widget.path.highlightCode;
_controller = CodeController(
text: widget.initCode,
language: suffix2HighlightMap[_langCode ?? 'plaintext'],
language: suffix2HighlightMap[_langCode],
);
_codeTheme = themeMap[_setting.editorTheme.fetch()] ?? monokaiTheme;
if (widget.initCode == null && widget.path != null) {
File(widget.path!)
.readAsString()
.then((value) => _controller.text = value);
}
_focusNode.requestFocus();
}
@@ -92,7 +87,6 @@ class _EditorPageState extends State<EditorPage> {
child: CodeField(
focusNode: _focusNode,
controller: _controller,
textStyle: const TextStyle(fontFamily: 'SourceCode'),
),
),
),
@@ -104,4 +98,15 @@ class _EditorPageState extends State<EditorPage> {
),
);
}
@override
FutureOr<void> afterFirstLayout(BuildContext context) async {
if (widget.path != null) {
await Future.delayed(const Duration(milliseconds: 233));
final code = await File(widget.path!).readAsString();
setState(() {
_controller.text = code;
});
}
}
}

13
lib/view/page/home.dart
View File

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:get_it/get_it.dart';
import 'package:toolbox/core/extension/navigator.dart';
import 'package:toolbox/data/model/app/tab.dart';
import 'package:toolbox/data/provider/app.dart';
import 'package:toolbox/data/res/misc.dart';
import 'package:toolbox/view/widget/round_rect_card.dart';
@@ -54,6 +55,10 @@ class _HomePageState extends State<HomePage>
super.initState();
WidgetsBinding.instance.addObserver(this);
_selectIndex = _setting.launchPage.fetch()!;
// avoid index out of range
if (_selectIndex >= AppTab.values.length || _selectIndex < 0) {
_selectIndex = 0;
}
_pageController = PageController(initialPage: _selectIndex);
}
@@ -108,8 +113,10 @@ class _HomePageState extends State<HomePage>
IconButton(
icon: const Icon(Icons.developer_mode, size: 23),
tooltip: _s.debug,
onPressed: () =>
AppRoute(const DebugPage(), 'Debug Page').go(context),
onPressed: () => AppRoute(
const DebugPage(),
'Debug Page',
).go(context),
),
],
),
@@ -210,7 +217,7 @@ class _HomePageState extends State<HomePage>
title: Text(_s.download),
onTap: () => AppRoute(
const SFTPDownloadedPage(),
'snippet list',
'sftp local page',
).go(context),
),
ListTile(

4
lib/view/page/sftp/local.dart
View File

@@ -180,11 +180,9 @@ class _SFTPDownloadedPageState extends State<SFTPDownloadedPage> {
return;
}
final f = File(file.absolute.path);
final data = await f.readAsString();
final result = await AppRoute(
EditorPage(
initCode: data,
path: fileName,
path: file.absolute.path,
),
'sftp dled editor',
).go<String>(context);

1
lib/view/page/sftp/remote.dart
View File

@@ -328,6 +328,7 @@ class _SFTPPageState extends State<SFTPPage> {
)));
return;
}
context.pop();
final remotePath = _getRemotePath(name);
final localPath = await _getLocalPath(remotePath);

3
lib/view/page/snippet/list.dart
View File

@@ -26,6 +26,9 @@ class _SnippetListPageState extends State<SnippetListPage> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text(_s.snippet),
),
body: _buildBody(),
floatingActionButton: FloatingActionButton(
heroTag: 'snippet',

12
macos/Runner.xcodeproj/project.pbxproj
View File

@@ -475,9 +475,9 @@
baseConfigurationReference = C1C758C41C4E208965A68933 /* Pods-RunnerTests.debug.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CURRENT_PROJECT_VERSION = 343;
CURRENT_PROJECT_VERSION = 344;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0.343;
MARKETING_VERSION = 1.0.344;
PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
@@ -490,9 +490,9 @@
baseConfigurationReference = 15AF97DF993E8968098D6EBE /* Pods-RunnerTests.release.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CURRENT_PROJECT_VERSION = 343;
CURRENT_PROJECT_VERSION = 344;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0.343;
MARKETING_VERSION = 1.0.344;
PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
@@ -505,9 +505,9 @@
baseConfigurationReference = 7CFA7DE7FABA75685DFB6948 /* Pods-RunnerTests.profile.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CURRENT_PROJECT_VERSION = 343;
CURRENT_PROJECT_VERSION = 344;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0.343;
MARKETING_VERSION = 1.0.344;
PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;