Merge pull request #104 from CCXXXI/dev

Dev
CCXXXI · Oct 2, 2021 · 856b2bc · 856b2bc
2 parents 0534916 + e6b431c
commit 856b2bc
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 7 deletions.
diff --git a/lib/home/home_logic.dart b/lib/home/home_logic.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_settings_screens/flutter_settings_screens.dart';
 import 'package:get/get.dart';
 
+import '../utils/gu.dart';
 import '../utils/logger.dart';
 
 class HomeLogic extends GetxController {
@@ -44,6 +45,8 @@ class HomeLogic extends GetxController {
   void onPageChanged(int idx_) {
     if (isAnimating.isFalse) idx.value = idx_;
   }
+
+  void ecnuLongPress() => gu(); // todo
 }
 
 // NavigationRail: Timetable, Toolbox, Settings

diff --git a/lib/home/home_view.dart b/lib/home/home_view.dart
@@ -23,6 +23,7 @@ class HomePage extends StatelessWidget {
                 '求实创造 为人师表',
                 style: TextStyle(fontFamily: fontSerif),
               ),
+              leading: ecnuButton(),
             )
           : null,
       body: Row(
@@ -40,6 +41,7 @@ class HomePage extends StatelessWidget {
                     ),
                 ],
                 selectedIconTheme: IconTheme.of(context),
+                leading: ecnuButton(),
               );
             }),
           Expanded(
@@ -81,6 +83,15 @@ class HomePage extends StatelessWidget {
           : null,
     );
   }
+
+  Widget ecnuButton() => GestureDetector(
+        child: IconButton(
+          iconSize: 42,
+          icon: const ImageIcon(AssetImage('assets/images/ecnu_c.png')),
+          onPressed: () {},
+        ),
+        onLongPress: logic.ecnuLongPress,
+      );
 }
 
 class _LabelIcon {

diff --git a/lib/main.dart b/lib/main.dart
@@ -13,7 +13,7 @@ import 'utils/sentry.dart';
 Future<void> main() async {
   initLogger();
   await Settings.init();
-  if (GetPlatform.isDesktop) initDesktop();
+  if (GetPlatform.isDesktop && !GetPlatform.isWeb) initDesktop();
   await initSentry(const MyApp());
 }
 

diff --git a/lib/settings/theme.dart b/lib/settings/theme.dart
@@ -37,7 +37,7 @@ void updateTheme() {
     Get.snackbar(
       '主题切换目前有 bug，请手动重启以使更改生效',
       'https://github.com/jonataslaw/getx/issues/1878',
-      duration: const Duration(days: 42),
+      duration: const Duration(days: 1),
     );
   }
 }
diff --git a/lib/utils/desktop.dart b/lib/utils/desktop.dart
@@ -14,7 +14,7 @@ void initDesktop() {
   setWindowTitle(appName);
 
   logger.d('setWindowMinSize');
-  setWindowMinSize(const Size(300, 300));
+  setWindowMinSize(const Size(300, 400));
 
   logger.i('initDesktop end.');
 }
diff --git a/lib/utils/messages.dart b/lib/utils/messages.dart
@@ -4,8 +4,8 @@ import 'pangu.dart';
 // record them manually
 const appName = 'ECNU Timetable';
 const packageName = 'io.github.ccxxxi.ecnu_timetable';
-const version = '0.4.0';
-const buildNumber = '6';
+const version = '0.5.0';
+const buildNumber = '7';
 
 const release = '$packageName@$version+$buildNumber';
 

diff --git a/pubspec.lock b/pubspec.lock
@@ -204,7 +204,7 @@ packages:
       name: image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.7"
+    version: "3.0.8"
   io:
     dependency: transitive
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -4,7 +4,7 @@ description: 更美观更智能的ECNU课程表。
 # Prevent the package from being accidentally published to pub.dev.
 publish_to: "none"
 
-version: 0.4.0+6
+version: 0.5.0+7
 
 environment:
   sdk: ">=2.15.0-172.0.dev"
@@ -45,3 +45,6 @@ flutter:
     - family: NotoSerifSC
       fonts:
         - asset: assets/fonts/NotoSerifSC-Regular.otf
+
+  assets:
+    - assets/images/