Merge pull request #2 from qinglong-app/dev

Dev

CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.0.7
+* 首页任务增加分类
+* 增加国际化相关配置
+* 登录页状态栏适配
+
 ## v1.0.6
 * 支持切换账号功能
 * 登录页青龙图标随颜色主题变换

README.md

@@ -38,6 +38,9 @@ iOS端暂无上架打算，用户自行下载main分支源码编译安装
   <img src="./art/8.jpg" width="200" />
 </p>
 
+## [更新记录](./CHANGELOG.md)
+
+
 ### 不支持的功能
 >* 应用设置
 >* 通知设置

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
         mavenCentral()

lib/main.dart

@@ -10,6 +10,7 @@ import 'package:logger/logger.dart';
 import 'package:qinglong_app/base/theme.dart';
 import 'package:qinglong_app/module/login/login_page.dart';
 import 'package:qinglong_app/utils/sp_utils.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
 
 import 'base/routes.dart';
 import 'base/userinfo_viewmodel.dart';
@@ -34,8 +35,7 @@ void main() async {
     ),
   );
   if (Platform.isAndroid) {
-    SystemUiOverlayStyle style =
+    SystemUiOverlayStyle style = const SystemUiOverlayStyle(statusBarColor: Colors.transparent);
-        const SystemUiOverlayStyle(statusBarColor: Colors.transparent);
     SystemChrome.setSystemUIOverlayStyle(style);
   }
 }
@@ -56,14 +56,22 @@ class QlAppState extends ConsumerState<QlApp> {
         FocusScope.of(context).requestFocus(FocusNode());
       },
       child: MediaQuery(
-        data:
+        data: MediaQueryData.fromWindow(WidgetsBinding.instance!.window).copyWith(
-            MediaQueryData.fromWindow(WidgetsBinding.instance!.window).copyWith(
           textScaleFactor: 1,
         ),
         child: MaterialApp(
           title: "青龙",
           locale: const Locale('zh', 'CN'),
           navigatorKey: navigatorState,
+          localizationsDelegates: const [
+            GlobalMaterialLocalizations.delegate,
+            GlobalWidgetsLocalizations.delegate,
+            GlobalCupertinoLocalizations.delegate,
+          ],
+          supportedLocales: const [
+            Locale('zh', 'CN'),
+            Locale('en', 'US'),
+          ],
           theme: ref.watch<ThemeViewModel>(themeProvider).currentTheme,
           onGenerateRoute: (setting) {
             return Routes.generateRoute(setting);
@@ -73,9 +81,7 @@ class QlAppState extends ConsumerState<QlApp> {
               if (!kReleaseMode) {
                 showDebugBtn(context);
               }
-              return getIt<UserInfoViewModel>().isLogined()
+              return getIt<UserInfoViewModel>().isLogined() ? const HomePage() : const LoginPage();
-                  ? const HomePage()
-                  : const LoginPage();
             },
           ),
           // home: LoginPage(),

lib/module/login/login_page.dart

@@ -1,6 +1,7 @@
 import 'package:dio_log/dio_log.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:qinglong_app/base/http/api.dart';
 import 'package:qinglong_app/base/http/http.dart';
@@ -74,7 +75,9 @@ class _LoginPageState extends ConsumerState<LoginPage> {
 
   @override
   Widget build(BuildContext context) {
-    return SafeArea(
+    return Scaffold(
+      body: AnnotatedRegion<SystemUiOverlayStyle>(
+        value: ref.watch(themeProvider).darkMode == true ? SystemUiOverlayStyle.light : SystemUiOverlayStyle.dark,
         child: ColoredBox(
           color: ref.watch(themeProvider).themeColor.settingBgColor(),
           child: SizedBox(
@@ -407,6 +410,7 @@ class _LoginPageState extends ConsumerState<LoginPage> {
             ),
           ),
         ),
+      ),
     );
   }
 

lib/module/task/task_page.dart

@@ -57,7 +57,7 @@ class _TaskPageState extends State<TaskPage> {
                           text: "从未运行",
                         ),
                         Tab(
-                          text: "非脚本类",
+                          text: "拉库脚本",
                         ),
                         Tab(
                           text: "已禁用",

lib/module/task/task_viewmodel.dart

@@ -43,7 +43,7 @@ class TaskViewModel extends BaseViewModel {
     running.clear();
     running.addAll(list.where((element) => element.status == 0));
     neverRunning.clear();
-    neverRunning.addAll(list.where((element) => element.lastRunningTime == null || element.lastRunningTime == 0));
+    neverRunning.addAll(list.where((element) => element.lastRunningTime == null ));
     notScripts.clear();
     notScripts.addAll(list.where((element) => (element.command != null && (element.command!.startsWith("ql repo") || element.command!.startsWith("ql raw")))));
     disabled.clear();

pubspec.yaml

@@ -1,20 +1,21 @@
 name: qinglong_app
 description: A new Flutter project.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
-version: 1.0.6+8
+version: 1.0.7+9
 
 environment:
   sdk: ">=2.15.1 <3.0.0"
-  flutter: ">=2.8.1"
+  flutter: ">=2.10.1"
 
 
 dependencies:
   flutter:
     sdk: flutter
-
+  flutter_localizations:
-  cupertino_icons: ^1.0.2
+    sdk: flutter
+  cupertino_icons: ^1.0.4
   flutter_riverpod: ^1.0.3
-  shared_preferences: ^2.0.12
+  shared_preferences: ^2.0.13
   synchronized: ^3.0.0
   back_button_interceptor: ^5.0.2
   flutter_slidable: ^1.2.0
@@ -29,23 +30,23 @@ dependencies:
   fluttertoast: ^8.0.8
   move_to_background: ^1.0.2
   flip_card: ^0.6.0
-  package_info_plus: ^1.3.0
+  package_info_plus: ^1.4.0
-  url_launcher: ^6.0.18
+  url_launcher: ^6.0.20
   flutter_colorpicker: ^1.0.3
 
 dev_dependencies:
-  flutter_native_splash: ^1.3.3
+  flutter_native_splash: ^2.0.5
   flutter_launcher_icons: ^0.9.2
-  change_app_package_name: ^0.1.3
+  change_app_package_name: ^1.0.0
-  flutter_app_name: ^0.1.0
+  flutter_app_name: ^0.1.1
 
-  build_runner: ^2.0.0
+  build_runner: ^2.1.7
   json_conversion: ^0.0.4
   flutter_test:
     sdk: flutter
 
 
-  flutter_lints: ^1.0.0
+  flutter_lints: ^1.0.4
 
 flutter:
 

version

@@ -1 +1 @@
-1.0.6
+1.0.7