final

DanXi-Dev · Aug 5, 2023 · 69cc68c · 69cc68c
1 parent 3bdd5eb
commit 69cc68c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 45 deletions.
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
@@ -500,5 +500,5 @@
   "manually_add_course":"Add lesson manually:",
   "manually_add_course_message":"If there is a class that is not included in the class schedule, but you want to check it, add it manually yourself.",
   "start_date_select": "Term start date query",
-  "start_date_select_message": "You must select the start date of the semester to view your class schedule. Not selecting will result in a date error. Tip: Start date is the Monday of the first week."
+  "start_date_select_message": "You must select the start date of the semester to view your class schedule. Not selecting will result in a date error. \nTip: Start date is the Monday of the first week."
 }
diff --git a/lib/l10n/intl_ja.arb b/lib/l10n/intl_ja.arb
@@ -492,5 +492,5 @@
   "manually_add_course":"カリキュラムを手動で追加するには：",
   "manually_add_course_message":"授業表に収録されていない授業があるかどうか、また見たいのではないでしょうか。自分で手動で追加しましょう。",
   "start_date_select": "学期開始日照会:",
-  "start_date_select_message": "授業表を見るには、学期の開始日を選択しなければなりません。選択しないと日付エラーになります。ヒント：開始日は第1週の月曜日です。"
+  "start_date_select_message": "授業表を見るには、学期の開始日を選択しなければなりません。選択しないと日付エラーになります。\nヒント：開始日は第1週の月曜日です。"
 }
diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb
@@ -492,5 +492,5 @@
   "manually_add_course":"手动添加课程:",
   "manually_add_course_message":"是否有课未收录在课表上，但你又想查看的呢，自己手动添加它吧。",
   "start_date_select": "学期开始日期查询:",
-  "start_date_select_message": "必须选择学期的开始日期才能查看你的课表。不选择将导致日期错误。提示:开始日期是第一周的周一。"
+  "start_date_select_message": "必须选择学期的开始日期才能查看你的课表。不选择将导致日期错误。\n提示:开始日期是第一周的周一。"
 }
diff --git a/lib/page/subpage_timetable.dart b/lib/page/subpage_timetable.dart
@@ -327,22 +327,22 @@ class TimetableSubPageState extends PlatformSubpageState<TimetableSubPage> {
           TargetContent(
             align: ContentAlign.bottom,
             builder: (context, controller) {
-              return const Column(
+              return Column(
                 mainAxisSize: MainAxisSize.min,
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: <Widget>[
                   Text(
-                    "学期选择:",
-                    style: TextStyle(
+                    S.of(context).choose_semester,
+                    style: const TextStyle(
                         fontWeight: FontWeight.bold,
                         color: Colors.white,
                         fontSize: 20.0),
                   ),
                   Padding(
-                    padding: EdgeInsets.only(top: 10.0),
+                    padding: const EdgeInsets.only(top: 10.0),
                     child: Text(
-                      "选择你想查看的学期",
-                      style: TextStyle(color: Colors.white),
+                      S.of(context).choose_semester_message,
+                      style: const TextStyle(color: Colors.white),
                     ),
                   ),
                 ],
@@ -356,7 +356,6 @@ class TimetableSubPageState extends PlatformSubpageState<TimetableSubPage> {
       TargetFocus(
         identify: "ManuallyAddCourseButton",
         keyTarget: keyButton,
-        // color: Colors.purple,
         contents: [
           TargetContent(
             align: ContentAlign.bottom,
@@ -366,18 +365,18 @@ class TimetableSubPageState extends PlatformSubpageState<TimetableSubPage> {
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: <Widget>[
                   Text(
-                    S.of(context).skip,
+                    S.of(context).manually_add_course,
                     style: const TextStyle(
                       fontWeight: FontWeight.bold,
                       color: Colors.white,
                       fontSize: 20.0,
                     ),
                   ),
-                  const Padding(
-                    padding: EdgeInsets.only(top: 10.0),
+                  Padding(
+                    padding: const EdgeInsets.only(top: 10.0),
                     child: Text(
-                      "是否有课未收录在课表上，但你又想查看的呢，自己手动添加它吧",
-                      style: TextStyle(color: Colors.white),
+                      S.of(context).manually_add_course_message,
+                      style: const TextStyle(color: Colors.white),
                     ),
                   ),
                   ElevatedButton(
@@ -409,45 +408,22 @@ class TimetableSubPageState extends PlatformSubpageState<TimetableSubPage> {
                 mainAxisSize: MainAxisSize.min,
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: <Widget>[
-                  const Text(
-                    "学期开始日期选择:",
-                    style: TextStyle(
+                  Text(
+                    S.of(context).start_date_select,
+                    style: const TextStyle(
                       fontWeight: FontWeight.bold,
                       color: Colors.white,
                       fontSize: 20.0,
                     ),
                   ),
-                  const Padding(
-                    padding: EdgeInsets.only(top: 10.0),
+                  Padding(
+                    padding: const EdgeInsets.only(top: 10.0),
                     child: Column(
                       children: [
                         Align(
-                          // alignment: Alignment.center,
-                          child: Text(
-                            "必须选择学期的开始日期才能查看你的课表",
-                            style: TextStyle(
-                              fontWeight: FontWeight.bold,
-                              color: Colors.white,
-                              fontSize: 20.0,
-                            ),
-                          ),
-                        ),
-                        Align(
-                          // alignment: Alignment.center,
-                          child: Text(
-                            "不选择将导致日期错误",
-                            style: TextStyle(
-                              fontWeight: FontWeight.bold,
-                              color: Colors.white,
-                              fontSize: 20.0,
-                            ),
-                          ),
-                        ),
-                        Align(
-                          // alignment: Alignment.center,
                           child: Text(
-                            "tips:开始日期是第一周的周一",
-                            style: TextStyle(
+                            S.of(context).start_date_select_message,
+                            style: const TextStyle(
                               fontWeight: FontWeight.bold,
                               color: Colors.white,
                               fontSize: 20.0,