Leaf-WAI/qinglong_app
1
0
Fork 0
mirror of https://github.com/qinglong-app/qinglong_app.git synced 2025-10-09 16:48:19 +08:00
Code Issues Projects Releases Wiki Activity

优化使用体验

Browse Source
This commit is contained in:
jyuesong
2022-06-08 10:06:54 +08:00
parent b89de1414a
commit 14c3b1a965
20 changed files with 659 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -44,3 +44,4 @@ app.*.map.json
/android/app/debug /android/app/debug
/android/app/profile /android/app/profile
/android/app/release /android/app/release
.fvm/

4
lib/base/base_state_widget.dart
View File

@@ -29,7 +29,7 @@ class _BaseStateWidgetState<T extends BaseViewModel> extends ConsumerState<BaseS
Widget build(BuildContext context) { Widget build(BuildContext context) {
var viewModel = ref.watch<T>(widget.model); var viewModel = ref.watch<T>(widget.model);
if (viewModel.failedToast != null) { if (viewModel.failedToast != null) {
WidgetsBinding.instance?.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
(viewModel.failedToast ?? "").toast(); (viewModel.failedToast ?? "").toast();
viewModel.clearToast(); viewModel.clearToast();
}); });
@@ -72,7 +72,7 @@ class _BaseStateWidgetState<T extends BaseViewModel> extends ConsumerState<BaseS
@override @override
void initState() { void initState() {
super.initState(); super.initState();
WidgetsBinding.instance?.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
if (widget.onReady != null && !widget.lazyLoad) { if (widget.onReady != null && !widget.lazyLoad) {
widget.onReady!(ref.read<T>(widget.model)); widget.onReady!(ref.read<T>(widget.model));
} }

2
lib/base/theme.dart
View File

@@ -24,7 +24,7 @@ class ThemeViewModel extends ChangeNotifier {
ThemeViewModel() { ThemeViewModel() {
_primaryColor = Color(getIt<UserInfoViewModel>().primaryColor); _primaryColor = Color(getIt<UserInfoViewModel>().primaryColor);
primaryColor = Color(getIt<UserInfoViewModel>().primaryColor); primaryColor = Color(getIt<UserInfoViewModel>().primaryColor);
var brightness = SchedulerBinding.instance!.window.platformBrightness; var brightness = SchedulerBinding.instance.window.platformBrightness;
_isInDarkMode = brightness == Brightness.dark; _isInDarkMode = brightness == Brightness.dark;
changeThemeReal(_isInDarkMode, false); changeThemeReal(_isInDarkMode, false);
} }

2
lib/base/ui/lazy_load_state.dart
View File

@@ -6,7 +6,7 @@ mixin LazyLoadState<T extends StatefulWidget> on State<T> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
WidgetsBinding.instance?.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
var route = ModalRoute.of(context); var route = ModalRoute.of(context);
void handler(status) { void handler(status) {
if (status == AnimationStatus.completed) { if (status == AnimationStatus.completed) {

2
lib/main.dart
View File

@@ -62,7 +62,7 @@ class QlAppState extends ConsumerState<QlApp> {
FocusScope.of(context).requestFocus(FocusNode()); FocusScope.of(context).requestFocus(FocusNode());
}, },
child: MediaQuery( child: MediaQuery(
data: MediaQueryData.fromWindow(WidgetsBinding.instance!.window).copyWith( data: MediaQueryData.fromWindow(WidgetsBinding.instance.window).copyWith(
textScaleFactor: 1, textScaleFactor: 1,
), ),
child: MaterialApp( child: MaterialApp(

2
lib/module/config/config_edit_page.dart
View File

@@ -33,7 +33,7 @@ class _ConfigEditPageState extends ConsumerState<ConfigEditPage> {
super.initState(); super.initState();
WidgetsBinding.instance?.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
focusNode.requestFocus(); focusNode.requestFocus();
}); });
} }

1
lib/module/config/config_page.dart
View File

@@ -121,6 +121,7 @@ class _CodeWidgetState extends State<CodeWidget>
with AutomaticKeepAliveClientMixin { with AutomaticKeepAliveClientMixin {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
super.build(context);
return SelectableText.rich( return SelectableText.rich(
TextSpan( TextSpan(
style: GoogleFonts.droidSansMono(fontSize: 14).apply( style: GoogleFonts.droidSansMono(fontSize: 14).apply(

2
lib/module/env/add_env_page.dart vendored
View File

@@ -35,7 +35,7 @@ class _AddEnvPageState extends ConsumerState<AddEnvPage> {
} else { } else {
envBean = EnvBean(); envBean = EnvBean();
} }
WidgetsBinding.instance?.addPostFrameCallback( WidgetsBinding.instance.addPostFrameCallback(
(timeStamp) { (timeStamp) {
focusNode.requestFocus(); focusNode.requestFocus();
}, },

2
lib/module/home/home_page.dart
View File

@@ -44,7 +44,7 @@ class _HomePageState extends ConsumerState<HomePage>
initTitles(); initTitles();
_title = titles[0].title; _title = titles[0].title;
super.initState(); super.initState();
WidgetsBinding.instance?.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
getSystemBean(); getSystemBean();
}); });
} }

672
lib/module/login/login_page.dart
View File

@@ -2,6 +2,7 @@ import 'package:dio_log/dio_log.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_animator/flutter_animator.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:qinglong_app/base/http/http.dart'; import 'package:qinglong_app/base/http/http.dart';
import 'package:qinglong_app/base/routes.dart'; import 'package:qinglong_app/base/routes.dart';
@@ -62,13 +63,15 @@ class _LoginPageState extends ConsumerState<LoginPage> {
} }
} }
getIt<UserInfoViewModel>().updateToken(""); getIt<UserInfoViewModel>().updateToken("");
WidgetsBinding.instance?.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
if (useSecretLogin) { if (useSecretLogin) {
cardKey.currentState?.toggleCard(); cardKey.currentState?.toggleCard();
} }
}); });
} }
GlobalKey<AnimatorWidgetState> loginKey = GlobalKey<AnimatorWidgetState>();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
@@ -76,273 +79,393 @@ class _LoginPageState extends ConsumerState<LoginPage> {
value: ref.watch(themeProvider).darkMode == true ? SystemUiOverlayStyle.light : SystemUiOverlayStyle.dark, value: ref.watch(themeProvider).darkMode == true ? SystemUiOverlayStyle.light : SystemUiOverlayStyle.dark,
child: ColoredBox( child: ColoredBox(
color: ref.watch(themeProvider).themeColor.settingBgColor(), color: ref.watch(themeProvider).themeColor.settingBgColor(),
child: SizedBox( child: SingleChildScrollView(
height: MediaQuery.of(context).size.height, child: Column(
child: Stack( mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Positioned( Padding(
bottom: 0, padding: const EdgeInsets.symmetric(
child: Image.asset( horizontal: 40,
"assets/images/login_bg.png",
width: MediaQuery.of(context).size.width,
), ),
), child: Column(
Scaffold( mainAxisAlignment: MainAxisAlignment.start,
backgroundColor: Colors.transparent, crossAxisAlignment: CrossAxisAlignment.start,
body: SingleChildScrollView( children: [
child: Column( SizedBox(
mainAxisAlignment: MainAxisAlignment.start, height: MediaQuery.of(context).size.height / 8,
crossAxisAlignment: CrossAxisAlignment.start, ),
children: [ Row(
Padding( children: [
padding: const EdgeInsets.symmetric( Expanded(
horizontal: 40, child: Align(
alignment: Alignment.centerLeft,
child: Text(
useSecretLogin ? "client_id登录" : "账号登录",
style: TextStyle(
fontSize: 26,
fontWeight: FontWeight.bold,
color: ref.watch(themeProvider).themeColor.titleColor(),
),
),
),
), ),
GestureDetector(
onDoubleTap: () {
if (debugBtnIsShow()) {
dismissDebugBtn();
} else {
showDebugBtn(context, btnColor: ref.watch(themeProvider).primaryColor);
}
WidgetsBinding.instance.endOfFrame;
},
child: Image.asset(
"assets/images/ql.png",
height: 45,
),
),
],
),
SizedBox(
height: MediaQuery.of(context).size.height / 15,
),
Row(
children: [
const SizedBox(
width: 40,
child: Text(
"域名",
style: TextStyle(
fontSize: 16,
),
),
),
const SizedBox(
width: 30,
),
Expanded(
child: TextField(
onChanged: (_) {
setState(() {});
},
controller: _hostController,
decoration: InputDecoration(
border: InputBorder.none,
enabledBorder: InputBorder.none,
focusedBorder: InputBorder.none,
isDense: true,
contentPadding: const EdgeInsets.all(4),
hintText: "http://1.1.1.1:5700",
hintStyle: TextStyle(
fontSize: 16,
color: ref.watch(themeProvider).themeColor.descColor(),
),
),
autofocus: false,
),
),
],
),
const Divider(
color: Color(0xff999999),
),
const SizedBox(
height: 10,
),
FlipCard(
key: cardKey,
flipOnTouch: false,
onFlipDone: (back) {
useSecretLogin = back;
setState(() {});
},
direction: FlipDirection.HORIZONTAL,
front: SizedBox(
height: 110,
child: Column( child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
SizedBox(
height: MediaQuery.of(context).size.height / 10,
),
Row( Row(
children: [ children: [
Expanded( const SizedBox(
child: Align( child: Text(
alignment: Alignment.centerLeft, "账户",
child: Image.asset( style: TextStyle(
"assets/images/login_tip.png", fontSize: 16,
height: 45,
), ),
), ),
width: 40,
), ),
GestureDetector( const SizedBox(
onDoubleTap: () { width: 30,
if (debugBtnIsShow()) { ),
dismissDebugBtn(); Expanded(
} else { child: TextField(
showDebugBtn(context, btnColor: ref.watch(themeProvider).primaryColor); onChanged: (_) {
} setState(() {});
WidgetsBinding.instance?.endOfFrame; },
}, controller: _userNameController,
child: Image.asset( decoration: InputDecoration(
"assets/images/ql.png", border: InputBorder.none,
height: 45, enabledBorder: InputBorder.none,
focusedBorder: InputBorder.none,
isDense: true,
contentPadding: const EdgeInsets.all(4),
hintText: "请输入账户",
hintStyle: TextStyle(
fontSize: 16,
color: ref.watch(themeProvider).themeColor.descColor(),
),
),
autofocus: false,
), ),
), ),
], ],
), ),
SizedBox( const Divider(
height: MediaQuery.of(context).size.height / 15, color: Color(0xff999999),
),
const Text(
"域名:",
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
),
),
TextField(
onChanged: (_) {
setState(() {});
},
controller: _hostController,
decoration: const InputDecoration(
contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),
hintText: "http://1.1.1.1:5700",
),
autofocus: false,
),
FlipCard(
key: cardKey,
flipOnTouch: false,
onFlipDone: (back) {
useSecretLogin = back;
setState(() {});
},
direction: FlipDirection.HORIZONTAL,
front: SizedBox(
height: 200,
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(
height: 15,
),
const Text(
"用户名:",
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
),
),
TextField(
onChanged: (_) {
setState(() {});
},
controller: _userNameController,
decoration: const InputDecoration(
contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),
hintText: "请输入用户名",
),
autofocus: false,
),
const SizedBox(
height: 15,
),
const Text(
"密码:",
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
),
),
TextField(
onChanged: (_) {
setState(() {});
},
controller: _passwordController,
obscureText: true,
decoration: const InputDecoration(
contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),
hintText: "请输入密码",
),
autofocus: false,
),
const SizedBox(
height: 10,
),
],
),
),
back: SizedBox(
height: 200,
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(
height: 15,
),
const Text(
"client_id:",
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
),
),
TextField(
onChanged: (_) {
setState(() {});
},
controller: _cIdController,
decoration: const InputDecoration(
contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),
hintText: "请输入client_id",
),
autofocus: false,
),
const SizedBox(
height: 15,
),
const Text(
"client_secret:",
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
),
),
TextField(
onChanged: (_) {
setState(() {});
},
controller: _cSecretController,
obscureText: true,
decoration: const InputDecoration(
contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),
hintText: "请输入client_secret",
),
autofocus: false,
),
const SizedBox(
height: 10,
),
],
),
),
),
],
),
),
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 25,
),
child: Row(
children: [
Checkbox(
value: rememberPassword,
onChanged: (checked) {
rememberPassword = checked ?? false;
setState(() {});
},
),
const Text(
"记住密码/client",
style: TextStyle(
fontSize: 14,
),
),
const Spacer(),
GestureDetector(
onTap: () {
cardKey.currentState?.toggleCard();
WidgetsBinding.instance?.addPostFrameCallback((timeStamp) {
setState(() {});
});
},
child: Text(
loginByUserName() ? "client_id登录" : "账号登录",
style: const TextStyle(
fontSize: 14,
),
),
), ),
const SizedBox( const SizedBox(
width: 10, height: 10,
),
Row(
children: [
const SizedBox(
width: 40,
child: Text(
"密码",
style: TextStyle(
fontSize: 16,
),
),
),
const SizedBox(
width: 30,
),
Expanded(
child: TextField(
onChanged: (_) {
setState(() {});
},
controller: _passwordController,
obscureText: true,
decoration: InputDecoration(
border: InputBorder.none,
enabledBorder: InputBorder.none,
focusedBorder: InputBorder.none,
isDense: true,
contentPadding: const EdgeInsets.all(4),
hintText: "请输入密码",
hintStyle: TextStyle(
fontSize: 16,
color: ref.watch(themeProvider).themeColor.descColor(),
),
),
autofocus: false,
),
),
],
),
const Divider(
color: Color(0xff999999),
), ),
], ],
), ),
), ),
const SizedBox( back: SizedBox(
height: 30, height: 110,
), child: Column(
Container( mainAxisSize: MainAxisSize.min,
alignment: Alignment.center, mainAxisAlignment: MainAxisAlignment.start,
padding: const EdgeInsets.symmetric( crossAxisAlignment: CrossAxisAlignment.start,
horizontal: 40, children: [
Row(
children: [
const SizedBox(
width: 40,
child: Text(
"id",
style: TextStyle(
fontSize: 16,
),
),
),
const SizedBox(
width: 30,
),
Expanded(
child: TextField(
onChanged: (_) {
setState(() {});
},
controller: _cIdController,
decoration: InputDecoration(
border: InputBorder.none,
enabledBorder: InputBorder.none,
focusedBorder: InputBorder.none,
isDense: true,
contentPadding: const EdgeInsets.all(4),
hintText: "请输入client_id",
hintStyle: TextStyle(
fontSize: 16,
color: ref.watch(themeProvider).themeColor.descColor(),
),
),
autofocus: false,
),
),
],
),
const Divider(
color: Color(0xff999999),
),
const SizedBox(
height: 10,
),
Row(
children: [
const SizedBox(
width: 50,
child: Text(
"secret",
style: TextStyle(
fontSize: 16,
),
),
),
const SizedBox(
width: 20,
),
Expanded(
child: TextField(
onChanged: (_) {
setState(() {});
},
controller: _cSecretController,
obscureText: true,
decoration: InputDecoration(
border: InputBorder.none,
enabledBorder: InputBorder.none,
focusedBorder: InputBorder.none,
isDense: true,
contentPadding: const EdgeInsets.all(4),
hintText: "请输入client_secret",
hintStyle: TextStyle(
fontSize: 16,
color: ref.watch(themeProvider).themeColor.descColor(),
),
),
autofocus: false,
),
),
],
),
const Divider(
color: Color(0xff999999),
),
],
), ),
child: SizedBox( ),
width: MediaQuery.of(context).size.width - 80, ),
child: IgnorePointer( const SizedBox(
ignoring: !canClickLoginBtn(), height: 10,
child: CupertinoButton( ),
],
),
),
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 25,
),
child: Row(
children: [
Checkbox(
value: rememberPassword,
onChanged: (checked) {
rememberPassword = checked ?? false;
setState(() {});
},
),
const Text(
"记住密码",
style: TextStyle(
color: Color(0xff555555),
fontSize: 14,
),
),
const Spacer(),
GestureDetector(
onTap: () {
cardKey.currentState?.toggleCard();
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
setState(() {});
});
},
child: Text(
loginByUserName() ? "client_id登录" : "账号登录",
style: const TextStyle(
color: Color(0xff555555),
fontSize: 14,
),
),
),
const SizedBox(
width: 10,
),
],
),
),
const SizedBox(
height: 30,
),
Shake(
preferences: const AnimationPreferences(autoPlay: AnimationPlayStates.None),
key: loginKey,
child: Center(
child: Container(
alignment: Alignment.center,
width: MediaQuery.of(context).size.width * 0.8,
padding: const EdgeInsets.symmetric(
horizontal: 40,
),
decoration: BoxDecoration(
gradient: LinearGradient(
colors: canClickLoginBtn()
? [
const Color(0xff5DD16F),
const Color(0xff089556),
]
: [
const Color(0xff5DD16F).withOpacity(0.6),
const Color(0xff089556).withOpacity(0.6),
],
),
borderRadius: const BorderRadius.all(
Radius.circular(10),
),
),
child: SizedBox(
width: MediaQuery.of(context).size.width - 80,
child: IgnorePointer(
ignoring: !canClickLoginBtn(),
child: Builder(
builder: (context) {
return CupertinoButton(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
vertical: 5, vertical: 5,
), ),
color: canClickLoginBtn() ? ref.watch(themeProvider).primaryColor : ref.watch(themeProvider).primaryColor.withOpacity(0.4),
child: isLoading child: isLoading
? const CupertinoActivityIndicator() ? const CupertinoActivityIndicator()
: const Text( : const Text(
"登 录", "登 录",
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 18,
color: Colors.white,
), ),
), ),
onPressed: () { onPressed: () async {
Http.pushedLoginPage = false; Http.pushedLoginPage = false;
Utils.hideKeyBoard(context); Utils.hideKeyBoard(context);
if (loginByUserName()) { if (loginByUserName()) {
@@ -351,22 +474,22 @@ class _LoginPageState extends ConsumerState<LoginPage> {
login(_cIdController.text, _cSecretController.text); login(_cIdController.text, _cSecretController.text);
} }
}, },
), );
), },
), ),
), ),
const SizedBox( ),
height: 30,
),
],
), ),
), ),
), ),
Positioned( const SizedBox(
bottom: 10, height: 30,
child: (getIt<UserInfoViewModel>().historyAccounts.isEmpty) ),
? const SizedBox.shrink() (getIt<UserInfoViewModel>().historyAccounts.isEmpty)
: SizedBox( ? const SizedBox.shrink()
: SafeArea(
top: false,
child: SizedBox(
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
child: Center( child: Center(
child: Material( child: Material(
@@ -378,24 +501,39 @@ class _LoginPageState extends ConsumerState<LoginPage> {
itemBuilder: (BuildContext context) => <PopupMenuEntry<UserInfoBean>>[ itemBuilder: (BuildContext context) => <PopupMenuEntry<UserInfoBean>>[
...getIt<UserInfoViewModel>() ...getIt<UserInfoViewModel>()
.historyAccounts .historyAccounts
.map((e) => PopupMenuItem<UserInfoBean>( .map(
value: e, (e) => PopupMenuItem<UserInfoBean>(
child: buildCell(e), value: e,
)) child: buildCell(context, e),
),
)
.toList(), .toList(),
], ],
child: Text( child: Row(
"切换账号", mainAxisSize: MainAxisSize.min,
style: TextStyle( children: [
color: ref.watch(themeProvider).primaryColor, Image.asset(
fontSize: 14, "assets/images/icon_history.png",
), fit: BoxFit.cover,
width: 16,
),
const SizedBox(
width: 5,
),
const Text(
"历史账号",
style: TextStyle(
color: Color(0xff555555),
fontSize: 14,
),
),
],
), ),
), ),
), ),
), ),
), ),
), ),
], ],
), ),
), ),
@@ -434,6 +572,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
void loginFailed() { void loginFailed() {
isLoading = false; isLoading = false;
loginKey.currentState?.forward();
setState(() {}); setState(() {});
} }
@@ -512,7 +651,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
}); });
} }
Widget buildCell(UserInfoBean bean) { Widget buildCell(BuildContext context, UserInfoBean bean) {
return ListTile( return ListTile(
title: Text( title: Text(
bean.host ?? "", bean.host ?? "",
@@ -525,6 +664,19 @@ class _LoginPageState extends ConsumerState<LoginPage> {
bean.userName ?? "", bean.userName ?? "",
), ),
), ),
contentPadding: EdgeInsets.zero,
trailing: GestureDetector(
onTap: () {
getIt<UserInfoViewModel>().removeHistoryAccount(bean.host);
Navigator.pop(context);
setState(() {});
},
child: const Icon(
CupertinoIcons.clear_thick,
size: 20,
),
),
); );
} }
@@ -534,7 +686,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
_cIdController.text = result.userName ?? ""; _cIdController.text = result.userName ?? "";
_cSecretController.text = result.password ?? ""; _cSecretController.text = result.password ?? "";
if (cardKey.currentState?.isFront ?? false) { if (cardKey.currentState?.isFront ?? false) {
WidgetsBinding.instance?.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
cardKey.currentState?.toggleCard(); cardKey.currentState?.toggleCard();
}); });
} }
@@ -542,7 +694,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
_userNameController.text = result.userName ?? ""; _userNameController.text = result.userName ?? "";
_passwordController.text = result.password ?? ""; _passwordController.text = result.password ?? "";
if (!(cardKey.currentState?.isFront ?? false)) { if (!(cardKey.currentState?.isFront ?? false)) {
WidgetsBinding.instance?.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
cardKey.currentState?.toggleCard(); cardKey.currentState?.toggleCard();
}); });
} }

