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

update style

Browse Source
This commit is contained in:
jyuesong
2022-01-19 09:15:31 +08:00
parent 0a2e9a3c09
commit ca6f1db16f
11 changed files with 46 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/base/http/http.dart
View File

@@ -6,7 +6,6 @@ import 'package:dio_log/dio_log.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:qinglong_app/base/http/token_interceptor.dart'; import 'package:qinglong_app/base/http/token_interceptor.dart';
import 'package:qinglong_app/base/userinfo_viewmodel.dart'; import 'package:qinglong_app/base/userinfo_viewmodel.dart';
import 'package:qinglong_app/utils/QlNavigatorObserver.dart';
import '../../json.jc.dart'; import '../../json.jc.dart';
import '../../main.dart'; import '../../main.dart';

6
lib/base/theme.dart
View File

@@ -157,7 +157,7 @@ ThemeData lightTheme = ThemeData.light().copyWith(
abstract class ThemeColors { abstract class ThemeColors {
Color settingBgColor(); Color settingBgColor();
Color taskTitleColor(); Color titleColor();
Color descColor(); Color descColor();
@@ -170,7 +170,7 @@ abstract class ThemeColors {
class LightThemeColors extends ThemeColors { class LightThemeColors extends ThemeColors {
@override @override
Color taskTitleColor() { Color titleColor() {
return const Color(0xff333333); return const Color(0xff333333);
} }
@@ -202,7 +202,7 @@ class LightThemeColors extends ThemeColors {
class DartThemeColors extends ThemeColors { class DartThemeColors extends ThemeColors {
@override @override
Color taskTitleColor() { Color titleColor() {
return Colors.white; return Colors.white;
} }

3
lib/main.dart
View File

@@ -9,7 +9,6 @@ import 'package:get_it/get_it.dart';
import 'package:logger/logger.dart'; import 'package:logger/logger.dart';
import 'package:qinglong_app/base/theme.dart'; import 'package:qinglong_app/base/theme.dart';
import 'package:qinglong_app/module/login/login_page.dart'; import 'package:qinglong_app/module/login/login_page.dart';
import 'package:qinglong_app/utils/QlNavigatorObserver.dart';
import 'package:qinglong_app/utils/sp_utils.dart'; import 'package:qinglong_app/utils/sp_utils.dart';
import 'base/routes.dart'; import 'base/routes.dart';
@@ -25,7 +24,6 @@ void main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
await SpUtil.getInstance(); await SpUtil.getInstance();
getIt.registerSingleton<UserInfoViewModel>(UserInfoViewModel()); getIt.registerSingleton<UserInfoViewModel>(UserInfoViewModel());
getIt.registerSingleton<QlNavigatorObserver>(QlNavigatorObserver());
runApp( runApp(
ProviderScope( ProviderScope(
@@ -58,7 +56,6 @@ class QlAppState extends ConsumerState<QlApp> {
}, },
child: MaterialApp( child: MaterialApp(
locale: const Locale('zh', 'cn'), locale: const Locale('zh', 'cn'),
navigatorObservers: [getIt<QlNavigatorObserver>()],
navigatorKey: navigatorState, navigatorKey: navigatorState,
theme: ref.watch<ThemeViewModel>(themeProvider).currentTheme, theme: ref.watch<ThemeViewModel>(themeProvider).currentTheme,
onGenerateRoute: (setting) { onGenerateRoute: (setting) {

55
lib/module/env/env_page.dart vendored
View File

@@ -49,8 +49,7 @@ class _EnvPageState extends State<EnvPage> {
return model.loadData(false); return model.loadData(false);
}, },
child: ReorderableListView( child: ReorderableListView(
keyboardDismissBehavior: keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag,
ScrollViewKeyboardDismissBehavior.onDrag,
header: searchCell(ref), header: searchCell(ref),
onReorder: (int oldIndex, int newIndex) { onReorder: (int oldIndex, int newIndex) {
if (list.length != model.list.length) { if (list.length != model.list.length) {
@@ -142,8 +141,7 @@ class EnvItemCell extends StatelessWidget {
backgroundColor: Colors.grey, backgroundColor: Colors.grey,
flex: 1, flex: 1,
onPressed: (_) { onPressed: (_) {
Navigator.of(context) Navigator.of(context).pushNamed(Routes.routeAddEnv, arguments: bean);
.pushNamed(Routes.routeAddEnv, arguments: bean);
}, },
foregroundColor: Colors.white, foregroundColor: Colors.white,
icon: CupertinoIcons.pencil, icon: CupertinoIcons.pencil,
@@ -155,9 +153,7 @@ class EnvItemCell extends StatelessWidget {
enableEnv(); enableEnv();
}, },
foregroundColor: Colors.white, foregroundColor: Colors.white,
icon: bean.status == 0 icon: bean.status == 0 ? Icons.dnd_forwardslash : Icons.check_circle_outline_sharp,
? Icons.dnd_forwardslash
: Icons.check_circle_outline_sharp,
), ),
SlidableAction( SlidableAction(
backgroundColor: Colors.red, backgroundColor: Colors.red,
@@ -190,22 +186,29 @@ class EnvItemCell extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
Expanded( Expanded(
child: Material( child: Row(
color: Colors.transparent, children: [
child: Text( Material(
bean.name ?? "", color: Colors.transparent,
maxLines: 1, child: Text(
style: TextStyle( bean.name ?? "",
overflow: TextOverflow.ellipsis, maxLines: 1,
color: bean.status == 1 style: TextStyle(
? const Color(0xffF85152) overflow: TextOverflow.ellipsis,
: ref color: ref.watch(themeProvider).themeColor.titleColor(),
.watch(themeProvider) fontSize: 18,
.themeColor ),
.taskTitleColor(), ),
fontSize: 18,
), ),
), bean.status == 1
? const Icon(
Icons.dnd_forwardslash,
size: 12,
color: Colors.red,
)
: const SizedBox.shrink(),
const Spacer(),
],
), ),
), ),
const SizedBox( const SizedBox(
@@ -218,10 +221,7 @@ class EnvItemCell extends StatelessWidget {
maxLines: 1, maxLines: 1,
style: TextStyle( style: TextStyle(
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
color: ref color: ref.watch(themeProvider).themeColor.descColor(),
.watch(themeProvider)
.themeColor
.descColor(),
fontSize: 12, fontSize: 12,
), ),
), ),
@@ -238,8 +238,7 @@ class EnvItemCell extends StatelessWidget {
maxLines: 1, maxLines: 1,
style: TextStyle( style: TextStyle(
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
color: color: ref.watch(themeProvider).themeColor.descColor(),
ref.watch(themeProvider).themeColor.descColor(),
fontSize: 12, fontSize: 12,
), ),
), ),

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

@@ -187,7 +187,7 @@ class DependencyCell extends ConsumerWidget {
maxLines: 1, maxLines: 1,
style: TextStyle( style: TextStyle(
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
color: ref.watch(themeProvider).themeColor.taskTitleColor(), color: ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 18, fontSize: 18,
), ),
), ),
@@ -220,7 +220,7 @@ class DependencyCell extends ConsumerWidget {
maxLines: 1, maxLines: 1,
style: TextStyle( style: TextStyle(
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
color: ref.watch(themeProvider).themeColor.taskTitleColor(), color: ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 18, fontSize: 18,
), ),
), ),

2
lib/module/others/login_log/login_log_page.dart
View File

@@ -50,7 +50,7 @@ class _LoginLogPageState extends ConsumerState<LoginLogPage> with LazyLoadState<
Utils.formatMessageTime(item.timestamp ?? 0), Utils.formatMessageTime(item.timestamp ?? 0),
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
color: ref.watch(themeProvider).themeColor.taskTitleColor(), color: ref.watch(themeProvider).themeColor.titleColor(),
), ),
), ),
subtitle: Column( subtitle: Column(

10
lib/module/others/other_page.dart
View File

@@ -57,7 +57,7 @@ class _OtherPageState extends ConsumerState<OtherPage> {
Text( Text(
"脚本管理", "脚本管理",
style: TextStyle( style: TextStyle(
color: ref.watch(themeProvider).themeColor.taskTitleColor(), color: ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 16, fontSize: 16,
), ),
), ),
@@ -90,7 +90,7 @@ class _OtherPageState extends ConsumerState<OtherPage> {
Text( Text(
"依赖管理", "依赖管理",
style: TextStyle( style: TextStyle(
color: ref.watch(themeProvider).themeColor.taskTitleColor(), color: ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 16, fontSize: 16,
), ),
), ),
@@ -123,7 +123,7 @@ class _OtherPageState extends ConsumerState<OtherPage> {
Text( Text(
"任务日志", "任务日志",
style: TextStyle( style: TextStyle(
color: ref.watch(themeProvider).themeColor.taskTitleColor(), color: ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 16, fontSize: 16,
), ),
), ),
@@ -157,7 +157,7 @@ class _OtherPageState extends ConsumerState<OtherPage> {
Text( Text(
"登录日志", "登录日志",
style: TextStyle( style: TextStyle(
color: ref.watch(themeProvider).themeColor.taskTitleColor(), color: ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 16, fontSize: 16,
), ),
), ),
@@ -202,7 +202,7 @@ class _OtherPageState extends ConsumerState<OtherPage> {
Text( Text(
"夜间模式", "夜间模式",
style: TextStyle( style: TextStyle(
color: ref.watch(themeProvider).themeColor.taskTitleColor(), color: ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 16, fontSize: 16,
), ),
), ),

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

@@ -53,7 +53,7 @@ class _ScriptPageState extends ConsumerState<ScriptPage> {
style: TextStyle( style: TextStyle(
color: (item.disabled ?? false) color: (item.disabled ?? false)
? ref.watch(themeProvider).themeColor.descColor() ? ref.watch(themeProvider).themeColor.descColor()
: ref.watch(themeProvider).themeColor.taskTitleColor(), : ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 16, fontSize: 16,
), ),
), ),
@@ -73,7 +73,7 @@ class _ScriptPageState extends ConsumerState<ScriptPage> {
style: TextStyle( style: TextStyle(
color: (item.disabled ?? false) color: (item.disabled ?? false)
? ref.watch(themeProvider).themeColor.descColor() ? ref.watch(themeProvider).themeColor.descColor()
: ref.watch(themeProvider).themeColor.taskTitleColor(), : ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 14, fontSize: 14,
), ),
), ),
@@ -95,7 +95,7 @@ class _ScriptPageState extends ConsumerState<ScriptPage> {
style: TextStyle( style: TextStyle(
color: (item.disabled ?? false) color: (item.disabled ?? false)
? ref.watch(themeProvider).themeColor.descColor() ? ref.watch(themeProvider).themeColor.descColor()
: ref.watch(themeProvider).themeColor.taskTitleColor(), : ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 16, fontSize: 16,
), ),
), ),

6
lib/module/others/task_log/task_log_page.dart
View File

@@ -46,7 +46,7 @@ class _TaskLogPageState extends ConsumerState<TaskLogPage> with LazyLoadState<Ta
title: Text( title: Text(
item.name ?? "", item.name ?? "",
style: TextStyle( style: TextStyle(
color: ref.watch(themeProvider).themeColor.taskTitleColor(), color: ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 16, fontSize: 16,
), ),
), ),
@@ -58,7 +58,7 @@ class _TaskLogPageState extends ConsumerState<TaskLogPage> with LazyLoadState<Ta
title: Text( title: Text(
e, e,
style: TextStyle( style: TextStyle(
color: ref.watch(themeProvider).themeColor.taskTitleColor(), color: ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 14, fontSize: 14,
), ),
), ),
@@ -72,7 +72,7 @@ class _TaskLogPageState extends ConsumerState<TaskLogPage> with LazyLoadState<Ta
title: Text( title: Text(
item.name ?? "", item.name ?? "",
style: TextStyle( style: TextStyle(
color: ref.watch(themeProvider).themeColor.taskTitleColor(), color: ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 16, fontSize: 16,
), ),
), ),

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

@@ -243,7 +243,7 @@ class TaskItemCell extends StatelessWidget {
style: TextStyle( style: TextStyle(
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
color: color:
ref.watch(themeProvider).themeColor.taskTitleColor(), ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 18, fontSize: 18,
), ),
), ),
@@ -292,7 +292,7 @@ class TaskItemCell extends StatelessWidget {
color: ref color: ref
.watch(themeProvider) .watch(themeProvider)
.themeColor .themeColor
.taskTitleColor(), .titleColor(),
fontSize: 18, fontSize: 18,
), ),
), ),

16
lib/utils/QlNavigatorObserver.dart
View File

@@ -1,16 +0,0 @@
import 'package:flutter/cupertino.dart';
import 'package:qinglong_app/base/routes.dart';
class QlNavigatorObserver extends NavigatorObserver {
bool isInLoginPage = false;
@override
void didPush(Route route, Route? previousRoute) {
super.didPush(route, previousRoute);
if (Routes.routeLogin == route.settings.name) {
isInLoginPage = true;
} else {
isInLoginPage = false;
}
}
}