11import 'dart:convert' ;
22import 'dart:io' ;
3- import 'dart:math' ;
43
54import 'package:barcode_scan/barcode_scan.dart' ;
65import 'package:http/http.dart' as http;
@@ -52,6 +51,8 @@ class ClassTableState extends State<ClassTable> {
5251 borderRadius: BorderRadius .circular (5 ),
5352 side: BorderSide (color: Colors .black87)
5453 );
54+ final classButtonPadding = EdgeInsets .symmetric (vertical: 5 );
55+ final dayColumnPadding = EdgeInsets .symmetric (horizontal: 5 );
5556
5657 Class currentClass;
5758 Map <String , List <Class >> classes = Map ();
@@ -62,6 +63,8 @@ class ClassTableState extends State<ClassTable> {
6263 Widget build (BuildContext context) {
6364 currentClass = null ;
6465
66+ final now = DateTime .now ();
67+
6568 return Scaffold (
6669 appBar: AppBar (
6770 title: Text ('TimeTable' ),
@@ -92,12 +95,12 @@ class ClassTableState extends State<ClassTable> {
9295 ]
9396 ),
9497 body: SingleChildScrollView (
95- child: Column (children : [
96- Row ( children: createColumnsForTable (context, DateTime . now () ),
98+ child: Row (
99+ children: this .classes.keys. map ((k) => createColumnForDay (k, now)). toList ( ),
97100 mainAxisAlignment: MainAxisAlignment .spaceEvenly,
98- crossAxisAlignment: CrossAxisAlignment .start)
99- ]
100- ))
101+ crossAxisAlignment: CrossAxisAlignment .start
102+ )
103+ )
101104 );
102105 }
103106
@@ -184,8 +187,18 @@ class ClassTableState extends State<ClassTable> {
184187 }
185188
186189 void updateClassListFromBackend (String id) async {
190+ showDialog (
191+ context: context,
192+ child: AlertDialog (
193+ title: Text ('Szinkronizálás' ),
194+ contentPadding: EdgeInsets .all (16 ),
195+ content: Text ('Szinkronizálás a felhővel folyamatban' )
196+ )
197+ );
187198 final backendResponse = await http.get ('$backendURL ?id=$id ' , headers: { 'Content-Type' : 'application/json' });
188199
200+ Navigator .pop (context);
201+
189202 if (backendResponse.statusCode == 200 ) {
190203 this .hasLocalID = true ;
191204
@@ -197,6 +210,21 @@ class ClassTableState extends State<ClassTable> {
197210 };
198211
199212 this .settingsFile.writeAsStringSync (jsonEncode (fileContent));
213+ }else {
214+ showDialog (
215+ context: context,
216+ child: AlertDialog (
217+ title: Text ('Hiba' ),
218+ contentPadding: EdgeInsets .all (16 ),
219+ content: Text ("Nem sikerült lekérni az órarendet ehhez az azonosítóhoz: \n '$id '" ),
220+ actions: [
221+ RaisedButton (
222+ child: Text ('Vissza' ),
223+ onPressed: () => Navigator .pop (context)
224+ )
225+ ]
226+ )
227+ );
200228 }
201229 }
202230
@@ -214,31 +242,32 @@ class ClassTableState extends State<ClassTable> {
214242 return classesObject;
215243 }
216244
217- List <Column > createColumnsForTable (BuildContext context, DateTime now) {
218- return this .classes.keys.map ((k) => Column (children: createButtonsForColumn (k, context, now)))
219- .toList ();
245+ Widget createColumnForDay (String day, DateTime now) {
246+ return Expanded (
247+ child: Padding (
248+ padding: dayColumnPadding,
249+ child: Column (
250+ crossAxisAlignment: CrossAxisAlignment .stretch,
251+ children: createButtonsForColumn (day, now)
252+ )
253+ )
254+ );
220255 }
221256
222- List <Widget > createButtonsForColumn (String day, BuildContext context, DateTime now) {
223- List <Widget > result = List ();
257+ List <Widget > createButtonsForColumn (String day, DateTime now) {
258+ final result = List <Widget >();
259+
224260 result.add (RaisedButton (
225261 onPressed: () => {},
226262 shape: buttonShape,
227263 child: Text (day)
228264 ));
229265
230- result.add (SizedBox (height: 15 ));
231-
232- final currentClasses = this .classes[day];
233- for (var i = 0 ; i < currentClasses.length; ++ i) {
234- result.add (createClassButton (currentClasses[i], now, i, context));
235- result.add (SizedBox (height: 10 ));
236- }
237-
266+ this .classes[day].forEach ((k) => result.add (createClassButton (k, now)));
238267 return result;
239268 }
240269
241- Widget createClassButton (Class clazz, DateTime now, int index, BuildContext context ) {
270+ Widget createClassButton (Class clazz, DateTime now) {
242271 final today = dayList[now.weekday - 1 ];
243272 final isToday = clazz.day == today;
244273 final isBefore = isToday && now.isBefore (clazz.startTime);
@@ -254,11 +283,17 @@ class ClassTableState extends State<ClassTable> {
254283 'Típus: ${clazz .type }\n ' +
255284 'Terem: ${clazz .room }' ;
256285
257- return RaisedButton (
258- onPressed: () => {},
259- shape: buttonShape,
260- child: Text (buttonText, style: TextStyle (color: clazz.unImportant ? lightGray : Colors .black)),
261- color: clazz.unImportant ? unimportantClassColor : isNext ? currentClassColor : isBefore ? upcomingClassColor : isAfter ? pastClassColor : otherDayClassColor
286+ return Padding (
287+ padding: classButtonPadding,
288+ child: RaisedButton (
289+ onPressed: () => {},
290+ shape: buttonShape,
291+ child: Padding (
292+ padding: classButtonPadding,
293+ child: Text (buttonText, style: TextStyle (color: clazz.unImportant ? lightGray : Colors .black))
294+ ),
295+ color: clazz.unImportant ? unimportantClassColor : isNext ? currentClassColor : isBefore ? upcomingClassColor : isAfter ? pastClassColor : otherDayClassColor
296+ )
262297 );
263298 }
264299}
@@ -276,7 +311,7 @@ class Class {
276311 this .day = jsonData['day' ],
277312 this .startTime = parseTimeFrom (jsonData['startTime' ], now),
278313 this .endTime = parseTimeFrom (jsonData['endTime' ], now),
279- this .name = jsonData['name' ]. substring ( 0 , min (jsonData[ 'name' ].length as int , 15 )) ,
314+ this .name = jsonData['name' ],
280315 this .type = jsonData['type' ],
281316 this .room = jsonData['room' ],
282317 this .unImportant = jsonData['unImportant' ];
0 commit comments