2
lib/module/others/dependencies/dependency_page.dart
View File

@@ -283,7 +283,7 @@ class DependencyCell extends ConsumerWidget {
} }
void showLog(WidgetRef ref, String? sId) { void showLog(WidgetRef ref, String? sId) {
WidgetsBinding.instance?.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
showCupertinoDialog( showCupertinoDialog(
builder: (BuildContext context) { builder: (BuildContext context) {
return CupertinoAlertDialog( return CupertinoAlertDialog(

39
lib/module/others/scripts/script_detail_page.dart
View File

@@ -219,7 +219,7 @@ class _ScriptDetailPageState extends ConsumerState<ScriptDetailPage>
? const Center( ? const Center(
child: CupertinoActivityIndicator(), child: CupertinoActivityIndicator(),
) )
: CodeWidget( : ScriptCodeWidget(
content: content ?? "", content: content ?? "",
), ),
); );
@@ -265,3 +265,40 @@ class _ScriptDetailPageState extends ConsumerState<ScriptDetailPage>
loadData(); loadData();
} }
} }
class ScriptCodeWidget extends StatefulWidget {
final String content;
const ScriptCodeWidget({
Key? key,
required this.content,
}) : super(key: key);
@override
State<ScriptCodeWidget> createState() => _ScriptCodeWidgetState();
}
class _ScriptCodeWidgetState extends State<ScriptCodeWidget>{
@override
Widget build(BuildContext context) {
return SelectableText.rich(
TextSpan(
style: GoogleFonts.droidSansMono(fontSize: 14).apply(
fontSizeFactor: 1,
),
children: <TextSpan>[
DartSyntaxHighlighter(SyntaxHighlighterStyle.lightThemeStyle())
.format(widget.content)
],
),
style: DefaultTextStyle.of(context).style.apply(
fontSizeFactor: 1,
),
selectionWidthStyle: BoxWidthStyle.max,
selectionHeightStyle: BoxHeightStyle.max,
autofocus: true,
);
}
}

24
lib/module/others/scripts/script_edit_page.dart
View File

@@ -41,7 +41,7 @@ class _ScriptEditPageState extends ConsumerState<ScriptEditPage> {
super.initState(); super.initState();
WidgetsBinding.instance?.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
focusNode.requestFocus(); focusNode.requestFocus();
}); });
} }
@@ -117,24 +117,10 @@ class _ScriptEditPageState extends ConsumerState<ScriptEditPage> {
), ),
body: SafeArea( body: SafeArea(
top: false, top: false,
child: Padding( child: CodeField(
padding: const EdgeInsets.symmetric( controller: _codeController!,
horizontal: 10, expands: true,
vertical: 10, background: ref.watch(themeProvider).themeColor.tabBarColor(),
),
child: CodeField(
controller: _codeController!,
expands: true,
wrap: true,
lineNumberStyle: LineNumberStyle(
width: 0,
margin: 0,
textStyle: TextStyle(
color: ref.watch(themeProvider).themeColor.descColor(),
),
),
background: ref.watch(themeProvider).themeColor.tabBarColor(),
),
), ),
), ),
); );

