重命名,合并timetable.homepage

README.md

@@ -1,2 +1 @@
-# flutter
 

src/timemanagerapp/lib/controller/CourseWidgetController.dart

@@ -1,3 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 import 'dart:ui';
 
 import 'package:timemanagerapp/entity/Course.dart';
@@ -104,7 +210,7 @@ class CourseWidgetController {
 
       int totalMinutes = (hour - 7) * 60 + minute;
       double convertedTime = totalMinutes * pixelToMinuteRatio;
-      convertedTimes.add(Offset(deviceWidth * 0.02, convertedTime));
+      convertedTimes.add(Offset(deviceWidth * 0.015, convertedTime));
     }
 
     return convertedTimes;

src/timemanagerapp/lib/entity/Course.dart

@@ -40,7 +40,7 @@ class Course {
   }
 
   //初始化任务在周几对应的x坐标
-  var weekListPixel=[0,50,100,150,200,250,300];
+  var weekListPixel=[0,Setting.deviceWidth*0.12,Setting.deviceWidth*0.24,Setting.deviceWidth*0.36,Setting.deviceWidth*0.48,Setting.deviceWidth*0.60,Setting.deviceWidth*0.72];
   // Course(this.name, this.teacher, this.location, this.start, this.end);
   double getdy()
   {

src/timemanagerapp/lib/main.dart

@@ -1,12 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import 'package:timemanagerapp/setting/Setting.dart';
-import 'package:timemanagerapp/util/GetCourseByLogin.dart';
-import 'package:timemanagerapp/wighets/AddCourseFormWidget.dart';
-import 'package:timemanagerapp/wighets/HomeWighet.dart';
-import 'package:timemanagerapp/wighets/LoginWidget.dart';
-import 'package:timemanagerapp/wighets/TestWidget.dart';
-import 'package:timemanagerapp/wighets/TimetableWighet.dart';
+import 'package:timemanagerapp/widgets/HomeWidget.dart';
 
 init() async {
   WidgetsFlutterBinding.ensureInitialized();

src/timemanagerapp/lib/ruters/AddCourseRoute.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:timemanagerapp/wighets/AddCourseFormWidget.dart';
+import 'package:timemanagerapp/widgets/AddCourseFormWidget.dart';
 
 class AddCourseRoute extends StatelessWidget {
   final VoidCallback onCourseAdded;

src/timemanagerapp/lib/ruters/AddScheduleRoute.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:timemanagerapp/wighets/AddScheduleFormWighet.dart';
+import 'package:timemanagerapp/widgets/AddScheduleFormWidget.dart';
 
 class AddScheduleRoute extends StatelessWidget {
   @override

src/timemanagerapp/lib/ruters/TestRoute.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
-import '../wighets/TestWidget.dart';
+import '../widgets/TestWidget.dart';
 
 class TestRoute extends StatelessWidget {
   @override

src/timemanagerapp/lib/ruters/TimetableRoute.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:timemanagerapp/wighets/AddCourseFormWidget.dart';
-import 'package:timemanagerapp/wighets/TimetableWighet.dart';
+import 'package:timemanagerapp/widgets/AddCourseFormWidget.dart';
+import 'package:timemanagerapp/widgets/TimetableWidget.dart';
 
 class TimetableRoute extends StatelessWidget {
 

src/timemanagerapp/lib/ruters/UserSettingRoute.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:timemanagerapp/wighets/UserSettingWighet.dart';
+import 'package:timemanagerapp/widgets/UserSettingWidget.dart';
 
 import '../tests/TestWidget.dart';
 
@@ -11,7 +11,7 @@ class UserSettingRoute extends StatelessWidget {
       appBar: AppBar(
         title: Text('设置'),
       ),
-      body: UserSettingWight(),
+      body: UserSettingWidgt(),
     );
   }
 }

src/timemanagerapp/lib/tests/Addcoursewidget_test.dart

@@ -4,9 +4,9 @@ import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:timemanagerapp/setting/Setting.dart';
 import 'package:timemanagerapp/util/GetCourseByLogin.dart';
-import 'package:timemanagerapp/wighets/AddCourseFormWidget.dart';
-import 'package:timemanagerapp/wighets/LoginWidget.dart';
-import 'package:timemanagerapp/wighets/TimetableWighet.dart';
+import 'package:timemanagerapp/widgets/AddCourseFormWidget.dart';
+import 'package:timemanagerapp/widgets/LoginWidget.dart';
+import 'package:timemanagerapp/widgets/TimetableWidget.dart';
 
 
 init() async {

src/timemanagerapp/lib/tests/TestWidget.dart

@@ -1,6 +1,6 @@
 // /*
 // import 'package:flutter/material.dart';
-// import 'package:timemanagerapp/wighets/AddCourseFormWidget.dart';
+// import 'package:timemanagerapp/Wighets/AddCourseFormWidget.dart';
 //
 // void main() {
 //   runApp(MyApp());
@@ -27,13 +27,13 @@
 // import 'package:timemanagerapp/entity/Course.dart';
 // import 'package:timemanagerapp/entity/User.dart';
 // import 'package:timemanagerapp/database/MyDatebase.dart';
-// import 'package:timemanagerapp/wighets/TimetableWighet.dart';
+// import 'package:timemanagerapp/Wighets/TimetableWidget.dart';
 //
 // import '../main.dart';
 // import '../ruters/AddCourseRoute.dart';
 // import '../ruters/TimetableRoute.dart';
 // import '../tests/database_test.dart';
-// import 'package:timemanagerapp/wighets/AddCourseFormWidget.dart';
+// import 'package:timemanagerapp/Wighets/AddCourseFormWidget.dart';
 //
 // class TestWidget extends StatefulWidget {
 //   const TestWidget({Key? key}) : super(key: key);

src/timemanagerapp/lib/tests/timetable_tes.dart

@@ -4,9 +4,9 @@ import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:timemanagerapp/setting/Setting.dart';
 import 'package:timemanagerapp/util/GetCourseByLogin.dart';
-import 'package:timemanagerapp/wighets/AddCourseFormWidget.dart';
-import 'package:timemanagerapp/wighets/LoginWidget.dart';
-import 'package:timemanagerapp/wighets/TimetableWighet.dart';
+import 'package:timemanagerapp/widgets/AddCourseFormWidget.dart';
+import 'package:timemanagerapp/widgets/LoginWidget.dart';
+import 'package:timemanagerapp/widgets/TimetableWidget.dart';
 
 
 init() async {

src/timemanagerapp/lib/widgets/HomeWidget.dart

@@ -1,33 +1,27 @@
 import 'package:flutter/material.dart';
 import 'package:timemanagerapp/controller/CourseController.dart';
 import 'package:timemanagerapp/controller/UserController.dart';
-import 'package:timemanagerapp/entity/Course.dart';
-import 'package:timemanagerapp/entity/User.dart';
 import 'package:timemanagerapp/database/MyDatebase.dart';
 import 'package:timemanagerapp/ruters/AddScheduleRoute.dart';
 import 'package:timemanagerapp/ruters/TestRoute.dart';
-import 'package:timemanagerapp/wighets/TimetableWighet.dart';
+import 'package:timemanagerapp/widgets/TimetableWidget.dart';
 
 import '../ruters/AddCourseRoute.dart';
-import '../ruters/TimetableRoute.dart';
 import '../ruters/UserSettingRoute.dart';
 
 class HomeWidget extends StatefulWidget {
-
-
   const HomeWidget({Key? key}) : super(key: key);
 
   @override
-  _HomePageState createState() => _HomePageState();
+  _HomeWidgetState createState() => _HomeWidgetState();
 }
 
-class _HomePageState extends State<HomeWidget> {
-  GlobalKey<TimetableWidgetState> timetableWidgetKey = GlobalKey();//课程表的key
+class _HomeWidgetState extends State<HomeWidget> {
+  GlobalKey<TimetableWidgetState> timetableWidgetKey = GlobalKey(); //课程表的key
 
   late UserController userController;
   late CourseController courseController;
 
-
   @override
   void initState() {
     super.initState();
@@ -44,7 +38,7 @@ class _HomePageState extends State<HomeWidget> {
           return AddCourseRoute(onCourseAdded: () {
             setState(() {
               // 更新您的数据
-              timetableWidgetKey.currentState?.updateWhenDataChange();
+              // timetableWidgetKey.currentState?.updateWhenDataChange();
             });
           });
         },
@@ -70,10 +64,12 @@ class _HomePageState extends State<HomeWidget> {
       appBar: AppBar(
         backgroundColor: Colors.blue,
         actions: [
-          IconButton( //addIconButton
+          IconButton(
+            //addIconButton
             icon: const Icon(Icons.add),
             onPressed: () {
-              showDialog( //弹出对话框
+              showDialog(
+                //弹出对话框
                 context: context,
                 builder: (BuildContext context) {
                   return AlertDialog(
@@ -91,7 +87,7 @@ class _HomePageState extends State<HomeWidget> {
                                   return AddCourseRoute(onCourseAdded: () {
                                     setState(() {
                                       // 更新您的数据
-                                      timetableWidgetKey.currentState?.updateWhenDataChange();
+                                      // timetableWidgetKey.currentState?.updateWhenDataChange();
                                     });
                                   });
                                 },
@@ -144,7 +140,8 @@ class _HomePageState extends State<HomeWidget> {
             },
           ),
           Builder(
-            builder: (context) => IconButton( //菜单按钮
+            builder: (context) => IconButton(
+              //菜单按钮
               icon: const Icon(Icons.more_horiz),
               onPressed: () {
                 Scaffold.of(context).openEndDrawer(); // Open the right drawer

src/timemanagerapp/lib/widgets/TestWidget.dart

@@ -1,6 +1,6 @@
 /*
 import 'package:flutter/material.dart';
-import 'package:timemanagerapp/wighets/AddCourseFormWidget.dart';
+import 'package:timemanagerapp/Wighets/AddCourseFormWidget.dart';
 
 void main() {
   runApp(MyApp());
@@ -27,23 +27,17 @@ import 'package:timemanagerapp/controller/UserController.dart';
 import 'package:timemanagerapp/entity/Course.dart';
 import 'package:timemanagerapp/entity/User.dart';
 import 'package:timemanagerapp/database/MyDatebase.dart';
-import 'package:timemanagerapp/wighets/TimetableWighet.dart';
 
-import '../main.dart';
-import '../ruters/AddCourseRoute.dart';
 import '../ruters/TimetableRoute.dart';
-import '../tests/database_test.dart';
-import '../util/dataUtil.dart';
-import 'AddCourseFormWidget.dart';
 
 class TestWidget extends StatefulWidget {
   const TestWidget({Key? key}) : super(key: key);
 
   @override
-  _HomePageState createState() => _HomePageState();
+  _TestWidgetState createState() => _TestWidgetState();
 }
 
-class _HomePageState extends State<TestWidget> {
+class _TestWidgetState extends State<TestWidget> {
   late UserController userController;
   late CourseController courseController;
 

src/timemanagerapp/lib/widgets/TimetableWidget.dart

@@ -4,7 +4,6 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:timemanagerapp/controller/CourseController.dart';
 import 'package:timemanagerapp/controller/CourseWidgetController.dart';
-import 'package:timemanagerapp/main.dart';
 
 import '../entity/Course.dart';
 import '../setting/Setting.dart';
@@ -72,18 +71,6 @@ class TimetableWidgetState extends State<TimetableWidget> {
     }
   }
 
-  updateWhenDataChange(){
-    courseController.getCourses().then((res) {
-      courseList = res;
-
-      courseWeekMap = courseWidgetController.transformCourseMap(courseList);
-
-      setState(() {
-        loading = false;
-      });
-    });
-  }
-
   //执行初始化，将需要的数值进行加工
   @override
   initState() {
@@ -247,7 +234,7 @@ class TimetableWidgetState extends State<TimetableWidget> {
                                                   .toString()
                                                   .padLeft(2, '0'),
                                         ),
-                                        SizedBox(width: 5),
+                                
                                         Container(
                                           width: deviceWidth * 0.04,
                                           height: 10,
@@ -260,7 +247,7 @@ class TimetableWidgetState extends State<TimetableWidget> {
                                           ),
                                         ),
                                         Container(
-                                          width: deviceWidth * 0.82,
+                                          width: deviceWidth * 0.84,
                                           height: 2,
                                           color: const Color.fromARGB(
                                               255, 136, 61, 61),
@@ -289,11 +276,11 @@ class TimetableWidgetState extends State<TimetableWidget> {
                                             10,
                                         left: courseWeekMap[weekCount]![index]
                                                 .getdx() +
-                                            50,
+                                            deviceWidth*0.15,
                                         child: SingleChildScrollView(
                                           child: Container(
                                             //课程方块
-                                            width: deviceWidth * 0.16,
+                                            width: deviceWidth * 0.115,
                                             height:
                                                 courseWeekMap[weekCount]![index]
                                                     .getHeight(),

src/timemanagerapp/lib/widgets/UserSettingWidget.dart

@@ -1,13 +1,13 @@
 //用户设置Wight
 import 'package:flutter/cupertino.dart';
 
-class UserSettingWight extends StatefulWidget {
+class UserSettingWidgt extends StatefulWidget {
   @override
   _UserSettingWightState createState() => _UserSettingWightState();
 }
 //用户设置Wight状态
 //todo:实现用户设置Wight
-class _UserSettingWightState extends State<UserSettingWight> {
+class _UserSettingWightState extends State<UserSettingWidgt> {
   @override
   Widget build(BuildContext context) {
     return Container(

src/timemanagerapp/test/Setting_test.dart

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:timemanagerapp/setting/Setting.dart';
 import 'package:timemanagerapp/util/GetCourseByLogin.dart';
-import 'package:timemanagerapp/wighets/AddCourseFormWidget.dart';
-import 'package:timemanagerapp/wighets/LoginWidget.dart';
+import 'package:timemanagerapp/Wighets/AddCourseFormWidget.dart';
+import 'package:timemanagerapp/Wighets/LoginWidget.dart';
 
 
 init() async {

src/timemanagerapp/test/main_test.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:timemanagerapp/setting/Setting.dart';
-import 'package:timemanagerapp/wighets/AddCourseFormWidget.dart';
-import 'package:timemanagerapp/wighets/LoginWidget.dart';
+import 'package:timemanagerapp/Wighets/AddCourseFormWidget.dart';
+import 'package:timemanagerapp/Wighets/LoginWidget.dart';
 
 
 void init(){