add theme color

This commit is contained in:
jyuesong
2022-01-14 09:40:58 +08:00
parent b0357b0827
commit 572deec31b
37 changed files with 334 additions and 261 deletions

View File

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
var themeProvider = ChangeNotifierProvider((ref) => ThemeViewModel());
const Color _primaryColor = Color(0xFF299343);
class ThemeViewModel extends ChangeNotifier {
ThemeData currentTheme = lightTheme;
@@ -25,8 +26,29 @@ ThemeData darkTheme = ThemeData.dark().copyWith(
primaryColor: const Color(0xffffffff),
);
ThemeData lightTheme = ThemeData.light().copyWith(
primaryColor: const Color(0xFF0F77FE),
primaryColor: _primaryColor,
scaffoldBackgroundColor: Colors.white,
inputDecorationTheme: const InputDecorationTheme(
labelStyle: TextStyle(color: _primaryColor),
focusedBorder: UnderlineInputBorder(
borderSide: BorderSide(
color: _primaryColor,
),
),
),
appBarTheme: const AppBarTheme(
backgroundColor: _primaryColor,
),
bottomNavigationBarTheme: const BottomNavigationBarThemeData(
selectedItemColor: _primaryColor,
),
buttonTheme: const ButtonThemeData(
buttonColor: _primaryColor,
),
progressIndicatorTheme: const ProgressIndicatorThemeData(
color: _primaryColor,
),
);
abstract class ThemeColors {
@@ -67,6 +89,6 @@ class DartThemeColors extends ThemeColors {
@override
Color pinColor() {
return Colors.black12;
return Colors.black12;
}
}

View File

@@ -57,7 +57,13 @@ class _ConfigPageState extends State<ConfigPage> {
),
const Spacer(),
CupertinoButton(
child: const Text("编辑"),
child: Text(
"编辑",
style: TextStyle(
color: Theme.of(context).primaryColor,
fontSize: 16,
),
),
onPressed: () {
Navigator.of(context).pushNamed(Routes.route_ConfigEdit, arguments: {
"title": model.title,

View File

@@ -44,168 +44,170 @@ class _LoginPageState extends State<LoginPage> {
}
return SizedBox(
height: MediaQuery.of(context).size.height,
child: SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
height: MediaQuery.of(context).size.height / 6,
child: Stack(
children: [
Positioned(
bottom: 0,
child: Image.asset(
"assets/images/login_bg.png",
width: MediaQuery.of(context).size.width,
),
Image.asset(
"assets/images/ql.png",
width: 60,
height: 60,
),
SizedBox(
height: 15,
),
Text(
"青龙控制面板",
style: TextStyle(
fontSize: 16,
),
),
SizedBox(
height: MediaQuery.of(context).size.height / 10,
),
Padding(
),
SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 15,
horizontal: 40,
),
child: Row(
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(
child: Text(
"域名:",
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,
),
),
width: 60,
SizedBox(
height: MediaQuery.of(context).size.height / 6,
),
const SizedBox(
width: 15,
),
Expanded(
child: TextField(
onChanged: (_) {
setState(() {});
},
controller: _hostController,
decoration: const InputDecoration(
contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),
hintText: "http://1.1.1.1:5700",
),
autofocus: false,
),
),
],
),
),
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 15,
),
child: Row(
children: [
const SizedBox(
child: Text(
"用户名:",
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,
),
),
width: 60,
),
const SizedBox(
width: 15,
),
Expanded(
child: TextField(
onChanged: (_) {
setState(() {});
},
controller: _userNameController,
decoration: const InputDecoration(
contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),
hintText: "请输入用户名",
),
autofocus: false,
),
),
],
),
),
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 15,
vertical: 10,
),
child: Row(
children: [
const SizedBox(
child: Text(
"密码:",
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,
),
),
width: 60,
),
const SizedBox(
width: 15,
),
Expanded(
child: TextField(
onChanged: (_) {
setState(() {});
},
controller: _passwordController,
obscureText: true,
decoration: const InputDecoration(
contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),
hintText: "请输入密码",
),
autofocus: false,
),
),
],
),
),
const SizedBox(
height: 30,
),
SizedBox(
width: MediaQuery.of(context).size.width - 30,
child: IgnorePointer(
ignoring: _hostController.text.isEmpty || _userNameController.text.isEmpty || _passwordController.text.isEmpty || model.isLoading,
child: CupertinoButton(
color:
(_hostController.text.isNotEmpty && _userNameController.text.isNotEmpty && _passwordController.text.isNotEmpty && !model.isLoading)
? Theme.of(context).primaryColor
: Theme.of(context).primaryColor.withOpacity(0.4),
child: model.isLoading
? const CupertinoActivityIndicator()
: const Text(
SizedBox(
height: 50,
width: MediaQuery.of(context).size.width,
child: Stack(
children: [
Positioned(
top: 0,
left: 40,
child: Image.asset(
"assets/images/login_tip.png",
height: 45,
),
),
const Positioned(
top: 10,
left: 40,
child: Text(
"登录",
style: TextStyle(
fontSize: 16,
fontSize: 30,
fontWeight: FontWeight.bold,
),
),
onPressed: () {
Utils.hideKeyBoard(context);
userInfoViewModel.updateHost(_hostController.text);
model.login(_userNameController.text, _passwordController.text);
}),
),
Positioned(
top: 5,
right: 40,
child: Image.asset(
"assets/images/ql.png",
height: 45,
),
),
],
),
),
SizedBox(
height: MediaQuery.of(context).size.height / 10,
),
const Text(
"域名:",
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
),
),
const SizedBox(
height: 10,
),
TextField(
onChanged: (_) {
setState(() {});
},
controller: _hostController,
decoration: const InputDecoration(
contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),
hintText: "http://1.1.1.1:5700",
),
autofocus: false,
),
const SizedBox(
height: 20,
),
const Text(
"用户名:",
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
),
),
const SizedBox(
height: 10,
),
TextField(
onChanged: (_) {
setState(() {});
},
controller: _userNameController,
decoration: const InputDecoration(
contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),
hintText: "请输入用户名",
),
autofocus: false,
),
const SizedBox(
height: 20,
),
const Text(
"密码:",
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
),
),
const SizedBox(
height: 10,
),
TextField(
onChanged: (_) {
setState(() {});
},
controller: _passwordController,
obscureText: true,
decoration: const InputDecoration(
contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),
hintText: "请输入密码",
),
autofocus: false,
),
const SizedBox(
height: 30,
),
SizedBox(
width: MediaQuery.of(context).size.width - 80,
child: IgnorePointer(
ignoring: _hostController.text.isEmpty || _userNameController.text.isEmpty || _passwordController.text.isEmpty || model.isLoading,
child: CupertinoButton(
color: (_hostController.text.isNotEmpty &&
_userNameController.text.isNotEmpty &&
_passwordController.text.isNotEmpty &&
!model.isLoading)
? Theme.of(context).primaryColor
: Theme.of(context).primaryColor.withOpacity(0.4),
child: model.isLoading
? const CupertinoActivityIndicator()
: const Text(
"登 录",
style: TextStyle(
fontSize: 16,
),
),
onPressed: () {
Utils.hideKeyBoard(context);
userInfoViewModel.updateHost(_hostController.text);
model.login(_userNameController.text, _passwordController.text);
}),
),
),
],
),
),
],
),
),
],
),
);
}),