294
lib/module/others/scripts/script_page.dart
View File

@@ -65,103 +65,112 @@ class _ScriptPageState extends ConsumerState<ScriptPage> with LazyLoadState<Scri
), ),
body: list.isEmpty body: list.isEmpty
? const Center( ? const Center(
child: CupertinoActivityIndicator(), child: CupertinoActivityIndicator(),
) )
: ListView.builder( : RefreshIndicator(
itemBuilder: (context, index) { color: Theme.of(context).primaryColor,
if (index == 0) { onRefresh: () async {
return searchCell(ref); await loadData();
} return Future.value();
},
ScriptBean item = list[index - 1]; child: ListView.builder(
physics: const AlwaysScrollableScrollPhysics(),
if (_searchController.text.isEmpty || keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag,
(item.title?.contains(_searchController.text) ?? false) || itemBuilder: (context, index) {
(item.value?.contains(_searchController.text) ?? false) || if (index == 0) {
((item.children?.where((e) { return searchCell(ref);
return (e.title?.contains(_searchController.text) ?? false) || (e.value?.contains(_searchController.text) ?? false); }
}).isNotEmpty ??
false))) { ScriptBean item = list[index - 1];
return ColoredBox(
color: ref.watch(themeProvider).themeColor.settingBgColor(), if (_searchController.text.isEmpty ||
child: (item.children != null && item.children!.isNotEmpty) (item.title?.contains(_searchController.text) ?? false) ||
? ExpansionTile( (item.value?.contains(_searchController.text) ?? false) ||
title: Text( ((item.children?.where((e) {
item.title ?? "", return (e.title?.contains(_searchController.text) ?? false) || (e.value?.contains(_searchController.text) ?? false);
style: TextStyle( }).isNotEmpty ??
color: (item.disabled ?? false) false))) {
? ref.watch(themeProvider).themeColor.descColor() return ColoredBox(
: ref.watch(themeProvider).themeColor.titleColor(), color: ref.watch(themeProvider).themeColor.settingBgColor(),
fontSize: 16, child: (item.children != null && item.children!.isNotEmpty)
), ? ExpansionTile(
), title: Text(
children: item.children! item.title ?? "",
.where((element) { style: TextStyle(
if (_searchController.text.isEmpty) { color: (item.disabled ?? false)
return true; ? ref.watch(themeProvider).themeColor.descColor()
: ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 16,
),
),
children: item.children!
.where((element) {
if (_searchController.text.isEmpty) {
return true;
}
return (element.title?.contains(_searchController.text) ?? false) ||
(element.value?.contains(_searchController.text) ?? false);
})
.map((e) => ListTile(
onTap: () {
Navigator.of(context).pushNamed(
Routes.routeScriptDetail,
arguments: {
"title": e.title,
"path": e.parent,
},
).then((value) {
if (value != null && value == true) {
loadData();
}
});
},
title: Text(
e.title ?? "",
style: TextStyle(
color: (item.disabled ?? false)
? ref.watch(themeProvider).themeColor.descColor()
: ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 14,
),
),
))
.toList(),
)
: ListTile(
onTap: () {
Navigator.of(context).pushNamed(
Routes.routeScriptDetail,
arguments: {
"title": item.title,
"path": "",
},
).then(
(value) {
if (value != null && value == true) {
loadData();
}
},
);
},
title: Text(
item.title ?? "",
style: TextStyle(
color: (item.disabled ?? false)
? ref.watch(themeProvider).themeColor.descColor()
: ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 16,
),
),
),
);
} else {
return const SizedBox.shrink();
} }
return (element.title?.contains(_searchController.text) ?? false) ||
(element.value?.contains(_searchController.text) ?? false);
})
.map((e) => ListTile(
onTap: () {
Navigator.of(context).pushNamed(
Routes.routeScriptDetail,
arguments: {
"title": e.title,
"path": e.parent,
},
).then((value) {
if (value != null && value == true) {
loadData();
}
});
},
title: Text(
e.title ?? "",
style: TextStyle(
color: (item.disabled ?? false)
? ref.watch(themeProvider).themeColor.descColor()
: ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 14,
),
),
))
.toList(),
)
: ListTile(
onTap: () {
Navigator.of(context).pushNamed(
Routes.routeScriptDetail,
arguments: {
"title": item.title,
"path": "",
},
).then(
(value) {
if (value != null && value == true) {
loadData();
}
},
);
}, },
title: Text( itemCount: list.length + 1,
item.title ?? "",
style: TextStyle(
color: (item.disabled ?? false)
? ref.watch(themeProvider).themeColor.descColor()
: ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 16,
),
),
), ),
); ),
} else {
return const SizedBox.shrink();
}
},
itemCount: list.length + 1,
),
); );
} }
@@ -171,7 +180,9 @@ class _ScriptPageState extends ConsumerState<ScriptPage> with LazyLoadState<Scri
horizontal: 15, horizontal: 15,
vertical: 10, vertical: 10,
), ),
child:SearchCell(controller: _searchController,), child: SearchCell(
controller: _searchController,
),
); );
} }
@@ -220,61 +231,70 @@ class _ScriptPageState extends ConsumerState<ScriptPage> with LazyLoadState<Scri
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
vertical: 10, vertical: 10,
), ),
child: TextField( child: Material(
controller: _nameController, color: Colors.transparent,
decoration: const InputDecoration( child: TextField(
isDense: true, controller: _nameController,
contentPadding: EdgeInsets.all(4), decoration: const InputDecoration(
hintText: "请输入脚本名称", isDense: true,
hintStyle: TextStyle( contentPadding: EdgeInsets.all(4),
fontSize: 14, hintText: "请输入脚本名称",
hintStyle: TextStyle(
fontSize: 14,
),
), ),
autofocus: false,
), ),
autofocus: false,
), ),
), ),
const SizedBox( const SizedBox(
height: 10, height: 10,
), ),
const Text( const Material(
"脚本所属文件夹:", color: Colors.transparent,
style: TextStyle( child: Text(
fontSize: 14, "脚本所属文件夹:",
style: TextStyle(
fontSize: 14,
),
), ),
), ),
const SizedBox( const SizedBox(
height: 10, height: 10,
), ),
DropdownButtonFormField<String>( Material(
items: list color: Colors.transparent,
.where((element) => element.children?.isNotEmpty ?? false) child: DropdownButtonFormField<String>(
.map((e) => DropdownMenuItem( items: list
value: e.value, .where((element) => element.children?.isNotEmpty ?? false)
child: SizedBox( .map((e) => DropdownMenuItem(
width: MediaQuery.of(context).size.width / 2, value: e.value,
child: Text( child: SizedBox(
e.value ?? "", width: MediaQuery.of(context).size.width / 2,
maxLines: 2, child: Text(
), e.value ?? "",
), maxLines: 2,
)) ),
.toList() ),
..insert( ))
0, .toList()
DropdownMenuItem( ..insert(
value: "", 0,
child: SizedBox( DropdownMenuItem(
width: MediaQuery.of(context).size.width / 2, value: "",
child: const Text( child: SizedBox(
"根目录", width: MediaQuery.of(context).size.width / 2,
maxLines: 2, child: const Text(
"根目录",
maxLines: 2,
),
), ),
), )),
)), value: scriptPath,
value: scriptPath, onChanged: (value) {
onChanged: (value) { scriptPath = value ?? "";
scriptPath = value ?? ""; },
}, ),
), ),
], ],
), ),

