Improve bus time arrived text

nsysu-code-club · Feb 22, 2021 · f96b2ae · f96b2ae
1 parent 9dde4fc
commit f96b2ae
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/pages/bus/bus_time_page.dart b/lib/pages/bus/bus_time_page.dart
@@ -10,6 +10,7 @@ import 'package:flutter/material.dart';
 import 'package:nsysu_ap/api/bus_helper.dart';
 import 'package:nsysu_ap/models/bus_info.dart';
 import 'package:nsysu_ap/models/bus_time.dart';
+import 'package:nsysu_ap/utils/app_localizations.dart';
 
 enum _State { loading, finish, error }
 
@@ -160,8 +161,14 @@ class BusTimeItem extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final postfix = int.tryParse(busTime.arrivedTime ?? '') == null
+        ? ''
+        : ' ${AppLocalizations.of(context).minute}';
     return ListTile(
       leading: Container(
+        constraints: BoxConstraints(
+          minWidth: 65.0,
+        ),
         decoration: BoxDecoration(
           border: Border.all(
             width: 1.0,
@@ -175,12 +182,13 @@ class BusTimeItem extends StatelessWidget {
         ),
         padding: EdgeInsets.all(8.0),
         child: Text(
-          busTime.arrivedTime,
+          '${busTime.arrivedTime ?? ''}$postfix',
           style: TextStyle(
             color: busTime.arrivedTime == '進站中'
                 ? Colors.red
                 : ApTheme.of(context).greyText,
           ),
+          textAlign: TextAlign.center,
         ),
       ),
       title: Text(busTime.name ?? ''),

diff --git a/lib/utils/app_localizations.dart b/lib/utils/app_localizations.dart
@@ -10,6 +10,8 @@ class AppLocalizations {
 
   static Locale locale;
 
+  String get minute => _vocabularies['minute'];
+
   static AppLocalizations of(BuildContext context) {
     return Localizations.of<AppLocalizations>(context, AppLocalizations);
   }
@@ -122,6 +124,7 @@ class AppLocalizations {
       'hasPreScoreHint': 'Yellow Text not final score, proved by instructor.',
       'pleaseConfirmForm': 'Please fill out confirm form before login.',
       'bus': 'Bus System',
+      'minute': 'Min',
     },
     'zh': {
       'app_name': '中山校務通',
@@ -156,6 +159,7 @@ class AppLocalizations {
       'hasPreScoreHint': '黃字為授課老師開放成績查詢 並非最終成績',
       'pleaseConfirmForm': '請先填寫確認表單再進行登入',
       'bus': '校園公車',
+      'minute': '分',
     },
   };
 }