diff --git a/android/app/src/main/res/drawable-night-v21/background.png b/android/app/src/main/res/drawable-night-v21/background.png index 39ea62c..1b5df34 100644 Binary files a/android/app/src/main/res/drawable-night-v21/background.png and b/android/app/src/main/res/drawable-night-v21/background.png differ diff --git a/android/app/src/main/res/drawable-night/background.png b/android/app/src/main/res/drawable-night/background.png index 39ea62c..1b5df34 100644 Binary files a/android/app/src/main/res/drawable-night/background.png and b/android/app/src/main/res/drawable-night/background.png differ diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 98d845e..8300e26 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -341,6 +341,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = ""; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -421,6 +422,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -469,6 +471,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = ""; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/darkbackground.png b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/darkbackground.png index 39ea62c..1b5df34 100644 Binary files a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/darkbackground.png and b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/darkbackground.png differ diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 800a4a2..390aa6e 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -1,49 +1,49 @@ - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleDisplayName - Qinglong App - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - 青龙 - CFBundlePackageType - APPL - CFBundleShortVersionString - $(FLUTTER_BUILD_NAME) - CFBundleSignature - ???? - CFBundleVersion - $(FLUTTER_BUILD_NUMBER) - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIViewControllerBasedStatusBarAppearance - - UIStatusBarHidden - - - \ No newline at end of file + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + 青龙 + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + 青龙 + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + UIStatusBarHidden + + + diff --git a/lib/base/theme.dart b/lib/base/theme.dart index 3c233d0..019cbef 100644 --- a/lib/base/theme.dart +++ b/lib/base/theme.dart @@ -1,5 +1,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/scheduler.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:qinglong_app/base/sp_const.dart'; import 'package:qinglong_app/utils/codeeditor_theme.dart'; @@ -14,8 +15,9 @@ class ThemeViewModel extends ChangeNotifier { ThemeColors themeColor = LightThemeColors(); ThemeViewModel() { - bool dartMode = SpUtil.getBool(sp_Theme, defValue: false); - changeThemeReal(dartMode, false); + var brightness = SchedulerBinding.instance!.window.platformBrightness; + bool isDarkMode = brightness == Brightness.dark; + changeThemeReal(isDarkMode, false); } bool isInDartMode() { diff --git a/lib/module/env/add_env_page.dart b/lib/module/env/add_env_page.dart index 8e5dcff..2f04575 100644 --- a/lib/module/env/add_env_page.dart +++ b/lib/module/env/add_env_page.dart @@ -58,7 +58,13 @@ class _AddEnvPageState extends ConsumerState { horizontal: 15, ), child: Center( - child: Text("提交"), + child: Text( + "提交", + style: TextStyle( + color: Colors.white, + fontSize: 16, + ), + ), ), ), ) @@ -185,7 +191,9 @@ class _AddEnvPageState extends ConsumerState { envBean.name = _nameController.text; envBean.value = _valueController.text; envBean.remarks = _remarkController.text; - HttpResponse response = await Api.addEnv(_nameController.text, _valueController.text, _remarkController.text, id: envBean.sId); + HttpResponse response = await Api.addEnv( + _nameController.text, _valueController.text, _remarkController.text, + id: envBean.sId); if (response.success) { successDialog(context, "操作成功").then((value) { diff --git a/lib/module/home/home_page.dart b/lib/module/home/home_page.dart index 606d6c4..1d63211 100644 --- a/lib/module/home/home_page.dart +++ b/lib/module/home/home_page.dart @@ -49,6 +49,7 @@ class _HomePageState extends ConsumerState { child: Icon( CupertinoIcons.add, size: 20, + color: Colors.white, ), ), ), @@ -68,6 +69,7 @@ class _HomePageState extends ConsumerState { child: Icon( CupertinoIcons.add, size: 20, + color: Colors.white, ), ), ), @@ -82,7 +84,13 @@ class _HomePageState extends ConsumerState { horizontal: 15, ), child: Center( - child: Text("编辑"), + child: Text( + "编辑", + style: TextStyle( + color: Colors.white, + fontSize: 16, + ), + ), ), ), )); diff --git a/lib/module/task/add_task_page.dart b/lib/module/task/add_task_page.dart index 32489df..6b5df2f 100644 --- a/lib/module/task/add_task_page.dart +++ b/lib/module/task/add_task_page.dart @@ -56,7 +56,13 @@ class _AddTaskPageState extends ConsumerState { horizontal: 15, ), child: Center( - child: Text("提交"), + child: Text( + "提交", + style: TextStyle( + color: Colors.white, + fontSize: 16, + ), + ), ), ), ) @@ -189,7 +195,9 @@ class _AddTaskPageState extends ConsumerState { taskBean.name = _nameController.text; taskBean.command = _commandController.text; taskBean.schedule = _cronController.text; - HttpResponse response = await Api.addTask(_nameController.text, _commandController.text, _cronController.text, id: taskBean.sId); + HttpResponse response = await Api.addTask( + _nameController.text, _commandController.text, _cronController.text, + id: taskBean.sId); if (response.success) { successDialog(context, "操作成功").then((value) { @@ -197,7 +205,7 @@ class _AddTaskPageState extends ConsumerState { Navigator.of(context).pop(); }); } else { - failDialog(context, response.message ??""); + failDialog(context, response.message ?? ""); } } } diff --git a/lib/module/task/task_page.dart b/lib/module/task/task_page.dart index 6eea781..958e29a 100644 --- a/lib/module/task/task_page.dart +++ b/lib/module/task/task_page.dart @@ -397,29 +397,31 @@ class TaskItemCell extends StatelessWidget { } logCron(BuildContext context, WidgetRef ref) { - showCupertinoDialog( - builder: (BuildContext context) { - return CupertinoAlertDialog( - title: Text( - "${bean.name}运行日志", - maxLines: 1, - style: const TextStyle(overflow: TextOverflow.ellipsis), - ), - content: InTimeLogPage(bean.sId!, bean.status == 0), - actions: [ - CupertinoDialogAction( - child: Text( - "知道了", - style: TextStyle(color: Theme.of(context).primaryColor), - ), - onPressed: () { - Navigator.of(context).pop(); - }, + WidgetsBinding.instance?.addPostFrameCallback((timeStamp) { + showCupertinoDialog( + builder: (BuildContext context) { + return CupertinoAlertDialog( + title: Text( + "${bean.name}运行日志", + maxLines: 1, + style: const TextStyle(overflow: TextOverflow.ellipsis), ), - ], - ); - }, - context: context); + content: InTimeLogPage(bean.sId!, bean.status == 0), + actions: [ + CupertinoDialogAction( + child: Text( + "知道了", + style: TextStyle(color: Theme.of(context).primaryColor), + ), + onPressed: () { + Navigator.of(context).pop(); + }, + ), + ], + ); + }, + context: context); + }); } more(BuildContext context, WidgetRef ref) { diff --git a/pubspec.yaml b/pubspec.yaml index d235d2a..4aa110e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -98,7 +98,7 @@ flutter_native_splash: # parameters from above. If the image_dark parameter is specified, color_dark or # background_image_dark must be specified. color_dark and background_image_dark cannot both be # set. - color_dark: "#2E312E" + color_dark: "#000000" # background_image_dark: "assets/dark-background.png" # image_dark: assets/splash-invert.png diff --git a/web/splash/style.css b/web/splash/style.css index bbafb62..20a0cac 100644 --- a/web/splash/style.css +++ b/web/splash/style.css @@ -36,7 +36,7 @@ body, html { body { margin:0; height:100%; - background: #2E312E; + background: #000000; background-size: 100% 100%; }