From 5847a9724f2ced55487ea662f4af80b28776ed56 Mon Sep 17 00:00:00 2001 From: imaimai17468 Date: Mon, 5 Sep 2022 20:12:51 +0900 Subject: [PATCH 1/7] [feature]add time schedule, table title(#84) --- lib/pages/schedule_page.dart | 122 +++++------------- lib/pages/schedule_page_first_day_rainy.dart | 84 ++++++++++++ lib/pages/schedule_page_first_day_sunny.dart | 91 +++++++++++++ lib/pages/schedule_page_second_day_rainy.dart | 100 ++++++++++++++ lib/pages/schedule_page_second_day_sunny.dart | 107 +++++++++++++++ lib/widgets/drawer.dart | 4 +- 6 files changed, 419 insertions(+), 89 deletions(-) create mode 100644 lib/pages/schedule_page_first_day_rainy.dart create mode 100644 lib/pages/schedule_page_first_day_sunny.dart create mode 100644 lib/pages/schedule_page_second_day_rainy.dart create mode 100644 lib/pages/schedule_page_second_day_sunny.dart diff --git a/lib/pages/schedule_page.dart b/lib/pages/schedule_page.dart index dc2c5e7..55087c9 100644 --- a/lib/pages/schedule_page.dart +++ b/lib/pages/schedule_page.dart @@ -3,20 +3,39 @@ import 'dart:developer'; import 'package:seeft_mobile/configs/importer.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:http/http.dart' as http; +import 'package:seeft_mobile/pages/schedule_page_first_day_rainy.dart'; +import 'package:seeft_mobile/pages/schedule_page_first_day_sunny.dart'; +import 'package:seeft_mobile/pages/schedule_page_second_day_rainy.dart'; +import 'package:seeft_mobile/pages/schedule_page_second_day_sunny.dart'; class SchedulePage extends StatefulWidget { @override _SchedulePageState createState() => _SchedulePageState(); } -class _SchedulePageState extends State { -// notification関連をinitStateに書き出さなきゃいけないので書いてたけどutilとかに書いてもいいかもね +class TabInfo { + String label; + Widget widget; + TabInfo(this.label, this.widget); +} + +class _SchedulePageState extends State with SingleTickerProviderStateMixin { + final List _tabs = [ + TabInfo("9/10 晴天時", SchedulePageFirstDaySunny()), + TabInfo("9/10 雨天時", SchedulePageFirstDayRainy()), + TabInfo("9/11 晴天時", SchedulePageSecondDaySunny()), + TabInfo("9/11 雨天時", SchedulePageSecondDayRainy()), + ]; + late TabController _tabController; + + // notification関連をinitStateに書き出さなきゃいけないので書いてたけどutilとかに書いてもいいかもね // FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin; // NotificationDetails platformChannelSpecifics; @override void initState() { + _tabController = TabController(length: _tabs.length, vsync: this); super.initState(); } @@ -27,93 +46,22 @@ class _SchedulePageState extends State { appBar: AppBar( title: const Text('タイムスケジュール'), actions: [], + bottom: PreferredSize( + child: TabBar( + isScrollable: true, + tabs: _tabs.map((TabInfo tab) { + return Tab(text: tab.label); + }).toList(), + controller: _tabController, + ), + preferredSize: Size.fromHeight(30.0), + ), // debug ), drawer: drawer.applicationDrawer(context), - body: FutureBuilder( - future: getData(), - builder: (ctx, snapshot) { - if (snapshot.connectionState == AsyncSnapshot.waiting()) { - logger.w("message"); - } - if (!snapshot.hasData) { - return CircularProgressIndicator(); - } - return Container( - padding: const EdgeInsets.all(40.0), - child: SingleChildScrollView( - child: Column( - children: [ - Container( - // height: size.height - 200, - // width: size.width - 80, - // padding: const EdgeInsets.all(10.0), - // decoration: BoxDecoration( - // border: Border.all(color: Colors.black), - // ), - // child: _contents(size, snapshot.data)), - child: _table(snapshot.data)), - ], - ), - )); - }, - ), + body: TabBarView( + controller: _tabController, + children: _tabs.map((tab) => tab.widget).toList()), ); } -} - -Widget _table(var shifts) { - return Table( - border: TableBorder.all(color: Colors.black), - columnWidths: const { - // 0: IntrinsicColumnWidth(), - 0: FlexColumnWidth(1), - 1: FlexColumnWidth(10), - // 2: FixedColumnWidth(100.0), - }, - defaultVerticalAlignment: TableCellVerticalAlignment.middle, - children: [ - TableRow(children: [ - TableCell( - child: Container( - child: Text("日時"), - alignment: Alignment.center, - color: Colors.lightGreen, - )), - TableCell( - child: Container( - child: Text("場所"), - alignment: Alignment.center, - color: Colors.lightGreen, - ), - ) - ]), - for (var shift in shifts) - TableRow( - decoration: BoxDecoration(color: Colors.grey[200]), - children: [ - TableCell( - child: Container( - alignment: Alignment.center, - child: new Text(shift["Time"].toString()), - )), - TableCell( - child: Container( - alignment: Alignment.center, - child: new Text(shift["Work"].toString()), - // margin: EdgeInsets.only(bottom: 10.0), - height: 25, - )) - ]), - ]); -} - -Future getData() async { - try { - var userID = await store.getUserID(); - var res = await api.getMyShift(userID.toString()); - return res; - } catch (err) { - logger.e('don`t response. error message: $err'); - } -} +} \ No newline at end of file diff --git a/lib/pages/schedule_page_first_day_rainy.dart b/lib/pages/schedule_page_first_day_rainy.dart new file mode 100644 index 0000000..440c6fc --- /dev/null +++ b/lib/pages/schedule_page_first_day_rainy.dart @@ -0,0 +1,84 @@ +import 'dart:developer'; + +import 'package:seeft_mobile/configs/importer.dart'; +import 'package:flutter_local_notifications/flutter_local_notifications.dart'; +import 'package:http/http.dart' as http; + +class SchedulePageFirstDayRainy extends StatefulWidget { + @override + _SchedulePageFirstDayRainyState createState() => + _SchedulePageFirstDayRainyState(); +} + +class _SchedulePageFirstDayRainyState extends State { +// notification関連をinitStateに書き出さなきゃいけないので書いてたけどutilとかに書いてもいいかもね + +// FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin; +// NotificationDetails platformChannelSpecifics; + + @override + void initState() { + super.initState(); + } + + @override + Widget build(BuildContext context) { + final Size size = MediaQuery.of(context).size; + return Container( + padding: const EdgeInsets.all(40.0), + child: Container( + child: SingleChildScrollView( + scrollDirection: Axis.vertical, + child: Column( + children: [ + Container( + child: Table( + border: TableBorder.all(color: Colors.black), + columnWidths: const{ + 0: FlexColumnWidth(5), + 1: FlexColumnWidth(10), + 2: FlexColumnWidth(10), + 3: FlexColumnWidth(10), + }, + defaultVerticalAlignment: TableCellVerticalAlignment.middle, + children: [ + TableRow(children: [ + TableCell( + child: Container( + child: Text("日時"), + alignment: Alignment.center, + color: Colors.lightGreen, + ) + ), + TableCell( + child: Container( + child: Text("体育館"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text("A講義室"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text("D講義室"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + ], + ), + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/pages/schedule_page_first_day_sunny.dart b/lib/pages/schedule_page_first_day_sunny.dart new file mode 100644 index 0000000..f2b3dac --- /dev/null +++ b/lib/pages/schedule_page_first_day_sunny.dart @@ -0,0 +1,91 @@ +import 'dart:developer'; + +import 'package:seeft_mobile/configs/importer.dart'; +import 'package:flutter_local_notifications/flutter_local_notifications.dart'; +import 'package:http/http.dart' as http; + +class SchedulePageFirstDaySunny extends StatefulWidget { + @override + _SchedulePageFirstDaySunnyState createState() => _SchedulePageFirstDaySunnyState(); +} + +class _SchedulePageFirstDaySunnyState extends State { +// notification関連をinitStateに書き出さなきゃいけないので書いてたけどutilとかに書いてもいいかもね + +// FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin; +// NotificationDetails platformChannelSpecifics; + + @override + void initState() { + super.initState(); + } + + @override + Widget build(BuildContext context) { + final Size size = MediaQuery.of(context).size; + return Container( + padding: const EdgeInsets.all(40.0), + child: Container( + child: SingleChildScrollView( + scrollDirection: Axis.vertical, + child: Column( + children: [ + Container( + child: Table( + border: TableBorder.all(color: Colors.black), + columnWidths: const{ + 0: FlexColumnWidth(5), + 1: FlexColumnWidth(10), + 2: FlexColumnWidth(10), + 3: FlexColumnWidth(10), + 4: FlexColumnWidth(10), + }, + defaultVerticalAlignment: TableCellVerticalAlignment.middle, + children: [ + TableRow(children: [ + TableCell( + child: Container( + child: Text("日時"), + alignment: Alignment.center, + color: Colors.lightGreen, + ) + ), + TableCell( + child: Container( + child: Text("メインステージ"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text("体育館"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text("A講義室"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text("D講義室"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + ], + ), + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/pages/schedule_page_second_day_rainy.dart b/lib/pages/schedule_page_second_day_rainy.dart new file mode 100644 index 0000000..70978bb --- /dev/null +++ b/lib/pages/schedule_page_second_day_rainy.dart @@ -0,0 +1,100 @@ +import 'dart:developer'; + +import 'package:seeft_mobile/configs/importer.dart'; +import 'package:flutter_local_notifications/flutter_local_notifications.dart'; +import 'package:http/http.dart' as http; + +class SchedulePageSecondDayRainy extends StatefulWidget { + @override + _SchedulePageSecondDayRainyState createState() => _SchedulePageSecondDayRainyState(); +} + +class _SchedulePageSecondDayRainyState extends State { +// notification関連をinitStateに書き出さなきゃいけないので書いてたけどutilとかに書いてもいいかもね + +// FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin; +// NotificationDetails platformChannelSpecifics; + + @override + void initState() { + super.initState(); + } + + @override + Widget build(BuildContext context) { + final Size size = MediaQuery.of(context).size; + return Container( + padding: const EdgeInsets.all(40.0), + child: Container( + child: SingleChildScrollView( + scrollDirection: Axis.vertical, + child: Column( + children: [ + Container( + child: Table( + border: TableBorder.all(color: Colors.black), + columnWidths: const{ + 0: FlexColumnWidth(5), + 1: FlexColumnWidth(10), + 2: FlexColumnWidth(10), + 3: FlexColumnWidth(10), + 4: FlexColumnWidth(10), + 5: FlexColumnWidth(10), + }, + defaultVerticalAlignment: TableCellVerticalAlignment.middle, + children: [ + TableRow(children: [ + TableCell( + child: Container( + child: Text("日時"), + alignment: Alignment.center, + color: Colors.lightGreen, + ) + ), + TableCell( + child: Container( + child: Text("体育館"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text("武道場"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text("A講義室"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text("D講義室"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text("マルチメディア"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + ], + ), + ), + ], + ), + ), + ), + ); + } +} + diff --git a/lib/pages/schedule_page_second_day_sunny.dart b/lib/pages/schedule_page_second_day_sunny.dart new file mode 100644 index 0000000..4d263e8 --- /dev/null +++ b/lib/pages/schedule_page_second_day_sunny.dart @@ -0,0 +1,107 @@ +import 'dart:developer'; + +import 'package:seeft_mobile/configs/importer.dart'; +import 'package:flutter_local_notifications/flutter_local_notifications.dart'; +import 'package:http/http.dart' as http; + +class SchedulePageSecondDaySunny extends StatefulWidget { + @override + _SchedulePageSecondDaySunnyState createState() => _SchedulePageSecondDaySunnyState(); +} + +class _SchedulePageSecondDaySunnyState extends State { +// notification関連をinitStateに書き出さなきゃいけないので書いてたけどutilとかに書いてもいいかもね + +// FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin; +// NotificationDetails platformChannelSpecifics; + + @override + void initState() { + super.initState(); + } + + @override + Widget build(BuildContext context) { + final Size size = MediaQuery.of(context).size; + return Container( + padding: const EdgeInsets.all(40.0), + child: Container( + child: SingleChildScrollView( + scrollDirection: Axis.vertical, + child: Column( + children: [ + Container( + child: Table( + border: TableBorder.all(color: Colors.black), + columnWidths: const{ + 0: FlexColumnWidth(5), + 1: FlexColumnWidth(10), + 2: FlexColumnWidth(10), + 3: FlexColumnWidth(10), + 4: FlexColumnWidth(10), + 5: FlexColumnWidth(10), + 6: FlexColumnWidth(10), + }, + defaultVerticalAlignment: TableCellVerticalAlignment.middle, + children: [ + TableRow(children: [ + TableCell( + child: Container( + child: Text("日時"), + alignment: Alignment.center, + color: Colors.lightGreen, + ) + ), + TableCell( + child: Container( + child: Text("メインステージ"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text("体育館"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text("武道場"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text("A講義室"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text("D講義室"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text("マルチメディア"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + ], + ), + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/widgets/drawer.dart b/lib/widgets/drawer.dart index 8a3cec0..134621a 100644 --- a/lib/widgets/drawer.dart +++ b/lib/widgets/drawer.dart @@ -36,8 +36,8 @@ class ApplicationDrawer { title: Text("タイムスケジュール"), leading: Icon(Icons.schedule), onTap: () => { - // Navigator.pushNamedAndRemoveUntil( - // context, '/schedule_page', (Route route) => false) + Navigator.pushNamedAndRemoveUntil( + context, '/schedule_page', (Route route) => false) }, ), ListTile( From 5a3f97a636290dbcedb3fe62d371efb9cf42843a Mon Sep 17 00:00:00 2001 From: imaimai17468 Date: Tue, 6 Sep 2022 10:13:41 +0900 Subject: [PATCH 2/7] [feature]add schedule, first day sunny, -15:00(84) --- lib/pages/schedule_page_first_day_sunny.dart | 445 ++++++++++++++++++- 1 file changed, 435 insertions(+), 10 deletions(-) diff --git a/lib/pages/schedule_page_first_day_sunny.dart b/lib/pages/schedule_page_first_day_sunny.dart index f2b3dac..6c49e51 100644 --- a/lib/pages/schedule_page_first_day_sunny.dart +++ b/lib/pages/schedule_page_first_day_sunny.dart @@ -6,7 +6,8 @@ import 'package:http/http.dart' as http; class SchedulePageFirstDaySunny extends StatefulWidget { @override - _SchedulePageFirstDaySunnyState createState() => _SchedulePageFirstDaySunnyState(); + _SchedulePageFirstDaySunnyState createState() => + _SchedulePageFirstDaySunnyState(); } class _SchedulePageFirstDaySunnyState extends State { @@ -33,7 +34,7 @@ class _SchedulePageFirstDaySunnyState extends State { Container( child: Table( border: TableBorder.all(color: Colors.black), - columnWidths: const{ + columnWidths: const { 0: FlexColumnWidth(5), 1: FlexColumnWidth(10), 2: FlexColumnWidth(10), @@ -42,38 +43,462 @@ class _SchedulePageFirstDaySunnyState extends State { }, defaultVerticalAlignment: TableCellVerticalAlignment.middle, children: [ + TableRow( + decoration: BoxDecoration(color: Colors.teal), + children: [ + TableCell( + child: Container( + child: Text("日時"), + alignment: Alignment.center, + )), + TableCell( + child: Container( + child: Text("メインステージ"), + alignment: Alignment.center, + ), + ), + TableCell( + child: Container( + child: Text("体育館"), + alignment: Alignment.center, + ), + ), + TableCell( + child: Container( + child: Text("A講義室"), + alignment: Alignment.center, + ), + ), + TableCell( + child: Container( + child: Text("D講義室"), + alignment: Alignment.center, + ), + ), + ]), + + // 2行目 TableRow(children: [ TableCell( child: Container( - child: Text("日時"), - alignment: Alignment.center, - color: Colors.lightGreen, - ) + child: Text("10:00~\n10:30"), + alignment: Alignment.center, + )), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("悠久太鼓愛好会\n鶴亀会"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("Popular Music Club"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 3行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("10:30~\n11:00"), + alignment: Alignment.center, + )), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("合唱サークル"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 4行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("11:00~\n11:15"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), ), TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, child: Container( - child: Text("メインステージ"), + child: Text(""), alignment: Alignment.center, color: Colors.lightGreen, ), ), + ]), + + // 5行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("11:15~\n11:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("Mexico"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 6行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("11:30~\n12:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), TableCell( child: Container( - child: Text("体育館"), + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), alignment: Alignment.center, color: Colors.lightGreen, ), ), + ]), + + // 7行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("12:00~\n12:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, child: Container( - child: Text("A講義室"), + child: Text("Street Style"), alignment: Alignment.center, color: Colors.lightGreen, ), ), TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 8行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("12:30~\n13:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 9行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("13:00~\n13:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 10行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("13:30~\n14:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("Sri Lanka"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 12行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("14:00~\n14:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 11行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("14:30~\n15:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("吹奏楽部"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, child: Container( - child: Text("D講義室"), + child: Text(""), alignment: Alignment.center, color: Colors.lightGreen, ), From e944993d4b85b8c8d4b88466d75a5e33fb58923a Mon Sep 17 00:00:00 2001 From: imaimai17468 Date: Tue, 6 Sep 2022 11:28:50 +0900 Subject: [PATCH 3/7] [feature]add time schedule, first day sunny, all(#84) --- lib/pages/schedule_page_first_day_sunny.dart | 245 ++++++++++++++++++- 1 file changed, 240 insertions(+), 5 deletions(-) diff --git a/lib/pages/schedule_page_first_day_sunny.dart b/lib/pages/schedule_page_first_day_sunny.dart index 6c49e51..406d5d8 100644 --- a/lib/pages/schedule_page_first_day_sunny.dart +++ b/lib/pages/schedule_page_first_day_sunny.dart @@ -35,11 +35,11 @@ class _SchedulePageFirstDaySunnyState extends State { child: Table( border: TableBorder.all(color: Colors.black), columnWidths: const { - 0: FlexColumnWidth(5), - 1: FlexColumnWidth(10), - 2: FlexColumnWidth(10), - 3: FlexColumnWidth(10), - 4: FlexColumnWidth(10), + 0: FlexColumnWidth(10), + 1: FlexColumnWidth(15), + 2: FlexColumnWidth(15), + 3: FlexColumnWidth(15), + 4: FlexColumnWidth(15), }, defaultVerticalAlignment: TableCellVerticalAlignment.middle, children: [ @@ -504,6 +504,241 @@ class _SchedulePageFirstDaySunnyState extends State { ), ), ]), + + // 13行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("15:00~\n15:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 14行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("15:30~\n16:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 15行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("16:00~\n16:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 16行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("16:30~\n17:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("ヒーローショー"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 15行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("17:00~\n17:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 17行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("17:30~\n18:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), ], ), ), From 951bc566c8c14d75076e92c72589d4fe35b1c4cc Mon Sep 17 00:00:00 2001 From: imaimai17468 Date: Tue, 6 Sep 2022 11:37:42 +0900 Subject: [PATCH 4/7] [feature]add time schedule, first day rainy, all(#84) --- lib/pages/schedule_page_first_day_rainy.dart | 567 ++++++++++++++++++- 1 file changed, 555 insertions(+), 12 deletions(-) diff --git a/lib/pages/schedule_page_first_day_rainy.dart b/lib/pages/schedule_page_first_day_rainy.dart index 440c6fc..6bee5b8 100644 --- a/lib/pages/schedule_page_first_day_rainy.dart +++ b/lib/pages/schedule_page_first_day_rainy.dart @@ -34,39 +34,582 @@ class _SchedulePageFirstDayRainyState extends State { Container( child: Table( border: TableBorder.all(color: Colors.black), - columnWidths: const{ - 0: FlexColumnWidth(5), - 1: FlexColumnWidth(10), - 2: FlexColumnWidth(10), - 3: FlexColumnWidth(10), + columnWidths: const { + 0: FlexColumnWidth(10), + 1: FlexColumnWidth(15), + 2: FlexColumnWidth(15), + 3: FlexColumnWidth(15), }, defaultVerticalAlignment: TableCellVerticalAlignment.middle, children: [ + TableRow( + decoration: BoxDecoration(color: Colors.teal), + children: [ + TableCell( + child: Container( + child: Text("日時"), + alignment: Alignment.center, + )), + TableCell( + child: Container( + child: Text("体育館"), + alignment: Alignment.center, + ), + ), + TableCell( + child: Container( + child: Text("A講義室"), + alignment: Alignment.center, + ), + ), + TableCell( + child: Container( + child: Text("D講義室"), + alignment: Alignment.center, + ), + ), + ]), + + // 2行目 TableRow(children: [ TableCell( child: Container( - child: Text("日時"), - alignment: Alignment.center, - color: Colors.lightGreen, - ) + child: Text("10:00~\n10:30"), + alignment: Alignment.center, + )), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("悠久太鼓愛好会\n鶴亀会"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("Popular Music Club"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 3行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("10:30~\n11:00"), + alignment: Alignment.center, + )), + TableCell( + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("合唱サークル"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 4行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("11:00~\n11:15"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 5行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("11:15~\n11:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("Mexico"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 6行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("11:30~\n12:00"), + alignment: Alignment.center, + ), + ), + TableCell( + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 7行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("12:00~\n12:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("Street Style"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 8行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("12:30~\n13:00"), + alignment: Alignment.center, + ), ), TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, child: Container( - child: Text("体育館"), + child: Text(""), alignment: Alignment.center, color: Colors.lightGreen, ), ), TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, child: Container( - child: Text("A講義室"), + child: Text(""), alignment: Alignment.center, color: Colors.lightGreen, ), ), + ]), + + // 9行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("13:00~\n13:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 10行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("13:30~\n14:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("Sri Lanka"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 12行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("14:00~\n14:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 11行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("14:30~\n15:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("吹奏楽部"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 13行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("15:00~\n15:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 14行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("15:30~\n16:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 15行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("16:00~\n16:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 16行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("16:30~\n17:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("ヒーローショー"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 15行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("17:00~\n17:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 17行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("17:30~\n18:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, child: Container( - child: Text("D講義室"), + child: Text(""), alignment: Alignment.center, color: Colors.lightGreen, ), From 65434ff3b73d1be8d00c1b10c578eb74fc4bda73 Mon Sep 17 00:00:00 2001 From: imaimai17468 Date: Tue, 6 Sep 2022 11:51:53 +0900 Subject: [PATCH 5/7] [feature]add tiem schedule, second day sunny, -13:00 --- lib/pages/schedule_page_second_day_sunny.dart | 676 +++++++++++++++++- 1 file changed, 663 insertions(+), 13 deletions(-) diff --git a/lib/pages/schedule_page_second_day_sunny.dart b/lib/pages/schedule_page_second_day_sunny.dart index 4d263e8..89e739c 100644 --- a/lib/pages/schedule_page_second_day_sunny.dart +++ b/lib/pages/schedule_page_second_day_sunny.dart @@ -6,10 +6,12 @@ import 'package:http/http.dart' as http; class SchedulePageSecondDaySunny extends StatefulWidget { @override - _SchedulePageSecondDaySunnyState createState() => _SchedulePageSecondDaySunnyState(); + _SchedulePageSecondDaySunnyState createState() => + _SchedulePageSecondDaySunnyState(); } -class _SchedulePageSecondDaySunnyState extends State { +class _SchedulePageSecondDaySunnyState + extends State { // notification関連をinitStateに書き出さなきゃいけないので書いてたけどutilとかに書いてもいいかもね // FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin; @@ -33,7 +35,7 @@ class _SchedulePageSecondDaySunnyState extends State Container( child: Table( border: TableBorder.all(color: Colors.black), - columnWidths: const{ + columnWidths: const { 0: FlexColumnWidth(5), 1: FlexColumnWidth(10), 2: FlexColumnWidth(10), @@ -44,52 +46,700 @@ class _SchedulePageSecondDaySunnyState extends State }, defaultVerticalAlignment: TableCellVerticalAlignment.middle, children: [ - TableRow(children: [ - TableCell( - child: Container( + TableRow( + decoration: BoxDecoration(color: Colors.teal), + children: [ + TableCell( + child: Container( child: Text("日時"), alignment: Alignment.center, color: Colors.lightGreen, - ) + )), + TableCell( + child: Container( + child: Text("メインステージ"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text("体育館"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text("武道場"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text("A講義室"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text("D講義室"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text("マルチメディア"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 2行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("10:00~\n10:30"), + alignment: Alignment.center, + )), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), ), TableCell( child: Container( - child: Text("メインステージ"), + child: Text("Mongolian\nstudent"), alignment: Alignment.center, color: Colors.lightGreen, ), ), TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, child: Container( - child: Text("体育館"), + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("Popular Music Club"), alignment: Alignment.center, color: Colors.lightGreen, ), ), TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, child: Container( - child: Text("武道場"), + child: Text(""), + alignment: Alignment.center, + ), + ), + ]), + + // 3行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("10:30~\n11:00"), + alignment: Alignment.center, + )), + TableCell( + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), alignment: Alignment.center, color: Colors.lightGreen, ), ), TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, child: Container( - child: Text("A講義室"), + child: Text(""), + alignment: Alignment.center, + ), + ), + ]), + + // 4行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("11:00~\n11:15"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("VYSAN"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), alignment: Alignment.center, color: Colors.lightGreen, ), ), TableCell( child: Container( - child: Text("D講義室"), + child: Text("ゲーム大会"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), alignment: Alignment.center, color: Colors.lightGreen, ), ), + ]), + + // 5行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("11:30~\n12:00"), + alignment: Alignment.center, + ), + ), + TableCell( + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 7行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("12:00~\n12:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("Street Style"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 8行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("12:30~\n13:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 9行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("13:00~\n13:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 10行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("13:30~\n14:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("Sri Lanka"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 12行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("14:00~\n14:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 11行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("14:30~\n15:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("吹奏楽部"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 13行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("15:00~\n15:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 14行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("15:30~\n16:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 15行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("16:00~\n16:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 16行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("16:30~\n17:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("ヒーローショー"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 15行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("17:00~\n17:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 17行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("17:30~\n18:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, child: Container( - child: Text("マルチメディア"), + child: Text(""), alignment: Alignment.center, color: Colors.lightGreen, ), From 6ab599abc3f9075424aa1e0acc035f838c5e32f5 Mon Sep 17 00:00:00 2001 From: imaimai17468 Date: Wed, 7 Sep 2022 09:15:00 +0900 Subject: [PATCH 6/7] [feature]add time schedule, second day sunny and rainy(#84) --- lib/pages/schedule_page_second_day_rainy.dart | 896 +++++++++++++++++- lib/pages/schedule_page_second_day_sunny.dart | 427 ++++++++- 2 files changed, 1282 insertions(+), 41 deletions(-) diff --git a/lib/pages/schedule_page_second_day_rainy.dart b/lib/pages/schedule_page_second_day_rainy.dart index 70978bb..6668515 100644 --- a/lib/pages/schedule_page_second_day_rainy.dart +++ b/lib/pages/schedule_page_second_day_rainy.dart @@ -43,49 +43,929 @@ class _SchedulePageSecondDayRainyState extends State }, defaultVerticalAlignment: TableCellVerticalAlignment.middle, children: [ + TableRow( + decoration: BoxDecoration(color: Colors.teal), + children: [ + TableCell( + child: Container( + child: Text("日時"), + alignment: Alignment.center, + )), + TableCell( + child: Container( + child: Text("体育館"), + alignment: Alignment.center, + ), + ), + TableCell( + child: Container( + child: Text("武道場"), + alignment: Alignment.center, + ), + ), + TableCell( + child: Container( + child: Text("A講義室"), + alignment: Alignment.center, + ), + ), + TableCell( + child: Container( + child: Text("D講義室"), + alignment: Alignment.center, + ), + ), + TableCell( + child: Container( + child: Text("マルチメディア"), + alignment: Alignment.center, + ), + ), + ]), + + // 2行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("10:00~\n10:30"), + alignment: Alignment.center, + )), + TableCell( + child: Container( + child: Text("Mongolian\nstudent"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("Popular Music Club"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + ]), + + // 3行目 TableRow(children: [ TableCell( child: Container( - child: Text("日時"), + child: Text("10:30~\n11:00"), alignment: Alignment.center, - color: Colors.lightGreen, - ) + )), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + ]), + + // 4行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("11:00~\n11:15"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("VYSAN"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("ゲーム大会"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 5行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("11:30~\n12:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 7行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("12:00~\n12:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("Street Style"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), ), TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, child: Container( - child: Text("体育館"), + child: Text(""), alignment: Alignment.center, color: Colors.lightGreen, ), ), + ]), + + // 8行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("12:30~\n13:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, child: Container( - child: Text("武道場"), + child: Text(""), alignment: Alignment.center, color: Colors.lightGreen, ), ), TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + ]), + + // 9行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("13:00~\n13:15"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, child: Container( - child: Text("A講義室"), + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), alignment: Alignment.center, color: Colors.lightGreen, ), ), TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + ]), + + // 10行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("13:15~\n13:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, child: Container( - child: Text("D講義室"), + child: Text("実践空手道部"), alignment: Alignment.center, color: Colors.lightGreen, ), ), TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, child: Container( - child: Text("マルチメディア"), + child: Text(""), alignment: Alignment.center, color: Colors.lightGreen, ), ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + ]), + + // 11行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("13:30~\n14:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("NUT\nソフトウェア"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + ]), + + // 12行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("14:00~\n14:15"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + ]), + + // 13行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("14:15~\n14:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + ]), + + // 14行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("14:30~\n15:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("カラオケ大会"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + ]), + + // 15行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("15:00~\n15:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + ]), + + // 16行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("15:30~\n16:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + ]), + + // 17行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("16:00~\n16:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + ]), + + // 16行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("16:30~\n17:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + ]), + + // 15行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("17:00~\n17:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("学生番号抽選会"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + ]), + + // 17行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("17:30~\n18:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + ]), + // 17行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("18:00~\n18:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), ]), ], ), diff --git a/lib/pages/schedule_page_second_day_sunny.dart b/lib/pages/schedule_page_second_day_sunny.dart index 89e739c..30f1f83 100644 --- a/lib/pages/schedule_page_second_day_sunny.dart +++ b/lib/pages/schedule_page_second_day_sunny.dart @@ -36,13 +36,13 @@ class _SchedulePageSecondDaySunnyState child: Table( border: TableBorder.all(color: Colors.black), columnWidths: const { - 0: FlexColumnWidth(5), - 1: FlexColumnWidth(10), - 2: FlexColumnWidth(10), - 3: FlexColumnWidth(10), - 4: FlexColumnWidth(10), - 5: FlexColumnWidth(10), - 6: FlexColumnWidth(10), + 0: FlexColumnWidth(10), + 1: FlexColumnWidth(15), + 2: FlexColumnWidth(15), + 3: FlexColumnWidth(15), + 4: FlexColumnWidth(15), + 5: FlexColumnWidth(15), + 6: FlexColumnWidth(15), }, defaultVerticalAlignment: TableCellVerticalAlignment.middle, children: [ @@ -53,48 +53,41 @@ class _SchedulePageSecondDaySunnyState child: Container( child: Text("日時"), alignment: Alignment.center, - color: Colors.lightGreen, )), TableCell( child: Container( child: Text("メインステージ"), alignment: Alignment.center, - color: Colors.lightGreen, ), ), TableCell( child: Container( child: Text("体育館"), alignment: Alignment.center, - color: Colors.lightGreen, ), ), TableCell( child: Container( child: Text("武道場"), alignment: Alignment.center, - color: Colors.lightGreen, ), ), TableCell( child: Container( child: Text("A講義室"), alignment: Alignment.center, - color: Colors.lightGreen, ), ), TableCell( child: Container( child: Text("D講義室"), alignment: Alignment.center, - color: Colors.lightGreen, ), ), TableCell( child: Container( child: Text("マルチメディア"), alignment: Alignment.center, - color: Colors.lightGreen, ), ), ]), @@ -244,16 +237,10 @@ class _SchedulePageSecondDaySunnyState color: Colors.lightGreen, ), ), - TableCell( - child: Container( - child: Text("ゲーム大会"), - alignment: Alignment.center, - ), - ), TableCell( verticalAlignment: TableCellVerticalAlignment.fill, child: Container( - child: Text(""), + child: Text("ゲーム大会"), alignment: Alignment.center, color: Colors.lightGreen, ), @@ -427,7 +414,21 @@ class _SchedulePageSecondDaySunnyState TableRow(children: [ TableCell( child: Container( - child: Text("13:00~\n13:30"), + child: Text("13:00~\n13:15"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), alignment: Alignment.center, ), ), @@ -453,20 +454,56 @@ class _SchedulePageSecondDaySunnyState color: Colors.lightGreen, ), ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), ]), // 10行目 TableRow(children: [ TableCell( child: Container( - child: Text("13:30~\n14:00"), + child: Text("13:15~\n13:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("実践空手道部"), alignment: Alignment.center, + color: Colors.lightGreen, ), ), TableCell( verticalAlignment: TableCellVerticalAlignment.fill, child: Container( - child: Text("Sri Lanka"), + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), alignment: Alignment.center, color: Colors.lightGreen, ), @@ -478,6 +515,46 @@ class _SchedulePageSecondDaySunnyState alignment: Alignment.center, ), ), + ]), + + // 11行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("13:30~\n14:00"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("NUT\nソフトウェア"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), TableCell( verticalAlignment: TableCellVerticalAlignment.fill, child: Container( @@ -486,13 +563,20 @@ class _SchedulePageSecondDaySunnyState color: Colors.lightGreen, ), ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), ]), // 12行目 TableRow(children: [ TableCell( child: Container( - child: Text("14:00~\n14:30"), + child: Text("14:00~\n14:15"), alignment: Alignment.center, ), ), @@ -518,9 +602,86 @@ class _SchedulePageSecondDaySunnyState color: Colors.lightGreen, ), ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), ]), - // 11行目 + // 13行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("14:15~\n14:30"), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + ]), + + // 14行目 TableRow(children: [ TableCell( child: Container( @@ -531,7 +692,7 @@ class _SchedulePageSecondDaySunnyState TableCell( verticalAlignment: TableCellVerticalAlignment.fill, child: Container( - child: Text("吹奏楽部"), + child: Text("カラオケ大会"), alignment: Alignment.center, color: Colors.lightGreen, ), @@ -543,6 +704,21 @@ class _SchedulePageSecondDaySunnyState alignment: Alignment.center, ), ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), TableCell( verticalAlignment: TableCellVerticalAlignment.fill, child: Container( @@ -551,9 +727,16 @@ class _SchedulePageSecondDaySunnyState color: Colors.lightGreen, ), ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), ]), - // 13行目 + // 15行目 TableRow(children: [ TableCell( child: Container( @@ -561,6 +744,21 @@ class _SchedulePageSecondDaySunnyState alignment: Alignment.center, ), ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), TableCell( verticalAlignment: TableCellVerticalAlignment.fill, child: Container( @@ -583,9 +781,16 @@ class _SchedulePageSecondDaySunnyState color: Colors.lightGreen, ), ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), ]), - // 14行目 + // 16行目 TableRow(children: [ TableCell( child: Container( @@ -607,6 +812,20 @@ class _SchedulePageSecondDaySunnyState alignment: Alignment.center, ), ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), TableCell( verticalAlignment: TableCellVerticalAlignment.fill, child: Container( @@ -615,9 +834,16 @@ class _SchedulePageSecondDaySunnyState color: Colors.lightGreen, ), ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), ]), - // 15行目 + // 17行目 TableRow(children: [ TableCell( child: Container( @@ -639,6 +865,20 @@ class _SchedulePageSecondDaySunnyState alignment: Alignment.center, ), ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), TableCell( verticalAlignment: TableCellVerticalAlignment.fill, child: Container( @@ -647,6 +887,13 @@ class _SchedulePageSecondDaySunnyState color: Colors.lightGreen, ), ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), ]), // 16行目 @@ -660,9 +907,22 @@ class _SchedulePageSecondDaySunnyState TableCell( verticalAlignment: TableCellVerticalAlignment.fill, child: Container( - child: Text("ヒーローショー"), + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), alignment: Alignment.center, - color: Colors.lightGreen, ), ), TableCell( @@ -680,6 +940,13 @@ class _SchedulePageSecondDaySunnyState color: Colors.lightGreen, ), ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), ]), // 15行目 @@ -690,6 +957,28 @@ class _SchedulePageSecondDaySunnyState alignment: Alignment.center, ), ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text("学生番号抽選会"), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), TableCell( verticalAlignment: TableCellVerticalAlignment.fill, child: Container( @@ -709,7 +998,6 @@ class _SchedulePageSecondDaySunnyState child: Container( child: Text(""), alignment: Alignment.center, - color: Colors.lightGreen, ), ), ]), @@ -722,6 +1010,35 @@ class _SchedulePageSecondDaySunnyState alignment: Alignment.center, ), ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + color: Colors.lightGreen, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), TableCell( verticalAlignment: TableCellVerticalAlignment.fill, child: Container( @@ -736,6 +1053,15 @@ class _SchedulePageSecondDaySunnyState alignment: Alignment.center, ), ), + ]), + // 17行目 + TableRow(children: [ + TableCell( + child: Container( + child: Text("18:00~\n18:30"), + alignment: Alignment.center, + ), + ), TableCell( verticalAlignment: TableCellVerticalAlignment.fill, child: Container( @@ -744,6 +1070,41 @@ class _SchedulePageSecondDaySunnyState color: Colors.lightGreen, ), ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), + TableCell( + verticalAlignment: TableCellVerticalAlignment.fill, + child: Container( + child: Text(""), + alignment: Alignment.center, + ), + ), ]), ], ), From 6b8e71bc52b292337ef9932f181eb077d10aeb73 Mon Sep 17 00:00:00 2001 From: imaimai17468 Date: Wed, 7 Sep 2022 15:36:03 +0900 Subject: [PATCH 7/7] [fix]drawer, comment out navigates(#84) --- lib/widgets/drawer.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/widgets/drawer.dart b/lib/widgets/drawer.dart index 134621a..4402da5 100644 --- a/lib/widgets/drawer.dart +++ b/lib/widgets/drawer.dart @@ -12,8 +12,8 @@ class ApplicationDrawer { title: Text("マイシフト"), leading: const Icon(Icons.dvr), onTap: () => { - Navigator.pushNamedAndRemoveUntil( - context, '/my_shift_page', (Route route) => false) + // Navigator.pushNamedAndRemoveUntil( + // context, '/my_shift_page', (Route route) => false) }, ), ListTile( @@ -36,8 +36,8 @@ class ApplicationDrawer { title: Text("タイムスケジュール"), leading: Icon(Icons.schedule), onTap: () => { - Navigator.pushNamedAndRemoveUntil( - context, '/schedule_page', (Route route) => false) + // Navigator.pushNamedAndRemoveUntil( + // context, '/schedule_page', (Route route) => false) }, ), ListTile(