2
lib/module/others/update_password_page.dart
View File

@@ -31,7 +31,7 @@ class _UpdatePasswordPageState extends ConsumerState<UpdatePasswordPage> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
WidgetsBinding.instance?.addPostFrameCallback( WidgetsBinding.instance.addPostFrameCallback(
(timeStamp) { (timeStamp) {
focusNode.requestFocus(); focusNode.requestFocus();
}, },

2
lib/module/task/add_task_page.dart
View File

@@ -36,7 +36,7 @@ class _AddTaskPageState extends ConsumerState<AddTaskPage> {
} else { } else {
taskBean = TaskBean(); taskBean = TaskBean();
} }
WidgetsBinding.instance?.addPostFrameCallback( WidgetsBinding.instance.addPostFrameCallback(
(timeStamp) { (timeStamp) {
focusNode.requestFocus(); focusNode.requestFocus();
}, },

2
lib/module/task/task_detail/task_detail_page.dart
View File

@@ -345,7 +345,7 @@ class _TaskDetailPageState extends ConsumerState<TaskDetailPage> {
startCron(BuildContext context, WidgetRef ref) async { startCron(BuildContext context, WidgetRef ref) async {
await ref.read(taskProvider).runCrons(widget.taskBean.sId!); await ref.read(taskProvider).runCrons(widget.taskBean.sId!);
setState(() {}); setState(() {});
WidgetsBinding.instance?.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
showLog(); showLog();
}); });
} }