View File

@@ -83,7 +83,7 @@ class _AddTaskPageState extends ConsumerState<AddTaskPage> {
"名称:",
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,
fontWeight: FontWeight.w600,
),
),
const SizedBox(
@@ -115,7 +115,7 @@ class _AddTaskPageState extends ConsumerState<AddTaskPage> {
"命令:",
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,
fontWeight: FontWeight.w600,
),
),
const SizedBox(
@@ -149,7 +149,7 @@ class _AddTaskPageState extends ConsumerState<AddTaskPage> {
"定时:",
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,
fontWeight: FontWeight.w600,
),
),
const SizedBox(

View File

@@ -31,6 +31,7 @@ class _TaskPageState extends State<TaskPage> {
return BaseStateWidget<TaskViewModel>(
builder: (ref, model, child) {
return RefreshIndicator(
color: Theme.of(context).primaryColor,
onRefresh: () async {
return model.loadData(false);
},
@@ -106,90 +107,108 @@ class TaskItemCell extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Slidable(
key: const ValueKey(0),
startActionPane: ActionPane(
motion: const ScrollMotion(),
extentRatio: 0.3,
dragDismissible: false,
children: [
SlidableAction(
flex: 1,
icon: bean.status == 0 ? CupertinoIcons.stop_circle : CupertinoIcons.memories,
foregroundColor: Colors.white,
backgroundColor: const Color(0xFF0F77FE),
onPressed: (BuildContext context) {
if (bean.status == 0) {
stopCron(context, ref);
} else {
startCron(context, ref);
}
},
return Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Slidable(
key: const ValueKey(0),
startActionPane: ActionPane(
motion: const ScrollMotion(),
extentRatio: 0.3,
dragDismissible: false,
children: [
SlidableAction(
flex: 1,
icon: bean.status == 0 ? CupertinoIcons.stop_circle : CupertinoIcons.memories,
foregroundColor: Colors.white,
backgroundColor: const Color(0xFF0F77FE),
onPressed: (BuildContext context) {
if (bean.status == 0) {
stopCron(context, ref);
} else {
startCron(context, ref);
}
},
),
SlidableAction(
flex: 1,
backgroundColor: Colors.green,
foregroundColor: Colors.white,
icon: CupertinoIcons.clock_fill,
onPressed: (BuildContext context) {
logCron(context, ref);
},
),
],
),
SlidableAction(
flex: 1,
backgroundColor: Colors.green,
foregroundColor: Colors.white,
icon: CupertinoIcons.clock_fill,
onPressed: (BuildContext context) {
logCron(context, ref);
},
endActionPane: ActionPane(
motion: const ScrollMotion(),
extentRatio: 0.15,
children: [
SlidableAction(
backgroundColor: Colors.cyan,
flex: 1,
onPressed: (_) {
more(context, ref);
},
foregroundColor: Colors.white,
icon: CupertinoIcons.ellipsis,
),
],
),
],
),
endActionPane: ActionPane(
motion: const ScrollMotion(),
extentRatio: 0.15,
children: [
SlidableAction(
backgroundColor: Colors.cyan,
flex: 1,
onPressed: (_) {
more(context, ref);
},
foregroundColor: Colors.white,
icon: CupertinoIcons.ellipsis,
),
],
),
child: Container(
color: bean.isPinned == 1 ? ref.watch(themeProvider).themeColor.pinColor() : Colors.transparent,
padding: const EdgeInsets.symmetric(
horizontal: 15,
vertical: 8,
),
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
child: Container(
color: bean.isPinned == 1 ? ref.watch(themeProvider).themeColor.pinColor() : Colors.transparent,
padding: const EdgeInsets.symmetric(
horizontal: 15,
vertical: 8,
),
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
bean.name ?? "",
maxLines: 1,
style: TextStyle(
overflow: TextOverflow.ellipsis,
color: bean.isDisabled == 1 ? Color(0xffF85152) : ref.watch(themeProvider).themeColor.taskTitleColor(),
fontSize: 18,
),
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text(
bean.name ?? "",
maxLines: 1,
style: TextStyle(
overflow: TextOverflow.ellipsis,
color: bean.isDisabled == 1 ? Color(0xffF85152) : ref.watch(themeProvider).themeColor.taskTitleColor(),
fontSize: 18,
),
),
const SizedBox(
width: 5,
),
bean.status == 1
? const SizedBox.shrink()
: const SizedBox(
width: 15,
height: 15,
child: CircularProgressIndicator(
strokeWidth: 2,
),
),
const Spacer(),
Text(
(bean.lastExecutionTime == null || bean.lastExecutionTime == 0) ? "-" : Utils.formatMessageTime(bean.lastExecutionTime!),
maxLines: 1,
style: const TextStyle(
overflow: TextOverflow.ellipsis,
color: Color(0xff999999),
fontSize: 12,
),
),
],
),
const SizedBox(
width: 5,
height: 8,
),
bean.status == 1
? const SizedBox.shrink()
: const SizedBox(
width: 15,
height: 15,
child: CircularProgressIndicator(
strokeWidth: 2,
),
),
const Spacer(),
Text(
(bean.lastExecutionTime == null || bean.lastExecutionTime == 0) ? "-" : Utils.formatMessageTime(bean.lastExecutionTime!),
bean.schedule ?? "",
maxLines: 1,
style: const TextStyle(
overflow: TextOverflow.ellipsis,
@@ -199,21 +218,10 @@ class TaskItemCell extends StatelessWidget {
),
],
),
const SizedBox(
height: 8,
),
Text(
bean.schedule ?? "",
maxLines: 1,
style: const TextStyle(
overflow: TextOverflow.ellipsis,
color: Color(0xff999999),
fontSize: 12,
),
),
],
),
),
),
const Divider(height: 1,indent: 15,),
],
);
}

View File

@@ -38,9 +38,7 @@ class TaskViewModel extends BaseViewModel {
list.sort((a, b) {
return a.status!.compareTo(b.status!);
});
list.sort((a, b) {
return b.isPinned!.compareTo(a.isPinned!);
});
}
Future<void> runCrons(String cron) async {