auto paste in private key page

This commit is contained in:
lollipopkit
2023-01-09 13:46:02 +08:00
parent b2e2d4c603
commit 9c8f9c3b9f
5 changed files with 39 additions and 31 deletions

View File

@@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:toolbox/core/extension/colorx.dart';
import 'package:toolbox/core/utils.dart'; import 'package:toolbox/core/utils.dart';
import 'package:toolbox/data/res/build_data.dart'; import 'package:toolbox/data/res/build_data.dart';
import 'package:toolbox/data/store/setting.dart'; import 'package:toolbox/data/store/setting.dart';
@@ -7,25 +8,9 @@ import 'package:toolbox/generated/l10n.dart';
import 'package:toolbox/locator.dart'; import 'package:toolbox/locator.dart';
import 'package:toolbox/view/page/home.dart'; import 'package:toolbox/view/page/home.dart';
const Set<MaterialState> interactiveStates = <MaterialState>{
MaterialState.pressed,
MaterialState.hovered,
MaterialState.focused,
MaterialState.selected
};
class MyApp extends StatelessWidget { class MyApp extends StatelessWidget {
const MyApp({Key? key}) : super(key: key); const MyApp({Key? key}) : super(key: key);
MaterialStateProperty<Color?> getMaterialStateColor(Color primaryColor) {
return MaterialStateProperty.resolveWith((states) {
if (states.any(interactiveStates.contains)) {
return primaryColor;
}
return null;
});
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
setTransparentNavigationBar(context); setTransparentNavigationBar(context);
@@ -34,11 +19,13 @@ class MyApp extends StatelessWidget {
builder: (_, value, __) { builder: (_, value, __) {
final primaryColor = Color(value); final primaryColor = Color(value);
final textStyle = TextStyle(color: primaryColor); final textStyle = TextStyle(color: primaryColor);
final materialColor = primaryColor.materialStateColor;
final materialColorAlpha =
primaryColor.withOpacity(0.7).materialStateColor;
return MaterialApp( return MaterialApp(
localizationsDelegates: const [ localizationsDelegates: const [
S.delegate, S.delegate,
GlobalMaterialLocalizations.delegate, ...GlobalMaterialLocalizations.delegates,
GlobalWidgetsLocalizations.delegate,
], ],
supportedLocales: S.delegate.supportedLocales, supportedLocales: S.delegate.supportedLocales,
title: BuildData.name, title: BuildData.name,
@@ -50,10 +37,8 @@ class MyApp extends StatelessWidget {
iconTheme: IconThemeData(color: primaryColor), iconTheme: IconThemeData(color: primaryColor),
primaryIconTheme: IconThemeData(color: primaryColor), primaryIconTheme: IconThemeData(color: primaryColor),
switchTheme: SwitchThemeData( switchTheme: SwitchThemeData(
thumbColor: getMaterialStateColor(primaryColor), thumbColor: materialColor,
trackColor: getMaterialStateColor( trackColor: materialColorAlpha,
primaryColor.withOpacity(0.7),
),
), ),
buttonTheme: ButtonThemeData(splashColor: primaryColor), buttonTheme: ButtonThemeData(splashColor: primaryColor),
inputDecorationTheme: InputDecorationTheme( inputDecorationTheme: InputDecorationTheme(
@@ -63,7 +48,7 @@ class MyApp extends StatelessWidget {
), ),
), ),
radioTheme: RadioThemeData( radioTheme: RadioThemeData(
fillColor: getMaterialStateColor(primaryColor), fillColor: materialColor,
), ),
), ),
darkTheme: ThemeData.dark().copyWith( darkTheme: ThemeData.dark().copyWith(
@@ -73,10 +58,8 @@ class MyApp extends StatelessWidget {
iconTheme: IconThemeData(color: primaryColor), iconTheme: IconThemeData(color: primaryColor),
primaryIconTheme: IconThemeData(color: primaryColor), primaryIconTheme: IconThemeData(color: primaryColor),
switchTheme: SwitchThemeData( switchTheme: SwitchThemeData(
thumbColor: getMaterialStateColor(primaryColor), thumbColor: materialColor,
trackColor: getMaterialStateColor( trackColor: materialColorAlpha,
primaryColor.withOpacity(0.7),
),
), ),
buttonTheme: ButtonThemeData(splashColor: primaryColor), buttonTheme: ButtonThemeData(splashColor: primaryColor),
inputDecorationTheme: InputDecorationTheme( inputDecorationTheme: InputDecorationTheme(
@@ -86,7 +69,7 @@ class MyApp extends StatelessWidget {
), ),
), ),
radioTheme: RadioThemeData( radioTheme: RadioThemeData(
fillColor: getMaterialStateColor(primaryColor), fillColor: materialColor,
), ),
), ),
home: MyHomePage(primaryColor: primaryColor), home: MyHomePage(primaryColor: primaryColor),

View File

@@ -1,5 +1,12 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
const Set<MaterialState> interactiveStates = <MaterialState>{
MaterialState.pressed,
MaterialState.hovered,
MaterialState.focused,
MaterialState.selected
};
extension ColorX on Color { extension ColorX on Color {
bool get isBrightColor { bool get isBrightColor {
return getBrightnessFromColor == Brightness.light; return getBrightnessFromColor == Brightness.light;
@@ -8,4 +15,13 @@ extension ColorX on Color {
Brightness get getBrightnessFromColor { Brightness get getBrightnessFromColor {
return ThemeData.estimateBrightnessForColor(this); return ThemeData.estimateBrightnessForColor(this);
} }
MaterialStateProperty<Color?> get materialStateColor {
return MaterialStateProperty.resolveWith((states) {
if (states.any(interactiveStates.contains)) {
return this;
}
return null;
});
}
} }

View File

@@ -1,5 +1,4 @@
import 'package:dartssh2/dartssh2.dart'; import 'package:dartssh2/dartssh2.dart';
import 'package:toolbox/data/model/server/server_private_info.dart';
import 'package:toolbox/data/model/sftp/absolute_path.dart'; import 'package:toolbox/data/model/sftp/absolute_path.dart';
class SftpBrowserStatus { class SftpBrowserStatus {

View File

@@ -23,6 +23,8 @@ const _dockerPS = 'docker ps -a';
final _logger = Logger('DockerProvider'); final _logger = Logger('DockerProvider');
class DockerProvider extends BusyProvider { class DockerProvider extends BusyProvider {
final dockerStore = locator<DockerStore>();
SSHClient? client; SSHClient? client;
String? userName; String? userName;
List<DockerPsItem>? items; List<DockerPsItem>? items;
@@ -156,7 +158,7 @@ class DockerProvider extends BusyProvider {
// judge whether to use DOCKER_HOST / sudo // judge whether to use DOCKER_HOST / sudo
String _wrap(String cmd) { String _wrap(String cmd) {
final dockerHost = locator<DockerStore>().getDockerHost(hostId!); final dockerHost = dockerStore.getDockerHost(hostId!);
if (dockerHost == null || dockerHost.isEmpty) { if (dockerHost == null || dockerHost.isEmpty) {
return 'sudo $cmd'.withLangExport; return 'sudo $cmd'.withLangExport;
} }

View File

@@ -2,6 +2,7 @@ import 'package:after_layout/after_layout.dart';
import 'package:dartssh2/dartssh2.dart'; import 'package:dartssh2/dartssh2.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:toolbox/core/utils.dart'; import 'package:toolbox/core/utils.dart';
import 'package:toolbox/data/model/server/private_key_info.dart'; import 'package:toolbox/data/model/server/private_key_info.dart';
import 'package:toolbox/data/provider/private_key.dart'; import 'package:toolbox/data/provider/private_key.dart';
@@ -10,6 +11,8 @@ import 'package:toolbox/generated/l10n.dart';
import 'package:toolbox/locator.dart'; import 'package:toolbox/locator.dart';
import 'package:toolbox/view/widget/input_decoration.dart'; import 'package:toolbox/view/widget/input_decoration.dart';
const _format = 'text/plain';
class PrivateKeyEditPage extends StatefulWidget { class PrivateKeyEditPage extends StatefulWidget {
const PrivateKeyEditPage({Key? key, this.info}) : super(key: key); const PrivateKeyEditPage({Key? key, this.info}) : super(key: key);
@@ -143,11 +146,16 @@ class _PrivateKeyEditPageState extends State<PrivateKeyEditPage>
} }
@override @override
void afterFirstLayout(BuildContext context) { Future<void> afterFirstLayout(BuildContext context) async {
if (widget.info != null) { if (widget.info != null) {
_nameController.text = widget.info!.id; _nameController.text = widget.info!.id;
_keyController.text = widget.info!.privateKey; _keyController.text = widget.info!.privateKey;
_pwdController.text = widget.info!.password; _pwdController.text = widget.info!.password;
} else {
final clipdata = ((await Clipboard.getData(_format))?.text ?? '').trim();
if (clipdata.startsWith('-----BEGIN') && clipdata.endsWith('-----')) {
_keyController.text = clipdata;
}
} }
} }
} }