2
lib/module/task/task_page.dart
View File

@@ -245,7 +245,7 @@ class TaskItemCell extends StatelessWidget {
SlidableAction( SlidableAction(
backgroundColor: const Color(0xff5D5E70), backgroundColor: const Color(0xff5D5E70),
onPressed: (_) { onPressed: (_) {
WidgetsBinding.instance?.endOfFrame.then((timeStamp) { WidgetsBinding.instance.endOfFrame.then((timeStamp) {
Navigator.of(context).pushNamed(Routes.routeAddTask, arguments: bean); Navigator.of(context).pushNamed(Routes.routeAddTask, arguments: bean);
}); });
}, },

35
pubspec.lock
View File

@@ -42,7 +42,7 @@ packages:
name: back_button_interceptor name: back_button_interceptor
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "5.0.2" version: "6.0.0"
boolean_selector: boolean_selector:
dependency: transitive dependency: transitive
description: description:
@@ -168,7 +168,7 @@ packages:
name: collection name: collection
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.15.0" version: "1.16.0"
convert: convert:
dependency: transitive dependency: transitive
description: description:
@@ -189,7 +189,7 @@ packages:
name: cupertino_icons name: cupertino_icons
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.0.4" version: "1.0.5"
dart_style: dart_style:
dependency: transitive dependency: transitive
description: description:
@@ -224,7 +224,7 @@ packages:
name: fake_async name: fake_async
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.2.0" version: "1.3.0"
ffi: ffi:
dependency: transitive dependency: transitive
description: description:
@@ -258,6 +258,13 @@ packages:
description: flutter description: flutter
source: sdk source: sdk
version: "0.0.0" version: "0.0.0"
flutter_animator:
dependency: "direct main"
description:
name: flutter_animator
url: "https://pub.flutter-io.cn"
source: hosted
version: "3.2.2"
flutter_app_name: flutter_app_name:
dependency: "direct dev" dependency: "direct dev"
description: description:
@@ -311,7 +318,7 @@ packages:
name: flutter_riverpod name: flutter_riverpod
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.0.3" version: "1.0.4"
flutter_slidable: flutter_slidable:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -433,7 +440,7 @@ packages:
name: js name: js
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.6.3" version: "0.6.4"
json_annotation: json_annotation:
dependency: transitive dependency: transitive
description: description:
@@ -503,7 +510,7 @@ packages:
name: material_color_utilities name: material_color_utilities
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.1.3" version: "0.1.4"
meta: meta:
dependency: transitive dependency: transitive
description: description:
@@ -580,7 +587,7 @@ packages:
name: path name: path
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.8.0" version: "1.8.1"
path_provider: path_provider:
dependency: transitive dependency: transitive
description: description:
@@ -781,7 +788,7 @@ packages:
name: source_span name: source_span
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.8.1" version: "1.8.2"
stack_trace: stack_trace:
dependency: transitive dependency: transitive
description: description:
@@ -837,7 +844,7 @@ packages:
name: test_api name: test_api
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.4.8" version: "0.4.9"
timing: timing:
dependency: transitive dependency: transitive
description: description:
@@ -865,7 +872,7 @@ packages:
name: url_launcher name: url_launcher
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "6.1.2" version: "6.1.3"
url_launcher_android: url_launcher_android:
dependency: transitive dependency: transitive
description: description:
@@ -921,7 +928,7 @@ packages:
name: vector_math name: vector_math
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.1.1" version: "2.1.2"
watcher: watcher:
dependency: transitive dependency: transitive
description: description:
@@ -972,5 +979,5 @@ packages:
source: hosted source: hosted
version: "3.1.1" version: "3.1.1"
sdks: sdks:
dart: ">=2.16.0 <3.0.0" dart: ">=2.17.0-0 <3.0.0"
flutter: ">=2.10.1" flutter: ">=3.0.0"

21
pubspec.yaml
View File

@@ -13,13 +13,13 @@ dependencies:
sdk: flutter sdk: flutter
flutter_localizations: flutter_localizations:
sdk: flutter sdk: flutter
cupertino_icons: ^1.0.4 cupertino_icons: ^1.0.5
flutter_riverpod: ^1.0.3 flutter_riverpod: ^1.0.4
shared_preferences: ^2.0.13 shared_preferences: ^2.0.15
synchronized: ^3.0.0 synchronized: ^3.0.0+2
back_button_interceptor: ^5.0.2 back_button_interceptor: ^6.0.0
flutter_slidable: ^1.2.0 flutter_slidable: ^1.3.0
dio: ^4.0.4 dio: ^4.0.6
dio_log: ^2.0.2 dio_log: ^2.0.2
json_conversion_annotation: ^0.0.4 json_conversion_annotation: ^0.0.4
logger: ^1.1.0 logger: ^1.1.0
@@ -27,14 +27,15 @@ dependencies:
get_it: ^7.2.0 get_it: ^7.2.0
highlight: ^0.7.0 highlight: ^0.7.0
drag_and_drop_lists: ^0.3.2+2 drag_and_drop_lists: ^0.3.2+2
fluttertoast: ^8.0.8 fluttertoast: ^8.0.9
move_to_background: ^1.0.2 move_to_background: ^1.0.2
flip_card: ^0.6.0 flip_card: ^0.6.0
package_info_plus: ^1.4.0 package_info_plus: ^1.4.2
url_launcher: ^6.0.20 url_launcher: ^6.1.3
flutter_colorpicker: ^1.0.3 flutter_colorpicker: ^1.0.3
widget_with_codeview: ^2.0.1+2 widget_with_codeview: ^2.0.1+2
code_text_field: ^1.0.2 code_text_field: ^1.0.2
flutter_animator: ^3.2.1
# flutter pub run build_runner build --delete-conflicting-outputs # flutter pub run build_runner build --delete-conflicting-outputs
# flutter pub run change_app_package_name:main work.master.qinglongapp # flutter pub run change_app_package_name:main work.master.qinglongapp